Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-01-02 18:17:46 +01:00
Code Issues Projects Releases Wiki Activity

[SM-385] feat: add org-switcher filter input (#4235)

Browse Source
This commit is contained in:
Will Martin 2022-12-20 11:23:53 -05:00 committed by GitHub
parent 1f0e184cff
commit b331f5b329
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.html
View File

@ -2,7 +2,7 @@
<bit-icon [icon]="logo" class="tw-w-full tw-text-alt2"></bit-icon>
</a>
<org-switcher></org-switcher>
<org-switcher [filter]="orgFilter"></org-switcher>
<bit-nav-item icon="bwi-collection" text="Projects" route="projects"></bit-nav-item>
<bit-nav-item icon="bwi-key" text="Secrets" route="secrets"></bit-nav-item>
<bit-nav-item icon="bwi-wrench" text="Service Accounts" route="service-accounts"></bit-nav-item>

4
bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.ts
View File

@ -1,5 +1,7 @@
import { Component } from "@angular/core";
import { Organization } from "@bitwarden/common/models/domain/organization";
import { SecretsManagerLogo } from "./secrets-manager-logo";
@Component({
@ -8,4 +10,6 @@ import { SecretsManagerLogo } from "./secrets-manager-logo";
})
export class NavigationComponent {
protected readonly logo = SecretsManagerLogo;
protected orgFilter = (org: Organization) => org.canAccessSecretsManager;
}

13
bitwarden_license/bit-web/src/app/secrets-manager/layout/org-switcher.component.ts
View File

@ -12,13 +12,22 @@ import type { Organization } from "@bitwarden/common/models/domain/organization"
export class OrgSwitcherComponent {
protected organizations$: Observable<Organization[]> =
this.organizationService.organizations$.pipe(
map((orgs) => orgs.sort((a, b) => a.name.localeCompare(b.name)))
map((orgs) => orgs.filter(this.filter).sort((a, b) => a.name.localeCompare(b.name)))
);
protected activeOrganization$: Observable<Organization> = combineLatest([
this.route.paramMap,
this.organizationService.organizations$,
this.organizations$,
]).pipe(map(([params, orgs]) => orgs.find((org) => org.id === params.get("organizationId"))));
/**
* Filter function for displayed organizations in the `org-switcher`
* @example
* const smFilter = (org: Organization) => org.canAccessSecretsManager
* // <org-switcher [filter]="smFilter">
*/
@Input()
filter: (org: Organization) => boolean = () => true;
/**
* Is `true` if the expanded content is visible
*/