bitwarden/jslib
1
0
Fork 0
mirror of https://github.com/bitwarden/jslib synced 2025-12-23 19:53:55 +00:00
Code Issues Releases Wiki Activity

Refactor: use VaultFilter model instead of service class property

Browse Source
This commit is contained in:
Thomas Rittson
2022-05-20 15:08:10 +10:00
parent d215e4157a
commit c3756319d6
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
angular/src/modules/vault-filter/models/vault-filter.model.ts
View File

@@ -11,6 +11,7 @@ export class VaultFilter {
selectedOrganizationId?: string; selectedOrganizationId?: string;
myVaultOnly = false; myVaultOnly = false;
refreshCollectionsAndFolders = false; refreshCollectionsAndFolders = false;
useAdminCollections = false;
constructor(init?: Partial<VaultFilter>) { constructor(init?: Partial<VaultFilter>) {
Object.assign(this, init); Object.assign(this, init);

2
angular/src/modules/vault-filter/vault-filter.component.ts
View File

@@ -72,7 +72,7 @@ export class VaultFilterComponent implements OnInit {
this.folders = await this.vaultFilterService.buildFolders(filter.selectedOrganizationId); this.folders = await this.vaultFilterService.buildFolders(filter.selectedOrganizationId);
this.collections = filter.myVaultOnly this.collections = filter.myVaultOnly
? null ? null
: await this.vaultFilterService.buildCollections(filter.selectedOrganizationId); : await this.vaultFilterService.buildCollections(filter);
} }
async reloadOrganizations() { async reloadOrganizations() {

11
angular/src/modules/vault-filter/vault-filter.service.ts
View File

@@ -16,11 +16,10 @@ import { CollectionView } from "jslib-common/models/view/collectionView";
import { FolderView } from "jslib-common/models/view/folderView"; import { FolderView } from "jslib-common/models/view/folderView";
import { DynamicTreeNode } from "./models/dynamic-tree-node.model"; import { DynamicTreeNode } from "./models/dynamic-tree-node.model";
import { VaultFilter } from "./models/vault-filter.model";
@Injectable() @Injectable()
export class VaultFilterService { export class VaultFilterService {
getAllCollectionsFromServer = false;
constructor( constructor(
protected stateService: StateService, protected stateService: StateService,
protected organizationService: OrganizationService, protected organizationService: OrganizationService,
@@ -64,10 +63,10 @@ export class VaultFilterService {
}); });
} }
async buildCollections(organizationId?: string): Promise<DynamicTreeNode<CollectionView>> { async buildCollections(vaultFilter: VaultFilter): Promise<DynamicTreeNode<CollectionView>> {
const collections = this.getAllCollectionsFromServer const collections = vaultFilter.useAdminCollections
? await this.getAdminCollections(organizationId) ? await this.getAdminCollections(vaultFilter.selectedOrganizationId)
: await this.getUserCollections(organizationId); : await this.getUserCollections(vaultFilter.selectedOrganizationId);
const nestedCollections = await this.collectionService.getAllNested(collections); const nestedCollections = await this.collectionService.getAllNested(collections);
return new DynamicTreeNode<CollectionView>({ return new DynamicTreeNode<CollectionView>({