Merge pull request #46030 from nextcloud/fix/44961/shared-state-file-…

…list

fix(FilesView): Update files view upon share creation/delete

apps/files_sharing/src/components/SharingEntryLink.vue

@@ -134,7 +134,7 @@
 						{{ t('files_sharing', 'Customize link') }}
 					</NcActionButton>
 				</template>
-				
+
 				<NcActionButton :close-after-click="true"
 					@click.prevent="showQRCode = true">
 					<template #icon>
@@ -210,11 +210,12 @@
 </template>
 
 <script>
+import { emit } from '@nextcloud/event-bus'
 import { generateUrl } from '@nextcloud/router'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import { Type as ShareTypes } from '@nextcloud/sharing'
 import Vue from 'vue'
-import VueQrcode from '@chenfengyuan/vue-qrcode';
+import VueQrcode from '@chenfengyuan/vue-qrcode'
 
 import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
 import NcActionInput from '@nextcloud/vue/dist/Components/NcActionInput.js'
@@ -686,6 +687,9 @@ export default {
 					})
 				}
 
+				await this.getNode()
+				emit('files:node:updated', this.node)
+
 				// Execute the copy link method
 				// freshly created share component
 				// ! somehow does not works on firefox !

apps/files_sharing/src/mixins/SharesMixin.js

@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { emit } from '@nextcloud/event-bus'
+import { fetchNode } from '../services/WebdavClient.ts'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import { getCurrentUser } from '@nextcloud/auth'
 // eslint-disable-next-line import/no-unresolved, n/no-missing-import
@@ -13,6 +15,7 @@ import Share from '../models/Share.js'
 import SharesRequests from './ShareRequests.js'
 import ShareTypes from './ShareTypes.js'
 import Config from '../services/ConfigService.js'
