admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-18 18:41:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(editor): Show correct options in the NDV runs selector (#19297)

Browse Source 
Co-authored-by: Charlie Kolb <charlie@n8n.io>
This commit is contained in:
Eugene
2025-09-09 18:13:17 +03:00
committed by GitHub
parent 3ee827c7a5
commit bae6e3b12b
2 changed files with 155 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
packages/frontend/editor-ui/src/components/RunData.vue
View File

@@ -388,6 +388,9 @@ const maxOutputIndex = computed(() => {
return 0;
});
const currentPageOffset = computed(() => pageSize.value * (currentPage.value - 1));
const showBranchSwitch = computed(
() => maxOutputIndex.value > 0 && branches.value.length > 1 && !displaysMultipleNodes.value,
);
const maxRunIndex = computed(() => {
if (!node.value) {
return 0;
@@ -406,6 +409,29 @@ const maxRunIndex = computed(() => {
return 0;
});
const runSelectorOptionsCount = computed(() => {
if (!node.value) {
return 0;
}
const runData: IRunData | null = workflowRunData.value;
if (!runData?.hasOwnProperty(node.value.name)) {
return 0;
}
// If there is branch selector – we show all runs in the run selector
if (showBranchSwitch.value) {
return maxRunIndex.value + 1;
}
// If there is only one branch - we show only the runs containing the data in the connected branch
return runData[node.value.name].filter((nodeRun) => {
const nodeOutput = nodeRun?.data?.[connectionType.value]?.[currentOutputIndex.value];
return nodeOutput && nodeOutput?.length > 0;
}).length;
});
const rawInputData = computed(() =>
getRawInputData(props.runIndex, currentOutputIndex.value, connectionType.value),
);
@@ -1136,7 +1162,7 @@ function getRunLabel(option: number) {
: '';
const itemsLabel = itemsCount > 0 ? ` (${items}${subexecutions})` : '';
return option + i18n.baseText('ndv.output.of') + (maxRunIndex.value + 1) + itemsLabel;
return option + i18n.baseText('ndv.output.of') + runSelectorOptionsCount.value + itemsLabel;
}
function getRawInputData(
@@ -1510,10 +1536,11 @@ defineExpose({ enterEditMode });
>
<template #prepend>{{ i18n.baseText('ndv.output.run') }}</template>
<N8nOption
v-for="option in maxRunIndex + 1"
v-for="option in runSelectorOptionsCount"
:key="option"
:label="getRunLabel(option)"
:value="option - 1"
data-test-id="run-selection-option"
></N8nOption>
</N8nSelect>
@@ -1564,11 +1591,7 @@ defineExpose({ enterEditMode });
<N8nText v-n8n-html="hint.message" size="small"></N8nText>
</N8nCallout>
<div
v-if="maxOutputIndex > 0 && branches.length > 1 && !displaysMultipleNodes"
:class="$style.outputs"
data-test-id="branches"
>
<div v-if="showBranchSwitch" :class="$style.outputs" data-test-id="branches">
<slot v-if="inputSelectLocation === 'outputs'" name="input-select"></slot>
<ViewSubExecution
v-if="activeTaskMetadata && !(paneType === 'input' && hasInputOverwrite)"