mirror of
https://github.com/n8n-io/n8n.git
synced 2025-03-05 20:50:17 -08:00
fix(editor): Copy JSON from selected run if node has been multiple times (#13673)
This commit is contained in:
parent
72c535f583
commit
5eddf00fa1
|
@ -1827,6 +1827,7 @@ defineExpose({ enterEditMode });
|
|||
:mapping-enabled="mappingEnabled"
|
||||
:distance-from-active="distanceFromActive"
|
||||
:run-index="runIndex"
|
||||
:output-index="currentOutputIndex"
|
||||
:total-runs="maxRunIndex"
|
||||
:search="search"
|
||||
/>
|
||||
|
|
|
@ -29,6 +29,7 @@ const props = withDefaults(
|
|||
inputData: INodeExecutionData[];
|
||||
mappingEnabled?: boolean;
|
||||
distanceFromActive: number;
|
||||
outputIndex: number | undefined;
|
||||
runIndex: number | undefined;
|
||||
totalRuns: number | undefined;
|
||||
search: string | undefined;
|
||||
|
@ -45,7 +46,6 @@ const telemetry = useTelemetry();
|
|||
|
||||
const selectedJsonPath = ref(nonExistingJsonPath);
|
||||
const draggingPath = ref<null | string>(null);
|
||||
const displayMode = ref('json');
|
||||
const jsonDataContainer = ref(null);
|
||||
|
||||
const { height } = useElementSize(jsonDataContainer);
|
||||
|
@ -119,12 +119,13 @@ const getListItemName = (path: string) => {
|
|||
<LazyRunDataJsonActions
|
||||
v-if="!editMode.enabled"
|
||||
:node="node"
|
||||
:pane-type="paneType"
|
||||
:push-ref="pushRef"
|
||||
:display-mode="displayMode"
|
||||
:distance-from-active="distanceFromActive"
|
||||
:selected-json-path="selectedJsonPath"
|
||||
:json-data="jsonData"
|
||||
:pane-type="paneType"
|
||||
:output-index="outputIndex"
|
||||
:run-index="runIndex"
|
||||
/>
|
||||
</Suspense>
|
||||
<Draggable
|
||||
|
|
|
@ -0,0 +1,379 @@
|
|||
import { reactive } from 'vue';
|
||||
import { mock } from 'vitest-mock-extended';
|
||||
import { createPinia, setActivePinia } from 'pinia';
|
||||
import { waitFor, cleanup, fireEvent, within, screen } from '@testing-library/vue';
|
||||
|
||||
import RunDataJsonActions from './RunDataJsonActions.vue';
|
||||
import { nonExistingJsonPath, VIEWS } from '@/constants';
|
||||
import type { IWorkflowDb } from '@/Interface';
|
||||
import { useNDVStore } from '@/stores/ndv.store';
|
||||
import { useNodeTypesStore } from '@/stores/nodeTypes.store';
|
||||
import { useWorkflowsStore } from '@/stores/workflows.store';
|
||||
|
||||
import { createComponentRenderer } from '@/__tests__/render';
|
||||
import { setupServer } from '@/__tests__/server';
|
||||
import { defaultNodeDescriptions, mockNodes } from '@/__tests__/mocks';
|
||||
import { useI18n } from '@/composables/useI18n';
|
||||
|
||||
vi.mock('vue-router', () => {
|
||||
return {
|
||||
useRouter: () => ({}),
|
||||
useRoute: () => reactive({ meta: {} }),
|
||||
RouterLink: vi.fn(),
|
||||
};
|
||||
});
|
||||
|
||||
const copy = vi.fn();
|
||||
vi.mock('@/composables/useClipboard', () => ({
|
||||
useClipboard: () => ({
|
||||
copy,
|
||||
}),
|
||||
}));
|
||||
|
||||
const i18n = useI18n();
|
||||
|
||||
async function createPiniaWithActiveNode() {
|
||||
const node = mockNodes[0];
|
||||
const workflow = mock<IWorkflowDb>({
|
||||
id: '1',
|
||||
name: 'Test Workflow',
|
||||
versionId: '1',
|
||||
createdAt: new Date().toISOString(),
|
||||
updatedAt: new Date().toISOString(),
|
||||
active: true,
|
||||
connections: {},
|
||||
nodes: [node],
|
||||
});
|
||||
|
||||
const pinia = createPinia();
|
||||
setActivePinia(pinia);
|
||||
|
||||
const workflowsStore = useWorkflowsStore();
|
||||
const nodeTypesStore = useNodeTypesStore();
|
||||
const ndvStore = useNDVStore();
|
||||
|
||||
nodeTypesStore.setNodeTypes(defaultNodeDescriptions);
|
||||
workflowsStore.workflow = workflow;
|
||||
workflowsStore.nodeMetadata[node.name] = { pristine: true };
|
||||
workflowsStore.workflowExecutionData = {
|
||||
id: '1',
|
||||
finished: true,
|
||||
mode: 'trigger',
|
||||
status: 'success',
|
||||
createdAt: new Date(),
|
||||
startedAt: new Date(),
|
||||
workflowData: workflow,
|
||||
data: {
|
||||
resultData: {
|
||||
runData: {
|
||||
[node.name]: [
|
||||
{
|
||||
startTime: new Date().getTime(),
|
||||
executionTime: new Date().getTime(),
|
||||
data: {
|
||||
main: [
|
||||
[
|
||||
{
|
||||
json: {
|
||||
id: 1,
|
||||
name: 'First run 1',
|
||||
},
|
||||
},
|
||||
{
|
||||
json: {
|
||||
id: 2,
|
||||
name: 'First run 2',
|
||||
},
|
||||
},
|
||||
],
|
||||
],
|
||||
},
|
||||
source: [null],
|
||||
},
|
||||
{
|
||||
startTime: new Date().getTime(),
|
||||
executionTime: new Date().getTime(),
|
||||
data: {
|
||||
main: [
|
||||
[
|
||||
{
|
||||
json: {
|
||||
id: 3,
|
||||
name: 'Second run 1',
|
||||
},
|
||||
},
|
||||
],
|
||||
],
|
||||
},
|
||||
source: [null],
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
ndvStore.activeNodeName = node.name;
|
||||
|
||||
return {
|
||||
pinia,
|
||||
activeNode: ndvStore.activeNode,
|
||||
};
|
||||
}
|
||||
|
||||
describe('RunDataJsonActions', () => {
|
||||
let server: ReturnType<typeof setupServer>;
|
||||
|
||||
beforeEach(cleanup);
|
||||
|
||||
beforeAll(() => {
|
||||
document.body.innerHTML = '<div id="app-grid"></div>';
|
||||
server = setupServer();
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
copy.mockReset();
|
||||
vi.clearAllMocks();
|
||||
});
|
||||
|
||||
afterAll(() => {
|
||||
server.shutdown();
|
||||
});
|
||||
|
||||
it('should copy unselected JSON output from latest run on click', async () => {
|
||||
const { pinia, activeNode } = await createPiniaWithActiveNode();
|
||||
const renderComponent = createComponentRenderer(RunDataJsonActions, {
|
||||
props: {
|
||||
node: activeNode,
|
||||
paneType: 'output',
|
||||
pushRef: 'ref',
|
||||
displayMode: 'json',
|
||||
distanceFromActive: 0,
|
||||
selectedJsonPath: nonExistingJsonPath,
|
||||
jsonData: [
|
||||
{
|
||||
id: 3,
|
||||
name: 'Second run 1',
|
||||
},
|
||||
],
|
||||
outputIndex: 0,
|
||||
runIndex: 1,
|
||||
},
|
||||
global: {
|
||||
mocks: {
|
||||
$route: {
|
||||
name: VIEWS.WORKFLOW,
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
const { getByTestId } = renderComponent({
|
||||
pinia,
|
||||
});
|
||||
|
||||
await waitFor(() => expect(getByTestId('ndv-json-actions')).toBeInTheDocument());
|
||||
|
||||
const button = within(getByTestId('ndv-json-actions')).getByRole('button');
|
||||
|
||||
await fireEvent.click(button);
|
||||
|
||||
expect(copy).toHaveBeenCalledWith(
|
||||
JSON.stringify(
|
||||
[
|
||||
{
|
||||
id: 3,
|
||||
name: 'Second run 1',
|
||||
},
|
||||
],
|
||||
null,
|
||||
2,
|
||||
),
|
||||
);
|
||||
});
|
||||
|
||||
it('should copy unselected JSON output from selected previous run on click', async () => {
|
||||
const { pinia, activeNode } = await createPiniaWithActiveNode();
|
||||
const renderComponent = createComponentRenderer(RunDataJsonActions, {
|
||||
props: {
|
||||
node: activeNode,
|
||||
paneType: 'output',
|
||||
pushRef: 'ref',
|
||||
displayMode: 'json',
|
||||
distanceFromActive: 0,
|
||||
selectedJsonPath: nonExistingJsonPath,
|
||||
jsonData: [
|
||||
{
|
||||
id: 3,
|
||||
name: 'Second run 1',
|
||||
},
|
||||
],
|
||||
outputIndex: 0,
|
||||
runIndex: 0,
|
||||
},
|
||||
global: {
|
||||
mocks: {
|
||||
$route: {
|
||||
name: VIEWS.WORKFLOW,
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
const { getByTestId } = renderComponent({
|
||||
pinia,
|
||||
});
|
||||
|
||||
await waitFor(() => expect(getByTestId('ndv-json-actions')).toBeInTheDocument());
|
||||
|
||||
const button = within(getByTestId('ndv-json-actions')).getByRole('button');
|
||||
|
||||
await fireEvent.click(button);
|
||||
|
||||
expect(copy).toHaveBeenCalledWith(
|
||||
JSON.stringify(
|
||||
[
|
||||
{
|
||||
id: 1,
|
||||
name: 'First run 1',
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
name: 'First run 2',
|
||||
},
|
||||
],
|
||||
null,
|
||||
2,
|
||||
),
|
||||
);
|
||||
});
|
||||
|
||||
it("should copy selected JSON value on 'Copy Selection' click", async () => {
|
||||
const { pinia, activeNode } = await createPiniaWithActiveNode();
|
||||
const renderComponent = createComponentRenderer(RunDataJsonActions, {
|
||||
props: {
|
||||
node: activeNode,
|
||||
paneType: 'output',
|
||||
pushRef: 'ref',
|
||||
displayMode: 'json',
|
||||
distanceFromActive: 0,
|
||||
selectedJsonPath: '[0].name',
|
||||
jsonData: [
|
||||
{
|
||||
id: 3,
|
||||
name: 'Second run 1',
|
||||
},
|
||||
],
|
||||
outputIndex: 0,
|
||||
runIndex: 1,
|
||||
},
|
||||
global: {
|
||||
mocks: {
|
||||
$route: {
|
||||
name: VIEWS.WORKFLOW,
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
renderComponent({
|
||||
pinia,
|
||||
});
|
||||
|
||||
await waitFor(() =>
|
||||
expect(screen.getByText(i18n.baseText('runData.copyValue'))).toBeInTheDocument(),
|
||||
);
|
||||
|
||||
const option = screen.getByText(i18n.baseText('runData.copyValue'));
|
||||
|
||||
await fireEvent.click(option);
|
||||
|
||||
expect(copy).toHaveBeenCalledWith('Second run 1');
|
||||
});
|
||||
|
||||
it("should copy selected JSON value's item path on 'Copy Item Path' click", async () => {
|
||||
const { pinia, activeNode } = await createPiniaWithActiveNode();
|
||||
const renderComponent = createComponentRenderer(RunDataJsonActions, {
|
||||
props: {
|
||||
node: activeNode,
|
||||
paneType: 'output',
|
||||
pushRef: 'ref',
|
||||
displayMode: 'json',
|
||||
distanceFromActive: 0,
|
||||
selectedJsonPath: '[0].name',
|
||||
jsonData: [
|
||||
{
|
||||
id: 3,
|
||||
name: 'Second run 1',
|
||||
},
|
||||
],
|
||||
outputIndex: 0,
|
||||
runIndex: 1,
|
||||
},
|
||||
global: {
|
||||
mocks: {
|
||||
$route: {
|
||||
name: VIEWS.WORKFLOW,
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
renderComponent({
|
||||
pinia,
|
||||
});
|
||||
|
||||
await waitFor(() =>
|
||||
expect(screen.getByText(i18n.baseText('runData.copyItemPath'))).toBeInTheDocument(),
|
||||
);
|
||||
|
||||
const option = screen.getByText(i18n.baseText('runData.copyItemPath'));
|
||||
|
||||
await fireEvent.click(option);
|
||||
|
||||
expect(copy).toHaveBeenCalledWith('{{ $item("0").$node["Manual Trigger"].json["name"] }}');
|
||||
});
|
||||
|
||||
it("should copy selected JSON value's parameter path on 'Copy Parameter Path' click", async () => {
|
||||
const { pinia, activeNode } = await createPiniaWithActiveNode();
|
||||
const renderComponent = createComponentRenderer(RunDataJsonActions, {
|
||||
props: {
|
||||
node: activeNode,
|
||||
paneType: 'output',
|
||||
pushRef: 'ref',
|
||||
displayMode: 'json',
|
||||
distanceFromActive: 0,
|
||||
selectedJsonPath: '[0].name',
|
||||
jsonData: [
|
||||
{
|
||||
id: 3,
|
||||
name: 'Second run 1',
|
||||
},
|
||||
],
|
||||
outputIndex: 0,
|
||||
runIndex: 1,
|
||||
},
|
||||
global: {
|
||||
mocks: {
|
||||
$route: {
|
||||
name: VIEWS.WORKFLOW,
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
renderComponent({
|
||||
pinia,
|
||||
});
|
||||
|
||||
await waitFor(() =>
|
||||
expect(screen.getByText(i18n.baseText('runData.copyParameterPath'))).toBeInTheDocument(),
|
||||
);
|
||||
|
||||
const option = screen.getByText(i18n.baseText('runData.copyParameterPath'));
|
||||
|
||||
await fireEvent.click(option);
|
||||
|
||||
expect(copy).toHaveBeenCalledWith('{{ $node["Manual Trigger"].json["name"] }}');
|
||||
});
|
||||
});
|
|
@ -26,12 +26,11 @@ const props = withDefaults(
|
|||
node: INodeUi;
|
||||
paneType: string;
|
||||
pushRef: string;
|
||||
displayMode: string;
|
||||
distanceFromActive: number;
|
||||
selectedJsonPath: string;
|
||||
jsonData: IDataObject[];
|
||||
currentOutputIndex?: number;
|
||||
runIndex?: number;
|
||||
outputIndex: number | undefined;
|
||||
runIndex: number | undefined;
|
||||
}>(),
|
||||
{
|
||||
selectedJsonPath: nonExistingJsonPath,
|
||||
|
@ -71,7 +70,7 @@ function getJsonValue(): string {
|
|||
selectedValue = clearJsonKey(pinnedData.data.value as object);
|
||||
} else {
|
||||
selectedValue = executionDataToJson(
|
||||
nodeHelpers.getNodeInputData(props.node, props.runIndex, props.currentOutputIndex),
|
||||
nodeHelpers.getNodeInputData(props.node, props.runIndex, props.outputIndex),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
@ -176,7 +175,7 @@ function handleCopyClick(commandData: { command: string }) {
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<div :class="$style.actionsGroup">
|
||||
<div :class="$style.actionsGroup" data-test-id="ndv-json-actions">
|
||||
<n8n-icon-button
|
||||
v-if="noSelection"
|
||||
:title="i18n.baseText('runData.copyToClipboard')"
|
||||
|
|
Loading…
Reference in a new issue