+import logger from '../services/logger.ts'
 
 import {
 	BUNDLED_PERMISSIONS,
@@ -40,6 +43,7 @@ export default {
 	data() {
 		return {
 			config: new Config(),
+			node: null,
 
 			// errors helpers
 			errors: {},
@@ -62,7 +66,9 @@ export default {
 	},
 
 	computed: {
-
+		path() {
+			return (this.fileInfo.path + '/' + this.fileInfo.name).replace('//', '/')
+		},
 		/**
 		 * Does the current share have a note
 		 *
@@ -149,6 +155,20 @@ export default {
 	},
 
 	methods: {
+		/**
+		 * Fetch webdav node
+		 *
+		 * @return {Node}
+		 */
+		async getNode() {
+			const node = { path: this.path }
+			try {
+				this.node = await fetchNode(node)
+				logger.info('Fetched node:', { node: this.node })
+			} catch (error) {
+				logger.error('Error:', error)
+			}
+		},
 		/**
 		 * Check if a share is valid before
 		 * firing the request
@@ -247,6 +267,8 @@ export default {
 					: t('files_sharing', 'Folder "{path}" has been unshared', { path: this.share.path })
 				showSuccess(message)
 				this.$emit('remove:share', this.share)
+				await this.getNode()
+				emit('files:node:updated', this.node)
 			} catch (error) {
 				// re-open menu if error
 				this.open = true

apps/files_sharing/src/services/WebdavClient.ts

@@ -0,0 +1,18 @@
+/**
+ * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+import { davGetClient, davGetDefaultPropfind, davResultToNode, davRootPath } from '@nextcloud/files'
+import type { FileStat, ResponseDataDetailed } from 'webdav'
+import type { Node } from '@nextcloud/files'
+
+export const client = davGetClient()
+
+export const fetchNode = async (node: Node): Promise<Node> => {
+	const propfindPayload = davGetDefaultPropfind()
+	const result = await client.stat(`${davRootPath}${node.path}`, {
+		details: true,
+		data: propfindPayload,
+	}) as ResponseDataDetailed<FileStat>
+	return davResultToNode(result.data)
+}

apps/files_sharing/src/views/SharingDetailsTab.vue

@@ -245,6 +245,7 @@
 </template>
 
 <script>
+import { emit } from '@nextcloud/event-bus'
 import { getLanguage } from '@nextcloud/l10n'
 import { Type as ShareType } from '@nextcloud/sharing'
 
@@ -276,6 +277,7 @@ import Share from '../models/Share.js'
 import ShareRequests from '../mixins/ShareRequests.js'
 import ShareTypes from '../mixins/ShareTypes.js'
 import SharesMixin from '../mixins/SharesMixin.js'
+import logger from '../services/logger.ts'
 
 import {
 	ATOMIC_PERMISSIONS,
@@ -727,8 +729,8 @@ export default {
 	beforeMount() {
 		this.initializePermissions()
 		this.initializeAttributes()
-		console.debug('shareSentIn', this.share)
-		console.debug('config', this.config)
+		logger.debug('Share object received', { share: this.share })
+		logger.debug('Configuration object received', { config: this.config })
 	},
 
 	mounted() {
@@ -887,7 +889,7 @@ export default {
 				}
 
 				this.creating = true
-				const share = await this.addShare(incomingShare, this.fileInfo)
+				const share = await this.addShare(incomingShare)
 				this.creating = false
 				this.share = share
 				this.$emit('add:share', this.share)
@@ -896,6 +898,9 @@ export default {
 				this.queueUpdate(...permissionsAndAttributes)
 			}
 
+			await this.getNode()
+			emit('files:node:updated', this.node)
+
 			if (this.$refs.externalLinkActions?.length > 0) {
 				await Promise.allSettled(this.$refs.externalLinkActions.map((action) => {
 					if (typeof action.$children.at(0)?.onSave !== 'function') {
@@ -911,12 +916,11 @@ export default {
 		 * Process the new share request
 		 *
 		 * @param {Share} share incoming share object
-		 * @param {object} fileInfo file data
 		 */
-		async addShare(share, fileInfo) {
-			console.debug('Adding a new share from the input for', share)
+		async addShare(share) {
+			logger.debug('Adding a new share from the input for', { share })
+			const path = this.path
 			try {
-				const path = (fileInfo.path + '/' + fileInfo.name).replace('//', '/')
 				const resultingShare = await this.createShare({
 					path,
 					shareType: share.shareType,
@@ -929,13 +933,15 @@ export default {
 				})
 				return resultingShare
 			} catch (error) {
-				console.error('Error while adding new share', error)
+				logger.error('Error while adding new share', { error })
 			} finally {
 				// this.loading = false // No loader here yet
 			}
 		},
 		async removeShare() {
 			await this.onDelete()
+			await this.getNode()
+			emit('files:node:updated', this.node)
 			this.$emit('close-sharing-details')
 		},
 		/**

dist/5733-5733.js.license → dist/1345-1345.js.license

@@ -30,6 +30,7 @@ SPDX-FileCopyrightText: Julius Härtl <[email protected]>
 SPDX-FileCopyrightText: Joyent
 SPDX-FileCopyrightText: Jordan Harband <[email protected]>
 SPDX-FileCopyrightText: Jordan Harband
+SPDX-FileCopyrightText: Jonas Schade <[email protected]>
 SPDX-FileCopyrightText: John-David Dalton <[email protected]> (http://allyoucanleet.com/)
 SPDX-FileCopyrightText: John Molakvoæ (skjnldsv) <[email protected]>
 SPDX-FileCopyrightText: Jerry Bendy <[email protected]>
@@ -45,11 +46,13 @@ SPDX-FileCopyrightText: Eric Norris (https://github.com/ericnorris)
 SPDX-FileCopyrightText: Dr.-Ing. Mario Heiderich, Cure53 <[email protected]> (https://cure53.de/)
 SPDX-FileCopyrightText: Denis Pushkarev
 SPDX-FileCopyrightText: David Clark
+SPDX-FileCopyrightText: Christoph Wurst <[email protected]>
 SPDX-FileCopyrightText: Christoph Wurst
 SPDX-FileCopyrightText: Chen Fengyuan
 SPDX-FileCopyrightText: Arnout Kazemier
 SPDX-FileCopyrightText: Anthony Fu <https://github.com/antfu>
 SPDX-FileCopyrightText: Andris Reinman
+SPDX-FileCopyrightText: Alkemics
 SPDX-FileCopyrightText: @nextcloud/dialogs developers
 
 
@@ -81,6 +84,12 @@ This file is generated from multiple sources. Included packages:
 - @nextcloud/event-bus
 	- version: 3.3.1
 	- license: GPL-3.0-or-later
+- @nextcloud/l10n
+	- version: 3.1.0
+	- license: GPL-3.0-or-later
+- @nextcloud/files
+	- version: 3.5.1
+	- license: AGPL-3.0-or-later
 - @nextcloud/initial-state
 	- version: 2.2.0
 	- license: GPL-3.0-or-later
@@ -147,6 +156,9 @@ This file is generated from multiple sources. Included packages:
 - call-bind
 	- version: 1.0.7
 	- license: MIT
+- cancelable-promise
+	- version: 4.3.1
+	- license: MIT
 - charenc
 	- version: 0.0.2
 	- license: BSD-3-Clause
@@ -309,6 +321,9 @@ This file is generated from multiple sources. Included packages:
 - toastify-js
 	- version: 1.12.0
 	- license: MIT
+- typescript-event-target
+	- version: 1.1.1
+	- license: MIT
 - unist-builder
 	- version: 4.0.0
 	- license: MIT

dist/1345-1345.js.map.license

@@ -0,0 +1 @@
+1345-1345.js.license

dist/5455-5455.js.license

@@ -29,7 +29,6 @@ SPDX-FileCopyrightText: Roeland Jago Douma
 SPDX-FileCopyrightText: Richie Bendall
 SPDX-FileCopyrightText: Raynos <[email protected]>
 SPDX-FileCopyrightText: Philipp Kewisch
-SPDX-FileCopyrightText: Perry Mitchell <[email protected]>
 SPDX-FileCopyrightText: Paul Vorbach <[email protected]> (http://paul.vorba.ch)
 SPDX-FileCopyrightText: Paul Vorbach <[email protected]> (http://vorb.de)
 SPDX-FileCopyrightText: OpenJS Foundation and other contributors
@@ -110,9 +109,6 @@ This file is generated from multiple sources. Included packages:
 - @nextcloud/l10n
 	- version: 3.1.0
 	- license: GPL-3.0-or-later
-- @nextcloud/sharing
-	- version: 0.2.2
-	- license: GPL-3.0-or-later
 - @nextcloud/files
 	- version: 3.5.1
 	- license: AGPL-3.0-or-later
@@ -587,9 +583,6 @@ This file is generated from multiple sources. Included packages:
 - web-namespaces
 	- version: 2.0.1
 	- license: MIT
-- webdav
-	- version: 5.6.0
-	- license: MIT
 - which-typed-array
 	- version: 1.1.14
 	- license: MIT

dist/6778-6778.js.license

@@ -14,7 +14,6 @@ SPDX-FileCopyrightText: Stefan-Gabriel Muscalu <[email protected]
 SPDX-FileCopyrightText: Sindre Sorhus
 SPDX-FileCopyrightText: Roman Shtylman <[email protected]>
 SPDX-FileCopyrightText: Raynos <[email protected]>
-SPDX-FileCopyrightText: Perry Mitchell <[email protected]>
 SPDX-FileCopyrightText: Matt Zabriskie
 SPDX-FileCopyrightText: Joyent
 SPDX-FileCopyrightText: Jordan Harband <[email protected]>
@@ -58,9 +57,6 @@ This file is generated from multiple sources. Included packages:
 - @nextcloud/l10n
 	- version: 3.1.0
 	- license: GPL-3.0-or-later
-- @nextcloud/sharing
-	- version: 0.2.2
-	- license: GPL-3.0-or-later
 - @nextcloud/files
 	- version: 3.5.1
 	- license: AGPL-3.0-or-later
@@ -256,9 +252,6 @@ This file is generated from multiple sources. Included packages:
 - vue
 	- version: 2.7.16
 	- license: MIT
-- webdav
-	- version: 5.6.0
-	- license: MIT
 - which-typed-array
 	- version: 1.1.14
 	- license: MIT