From 4e9d20fa972d26337b459183829f1976b67bdbf5 Mon Sep 17 00:00:00 2001
From: Christopher Ng <chrng8@gmail.com>
Date: Mon, 6 Mar 2023 12:25:07 -0800
Subject: [PATCH] Display related resources error message in panel

Signed-off-by: Christopher Ng <chrng8@gmail.com>
---
 l10n/messages.pot                             |  2 +-
 .../NcRelatedResourcesPanel.vue               | 33 +++++++++++++++----
 .../NcRelatedResourcesPanel/NcResource.vue    |  5 +++
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/l10n/messages.pot b/l10n/messages.pot
index dc526e32d2..04295df0e4 100644
--- a/l10n/messages.pot
+++ b/l10n/messages.pot
@@ -71,7 +71,7 @@ msgstr ""
 msgid "Enter link"
 msgstr ""
 
-msgid "Error getting related resources"
+msgid "Error getting related resources. Please contact your system administrator if you have any questions."
 msgstr ""
 
 msgid "External documentation for {title}"
diff --git a/src/components/NcRelatedResourcesPanel/NcRelatedResourcesPanel.vue b/src/components/NcRelatedResourcesPanel/NcRelatedResourcesPanel.vue
index 948df6feeb..468946e65a 100644
--- a/src/components/NcRelatedResourcesPanel/NcRelatedResourcesPanel.vue
+++ b/src/components/NcRelatedResourcesPanel/NcRelatedResourcesPanel.vue
@@ -47,7 +47,7 @@ export default {
 	<div v-if="appEnabled && isVisible" class="related-resources">
 		<div class="related-resources__header">
 			<h5>{{ headerTranslated }}</h5>
-			<p>{{ descriptionTranslated }}</p>
+			<p>{{ description }}</p>
 		</div>
 
 		<NcResource v-for="resource in resources"
@@ -64,11 +64,11 @@ export default {
 <script>
 import axios from '@nextcloud/axios'
 import { generateOcsUrl } from '@nextcloud/router'
-import { showError } from '@nextcloud/dialogs'
-import { t } from '../../l10n.js'
 
 import NcResource from './NcResource.vue'
 
+import { t } from '../../l10n.js'
+
 export default {
 	name: 'NcRelatedResourcesPanel',
 
@@ -103,6 +103,7 @@ export default {
 	},
 
 	emits: [
+		'has-error',
 		'has-resources',
 	],
 
@@ -110,15 +111,25 @@ export default {
 		return {
 			appEnabled: OC?.appswebroots?.related_resources !== undefined,
 			headerTranslated: t('Related resources'),
-			descriptionTranslated: t('Anything shared with the same group of people will show up here'),
 			loading: false,
+			error: null,
 			resources: [],
 		}
 	},
 
 	computed: {
 		isVisible() {
-			return !this.loading && this.resources.length > 0
+			if (this.loading) {
+				return false
+			}
+			return this.error ?? this.resources.length > 0
+		},
+
+		description() {
+			if (this.error) {
+				return t('Error getting related resources. Please contact your system administrator if you have any questions.')
+			}
+			return t('Anything shared with the same group of people will show up here')
 		},
 
 		hasResourceInfo() {
@@ -164,6 +175,14 @@ export default {
 		fileInfo() {
 			this.fetchRelatedResources()
 		},
+		error(error) {
+			/**
+			 * Emitted when the error value changes
+			 *
+			 * @type {boolean}
+			 */
+			this.$emit('has-error', Boolean(error))
+		},
 		resources(resources) {
 			/**
 			 * Emitted when the resources value changes
@@ -179,19 +198,21 @@ export default {
 	},
 
 	methods: {
+		t,
 		async fetchRelatedResources() {
 			if (!this.appEnabled || !this.hasResourceInfo) {
 				return
 			}
 
 			this.loading = true
+			this.error = null
 			this.resources = []
 			try {
 				const response = await axios.get(this.url)
 				this.resources = response.data.ocs?.data
 			} catch (e) {
+				this.error = e
 				console.error(e)
-				showError(t('Error getting related resources'))
 			} finally {
 				this.loading = false
 			}
diff --git a/src/components/NcRelatedResourcesPanel/NcResource.vue b/src/components/NcRelatedResourcesPanel/NcResource.vue
index 6c3adcded6..e4007000e5 100644
--- a/src/components/NcRelatedResourcesPanel/NcResource.vue
+++ b/src/components/NcRelatedResourcesPanel/NcResource.vue
@@ -39,6 +39,7 @@
 <script>
 import NcButton from '../NcButton/index.js'
 import Tooltip from '../../directives/Tooltip/index.js'
+
 import { t } from '../../l10n.js'
 
 export default {
@@ -80,6 +81,10 @@ export default {
 			labelTranslated: t('Open link to "{resourceTitle}"', { resourceTitle: this.title }),
 		}
 	},
+
+	methods: {
+		t,
+	},
 }
 </script>