Merge pull request #15667 from nextcloud/fix/noid/files-sidebar

Author: Antreesy

src/FilesSidebarCallViewApp.vue

@@ -22,7 +22,10 @@
 				{{ t('spreed', 'Join conversation') }}
 			</NcButton>
 		</div>
-		<FilesSidebarChatView v-else />
+		<template v-else>
+			<FilesSidebarCallView v-if="isInFile && isInCall" />
+			<FilesSidebarChatView />
+		</template>
 	</div>
 </template>
 
@@ -34,6 +37,7 @@ import { t } from '@nextcloud/l10n'
 import { defineAsyncComponent, defineComponent, h } from 'vue'
 import NcButton from '@nextcloud/vue/components/NcButton'
 import LoadingComponent from './components/LoadingComponent.vue'
+import { useIsInCall } from './composables/useIsInCall.js'
 import { useSessionIssueHandler } from './composables/useSessionIssueHandler.ts'
 import { EventBus } from './services/EventBus.ts'
 import { getFileConversation } from './services/filesIntegrationServices.ts'
@@ -56,11 +60,17 @@ export default {
 			loadingComponent: defineComponent(() => h(LoadingComponent, { class: 'tab-loading' })),
 		}),
 
+		FilesSidebarCallView: defineAsyncComponent({
+			loader: () => import(/* webpackChunkName: "files-sidebar-call-chunk" */'./views/FilesSidebarCallView.vue'),
+			loadingComponent: defineComponent(() => h(LoadingComponent, { class: 'tab-loading' })),
+		}),
+
 		NcButton,
 	},
 
 	setup() {
 		return {
+			isInCall: useIsInCall(),
 			isLeavingAfterSessionIssue: useSessionIssueHandler(),
 			actorStore: useActorStore(),
 			tokenStore: useTokenStore(),
@@ -97,6 +107,20 @@ export default {
 			return this.tokenStore.fileIdForToken
 		},
 
+		/**
+		 * Returns whether the sidebar is opened in the file of the current
+		 * conversation or not.
+		 *
+		 * Note that false is returned too when the sidebar is closed, even if
+		 * the conversation is active in the current file.
+		 *
+		 * @return {boolean} true if the sidebar is opened in the file, false
+		 *          otherwise.
+		 */
+		isInFile() {
+			return this.fileId === this.fileIdForToken
+		},
+
 		isChatTheActiveTab() {
 			// FIXME check for empty active tab is currently needed because the
 			// activeTab is not set when opening the sidebar from the "Details"

src/FilesSidebarTabApp.vue

@@ -6,7 +6,6 @@
 import { getCSPNonce } from '@nextcloud/auth'
 import { generateFilePath } from '@nextcloud/router'
 import { createApp, reactive } from 'vue'
-import FilesSidebarCallViewApp from './FilesSidebarCallViewApp.vue'
 import FilesSidebarTabApp from './FilesSidebarTabApp.vue'
 import { createMemoryRouter } from './router/router.ts'
 import store from './store/index.js'
@@ -30,17 +29,6 @@ __webpack_public_path__ = generateFilePath('spreed', '', 'js/')
 
 const router = createMemoryRouter()
 
-/**
- *
- */
-function newCallView() {
-	return createApp(FilesSidebarCallViewApp)
-		.use(store)
-		.use(pinia)
-		.use(router)
-		.use(NextcloudGlobalsVuePlugin)
-}
-
 /**
  *
  */
@@ -57,7 +45,6 @@ if (!window.OCA.Talk) {
 }
 Object.assign(window.OCA.Talk, {
 	fileInfo: null,
-	newCallView,
 	newTab,
 	store,
 })