17119: implement review feedback.

[arvados.git] / src / store / context-menu / context-menu-actions.ts

diff --git a/src/store/context-menu/context-menu-actions.ts b/src/store/context-menu/context-menu-actions.ts
index 9a5b30997e2a84355ff854a8943c5a4da0493a03..f8049a5c532b84ba9f092a0c7a7e0549257c153c 100644 (file)
--- a/src/store/context-menu/context-menu-actions.ts
+++ b/src/store/context-menu/context-menu-actions.ts
@@ -205,9 +205,6 @@ export const openProcessContextMenu = (event: React.MouseEvent<HTMLElement>, pro
     };
 
 export const isProjectRoute = (router: RouterState) => {
-    if (router === undefined) {
-      return false;
-    }
     const pathname = router.location ? router.location.pathname : '';
     const matchProject = matchProjectRoute(pathname);
     return Boolean(matchProject);
@@ -223,24 +220,20 @@ export const resourceUuidToContextMenuKind = (uuid: string) =>
         let inFilterGroup = false;
         const { router } = getState();
         if (isProjectRoute(router)) {
-          const projectUuid = getProjectPanelCurrentUuid(getState());
-          if (projectUuid !== undefined) {
-            const project = getResource<GroupResource>(projectUuid)(getState().resources);
-            if (project) {
-              if (project.groupClass === GroupClass.FILTER) {
-                inFilterGroup = true;
-              }
+            const projectUuid = getProjectPanelCurrentUuid(getState());
+            if (projectUuid !== undefined) {
+                const project = getResource<GroupResource>(projectUuid)(getState().resources);
+                if (project && project.groupClass === GroupClass.FILTER) {
+                    inFilterGroup = true;
+                }
             }
-          }
         }
 
         const isEditable = (isAdminUser || (resource || {} as EditableResource).isEditable) && !inFilterGroup;
         switch (kind) {
             case ResourceKind.PROJECT:
                 return (isAdminUser && !inFilterGroup)
-                    ? (resource && resource.groupClass === GroupClass.PROJECT)
-                        ? ContextMenuKind.PROJECT_ADMIN
-                        : ContextMenuKind.READONLY_PROJECT
+                    ? ContextMenuKind.PROJECT_ADMIN
                     : isEditable
                         ? ContextMenuKind.PROJECT
                         : ContextMenuKind.READONLY_PROJECT;