From c3756319d60e2d762cb6264673379e5c5fa55b6d Mon Sep 17 00:00:00 2001
From: Thomas Rittson <trittson@bitwarden.com>
Date: Fri, 20 May 2022 15:08:10 +1000
Subject: [PATCH] Refactor: use VaultFilter model instead of service class
 property

---
 .../modules/vault-filter/models/vault-filter.model.ts |  1 +
 .../modules/vault-filter/vault-filter.component.ts    |  2 +-
 .../src/modules/vault-filter/vault-filter.service.ts  | 11 +++++------
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/angular/src/modules/vault-filter/models/vault-filter.model.ts b/angular/src/modules/vault-filter/models/vault-filter.model.ts
index b65729c5..9fd06982 100644
--- a/angular/src/modules/vault-filter/models/vault-filter.model.ts
+++ b/angular/src/modules/vault-filter/models/vault-filter.model.ts
@@ -11,6 +11,7 @@ export class VaultFilter {
   selectedOrganizationId?: string;
   myVaultOnly = false;
   refreshCollectionsAndFolders = false;
+  useAdminCollections = false;
 
   constructor(init?: Partial<VaultFilter>) {
     Object.assign(this, init);
diff --git a/angular/src/modules/vault-filter/vault-filter.component.ts b/angular/src/modules/vault-filter/vault-filter.component.ts
index cabdba1f..d330cc9e 100644
--- a/angular/src/modules/vault-filter/vault-filter.component.ts
+++ b/angular/src/modules/vault-filter/vault-filter.component.ts
@@ -72,7 +72,7 @@ export class VaultFilterComponent implements OnInit {
     this.folders = await this.vaultFilterService.buildFolders(filter.selectedOrganizationId);
     this.collections = filter.myVaultOnly
       ? null
-      : await this.vaultFilterService.buildCollections(filter.selectedOrganizationId);
+      : await this.vaultFilterService.buildCollections(filter);
   }
 
   async reloadOrganizations() {
diff --git a/angular/src/modules/vault-filter/vault-filter.service.ts b/angular/src/modules/vault-filter/vault-filter.service.ts
index 653cfbbf..eb602e7e 100644
--- a/angular/src/modules/vault-filter/vault-filter.service.ts
+++ b/angular/src/modules/vault-filter/vault-filter.service.ts
@@ -16,11 +16,10 @@ import { CollectionView } from "jslib-common/models/view/collectionView";
 import { FolderView } from "jslib-common/models/view/folderView";
 
 import { DynamicTreeNode } from "./models/dynamic-tree-node.model";
+import { VaultFilter } from "./models/vault-filter.model";
 
 @Injectable()
 export class VaultFilterService {
-  getAllCollectionsFromServer = false;
-
   constructor(
     protected stateService: StateService,
     protected organizationService: OrganizationService,
@@ -64,10 +63,10 @@ export class VaultFilterService {
     });
   }
 
-  async buildCollections(organizationId?: string): Promise<DynamicTreeNode<CollectionView>> {
-    const collections = this.getAllCollectionsFromServer
-      ? await this.getAdminCollections(organizationId)
-      : await this.getUserCollections(organizationId);
+  async buildCollections(vaultFilter: VaultFilter): Promise<DynamicTreeNode<CollectionView>> {
+    const collections = vaultFilter.useAdminCollections
+      ? await this.getAdminCollections(vaultFilter.selectedOrganizationId)
+      : await this.getUserCollections(vaultFilter.selectedOrganizationId);
 
     const nestedCollections = await this.collectionService.getAllNested(collections);
     return new DynamicTreeNode<CollectionView>({