From 3fb3b5334e11c1239b5126767c4160da79d1cfe9 Mon Sep 17 00:00:00 2001
From: Ashutosh Bishnoi <mail2bishnoi@gmail.com>
Date: Tue, 5 Jan 2021 17:23:32 +0530
Subject: Computed Attributes

---
 modern/src/settings/ComputedAttributePage.js  | 92 +++++++++++++++++++++++++++
 modern/src/settings/ComputedAttributesPage.js | 69 ++++++++++++++++++++
 2 files changed, 161 insertions(+)
 create mode 100644 modern/src/settings/ComputedAttributePage.js
 create mode 100644 modern/src/settings/ComputedAttributesPage.js

(limited to 'modern/src/settings')

diff --git a/modern/src/settings/ComputedAttributePage.js b/modern/src/settings/ComputedAttributePage.js
new file mode 100644
index 0000000..f985152
--- /dev/null
+++ b/modern/src/settings/ComputedAttributePage.js
@@ -0,0 +1,92 @@
+import React, { useState } from 'react';
+import { Accordion, AccordionSummary, AccordionDetails, makeStyles, Typography,  FormControl, InputLabel, MenuItem, Select, TextField } from "@material-ui/core";
+import t from '../common/localization';
+import EditItemView from '../EditItemView';
+
+import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
+import positionAttributes from '../attributes/positionAttributes';
+
+
+const useStyles = makeStyles(() => ({
+  details: {
+    flexDirection: 'column',
+  },
+}));
+
+const ComputedAttributePage =() => {
+
+  const classes = useStyles();
+  const [item, setItem] = useState();
+  const [key, setKey] = useState();
+
+  const options = Object.entries(positionAttributes).map(([key, value]) => ({
+    key,
+    name: value.name,
+    type: value.type,
+  }));
+
+  return (
+    <EditItemView endpoint="/attributes/computed" item={item} setItem={setItem}>
+      {item &&
+        <Accordion defaultExpanded>
+          <AccordionSummary expandIcon={<ExpandMoreIcon />}>
+            <Typography variant="subtitle1">
+              {t('sharedRequired')}
+            </Typography>
+          </AccordionSummary>
+          <AccordionDetails className={classes.details}>
+            <TextField
+              margin="normal"
+              value={item.description || ''}
+              onChange={event => setItem({...item, description: event.target.value})}
+              label={t('sharedDescription')}
+              variant="filled" />
+            <FormControl variant="filled" margin="normal" fullWidth>
+              <InputLabel>{t('sharedAttribute')}</InputLabel>
+              <Select 
+                value={item.attribute || ''} 
+                onChange={(e) => {
+                  const newValue = e.target.value;
+                  const positionAttribute = positionAttributes[newValue];
+                  setKey(newValue);
+                  if(positionAttribute && positionAttribute.type) {
+                    setItem({...item, attribute: newValue, type: positionAttribute.type});
+                  }else {
+                    setItem({...item, attribute: newValue});
+                  }
+                }}>
+                {options.map((option) => (
+                  <MenuItem key={option.key} value={option.key}>{option.name}</MenuItem>
+                ))}
+              </Select>
+            </FormControl>            
+            <TextField
+              margin="normal"
+              value={item.expression || ''}
+              onChange={event => setItem({...item, expression: event.target.value})}
+              label={t('sharedExpression')}
+              multiline
+              rows={4}
+              variant="filled" />
+            <FormControl
+              variant="filled"
+              margin="normal"
+              fullWidth
+              disabled={key in positionAttributes}>
+              <InputLabel>{t('sharedType')}</InputLabel>
+              <Select
+                value={item.type || ''}
+                onChange={event => setItem({...item, type: event.target.value})}>
+                <MenuItem value={'string'}>{t('sharedTypeString')}</MenuItem>
+                <MenuItem value={'number'}>{t('sharedTypeNumber')}</MenuItem>
+                <MenuItem value={'boolean'}>{t('sharedTypeBoolean')}</MenuItem>
+              </Select>
+            </FormControl>
+          </AccordionDetails>
+        </Accordion>
+      }
+    </EditItemView>
+  )
+}
+
+export default ComputedAttributePage;
diff --git a/modern/src/settings/ComputedAttributesPage.js b/modern/src/settings/ComputedAttributesPage.js
new file mode 100644
index 0000000..9ca5b69
--- /dev/null
+++ b/modern/src/settings/ComputedAttributesPage.js
@@ -0,0 +1,69 @@
+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 ComputedAttributeView = ({ updateTimestamp, onMenuClick }) => {
+  const classes = useStyles();
+
+  const [items, setItems] = useState([]);
+
+  useEffectAsync(async () => {
+    const response = await fetch('/api/attributes/computed');
+    if (response.ok) {
+      setItems(await response.json());
+    }
+  }, [updateTimestamp]);
+
+  return (
+    <TableContainer>
+    <Table>
+      <TableHead>
+        <TableRow>
+          <TableCell className={classes.columnAction} />
+          <TableCell>{t('sharedDescription')}</TableCell>
+          <TableCell>{t('sharedAttribute')}</TableCell>
+          <TableCell>{t('sharedExpression')}</TableCell>
+          <TableCell>{t('sharedType')}</TableCell>
+        </TableRow>
+      </TableHead>
+      <TableBody>
+        {items.map((item) => (
+          <TableRow key={item.id}>
+            <TableCell className={classes.columnAction} padding="none">
+              <IconButton onClick={(event) => onMenuClick(event.currentTarget, item.id)}>
+                <MoreVertIcon />
+              </IconButton>
+            </TableCell>
+            <TableCell>{item.description}</TableCell>
+            <TableCell>{item.attribute}</TableCell>
+            <TableCell>{item.expression}</TableCell>
+            <TableCell>{item.type}</TableCell>            
+          </TableRow>
+        ))}
+      </TableBody>
+    </Table>
+    </TableContainer>
+  );
+}
+
+const ComputedAttributesPage = () => {
+  return (
+    <>
+      <MainToolbar />
+      <EditCollectionView content={ComputedAttributeView} editPath="/settings/attribute/computed" endpoint="attributes/computed" />
+    </>
+  );
+}
+
+export default ComputedAttributesPage;
-- 
cgit v1.2.3


