Merge pull request #6543 from owncloud/spaces-add-sharepanel-watcher

Add a watcher for the share panel of a space
owncloud · Mar 7, 2022 · ae37883 · ae37883
2 parents 19a9d57 + 8f961e0
commit ae37883
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/changelog/unreleased/enhancement-add-space-share-panel-watcher b/changelog/unreleased/enhancement-add-space-share-panel-watcher
@@ -0,0 +1,5 @@
+Enhancement: Add a watcher for the share panel of a space
+
+We've added a watcher for the share panel of a space to ensure seamless navigation via the share indicator.
+
+https://github.com/owncloud/web/pull/6543
diff --git a/packages/web-app-files/src/components/SideBar/Shares/SpaceShares.vue b/packages/web-app-files/src/components/SideBar/Shares/SpaceShares.vue
@@ -87,8 +87,15 @@ export default {
       return currentUserCollaborator?.role?.name === spaceRoleManager.name
     }
   },
-  mounted() {
-    this.loadSharesTask.perform(this)
+  watch: {
+    highlightedFile: {
+      handler: function (newItem, oldItem) {
+        if (oldItem !== newItem) {
+          this.loadSharesTask.perform(this)
+        }
+      },
+      immediate: true
+    }
   },
   methods: {
     ...mapActions('Files', ['loadCurrentFileOutgoingShares', 'deleteShare']),

diff --git a/packages/web-app-files/src/views/spaces/Project.vue b/packages/web-app-files/src/views/spaces/Project.vue
@@ -447,8 +447,7 @@ export default {
   methods: {
     ...mapActions('Files', ['loadIndicators', 'loadPreview', 'loadCurrentFileOutgoingShares']),
     ...mapActions('Files/sidebar', {
-      openSidebarWithPanel: 'openWithPanel',
-      closeSidebar: 'close'
+      openSidebarWithPanel: 'openWithPanel'
     }),
     ...mapMutations('Files', [
       'SET_CURRENT_FOLDER',
@@ -521,8 +520,7 @@ export default {
     closeQuotaModal() {
       this.$_editQuota_closeModal()
     },
-    async openSidebarSharePanel() {
-      await this.closeSidebar()
+    openSidebarSharePanel() {
       this.SET_FILE_SELECTION([this.space])
       this.openSidebarWithPanel('space-share-item')
     },

diff --git a/packages/web-app-files/src/views/spaces/Projects.vue b/packages/web-app-files/src/views/spaces/Projects.vue
@@ -260,8 +260,7 @@ export default {
   methods: {
     ...mapActions(['createModal', 'hideModal', 'setModalInputErrorMessage']),
     ...mapActions('Files/sidebar', {
-      openSidebarWithPanel: 'openWithPanel',
-      closeSidebar: 'close'
+      openSidebarWithPanel: 'openWithPanel'
     }),
     ...mapMutations('Files', [
       'SET_CURRENT_FOLDER',
@@ -379,8 +378,7 @@ export default {
       }
       return ''
     },
-    async openSidebarSharePanel(space) {
-      await this.closeSidebar()
+    openSidebarSharePanel(space) {
       this.SET_FILE_SELECTION([space])
       this.openSidebarWithPanel('space-share-item')
     }