From d433fa22d58bdc87092423d88c9ff48d1e889ff5 Mon Sep 17 00:00:00 2001
From: Leslie Xiong <lxiong@livefront.com>
Date: Fri, 19 Dec 2025 12:12:51 -0500
Subject: [PATCH] - created 'All vaults' group nav item to reset 'My vault' and
 'Organization's - changed 'All items' to a group nav item - fixed issue where
 'My vault' items were disappearing on page reload

---
 .../organization-filter.component.html        | 45 +++++++++++--------
 .../filters/organization-filter.component.ts  | 12 ++++-
 .../filters/type-filter.component.html        | 34 ++++++++------
 .../filters/type-filter.component.ts          |  5 ++-
 .../vault-filter/vault-filter.component.ts    |  1 -
 .../src/vault/app/vault-v3/vault.component.ts |  3 +-
 6 files changed, 62 insertions(+), 38 deletions(-)

diff --git a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/organization-filter.component.html b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/organization-filter.component.html
index 5de23af8e4e..79f89a39260 100644
--- a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/organization-filter.component.html
+++ b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/organization-filter.component.html
@@ -1,21 +1,30 @@
 @if (show()) {
-  @for (organization of organizations().children ?? []; track organization.node.id) {
-    <bit-nav-item
-      [icon]="organization.node.icon"
-      [forceActiveStyles]="organization.node.id === activeFilter()?.organizationId"
-      [text]="organization.node.name"
-      variant="tree"
-      [appA11yTitle]="organization.node.name"
-      (click)="applyFilter(organization)"
-    />
-    @if (!organization.node.enabled) {
-      <span class="tw-ml-auto">
-        <i
-          class="bwi bwi-fw bwi-exclamation-triangle text-danger mr-auto"
-          [attr.aria-label]="'organizationIsDisabled' | i18n"
-          [appA11yTitle]="'organizationIsDisabled' | i18n"
-        ></i>
-      </span>
+  <bit-nav-group
+    icon="bwi-filter"
+    (click)="applyAllVaultsFilter()"
+    [text]="'allVaults' | i18n"
+    [attr.aria-pressed]="activeFilter()?.organizationId === null"
+    [appA11yTitle]="'allVaults' | i18n"
+    variant="tree"
+    [open]="true"
+  >
+    @for (organization of organizations().children ?? []; track organization.node.id) {
+      <bit-nav-item
+        [icon]="organization.node.icon"
+        [forceActiveStyles]="organization.node.id === activeFilter()?.organizationId"
+        [text]="organization.node.name"
+        [appA11yTitle]="organization.node.name"
+        (click)="applyFilter($event, organization)"
+      />
+      @if (!organization.node.enabled) {
+        <span class="tw-ml-auto">
+          <i
+            class="bwi bwi-fw bwi-exclamation-triangle text-danger mr-auto"
+            [attr.aria-label]="'organizationIsDisabled' | i18n"
+            [appA11yTitle]="'organizationIsDisabled' | i18n"
+          ></i>
+        </span>
+      }
     }
-  }
+  </bit-nav-group>
 }
diff --git a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/organization-filter.component.ts b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/organization-filter.component.ts
index fb88db007f4..fa91816577a 100644
--- a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/organization-filter.component.ts
+++ b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/organization-filter.component.ts
@@ -51,7 +51,8 @@ export class OrganizationFilterComponent {
     return displayMode;
   });
 
