From b689d2d7c28eb90c8979aba5bbc2f75867289505 Mon Sep 17 00:00:00 2001 From: OlegIvaniv Date: Mon, 12 Dec 2022 09:34:34 +0100 Subject: [PATCH] fix(editor): Avoid adding manual trigger node when webhook node is added (#4887) --- packages/editor-ui/src/stores/nodeCreator.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/editor-ui/src/stores/nodeCreator.ts b/packages/editor-ui/src/stores/nodeCreator.ts index 240eb69289..a9f28d6e09 100644 --- a/packages/editor-ui/src/stores/nodeCreator.ts +++ b/packages/editor-ui/src/stores/nodeCreator.ts @@ -1,7 +1,7 @@ import startCase from 'lodash.startCase'; import { defineStore } from "pinia"; import { INodePropertyCollection, INodePropertyOptions, IDataObject, INodeProperties, INodeTypeDescription, deepCopy, INodeParameters, INodeActionTypeDescription } from 'n8n-workflow'; -import { STORES, MANUAL_TRIGGER_NODE_TYPE, CORE_NODES_CATEGORY, CALENDLY_TRIGGER_NODE_TYPE, TRIGGER_NODE_FILTER } from "@/constants"; +import { STORES, MANUAL_TRIGGER_NODE_TYPE, CORE_NODES_CATEGORY, CALENDLY_TRIGGER_NODE_TYPE, TRIGGER_NODE_FILTER, WEBHOOK_NODE_TYPE } from "@/constants"; import { useNodeTypesStore } from '@/stores/nodeTypes'; import { useWorkflowsStore } from './workflows'; import { CUSTOM_API_CALL_KEY, ALL_NODE_FILTER } from '@/constants'; @@ -276,11 +276,11 @@ export const useNodeCreatorStore = defineStore(STORES.NODE_CREATOR, { if(!nodeType) return []; const { workflowTriggerNodes } = useWorkflowsStore(); - const isTriggerAction = nodeType.toLocaleLowerCase().includes('trigger'); + const isTrigger = nodeType.toLocaleLowerCase().includes('trigger') || nodeType === WEBHOOK_NODE_TYPE; const workflowContainsTrigger = workflowTriggerNodes.length > 0; const isTriggerPanel = useNodeCreatorStore().selectedType === TRIGGER_NODE_FILTER; - const nodeTypes = !isTriggerAction && !workflowContainsTrigger && isTriggerPanel + const nodeTypes = !isTrigger && !workflowContainsTrigger && isTriggerPanel ? [MANUAL_TRIGGER_NODE_TYPE, nodeType] : [nodeType];