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 696a136280c1a72fef39a8a204e5fd9557439508..bf82fac12d13d7b608319f9e611c968ba97127fa 100644 (file)
--- a/src/store/resources/resources.ts
+++ b/src/store/resources/resources.ts
@@ -2,41 +2,24 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { Resource, EditableResource } from "~/models/resource";
-import { ResourceKind } from '~/models/resource';
-import { ProjectResource } from "~/models/project";
-import { GroupResource } from "~/models/group";
+import { Resource, EditableResource } from "models/resource";
+import { ResourceKind } from 'models/resource';
+import { GroupResource } from "models/group";
 
 export type ResourcesState = { [key: string]: Resource };
 
-const getResourceWritableBy = (state: ResourcesState, id: string, userUuid: string): string[] => {
-    if (!id) {
-        return [];
-    }
-
-    if (id === userUuid) {
-        return [userUuid];
-    }
-
-    const resource = (state[id] as ProjectResource);
-
-    if (!resource) {
-        return [];
-    }
-
-    const { writableBy } = resource;
-
-    return writableBy || getResourceWritableBy(state, resource.ownerUuid, userUuid);
-};
-
-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 = userUuid ? getResourceWritableBy(state, id, userUuid).indexOf(userUuid) > -1 : false;
+            if (resource.canWrite === undefined) {
+                resource.isEditable = (state[resource.ownerUuid] as GroupResource)?.canWrite;
+            } else {
+                resource.isEditable = resource.canWrite;
+            }
         }
 
         return resource;