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

chore(Execute Workflow Node): Update text copy for ExecuteWorkflow node and ResourceMapper #12277

Merged
merged 6 commits into from
Dec 20, 2024
Merged

chore(Execute Workflow Node): Update text copy for ExecuteWorkflow node and ResourceMapper #12277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0286e04
Copy
CharlieKolb Dec 18, 2024
1906bae
Merge remote-tracking branch 'origin/feature-sub-workflow-inputs' int…
CharlieKolb Dec 19, 2024
0f3bbbc
lockfile
CharlieKolb Dec 19, 2024
5597987
Merge branch 'feature-sub-workflow-inputs' into ADO-2972
CharlieKolb Dec 19, 2024
3841e7f
lint
CharlieKolb Dec 19, 2024
51535e7
fix test
CharlieKolb Dec 19, 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 packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/ToolWorkflow.node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { ToolWorkflowV2 } from './v2/ToolWorkflowV2.node';
export class ToolWorkflow extends VersionedNodeType {
constructor() {
const baseDescription: INodeTypeBaseDescription = {
displayName: 'Call n8n Workflow Tool',
displayName: 'Call n8n Sub-Workflow Tool',
name: 'toolWorkflow',
icon: 'fa:network-wired',
group: ['transform'],
Expand Down
3 changes: 1 addition & 2 deletions packages/core/src/node-execution-context/workflow-node-context.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ export class LoadWorkflowNodeContext extends NodeExecutionContext implements IWo
this.getNodeParameter = ((
parameterName: string,
itemIndex: number,
// eslint-disable-next-line @typescript-eslint/no-explicit-any
fallbackValue?: any,
fallbackValue?: unknown,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops, this is from my review, lets leave it in rather than restart CI? It's a safe change.

options?: IGetNodeParameterOptions,
) =>
this._getNodeParameter(
Expand Down
2 changes: 1 addition & 1 deletion packages/editor-ui/src/components/ResourceMapper.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ describe('ResourceMapper.vue', () => {
expect(
getByText('Look for incoming data that matches the foos in the service'),
).toBeInTheDocument();
expect(getByText('Foos to Match On')).toBeInTheDocument();
expect(getByText('Foos to match on')).toBeInTheDocument();
expect(
getByText(
'The foos to use when matching rows in the service to the input items of this node. Usually an ID.',
Expand Down
4 changes: 2 additions & 2 deletions packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ defineExpose({
:title="
locale.baseText('resourceMapper.removeField', {
interpolate: {
fieldWord: singularFieldWordCapitalized,
fieldWord: singularFieldWord,
},
})
"
Expand Down Expand Up @@ -391,7 +391,7 @@ defineExpose({
<N8nSelect
:placeholder="
locale.baseText('resourceMapper.addFieldToSend', {
interpolate: { fieldWord: singularFieldWordCapitalized },
interpolate: { fieldWord: singularFieldWord },
})
"
size="small"
Expand Down
4 changes: 2 additions & 2 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 @@ -1572,7 +1572,7 @@
"resourceMapper.fetchingFields.message": "Fetching {fieldWord}",
"resourceMapper.fetchingFields.errorMessage": "Can't get {fieldWord}.",
"resourceMapper.fetchingFields.noFieldsFound": "No {fieldWord} found in {serviceName}.",
"resourceMapper.columnsToMatchOn.label": "{fieldWord} to Match On",
"resourceMapper.columnsToMatchOn.label": "{fieldWord} to match on",
"resourceMapper.columnsToMatchOn.multi.description": "The {fieldWord} to use when matching rows in {nodeDisplayName} to the input items of this node. Usually an ID.",
"resourceMapper.columnsToMatchOn.single.description": "The {fieldWord} to use when matching rows in {nodeDisplayName} to the input items of this node. Usually an ID.",
"resourceMapper.columnsToMatchOn.tooltip": "The {fieldWord} to compare when finding the rows to update",
Expand All @@ -1583,7 +1583,7 @@
"resourceMapper.usingToMatch.description": "This {fieldWord} won't be updated and can't be removed, as it's used for matching",
"resourceMapper.removeField": "Remove {fieldWord}",
"resourceMapper.mandatoryField.title": "This {fieldWord} is mandatory and can’t be removed",
"resourceMapper.addFieldToSend": "Add {fieldWord} to Send",
"resourceMapper.addFieldToSend": "Add {fieldWord} to send",
"resourceMapper.matching.title": "This {fieldWord} is used for matching and can’t be removed",
"resourceMapper.addAllFields": "Add All {fieldWord}",
"resourceMapper.removeAllFields": "Remove All {fieldWord}",
Expand Down
4 changes: 2 additions & 2 deletions packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,8 @@ export class ExecuteWorkflow implements INodeType {
valuesLabel: 'Workflow Inputs',
mode: 'map',
fieldWords: {
singular: 'workflow input',
plural: 'workflow inputs',
singular: 'input',
plural: 'inputs',
},
addAllFields: true,
multiKeyMatch: false,
Expand Down
14 changes: 9 additions & 5 deletions ...es/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,22 +83,26 @@ export class ExecuteWorkflowTrigger implements INodeType {
default: '',
},
{
displayName: 'Input Source',
// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
Copy link
Contributor Author

@CharlieKolb CharlieKolb Dec 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably update this since we're committing to lower case dropdowns. 155 exceptions means it's not a good rule :D

displayName: 'Input data mode',
name: INPUT_SOURCE,
type: 'options',
options: [
{
name: 'Using Fields Below',
// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
name: 'Define using fields below',
value: WORKFLOW_INPUTS,
description: 'Provide input fields via UI',
},
{
name: 'Using JSON Example',
// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
name: 'Define using JSON example',
value: JSON_EXAMPLE,
description: 'Generate a schema from an example JSON object',
},
{
name: 'Using Parent Workflow Data',
// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
name: 'Accept all data',
value: PASSTHROUGH,
description: 'Use all incoming data from the parent workflow',
},
Expand Down Expand Up @@ -141,7 +145,7 @@ export class ExecuteWorkflowTrigger implements INodeType {
{
displayName: 'Workflow Inputs',
name: WORKFLOW_INPUTS,
placeholder: 'Add Field',
placeholder: 'Add field',
type: 'fixedCollection',
description:
'Define expected input fields. If no inputs are provided, all data from the calling workflow will be passed through.',
Expand Down
3 changes: 2 additions & 1 deletion pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading