bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-10 13:23:34 +00:00
Code Issues Releases Wiki Activity

[PM-24096] replace getOrgKey with orgKey$, refactor collectionAdminService (#15928)

Browse Source 
* replace getOrgKey with orgKey$, refactor collectionAdminService

* clean up

* uncomment accidental commet

* remove cache
This commit is contained in:
Brandon Treston
2025-08-12 12:06:55 -04:00
committed by GitHub
parent 04489b9fef
commit d4952d211e
27 changed files with 226 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/importer/src/components/import.component.ts
View File

@@ -279,7 +279,7 @@ export class ImportComponent implements OnInit, OnDestroy, AfterViewInit {
this.collections$ = Utils.asyncToObservable(() =>
this.importCollectionService
.getAllAdminCollections(this.organizationId)
.getAllAdminCollections(this.organizationId, userId)
.then((collections) => collections.sort(Utils.getSortFunction(this.i18nService, "name"))),
);

3
libs/importer/src/services/import-collection.service.abstraction.ts
View File

@@ -3,7 +3,8 @@
// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
// eslint-disable-next-line no-restricted-imports
import { CollectionView } from "@bitwarden/admin-console/common";
import { UserId } from "@bitwarden/user-core";
export abstract class ImportCollectionServiceAbstraction {
getAllAdminCollections: (organizationId: string) => Promise<CollectionView[]>;
getAllAdminCollections: (organizationId: string, userId: UserId) => Promise<CollectionView[]>;
}