mirror of
https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git
synced 2025-12-17 10:02:05 +00:00
fix(editor): Sync log selection doesn't work for renamed nodes (#16878)
This commit is contained in:
@@ -14,6 +14,7 @@ import { useLogsStore } from '@/stores/logs.store';
|
||||
import { useUIStore } from '@/stores/ui.store';
|
||||
import { shallowRef, watch } from 'vue';
|
||||
import { computed, type ComputedRef } from 'vue';
|
||||
import { useWorkflowsStore } from '@/stores/workflows.store';
|
||||
|
||||
export function useLogsSelection(
|
||||
execution: ComputedRef<IExecutionResponse | undefined>,
|
||||
@@ -23,7 +24,7 @@ export function useLogsSelection(
|
||||
) {
|
||||
const telemetry = useTelemetry();
|
||||
const manualLogEntrySelection = shallowRef<LogEntrySelection>({ type: 'initial' });
|
||||
const nodeNameToSelect = shallowRef<string>();
|
||||
const nodeIdToSelect = shallowRef<string>();
|
||||
const isExecutionStopped = computed(() => execution.value?.stoppedAt !== undefined);
|
||||
const selected = computed(() =>
|
||||
findSelectedLogEntry(manualLogEntrySelection.value, tree.value, !isExecutionStopped.value),
|
||||
@@ -31,6 +32,7 @@ export function useLogsSelection(
|
||||
const logsStore = useLogsStore();
|
||||
const uiStore = useUIStore();
|
||||
const canvasStore = useCanvasStore();
|
||||
const workflowsStore = useWorkflowsStore();
|
||||
|
||||
function syncSelectionToCanvasIfEnabled(value: LogEntry) {
|
||||
if (!logsStore.isLogSelectionSyncedWithCanvas) {
|
||||
@@ -101,24 +103,32 @@ export function useLogsSelection(
|
||||
watch(
|
||||
[() => uiStore.lastSelectedNode, () => logsStore.isLogSelectionSyncedWithCanvas],
|
||||
([selectedOnCanvas, shouldSync]) => {
|
||||
if (
|
||||
!shouldSync ||
|
||||
!selectedOnCanvas ||
|
||||
canvasStore.hasRangeSelection ||
|
||||
selected.value?.node.name === selectedOnCanvas
|
||||
) {
|
||||
nodeNameToSelect.value = undefined;
|
||||
const selectedNodeId = selectedOnCanvas
|
||||
? workflowsStore.nodesByName[selectedOnCanvas]?.id
|
||||
: undefined;
|
||||
|
||||
nodeIdToSelect.value =
|
||||
shouldSync && !canvasStore.hasRangeSelection && selected.value?.node.id !== selectedNodeId
|
||||
? selectedNodeId
|
||||
: undefined;
|
||||
},
|
||||
{ immediate: true },
|
||||
);
|
||||
|
||||
watch(
|
||||
[tree, nodeIdToSelect],
|
||||
([latestTree, id]) => {
|
||||
if (id === undefined) {
|
||||
return;
|
||||
}
|
||||
|
||||
const entry = findLogEntryRec((e) => e.node.name === selectedOnCanvas, tree.value);
|
||||
const entry = findLogEntryRec((e) => e.node.id === id, latestTree);
|
||||
|
||||
if (!entry) {
|
||||
nodeNameToSelect.value = selectedOnCanvas;
|
||||
return;
|
||||
}
|
||||
|
||||
nodeNameToSelect.value = undefined;
|
||||
nodeIdToSelect.value = undefined;
|
||||
manualLogEntrySelection.value = { type: 'selected', entry };
|
||||
|
||||
let parent = entry.parent;
|
||||
@@ -131,22 +141,5 @@ export function useLogsSelection(
|
||||
{ immediate: true },
|
||||
);
|
||||
|
||||
watch(
|
||||
tree,
|
||||
(t) => {
|
||||
if (nodeNameToSelect.value === undefined) {
|
||||
return;
|
||||
}
|
||||
|
||||
const entry = findLogEntryRec((e) => e.node.name === nodeNameToSelect.value, t);
|
||||
|
||||
if (entry) {
|
||||
nodeNameToSelect.value = undefined;
|
||||
manualLogEntrySelection.value = { type: 'selected', entry };
|
||||
}
|
||||
},
|
||||
{ immediate: true },
|
||||
);
|
||||
|
||||
return { selected, select, selectPrev, selectNext };
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user