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 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'modern/src/EditCollectionView.js')

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>
-- 
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/EditCollectionView.js')

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