mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

⚡Improve message deupe logic

Browse source
This commit is contained in:
Milorad Filipovic 2025-03-05 11:48:44 +01:00
parent 2e41075fc8
commit ed0e34546f
No known key found for this signature in database
1 changed files with 45 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
packages/frontend/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
View file

@ -55,6 +55,20 @@ import {
} from '../../utils/fromAIOverrideUtils';
import { N8nNotice } from '@n8n/design-system';
/**
* Regular expression to check if the error message contains credential-related phrases.
*/
const CHECK_CREDENTIALS_REGEX = /check\s+(your\s+)?credentials?/i;
/**
* Error codes and messages that indicate a permission error.
*/
const PERMISSION_ERROR_CODES = ['401', '403'];
const NODE_API_AUTH_ERROR_MESSAGES = [
'NodeApiError: Authorization failed',
'NodeApiError: Unable to sign without access token',
'secretOrPrivateKey must be an asymmetric key when using RS256',
];
interface IResourceLocatorQuery {
results: INodeListSearchItems[];
nextPageToken: unknown;
@ -155,16 +169,12 @@ const selectedMode = computed(() => {
const isListMode = computed(() => selectedMode.value === 'list');
/**
* Check if the current response contains an error that indicates a credential issue.
* We do this by checking error http code
* But, since out NodeApiErrors sometimes just return 500, we also check the message and stack trace
*/
const hasCredentialError = computed(() => {
const PERMISSION_ERROR_CODES = ['401', '403'];
// Some of our NodeAPIErrors just return 500 without any details,
// so checking messages and stack traces for permission errors
const NODE_API_AUTH_ERROR_MESSAGES = [
'NodeApiError: Authorization failed',
'NodeApiError: Unable to sign without access token',
'secretOrPrivateKey must be an asymmetric key when using RS256',
];
// Check if error stack trace contains permission error messages
const stackTraceContainsCredentialError = (currentResponse.value?.errorDetails?.stackTrace ?? '')
.split('\n')
.some((line) => NODE_API_AUTH_ERROR_MESSAGES.includes(line.trim()));
@ -664,7 +674,7 @@ async function loadResources() {
loading: false,
error: true,
errorDetails: {
message: e.message,
message: removeDuplicateTextFromErrorMessage(e.message),
description: e.description,
httpCode: e.httpCode,
},
@ -672,6 +682,31 @@ async function loadResources() {
}
}
/**
* Removes duplicate credential-related sentences from error messages.
* We are already showing a link to create/check the credentials, so we don't need to repeat the same message.
*/
function removeDuplicateTextFromErrorMessage(message: string): string {
let segments: string[] = [];
// Split message into sentences or segments
if (/[-–—]/.test(message)) {
// By various dash types
segments = message.split(/\s*[-–—]\s*/);
} else {
// By sentence boundaries
segments = message.split(/(?<=[.!?])\s+/);
}
// Filter out segments containing credential check phrases
const filteredSegments = segments.filter((segment: string) => {
if (!segment.trim()) return false;
return !CHECK_CREDENTIALS_REGEX.test(segment);
});
return filteredSegments.join(' ').trim();
}
function onInputFocus(): void {
if (!isListMode.value || resourceDropdownVisible.value) {
return;