Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(editor): Update copy: Execute --> Test #8137

Merged
merged 14 commits into from
Jan 5, 2024
Merged

feat(editor): Update copy: Execute --> Test #8137

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d1e9d39
chore(editor): Update copy: 'Execute' --> 'Test'
RicardoE105 Dec 21, 2023
dc00956
update copy on missing properties
RicardoE105 Dec 22, 2023
66be690
update snapshot
RicardoE105 Dec 22, 2023
fe70be6
update cypress test
RicardoE105 Dec 22, 2023
cd3f94e
update more copies
RicardoE105 Dec 22, 2023
fb27391
update copy
RicardoE105 Dec 27, 2023
f75fea9
update e2e tests
RicardoE105 Dec 27, 2023
07d8371
sync master
RicardoE105 Dec 29, 2023
b61983b
fix linting issue
RicardoE105 Jan 2, 2024
15abc7e
apply feedback
RicardoE105 Jan 3, 2024
3cdc228
Merge branch 'master' into ado-129-update-copy-execute-test
RicardoE105 Jan 3, 2024
8a438ae
fix e2e test
RicardoE105 Jan 4, 2024
ff448b7
sync master
RicardoE105 Jan 4, 2024
c858ed9
fix e2e test
RicardoE105 Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cypress/e2e/13-pinning.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ describe('Data pinning', () => {
});

