mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(editor): Update Sub-Workflow Debugging Copy (#12483)

Browse source
This commit is contained in:
Charlie Kolb 2025-01-07 17:06:16 +01:00 committed by GitHub
parent cc008f9239
commit 04e2928d34
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cypress/e2e/47-subworkflow-debugging.cy.ts
View file

@ -40,7 +40,7 @@ describe('Subworkflow debugging', () => {
openNode('Execute Workflow with param'); openNode('Execute Workflow with param');
getOutputPanelItemsCount().should('contain.text', '2 items, 1 sub-execution'); getOutputPanelItemsCount().should('contain.text', '2 items, 1 sub-execution');
getOutputPanelRelatedExecutionLink().should('contain.text', 'Inspect Sub-Execution'); getOutputPanelRelatedExecutionLink().should('contain.text', 'View sub-execution');
getOutputPanelRelatedExecutionLink().should('have.attr', 'href'); getOutputPanelRelatedExecutionLink().should('have.attr', 'href');
// ensure workflow executed and waited on output // ensure workflow executed and waited on output
@ -64,7 +64,7 @@ describe('Subworkflow debugging', () => {
openNode('Execute Workflow with param2'); openNode('Execute Workflow with param2');
getOutputPanelItemsCount().should('not.exist'); getOutputPanelItemsCount().should('not.exist');
getOutputPanelRelatedExecutionLink().should('contain.text', 'Inspect Sub-Execution'); getOutputPanelRelatedExecutionLink().should('contain.text', 'View sub-execution');
getOutputPanelRelatedExecutionLink().should('have.attr', 'href'); getOutputPanelRelatedExecutionLink().should('have.attr', 'href');
// ensure workflow executed but returned same data as input // ensure workflow executed but returned same data as input
@ -109,7 +109,7 @@ describe('Subworkflow debugging', () => {
openNode('Execute Workflow with param'); openNode('Execute Workflow with param');
getOutputPanelItemsCount().should('contain.text', '2 items, 1 sub-execution'); getOutputPanelItemsCount().should('contain.text', '2 items, 1 sub-execution');
getOutputPanelRelatedExecutionLink().should('contain.text', 'Inspect Sub-Execution'); getOutputPanelRelatedExecutionLink().should('contain.text', 'View sub-execution');
getOutputPanelRelatedExecutionLink().should('have.attr', 'href'); getOutputPanelRelatedExecutionLink().should('have.attr', 'href');
// ensure workflow executed and waited on output // ensure workflow executed and waited on output
@ -125,7 +125,7 @@ describe('Subworkflow debugging', () => {
getExecutionPreviewOutputPanelRelatedExecutionLink().should( getExecutionPreviewOutputPanelRelatedExecutionLink().should(
'include.text', 'include.text',
'Inspect Parent Execution', 'View parent execution',
); );
getExecutionPreviewOutputPanelRelatedExecutionLink() getExecutionPreviewOutputPanelRelatedExecutionLink()

8
packages/editor-ui/src/components/RunData.test.ts
View file

@ -282,7 +282,7 @@ describe('RunData', () => {
}); });
expect(getByTestId('related-execution-link')).toBeInTheDocument(); expect(getByTestId('related-execution-link')).toBeInTheDocument();
expect(getByTestId('related-execution-link')).toHaveTextContent('Inspect Sub-Execution 123'); expect(getByTestId('related-execution-link')).toHaveTextContent('View sub-execution');
expect(resolveRelatedExecutionUrl).toHaveBeenCalledWith(metadata); expect(resolveRelatedExecutionUrl).toHaveBeenCalledWith(metadata);
expect(getByTestId('related-execution-link')).toHaveAttribute('href', MOCK_EXECUTION_URL); expect(getByTestId('related-execution-link')).toHaveAttribute('href', MOCK_EXECUTION_URL);
@ -311,7 +311,7 @@ describe('RunData', () => {
}); });
expect(getByTestId('related-execution-link')).toBeInTheDocument(); expect(getByTestId('related-execution-link')).toBeInTheDocument();
expect(getByTestId('related-execution-link')).toHaveTextContent('Inspect Parent Execution 123'); expect(getByTestId('related-execution-link')).toHaveTextContent('View parent execution');
expect(resolveRelatedExecutionUrl).toHaveBeenCalledWith(metadata); expect(resolveRelatedExecutionUrl).toHaveBeenCalledWith(metadata);
expect(getByTestId('related-execution-link')).toHaveAttribute('href', MOCK_EXECUTION_URL); expect(getByTestId('related-execution-link')).toHaveAttribute('href', MOCK_EXECUTION_URL);
@ -344,7 +344,7 @@ describe('RunData', () => {
}); });
expect(getByTestId('related-execution-link')).toBeInTheDocument(); expect(getByTestId('related-execution-link')).toBeInTheDocument();
expect(getByTestId('related-execution-link')).toHaveTextContent('Inspect Sub-Execution 123'); expect(getByTestId('related-execution-link')).toHaveTextContent('View sub-execution 123');
expect(resolveRelatedExecutionUrl).toHaveBeenCalledWith(metadata); expect(resolveRelatedExecutionUrl).toHaveBeenCalledWith(metadata);
expect(getByTestId('related-execution-link')).toHaveAttribute('href', MOCK_EXECUTION_URL); expect(getByTestId('related-execution-link')).toHaveAttribute('href', MOCK_EXECUTION_URL);
@ -389,7 +389,7 @@ describe('RunData', () => {
}); });
expect(getByTestId('related-execution-link')).toBeInTheDocument(); expect(getByTestId('related-execution-link')).toBeInTheDocument();
expect(getByTestId('related-execution-link')).toHaveTextContent('Inspect Sub-Execution 123'); expect(getByTestId('related-execution-link')).toHaveTextContent('View sub-execution 123');
expect(queryByTestId('ndv-items-count')).not.toBeInTheDocument(); expect(queryByTestId('ndv-items-count')).not.toBeInTheDocument();
expect(getByTestId('run-selector')).toBeInTheDocument(); expect(getByTestId('run-selector')).toBeInTheDocument();

10
packages/editor-ui/src/components/RunData.vue
View file

@ -1263,9 +1263,13 @@ function getExecutionLinkLabel(task: ITaskMetadata): string | undefined {
} }
if (task.subExecution) { if (task.subExecution) {
return i18n.baseText('runData.openSubExecution', { if (activeTaskMetadata.value?.subExecutionsCount === 1) {
interpolate: { id: task.subExecution.executionId }, return i18n.baseText('runData.openSubExecutionSingle');
}); } else {
return i18n.baseText('runData.openSubExecutionWithId', {
interpolate: { id: task.subExecution.executionId },
});
}
} }
return; return;

