From 8fe0a4c9d13ca198d5012d90391104414eda62b3 Mon Sep 17 00:00:00 2001 From: Alexander Ackermann Date: Thu, 28 May 2026 20:24:38 +0200 Subject: [PATCH 1/2] fix: sse event on space delete has no effect --- packages/web-runtime/src/container/sse/spaces.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/web-runtime/src/container/sse/spaces.ts b/packages/web-runtime/src/container/sse/spaces.ts index 92e4c8399ec..3b923c75fe9 100644 --- a/packages/web-runtime/src/container/sse/spaces.ts +++ b/packages/web-runtime/src/container/sse/spaces.ts @@ -45,7 +45,7 @@ export const onSSESpaceDisabledEvent = async ({ resourcesStore.upsertResource(space) } -export const onSSESpaceDeletedEvent = async ({ +export const onSSESpaceDeletedEvent = ({ sseData, resourcesStore, spacesStore, @@ -57,7 +57,12 @@ export const onSSESpaceDeletedEvent = async ({ return } - const space = await clientService.graphAuthenticated.drives.getDrive(sseData.spaceid) + const space = spacesStore.getSpace(sseData.spaceid) + + if (!space) { + return + } + spacesStore.removeSpace(space) if (!isLocationSpacesActive(router, 'files-spaces-projects')) { From ed2c9a46a778af605d71df255bf8a4376d2d9c49 Mon Sep 17 00:00:00 2001 From: Alexander Ackermann Date: Fri, 29 May 2026 01:14:49 +0200 Subject: [PATCH 2/2] add unit tests --- .../tests/unit/container/sse/spaces.spec.ts | 221 ++++++++++++++++++ 1 file changed, 221 insertions(+) create mode 100644 packages/web-runtime/tests/unit/container/sse/spaces.spec.ts diff --git a/packages/web-runtime/tests/unit/container/sse/spaces.spec.ts b/packages/web-runtime/tests/unit/container/sse/spaces.spec.ts new file mode 100644 index 00000000000..a2204324526 --- /dev/null +++ b/packages/web-runtime/tests/unit/container/sse/spaces.spec.ts @@ -0,0 +1,221 @@ +import { + AuthStore, + ClientService, + ConfigStore, + MessageStore, + PreviewService, + ResourcesStore, + SharesStore, + SpacesStore, + useAuthStore, + useConfigStore, + useMessages, + useResourcesStore, + useSharesStore, + useSpacesStore, + useUserStore, + UserStore +} from '@opencloud-eu/web-pkg' +import { + EventSchemaType, + onSSESpaceCreatedEvent, + onSSESpaceDeletedEvent, + onSSESpaceDisabledEvent +} from '../../../../src/container/sse' +import { Resource, SpaceResource } from '@opencloud-eu/web-client' +import { createTestingPinia, defaultComponentMocks } from '@opencloud-eu/web-test-helpers' +import { mock, mockDeep } from 'vitest-mock-extended' +import { RouteLocation, Router } from 'vue-router' +import { Language } from 'vue3-gettext' +import PQueue from 'p-queue' + +describe('spaces events', () => { + describe('onSSESpaceCreatedEvent', () => { + it('calls "upsertSpace" when space has been created', async () => { + const space = mock({ id: 'space1' }) + const mocks = getMocks() + const sseData = mock({ spaceid: space.id }) + mocks.clientService.graphAuthenticated.drives.getDrive.mockResolvedValue(space) + + await onSSESpaceCreatedEvent({ sseData, ...mocks }) + + expect(mocks.clientService.graphAuthenticated.drives.getDrive).toHaveBeenCalledWith(space.id) + expect(mocks.spacesStore.upsertSpace).toHaveBeenCalledWith(space) + expect(mocks.resourcesStore.upsertResource).not.toHaveBeenCalled() + }) + + it('calls "upsertResource" when space has been created and current route equals "files-spaces-projects"', async () => { + const space = mock({ id: 'space1' }) + const mocks = getMocks({ currentRouteFilesSpacesProjects: true }) + const sseData = mock({ spaceid: space.id }) + mocks.clientService.graphAuthenticated.drives.getDrive.mockResolvedValue(space) + + await onSSESpaceCreatedEvent({ sseData, ...mocks }) + + expect(mocks.clientService.graphAuthenticated.drives.getDrive).toHaveBeenCalledWith(space.id) + expect(mocks.spacesStore.upsertSpace).toHaveBeenCalledWith(space) + expect(mocks.resourcesStore.upsertResource).toHaveBeenCalledWith(space) + }) + + it('does not trigger any action when initiator ids are identical', async () => { + const mocks = getMocks() + const sseData = mock({ + spaceid: 'space1', + initiatorid: 'local1' + }) + + await onSSESpaceCreatedEvent({ sseData, ...mocks }) + + expect(mocks.clientService.graphAuthenticated.drives.getDrive).not.toHaveBeenCalled() + expect(mocks.spacesStore.upsertSpace).not.toHaveBeenCalled() + expect(mocks.resourcesStore.upsertResource).not.toHaveBeenCalled() + }) + }) + + describe('onSSESpaceDisabledEvent', () => { + it('calls "upsertSpace" when space has been disabled', async () => { + const space = mock({ id: 'space1' }) + const mocks = getMocks() + const sseData = mock({ spaceid: space.id }) + mocks.clientService.graphAuthenticated.drives.getDrive.mockResolvedValue(space) + + await onSSESpaceDisabledEvent({ sseData, ...mocks }) + + expect(mocks.clientService.graphAuthenticated.drives.getDrive).toHaveBeenCalledWith(space.id) + expect(mocks.spacesStore.upsertSpace).toHaveBeenCalledWith(space) + expect(mocks.resourcesStore.upsertResource).not.toHaveBeenCalled() + }) + + it('calls "upsertResource" when space has been disabled and current route equals "files-spaces-projects"', async () => { + const space = mock({ id: 'space1' }) + const mocks = getMocks({ currentRouteFilesSpacesProjects: true }) + const sseData = mock({ spaceid: space.id }) + mocks.clientService.graphAuthenticated.drives.getDrive.mockResolvedValue(space) + + await onSSESpaceDisabledEvent({ sseData, ...mocks }) + + expect(mocks.clientService.graphAuthenticated.drives.getDrive).toHaveBeenCalledWith(space.id) + expect(mocks.spacesStore.upsertSpace).toHaveBeenCalledWith(space) + expect(mocks.resourcesStore.upsertResource).toHaveBeenCalledWith(space) + }) + + it('does not trigger any action when initiator ids are identical', async () => { + const mocks = getMocks() + const sseData = mock({ + spaceid: 'space1', + initiatorid: 'local1' + }) + + await onSSESpaceDisabledEvent({ sseData, ...mocks }) + + expect(mocks.clientService.graphAuthenticated.drives.getDrive).not.toHaveBeenCalled() + expect(mocks.spacesStore.upsertSpace).not.toHaveBeenCalled() + expect(mocks.resourcesStore.upsertResource).not.toHaveBeenCalled() + }) + }) + + describe('onSSESpaceDeletedEvent', () => { + it('calls "removeSpace" when space has been deleted', () => { + const space = mock({ id: 'space1' }) + const mocks = getMocks({ spaces: [space] }) + const sseData = mock({ spaceid: space.id }) + ;(mocks.spacesStore.getSpace as any).mockReturnValue(space) + + onSSESpaceDeletedEvent({ sseData, ...mocks }) + + expect(mocks.spacesStore.removeSpace).toHaveBeenCalledWith(space) + expect(mocks.resourcesStore.removeResources).not.toHaveBeenCalled() + }) + + it('calls "removeResources" when space has been deleted and current route equals "files-spaces-projects"', () => { + const space = mock({ id: 'space1' }) + const mocks = getMocks({ spaces: [space], currentRouteFilesSpacesProjects: true }) + const sseData = mock({ spaceid: space.id }) + ;(mocks.spacesStore.getSpace as any).mockReturnValue(space) + + onSSESpaceDeletedEvent({ sseData, ...mocks }) + + expect(mocks.spacesStore.removeSpace).toHaveBeenCalledWith(space) + expect(mocks.resourcesStore.removeResources).toHaveBeenCalledWith([space]) + }) + + it('does not trigger any action when space does not exist', () => { + const mocks = getMocks({ spaces: [] }) + const sseData = mock({ spaceid: 'space1' }) + + onSSESpaceDeletedEvent({ sseData, ...mocks }) + + expect(mocks.spacesStore.removeSpace).not.toHaveBeenCalled() + expect(mocks.resourcesStore.removeResources).not.toHaveBeenCalled() + }) + + it('does not trigger any action when initiator ids are identical', () => { + const space = mock({ id: 'space1' }) + const mocks = getMocks({ spaces: [space] }) + const sseData = mock({ + spaceid: space.id, + initiatorid: 'local1' + }) + + onSSESpaceDeletedEvent({ sseData, ...mocks }) + + expect(mocks.spacesStore.removeSpace).not.toHaveBeenCalled() + expect(mocks.resourcesStore.removeResources).not.toHaveBeenCalled() + }) + }) +}) + +function getMocks({ + currentFolder = mockDeep({ + id: 'currenFolder!currentFolder', + isFolder: true, + storageId: 'space1' + }), + resources = [], + spaces = [mockDeep({ id: 'space1' })], + currentRouteFilesSpacesProjects = false +}: { + currentFolder?: Resource + resources?: Resource[] + spaces?: SpaceResource[] + currentRouteFilesSpacesProjects?: boolean +} = {}) { + createTestingPinia() + + const resourcesStore = useResourcesStore() + resourcesStore.currentFolder = currentFolder + resourcesStore.resources = resources + + const spacesStore = useSpacesStore() + spacesStore.spaces = spaces + + const messageStore = useMessages() + const userStore = useUserStore() + const configStore = useConfigStore() + const authStore = useAuthStore() + const sharesStore = useSharesStore() + const clientService = mockDeep({ initiatorId: 'local1' }) + const previewService = mockDeep() + const language = mockDeep({ $gettext: vi.fn((m) => m) }) + const resourceQueue = mockDeep() + + const currentRoute = mock({ + name: currentRouteFilesSpacesProjects ? 'files-spaces-projects' : 'files-spaces-generic' + }) + const { $router: router } = defaultComponentMocks({ currentRoute }) + + return { + resourcesStore: resourcesStore as ResourcesStore, + spacesStore: spacesStore as SpacesStore, + router: router as Router, + messageStore: messageStore as MessageStore, + userStore: userStore as UserStore, + sharesStore: sharesStore as SharesStore, + configStore: configStore as ConfigStore, + authStore: authStore as AuthStore, + clientService, + previewService, + resourceQueue, + language + } +}