* feat: remove vue-fragment (no-changelog) * feat: partial design-system migration * feat: migrate info-accordion and info-tip components * feat: migrate several components to vue 3 * feat: migrated several components * feat: migrate several components * feat: migrate several components * feat: migrate several components * feat: re-exported all design system components * fix: fix design for popper components * fix: editor kind of working, lots of issues to fix * fix: fix several vue 3 migration issues * fix: replace @change with @update:modelValue in several places * fix: fix translation linking * fix: fix inline-edit input * fix: fix ndv and dialog design * fix: update parameter input event bindings * fix: rename deprecated lifecycle methods * fix: fix json view mapping * build: update lock file * fix(editor): revisit last conflict with master and fix issues * fix(editor): revisit last conflict with master and fix issues * fix: fix expression editor bug causing code mirror to no longer be reactive * fix: fix resource locator bug * fix: fix vue-agile integration * fix: remove global import for vue-agile * fix: replace element-plus buttons with n8n-buttons everywhere * fix(editor): Fix various element-plus styles (#6571) * fix(editor): Fix various element-plus styles Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> * Remove debugging code Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> * Address PR comments Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> --------- Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> * fix(editor): Fix loading in production mode [Vue 3] (#6578) Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> * fix(editor): First round of e2e tests fixes with Vue 3 (#6579) * fix(editor): Fix broken smoke and workflow list e2e tests * ✔️ Fix failing canvas action tests. Updating some selectors used in credentials and workflow tests * feat: add vue 3 eslint rules and fix issues * fix: fix tags-dropdown * fix: fix white-space issues caused by i18n-t * fix: rename non-generic click events * fix: fix search in resources list layout * fix: fix datatable paginator * fix: fix popper select caret and dropdown size * fix: add width to action-dropdown * fix: fix workflow settings icon not being hidden * fix: refactor newly added code * fix: fix merge issue * fix: fix ndv credentials watcher * fix: fix workflow saving and grabber notch * fix: fix nodes list panel transition * fix: fix node title visibility * fix: fix data unpinning * fix: fix value access * fix: show input panel only if trigger panel enabled or not trigger node * fix: fix tags dropdown and executions status spcing * fix(editor): Prevent execution list to load back when leaving the route (#6697) fix(editor): prevent execution list to load back when leaving the route * fix: fix drawer visibility * fix: fix expression toggle padding * fix: fix expressions editor styling * chore: prepare for testing * fix: fix styling for el-button without patching * test: fix unit tests in design-system * test: fix most unit tests * fix: remove import cycle. * fix: fix personalization modal tests * fix further resource mapper test adjustments * fix: fix multiple tests and n8n-route attr duplication * fix: fix source control tets * fix: fixed remaining unit tests * fix: fix workflows and credentials e2e tests * fix: fix localizeNodeNames * fix: update ndv e2e tests * fix: fix popper left placement arrow * fix: fix 5-ndv e2e tests * fix: fix 6-code-node e2e tests * fix(editor): Drop click outside directive from NodeCreator (#6716) * fix(editor): Drop click outside directive from NodeCreator * fix(editor): make sure mouseup outside is unbound at least before the component is unmounted * fix: fix 10-settings-log-streaming e2e tests * fix: fix node redrawing * fix: fix tooltip buttons styling * fix: fix varous e2e suites * fix: fix 15-scheduler-node e2e suite * fix: fix route watcher * fix: fixed param name update and credential edit * feat: update event names * refactor: Remove deprecated `$data` (#6576) Co-authored-by: Alex Grozav <alex@grozav.com> * fix: fix 17-sharing e2e suite * fix: fix tags dropdown * fix: fix tags manager * fix(editor): move :deep selectors to a separate scoped style block * fix: fix sticky component and inline text edit * fix: update e2e tests * fix: remove button override references * fix(editor): Adjust spacing in templates for Vue 3 (#6744) * fix(editor): Adjust spacing in templates * fix: Undo unneeded change * fix: Undo unneeded change * fix(editor): Adjust NDV height for Vue 3 (#6742) fix(editor): Adjust NDV height * fix(editor): Restore collapsed sidebar items for Vue 3 (#6743) fix(editor): Restore collapsed sidebar items * fix: fix linting issues * fix: fix design-system deps * fix: post-merge fixes * fix: update tests * fix: increase timeout for executionslist tets * chore: fix linting issue * fix: fix 14-mapping e2e tests in ci * fix: re-enable tests * fix: fix workflow duplication e2e tests after tags update * fix(editor): Change component prop to be typed * fix: fix tags dropdown in duplicate wf modal * fix: fix focus behaviour in tags selector * fix: fix tag creation * fix: fix log streaming e2e race condition * fix(editor): Fix Vue 3 linting issues (#6748) * fix(editor): Fix Vue 3 linting issues Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> * fix MainSidebar linter issues * revert pnpm lock * update pnpm lock file --------- Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> Co-authored-by: Alex Grozav <alex@grozav.com> * fix(editor): Some css fixes for vue3 branch (#6749) * ✨ Fixing filter button height * ✨ Update input modal button position * ✨ Updating tags styling * ✨ Fix event logging settings spacing * 👕 Fixing lint errors * fix: fix linting issues * Revert to `// eslint-disable-next-line @typescript-eslint/no-misused-promises` disabling of mixins init Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> * fix: fix css issue * fix(editor): Lint fix * fix(editor): Fix settings initialisation (#6750) Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> * fix: fix initial settings loading * fix: replace realClick with click force * fix: fix randomly failing mapping e2e tests * fix(editor): Fix menu item event handling * fix: fix resource filters dropdown events (#6752) * fix: fix resource filters dropdown events * fix: remove teleported:false * fix: fix event selection event naming (#6753) * fix: removed console.log (#6754) * fix: rever await nextTick changes * fix: redo linting changes * fix(editor): Redraw node connections if adding more than one node to canvas (#6755) * fix(editor): Redraw node connections if adding more than one node to canvas Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> * Update position before connection two nodes * Lint fix --------- Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> Co-authored-by: Alex Grozav <alex@grozav.com> * fix(editor): Fix `ResourceMapper` unit tests (#6758) * ✔️ Fix matching columns test * ✔️ Fix multiple matching columns test * ✔️ Removing `skip` from the last test * fix: Allow pasting a big workflow (#6760) * fix: pasting a big workflow * chore: update comment * refactor: move try/catch to function * refactor: move try/catch to function * fix(editor): Fix modal layer width * fix: fix position changes * fix: undo it.only * fix: make undo/redo multiple steps more verbose * fix: Fix value survey styles (#6764) * fix: fix value survey styles * fix: lint * Revert "fix: lint" 72869c431f1448861df021be041b61c62f1e3118 * fix: lint * fix(editor): Fix collapsed sub menu * fix: Fix drawer animation (#6767) fix: drawer animation * fix(editor): Fix source control buttons (#6769) * fix(editor): Fix App loading & auth (#6768) * fix(editor): Fix App loading & auth Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> * Await promises Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> * Fix eslint error Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> --------- Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> --------- Signed-off-by: Oleg Ivaniv <me@olegivaniv.com> Co-authored-by: Csaba Tuncsik <csaba@n8n.io> Co-authored-by: OlegIvaniv <me@olegivaniv.com> Co-authored-by: Milorad FIlipović <milorad@n8n.io> Co-authored-by: Iván Ovejero <ivov.src@gmail.com> Co-authored-by: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
250 lines
6.8 KiB
TypeScript
250 lines
6.8 KiB
TypeScript
import { defineComponent } from 'vue';
|
|
import type { PropType } from 'vue';
|
|
import { mapStores } from 'pinia';
|
|
|
|
import { Expression, ExpressionExtensions } from 'n8n-workflow';
|
|
import { ensureSyntaxTree } from '@codemirror/language';
|
|
|
|
import { workflowHelpers } from '@/mixins/workflowHelpers';
|
|
import { useNDVStore } from '@/stores/ndv.store';
|
|
import { EXPRESSION_EDITOR_PARSER_TIMEOUT } from '@/constants';
|
|
|
|
import type { EditorView } from '@codemirror/view';
|
|
import type { TargetItem } from '@/Interface';
|
|
import type { Html, Plaintext, RawSegment, Resolvable, Segment } from '@/types/expressions';
|
|
|
|
export const expressionManager = defineComponent({
|
|
mixins: [workflowHelpers],
|
|
props: {
|
|
targetItem: {
|
|
type: Object as PropType<TargetItem | null>,
|
|
},
|
|
},
|
|
data() {
|
|
return {
|
|
editor: {} as EditorView,
|
|
skipSegments: [] as string[],
|
|
editorState: undefined,
|
|
};
|
|
},
|
|
watch: {
|
|
targetItem() {
|
|
setTimeout(() => {
|
|
this.$emit('change', {
|
|
value: this.unresolvedExpression,
|
|
segments: this.displayableSegments,
|
|
});
|
|
});
|
|
},
|
|
},
|
|
computed: {
|
|
...mapStores(useNDVStore),
|
|
|
|
unresolvedExpression(): string {
|
|
return this.segments.reduce((acc, segment) => {
|
|
acc += segment.kind === 'resolvable' ? segment.resolvable : segment.plaintext;
|
|
|
|
return acc;
|
|
}, '=');
|
|
},
|
|
|
|
hoveringItem(): TargetItem | undefined {
|
|
return this.ndvStore.hoveringItem ?? undefined;
|
|
},
|
|
|
|
resolvableSegments(): Resolvable[] {
|
|
return this.segments.filter((s): s is Resolvable => s.kind === 'resolvable');
|
|
},
|
|
|
|
plaintextSegments(): Plaintext[] {
|
|
return this.segments.filter((s): s is Plaintext => s.kind === 'plaintext');
|
|
},
|
|
|
|
expressionExtensionNames(): Set<string> {
|
|
return new Set(
|
|
ExpressionExtensions.reduce<string[]>((acc, cur) => {
|
|
return [...acc, ...Object.keys(cur.functions)];
|
|
}, []),
|
|
);
|
|
},
|
|
|
|
htmlSegments(): Html[] {
|
|
return this.segments.filter((s): s is Html => s.kind !== 'resolvable');
|
|
},
|
|
|
|
segments(): Segment[] {
|
|
if (!this.editorState || !this.editorState) return [];
|
|
|
|
const rawSegments: RawSegment[] = [];
|
|
|
|
const fullTree = ensureSyntaxTree(
|
|
this.editorState,
|
|
this.editorState.doc.length,
|
|
EXPRESSION_EDITOR_PARSER_TIMEOUT,
|
|
);
|
|
|
|
if (fullTree === null) {
|
|
throw new Error(`Failed to parse expression: ${this.editorValue}`);
|
|
}
|
|
|
|
const skipSegments = ['Program', 'Script', 'Document', ...this.skipSegments];
|
|
|
|
fullTree.cursor().iterate((node) => {
|
|
const text = this.editorState.sliceDoc(node.from, node.to);
|
|
|
|
if (skipSegments.includes(node.type.name)) return;
|
|
|
|
rawSegments.push({
|
|
from: node.from,
|
|
to: node.to,
|
|
text,
|
|
token: node.type.name === 'Resolvable' ? 'Resolvable' : 'Plaintext',
|
|
});
|
|
});
|
|
|
|
return rawSegments.reduce<Segment[]>((acc, segment) => {
|
|
const { from, to, text, token } = segment;
|
|
|
|
if (token === 'Resolvable') {
|
|
const { resolved, error, fullError } = this.resolve(text, this.hoveringItem);
|
|
|
|
acc.push({
|
|
kind: 'resolvable',
|
|
from,
|
|
to,
|
|
resolvable: text,
|
|
// TODO:
|
|
// For some reason, expressions that resolve to a number 0 are breaking preview in the SQL editor
|
|
// This fixes that but as as TODO we should figure out why this is happening
|
|
resolved: String(resolved),
|
|
error,
|
|
fullError,
|
|
});
|
|
|
|
return acc;
|
|
}
|
|
|
|
acc.push({ kind: 'plaintext', from, to, plaintext: text });
|
|
|
|
return acc;
|
|
}, []);
|
|
},
|
|
|
|
/**
|
|
* Segments to display in the output of an expression editor.
|
|
*
|
|
* Some segments are not displayed when they are _part_ of the result,
|
|
* but displayed when they are the _entire_ result:
|
|
*
|
|
* - `This is a {{ [] }} test` displays as `This is a test`.
|
|
* - `{{ [] }}` displays as `[Array: []]`.
|
|
*
|
|
* Some segments display differently based on context:
|
|
*
|
|
* Date displays as
|
|
* - `Mon Nov 14 2022 17:26:13 GMT+0100 (CST)` when part of the result
|
|
* - `[Object: "2022-11-14T17:26:13.130Z"]` when the entire result
|
|
*
|
|
* Only needed in order to mimic behavior of `ParameterInputHint`.
|
|
*/
|
|
displayableSegments(): Segment[] {
|
|
return this.segments
|
|
.map((s) => {
|
|
if (this.segments.length <= 1 || s.kind !== 'resolvable') return s;
|
|
|
|
if (typeof s.resolved === 'string' && /\[Object: "\d{4}-\d{2}-\d{2}T/.test(s.resolved)) {
|
|
const utcDateString = s.resolved.replace(/(\[Object: "|\"\])/g, '');
|
|
s.resolved = new Date(utcDateString).toString();
|
|
}
|
|
|
|
if (typeof s.resolved === 'string' && /\[Array:\s\[.+\]\]/.test(s.resolved)) {
|
|
s.resolved = s.resolved.replace(/(\[Array: \[|\])/g, '');
|
|
}
|
|
|
|
return s;
|
|
})
|
|
.filter((s) => {
|
|
if (
|
|
this.segments.length > 1 &&
|
|
s.kind === 'resolvable' &&
|
|
typeof s.resolved === 'string' &&
|
|
(s.resolved === '[Array: []]' ||
|
|
s.resolved === this.$locale.baseText('expressionModalInput.empty'))
|
|
) {
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
});
|
|
},
|
|
},
|
|
methods: {
|
|
isEmptyExpression(resolvable: string) {
|
|
return /\{\{\s*\}\}/.test(resolvable);
|
|
},
|
|
|
|
resolve(resolvable: string, targetItem?: TargetItem) {
|
|
const result: { resolved: unknown; error: boolean; fullError: Error | null } = {
|
|
resolved: undefined,
|
|
error: false,
|
|
fullError: null,
|
|
};
|
|
|
|
try {
|
|
const ndvStore = useNDVStore();
|
|
if (!ndvStore.activeNode) {
|
|
// e.g. credential modal
|
|
result.resolved = Expression.resolveWithoutWorkflow(resolvable);
|
|
} else {
|
|
let opts;
|
|
if (ndvStore.isInputParentOfActiveNode) {
|
|
opts = {
|
|
targetItem: targetItem ?? undefined,
|
|
inputNodeName: this.ndvStore.ndvInputNodeName,
|
|
inputRunIndex: this.ndvStore.ndvInputRunIndex,
|
|
inputBranchIndex: this.ndvStore.ndvInputBranchIndex,
|
|
};
|
|
}
|
|
result.resolved = this.resolveExpression('=' + resolvable, undefined, opts);
|
|
}
|
|
} catch (error) {
|
|
result.resolved = `[${error.message}]`;
|
|
result.error = true;
|
|
result.fullError = error;
|
|
}
|
|
|
|
if (result.resolved === '') {
|
|
result.resolved = this.$locale.baseText('expressionModalInput.empty');
|
|
}
|
|
|
|
if (result.resolved === undefined && this.isEmptyExpression(resolvable)) {
|
|
result.resolved = this.$locale.baseText('expressionModalInput.empty');
|
|
}
|
|
|
|
if (result.resolved === undefined) {
|
|
result.resolved = this.isUncalledExpressionExtension(resolvable)
|
|
? this.$locale.baseText('expressionEditor.uncalledFunction')
|
|
: this.$locale.baseText('expressionModalInput.undefined');
|
|
|
|
result.error = true;
|
|
}
|
|
|
|
if (typeof result.resolved === 'number' && isNaN(result.resolved)) {
|
|
result.resolved = this.$locale.baseText('expressionModalInput.null');
|
|
}
|
|
|
|
return result;
|
|
},
|
|
|
|
isUncalledExpressionExtension(resolvable: string) {
|
|
const end = resolvable
|
|
.replace(/^{{|}}$/g, '')
|
|
.trim()
|
|
.split('.')
|
|
.pop();
|
|
|
|
return end !== undefined && this.expressionExtensionNames.has(end);
|
|
},
|
|
},
|
|
});
|