From 23466068f868b631aca5e1b9c4ecf5c846541fd2 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 30 Sep 2020 22:04:28 -0700 Subject: Implement groups management --- modern/src/App.js | 4 ++ modern/src/MainToolbar.js | 7 +++ modern/src/settings/GroupPage.js | 93 +++++++++++++++++++++++++++++++++++++++ modern/src/settings/GroupsPage.js | 63 ++++++++++++++++++++++++++ 4 files changed, 167 insertions(+) create mode 100644 modern/src/settings/GroupPage.js create mode 100644 modern/src/settings/GroupsPage.js diff --git a/modern/src/App.js b/modern/src/App.js index 9dc963b6..1f6b55a4 100644 --- a/modern/src/App.js +++ b/modern/src/App.js @@ -11,6 +11,8 @@ import UserPage from './UserPage'; import SocketController from './SocketController'; import NotificationsPage from './settings/NotificationsPage'; import NotificationPage from './settings/NotificationPage'; +import GroupsPage from './settings/GroupsPage'; +import GroupPage from './settings/GroupPage'; import PositionPage from './PositionPage'; const App = () => { @@ -27,6 +29,8 @@ const App = () => { + + diff --git a/modern/src/MainToolbar.js b/modern/src/MainToolbar.js index 9d4824ac..374c694c 100644 --- a/modern/src/MainToolbar.js +++ b/modern/src/MainToolbar.js @@ -28,6 +28,7 @@ import PlayCircleFilledIcon from '@material-ui/icons/PlayCircleFilled'; import NotificationsActiveIcon from '@material-ui/icons/NotificationsActive'; import FormatListBulletedIcon from '@material-ui/icons/FormatListBulleted'; import TrendingUpIcon from '@material-ui/icons/TrendingUp'; +import FolderIcon from '@material-ui/icons/Folder'; import t from './common/localization'; const useStyles = makeStyles(theme => ({ @@ -159,6 +160,12 @@ const MainToolbar = () => { + history.push('/settings/groups')}> + + + + + {adminEnabled && ( <> diff --git a/modern/src/settings/GroupPage.js b/modern/src/settings/GroupPage.js new file mode 100644 index 00000000..0dc61e50 --- /dev/null +++ b/modern/src/settings/GroupPage.js @@ -0,0 +1,93 @@ +import React, { useState } from 'react'; +import TextField from '@material-ui/core/TextField'; + +import t from '../common/localization'; +import EditItemView from '../EditItemView'; +import { Accordion, AccordionSummary, AccordionDetails, makeStyles, Typography, FormControl, InputLabel, Select } from '@material-ui/core'; +import ExpandMoreIcon from '@material-ui/icons/ExpandMore'; +import EditAttributesView from '../attributes/EditAttributesView'; +import { useEffectAsync } from '../reactHelper'; +import deviceAttributes from '../attributes/deviceAttributes'; + +const useStyles = makeStyles(() => ({ + details: { + flexDirection: 'column', + }, +})); + +const GroupPage = () => { + const classes = useStyles(); + + const [item, setItem] = useState(); + const [groups, setGroups] = useState(); + + useEffectAsync(async () => { + const response = await fetch('/api/groups'); + if (response.ok) { + setGroups(await response.json()); + } + }, []); + + return ( + + {item && + <> + + }> + + {t('sharedRequired')} + + + + setItem({...item, name: event.target.value})} + label={t('sharedName')} + variant="filled" /> + + + + }> + + {t('sharedExtra')} + + + + {groups && + + {t('groupParent')} + + + } + + + + }> + + {t('sharedAttributes')} + + + + setItem({...item, attributes})} + definitions={deviceAttributes} + /> + + + + } + + ); +} + +export default GroupPage; diff --git a/modern/src/settings/GroupsPage.js b/modern/src/settings/GroupsPage.js new file mode 100644 index 00000000..e2740627 --- /dev/null +++ b/modern/src/settings/GroupsPage.js @@ -0,0 +1,63 @@ +import React, { useState } from 'react'; +import MainToolbar from '../MainToolbar'; +import { TableContainer, Table, TableRow, TableCell, TableHead, TableBody, makeStyles, IconButton } from '@material-ui/core'; +import MoreVertIcon from '@material-ui/icons/MoreVert'; +import t from '../common/localization'; +import { useEffectAsync } from '../reactHelper'; +import EditCollectionView from '../EditCollectionView'; + +const useStyles = makeStyles(theme => ({ + columnAction: { + width: theme.spacing(1), + padding: theme.spacing(0, 1), + }, +})); + +const GroupsView = ({ updateTimestamp, onMenuClick }) => { + const classes = useStyles(); + + const [items, setItems] = useState([]); + + useEffectAsync(async () => { + const response = await fetch('/api/groups'); + if (response.ok) { + setItems(await response.json()); + } + }, [updateTimestamp]); + + return ( + + + + + + {t('sharedName')} + + + + {items.map((item) => ( + + + onMenuClick(event.currentTarget, item.id)}> + + + + {item.name} + + ))} + +
+
+ ); +} + +const GroupsPage = () => { + return ( + <> + + + + ); +} + +export default GroupsPage; -- cgit v1.2.3