Merge pull request #47102 from nextcloud/fix/files-multiple-propfind

nextcloud · Aug 7, 2024 · 9b511d1 · 9b511d1
2 parents 07d302d + b96800e
commit 9b511d1
Show file tree

Hide file tree

Showing 25 changed files with 34 additions and 36 deletions.
diff --git a/apps/files/src/store/userconfig.ts b/apps/files/src/store/userconfig.ts
@@ -43,7 +43,6 @@ export const useUserConfigStore = function(...args) {
 				await axios.put(generateUrl('/apps/files/api/v1/config/' + key), {
 					value,
 				})
-
 				emit('files:config:updated', { key, value })
 			},
 		},

diff --git a/apps/files/src/views/FilesList.vue b/apps/files/src/views/FilesList.vue
@@ -230,8 +230,6 @@ export default defineComponent({
 			promise: null as CancelablePromise<ContentsWithRoot> | Promise<ContentsWithRoot> | null,
 
 			dirContentsFiltered: [] as INode[],
-
-			unsubscribeStoreCallback: () => {},
 		}
 	},
 
@@ -466,12 +464,13 @@ export default defineComponent({
 		subscribe('files:node:updated', this.onUpdatedNode)
 
 		// reload on settings change
-		this.unsubscribeStoreCallback = this.userConfigStore.$subscribe(() => this.fetchContent(), { deep: true })
+		subscribe('files:config:updated', this.fetchContent)
 	},
 
 	unmounted() {
 		unsubscribe('files:node:deleted', this.onNodeDeleted)
 		unsubscribe('files:node:updated', this.onUpdatedNode)
+		unsubscribe('files:config:updated', this.fetchContent)
 	},
 
 	methods: {

diff --git a/apps/files_sharing/src/views/SharingTab.vue b/apps/files_sharing/src/views/SharingTab.vue
@@ -207,7 +207,7 @@ export default {
 				this.processSharedWithMe(sharedWithMe)
 				this.processShares(shares)
 			} catch (error) {
-				if (error.response.data?.ocs?.meta?.message) {
+				if (error?.response?.data?.ocs?.meta?.message) {
 					this.error = error.response.data.ocs.meta.message
 				} else {
 					this.error = t('files_sharing', 'Unable to load the shares list')

diff --git a/dist/5963-5963.js → dist/1019-1019.js b/dist/5963-5963.js → dist/1019-1019.js
diff --git a/dist/5963-5963.js.license → dist/1019-1019.js.license b/dist/5963-5963.js.license → dist/1019-1019.js.license
@@ -84,7 +84,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 5.0.1
 	- license: MIT
 - @nextcloud/upload
-	- version: 1.4.2
+	- version: 1.4.3
 	- license: AGPL-3.0-or-later
 - @nextcloud/vue
 	- version: 8.16.0

diff --git a/dist/5963-5963.js.map → dist/1019-1019.js.map b/dist/5963-5963.js.map → dist/1019-1019.js.map
diff --git a/dist/1019-1019.js.map.license b/dist/1019-1019.js.map.license
@@ -0,0 +1 @@
+1019-1019.js.license
diff --git a/dist/3167-3167.js b/dist/3167-3167.js
diff --git a/dist/6880-6880.js.license → dist/3167-3167.js.license b/dist/6880-6880.js.license → dist/3167-3167.js.license
diff --git a/dist/3167-3167.js.map b/dist/3167-3167.js.map
diff --git a/dist/3167-3167.js.map.license b/dist/3167-3167.js.map.license
@@ -0,0 +1 @@
+3167-3167.js.license
diff --git a/dist/5963-5963.js.map.license b/dist/5963-5963.js.map.license
diff --git a/dist/6880-6880.js b/dist/6880-6880.js
diff --git a/dist/6880-6880.js.map b/dist/6880-6880.js.map
diff --git a/dist/6880-6880.js.map.license b/dist/6880-6880.js.map.license
diff --git a/dist/files-init.js b/dist/files-init.js
diff --git a/dist/files-init.js.license b/dist/files-init.js.license
@@ -95,7 +95,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 5.0.1
 	- license: MIT
 - @nextcloud/upload
-	- version: 1.4.2
+	- version: 1.4.3
 	- license: AGPL-3.0-or-later
 - @nextcloud/vue
 	- version: 8.16.0

diff --git a/dist/files-init.js.map b/dist/files-init.js.map
diff --git a/dist/files-main.js b/dist/files-main.js
diff --git a/dist/files-main.js.license b/dist/files-main.js.license
@@ -118,7 +118,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 5.0.1
 	- license: MIT
 - @nextcloud/upload
-	- version: 1.4.2
+	- version: 1.4.3
 	- license: AGPL-3.0-or-later
 - @nextcloud/vue
 	- version: 8.16.0

diff --git a/dist/files-main.js.map b/dist/files-main.js.map
diff --git a/dist/files_sharing-files_sharing_tab.js b/dist/files_sharing-files_sharing_tab.js
diff --git a/dist/files_sharing-files_sharing_tab.js.map b/dist/files_sharing-files_sharing_tab.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "@nextcloud/paths": "^2.2.1",
     "@nextcloud/router": "^3.0.0",
     "@nextcloud/sharing": "^0.2.3",
-    "@nextcloud/upload": "^1.4.2",
+    "@nextcloud/upload": "^1.4.3",
     "@nextcloud/vue": "^8.16.0",
     "@simplewebauthn/browser": "^10.0.0",
     "@skjnldsv/sanitize-svg": "^1.0.2",