From a87f06b4cb10014b431e0a3ea8d6ba1da5a02fc1 Mon Sep 17 00:00:00 2001
From: Ashutosh Bishnoi <mail2bishnoi@gmail.com>
Date: Wed, 6 Jan 2021 15:53:48 +0530
Subject: computed attribute code improvements

---
 modern/src/App.js                             |  4 ++--
 modern/src/MainToolbar.js                     |  2 +-
 modern/src/settings/ComputedAttributePage.js  | 22 ++++++++++++----------
 modern/src/settings/ComputedAttributesPage.js |  2 +-
 4 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'modern/src/settings')

diff --git a/modern/src/App.js b/modern/src/App.js
index d7a6511..f5ebc14 100644
--- a/modern/src/App.js
+++ b/modern/src/App.js
@@ -50,8 +50,8 @@ const App = () => {
               <Route exact path='/settings/group/:id?' component={GroupPage} />
               <Route exact path='/settings/drivers' component={DriversPage} />
               <Route exact path='/settings/driver/:id?' component={DriverPage} />
-              <Route exact path='/settings/attributes/computed' component={ComputedAttributesPage} />
-              <Route exact path='/settings/attribute/computed/:id?' component={ComputedAttributePage} />                            
+              <Route exact path='/settings/attributes' component={ComputedAttributesPage} />
+              <Route exact path='/settings/attribute/:id?' component={ComputedAttributePage} />                            
               <Route exact path='/admin/server' component={ServerPage} />
               <Route exact path='/admin/users' component={UsersPage} />
               <Route exact path='/reports/route' component={RouteReportPage} />              
diff --git a/modern/src/MainToolbar.js b/modern/src/MainToolbar.js
index acb10aa..91b3d69 100644
--- a/modern/src/MainToolbar.js
+++ b/modern/src/MainToolbar.js
@@ -179,7 +179,7 @@ const MainToolbar = () => {
               </ListItemIcon>
               <ListItemText primary={t('sharedDrivers')} />
             </ListItem>
-            <ListItem button onClick={() => history.push('/settings/attributes/computed')}>
+            <ListItem button onClick={() => history.push('/settings/attributes')}>
               <ListItemIcon>
                 <StorageIcon />
               </ListItemIcon>
diff --git a/modern/src/settings/ComputedAttributePage.js b/modern/src/settings/ComputedAttributePage.js
index f985152..7ff9511 100644
--- a/modern/src/settings/ComputedAttributePage.js
+++ b/modern/src/settings/ComputedAttributePage.js
@@ -25,6 +25,17 @@ const ComputedAttributePage =() => {
     type: value.type,
   }));
 
