allow guests to download documents (#425)

bimdata · Oct 31, 2023 · 2cc4b78 · 2cc4b78
1 parent 9d8f1fa
commit 2cc4b78
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 20 deletions.
diff --git a/src/components/specific/files/files-manager/files-action-bar/FilesActionBar.vue b/src/components/specific/files/files-manager/files-action-bar/FilesActionBar.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="files-action-bar">
     <BIMDataButton
-      :disabled="!project.isAdmin && files.some(f => f.user_permission < 100)"
+      :disabled="project.isGuest || !project.isAdmin && files.some(f => f.user_permission < 100)"
       width="120px"
       color="high"
       ghost
@@ -12,7 +12,7 @@
       <span>{{ $t("t.delete") }}</span>
     </BIMDataButton>
     <BIMDataButton
-      :disabled="!project.isAdmin && files.some(f => f.user_permission < 100)"
+      :disabled="project.isGuest || !project.isAdmin && files.some(f => f.user_permission < 100)"
       width="120px"
       color="secondary"
       ghost

diff --git a/src/components/specific/files/files-table/FilesTable.vue b/src/components/specific/files/files-table/FilesTable.vue
@@ -8,7 +8,7 @@
     :rows="files"
     rowKey="id"
     :rowHeight="54"
-    :selectable="!project.isGuest"
+    :selectable="true"
     @selection-changed="$emit('selection-changed', $event)"
     :canDragOverRow="isFolder"
     @row-drop="onRowDrop"
@@ -86,7 +86,7 @@
     <template #cell-size="{ row: file }">
       {{ !isFolder(file) && file.size ? formatBytes(file.size) : "-" }}
     </template>
-    <template v-if="!project.isGuest" #cell-actions="{ row: file }">
+    <template #cell-actions="{ row: file }">
       <FileActionsCell
         :filesTable="filesTable"
         :project="project"

diff --git a/src/components/specific/files/files-table/file-actions-cell/FileActionsCell.vue b/src/components/specific/files/files-table/file-actions-cell/FileActionsCell.vue
@@ -159,6 +159,7 @@ export default {
             key: 3,
             text: "FileActionsCell.createModelButtonText",
             component: SetAsModelIcon,
+            disabled: props.project.isGuest || !props.project.isAdmin && props.file.user_permission < FILE_PERMISSION.READ_WRITE,
             action: () => onClick("create-model")
           });
         } else {
@@ -170,14 +171,13 @@ export default {
           });
         }
       }
-
       menuItems.value.push({
         key: 5,
         text: "t.rename",
         action: () => onClick("update"),
         icon: "edit",
         disabled:
-          !props.project.isAdmin &&
+          props.project.isGuest || !props.project.isAdmin &&
           props.file.user_permission < FILE_PERMISSION.READ_WRITE
       });
 
@@ -186,9 +186,6 @@ export default {
         text: "t.download",
         action: () => onClick("download"),
         icon: "download",
-        disabled:
-          !props.project.isAdmin &&
-          props.file.user_permission < FILE_PERMISSION.READ_WRITE
       });
 
       if (isFolder(props.file) && props.project.isAdmin) {
@@ -235,7 +232,7 @@ export default {
         dataTestId: "btn-delete-doc",
         icon: "delete",
         disabled:
-          !props.project.isAdmin &&
+          props.project.isGuest || !props.project.isAdmin &&
           props.file.user_permission < FILE_PERMISSION.READ_WRITE
       });
 

diff --git a/src/components/specific/models/models-manager/models-action-bar/ModelsActionBar.vue b/src/components/specific/models/models-manager/models-action-bar/ModelsActionBar.vue
@@ -2,7 +2,7 @@
   <div class="models-action-bar">
     <BIMDataButton
       :disabled="
-        !project.isAdmin && models.some(m => m.document?.user_permission < 100)
+        project.isGuest || !project.isAdmin && models.some(m => m.document?.user_permission < 100)
       "
       width="120px"
       color="high"
@@ -16,7 +16,7 @@
 
     <BIMDataButton
       :disabled="
-        !project.isAdmin && models.some(m => m.document?.user_permission < 100)
+        project.isGuest || !project.isAdmin && models.some(m => m.document?.user_permission < 100)
       "
       width="120px"
       ghost
@@ -36,11 +36,6 @@
     </BIMDataButton>
 
     <BIMDataButton
-      :disabled="
-        (!project.isAdmin &&
-          models.some(m => m.document.user_permission < 100)) ||
-        models.every(m => !m.document)
-      "
       width="120px"
       ghost
       squared

diff --git a/src/components/specific/models/models-table/ModelsTable.vue b/src/components/specific/models/models-table/ModelsTable.vue
@@ -8,7 +8,7 @@
     rowKey="id"
     :paginated="true"
     :perPage="7"
-    :selectable="!project.isGuest"
+    :selectable="true"
     @selection-changed="$emit('selection-changed', $event)"
   >
     <template #sub-header>

diff --git a/src/components/specific/models/models-table/model-actions-cell/ModelActionsCell.vue b/src/components/specific/models/models-table/model-actions-cell/ModelActionsCell.vue
@@ -58,7 +58,7 @@
       />
     </template>
 
-    <template v-if="model.document && !project.isGuest">
+    <template v-if="model.document">
       <BIMDataButton
         class="model-actions-cell__btn"
         data-test-id="btn-download-model"

diff --git a/src/utils/file-structure.js b/src/utils/file-structure.js
@@ -286,7 +286,7 @@ function isFolder(file) {
 }
 
 function hasAdminPerm(project, file) {
-  return project.isAdmin || file.user_permission === 100;
+  return !project.isGuest && (project.isAdmin || file.user_permission === 100);
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -286,7 +286,7 @@ function isFolder(file) { @@
     }
     function hasAdminPerm(project, file) {
-      return project.isAdmin || file.user_permission === 100;
+      return !project.isGuest && (project.isAdmin || file.user_permission === 100);
     }
@@ Expand Down @@