Fix share panel now showing correct data after updating a share

owncloud · Feb 20, 2023 · b909fe5 · b909fe5
1 parent f01f6c1
commit b909fe5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/changelog/unreleased/enhancement-share-and-folder-loading-performance b/changelog/unreleased/enhancement-share-and-folder-loading-performance
@@ -4,3 +4,4 @@ The performance when loading folders and share indicators has been improved by o
 
 https://github.com/owncloud/web/issues/7721
 https://github.com/owncloud/web/pull/8349
+https://github.com/owncloud/web/pull/8482
diff --git a/packages/web-app-files/src/store/actions.ts b/packages/web-app-files/src/store/actions.ts
@@ -234,15 +234,16 @@ export default {
         permissions,
         expireDate: expirationDate
       })
-
-      commit(
-        'CURRENT_FILE_OUTGOING_SHARES_UPSERT',
-        buildCollaboratorShare(
-          updatedShare.shareInfo,
-          getters.highlightedFile,
-          allowSharePermissions(rootGetters)
-        )
+      const builtShare = buildCollaboratorShare(
+        updatedShare.shareInfo,
+        getters.highlightedFile,
+        allowSharePermissions(rootGetters)
       )
+      commit('CURRENT_FILE_OUTGOING_SHARES_UPSERT', builtShare)
+      commit('SHARESTREE_UPSERT', {
+        path: share.path,
+        share: { ...builtShare, indirect: false, outgoing: true }
+      })
     } catch (error) {
       dispatch(
         'showMessage',
@@ -447,6 +448,10 @@ export default {
         .then((data) => {
           const link = buildShare(data.shareInfo, null, allowSharePermissions(context.rootGetters))
           context.commit('CURRENT_FILE_OUTGOING_SHARES_UPSERT', link)
+          context.commit('SHARESTREE_UPSERT', {
+            path: link.path,
+            share: { ...link, indirect: false, outgoing: true }
+          })
           resolve(link)
         })
         .catch((e) => {

diff --git a/packages/web-app-files/src/store/mutations.ts b/packages/web-app-files/src/store/mutations.ts
@@ -136,6 +136,11 @@ export default {
     if (!state.sharesTree[path]) {
       state.sharesTree[path] = []
     }
+    const existingShare = state.sharesTree[path].find((s) => s.id === share.id)
+    if (existingShare) {
+      Object.assign(existingShare, share)
+      return
+    }
     state.sharesTree[path].push(share)
   },
   SHARESTREE_REMOVE(state, { path, id }) {

diff --git a/packages/web-app-files/tests/unit/store/actions.spec.ts b/packages/web-app-files/tests/unit/store/actions.spec.ts
@@ -31,7 +31,7 @@ describe('vuex store actions', () => {
         expirationDate: null
       })
 
-      expect(stateMock.commit).toHaveBeenCalledTimes(1)
+      expect(stateMock.commit).toHaveBeenCalledTimes(2)
     })
     it('fails on error', async () => {
       const clientMock = mockDeep<OwnCloudSdk>()