show channel loading error in the UI

Signed-off-by: Julien Veyssier <[email protected]>
nextcloud · Nov 9, 2022 · ea16536 · ea16536
1 parent 73bf4e3
commit ea16536
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/Controller/MattermostAPIController.php b/lib/Controller/MattermostAPIController.php
@@ -147,7 +147,7 @@ public function getNotifications(?int $since = null) {
 	public function getChannels() {
 		$result = $this->mattermostAPIService->getMyChannels($this->userId, $this->mattermostUrl);
 		if (isset($result['error'])) {
-			return new DataResponse($result['error'], Http::STATUS_BAD_REQUEST);
+			return new DataResponse($result, Http::STATUS_BAD_REQUEST);
 		} else {
 			return new DataResponse($result);
 		}

diff --git a/src/components/SendFilesModal.vue b/src/components/SendFilesModal.vue
@@ -231,6 +231,7 @@ import EyeIcon from 'vue-material-design-icons/Eye.vue'
 import RadioElementSet from './RadioElementSet.vue'
 import axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
+import { showError } from '@nextcloud/dialogs'
 import MattermostIcon from './icons/MattermostIcon.vue'
 import { humanFileSize } from '../utils.js'
 
@@ -377,6 +378,10 @@ export default {
 					this.selectedChannel = this.sortedChannels[0]
 				}
 			}).catch((error) => {
+				showError(
+					t('integration_mattermost', 'Failed to load Mattermost channels')
+					+ ': ' + error.response?.data?.error
+				)
 				console.error(error)
 			})
 		},