diff --git a/.gitignore b/.gitignore
index 8ce13a8ff12..b22df6a9ad0 100644
--- 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
index 4f0af787f43..c3c7c9e3288 100644
--- 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 @@
-
+
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
index 7506dc08c1e..117d754ee40 100644
--- 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
}
]
}