From 8c6a5eed8e19a11393f705ee77ee36c5640b7d0f Mon Sep 17 00:00:00 2001
From: Milorad Filipovic <milorad@n8n.io>
Date: Tue, 4 Mar 2025 14:54:21 +0100
Subject: [PATCH] =?UTF-8?q?=E2=9A=A1Implemented=20error=20notice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ResourceLocator/ResourceLocator.vue       | 64 +++++++++++++------
 .../ResourceLocator/resourceLocator.scss      |  7 +-
 .../src/plugins/i18n/locales/en.json          |  5 +-
 3 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/packages/frontend/editor-ui/src/components/ResourceLocator/ResourceLocator.vue b/packages/frontend/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
index 649272a12a..779897efd2 100644
--- a/packages/frontend/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
+++ b/packages/frontend/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
@@ -53,11 +53,17 @@ import {
 	updateFromAIOverrideValues,
 	type FromAIOverride,
 } from '../../utils/fromAIOverrideUtils';
+import { N8nNotice } from '@n8n/design-system';
 
 interface IResourceLocatorQuery {
 	results: INodeListSearchItems[];
 	nextPageToken: unknown;
 	error: boolean;
+	errorDetails?: {
+		message?: string;
+		description?: string;
+		httpCode?: string;
+	};
 	loading: boolean;
 }
 
@@ -148,13 +154,9 @@ const selectedMode = computed(() => {
 
 const isListMode = computed(() => selectedMode.value === 'list');
 
-const hasCredential = computed(() => {
-	const node = ndvStore.activeNode;
-	if (!node) {
-		return false;
-	}
-	return !!(node?.credentials && Object.keys(node.credentials).length === 1);
-});
+const hasPermissionError = computed(() =>
+	['401', '403'].includes(currentResponse.value?.errorDetails?.httpCode ?? ''),
+);
 
 const credentialsNotSet = computed(() => {
 	if (!props.node) return false;
@@ -643,6 +645,11 @@ async function loadResources() {
 		setResponse(paramsKey, {
 			loading: false,
 			error: true,
+			errorDetails: {
+				message: e.message,
+				description: e.description,
+				httpCode: e.httpCode,
+			},
 		});
 	}
 }
@@ -777,19 +784,37 @@ function removeOverride() {
 			@load-more="loadResourcesDebounced"
 		>
 			<template #error>
-				<div :class="$style.error" data-test-id="rlc-error-container">
-					<n8n-text color="text-dark" align="center" tag="div">
-						{{ i18n.baseText('resourceLocator.mode.list.error.title') }}
-					</n8n-text>
-					<n8n-text v-if="hasCredential || credentialsNotSet" size="small" color="text-base">
-						{{ i18n.baseText('resourceLocator.mode.list.error.description.part1') }}
-						<a v-if="credentialsNotSet" @click="createNewCredential">{{
-							i18n.baseText('resourceLocator.mode.list.error.description.part2.noCredentials')
-						}}</a>
-						<a v-else-if="hasCredential" @click="openCredential">{{
-							i18n.baseText('resourceLocator.mode.list.error.description.part2.hasCredentials')
-						}}</a>
+				<div
+					v-if="currentResponse.errorDetails"
+					:class="$style.error"
+					data-test-id="rlc-error-container"
+				>
+					<n8n-text bold size="small">
+						{{ i18n.baseText('resourceLocator.mode.list.error.title') }} -
+						<span v-if="currentResponse.errorDetails.httpCode">
+							{{ currentResponse.errorDetails.httpCode }}
+						</span>
+						{{ currentResponse.errorDetails.message?.split('-')[0]?.trim() }}
 					</n8n-text>
+					<N8nNotice
+						v-if="currentResponse.errorDetails.description"
+						theme="warning"
+						class="mt-s mb-s text-left"
+					>
+						{{ currentResponse.errorDetails.description }}
+					</N8nNotice>
+					<div v-if="hasPermissionError" data-test-id="permission-error-link">
+						<a
+							v-if="credentialsNotSet"
+							:class="$style['credential-link']"
+							@click="createNewCredential"
+						>
+							{{ i18n.baseText('resourceLocator.mode.list.error.description.noCredentials') }}
+						</a>
+						<a v-else :class="$style['credential-link']" @click="openCredential">
+							{{ i18n.baseText('resourceLocator.mode.list.error.description.checkCredentials') }}
+						</a>
+					</div>
 				</div>
 			</template>
 			<div
@@ -820,6 +845,7 @@ function removeOverride() {
 						<n8n-option
 							v-for="mode in parameter.modes"
 							:key="mode.name"
+							:data-test-id="`mode-${mode.name}`"
 							:value="mode.name"
 							:label="getModeLabel(mode)"
 							:disabled="isValueExpression && mode.name === 'list'"
diff --git a/packages/frontend/editor-ui/src/components/ResourceLocator/resourceLocator.scss b/packages/frontend/editor-ui/src/components/ResourceLocator/resourceLocator.scss
index 9eabb26bb4..795fe9fdb8 100644
--- a/packages/frontend/editor-ui/src/components/ResourceLocator/resourceLocator.scss
+++ b/packages/frontend/editor-ui/src/components/ResourceLocator/resourceLocator.scss
@@ -141,9 +141,14 @@ $--mode-selector-width: 92px;
 }
 
 .error {
-	max-width: 170px;
+	width: 80%;
 	word-break: normal;
 	text-align: center;
+	color: var(--color-text-base);
+}
+
+.credential-link {
+	font-size: 12px;
 }
 
 .openResourceLink {
diff --git a/packages/frontend/editor-ui/src/plugins/i18n/locales/en.json b/packages/frontend/editor-ui/src/plugins/i18n/locales/en.json
index 0bce1a0310..2465984803 100644
--- a/packages/frontend/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/frontend/editor-ui/src/plugins/i18n/locales/en.json
@@ -1589,9 +1589,8 @@
 	"resourceLocator.mode.list": "From list",
 	"resourceLocator.mode.list.disabled.title": "Change to Fixed mode to choose From List",
 	"resourceLocator.mode.list.error.title": "Could not load list",
-	"resourceLocator.mode.list.error.description.part1": "Please",
-	"resourceLocator.mode.list.error.description.part2.hasCredentials": "check your credential",
-	"resourceLocator.mode.list.error.description.part2.noCredentials": "add your credential",
+	"resourceLocator.mode.list.error.description.checkCredentials": "Check your credential",
+	"resourceLocator.mode.list.error.description.noCredentials": "Add your credential",
 	"resourceLocator.mode.list.noResults": "No results",
 	"resourceLocator.mode.list.openUrl": "Open URL",
 	"resourceLocator.mode.list.placeholder": "Choose...",