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(Filter Node): Show discarded items

Browse source
This commit is contained in:
Michael Kret 2023-03-31 10:27:33 +03:00 committed by GitHub
parent 11692c55f3
commit f7f9d915b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -476,6 +476,7 @@ import {
import { import {
DATA_PINNING_DOCS_URL, DATA_PINNING_DOCS_URL,
DATA_EDITING_DOCS_URL, DATA_EDITING_DOCS_URL,
NODE_TYPES_EXCLUDED_FROM_OUTPUT_NAME_APPEND,
LOCAL_STORAGE_PIN_DATA_DISCOVERY_NDV_FLAG, LOCAL_STORAGE_PIN_DATA_DISCOVERY_NDV_FLAG,
LOCAL_STORAGE_PIN_DATA_DISCOVERY_CANVAS_FLAG, LOCAL_STORAGE_PIN_DATA_DISCOVERY_CANVAS_FLAG,
MAX_DISPLAY_DATA_SIZE, MAX_DISPLAY_DATA_SIZE,
@ -834,6 +835,7 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
return name.charAt(0).toLocaleUpperCase() + name.slice(1); return name.charAt(0).toLocaleUpperCase() + name.slice(1);
} }
const branches: ITab[] = []; const branches: ITab[] = [];
for (let i = 0; i <= this.maxOutputIndex; i++) { for (let i = 0; i <= this.maxOutputIndex; i++) {
if (this.overrideOutputs && !this.overrideOutputs.includes(i)) { if (this.overrideOutputs && !this.overrideOutputs.includes(i)) {
continue; continue;
@ -844,9 +846,12 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
if (`${outputName}` === `${i}`) { if (`${outputName}` === `${i}`) {
outputName = `${this.$locale.baseText('ndv.output')} ${outputName}`; outputName = `${this.$locale.baseText('ndv.output')} ${outputName}`;
} else { } else {
outputName = capitalize( const appendBranchWord = NODE_TYPES_EXCLUDED_FROM_OUTPUT_NAME_APPEND.includes(
`${this.getOutputName(i)} ${this.$locale.baseText('ndv.output.branch')}`, this.node?.type,
); )
? ''
: ` ${this.$locale.baseText('ndv.output.branch')}`;
outputName = capitalize(`${this.getOutputName(i)}${appendBranchWord}`);
} }
branches.push({ branches.push({
label: itemsCount ? `${outputName} (${itemsCount} ${items})` : outputName, label: itemsCount ? `${outputName} (${itemsCount} ${items})` : outputName,

3
packages/editor-ui/src/constants.ts
View file

@ -85,6 +85,7 @@ export const CALENDLY_TRIGGER_NODE_TYPE = 'n8n-nodes-base.calendlyTrigger';
export const CODE_NODE_TYPE = 'n8n-nodes-base.code'; export const CODE_NODE_TYPE = 'n8n-nodes-base.code';
export const CRON_NODE_TYPE = 'n8n-nodes-base.cron'; export const CRON_NODE_TYPE = 'n8n-nodes-base.cron';
export const CLEARBIT_NODE_TYPE = 'n8n-nodes-base.clearbit'; export const CLEARBIT_NODE_TYPE = 'n8n-nodes-base.clearbit';
export const FILTER_NODE_TYPE = 'n8n-nodes-base.filter';
export const FUNCTION_NODE_TYPE = 'n8n-nodes-base.function'; export const FUNCTION_NODE_TYPE = 'n8n-nodes-base.function';
export const GITHUB_TRIGGER_NODE_TYPE = 'n8n-nodes-base.githubTrigger'; export const GITHUB_TRIGGER_NODE_TYPE = 'n8n-nodes-base.githubTrigger';
export const GIT_NODE_TYPE = 'n8n-nodes-base.git'; export const GIT_NODE_TYPE = 'n8n-nodes-base.git';
@ -540,3 +541,5 @@ export const ONBOARDING_EXPERIMENT = {
}; };
export const EXPERIMENTS_TO_TRACK = [ASSUMPTION_EXPERIMENT.name, ONBOARDING_EXPERIMENT.name]; export const EXPERIMENTS_TO_TRACK = [ASSUMPTION_EXPERIMENT.name, ONBOARDING_EXPERIMENT.name];
export const NODE_TYPES_EXCLUDED_FROM_OUTPUT_NAME_APPEND = [FILTER_NODE_TYPE];

16
packages/nodes-base/nodes/Filter/Filter.node.ts
View file

@ -23,6 +23,7 @@ export class Filter implements INodeType {
}, },
inputs: ['main'], inputs: ['main'],
outputs: ['main'], outputs: ['main'],
outputNames: ['Kept', 'Discarded'],
properties: [ properties: [
{ {
displayName: 'Conditions', displayName: 'Conditions',
@ -305,7 +306,8 @@ export class Filter implements INodeType {
}; };
async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> { async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
const returnData: INodeExecutionData[] = []; const returnDataTrue: INodeExecutionData[] = [];
const returnDataFalse: INodeExecutionData[] = [];
const items = this.getInputData(); const items = this.getInputData();
@ -340,21 +342,27 @@ export class Filter implements INodeType {
// If the operation is "OR" it means the item did match one condition no ned to check further // If the operation is "OR" it means the item did match one condition no ned to check further
if (compareResult && combineConditions === 'OR') { if (compareResult && combineConditions === 'OR') {
returnData.push(item); returnDataTrue.push(item);
continue itemLoop; continue itemLoop;
} }
// If the operation is "AND" it means the item failed one condition no ned to check further // If the operation is "AND" it means the item failed one condition no ned to check further
if (!compareResult && combineConditions === 'AND') { if (!compareResult && combineConditions === 'AND') {
returnDataFalse.push(item);
continue itemLoop; continue itemLoop;
} }
} }
} }
// If the operation is "AND" it means the item did match all conditions // If the operation is "AND" it means the item did match all conditions
if (combineConditions === 'AND') returnData.push(item); if (combineConditions === 'AND') {
returnDataTrue.push(item);
} else {
// If the operation is "OR" it means the the item did not match any condition.
returnDataFalse.push(item);
}
} }
return [returnData]; return [returnDataTrue, returnDataFalse];
} }
} }