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: Expressions display actual result of evaluating expression inside string (#11257)

Browse Source 
Co-authored-by: Shireen Missi <94372015+ShireenMissi@users.noreply.github.com>
This commit is contained in:
Michael Kret
2024-10-16 13:27:00 +03:00
committed by GitHub
parent e7a4b0da01
commit 7f5f0a9df3
1 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
packages/editor-ui/src/composables/useExpressionEditor.ts
View File

@@ -352,6 +352,12 @@ export const useExpressionEditor = ({
* - `This is a {{ [] }} test` displays as `This is a test`. * - `This is a {{ [] }} test` displays as `This is a test`.
* - `{{ [] }}` displays as `[Array: []]`. * - `{{ [] }}` displays as `[Array: []]`.
* *
* - `This is a {{ {} }} test` displays as `This is a [object Object] test`.
* - `{{ {} }}` displays as `[Object: {}]`.
*
* - `This is a {{ [{}] }} test` displays as `This is a [object Object] test`.
* - `{{ [] }}` displays as `[Array: []]`.
*
* Some segments display differently based on context: * Some segments display differently based on context:
* *
* Date displays as * Date displays as
@@ -366,13 +372,29 @@ export const useExpressionEditor = ({
.map((s) => { .map((s) => {
if (cachedSegments.length <= 1 || s.kind !== 'resolvable') return s; if (cachedSegments.length <= 1 || s.kind !== 'resolvable') return s;
if (typeof s.resolved === 'string' && /\[Object: "\d{4}-\d{2}-\d{2}T/.test(s.resolved)) { if (typeof s.resolved === 'string') {
const utcDateString = s.resolved.replace(/(\[Object: "|\"\])/g, ''); let resolved = s.resolved;
s.resolved = new Date(utcDateString).toString();
if (/\[Object: "\d{4}-\d{2}-\d{2}T/.test(resolved)) {
const utcDateString = resolved.replace(/(\[Object: "|\"\])/g, '');
resolved = new Date(utcDateString).toString();
} }
if (typeof s.resolved === 'string' && /\[Array:\s\[.+\]\]/.test(s.resolved)) { if (/\[Object:\s(\{.+\}|\{\})\]/.test(resolved)) {
s.resolved = s.resolved.replace(/(\[Array: \[|\])/g, ''); resolved = resolved.replace(/(\[Object: |\]$)/g, '');
try {
resolved = String(JSON.parse(resolved));
} catch (error) {}
}
if (/\[Array:\s\[.+\]\]/.test(resolved)) {
resolved = resolved.replace(/(\[Array: |\]$)/g, '');
try {
resolved = String(JSON.parse(resolved));
} catch (error) {}
}
s.resolved = resolved;
} }
return s; return s;