add changes

theopensystemslab · Nov 19, 2024 · bb671d4 · bb671d4
1 parent 51ac118
commit bb671d4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Tag.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Tag.tsx
@@ -8,12 +8,12 @@ import { FONT_WEIGHT_SEMI_BOLD } from "theme";
 
 export const TAG_DISPLAY_VALUES: Record<
   NodeTag,
-  { color: keyof Palette["nodeTag"]; displayName: string; isEditable?: Role }
+  { color: keyof Palette["nodeTag"]; displayName: string; isEditable?: Role[] }
 > = {
   placeholder: {
     color: "blocking",
     displayName: "Placeholder",
-    isEditable: "platformAdmin", // if new roles are added, we should update the canEdit() in ComponentTagSelect.tsx
+    isEditable: ["platformAdmin"], // if new roles are added, we should update the canEdit() in ComponentTagSelect.tsx
   },
   toReview: {
     color: "nonBlocking",

diff --git a/editor.planx.uk/src/ui/editor/ComponentTagSelect.tsx b/editor.planx.uk/src/ui/editor/ComponentTagSelect.tsx
@@ -18,11 +18,10 @@ interface Props {
 }
 
 const canEdit = (role?: Role) => {
+  // depending on the role, a different form of validation will happen
   switch (role) {
     case "platformAdmin":
-      return useStore.getState().user?.isPlatformAdmin;
-    case undefined:
-      return true;
+      return !useStore.getState().user?.isPlatformAdmin;
     default:
       return true;
   }
@@ -35,7 +34,7 @@ const renderOption: AutocompleteProps<
   false,
   "div"
 >["renderOption"] = (props, tag, { selected }) => {
-  if (!canEdit(TAG_DISPLAY_VALUES[tag].isEditable)) return null;
+  if (TAG_DISPLAY_VALUES[tag].isEditable?.some(canEdit)) return null;
   return (
     <ListItem {...props}>
       <CustomCheckbox
@@ -71,9 +70,9 @@ const renderTags: AutocompleteProps<
           ),
         })}
         onDelete={
-          canEdit(TAG_DISPLAY_VALUES[tag].isEditable)
-            ? getTagProps({ index }).onDelete
-            : undefined
+          TAG_DISPLAY_VALUES[tag].isEditable?.some(canEdit)
+            ? undefined
+            : getTagProps({ index }).onDelete
         }
       />
     );