Various small vault filter fixes (#1659)

src/app/modules/vault-filter/components/organization-filter.component.html

@@ -78,14 +78,12 @@
       </ul>
     </ng-container>
     <ng-container *ngSwitchCase="'singleOrganizationAndPersonalOwnershipPolicies'">
-      <ul class="filter-options">
+      <div class="filter-heading">
-        <li class="filter-option active">
+        <button class="filter-button active">
-          <button class="filter-button">
+          <i class="bwi bwi-fw bwi-business" aria-hidden="true"></i>
-            <i class="bwi bwi-fw bwi-business" aria-hidden="true"></i>
+          {{ organizations[0].name }}
-            {{ organizations[0].name }}
+        </button>
-          </button>
+      </div>
-        </li>
-      </ul>
     </ng-container>
     <ng-container *ngSwitchCase="'organizationMember'">
       <div class="filter-heading">
@@ -140,7 +138,7 @@
               <i class="bwi bwi-fw bwi-business" aria-hidden="true"></i>
               {{ organization.name }}
             </button>
-            <ng-container *ngIf="organization.id === activeFilter.selectedOrganizationId">
+            <ng-container>
               <button [bitMenuTriggerFor]="orgMenu" class="org-options ml-auto">
                 <i class="bwi bwi-ellipsis-v" aria-hidden="true"></i>
               </button>

src/app/modules/vault-filter/vault-filter.component.html

@@ -26,19 +26,17 @@
         autocomplete="off"
         appAutofocus
       />
-      <div class="filter">
+      <app-organization-filter
-        <app-organization-filter
+        *ngIf="showOrgFilter"
-          *ngIf="showOrgFilter"
+        [hide]="hideOrganizations"
-          [hide]="hideOrganizations"
+        [activeFilter]="activeFilter"
-          [activeFilter]="activeFilter"
+        [collapsedFilterNodes]="collapsedFilterNodes"
-          [collapsedFilterNodes]="collapsedFilterNodes"
+        [organizations]="organizations"
-          [organizations]="organizations"
+        [activePersonalOwnershipPolicy]="activePersonalOwnershipPolicy"
-          [activePersonalOwnershipPolicy]="activePersonalOwnershipPolicy"
+        [activeSingleOrganizationPolicy]="activeSingleOrganizationPolicy"
-          [activeSingleOrganizationPolicy]="activeSingleOrganizationPolicy"
+        (onNodeCollapseStateChange)="toggleFilterNodeCollapseState($event)"
-          (onNodeCollapseStateChange)="toggleFilterNodeCollapseState($event)"
+        (onFilterChange)="applyFilter($event)"
-          (onFilterChange)="applyFilter($event)"
+      ></app-organization-filter>
-        ></app-organization-filter>
-      </div>
       <div class="filter">
         <app-status-filter
           [hideFavorites]="!showFavorites"

src/app/modules/vault/modules/organization-vault/organization-vault.component.ts

@@ -86,7 +86,7 @@ export class OrganizationVaultComponent implements OnInit, OnDestroy {
       this.ciphersComponent.organization = this.organization;
 
       this.route.queryParams.pipe(first()).subscribe(async (qParams) => {
-        // this.ciphersComponent.searchText = this.vaultFilterComponent.search = qParams.search;
+        this.ciphersComponent.searchText = this.vaultFilterComponent.searchText = qParams.search;
         if (!this.organization.canViewAllCollections) {
           await this.syncService.fullSync(false);
           this.broadcasterService.subscribe(BroadcasterSubscriptionId, (message: any) => {

src/app/organizations/vault/ciphers.component.ts

@@ -58,7 +58,8 @@ export class CiphersComponent extends BaseCiphersComponent {
     );
   }
 
-  async load(filter: (cipher: CipherView) => boolean = null) {
+  async load(filter: (cipher: CipherView) => boolean = null, deleted = false) {
+    this.deleted = deleted || false;
     if (this.organization.canEditAnyCollection) {
       this.accessEvents = this.organization.useEvents;
       this.allCiphers = await this.cipherService.getAllFromApiForOrganization(this.organization.id);

src/scss/vault-filters.scss

@@ -28,8 +28,6 @@
 
   h3,
   button.filter-button {
-    text-transform: uppercase;
-    text-transform: uppercase;
     margin: 0;
     @include themify($themes) {
       color: themed("textMuted");