From 0ebdd4f81ded83310abde4796b85d2ec298704c6 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Tue, 19 Jul 2022 11:40:58 +0200
Subject: [PATCH] Use id as fileId in space resource entities

---
 .../bugfix-personal-shares-in-project-space    |  6 ++++++
 .../components/SideBar/Shares/FileLinks.vue    | 18 ------------------
 .../components/SideBar/Shares/SharesPanel.vue  |  6 +++---
 .../web-app-files/src/helpers/resources.ts     |  2 +-
 .../services/folder/spaces/loaderProject.ts    |  3 ++-
 5 files changed, 12 insertions(+), 23 deletions(-)
 create mode 100644 changelog/unreleased/bugfix-personal-shares-in-project-space

diff --git a/changelog/unreleased/bugfix-personal-shares-in-project-space b/changelog/unreleased/bugfix-personal-shares-in-project-space
new file mode 100644
index 00000000000..267e1f7ab85
--- /dev/null
+++ b/changelog/unreleased/bugfix-personal-shares-in-project-space
@@ -0,0 +1,6 @@
+Bugfix: Personal shares leaked into project space
+
+Due to a bug in how we handle spaces as resources internally we loaded personal shares when listing project space shares.
+
+https://github.com/owncloud/web/issues/7268
+https://github.com/owncloud/web/pull/7294
diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
index d0518f8932c..408ad587e76 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
@@ -106,7 +106,6 @@
   </div>
 </template>
 <script lang="ts">
-import { dirname } from 'path'
 import { defineComponent } from '@vue/composition-api'
 import { DateTime } from 'luxon'
 import { mapGetters, mapActions, mapState } from 'vuex'
@@ -375,23 +374,6 @@ export default defineComponent({
       this.indirectLinkListCollapsed = !this.indirectLinkListCollapsed
     },
 
-    reloadLinks() {
-      this.loadCurrentFileOutgoingShares({
-        client: this.$client,
-        graphClient: this.graphClient,
-        path: this.highlightedFile.path,
-        $gettext: this.$gettext,
-        ...(this.currentStorageId && { storageId: this.currentStorageId }),
-        resource: this.highlightedFile
-      })
-      this.loadSharesTree({
-        client: this.$client,
-        path: this.highlightedFile.path === '' ? '/' : dirname(this.highlightedFile.path),
-        $gettext: this.$gettext,
-        ...(this.currentStorageId && { storageId: this.currentStorageId })
-      })
-    },
-
     isPasswordEnforcedFor(link) {
       const currentRole = LinkShareRoles.getByBitmask(
         parseInt(link.permissions),
diff --git a/packages/web-app-files/src/components/SideBar/Shares/SharesPanel.vue b/packages/web-app-files/src/components/SideBar/Shares/SharesPanel.vue
index ebe32d8d8c0..317538c7b9c 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/SharesPanel.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/SharesPanel.vue
@@ -35,6 +35,9 @@ export default defineComponent({
       ...useGraphClient()
     }
   },
+  computed: {
+    ...mapGetters('Files', ['highlightedFile'])
+  },
   watch: {
     highlightedFile: {
       handler: function (newItem, oldItem) {
@@ -45,9 +48,6 @@ export default defineComponent({
       immediate: true
     }
   },
-  computed: {
-    ...mapGetters('Files', ['highlightedFile'])
-  },
   methods: {
     ...mapActions('Files', [
       'loadCurrentFileOutgoingShares',
diff --git a/packages/web-app-files/src/helpers/resources.ts b/packages/web-app-files/src/helpers/resources.ts
index b24c643db97..bc7b21917c7 100644
--- a/packages/web-app-files/src/helpers/resources.ts
+++ b/packages/web-app-files/src/helpers/resources.ts
@@ -146,7 +146,7 @@ export function buildSpace(space) {
   }
   return {
     id: space.id,
-    fileId: '',
+    fileId: space.id,
     storageId: space.id,
     mimeType: '',
     name: space.name,
diff --git a/packages/web-app-files/src/services/folder/spaces/loaderProject.ts b/packages/web-app-files/src/services/folder/spaces/loaderProject.ts
index e7326038aae..087c08b0e60 100644
--- a/packages/web-app-files/src/services/folder/spaces/loaderProject.ts
+++ b/packages/web-app-files/src/services/folder/spaces/loaderProject.ts
@@ -71,7 +71,8 @@ export class FolderLoaderSpacesProject implements FolderLoader {
       const hasShareJail = useCapabilityShareJailEnabled(store)
       yield store.dispatch('Files/loadSharesTree', {
         client: clientService.owncloudSdk,
-        path: currentFolder.path
+        path: currentFolder.path,
+        storageId: space.fileId
       })
 
       for (const file of resources) {