Merge pull request #3400 from nextcloud/backport/3311/stable28

[stable28] feat: add loadingMessage() to show different loadingMsg
nextcloud · Jan 9, 2024 · d2a533e · d2a533e
2 parents 34eceb6 + 31df6f1
commit d2a533e
Showing 1 changed file with 40 additions and 3 deletions.
diff --git a/src/view/Office.vue b/src/view/Office.vue
@@ -25,7 +25,7 @@
 		<div v-if="showLoadingIndicator"
 			class="office-viewer__loading-overlay"
 			:class="{ debug: debug }">
-			<NcEmptyContent v-if="!error" :title="t('richdocuments', 'Loading {filename} …', { filename: basename }, 1, {escape: false})">
+			<NcEmptyContent v-if="!error" :title="loadingMessage">
 				<template #icon>
 					<NcLoadingIcon />
 				</template>
@@ -39,6 +39,21 @@
 				<template #icon>
 					<AlertOctagonOutline />
 				</template>
+				<template #description>
+					<p>{{ errorMessage }}</p>
+					<p v-if="showAdminStorageFailure">
+						{{ t('richdocuments', 'Please check the Collabora Online server log for more details and make sure that Nextcloud can be reached from there.') }}
+					</p>
+					<p v-if="showAdminWebsocketFailure">
+						{{ t('richdocuments', 'Socket connection closed unexpectedly. The reverse proxy might be misconfigured, please contact the administrator.') }}
+						<a href="https://docs.nextcloud.com/server/latest/admin_manual/office/proxy.html"
+							target="_blank"
+							rel="noreferrer noopener"
+							class="external">
+							{{ t('richdocuments', 'More information can be found in the reverse proxy documentation') }}
+						</a>
+					</p>
+				</template>
 				<template #action>
 					<NcButton @click="close">
 						{{ t('richdocuments', 'Close') }}
@@ -105,6 +120,7 @@ import pickLink from '../mixins/pickLink.js'
 import saveAs from '../mixins/saveAs.js'
 import uiMention from '../mixins/uiMention.js'
 import version from '../mixins/version.js'
+import { getCurrentUser } from '@nextcloud/auth'
 
 const FRAME_DOCUMENT = 'FRAME_DOCUMENT'
 
@@ -154,6 +170,8 @@ export default {
 			loading: LOADING_STATE.LOADING,
 			loadingTimeout: null,
 			error: null,
+			errorType: null,
+			loadingMsg: null,
 			views: [],
 
 			showLinkPicker: false,
@@ -187,6 +205,13 @@ export default {
 				return this.error
 			}
 		},
+		loadingMessage() {
+			if (this.loadingMsg) {
+				return this.loadingMsg
+			}
+
+			return t('richdocuments', 'Loading {filename} …', { filename: basename(this.filename) }, 1, { escape: false })
+		},
 		debug() {
 			return !!window.TESTING
 		},
@@ -196,6 +221,12 @@ export default {
 		shareToken() {
 			return document.getElementById('sharingToken')?.value
 		},
+		showAdminStorageFailure() {
+			return getCurrentUser()?.isAdmin && this.errorType === 'websocketloadfailed'
+		},
+		showAdminWebsocketFailure() {
+			return getCurrentUser()?.isAdmin && this.errorType === 'websocketconnectionfailed'
+		},
 	},
 	async mounted() {
 		this.postMessage = new PostMessageService({
@@ -322,8 +353,14 @@ export default {
 				if (args.success) {
 					this.documentReady()
 				} else {
-					this.error = args.errorMsg
-					this.loading = LOADING_STATE.FAILED
+					if (args.errorType === 'clusterscaling') {
+						this.loadingMsg = t('richdocuments', 'Cluster is scaling …')
+					} else {
+						this.error = args.errorMsg
+						this.errorType = args.errorType
+						this.loading = LOADING_STATE.FAILED
+						clearTimeout(this.loadingTimeout)
+					}
 				}
 				break
 			case 'UI_Close':