diff --git a/.storybook/middleware.js b/.storybook/middleware.js index 06e1419f..b4128c05 100644 --- a/.storybook/middleware.js +++ b/.storybook/middleware.js @@ -6,6 +6,6 @@ module.exports = function expressMiddleware(router) { for (let domain in proxyConfig) { console.log(domain); - router.use(domain, proxy(proxyConfig[domain])); + router.use(domain, proxy.createProxyMiddleware(proxyConfig[domain])); } }; diff --git a/src/Components/ProfileMenu.js b/src/Components/ProfileMenu.js index c525f6a4..ce2a5234 100644 --- a/src/Components/ProfileMenu.js +++ b/src/Components/ProfileMenu.js @@ -61,10 +61,7 @@ const ProfileMenu = props => { {props.extraItems?.map(item => ( - item.func} - > + {item.label} ))} diff --git a/src/Components/Select.js b/src/Components/Select.js index eb330425..fabfebee 100644 --- a/src/Components/Select.js +++ b/src/Components/Select.js @@ -5,6 +5,7 @@ import MenuItem from "@material-ui/core/MenuItem"; import FormControl from "@material-ui/core/FormControl"; import MaterialSelect from "@material-ui/core/Select"; import PropTypes from "prop-types"; +import { Checkbox, ListItemText } from "@material-ui/core"; const useStyles = makeStyles(theme => ({ formControl: { @@ -39,12 +40,17 @@ const Select = props => { value={props.value} onChange={props.onChange} inputProps={props.inputProps} + multiple={props.multiple} + renderValue={props.renderValue} > {noneOption} {props.options.map((element, index) => { return ( - {element} + {props.multiple && ( + -1} /> + )} + ); })} diff --git a/src/Components/Table.js b/src/Components/Table.js index 8a348b94..82db6b6a 100644 --- a/src/Components/Table.js +++ b/src/Components/Table.js @@ -41,14 +41,15 @@ const tableIcons = { Search: forwardRef((props, ref) => ), SortArrow: forwardRef((props, ref) => ), ThirdStateCheck: forwardRef((props, ref) => ), - ViewColumn: forwardRef((props, ref) => ), + ViewColumn: forwardRef((props, ref) => ) }; // More information in: https://material-table.com/#/docs/all-props -const Table = (props) => { +const Table = props => { return (