1
0
mirror of https://github.com/bitwarden/web synced 2025-12-06 00:03:28 +00:00

Compare commits

...

9 Commits

Author SHA1 Message Date
Thomas Rittson
35034c2ced Revert jslib 2022-05-20 15:26:04 +10:00
Thomas Rittson
27977ff4fe Revert jslib 2022-05-20 15:25:24 +10:00
Thomas Rittson
2ba01990a2 Revert jslib 2022-05-20 15:22:10 +10:00
Thomas Rittson
b45d249a7d Update to use new VaultFilter model 2022-05-20 15:22:10 +10:00
Thomas Rittson
48508ef87a Remove unneeded subclass method 2022-05-20 15:22:10 +10:00
Thomas Rittson
bcfc09a173 Revert "Get all collections from server if required"
This reverts commit eae38e2f9c.
2022-05-20 15:22:10 +10:00
Thomas Rittson
ddcd6d1137 Remove unused code 2022-05-20 15:22:10 +10:00
Thomas Rittson
7c3f0320e7 Autoresolve dependencies 2022-05-20 15:22:10 +10:00
Thomas Rittson
b3f9136aea Get all collections from server if required 2022-05-20 15:22:10 +10:00
4 changed files with 6 additions and 28 deletions

View File

@@ -27,8 +27,4 @@ export class VaultFilterComponent extends BaseVaultFilterComponent {
searchTextChanged() {
this.onSearchTextChanged.emit(this.searchText);
}
async initCollections() {
return await this.vaultFilterService.buildCollections(this.organization?.id);
}
}

View File

@@ -1,12 +1,6 @@
import { NgModule } from "@angular/core";
import { VaultFilterService } from "jslib-angular/modules/vault-filter/vault-filter.service";
import { CipherService } from "jslib-common/abstractions/cipher.service";
import { CollectionService } from "jslib-common/abstractions/collection.service";
import { FolderService } from "jslib-common/abstractions/folder.service";
import { OrganizationService } from "jslib-common/abstractions/organization.service";
import { PolicyService } from "jslib-common/abstractions/policy.service";
import { StateService } from "jslib-common/abstractions/state.service";
import { SharedModule } from "../shared.module";
@@ -30,19 +24,6 @@ import { VaultFilterComponent } from "./vault-filter.component";
TypeFilterComponent,
],
exports: [VaultFilterComponent],
providers: [
{
provide: VaultFilterService,
useClass: VaultFilterService,
deps: [
StateService,
OrganizationService,
FolderService,
CipherService,
CollectionService,
PolicyService,
],
},
],
providers: [VaultFilterService],
})
export class VaultFilterModule {}

View File

@@ -1,3 +0,0 @@
import { VaultFilterService as BaseVaultFilterService } from "jslib-angular/modules/vault-filter/vault-filter.service";
export class VaultFilterService extends BaseVaultFilterService {}

View File

@@ -98,6 +98,7 @@ export class OrganizationVaultComponent implements OnInit, OnDestroy {
this.vaultFilterComponent.reloadCollectionsAndFolders(
new VaultFilter({
selectedOrganizationId: this.organization.id,
useAdminCollections: this.organization.canEditAnyCollection,
} as Partial<VaultFilter>)
),
this.ciphersComponent.refresh(),
@@ -110,7 +111,10 @@ export class OrganizationVaultComponent implements OnInit, OnDestroy {
});
}
await this.vaultFilterComponent.reloadCollectionsAndFolders(
new VaultFilter({ selectedOrganizationId: this.organization.id } as Partial<VaultFilter>)
new VaultFilter({
selectedOrganizationId: this.organization.id,
useAdminCollections: this.organization.canEditAnyCollection,
} as Partial<VaultFilter>)
);
await this.ciphersComponent.reload();