function setExpressionOnStringValueInSet(expression: string) {
cy.get('button').contains('Execute node').click();
cy.get('button').contains('Test node').click();
cy.get('.fixed-collection-parameter > :nth-child(2) > .button > span').click();

ndv.getters.nthParam(4).contains('Expression').invoke('show').click();
Expand Down
2 changes: 1 addition & 1 deletion packages/editor-ui/src/components/Node.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
text
icon="play"
:disabled="workflowRunning || isConfigNode"
:title="$locale.baseText('node.executeNode')"
:title="$locale.baseText('node.testNode')"
@click="executeNode"
/>
<n8n-icon-button
Expand Down
3 changes: 2 additions & 1 deletion packages/editor-ui/src/components/NodeExecuteButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
:icon="isFormTriggerNode && 'flask'"
:transparentBackground="transparent"
@click="onClick"
:title="$locale.baseText('ndv.execute.testNode.description')"
/>
</div>
</n8n-tooltip>
Expand Down Expand Up @@ -201,7 +202,7 @@ export default defineComponent({
return this.$locale.baseText('ndv.execute.listenForEvent');
RicardoE105 marked this conversation as resolved.
Show resolved Hide resolved
}

return this.$locale.baseText('ndv.execute.executeNode');
return this.$locale.baseText('ndv.execute.testNode');
},
},
methods: {
Expand Down
6 changes: 3 additions & 3 deletions packages/editor-ui/src/composables/__tests__/__snapshots__/useContextMenu.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ exports[`useContextMenu > Read-only mode > should return the correct actions whe
{
"disabled": true,
"id": "execute",
"label": "Execute node",
"label": "Test node",
},
{
"disabled": true,
Expand Down Expand Up @@ -181,7 +181,7 @@ exports[`useContextMenu > should return the correct actions opening the menu fro
{
"disabled": false,
"id": "execute",
"label": "Execute node",
"label": "Test node",
},
{
"disabled": false,
Expand Down Expand Up @@ -279,7 +279,7 @@ exports[`useContextMenu > should return the correct actions when right clicking
{
"disabled": false,
"id": "execute",
"label": "Execute node",
"label": "Test node",
},
{
"disabled": false,
Expand Down
2 changes: 1 addition & 1 deletion packages/editor-ui/src/composables/useContextMenu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ export const useContextMenu = (onAction: ContextMenuActionCallback = () => {}) =
},
{
id: 'execute',
label: i18n.baseText('contextMenu.execute'),
label: i18n.baseText('contextMenu.test'),
disabled: isReadOnly.value,
},
{
Expand Down
13 changes: 7 additions & 6 deletions packages/editor-ui/src/plugins/i18n/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,8 @@
"multipleParameter.moveUp": "Move up",
"ndv.backToCanvas": "Back to canvas",
"ndv.backToCanvas.waitingForTriggerWarning": "Waiting for a Trigger node to execute. Close this view to see the Workflow Canvas.",
"ndv.execute.executeNode": "Execute node",
"ndv.execute.testNode": "Test node",
"ndv.execute.testNode.description": "Runs the current node. Will also run previous nodes if they have not been run yet",
"ndv.execute.executing": "Executing",
"ndv.execute.fetchEvent": "Fetch Test Event",
"ndv.execute.fixPrevious": "Fix previous node first",
Expand Down Expand Up @@ -806,7 +807,7 @@
"ndv.output.runNodeHint": "Execute this node to output data",
"ndv.output.runNodeHintSubNode": "Output will appear here once the parent node is run",
"ndv.output.insertTestData": "insert test data",
"ndv.output.staleDataWarning.regular": "Node parameters have changed.<br>Execute node again to refresh output.",
"ndv.output.staleDataWarning.regular": "Node parameters have changed.<br>Test node again to refresh output.",
"ndv.output.staleDataWarning.pinData": "Node parameter changes will not affect pinned output data.",
"ndv.output.tooMuchData.message": "The node contains {size} MB of data. Displaying it may cause problems. <br /> If you do decide to display it, avoid the JSON view.",
"ndv.output.tooMuchData.showDataAnyway": "Show data anyway",
Expand Down Expand Up @@ -838,7 +839,7 @@
"node.activateDeactivateNode": "Activate/Deactivate Node",
"node.changeColor": "Change color",
"node.disabled": "Disabled",
"node.executeNode": "Execute node",
"node.testNode": "Test node",
"node.deleteNode": "Delete node",
"node.issues": "Issues",
"node.nodeIsExecuting": "Node is executing",
Expand Down Expand Up @@ -1053,7 +1054,7 @@
"nodeView.redirecting": "Redirecting",
"nodeView.refresh": "Refresh",
"nodeView.resetZoom": "Reset Zoom",
"nodeView.runButtonText.executeWorkflow": "Execute Workflow",
"nodeView.runButtonText.testWorkflow": "Test Workflow",
"nodeView.runButtonText.executingWorkflow": "Executing Workflow",
"nodeView.runButtonText.waitingForTriggerEvent": "Waiting for Trigger Event",
"nodeView.showError.workflowError": "Workflow execution finished with an error",
Expand Down Expand Up @@ -1101,7 +1102,7 @@
"contextMenu.deselectAll": "Clear selection",
"contextMenu.duplicate": "Duplicate {subject} | Duplicate {count} {subject}",
"contextMenu.open": "Open node...",
"contextMenu.execute": "Execute node",
"contextMenu.test": "Test node",
"contextMenu.rename": "Rename node",
"contextMenu.copy": "Copy {subject} | Copy {count} {subject}",
"contextMenu.deactivate": "Deactivate {subject} | Deactivate {count} {subject}",
Expand Down Expand Up @@ -1338,7 +1339,7 @@
"runData.editOutputInvalid.atPosition": "(at position {position})",
"runData.editValue": "Edit Value",
"runData.downloadBinaryData": "Download",
"runData.executeNode": "Execute Node",
"runData.executeNode": "Test Node",
"runData.executionTime": "Execution Time",
"runData.fileExtension": "File Extension",
"runData.fileName": "File Name",
Expand Down
4 changes: 2 additions & 2 deletions packages/editor-ui/src/views/NodeView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
:loading="workflowRunning"
:label="runButtonText"
size="large"
icon="play-circle"
icon="flask"
type="primary"
:disabled="isExecutionDisabled"
data-test-id="execute-workflow-button"
Expand Down Expand Up @@ -607,7 +607,7 @@ export default defineComponent({
},
runButtonText(): string {
if (!this.workflowRunning) {
return this.$locale.baseText('nodeView.runButtonText.executeWorkflow');
return this.$locale.baseText('nodeView.runButtonText.testWorkflow');
RicardoE105 marked this conversation as resolved.
Show resolved Hide resolved
}

if (this.executionWaitingForWebhook) {
Expand Down
Loading