* 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>
316 lines
6.8 KiB
Vue
316 lines
6.8 KiB
Vue
<template>
|
|
<div :class="$style.jsonDisplay">
|
|
<Suspense>
|
|
<run-data-json-actions
|
|
v-if="!editMode.enabled"
|
|
:node="node"
|
|
:sessioId="sessionId"
|
|
:displayMode="displayMode"
|
|
:distanceFromActive="distanceFromActive"
|
|
:selectedJsonPath="selectedJsonPath"
|
|
:jsonData="jsonData"
|
|
:paneType="paneType"
|
|
/>
|
|
</Suspense>
|
|
<draggable
|
|
type="mapping"
|
|
targetDataKey="mappable"
|
|
:disabled="!mappingEnabled"
|
|
@dragstart="onDragStart"
|
|
@dragend="onDragEnd"
|
|
>
|
|
<template #preview="{ canDrop, el }">
|
|
<MappingPill v-if="el" :html="getShortKey(el)" :can-drop="canDrop" />
|
|
</template>
|
|
<vue-json-pretty
|
|
:data="jsonData"
|
|
:deep="10"
|
|
:showLength="true"
|
|
:selectedValue="selectedJsonPath"
|
|
rootPath=""
|
|
selectableType="single"
|
|
class="json-data"
|
|
@update:selectedValue="selectedJsonPath = $event"
|
|
>
|
|
<template #renderNodeKey="{ node }">
|
|
<span
|
|
data-target="mappable"
|
|
:data-value="getJsonParameterPath(node.path)"
|
|
:data-name="node.key"
|
|
:data-path="node.path"
|
|
:data-depth="node.level"
|
|
:class="{
|
|
[$style.mappable]: mappingEnabled,
|
|
[$style.dragged]: draggingPath === node.path,
|
|
}"
|
|
>"{{ node.key }}"</span
|
|
>
|
|
</template>
|
|
<template #renderNodeValue="{ node }">
|
|
<span v-if="isNaN(node.index)">{{ getContent(node.content) }}</span>
|
|
<span
|
|
v-else
|
|
data-target="mappable"
|
|
:data-value="getJsonParameterPath(node.path)"
|
|
:data-name="getListItemName(node.path)"
|
|
:data-path="node.path"
|
|
:data-depth="node.level"
|
|
:class="{
|
|
[$style.mappable]: mappingEnabled,
|
|
[$style.dragged]: draggingPath === node.path,
|
|
}"
|
|
class="ph-no-capture"
|
|
>{{ getContent(node.content) }}</span
|
|
>
|
|
</template>
|
|
</vue-json-pretty>
|
|
</draggable>
|
|
</div>
|
|
</template>
|
|
|
|
<script lang="ts">
|
|
import { defineAsyncComponent, defineComponent, ref } from 'vue';
|
|
import type { PropType } from 'vue';
|
|
import VueJsonPretty from 'vue-json-pretty';
|
|
import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
|
|
import Draggable from '@/components/Draggable.vue';
|
|
import { executionDataToJson, isString, shorten } from '@/utils';
|
|
import type { INodeUi } from '@/Interface';
|
|
import { externalHooks } from '@/mixins/externalHooks';
|
|
import { mapStores } from 'pinia';
|
|
import { useNDVStore } from '@/stores/ndv.store';
|
|
import MappingPill from './MappingPill.vue';
|
|
import { getMappedExpression } from '@/utils/mappingUtils';
|
|
import { useWorkflowsStore } from '@/stores/workflows.store';
|
|
import { nonExistingJsonPath } from '@/constants';
|
|
|
|
const RunDataJsonActions = defineAsyncComponent(
|
|
async () => import('@/components/RunDataJsonActions.vue'),
|
|
);
|
|
|
|
export default defineComponent({
|
|
name: 'run-data-json',
|
|
mixins: [externalHooks],
|
|
components: {
|
|
VueJsonPretty,
|
|
Draggable,
|
|
RunDataJsonActions,
|
|
MappingPill,
|
|
},
|
|
props: {
|
|
editMode: {
|
|
type: Object as () => { enabled?: boolean; value?: string },
|
|
},
|
|
sessionId: {
|
|
type: String,
|
|
},
|
|
paneType: {
|
|
type: String,
|
|
},
|
|
node: {
|
|
type: Object as PropType<INodeUi>,
|
|
},
|
|
inputData: {
|
|
type: Array as PropType<INodeExecutionData[]>,
|
|
},
|
|
mappingEnabled: {
|
|
type: Boolean,
|
|
},
|
|
distanceFromActive: {
|
|
type: Number,
|
|
},
|
|
runIndex: {
|
|
type: Number,
|
|
},
|
|
totalRuns: {
|
|
type: Number,
|
|
},
|
|
},
|
|
setup() {
|
|
const selectedJsonPath = ref(nonExistingJsonPath);
|
|
const draggingPath = ref<null | string>(null);
|
|
const displayMode = ref('json');
|
|
|
|
return {
|
|
selectedJsonPath,
|
|
draggingPath,
|
|
displayMode,
|
|
};
|
|
},
|
|
computed: {
|
|
...mapStores(useNDVStore, useWorkflowsStore),
|
|
jsonData(): IDataObject[] {
|
|
return executionDataToJson(this.inputData);
|
|
},
|
|
},
|
|
methods: {
|
|
getShortKey(el: HTMLElement): string {
|
|
if (!el) {
|
|
return '';
|
|
}
|
|
|
|
return shorten(el.dataset.name || '', 16, 2);
|
|
},
|
|
getJsonParameterPath(path: string): string {
|
|
const subPath = path.replace(/^(\["?\d"?])/, ''); // remove item position
|
|
|
|
return getMappedExpression({
|
|
nodeName: this.node.name,
|
|
distanceFromActive: this.distanceFromActive,
|
|
path: subPath,
|
|
});
|
|
},
|
|
onDragStart(el: HTMLElement) {
|
|
if (el && el.dataset.path) {
|
|
this.draggingPath = el.dataset.path;
|
|
}
|
|
|
|
this.ndvStore.resetMappingTelemetry();
|
|
},
|
|
onDragEnd(el: HTMLElement) {
|
|
this.draggingPath = null;
|
|
|
|
setTimeout(() => {
|
|
const mappingTelemetry = this.ndvStore.mappingTelemetry;
|
|
const telemetryPayload = {
|
|
src_node_type: this.node.type,
|
|
src_field_name: el.dataset.name || '',
|
|
src_nodes_back: this.distanceFromActive,
|
|
src_run_index: this.runIndex,
|
|
src_runs_total: this.totalRuns,
|
|
src_field_nest_level: el.dataset.depth || 0,
|
|
src_view: 'json',
|
|
src_element: el,
|
|
success: false,
|
|
...mappingTelemetry,
|
|
};
|
|
|
|
void this.$externalHooks().run('runDataJson.onDragEnd', telemetryPayload);
|
|
|
|
this.$telemetry.track('User dragged data for mapping', telemetryPayload);
|
|
}, 1000); // ensure dest data gets set if drop
|
|
},
|
|
getContent(value: unknown): string {
|
|
return isString(value) ? `"${value}"` : JSON.stringify(value);
|
|
},
|
|
getListItemName(path: string): string {
|
|
return path.replace(/^(\["?\d"?]\.?)/g, '');
|
|
},
|
|
},
|
|
});
|
|
</script>
|
|
|
|
<style lang="scss" module>
|
|
.jsonDisplay {
|
|
position: absolute;
|
|
top: 0;
|
|
left: 0;
|
|
padding-left: var(--spacing-s);
|
|
right: 0;
|
|
overflow-y: auto;
|
|
line-height: 1.5;
|
|
word-break: normal;
|
|
height: 100%;
|
|
padding-bottom: var(--spacing-3xl);
|
|
background-color: var(--color-background-base);
|
|
|
|
&:hover {
|
|
/* Shows .actionsGroup element from <run-data-json-actions /> child component */
|
|
> div:first-child {
|
|
opacity: 1;
|
|
}
|
|
}
|
|
}
|
|
|
|
.mappable {
|
|
cursor: grab;
|
|
|
|
&:hover {
|
|
background-color: var(--color-json-highlight);
|
|
}
|
|
}
|
|
|
|
.dragged {
|
|
&,
|
|
&:hover {
|
|
background-color: var(--color-primary-tint-2);
|
|
}
|
|
}
|
|
</style>
|
|
|
|
<style lang="scss">
|
|
.vjs-tree {
|
|
color: var(--color-json-default);
|
|
}
|
|
|
|
.vjs-tree-node {
|
|
&:hover {
|
|
background-color: transparent;
|
|
}
|
|
|
|
&.is-highlight {
|
|
background-color: var(--color-json-highlight);
|
|
}
|
|
}
|
|
|
|
.vjs-key,
|
|
.vjs-value {
|
|
> span {
|
|
color: var(--color-text-dark);
|
|
line-height: 1.7;
|
|
border-radius: var(--border-radius-base);
|
|
}
|
|
}
|
|
|
|
.vjs-value {
|
|
> span {
|
|
padding: 0 var(--spacing-5xs) 0 var(--spacing-5xs);
|
|
margin-left: var(--spacing-5xs);
|
|
}
|
|
}
|
|
|
|
.vjs-tree .vjs-value-null {
|
|
&,
|
|
span {
|
|
color: var(--color-json-null);
|
|
}
|
|
}
|
|
|
|
.vjs-tree .vjs-value-boolean {
|
|
&,
|
|
span {
|
|
color: var(--color-json-boolean);
|
|
}
|
|
}
|
|
|
|
.vjs-tree .vjs-value-number {
|
|
&,
|
|
span {
|
|
color: var(--color-json-number);
|
|
}
|
|
}
|
|
|
|
.vjs-tree .vjs-value-string {
|
|
&,
|
|
span {
|
|
color: var(--color-json-string);
|
|
}
|
|
}
|
|
|
|
.vjs-tree .vjs-key {
|
|
color: var(--color-json-key);
|
|
}
|
|
|
|
.vjs-tree .vjs-tree__brackets {
|
|
color: var(--color-json-brackets);
|
|
}
|
|
|
|
.vjs-tree .vjs-tree__brackets:hover {
|
|
color: var(--color-json-brackets-hover);
|
|
}
|
|
|
|
.vjs-tree .vjs-tree__content.has-line {
|
|
border-left: 1px dotted var(--color-json-line);
|
|
}
|
|
</style>
|