Introduce UPSERT_RESOURCE to files mutations

owncloud · May 20, 2021 · b7f522a · b7f522a
1 parent 4bf7899
commit b7f522a
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 21 deletions.
diff --git a/changelog/unreleased/bugfix-upsert-resource-in-filestable b/changelog/unreleased/bugfix-upsert-resource-in-filestable
@@ -0,0 +1,7 @@
+Bugfix: Upsert resource in filestable
+
+When uploading an already existing resource in the filestable, we sometimes displayed both 
+files in the filestable until the page got refreshed. We now check when uploading a file if 
+it exists in the filestable and replace it there if that is the case.
+
+https://github.com/owncloud/web/pull/5130
diff --git a/packages/web-app-files/src/components/AppBar.vue b/packages/web-app-files/src/components/AppBar.vue
@@ -252,7 +252,7 @@ export default {
       'loadIndicators'
     ]),
     ...mapActions(['openFile', 'showMessage', 'createModal', 'setModalInputErrorMessage']),
-    ...mapMutations('Files', ['PUSH_NEW_RESOURCE']),
+    ...mapMutations('Files', ['UPSERT_RESOURCE']),
     ...mapMutations(['SET_QUOTA']),
 
     showCreateResourceModal(isFolder = true, ext = 'txt', openAction = null) {
@@ -313,7 +313,7 @@ export default {
         }
         resource = buildResource(resource)
 
-        this.PUSH_NEW_RESOURCE(resource)
+        this.UPSERT_RESOURCE(resource)
         this.hideModal()
 
         if (this.isPersonalRoute) {
@@ -405,7 +405,7 @@ export default {
 
         resource = buildResource(resource)
 
-        this.PUSH_NEW_RESOURCE(resource)
+        this.UPSERT_RESOURCE(resource)
         this.hideModal()
 
         if (this.isPersonalRoute) {
@@ -481,7 +481,7 @@ export default {
             )
 
         resource = buildResource(resource)
-        this.PUSH_NEW_RESOURCE(resource)
+        this.UPSERT_RESOURCE(resource)
 
         if (this.isPersonalRoute) {
           await this.loadIndicators({

diff --git a/packages/web-app-files/src/store/actions.js b/packages/web-app-files/src/store/actions.js
@@ -561,7 +561,7 @@ export default {
           }
 
           resource.preview = previewUrl
-          commit('UPDATE_RESOURCE', resource)
+          commit('UPSERT_RESOURCE', resource, true)
 
           continue
         } catch (ignored) {}
@@ -570,7 +570,7 @@ export default {
       const previewUrl = davUrl + encodePath(resource.path) + '?' + queryString.stringify(query)
       try {
         resource.preview = await mediaSource(previewUrl, 'url')
-        commit('UPDATE_RESOURCE', resource)
+        commit('UPSERT_RESOURCE', resource, true)
       } catch (ignored) {}
     }
   }

diff --git a/packages/web-app-files/src/store/mutations.js b/packages/web-app-files/src/store/mutations.js
@@ -302,23 +302,19 @@ export default {
     state.files = files
   },
 
-  PUSH_NEW_RESOURCE(state, resource) {
-    const files = [...state.files]
-    files.push(resource)
-    state.files = files
-  },
-
   SELECT_RESOURCES(state, resources) {
     state.selected = resources
   },
 
-  UPDATE_RESOURCE(state, resource) {
+  UPSERT_RESOURCE(state, resource, force) {
     const files = [...state.files]
     const index = files.findIndex(r => r.id === resource.id)
 
-    if (index > -1) {
+    if (index > -1 || force) {
       files.splice(index, 1, resource)
-      state.files = files
+    } else {
+      files.push(resource)
     }
+    state.files = files
   }
 }
diff --git a/packages/web-app-files/src/views/SharedWithMe.vue b/packages/web-app-files/src/views/SharedWithMe.vue
@@ -159,7 +159,7 @@ export default {
       'LOAD_FILES',
       'SELECT_RESOURCES',
       'CLEAR_CURRENT_FILES_LIST',
-      'UPDATE_RESOURCE'
+      'UPSERT_RESOURCE'
     ]),
     ...mapMutations(['SET_QUOTA']),
 
@@ -192,7 +192,7 @@ export default {
         this.configuration.server,
         this.getToken,
         this.$client,
-        this.UPDATE_RESOURCE
+        this.UPSERT_RESOURCE
       )
 
       this.LOAD_FILES({ currentFolder: rootFolder, files: resources })
@@ -263,7 +263,7 @@ export default {
             this.configuration.server,
             this.getToken
           )
-          this.UPDATE_RESOURCE(sharedResource)
+          this.UPSERT_RESOURCE(sharedResource)
         }
       } catch (error) {
         this.showMessage({

diff --git a/packages/web-app-files/src/views/SharedWithOthers.vue b/packages/web-app-files/src/views/SharedWithOthers.vue
@@ -132,7 +132,7 @@ export default {
       'LOAD_FILES',
       'SELECT_RESOURCES',
       'CLEAR_CURRENT_FILES_LIST',
-      'UPDATE_RESOURCE'
+      'UPSERT_RESOURCE'
     ]),
     ...mapMutations(['SET_QUOTA']),
 
@@ -165,7 +165,7 @@ export default {
         this.configuration.server,
         this.getToken,
         this.$client,
-        this.UPDATE_RESOURCE
+        this.UPSERT_RESOURCE
       )
 
       this.LOAD_FILES({ currentFolder: rootFolder, files: resources })

diff --git a/packages/web-app-files/tests/views/SharedWithMe.setup.js b/packages/web-app-files/tests/views/SharedWithMe.setup.js
@@ -47,7 +47,7 @@ export const store = createStore(Vuex.Store, {
         highlightedFile: () => null
       },
       mutations: {
-        UPDATE_RESOURCE: (state, resource) => {
+        UPSERT_RESOURCE: (state, resource) => {
           state.resource = resource
         }
       },