Make archive buttons only accessible by admins (#187)

* Make archiving only available to admins
ScottyLabs · Nov 19, 2022 · 928945d · 928945d
1 parent e3511cd
commit 928945d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/client/src/components/EditItem.tsx b/client/src/components/EditItem.tsx
@@ -275,6 +275,10 @@ function EditItem(props: {
     );
   };
 
+  const isAdmin = props.user?.permissions.some((value) =>
+    value.includes(PermissionType.ADMIN)
+  );
+
   return (
     <Grid columns={1}>
       <Grid.Column>
@@ -426,28 +430,25 @@ function EditItem(props: {
                   <DeleteButton
                     id={props.id}
                     fetchItems={props.fetchItems}
-                    disabled={
-                      props.item.approved &&
-                      !props.user.permissions.some((value) =>
-                        value.includes(PermissionType.ADMIN)
-                      )
-                    }
+                    disabled={props.item.approved && !isAdmin}
                   />
                   <div
                     style={{
                       width: "10px",
                     }}
                   />
-                  <ArchiveButton
-                    id={props.id}
-                    fetchItems={props.fetchItems}
-                    disabled={
-                      props.item.approved &&
-                      !props.user.permissions.some((value) =>
-                        value.includes(PermissionType.ADMIN)
-                      )
-                    }
-                  />
+                  {isAdmin ? (
+                    <ArchiveButton
+                      id={props.id}
+                      fetchItems={props.fetchItems}
+                      disabled={
+                        props.item.approved &&
+                        !props.user.permissions.some((value) =>
+                          value.includes(PermissionType.ADMIN)
+                        )
+                      }
+                    />
+                  ) : null}
                 </div>
                 <div
                   style={{

diff --git a/client/src/components/TableWidget.tsx b/client/src/components/TableWidget.tsx
@@ -73,6 +73,10 @@ const TableWidget = (props: {
       `${BuildingType.ALL}:${PermissionType.ADMIN}`
     ) ?? false;
 
+  const isAdmin = props.user?.permissions.some((value) =>
+    value.includes(PermissionType.ADMIN)
+  );
+
   return (
     <div>
       <div className="table-buttons">
@@ -81,7 +85,7 @@ const TableWidget = (props: {
             fetchItems={props.fetchItems}
             items={props.fixedItems}
           />
-          {!props.isArchivedItems ? (
+          {!props.isArchivedItems && isAdmin ? (
             <BulkArchiveButton
               fetchItems={props.fetchItems}
             ></BulkArchiveButton>