Merge branch '21128-toolbar-context-menu'

[arvados-workbench2.git] / src / store / resources / resources.ts

diff --git a/src/store/resources/resources.ts b/src/store/resources/resources.ts
index 3f71140497f7c5df566ef096fb75afc23afcbe0f..bf82fac12d13d7b608319f9e611c968ba97127fa 100644 (file)
--- a/src/store/resources/resources.ts
+++ b/src/store/resources/resources.ts
@@ -4,23 +4,21 @@
 
 import { Resource, EditableResource } from "models/resource";
 import { ResourceKind } from 'models/resource';
-import { ProjectResource } from "models/project";
 import { GroupResource } from "models/group";
 
 export type ResourcesState = { [key: string]: Resource };
 
-export const getResourceWithEditableStatus = <T extends EditableResource & GroupResource>(id: string, userUuid?: string) =>
+export const getResourceWithEditableStatus = <T extends GroupResource & EditableResource>(id: string, userUuid?: string) =>
     (state: ResourcesState): T | undefined => {
         if (state[id] === undefined) { return; }
 
-        const resource = JSON.parse(JSON.stringify(state[id] as T));
+        const resource = JSON.parse(JSON.stringify(state[id])) as T;
 
         if (resource) {
-            resource.isEditable = resource.canWrite;
-
-            if (!resource.isEditable && state[resource.ownerUuid]) {
-                const resourceOwner = JSON.parse(JSON.stringify(state[resource.ownerUuid] as T));
-                resource.isEditable = resourceOwner.canWrite;
+            if (resource.canWrite === undefined) {
+                resource.isEditable = (state[resource.ownerUuid] as GroupResource)?.canWrite;
+            } else {
+                resource.isEditable = resource.canWrite;
             }
         }