+  const handleChange = event => {
+    const newValue = event.target.value;
+    setKey(newValue);
+    const positionAttribute = positionAttributes[newValue];
+    if(positionAttribute && positionAttribute.type) {
+      setItem({...item, attribute: newValue, type: positionAttribute.type});
+    } else {
+      setItem({...item, attribute: newValue});
+    }
+  }
+
   return (
     <EditItemView endpoint="/attributes/computed" item={item} setItem={setItem}>
       {item &&
@@ -45,16 +56,7 @@ const ComputedAttributePage =() => {
               <InputLabel>{t('sharedAttribute')}</InputLabel>
               <Select 
                 value={item.attribute || ''} 
-                onChange={(e) => {
-                  const newValue = e.target.value;
-                  const positionAttribute = positionAttributes[newValue];
-                  setKey(newValue);
-                  if(positionAttribute && positionAttribute.type) {
-                    setItem({...item, attribute: newValue, type: positionAttribute.type});
-                  }else {
-                    setItem({...item, attribute: newValue});
-                  }
-                }}>
+                onChange={handleChange}>
                 {options.map((option) => (
                   <MenuItem key={option.key} value={option.key}>{option.name}</MenuItem>
                 ))}
diff --git a/modern/src/settings/ComputedAttributesPage.js b/modern/src/settings/ComputedAttributesPage.js
index 9ca5b69..53d1172 100644
--- a/modern/src/settings/ComputedAttributesPage.js
+++ b/modern/src/settings/ComputedAttributesPage.js
@@ -61,7 +61,7 @@ const ComputedAttributesPage = () => {
   return (
     <>
       <MainToolbar />
-      <EditCollectionView content={ComputedAttributeView} editPath="/settings/attribute/computed" endpoint="attributes/computed" />
+      <EditCollectionView content={ComputedAttributeView} editPath="/settings/attribute" endpoint="attributes/computed" />
     </>
   );
 }
-- 
cgit v1.2.3


From e3ead466abdb03c5f1eb5d3979ad286d38ac95cb Mon Sep 17 00:00:00 2001
From: Ashutosh Bishnoi <mail2bishnoi@gmail.com>
Date: Thu, 7 Jan 2021 17:06:20 +0530
Subject: Hiding add computed attribute button for non admin users

---
 modern/src/EditCollectionView.js              | 12 +++++++++---
 modern/src/settings/ComputedAttributePage.js  |  1 -
 modern/src/settings/ComputedAttributesPage.js | 18 ++++++++++++------
 3 files changed, 21 insertions(+), 10 deletions(-)

(limited to 'modern/src/settings')

diff --git a/modern/src/EditCollectionView.js b/modern/src/EditCollectionView.js
index bec1056..f15d72c 100644
--- a/modern/src/EditCollectionView.js
+++ b/modern/src/EditCollectionView.js
@@ -5,6 +5,7 @@ import Menu from '@material-ui/core/Menu';
 import MenuItem from '@material-ui/core/MenuItem';
 import Fab from '@material-ui/core/Fab';
 import AddIcon from '@material-ui/icons/Add';
+import { useSelector } from 'react-redux';
 
 import t from './common/localization';
 import RemoveDialog from './RemoveDialog';
@@ -25,6 +26,7 @@ const EditCollectionView = ({ content, editPath, endpoint }) => {
   const [selectedAnchorEl, setSelectedAnchorEl] = useState(null);
   const [removeDialogShown, setRemoveDialogShown] = useState(false);
   const [updateTimestamp, setUpdateTimestamp] = useState(Date.now());
+  const adminEnabled = useSelector(state => state.session.user && state.session.user.administrator);
 
   const menuShow = (anchorId, itemId) => {
     setSelectedAnchorEl(anchorId);
@@ -60,9 +62,13 @@ const EditCollectionView = ({ content, editPath, endpoint }) => {
   return (
     <>
       <Content updateTimestamp={updateTimestamp} onMenuClick={menuShow} />
-      <Fab size="medium" color="primary" className={classes.fab} onClick={handleAdd}>
-        <AddIcon />
-      </Fab>
+      {adminEnabled && 
+        (
+          <Fab size="medium" color="primary" className={classes.fab} onClick={handleAdd}>
+            <AddIcon />
+          </Fab>          
+        )
+      }
       <Menu open={!!selectedAnchorEl} anchorEl={selectedAnchorEl} onClose={menuHide}>
         <MenuItem onClick={handleEdit}>{t('sharedEdit')}</MenuItem>
         <MenuItem onClick={handleRemove}>{t('sharedRemove')}</MenuItem>
diff --git a/modern/src/settings/ComputedAttributePage.js b/modern/src/settings/ComputedAttributePage.js
index 7ff9511..73759fa 100644
--- a/modern/src/settings/ComputedAttributePage.js
+++ b/modern/src/settings/ComputedAttributePage.js
@@ -2,7 +2,6 @@ import React, { useState } from 'react';
 import { Accordion, AccordionSummary, AccordionDetails, makeStyles, Typography,  FormControl, InputLabel, MenuItem, Select, TextField } from "@material-ui/core";
 import t from '../common/localization';
 import EditItemView from '../EditItemView';
-
 import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
 import positionAttributes from '../attributes/positionAttributes';
 
diff --git a/modern/src/settings/ComputedAttributesPage.js b/modern/src/settings/ComputedAttributesPage.js
index 53d1172..dde6b23 100644
--- a/modern/src/settings/ComputedAttributesPage.js
+++ b/modern/src/settings/ComputedAttributesPage.js
@@ -2,6 +2,7 @@ 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 { useSelector } from 'react-redux';
 import t from '../common/localization';
 import { useEffectAsync } from '../reactHelper';
 import EditCollectionView from '../EditCollectionView';
@@ -17,6 +18,7 @@ const ComputedAttributeView = ({ updateTimestamp, onMenuClick }) => {
   const classes = useStyles();
 
   const [items, setItems] = useState([]);
+  const adminEnabled = useSelector(state => state.session.user && state.session.user.administrator);
 
   useEffectAsync(async () => {
     const response = await fetch('/api/attributes/computed');
@@ -30,7 +32,7 @@ const ComputedAttributeView = ({ updateTimestamp, onMenuClick }) => {
     <Table>
       <TableHead>
         <TableRow>
-          <TableCell className={classes.columnAction} />
+          {adminEnabled && (<TableCell className={classes.columnAction} />)}
           <TableCell>{t('sharedDescription')}</TableCell>
           <TableCell>{t('sharedAttribute')}</TableCell>
           <TableCell>{t('sharedExpression')}</TableCell>
@@ -40,11 +42,15 @@ const ComputedAttributeView = ({ updateTimestamp, onMenuClick }) => {
       <TableBody>
         {items.map((item) => (
           <TableRow key={item.id}>
-            <TableCell className={classes.columnAction} padding="none">
-              <IconButton onClick={(event) => onMenuClick(event.currentTarget, item.id)}>
-                <MoreVertIcon />
-              </IconButton>
-            </TableCell>
+            {adminEnabled &&
+              (
+                <TableCell className={classes.columnAction} padding="none">
+                  <IconButton onClick={(event) => onMenuClick(event.currentTarget, item.id)}>
+                    <MoreVertIcon />
+                  </IconButton>
+                </TableCell>
+              )
+            }
             <TableCell>{item.description}</TableCell>
             <TableCell>{item.attribute}</TableCell>
             <TableCell>{item.expression}</TableCell>
-- 
cgit v1.2.3


From f48e7801d86ca3d8b831358013823dd62d33c7ee Mon Sep 17 00:00:00 2001
From: Ashutosh Bishnoi <mail2bishnoi@gmail.com>
Date: Fri, 8 Jan 2021 16:52:26 +0530
Subject: Computed attributes code improvements

---
 modern/src/EditCollectionView.js              |  8 +++-----
 modern/src/settings/ComputedAttributesPage.js | 14 ++++++--------
 2 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'modern/src/settings')

diff --git a/modern/src/EditCollectionView.js b/modern/src/EditCollectionView.js
index f15d72c..d3d0af1 100644
--- a/modern/src/EditCollectionView.js
+++ b/modern/src/EditCollectionView.js
@@ -63,11 +63,9 @@ const EditCollectionView = ({ content, editPath, endpoint }) => {
     <>
       <Content updateTimestamp={updateTimestamp} onMenuClick={menuShow} />
       {adminEnabled && 
-        (
-          <Fab size="medium" color="primary" className={classes.fab} onClick={handleAdd}>
-            <AddIcon />
-          </Fab>          
-        )
+        <Fab size="medium" color="primary" className={classes.fab} onClick={handleAdd}>
+          <AddIcon />
+        </Fab>
       }
       <Menu open={!!selectedAnchorEl} anchorEl={selectedAnchorEl} onClose={menuHide}>
         <MenuItem onClick={handleEdit}>{t('sharedEdit')}</MenuItem>
diff --git a/modern/src/settings/ComputedAttributesPage.js b/modern/src/settings/ComputedAttributesPage.js
index dde6b23..1a6feab 100644
--- a/modern/src/settings/ComputedAttributesPage.js
+++ b/modern/src/settings/ComputedAttributesPage.js
@@ -32,7 +32,7 @@ const ComputedAttributeView = ({ updateTimestamp, onMenuClick }) => {
     <Table>
       <TableHead>
         <TableRow>
-          {adminEnabled && (<TableCell className={classes.columnAction} />)}
+          {adminEnabled && <TableCell className={classes.columnAction} />}
           <TableCell>{t('sharedDescription')}</TableCell>
           <TableCell>{t('sharedAttribute')}</TableCell>
           <TableCell>{t('sharedExpression')}</TableCell>
@@ -43,13 +43,11 @@ const ComputedAttributeView = ({ updateTimestamp, onMenuClick }) => {
         {items.map((item) => (
           <TableRow key={item.id}>
             {adminEnabled &&
-              (
-                <TableCell className={classes.columnAction} padding="none">
-                  <IconButton onClick={(event) => onMenuClick(event.currentTarget, item.id)}>
-                    <MoreVertIcon />
-                  </IconButton>
-                </TableCell>
-              )
+              <TableCell className={classes.columnAction} padding="none">
+                <IconButton onClick={(event) => onMenuClick(event.currentTarget, item.id)}>
+                  <MoreVertIcon />
+                </IconButton>
+              </TableCell>
             }
             <TableCell>{item.description}</TableCell>
             <TableCell>{item.attribute}</TableCell>
-- 
cgit v1.2.3