-  protected applyFilter(organization: TreeNode<OrganizationFilter>) {
+  protected applyFilter(event: Event, organization: TreeNode<OrganizationFilter>) {
+    event.stopPropagation();
     if (!organization.node.enabled) {
       this.toastService.showToast({
         variant: "error",
@@ -68,4 +69,13 @@ export class OrganizationFilterComponent {
       filter.selectedOrganizationNode = organization;
     }
   }
+
+  protected applyAllVaultsFilter() {
+    this.vaultFilterService.clearOrganizationFilter();
+    const filter = this.activeFilter();
+
+    if (filter) {
+      filter.selectedOrganizationNode = null;
+    }
+  }
 }
diff --git a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/type-filter.component.html b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/type-filter.component.html
index 309b953acb5..1c9e58e0656 100644
--- a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/type-filter.component.html
+++ b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/type-filter.component.html
@@ -1,18 +1,24 @@
-<bit-nav-item
+<bit-nav-group
   icon="bwi-filter"
-  [forceActiveStyles]="activeFilter()?.selectedCipherTypeNode?.node?.id === 'AllItems'"
-  (click)="applyAllItemsFilter()"
+  (click)="applyAllItemsFilter($event)"
   [text]="'allItems' | i18n"
   [attr.aria-pressed]="activeFilter()?.selectedCipherTypeNode?.node?.id === 'AllItems'"
   [appA11yTitle]="'allItems' | i18n"
-/>
-@for (typeFilter of typeFilters$ | async; track typeFilter) {
-  <bit-nav-item
-    [icon]="typeFilter.node.icon"
-    [forceActiveStyles]="activeFilter()?.selectedCipherTypeNode.node.type === typeFilter.node.type"
-    (click)="applyTypeFilter(typeFilter)"
-    [text]="typeFilter.node.name"
-    [attr.aria-pressed]="activeFilter()?.selectedCipherTypeNode.node.type === typeFilter.node.type"
-    [appA11yTitle]="typeFilter.node.name"
-  />
-}
+  variant="tree"
+  [open]="true"
+>
+  @for (typeFilter of typeFilters$ | async; track typeFilter) {
+    <bit-nav-item
+      [icon]="typeFilter.node.icon"
+      [forceActiveStyles]="
+        activeFilter()?.selectedCipherTypeNode.node.type === typeFilter.node.type
+      "
+      (click)="applyTypeFilter($event, typeFilter)"
+      [text]="typeFilter.node.name"
+      [attr.aria-pressed]="
+        activeFilter()?.selectedCipherTypeNode.node.type === typeFilter.node.type
+      "
+      [appA11yTitle]="typeFilter.node.name"
+    />
+  }
+</bit-nav-group>
diff --git a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/type-filter.component.ts b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/type-filter.component.ts
index 9060d78bbba..40755b25253 100644
--- a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/type-filter.component.ts
+++ b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/type-filter.component.ts
@@ -23,7 +23,8 @@ export class TypeFilterComponent {
   protected readonly cipherTypes = input<TreeNode<CipherTypeFilter>>();
   protected readonly activeFilter = input<VaultFilter>();
 
-  protected applyTypeFilter(cipherType: TreeNode<CipherTypeFilter>) {
+  protected applyTypeFilter(event: Event, cipherType: TreeNode<CipherTypeFilter>) {
+    event.stopPropagation();
     const filter = this.activeFilter();
 
     if (filter) {
@@ -31,7 +32,7 @@ export class TypeFilterComponent {
     }
   }
 
-  protected applyAllItemsFilter() {
+  protected applyAllItemsFilter(event: Event) {
     const filter = this.activeFilter();
 
     if (filter) {
diff --git a/apps/desktop/src/vault/app/vault-v3/vault-filter/vault-filter.component.ts b/apps/desktop/src/vault/app/vault-v3/vault-filter/vault-filter.component.ts
index 3cb75e26a98..3d6a481911d 100644
--- a/apps/desktop/src/vault/app/vault-v3/vault-filter/vault-filter.component.ts
+++ b/apps/desktop/src/vault/app/vault-v3/vault-filter/vault-filter.component.ts
@@ -111,7 +111,6 @@ export class VaultFilterComponent implements OnInit {
       this.cipherArchiveService.hasArchiveFlagEnabled$,
     );
 
-    // Subscribe to the active filter from the bridge service
     this.routedVaultFilterBridgeService.activeFilter$
       .pipe(takeUntil(this.componentIsDestroyed$))
       .subscribe((filter) => {
diff --git a/apps/desktop/src/vault/app/vault-v3/vault.component.ts b/apps/desktop/src/vault/app/vault-v3/vault.component.ts
index 8eabb52aba1..81761a4a88c 100644
--- a/apps/desktop/src/vault/app/vault-v3/vault.component.ts
+++ b/apps/desktop/src/vault/app/vault-v3/vault.component.ts
@@ -273,8 +273,7 @@ export class VaultComponent implements OnInit, OnDestroy, CopyClickListener {
                 break;
               case "syncCompleted":
                 if (this.vaultItemsComponent) {
-                  const filter = this.activeFilter.buildFilter();
-                  await this.vaultItemsComponent.reload(filter).catch(() => {});
+                  await this.vaultItemsComponent.refresh().catch(() => {});
                 }
                 break;
               case "modalShown":