mirror of
https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git
synced 2025-12-17 18:12:04 +00:00
fix(editor): Sync log selection doesn't work for renamed nodes (#16878)
This commit is contained in:
@@ -78,8 +78,7 @@ function handleResizeEnd() {
|
|||||||
<div :class="$style.title">
|
<div :class="$style.title">
|
||||||
<NodeIcon :node-type="type" :size="16" :class="$style.icon" />
|
<NodeIcon :node-type="type" :size="16" :class="$style.icon" />
|
||||||
<LogsViewNodeName
|
<LogsViewNodeName
|
||||||
:latest-name="latestInfo?.name ?? logEntry.node.name"
|
:name="latestInfo?.name ?? logEntry.node.name"
|
||||||
:name="logEntry.node.name"
|
|
||||||
:is-deleted="latestInfo?.deleted ?? false"
|
:is-deleted="latestInfo?.deleted ?? false"
|
||||||
/>
|
/>
|
||||||
<LogsViewExecutionSummary
|
<LogsViewExecutionSummary
|
||||||
|
|||||||
@@ -131,8 +131,7 @@ watch(
|
|||||||
<NodeIcon :node-type="type" :size="16" :class="$style.icon" />
|
<NodeIcon :node-type="type" :size="16" :class="$style.icon" />
|
||||||
<LogsViewNodeName
|
<LogsViewNodeName
|
||||||
:class="$style.name"
|
:class="$style.name"
|
||||||
:latest-name="latestInfo?.name ?? props.data.node.name"
|
:name="latestInfo?.name ?? props.data.node.name"
|
||||||
:name="props.data.node.name"
|
|
||||||
:is-error="isError"
|
:is-error="isError"
|
||||||
:is-deleted="latestInfo?.deleted ?? false"
|
:is-deleted="latestInfo?.deleted ?? false"
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -433,6 +433,34 @@ describe('LogsPanel', () => {
|
|||||||
expect(rendered.queryByTestId('log-details-output')).not.toBeInTheDocument();
|
expect(rendered.queryByTestId('log-details-output')).not.toBeInTheDocument();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('should show new name when a node is renamed', async () => {
|
||||||
|
const canvasOperations = useCanvasOperations();
|
||||||
|
|
||||||
|
logsStore.toggleOpen(true);
|
||||||
|
|
||||||
|
// Create deep copy so that renaming doesn't affect other test cases
|
||||||
|
workflowsStore.setWorkflow(deepCopy(aiChatWorkflow));
|
||||||
|
workflowsStore.setWorkflowExecutionData(deepCopy(aiChatExecutionResponse));
|
||||||
|
|
||||||
|
const rendered = render();
|
||||||
|
|
||||||
|
await nextTick();
|
||||||
|
|
||||||
|
expect(
|
||||||
|
within(rendered.getByTestId('log-details-header')).getByText('AI Model'),
|
||||||
|
).toBeInTheDocument();
|
||||||
|
expect(within(rendered.getByRole('tree')).getByText('AI Model')).toBeInTheDocument();
|
||||||
|
|
||||||
|
await canvasOperations.renameNode('AI Model', 'Renamed!!');
|
||||||
|
|
||||||
|
await waitFor(() => {
|
||||||
|
expect(
|
||||||
|
within(rendered.getByTestId('log-details-header')).getByText('Renamed!!'),
|
||||||
|
).toBeInTheDocument();
|
||||||
|
expect(within(rendered.getByRole('tree')).getByText('Renamed!!')).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
describe('selection', () => {
|
describe('selection', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
logsStore.toggleOpen(true);
|
logsStore.toggleOpen(true);
|
||||||
@@ -487,6 +515,25 @@ describe('LogsPanel', () => {
|
|||||||
await rerender({});
|
await rerender({});
|
||||||
expect(await findByRole('treeitem', { selected: true })).toHaveTextContent(/AI Model/);
|
expect(await findByRole('treeitem', { selected: true })).toHaveTextContent(/AI Model/);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("should automatically select a log for the selected node on canvas even after it's renamed", async () => {
|
||||||
|
const canvasOperations = useCanvasOperations();
|
||||||
|
|
||||||
|
workflowsStore.setWorkflow(deepCopy(aiChatWorkflow));
|
||||||
|
workflowsStore.setWorkflowExecutionData(deepCopy(aiChatExecutionResponse));
|
||||||
|
|
||||||
|
logsStore.toggleLogSelectionSync(true);
|
||||||
|
|
||||||
|
const { rerender, findByRole } = render();
|
||||||
|
|
||||||
|
expect(await findByRole('treeitem', { selected: true })).toHaveTextContent(/AI Model/);
|
||||||
|
|
||||||
|
await canvasOperations.renameNode('AI Agent', 'Renamed Agent');
|
||||||
|
uiStore.lastSelectedNode = 'Renamed Agent';
|
||||||
|
|
||||||
|
await rerender({});
|
||||||
|
expect(await findByRole('treeitem', { selected: true })).toHaveTextContent(/Renamed Agent/);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('chat', () => {
|
describe('chat', () => {
|
||||||
|
|||||||
@@ -200,7 +200,7 @@ function handleOpenNdv(treeNode: LogEntry) {
|
|||||||
:is-open="isOpen"
|
:is-open="isOpen"
|
||||||
:log-entry="selected"
|
:log-entry="selected"
|
||||||
:window="pipWindow"
|
:window="pipWindow"
|
||||||
:latest-info="latestNodeNameById[selected.id]"
|
:latest-info="latestNodeNameById[selected.node.id]"
|
||||||
:panels="logsStore.detailsState"
|
:panels="logsStore.detailsState"
|
||||||
@click-header="onToggleOpen(true)"
|
@click-header="onToggleOpen(true)"
|
||||||
@toggle-input-open="logsStore.toggleInputOpen"
|
@toggle-input-open="logsStore.toggleInputOpen"
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { N8nText } from '@n8n/design-system';
|
import { N8nText } from '@n8n/design-system';
|
||||||
|
|
||||||
const { name, latestName, isError, isDeleted } = defineProps<{
|
const { name, isError, isDeleted } = defineProps<{
|
||||||
name: string;
|
name: string;
|
||||||
latestName: string;
|
|
||||||
isError?: boolean;
|
isError?: boolean;
|
||||||
isDeleted?: boolean;
|
isDeleted?: boolean;
|
||||||
}>();
|
}>();
|
||||||
@@ -17,12 +16,12 @@ const { name, latestName, isError, isDeleted } = defineProps<{
|
|||||||
:class="$style.name"
|
:class="$style.name"
|
||||||
:color="isError ? 'danger' : undefined"
|
:color="isError ? 'danger' : undefined"
|
||||||
>
|
>
|
||||||
<del v-if="isDeleted || name !== latestName">
|
<del v-if="isDeleted">
|
||||||
{{ name }}
|
{{ name }}
|
||||||
</del>
|
</del>
|
||||||
<span v-if="!isDeleted">
|
<template v-else>
|
||||||
{{ latestName }}
|
{{ name }}
|
||||||
</span>
|
</template>
|
||||||
</N8nText>
|
</N8nText>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import { useLogsStore } from '@/stores/logs.store';
|
|||||||
import { useUIStore } from '@/stores/ui.store';
|
import { useUIStore } from '@/stores/ui.store';
|
||||||
import { shallowRef, watch } from 'vue';
|
import { shallowRef, watch } from 'vue';
|
||||||
import { computed, type ComputedRef } from 'vue';
|
import { computed, type ComputedRef } from 'vue';
|
||||||
|
import { useWorkflowsStore } from '@/stores/workflows.store';
|
||||||
|
|
||||||
export function useLogsSelection(
|
export function useLogsSelection(
|
||||||
execution: ComputedRef<IExecutionResponse | undefined>,
|
execution: ComputedRef<IExecutionResponse | undefined>,
|
||||||
@@ -23,7 +24,7 @@ export function useLogsSelection(
|
|||||||
) {
|
) {
|
||||||
const telemetry = useTelemetry();
|
const telemetry = useTelemetry();
|
||||||
const manualLogEntrySelection = shallowRef<LogEntrySelection>({ type: 'initial' });
|
const manualLogEntrySelection = shallowRef<LogEntrySelection>({ type: 'initial' });
|
||||||
const nodeNameToSelect = shallowRef<string>();
|
const nodeIdToSelect = shallowRef<string>();
|
||||||
const isExecutionStopped = computed(() => execution.value?.stoppedAt !== undefined);
|
const isExecutionStopped = computed(() => execution.value?.stoppedAt !== undefined);
|
||||||
const selected = computed(() =>
|
const selected = computed(() =>
|
||||||
findSelectedLogEntry(manualLogEntrySelection.value, tree.value, !isExecutionStopped.value),
|
findSelectedLogEntry(manualLogEntrySelection.value, tree.value, !isExecutionStopped.value),
|
||||||
@@ -31,6 +32,7 @@ export function useLogsSelection(
|
|||||||
const logsStore = useLogsStore();
|
const logsStore = useLogsStore();
|
||||||
const uiStore = useUIStore();
|
const uiStore = useUIStore();
|
||||||
const canvasStore = useCanvasStore();
|
const canvasStore = useCanvasStore();
|
||||||
|
const workflowsStore = useWorkflowsStore();
|
||||||
|
|
||||||
function syncSelectionToCanvasIfEnabled(value: LogEntry) {
|
function syncSelectionToCanvasIfEnabled(value: LogEntry) {
|
||||||
if (!logsStore.isLogSelectionSyncedWithCanvas) {
|
if (!logsStore.isLogSelectionSyncedWithCanvas) {
|
||||||
@@ -101,24 +103,32 @@ export function useLogsSelection(
|
|||||||
watch(
|
watch(
|
||||||
[() => uiStore.lastSelectedNode, () => logsStore.isLogSelectionSyncedWithCanvas],
|
[() => uiStore.lastSelectedNode, () => logsStore.isLogSelectionSyncedWithCanvas],
|
||||||
([selectedOnCanvas, shouldSync]) => {
|
([selectedOnCanvas, shouldSync]) => {
|
||||||
if (
|
const selectedNodeId = selectedOnCanvas
|
||||||
!shouldSync ||
|
? workflowsStore.nodesByName[selectedOnCanvas]?.id
|
||||||
!selectedOnCanvas ||
|
: undefined;
|
||||||
canvasStore.hasRangeSelection ||
|
|
||||||
selected.value?.node.name === selectedOnCanvas
|
nodeIdToSelect.value =
|
||||||
) {
|
shouldSync && !canvasStore.hasRangeSelection && selected.value?.node.id !== selectedNodeId
|
||||||
nodeNameToSelect.value = undefined;
|
? selectedNodeId
|
||||||
|
: undefined;
|
||||||
|
},
|
||||||
|
{ immediate: true },
|
||||||
|
);
|
||||||
|
|
||||||
|
watch(
|
||||||
|
[tree, nodeIdToSelect],
|
||||||
|
([latestTree, id]) => {
|
||||||
|
if (id === undefined) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const entry = findLogEntryRec((e) => e.node.name === selectedOnCanvas, tree.value);
|
const entry = findLogEntryRec((e) => e.node.id === id, latestTree);
|
||||||
|
|
||||||
if (!entry) {
|
if (!entry) {
|
||||||
nodeNameToSelect.value = selectedOnCanvas;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
nodeNameToSelect.value = undefined;
|
nodeIdToSelect.value = undefined;
|
||||||
manualLogEntrySelection.value = { type: 'selected', entry };
|
manualLogEntrySelection.value = { type: 'selected', entry };
|
||||||
|
|
||||||
let parent = entry.parent;
|
let parent = entry.parent;
|
||||||
@@ -131,22 +141,5 @@ export function useLogsSelection(
|
|||||||
{ immediate: true },
|
{ 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 };
|
return { selected, select, selectPrev, selectNext };
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user