Merge pull request #5300 from nextcloud/backport/5294/stable33

[stable33] fix: Properly handle sidebar in 33

Author: juliusknorr

src/view/FilesAppIntegration.js

@@ -10,6 +10,9 @@ import { isPublicShare } from '@nextcloud/sharing/public'
 import axios from '@nextcloud/axios'
 import { emit } from '@nextcloud/event-bus'
 import { getCurrentDirectory } from '../helpers/filesApp.js'
+import {
+	getSidebar
+} from '@nextcloud/files'
 import {
 	getClient,
 	getDefaultPropfind,
@@ -106,7 +109,7 @@ export default {
 
 		this.changeFilesRoute(node.fileid)
 
-		OCA?.Files?.Sidebar?.close()
+		getSidebar()?.close()
 
 		if (this.getFileList()) {
 			const newFileModel = oldFile.clone()
@@ -115,12 +118,10 @@ export default {
 			newFileModel.set('mtime', Date.now())
 			this.getFileList()
 				.add(newFileModel.toJSON())
-
-			OC.Apps.hideAppSidebar()
 		}
 	},
 
-	share() {
+	async share() {
 		if (this.handlers.share && this.handlers.share(this)) {
 			return
 		}
@@ -130,8 +131,10 @@ export default {
 			return
 		}
 
-		OCA?.Files?.Sidebar?.open(this.filePath + '/' + this.fileName)
-		OCA?.Files?.Sidebar?.setActiveTab('sharing')
+		const node = await this.getFileNode()
+		const sidebar = getSidebar()
+		sidebar?.open(node)
+		sidebar?.setActiveTab('sharing')
 	},
 
 	rename(newName) {
@@ -144,7 +147,7 @@ export default {
 		}
 
 		if (this.getFileList()) {
-			OC.Apps.hideAppSidebar()
+			getSidebar()?.close()
 		}
 	},
 
@@ -421,17 +424,20 @@ export default {
 		avatardiv.append(popover)
 	},
 
-	showRevHistory() {
+	async showRevHistory() {
 		if (this.handlers.showRevHistory && this.handlers.showRevHistory(this)) {
 			return
 		}
 
-		if (isPublicShare() || !OCA?.Files?.Sidebar) {
+		if (isPublicShare()) {
 			console.error('[FilesAppIntegration] Versions are not supported')
 			return
 		}
-		OCA?.Files?.Sidebar?.open(this.filePath + '/' + this.fileName)
-		OCA?.Files?.Sidebar?.setActiveTab('files_versions')
+
+		const node = await this.getFileNode()
+		const sidebar = getSidebar()
+		sidebar?.open(node)
+		sidebar?.setActiveTab('files_versions')
 	},
 
 	/**

src/view/Office.vue

@@ -123,6 +123,7 @@ import uiMention from '../mixins/uiMention.js'
 import version from '../mixins/version.js'
 import { getCurrentUser, getGuestNickname } from '@nextcloud/auth'
 import { shouldAskForGuestName } from '../helpers/guestName.js'
+import { getSidebar } from '@nextcloud/files'
 
 const FRAME_DOCUMENT = 'FRAME_DOCUMENT'
 
@@ -288,7 +289,7 @@ export default {
 				},
 			})
 
-			window.OCA?.Files?.Sidebar?.close()
+			getSidebar()?.close()
 		}
 		this.postMessage.registerPostMessageHandler(this.postMessageHandler)