admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-21 11:49:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(editor): Render backticks as code segments in error view (#9352)

Browse Source
This commit is contained in:
Elias Meire
2024-05-10 11:23:23 +02:00
committed by GitHub
parent a00467c9fa
commit 4ed585040b
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/editor-ui/src/components/Error/NodeErrorView.vue
View File

@@ -122,12 +122,8 @@ function nodeVersionTag(nodeType: NodeError['node']): string {
}); });
} }
function replacePlaceholders(parameter: string, message: string): string { function prepareDescription(description: string): string {
const parameterName = parameterDisplayName(parameter, false); return sanitizeHtml(description.replace(/`(.*?)`/g, '<code>$1</code>'));
const parameterFullName = parameterDisplayName(parameter, true);
return message
.replace(/%%PARAMETER%%/g, parameterName)
.replace(/%%PARAMETER_FULL%%/g, parameterFullName);
} }
function getErrorDescription(): string { function getErrorDescription(): string {
@@ -136,7 +132,7 @@ function getErrorDescription(): string {
(props.error as NodeOperationError).functionality === 'configuration-node'; (props.error as NodeOperationError).functionality === 'configuration-node';
if (isSubNodeError) { if (isSubNodeError) {
return sanitizeHtml( return prepareDescription(
props.error.description + props.error.description +
i18n.baseText('pushConnection.executionError.openNode', { i18n.baseText('pushConnection.executionError.openNode', {
interpolate: { node: props.error.node.name }, interpolate: { node: props.error.node.name },
@@ -150,7 +146,7 @@ function getErrorDescription(): string {
runIndex: (props.error.context.runIndex as string) ?? '0', runIndex: (props.error.context.runIndex as string) ?? '0',
itemIndex: (props.error.context.itemIndex as string) ?? '0', itemIndex: (props.error.context.itemIndex as string) ?? '0',
}; };
return sanitizeHtml( return prepareDescription(
i18n.baseText( i18n.baseText(
`nodeErrorView.description.${props.error.context.descriptionKey as string}` as BaseTextKey, `nodeErrorView.description.${props.error.context.descriptionKey as string}` as BaseTextKey,
{ interpolate }, { interpolate },
@@ -159,11 +155,11 @@ function getErrorDescription(): string {
} }
if (!props.error.context?.descriptionTemplate) { if (!props.error.context?.descriptionTemplate) {
return sanitizeHtml(props.error.description ?? ''); return prepareDescription(props.error.description ?? '');
} }
const parameterName = parameterDisplayName(props.error.context.parameter as string); const parameterName = parameterDisplayName(props.error.context.parameter as string);
return sanitizeHtml( return prepareDescription(
(props.error.context.descriptionTemplate as string).replace(/%%PARAMETER%%/g, parameterName), (props.error.context.descriptionTemplate as string).replace(/%%PARAMETER%%/g, parameterName),
); );
} }
@@ -214,7 +210,7 @@ function getErrorMessage(): string {
function parameterDisplayName(path: string, fullPath = true) { function parameterDisplayName(path: string, fullPath = true) {
try { try {
const params = parameterName(parameters.value, path.split('.')); const params = getParameterName(parameters.value, path.split('.'));
if (!params.length) { if (!params.length) {
throw new Error(); throw new Error();
} }
@@ -228,7 +224,7 @@ function parameterDisplayName(path: string, fullPath = true) {
} }
} }
function parameterName( function getParameterName(
params: Array<INodePropertyOptions | INodeProperties | INodePropertyCollection>, params: Array<INodePropertyOptions | INodeProperties | INodePropertyCollection>,
pathParts: string[], pathParts: string[],
): Array<INodeProperties | INodePropertyCollection> { ): Array<INodeProperties | INodePropertyCollection> {
@@ -257,14 +253,14 @@ function parameterName(
if (currentParameter.hasOwnProperty('options')) { if (currentParameter.hasOwnProperty('options')) {
return [ return [
currentParameter, currentParameter,
...parameterName((currentParameter as INodeProperties).options!, pathParts), ...getParameterName((currentParameter as INodeProperties).options!, pathParts),
]; ];
} }
if (currentParameter.hasOwnProperty('values')) { if (currentParameter.hasOwnProperty('values')) {
return [ return [
currentParameter, currentParameter,
...parameterName((currentParameter as INodePropertyCollection).values, pathParts), ...getParameterName((currentParameter as INodePropertyCollection).values, pathParts),
]; ];
} }