From e1f9349c192fef03f31c5d09a1a9d38b50a6fe99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Tue, 3 Jan 2023 11:25:50 +0100 Subject: [PATCH] fix(editor): Prevent scrim on executable triggers (#5068) :bug: Prevent scrim on executable triggers --- packages/editor-ui/src/components/NodeDetailsView.vue | 8 +++++++- packages/editor-ui/src/constants.ts | 8 ++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/packages/editor-ui/src/components/NodeDetailsView.vue b/packages/editor-ui/src/components/NodeDetailsView.vue index 063c8de25f..b29ed143d7 100644 --- a/packages/editor-ui/src/components/NodeDetailsView.vue +++ b/packages/editor-ui/src/components/NodeDetailsView.vue @@ -77,7 +77,7 @@ :linkedRuns="linked" :sessionId="sessionId" :isReadOnly="readOnly || hasForeignCredential" - :blockUI="blockUi && isTriggerNode" + :blockUI="blockUi && isTriggerNode && !isExecutableTriggerNode" :isProductionExecutionPreview="isProductionExecutionPreview" @linkRun="onLinkRunToOutput" @unlinkRun="() => onUnlinkRun('output')" @@ -143,6 +143,7 @@ import TriggerPanel from './TriggerPanel.vue'; import { BASE_NODE_SURVEY_URL, EnterpriseEditionFeature, + EXECUTABLE_TRIGGER_NODE_TYPES, START_NODE_TYPE, STICKY_NODE_TYPE, } from '@/constants'; @@ -269,6 +270,11 @@ export default mixins( parentNode(): string | undefined { return this.parentNodes[0]; }, + isExecutableTriggerNode(): boolean { + if (!this.activeNodeType) return false; + + return EXECUTABLE_TRIGGER_NODE_TYPES.includes(this.activeNodeType.name); + }, isTriggerNode(): boolean { return ( !!this.activeNodeType && diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts index b6530e1e66..46e21a0749 100644 --- a/packages/editor-ui/src/constants.ts +++ b/packages/editor-ui/src/constants.ts @@ -126,6 +126,14 @@ export const XERO_NODE_TYPE = 'n8n-nodes-base.xero'; export const ZENDESK_NODE_TYPE = 'n8n-nodes-base.zendesk'; export const ZENDESK_TRIGGER_NODE_TYPE = 'n8n-nodes-base.zendeskTrigger'; +export const EXECUTABLE_TRIGGER_NODE_TYPES = [ + START_NODE_TYPE, + MANUAL_TRIGGER_NODE_TYPE, + SCHEDULE_TRIGGER_NODE_TYPE, + CRON_NODE_TYPE, + INTERVAL_NODE_TYPE, +]; + export const NON_ACTIVATABLE_TRIGGER_NODE_TYPES = [ ERROR_TRIGGER_NODE_TYPE, MANUAL_TRIGGER_NODE_TYPE,