Merge pull request galaxyproject#18924 from npinter/fix-library-manag…

…ement Allow users with 'can_modify_folder' permission to delete items in libraries
dannon · Oct 8, 2024 · 21cab6d · 21cab6d
2 parents aac9e5c + fe27c21
commit 21cab6d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue b/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue
@@ -11,7 +11,6 @@ import {
     BDropdownItem,
     BFormCheckbox,
 } from "bootstrap-vue";
-import { storeToRefs } from "pinia";
 import { computed, reactive, ref } from "vue";
 
 import { GalaxyApi } from "@/api";
@@ -61,7 +60,6 @@ const emit = defineEmits<{
 const { config, isConfigLoaded } = useConfig();
 
 const userStore = useUserStore();
-const { isAdmin } = storeToRefs(userStore);
 
 type ImportSource = "history" | "userdir" | "importdir" | "path" | undefined;
 const modalShow = ref<ImportSource>();
@@ -83,7 +81,7 @@ const containsFileOrFolder = computed(() => {
     return props.folderContents.find((el) => el.type === "folder" || el.type === "file");
 });
 const canDelete = computed(() => {
-    return !!(containsFileOrFolder.value && isAdmin.value);
+    return !!(containsFileOrFolder.value && props.metadata.can_modify_folder);
 });
 const datasetManipulation = computed(() => {
     return !!(containsFileOrFolder.value && userStore.currentUser);

diff --git a/client/src/components/Libraries/LibraryPermissions/LibraryPermissions.vue b/client/src/components/Libraries/LibraryPermissions/LibraryPermissions.vue
@@ -31,6 +31,15 @@
             alert="User with  <strong>any</strong> of these roles can modify this library (name, synopsis, etc.)."
             title="Roles that can modify this library"
             @input="setUserPermissionsPreferences" />
+        <PermissionsInputField
+            v-if="manage_library_role_list"
+            :id="library_id"
+            :permission_type="manage_type"
+            :initial_value="manage_library_role_list"
+            :api-root-url="apiRootUrl"
+            alert="User with <strong>any</strong> of these roles can manage this library."
+            title="Roles that can manage this library"
+            @input="setUserPermissionsPreferences" />
         <button title="Save modifications" class="toolbtn_save_permissions" @click="postPermissions">
             <FontAwesomeIcon :icon="['far', 'save']" />
             Save
@@ -71,10 +80,12 @@ export default {
             library: undefined,
             add_library_item_role_list: undefined,
             modify_library_role_list: undefined,
+            manage_library_role_list: undefined,
             access_library_role_list: undefined,
             apiRootUrl: `${getAppRoot()}api/libraries`,
             add_type: "add_library_item_role_list",
             modify_type: "modify_library_role_list",
+            manage_type: "manage_library_role_list",
             access_type: "access_library_role_list",
         };
     },
@@ -85,6 +96,7 @@ export default {
             console.log("fetched_permissions", fetched_permissions);
             this.add_library_item_role_list = extractRoles(fetched_permissions.add_library_item_role_list);
             this.modify_library_role_list = extractRoles(fetched_permissions.modify_library_role_list);
+            this.manage_library_role_list = extractRoles(fetched_permissions.manage_library_role_list);
             this.access_library_role_list = extractRoles(fetched_permissions.access_library_role_list);
         });
         this.services.getLibrary(this.library_id).then((library) => {
@@ -103,6 +115,7 @@ export default {
                 [
                     { "add_ids[]": this.add_library_item_role_list },
                     { "modify_ids[]": this.modify_library_role_list },
+                    { "manage_ids[]": this.manage_library_role_list },
                     { "access_ids[]": this.access_library_role_list },
                 ],
                 (fetched_permissions) => {