mirror of
https://github.com/bitwarden/web
synced 2025-12-06 00:03:28 +00:00
Compare commits
6 Commits
fix/filter
...
bug/ps-136
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
63aa95d55b | ||
|
|
eab8908206 | ||
|
|
51ee899c5e | ||
|
|
26065d3542 | ||
|
|
5094a710ac | ||
|
|
67ebf88837 |
@@ -27,4 +27,8 @@ export class VaultFilterComponent extends BaseVaultFilterComponent {
|
||||
searchTextChanged() {
|
||||
this.onSearchTextChanged.emit(this.searchText);
|
||||
}
|
||||
|
||||
async initCollections() {
|
||||
return await this.vaultFilterService.buildCollections(this.organization?.id);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,12 @@
|
||||
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";
|
||||
|
||||
@@ -24,6 +30,19 @@ import { VaultFilterComponent } from "./vault-filter.component";
|
||||
TypeFilterComponent,
|
||||
],
|
||||
exports: [VaultFilterComponent],
|
||||
providers: [VaultFilterService],
|
||||
providers: [
|
||||
{
|
||||
provide: VaultFilterService,
|
||||
useClass: VaultFilterService,
|
||||
deps: [
|
||||
StateService,
|
||||
OrganizationService,
|
||||
FolderService,
|
||||
CipherService,
|
||||
CollectionService,
|
||||
PolicyService,
|
||||
],
|
||||
},
|
||||
],
|
||||
})
|
||||
export class VaultFilterModule {}
|
||||
|
||||
3
src/app/modules/vault-filter/vault-filter.service.ts
Normal file
3
src/app/modules/vault-filter/vault-filter.service.ts
Normal file
@@ -0,0 +1,3 @@
|
||||
import { VaultFilterService as BaseVaultFilterService } from "jslib-angular/modules/vault-filter/vault-filter.service";
|
||||
|
||||
export class VaultFilterService extends BaseVaultFilterService {}
|
||||
@@ -98,7 +98,6 @@ 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(),
|
||||
@@ -111,10 +110,7 @@ export class OrganizationVaultComponent implements OnInit, OnDestroy {
|
||||
});
|
||||
}
|
||||
await this.vaultFilterComponent.reloadCollectionsAndFolders(
|
||||
new VaultFilter({
|
||||
selectedOrganizationId: this.organization.id,
|
||||
useAdminCollections: this.organization.canEditAnyCollection,
|
||||
} as Partial<VaultFilter>)
|
||||
new VaultFilter({ selectedOrganizationId: this.organization.id } as Partial<VaultFilter>)
|
||||
);
|
||||
await this.ciphersComponent.reload();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user