github-mirror/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2026-10-17 13:39:44 +02:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity Graph

fix: Keep workflow sharing open until changes are saved (#40137)

Browse Source 
Co-authored-by: n8n-cat-bot[bot] <n8n-cat-bot[bot]@users.noreply.github.com>
This commit is contained in:
n8n-cat-bot[bot] 2026-10-02 10:03:04 +00:00 committed by GitHub
parent 37ed348665
commit 9e5eb79cc4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 91 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
packages/frontend/editor-ui/src/features/workflows/components/WorkflowShareModal.ee.test.ts
View File

@ -14,6 +14,7 @@ import { createComponentRenderer } from '@/__tests__/render';
import WorkflowShareModal from './WorkflowShareModal.ee.vue';
import { useSettingsStore } from '@n8n/stores/settings.store';
import { useWorkflowsStore } from '@/app/stores/workflows.store';
import { useWorkflowsListStore } from '@/app/stores/workflowsList.store';
import { useWorkflowsEEStore } from '@/app/stores/workflows.ee.store';
import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
import { useRolesStore } from '@n8n/stores/roles.store';
@ -22,6 +23,8 @@ import type {
ProjectSharingData,
} from '@/features/collaboration/projects/projects.types';
import { DEFAULT_PROJECT_SEARCH_PAGE_SIZE } from '@/features/collaboration/projects/projects.utils';
import { createTestWorkflow } from '@/__tests__/mocks';
import { MODAL_CONFIRM } from '@/app/constants';
const mockWorkflowDocumentState = reactive({
homeProject: null as ProjectSharingData | null,
@ -39,6 +42,11 @@ vi.mock('@/app/stores/workflowDocument.store', () => ({
}));
const mockRouteQuery = reactive<Record<string, string>>({});
const { modalBusEmitMock, showErrorMock, confirmMock } = vi.hoisted(() => ({
modalBusEmitMock: vi.fn(),
showErrorMock: vi.fn(),
confirmMock: vi.fn().mockResolvedValue(true),
}));
vi.mock('vue-router', async (importOriginal) => {
return {
...(await importOriginal()),
@ -50,12 +58,12 @@ vi.mock('vue-router', async (importOriginal) => {
vi.mock('@n8n/composables/useToast', () => ({
useToast: () => ({
showMessage: vi.fn(),
showError: vi.fn(),
showError: showErrorMock,
}),
}));
vi.mock('@/app/composables/useMessage', () => ({
useMessage: () => ({
confirm: vi.fn().mockResolvedValue(true),
confirm: confirmMock,
}),
}));
const saveAsNewWorkflowMock = vi.fn().mockResolvedValue('abc123');
@ -73,7 +81,7 @@ vi.mock('@n8n/permissions', async (importOriginal) => ({
}));
vi.mock('@n8n/utils/event-bus', () => ({
createEventBus: () => ({
emit: vi.fn(),
emit: modalBusEmitMock,
}),
}));
@ -82,8 +90,9 @@ const renderComponent = createComponentRenderer(WorkflowShareModal, {
global: {
stubs: {
Modal: {
props: ['beforeClose'],
template:
'<div role="dialog"><slot name="header" /><slot name="content" /><slot name="footer" /></div>',
'<div role="dialog"><slot name="header" /><slot name="content" /><slot name="footer" /><button data-test-id="attempt-close" @click="beforeClose()">Close modal</button></div>',
},
},
},
@ -91,6 +100,7 @@ const renderComponent = createComponentRenderer(WorkflowShareModal, {
let settingsStore: MockedStore<typeof useSettingsStore>;
let workflowsStore: MockedStore<typeof useWorkflowsStore>;
let workflowsListStore: MockedStore<typeof useWorkflowsListStore>;
let workflowsEEStore: MockedStore<typeof useWorkflowsEEStore>;
let projectsStore: MockedStore<typeof useProjectsStore>;
let rolesStore: MockedStore<typeof useRolesStore>;
@ -98,6 +108,7 @@ describe('WorkflowShareModal.ee.vue', () => {
beforeEach(() => {
settingsStore = mockedStore(useSettingsStore);
workflowsStore = mockedStore(useWorkflowsStore);
workflowsListStore = mockedStore(useWorkflowsListStore);
workflowsEEStore = mockedStore(useWorkflowsEEStore);
projectsStore = mockedStore(useProjectsStore);
rolesStore = mockedStore(useRolesStore);
@ -110,6 +121,8 @@ describe('WorkflowShareModal.ee.vue', () => {
mockWorkflowDocumentState.name = '';
// Set up default store state
workflowsStore.isWorkflowSaved = {};
workflowsListStore.fetchWorkflow.mockReset();
settingsStore.settings.enterprise = { sharing: true } as FrontendSettings['enterprise'];
workflowsEEStore.getWorkflowOwnerName = vi.fn(() => 'Owner Name');
projectsStore.personalProjects = [createProjectListItem()];
@ -139,6 +152,9 @@ describe('WorkflowShareModal.ee.vue', () => {
];
saveAsNewWorkflowMock.mockClear();
modalBusEmitMock.mockClear();
showErrorMock.mockClear();
confirmMock.mockReset().mockResolvedValue(true);
});
it('should share new, unsaved workflow after saving it first', async () => {
@ -183,6 +199,70 @@ describe('WorkflowShareModal.ee.vue', () => {
});
});
it('does not close the sharing modal when saving a new workflow fails', async () => {
// IAM-1480: A competing canvas save can make the first workflow create fail.
mockRouteQuery.new = 'true';
workflowsStore.workflowId = '';
mockWorkflowDocumentState.homeProject = {
id: 'personal-project-id',
name: 'Personal Project',
type: ProjectTypes.Personal,
icon: null,
createdAt: new Date().toISOString(),
updatedAt: new Date().toISOString(),
};
saveAsNewWorkflowMock.mockRejectedValueOnce(new Error('Workflow create failed (400)'));
const saveWorkflowSharedWithSpy = vi.spyOn(workflowsEEStore, 'saveWorkflowSharedWith');
const { getByTestId, getByRole } = renderComponent({ props: { data: { id: '' } } });
const projectSelectDropdownItems = await getDropdownItems(
getByTestId('project-sharing-select'),
);
await userEvent.click(projectSelectDropdownItems[0]);
await userEvent.click(getByRole('button', { name: 'Save' }));
await waitFor(() => expect(showErrorMock).toHaveBeenCalledOnce());
expect(saveAsNewWorkflowMock).toHaveBeenCalledOnce();
expect(saveWorkflowSharedWithSpy).not.toHaveBeenCalled();
expect(modalBusEmitMock).not.toHaveBeenCalledWith('close');
});
it('saves sharing changes after initial loading when closing the modal', async () => {
const workflowId = 'workflow-1';
const fetch = Promise.withResolvers<ReturnType<typeof createTestWorkflow>>();
confirmMock.mockResolvedValueOnce(MODAL_CONFIRM);
workflowsStore.isWorkflowSaved = { [workflowId]: true };
workflowsListStore.fetchWorkflow.mockReturnValue(fetch.promise);
mockWorkflowDocumentState.homeProject = {
id: 'personal-project-id',
name: 'Personal Project',
type: ProjectTypes.Personal,
icon: null,
createdAt: new Date().toISOString(),
updatedAt: new Date().toISOString(),
};
const { getByTestId, getByText } = renderComponent({ props: { data: { id: workflowId } } });
const projectSelectDropdownItems = await getDropdownItems(
getByTestId('project-sharing-select'),
);
await userEvent.click(projectSelectDropdownItems[0]);
expect(getByText('You made changes')).toBeVisible();
await userEvent.click(getByTestId('attempt-close'));
await waitFor(() => expect(confirmMock).toHaveBeenCalledOnce());
expect(workflowsEEStore.saveWorkflowSharedWith).not.toHaveBeenCalled();
fetch.resolve(createTestWorkflow({ id: workflowId }));
await waitFor(() => {
expect(workflowsEEStore.saveWorkflowSharedWith).toHaveBeenCalledWith({
workflowId,
sharedWithProjects: [projectsStore.personalProjects[0]],
});
expect(modalBusEmitMock).toHaveBeenCalledWith('close');
});
});
// Covers the quarantined e2e journey
// "Workflow Sharing > should share workflow with another user via UI".
it('should offer a peer personal project when team projects fill the first page of sharing candidates', async () => {

10
packages/frontend/editor-ui/src/features/workflows/components/WorkflowShareModal.ee.vue
View File

@ -76,6 +76,7 @@ const workflowSharedWithProjects = computed(
workflowDocumentStore.value?.sharedWithProjects ?? workflowListEntry.value?.sharedWithProjects,
);
const loading = ref(true);
let initializationPromise: Promise<void> | undefined;
const isDirty = ref(false);
const modalBus = createEventBus();
const sharedWithProjects = ref([
@ -209,10 +210,10 @@ const onSave = async () => {
title: i18n.baseText('workflows.shareModal.onSave.success.title'),
});
isDirty.value = false;
modalBus.emit('close');
} catch (error) {
toast.showError(error, i18n.baseText('workflows.shareModal.onSave.error.title'));
} finally {
modalBus.emit('close');
loading.value = false;
}
};
@ -230,7 +231,9 @@ const onCloseModal = async () => {
);
if (shouldSave === MODAL_CONFIRM) {
return await onSave();
await initializationPromise;
await onSave();
return false;
}
}
@ -257,7 +260,8 @@ const initialize = async () => {
};
onMounted(async () => {
await initialize();
initializationPromise = initialize();
await initializationPromise;
});
watch(