Remove Modules and Navigations from Non Administrators Home Page

pedrozadotdev · Dec 9, 2023 · 7bce955 · 7bce955
1 parent 9800978
commit 7bce955
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/client/packages/openblocks/src/pages/ApplicationV2/HomeLayout.tsx b/client/packages/openblocks/src/pages/ApplicationV2/HomeLayout.tsx
@@ -281,6 +281,10 @@ export function HomeLayout(props: HomeLayoutProps) {
         return HomeResTypeEnum[filterBy].valueOf() === e.applicationType;
       }
     })
+    .filter((e) => {
+      if (user.orgDev) { return true}
+      return e.folder || e.applicationType === 1
+    })
     .map((e) =>
       e.folder
         ? {

diff --git a/client/packages/openblocks/src/pages/ApplicationV2/index.tsx b/client/packages/openblocks/src/pages/ApplicationV2/index.tsx
@@ -98,7 +98,7 @@ const FolderNameWrapper = styled.div<{ selected: boolean }>`
   }
 `;
 
-const FolderName = (props: { id: string; name: string }) => {
+const FolderName = (props: { id: string; name: string, orgDev?: boolean }) => {
   const dispatch = useDispatch();
   const [folderNameEditing, setFolderNameEditing] = useState(false);
 
@@ -116,9 +116,11 @@ const FolderName = (props: { id: string; name: string }) => {
           setFolderNameEditing(false);
         }}
       />
-      <EditPopover items={[{ text: trans("rename"), onClick: () => setFolderNameEditing(true) }]}>
-        <PopoverIcon tabIndex={-1} />
-      </EditPopover>
+      {props.orgDev ? (
+        <EditPopover items={[{ text: trans("rename"), onClick: () => setFolderNameEditing(true) }]}>
+          <PopoverIcon tabIndex={-1} />
+        </EditPopover>
+      ): null}
     </>
   );
 };
@@ -263,7 +265,7 @@ export default function ApplicationHome() {
         onSelected: (_, currentPath) => currentPath === path,
         text: (props: { selected: boolean }) => (
           <FolderNameWrapper selected={props.selected}>
-            <FolderName name={folder.name} id={folder.folderId} />
+            <FolderName name={folder.name} id={folder.folderId} orgDev={user.orgDev} />
           </FolderNameWrapper>
         ),
         routePath: FOLDER_URL,