WIP

owncloud · Aug 31, 2021 · 29ed1da · 29ed1da
1 parent cbd54fe
commit 29ed1da
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -50,3 +50,4 @@ comments.file
 # Report for tests
 tests/report/cucumber_report.json
 tests/report/cucumber_report.html
+.vscode/settings.json
diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
@@ -64,7 +64,13 @@
       </template>
     </div>
     <div>
-      <oc-avatar-group :users="collaborators_avatar" accessible-description="This resource is shared with many users." :stacked="true" :isTooltipDisplayed="true" class="oc-mb" />
+      <oc-avatars
+        :items="collaborators_avatar"
+        accessible-description="This resource is shared with many users."
+        :stacked="true"
+        :is-tooltip-displayed="true"
+        class="oc-mb"
+      />
     </div>
     <new-collaborator
       v-if="$_ocCollaborators_canShare && currentView === VIEW_NEW"
@@ -181,7 +187,8 @@ export default {
     },
     collaborators_avatar() {
       const result = []
-      this.collaborators.forEach(c => result.push(c.collaborator))
+      console.log(this.collaborators)
+      this.collaborators.forEach(c => result.push({ ...c.collaborator, shareType: c.shareType }))
       return result
     },
 

diff --git a/packages/web-app-files/src/helpers/resources.js b/packages/web-app-files/src/helpers/resources.js
@@ -122,12 +122,14 @@ export function aggregateResourceShares(
         prev.sharedWith.push({
           username: share.share_with,
           displayName: share.share_with_displayname,
-          avatar: undefined
+          avatar: undefined,
+          shareType: share.share_type
         })
       } else if (share.share_type === shareTypes.link) {
         prev.sharedWith.push({
           name: share.name || share.token,
-          link: true
+          link: true,
+          shareType: share.share_type
         })
       }
 
@@ -139,14 +141,16 @@ export function aggregateResourceShares(
         {
           username: share.share_with,
           displayName: share.share_with_displayname,
-          avatar: undefined
+          avatar: undefined,
+          shareType: share.share_type
         }
       ]
     } else if (share.share_type === shareTypes.link) {
       share.sharedWith = [
         {
           name: share.name || share.token,
-          link: true
+          link: true,
+          shareType: share.share_type
         }
       ]
     }