diff --git a/libs/admin-console/src/common/collections/services/default-collection-vNext.service.spec.ts b/libs/admin-console/src/common/collections/services/default-collection-vNext.service.spec.ts index 42f3669be8..e930ca63d0 100644 --- a/libs/admin-console/src/common/collections/services/default-collection-vNext.service.spec.ts +++ b/libs/admin-console/src/common/collections/services/default-collection-vNext.service.spec.ts @@ -248,7 +248,7 @@ describe("DefaultCollectionService", () => { const decryptedState = await firstValueFrom( collectionService.decryptedCollections$(of(userId)), ); - expect(decryptedState).toBeNull(); + expect(decryptedState.length).toEqual(0); }); it("clear", async () => { diff --git a/libs/admin-console/src/common/collections/services/default-collection-vNext.service.ts b/libs/admin-console/src/common/collections/services/default-collection-vNext.service.ts index 20ed3d03ce..6c29ef8776 100644 --- a/libs/admin-console/src/common/collections/services/default-collection-vNext.service.ts +++ b/libs/admin-console/src/common/collections/services/default-collection-vNext.service.ts @@ -70,7 +70,10 @@ export class DefaultCollectionvNextService implements CollectionvNextService { } decryptedCollections$(userId$: Observable) { - return userId$.pipe(switchMap((userId) => this.decryptedCollectionState(userId).state$)); + return userId$.pipe( + switchMap((userId) => this.decryptedCollectionState(userId).state$), + map((collections) => collections ?? []), + ); } async upsert(toUpdate: CollectionData | CollectionData[], userId: UserId): Promise {