2
packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue
View file

@ -149,7 +149,7 @@ const outputError = computed(() => {
> >
<N8nIcon icon="external-link-alt" size="xsmall" /> <N8nIcon icon="external-link-alt" size="xsmall" />
{{ {{
i18n.baseText('runData.openSubExecution', { i18n.baseText('runData.openSubExecutionWithId', {
interpolate: { interpolate: {
id: runMeta.subExecution?.executionId, id: runMeta.subExecution?.executionId,
}, },

4
packages/editor-ui/src/components/RunDataTable.vue
View file

@ -439,7 +439,7 @@ watch(focusedMappableInput, (curr) => {
> >
<N8nTooltip <N8nTooltip
:content=" :content="
i18n.baseText('runData.table.inspectSubExecution', { i18n.baseText('runData.table.viewSubExecution', {
interpolate: { interpolate: {
id: `${tableData.metadata.data[index1]?.subExecution.executionId}`, id: `${tableData.metadata.data[index1]?.subExecution.executionId}`,
}, },
@ -575,7 +575,7 @@ watch(focusedMappableInput, (curr) => {
> >
<N8nTooltip <N8nTooltip
:content=" :content="
i18n.baseText('runData.table.inspectSubExecution', { i18n.baseText('runData.table.viewSubExecution', {
interpolate: { interpolate: {
id: `${tableData.metadata.data[index1]?.subExecution.executionId}`, id: `${tableData.metadata.data[index1]?.subExecution.executionId}`,
}, },

7
packages/editor-ui/src/plugins/i18n/locales/en.json
View file

@ -1600,8 +1600,9 @@
"resourceMapper.staleDataWarning.notice": "Refresh to see the updated fields", "resourceMapper.staleDataWarning.notice": "Refresh to see the updated fields",
"resourceMapper.attemptToConvertTypes.displayName": "Attempt to convert types", "resourceMapper.attemptToConvertTypes.displayName": "Attempt to convert types",
"resourceMapper.attemptToConvertTypes.description": "Attempt to convert types when mapping fields", "resourceMapper.attemptToConvertTypes.description": "Attempt to convert types when mapping fields",
"runData.openSubExecution": "Inspect Sub-Execution {id}", "runData.openSubExecutionSingle": "View sub-execution",
"runData.openParentExecution": "Inspect Parent Execution {id}", "runData.openSubExecutionWithId": "View sub-execution {id}",
"runData.openParentExecution": "View parent execution {id}",
"runData.emptyItemHint": "This is an item, but it's empty.", "runData.emptyItemHint": "This is an item, but it's empty.",
"runData.emptyArray": "[empty array]", "runData.emptyArray": "[empty array]",
"runData.emptyString": "[empty]", "runData.emptyString": "[empty]",
@ -1649,7 +1650,7 @@
"runData.showBinaryData": "View", "runData.showBinaryData": "View",
"runData.startTime": "Start Time", "runData.startTime": "Start Time",
"runData.table": "Table", "runData.table": "Table",
"runData.table.inspectSubExecution": "Inspect sub-execution {id}", "runData.table.viewSubExecution": "View sub-execution {id}",
"runData.pindata.learnMore": "Learn more", "runData.pindata.learnMore": "Learn more",
"runData.pindata.thisDataIsPinned": "This data is pinned.", "runData.pindata.thisDataIsPinned": "This data is pinned.",
"runData.pindata.unpin": "Unpin", "runData.pindata.unpin": "Unpin",