mohiit1502/Automata
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(editor): Color node connections correctly in execution preview for nodes that have pinned data (#9669)

Browse Source
This commit is contained in:
Tomi Turtiainen
2024-06-07 16:12:59 +03:00
committed by GitHub
parent 6ae6a5ebdf
commit ebba7c87cd
9 changed files with 170 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/editor-ui/src/components/Node.vue
View File

@@ -108,9 +108,9 @@
</div>
<div
v-if="showDisabledLinethrough"
v-if="showDisabledLineThrough"
:class="{
'disabled-linethrough': true,
'disabled-line-through': true,
success: !['unknown'].includes(nodeExecutionStatus) && workflowDataItems > 0,
}"
></div>
@@ -187,7 +187,7 @@ import {
LOCAL_STORAGE_PIN_DATA_DISCOVERY_CANVAS_FLAG,
MANUAL_TRIGGER_NODE_TYPE,
NODE_INSERT_SPACER_BETWEEN_INPUT_GROUPS,
NOT_DUPLICATABE_NODE_TYPES,
NOT_DUPLICATABLE_NODE_TYPES,
SIMULATE_NODE_TYPE,
SIMULATE_TRIGGER_NODE_TYPE,
WAIT_TIME_UNLIMITED,
@@ -287,7 +287,7 @@ export default defineComponent({
},
isDuplicatable(): boolean {
if (!this.nodeType) return true;
if (NOT_DUPLICATABE_NODE_TYPES.includes(this.nodeType.name)) return false;
if (NOT_DUPLICATABLE_NODE_TYPES.includes(this.nodeType.name)) return false;
return (
this.nodeType.maxNodes === undefined || this.sameTypeNodes.length < this.nodeType.maxNodes
);
@@ -493,7 +493,7 @@ export default defineComponent({
position(): XYPosition {
return this.node ? this.node.position : [0, 0];
},
showDisabledLinethrough(): boolean {
showDisabledLineThrough(): boolean {
return (
!this.isConfigurableNode &&
!!(this.data?.disabled && this.inputs.length === 1 && this.outputs.length === 1)
@@ -1118,7 +1118,7 @@ export default defineComponent({
}
}
.disabled-linethrough {
.disabled-line-through {
border: 1px solid var(--color-foreground-dark);
position: absolute;
top: 49px;
@@ -1189,7 +1189,7 @@ export default defineComponent({
overflow: auto;
}
.disabled-linethrough {
.disabled-line-through {
z-index: 8;
}

11
packages/editor-ui/src/components/WorkflowPreview.vue
View File

@@ -27,7 +27,6 @@ import { onMounted, onBeforeUnmount, ref, computed, watch } from 'vue';
import { useI18n } from '@/composables/useI18n';
import { useToast } from '@/composables/useToast';
import type { IWorkflowDb, IWorkflowTemplate } from '@/Interface';
import { useRootStore } from '@/stores/n8nRoot.store';
import { useExecutionsStore } from '@/stores/executions.store';
const props = withDefaults(
@@ -44,6 +43,9 @@ const props = withDefaults(
{
loading: false,
mode: 'workflow',
workflow: undefined,
executionId: undefined,
executionMode: undefined,
loaderType: 'image',
canOpenNDV: true,
hideNodeIssues: false,
@@ -56,7 +58,6 @@ const emit = defineEmits<{
const i18n = useI18n();
const toast = useToast();
const rootStore = useRootStore();
const executionsStore = useExecutionsStore();
const iframeRef = ref<HTMLIFrameElement | null>(null);
@@ -73,8 +74,8 @@ const iframeSrc = computed(() => {
const showPreview = computed(() => {
return (
!props.loading &&
((props.mode === 'workflow' && props.workflow) ||
(props.mode === 'execution' && props.executionId)) &&
((props.mode === 'workflow' && !!props.workflow) ||
(props.mode === 'execution' && !!props.executionId)) &&
ready.value
);
});
@@ -114,7 +115,7 @@ const loadExecution = () => {
JSON.stringify({
command: 'openExecution',
executionId: props.executionId,
executionMode: props.executionMode || '',
executionMode: props.executionMode ?? '',
canOpenNDV: props.canOpenNDV,
}),
'*',