Merge pull request #6327 from LibreSign/fix/preserve-selected-nodeid

fix: preserve selected nodeid

Author: vitormattos

src/Components/RightSidebar/AppFilesTab.vue

@@ -34,10 +34,10 @@ export default {
 		}
 	},
 	methods: {
-		checkAndLoadPendingEnvelope() {
+		async checkAndLoadPendingEnvelope() {
 			const pendingEnvelope = window.OCA?.Libresign?.pendingEnvelope
 			if (pendingEnvelope?.id) {
-				this.filesStore.addFile(pendingEnvelope)
+				await this.filesStore.addFile(pendingEnvelope)
 				this.filesStore.selectFile(pendingEnvelope.id)
 				delete window.OCA.Libresign.pendingEnvelope
 
@@ -87,7 +87,7 @@ export default {
 		},
 
 		async update(fileInfo) {
-			if (this.checkAndLoadPendingEnvelope()) {
+			if (await this.checkAndLoadPendingEnvelope()) {
 				return
 			}
 
@@ -97,7 +97,7 @@ export default {
 				return
 			}
 
-			this.filesStore.addFile({
+			await this.filesStore.addFile({
 				nodeId: fileInfo.id,
 				name: fileInfo.name,
 				file: generateRemoteUrl(`dav/files/${getCurrentUser()?.uid}/${fileInfo.path + '/' + fileInfo.name}`)

src/store/files.js

@@ -50,8 +50,10 @@ export const useFilesStore = function(...args) {
 						? { file_id: file.id, force_fetch: true }
 						: { 'nodeIds[]': [nodeId], force_fetch: true }
 
+					const savedSelectedNodeId = this.selectedNodeId
 					const fetchedFiles = await this.getAllFiles(filter)
 					fileData = fetchedFiles[nodeId] || { ...file, signers: [] }
+					this.selectedNodeId = savedSelectedNodeId
 				}
 
 				if (fileData.signers) {
@@ -531,9 +533,13 @@ export const useFilesStore = function(...args) {
 
 				if (uuid || file.uuid) {
 					config.data.uuid = uuid || file.uuid
-				} else {
+				} else if (file.id) {
+					config.data.file = {
+						fileId: file.id,
+					}
+				} else if (file.nodeId) {
 					config.data.file = {
-						fileId: fileId || this.getFile().id,
+						nodeId: file.nodeId,
 					}
 				}
 
@@ -571,9 +577,13 @@ export const useFilesStore = function(...args) {
 
 				if (uuid || file.uuid) {
 					config.data.uuid = uuid || file.uuid
-				} else {
+				} else if (file.id) {
+					config.data.file = {
+						fileId: file.id,
+					}
+				} else if (file.nodeId) {
 					config.data.file = {
-						fileId: fileId || this.getFile().id,
+						nodeId: file.nodeId,
 					}
 				}
 				const { data } = await axios(config)

src/store/sign.js

@@ -33,7 +33,7 @@ export const useSignStore = defineStore('sign', {
 	state: () => ({ ...defaultState }),
 
 	actions: {
-		initFromState() {
+		async initFromState() {
 			this.errors = loadState('libresign', 'errors', [])
 
 			const file = {
@@ -50,7 +50,7 @@ export const useSignStore = defineStore('sign', {
 			}
 			this.setFileToSign(file)
 			const filesStore = useFilesStore()
-			filesStore.addFile(file)
+			await filesStore.addFile(file)
 			filesStore.selectedNodeId = file.nodeId
 		},
 		setFileToSign(file) {