Merge pull request #8404 from owncloud/spaces-view-multi-selection

Fix multi-select in spaces view
owncloud · Feb 9, 2023 · 4bafe0d · 4bafe0d
2 parents 58531e1 + af6f95f
commit 4bafe0d
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 15 deletions.
diff --git a/changelog/unreleased/enhancement-resources-tiles-view b/changelog/unreleased/enhancement-resources-tiles-view
@@ -7,6 +7,7 @@ Tiles can be dynamically resized on screens bigger than mobile, using the "displ
 https://github.com/owncloud/web/pull/7991
 https://github.com/owncloud/web/pull/8372
 https://github.com/owncloud/web/pull/8392
+https://github.com/owncloud/web/pull/8404
 https://github.com/owncloud/web/issues/6378
 https://github.com/owncloud/web/issues/6379
 https://github.com/owncloud/web/issues/6380

diff --git a/packages/web-app-files/src/components/AppBar/CreateSpace.vue b/packages/web-app-files/src/components/AppBar/CreateSpace.vue
@@ -31,14 +31,7 @@ export default defineComponent({
   methods: {
     ...mapActions(['showMessage', 'createModal', 'hideModal', 'setModalInputErrorMessage']),
     ...mapMutations('runtime/spaces', ['UPSERT_SPACE']),
-    ...mapMutations('Files', [
-      'SET_CURRENT_FOLDER',
-      'LOAD_FILES',
-      'CLEAR_CURRENT_FILES_LIST',
-      'SET_FILE_SELECTION',
-      'UPSERT_RESOURCE',
-      'UPDATE_RESOURCE_FIELD'
-    ]),
+    ...mapMutations('Files', ['UPSERT_RESOURCE', 'UPDATE_RESOURCE_FIELD']),
 
     showCreateSpaceModal() {
       const modal = {

diff --git a/packages/web-app-files/src/components/SideBar/SideBar.vue b/packages/web-app-files/src/components/SideBar/SideBar.vue
@@ -188,6 +188,7 @@ export default defineComponent({
           const panel = panelGenerator({
             capabilities: store.getters.capabilities,
             resource: unref(loadedResource),
+            selectedFiles: unref(selectedFiles),
             router,
             multipleSelection: unref(areMultipleSelected),
             rootFolder: unref(isRootFolder),
@@ -206,7 +207,7 @@ export default defineComponent({
     })
 
     const getSelectedResource = () => {
-      if (unref(highlightedFileIsSpace) && unref(selectedFiles).length) {
+      if (unref(highlightedFileIsSpace) && unref(selectedFiles).length === 1) {
         return unref(highlightedSpace)
       }
       if (unref(selectedFiles).length === 1) {

diff --git a/packages/web-app-files/src/fileSideBars.ts b/packages/web-app-files/src/fileSideBars.ts
@@ -20,6 +20,7 @@ import { Panel } from '../../web-pkg/src/components/sideBar'
 
 import { Resource, User } from 'web-client'
 import { Router } from 'vue-router'
+import SpaceDetailsMultiple from 'web-pkg/src/components/sideBar/Spaces/Details/SpaceDetailsMultiple.vue'
 
 function $gettext(msg: string): string {
   return msg
@@ -28,13 +29,15 @@ function $gettext(msg: string): string {
 const panelGenerators: (({
   rootFolder,
   resource,
+  selectedFiles,
   router,
   multipleSelection,
   user,
   capabilities
 }: {
   rootFolder: boolean
   resource: Resource
+  selectedFiles: Resource[]
   router: Router
   multipleSelection: boolean
   user: User
@@ -56,16 +59,15 @@ const panelGenerators: (({
       )
     }
   }),
-  ({ router, rootFolder, resource }): Panel => ({
+  ({ router, resource, multipleSelection }): Panel => ({
     app: 'no-selection',
     icon: 'questionnaire-line',
     title: $gettext('Details'),
     component: SpaceNoSelection,
     default: () => true,
     get enabled() {
       return (
-        isLocationSpacesActive(router, 'files-spaces-projects') &&
-        (!resource || (rootFolder && resource?.type !== 'space'))
+        isLocationSpacesActive(router, 'files-spaces-projects') && !multipleSelection && !resource
       )
     }
   }),
@@ -85,7 +87,7 @@ const panelGenerators: (({
       )
     }
   }),
-  ({ multipleSelection, rootFolder, resource, router }) => ({
+  ({ multipleSelection, router }) => ({
     app: 'details-multiple',
     icon: 'questionnaire-line',
     title: $gettext('Details'),
@@ -101,7 +103,20 @@ const panelGenerators: (({
     },
     default: () => true,
     get enabled() {
-      return multipleSelection && (!rootFolder || resource?.type === 'space')
+      return multipleSelection && !isLocationSpacesActive(router, 'files-spaces-projects')
+    }
+  }),
+  ({ multipleSelection, selectedFiles, router }) => ({
+    app: 'details-space-multiple',
+    icon: 'questionnaire-line',
+    title: $gettext('Details'),
+    component: SpaceDetailsMultiple,
+    componentAttrs: {
+      selectedSpaces: selectedFiles
+    },
+    default: () => true,
+    get enabled() {
+      return multipleSelection && isLocationSpacesActive(router, 'files-spaces-projects')
     }
   }),
   ({ multipleSelection, resource }) => ({

diff --git a/packages/web-app-files/src/mixins/actions/copy.ts b/packages/web-app-files/src/mixins/actions/copy.ts
@@ -33,6 +33,9 @@ export default {
             ) {
               return false
             }
+            if (isLocationSpacesActive(this.$router, 'files-spaces-projects')) {
+              return false
+            }
             if (resources.length === 0) {
               return false
             }

diff --git a/packages/web-app-files/src/mixins/actions/downloadArchive.ts b/packages/web-app-files/src/mixins/actions/downloadArchive.ts
@@ -35,6 +35,9 @@ export default {
             ) {
               return false
             }
+            if (isLocationSpacesActive(this.$router, 'files-spaces-projects')) {
+              return false
+            }
             if (resources.length === 0) {
               return false
             }

diff --git a/packages/web-app-files/src/views/spaces/Projects.vue b/packages/web-app-files/src/views/spaces/Projects.vue
@@ -6,6 +6,7 @@
         :has-view-options="false"
         :has-sidebar-toggle="true"
         :show-actions-on-selection="true"
+        :has-bulk-actions="true"
         :side-bar-open="sideBarOpen"
       >
         <template #actions>

diff --git a/packages/web-app-files/tests/unit/views/spaces/__snapshots__/Projects.spec.ts.snap b/packages/web-app-files/tests/unit/views/spaces/__snapshots__/Projects.spec.ts.snap
@@ -4,7 +4,7 @@ exports[`Projects view different files view states lists all available project s
 <div class="oc-flex">
   <div class="files-view-wrapper oc-width-expand">
     <div id="files-view">
-      <app-bar-stub breadcrumbs="[object Object]" breadcrumbscontextactionsitems="" displayviewmodeswitch="false" hasbulkactions="false" hassharesnavigation="false" hassidebartoggle="true" hasviewoptions="false" showactionsonselection="true" sidebaropen="false"></app-bar-stub>
+      <app-bar-stub breadcrumbs="[object Object]" breadcrumbscontextactionsitems="" displayviewmodeswitch="false" hasbulkactions="true" hassharesnavigation="false" hassidebartoggle="true" hasviewoptions="false" showactionsonselection="true" sidebaropen="false"></app-bar-stub>
       <div class="spaces-list oc-px-m oc-mt-l">
         <div>
           <ul class="oc-list oc-my-rm oc-mx-rm oc-tiles oc-flex">