Fix empty indicators column when not available, add click for OcAvatars

owncloud · Mar 17, 2022 · 8af8971 · 8af8971
1 parent 1ff7d51
commit 8af8971
Showing 1 changed file with 31 additions and 17 deletions.
diff --git a/packages/web-app-files/src/components/FilesList/ResourceTable.vue b/packages/web-app-files/src/components/FilesList/ResourceTable.vue
@@ -61,14 +61,16 @@
       <slot name="status" :resource="item" />
     </template>
     <template #sharedWith="{ item }">
-      <oc-avatars
-        class="resource-table-people"
-        :items="item.sharedWith"
-        :stacked="true"
-        :max-displayed="3"
-        :is-tooltip-displayed="true"
-        :accessible-description="getSharedWithAvatarDescription(item)"
-      />
+      <oc-button appearance="raw" @click="openSharingSidebar">
+        <oc-avatars
+          class="resource-table-people"
+          :items="item.sharedWith"
+          :stacked="true"
+          :max-displayed="3"
+          :is-tooltip-displayed="true"
+          :accessible-description="getSharedWithAvatarDescription(item)"
+        />
+      </oc-button>
     </template>
     <template #size="{ item }">
       <oc-resource-size :size="item.size || Number.NaN" />
@@ -80,7 +82,7 @@
         v-text="formatDateRelative(item.mdate)"
       />
     </template>
-    <template #shareTypes="{ item }">
+    <template #indicators="{ item }" >
       <oc-status-indicators
         v-if="item.indicators.length"
         :resource="item"
@@ -102,12 +104,14 @@
       />
     </template>
     <template #owner="{ item }">
-      <oc-avatars
-        class="resource-table-people"
-        :items="item.owner"
-        :is-tooltip-displayed="true"
-        :accessible-description="getOwnerAvatarDescription(item)"
-      />
+      <oc-button appearance="raw" @click="openSharingSidebar">
+        <oc-avatars
+          class="resource-table-people"
+          :items="item.owner"
+          :is-tooltip-displayed="true"
+          :accessible-description="getOwnerAvatarDescription(item)"
+        />
+      </oc-button>
     </template>
     <template #actions="{ item }">
       <div class="resource-table-actions">
@@ -150,7 +154,7 @@
 <script>
 import { DateTime } from 'luxon'
 import maxSize from 'popper-max-size-modifier'
-import { mapGetters } from 'vuex'
+import { mapGetters, mapActions } from 'vuex'
 import { EVENT_TROW_MOUNTED, EVENT_FILE_DROPPED } from '../../constants'
 import { SortDir } from '../../composables'
 import * as path from 'path'
@@ -359,7 +363,7 @@ export default {
             wrap: 'truncate'
           },
           {
-            name: 'shareTypes',
+            name: 'indicators',
             title: this.$gettext('Shares'),
             type: 'slot',
             alignH: 'right',
@@ -422,6 +426,12 @@ export default {
           }
         ]
           .filter((field) => Object.prototype.hasOwnProperty.call(firstResource, field.name))
+          .filter((field) => {
+            if(field.name !== 'indicators') {
+              return true
+            }
+            return firstResource.indicators.length > 0
+          })
           .map((field) => {
             const sortField = sortFields.find((f) => f.name === field.name)
             if (sortField) {
@@ -472,6 +482,10 @@ export default {
     }
   },
   methods: {
+    ...mapActions('Files/sidebar', ['openWithPanel']),
+    openSharingSidebar() {
+      this.openWithPanel('sharing-item')
+    },
     folderLink(file) {
       return this.createFolderLink(file.path, file.storageId)
     },