bitwarden/web
1
0
Fork 0
mirror of https://github.com/bitwarden/web synced 2025-12-15 15:53:18 +00:00
Code Issues Releases Wiki Activity

[fix] Simplify hiding unwanted filters in the org vault

Browse Source
This commit is contained in:
addison
2022-06-02 13:14:31 -04:00
parent 2af429249c
commit e07deff505
4 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/modules/vault-filter/organization-vault-filter.component.ts
View File

@@ -1,4 +1,4 @@
import { Component } from "@angular/core"; import { Component, Input } from "@angular/core";
import { Organization } from "jslib-common/models/domain/organization"; import { Organization } from "jslib-common/models/domain/organization";
@@ -10,6 +10,10 @@ import { VaultFilterServiceInterface } from "./vault-filter.service.interface";
templateUrl: "vault-filter.component.html", templateUrl: "vault-filter.component.html",
}) })
export class OrganizationVaultFilterComponent extends VaultFilterComponent { export class OrganizationVaultFilterComponent extends VaultFilterComponent {
@Input() hideOrganizations = true;
@Input() hideFavorites = true;
@Input() hideFolders = true;
organization: Organization; organization: Organization;
constructor(protected vaultFilterService: VaultFilterServiceInterface) { constructor(protected vaultFilterService: VaultFilterServiceInterface) {

5
src/app/modules/vault-filter/vault-filter.component.html
View File

@@ -27,7 +27,6 @@
appAutofocus appAutofocus
/> />
<app-organization-filter <app-organization-filter
*ngIf="showOrgFilter"
[hide]="hideOrganizations" [hide]="hideOrganizations"
[activeFilter]="activeFilter" [activeFilter]="activeFilter"
[collapsedFilterNodes]="collapsedFilterNodes" [collapsedFilterNodes]="collapsedFilterNodes"
@@ -39,7 +38,7 @@
></app-organization-filter> ></app-organization-filter>
<div class="filter"> <div class="filter">
<app-status-filter <app-status-filter
[hideFavorites]="!showFavorites" [hideFavorites]="hideFavorites"
[hideTrash]="hideTrash" [hideTrash]="hideTrash"
[activeFilter]="activeFilter" [activeFilter]="activeFilter"
(onFilterChange)="applyFilter($event)" (onFilterChange)="applyFilter($event)"
@@ -55,7 +54,7 @@
</div> </div>
<div class="filter"> <div class="filter">
<app-folder-filter <app-folder-filter
[hide]="!showFolders" [hide]="hideFolders"
[activeFilter]="activeFilter" [activeFilter]="activeFilter"
[collapsedFilterNodes]="collapsedFilterNodes" [collapsedFilterNodes]="collapsedFilterNodes"
[folderNodes]="folders" [folderNodes]="folders"

6
src/app/modules/vault-filter/vault-filter.component.ts
View File

@@ -1,4 +1,4 @@
import { Component, EventEmitter, Input, Output } from "@angular/core"; import { Component, EventEmitter, Output } from "@angular/core";
import { VaultFilterComponent as BaseVaultFilterComponent } from "jslib-angular/modules/vault-filter/vault-filter.component"; import { VaultFilterComponent as BaseVaultFilterComponent } from "jslib-angular/modules/vault-filter/vault-filter.component";
@@ -7,10 +7,6 @@ import { VaultFilterComponent as BaseVaultFilterComponent } from "jslib-angular/
templateUrl: "vault-filter.component.html", templateUrl: "vault-filter.component.html",
}) })
export class VaultFilterComponent extends BaseVaultFilterComponent { export class VaultFilterComponent extends BaseVaultFilterComponent {
@Input() showOrgFilter = true;
@Input() showFolders = true;
@Input() showFavorites = true;
@Output() onSearchTextChanged = new EventEmitter<string>(); @Output() onSearchTextChanged = new EventEmitter<string>();
searchPlaceholder: string; searchPlaceholder: string;

3
src/app/modules/vault/modules/organization-vault/organization-vault.component.html
View File

@@ -6,10 +6,7 @@
<div class="inner-content"> <div class="inner-content">
<app-organization-vault-filter <app-organization-vault-filter
#vaultFilter #vaultFilter
[showFolders]="false"
[showFavorites]="false"
[activeFilter]="activeFilter" [activeFilter]="activeFilter"
[showOrgFilter]="false"
(onFilterChange)="applyVaultFilter($event)" (onFilterChange)="applyVaultFilter($event)"
(onSearchTextChanged)="filterSearchText($event)" (onSearchTextChanged)="filterSearchText($event)"
></app-organization-vault-filter> ></app-organization-vault-filter>