From 7d7572eb060473ed8fabe12c7457eea9c80a5b50 Mon Sep 17 00:00:00 2001
From: jng <jng@bitwarden.com>
Date: Wed, 24 Sep 2025 15:20:09 -0400
Subject: [PATCH 01/10] archive and unarchive an individual item

---
 .../vault-cipher-row.component.html           | 14 ++++++
 .../vault-items/vault-cipher-row.component.ts | 24 ++++++++++
 .../vault-items/vault-item-event.ts           |  4 +-
 .../vault-items/vault-items.component.html    |  1 +
 .../vault-items/vault-items.component.ts      |  1 +
 .../individual-vault/vault.component.html     |  1 +
 .../vault/individual-vault/vault.component.ts | 48 ++++++++++++++++++-
 apps/web/src/locales/en/messages.json         | 21 ++++++++
 8 files changed, 112 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
index 2074f380e329..b7fa4be4b274 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
@@ -151,6 +151,20 @@
         <i class="bwi bwi-fw bwi-file-text" aria-hidden="true"></i>
         {{ "eventLogs" | i18n }}
       </button>
+      @if (showArchiveButton) {
+        <button bitMenuItem (click)="archive()" type="button">
+          <i class="bwi bwi-fw bwi-archive" aria-hidden="true"></i>
+          {{ "archive" | i18n }}
+        </button>
+      }
+
+      @if (showUnArchiveButton) {
+        <button bitMenuItem (click)="unarchive()" type="button">
+          <i class="bwi bwi-fw bwi-archive" aria-hidden="true"></i>
+          {{ "unarchive" | i18n }}
+        </button>
+      }
+
       <button bitMenuItem (click)="restore()" type="button" *ngIf="isDeleted && canRestoreCipher">
         <i class="bwi bwi-fw bwi-undo" aria-hidden="true"></i>
         {{ "restore" | i18n }}
diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
index 32037493e36f..b22f96e25378 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
@@ -48,6 +48,10 @@ export class VaultCipherRowComponent<C extends CipherViewLike> implements OnInit
    * uses new permission restore logic from PM-15493
    */
   @Input() canRestoreCipher: boolean;
+  /**
+   * user has archive permissions
+   */
+  @Input() userCanArchive: boolean;
 
   @Output() onEvent = new EventEmitter<VaultItemEvent<C>>();
 
@@ -76,6 +80,18 @@ export class VaultCipherRowComponent<C extends CipherViewLike> implements OnInit
     }
   }
 
+  protected get showArchiveButton() {
+    return (
+      this.userCanArchive &&
+      !CipherViewLikeUtils.isArchived(this.cipher) &&
+      !this.cipher.organizationId
+    );
+  }
+
+  protected get showUnArchiveButton() {
+    return this.userCanArchive && CipherViewLikeUtils.isArchived(this.cipher);
+  }
+
   protected get clickAction() {
     if (this.decryptionFailure) {
       return "showFailedToDecrypt";
@@ -236,6 +252,14 @@ export class VaultCipherRowComponent<C extends CipherViewLike> implements OnInit
     this.onEvent.emit({ type: "viewEvents", item: this.cipher });
   }
 
+  protected archive() {
+    this.onEvent.emit({ type: "archive", item: this.cipher });
+  }
+
+  protected unarchive() {
+    this.onEvent.emit({ type: "unarchive", item: this.cipher });
+  }
+
   protected restore() {
     this.onEvent.emit({ type: "restore", items: [this.cipher] });
   }
diff --git a/apps/web/src/app/vault/components/vault-items/vault-item-event.ts b/apps/web/src/app/vault/components/vault-items/vault-item-event.ts
index 6d84ed5cde18..d4205b9d17e7 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-item-event.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-item-event.ts
@@ -20,4 +20,6 @@ export type VaultItemEvent<C extends CipherViewLike> =
   | { type: "delete"; items: VaultItem<C>[] }
   | { type: "copyField"; item: C; field: "username" | "password" | "totp" }
   | { type: "moveToFolder"; items: C[] }
-  | { type: "assignToCollections"; items: C[] };
+  | { type: "assignToCollections"; items: C[] }
+  | { type: "archive"; item: C }
+  | { type: "unarchive"; item: C };
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.component.html b/apps/web/src/app/vault/components/vault-items/vault-items.component.html
index 5ddccf6a3956..a05ffeb78362 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.component.html
@@ -161,6 +161,7 @@
           "
           (checkedToggled)="selection.toggle(item)"
           (onEvent)="event($event)"
+          [userCanArchive]="userCanArchive"
         ></tr>
       </ng-container>
     </ng-template>
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.component.ts b/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
index a5bcb9157139..ba996947b8f5 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
@@ -63,6 +63,7 @@ export class VaultItemsComponent<C extends CipherViewLike> {
   @Input() addAccessStatus: number;
   @Input() addAccessToggle: boolean;
   @Input() activeCollection: CollectionView | undefined;
+  @Input() userCanArchive: boolean;
 
   private restrictedPolicies = toSignal(this.restrictedItemTypesService.restricted$);
 
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.html b/apps/web/src/app/vault/individual-vault/vault.component.html
index 958cf655d178..17d7801a66f1 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.html
+++ b/apps/web/src/app/vault/individual-vault/vault.component.html
@@ -50,6 +50,7 @@
       [useEvents]="false"
       [showAdminActions]="false"
       [showBulkAddToCollections]="true"
+      [userCanArchive]="userCanArchive$ | async"
       (onEvent)="onVaultItemsEvent($event)"
     >
     </app-vault-items>
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts
index 01082bfcd60d..8bf56d88cb67 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault.component.ts
@@ -184,13 +184,15 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
     .pipe(map((a) => a?.id))
     .pipe(switchMap((id) => this.organizationService.organizations$(id)));
 
-  private userCanArchive$ = this.accountService.activeAccount$.pipe(
+  protected userCanArchive$ = this.accountService.activeAccount$.pipe(
     getUserId,
     switchMap((userId) => {
       return this.cipherArchiveService.userCanArchive$(userId);
     }),
   );
 
+  private userId$ = this.accountService.activeAccount$.pipe(getUserId);
+
   constructor(
     private syncService: SyncService,
     private route: ActivatedRoute,
@@ -569,12 +571,56 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
         case "assignToCollections":
           await this.bulkAssignToCollections(event.items);
           break;
+        case "archive":
+          await this.archive(event.item);
+          break;
+        case "unarchive":
+          await this.unarchive(event.item);
+          break;
       }
     } finally {
       this.processingEvent = false;
     }
   }
 
+  async archive(cipher: CipherView | CipherListView) {
+    const confirmed = await this.dialogService.openSimpleDialog({
+      title: { key: "archiveItem" },
+      content: { key: "archiveItemConfirmDesc" },
+      type: "info",
+    });
+
+    if (!confirmed) {
+      return;
+    }
+
+    const repromptPassed = await this.passwordRepromptService.passwordRepromptCheck(cipher);
+    if (!repromptPassed) {
+      return;
+    }
+    const activeUserId = await firstValueFrom(this.userId$);
+    await this.cipherArchiveService.archiveWithServer(cipher.id as CipherId, activeUserId);
+    this.toastService.showToast({
+      variant: "success",
+      message: this.i18nService.t("itemSentToArchive"),
+    });
+  }
+
+  async unarchive(cipher: CipherView | CipherListView) {
+    const repromptPassed = await this.passwordRepromptService.passwordRepromptCheck(cipher);
+    if (!repromptPassed) {
+      return;
+    }
+    const activeUserId = await firstValueFrom(this.userId$);
+
+    await this.cipherArchiveService.unarchiveWithServer(cipher.id as CipherId, activeUserId);
+
+    this.toastService.showToast({
+      variant: "success",
+      message: this.i18nService.t("itemRemovedFromArchive"),
+    });
+  }
+
   async applyOrganizationFilter(orgId: string) {
     if (orgId == null) {
       orgId = "MyVault";
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 11d2d8e3dd8c..b5228ea752df 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -11024,9 +11024,30 @@
   "archive": {
     "message": "Archive"
   },
+  "unarchive": {
+    "message": "Unarchive"
+  },
+  "itemsInArchive": {
+    "message": "Items in archive"
+  },
   "noItemsInArchive": {
     "message": "No items in archive"
   },
+  "noItemsInArchiveDesc": {
+    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
+  },
+  "itemSentToArchive": {
+    "message": "Item sent to archive"
+  },
+  "itemRemovedFromArchive": {
+    "message": "Item removed from archive"
+  },
+  "archiveItem": {
+    "message": "Archive item"
+  },
+  "archiveItemConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
+  },
   "archivedItemsDescription": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },

From 586647dd8965b5e812c460935fd01aef1dbaa61d Mon Sep 17 00:00:00 2001
From: jng <jng@bitwarden.com>
Date: Thu, 25 Sep 2025 12:06:24 -0400
Subject: [PATCH 02/10] bulk archive and unachive

---
 .../vault-items/vault-cipher-row.component.ts |  4 +-
 .../vault-items/vault-item-event.ts           |  4 +-
 .../vault-items/vault-items.component.html    | 16 +++++
 .../vault-items/vault-items.component.ts      | 44 ++++++++++++++
 .../vault/individual-vault/vault.component.ts | 58 +++++++++++++++++--
 5 files changed, 118 insertions(+), 8 deletions(-)

diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
index b22f96e25378..5665267726c6 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
@@ -253,11 +253,11 @@ export class VaultCipherRowComponent<C extends CipherViewLike> implements OnInit
   }
 
   protected archive() {
-    this.onEvent.emit({ type: "archive", item: this.cipher });
+    this.onEvent.emit({ type: "archive", items: [this.cipher] });
   }
 
   protected unarchive() {
-    this.onEvent.emit({ type: "unarchive", item: this.cipher });
+    this.onEvent.emit({ type: "unarchive", items: [this.cipher] });
   }
 
   protected restore() {
diff --git a/apps/web/src/app/vault/components/vault-items/vault-item-event.ts b/apps/web/src/app/vault/components/vault-items/vault-item-event.ts
index d4205b9d17e7..302866ec9e24 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-item-event.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-item-event.ts
@@ -21,5 +21,5 @@ export type VaultItemEvent<C extends CipherViewLike> =
   | { type: "copyField"; item: C; field: "username" | "password" | "totp" }
   | { type: "moveToFolder"; items: C[] }
   | { type: "assignToCollections"; items: C[] }
-  | { type: "archive"; item: C }
-  | { type: "unarchive"; item: C };
+  | { type: "archive"; items: C[] }
+  | { type: "unarchive"; items: C[] };
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.component.html b/apps/web/src/app/vault/components/vault-items/vault-items.component.html
index a05ffeb78362..c1acf6290654 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.component.html
@@ -83,6 +83,22 @@
               <i class="bwi bwi-fw bwi-collection-shared" aria-hidden="true"></i>
               {{ "assignToCollections" | i18n }}
             </button>
+
+            <button *ngIf="bulkArchiveAllowed" type="button" bitMenuItem (click)="bulkArchive()">
+              <i class="bwi bwi-fw bwi-archive" aria-hidden="true"></i>
+              {{ "archive" | i18n }}
+            </button>
+
+            <button
+              *ngIf="bulkUnarchiveAllowed"
+              type="button"
+              bitMenuItem
+              (click)="bulkUnarchive()"
+            >
+              <i class="bwi bwi-fw bwi-archive" aria-hidden="true"></i>
+              {{ "unarchive" | i18n }}
+            </button>
+
             <button
               *ngIf="canRestoreSelected$ | async"
               type="button"
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.component.ts b/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
index ba996947b8f5..cdcd19c5babf 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
@@ -191,6 +191,32 @@ export class VaultItemsComponent<C extends CipherViewLike> {
     );
   }
 
+  get bulkArchiveAllowed() {
+    if (this.selection.selected.length === 0 || !this.userCanArchive) {
+      return false;
+    }
+
+    return (
+      this.userCanArchive &&
+      !this.selection.selected.find(
+        (item) => item.cipher.organizationId || item.cipher.archivedDate,
+      )
+    );
+  }
+
+  get bulkUnarchiveAllowed() {
+    if (this.selection.selected.length === 0 || !this.userCanArchive) {
+      return false;
+    }
+
+    return (
+      this.userCanArchive &&
+      !this.selection.selected.find(
+        (item) => !item.cipher.archivedDate || item.cipher.organizationId,
+      )
+    );
+  }
+
   //@TODO: remove this function when removing the limitItemDeletion$ feature flag.
   get showDelete(): boolean {
     if (this.selection.selected.length === 0) {
@@ -270,6 +296,24 @@ export class VaultItemsComponent<C extends CipherViewLike> {
     });
   }
 
+  protected bulkArchive() {
+    this.event({
+      type: "archive",
+      items: this.selection.selected
+        .filter((item) => item.cipher !== undefined)
+        .map((item) => item.cipher),
+    });
+  }
+
+  protected bulkUnarchive() {
+    this.event({
+      type: "unarchive",
+      items: this.selection.selected
+        .filter((item) => item.cipher !== undefined)
+        .map((item) => item.cipher),
+    });
+  }
+
   protected bulkRestore() {
     this.event({
       type: "restore",
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts
index 8bf56d88cb67..a1d376ef8988 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault.component.ts
@@ -572,10 +572,18 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
           await this.bulkAssignToCollections(event.items);
           break;
         case "archive":
-          await this.archive(event.item);
+          if (event.items.length === 1) {
+            await this.archive(event.items[0]);
+          } else {
+            await this.bulkArchive(event.items);
+          }
           break;
         case "unarchive":
-          await this.unarchive(event.item);
+          if (event.items.length === 1) {
+            await this.unarchive(event.items[0]);
+          } else {
+            await this.bulkUnarchive(event.items);
+          }
           break;
       }
     } finally {
@@ -583,7 +591,7 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
     }
   }
 
-  async archive(cipher: CipherView | CipherListView) {
+  async archive(cipher: C) {
     const confirmed = await this.dialogService.openSimpleDialog({
       title: { key: "archiveItem" },
       content: { key: "archiveItemConfirmDesc" },
@@ -606,7 +614,33 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
     });
   }
 
-  async unarchive(cipher: CipherView | CipherListView) {
+  async bulkArchive(ciphers: C[]) {
+    const confirmed = await this.dialogService.openSimpleDialog({
+      title: { key: "archiveItem" },
+      content: { key: "archiveItemConfirmDesc" },
+      type: "info",
+    });
+
+    if (!confirmed) {
+      return;
+    }
+
+    if (!(await this.repromptCipher(ciphers))) {
+      return;
+    }
+
+    const activeUserId = await firstValueFrom(this.userId$);
+    const cipherIds = ciphers.map((c) => c.id as CipherId);
+    await this.cipherArchiveService.archiveWithServer(cipherIds as CipherId[], activeUserId);
+    this.toastService.showToast({
+      variant: "success",
+      message: this.i18nService.t("itemSentToArchive"),
+    });
+
+    this.refresh();
+  }
+
+  async unarchive(cipher: C) {
     const repromptPassed = await this.passwordRepromptService.passwordRepromptCheck(cipher);
     if (!repromptPassed) {
       return;
@@ -621,6 +655,22 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
     });
   }
 
+  async bulkUnarchive(ciphers: C[]) {
+    if (!(await this.repromptCipher(ciphers))) {
+      return;
+    }
+
+    const activeUserId = await firstValueFrom(this.userId$);
+    const cipherIds = ciphers.map((c) => c.id as CipherId);
+    await this.cipherArchiveService.unarchiveWithServer(cipherIds as CipherId[], activeUserId);
+    this.toastService.showToast({
+      variant: "success",
+      message: this.i18nService.t("itemRemovedFromArchive"),
+    });
+
+    this.refresh();
+  }
+
   async applyOrganizationFilter(orgId: string) {
     if (orgId == null) {
       orgId = "MyVault";

From 38c87a470ee93631c75311de841b4f77e07bb94c Mon Sep 17 00:00:00 2001
From: jng <jng@bitwarden.com>
Date: Thu, 25 Sep 2025 17:17:23 -0400
Subject: [PATCH 03/10] updates to text strings for archive empty state and
 tooltips

---
 apps/browser/src/_locales/en/messages.json      |  8 ++++----
 .../item-more-options.component.ts              |  2 +-
 .../vault/popup/settings/archive.component.ts   |  2 +-
 apps/desktop/src/locales/en/messages.json       |  8 ++++----
 .../vault/individual-vault/vault.component.html |  2 +-
 .../vault/individual-vault/vault.component.ts   |  8 ++++----
 apps/web/src/locales/en/messages.json           | 17 ++++++++++-------
 7 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index 72c3892af621..0c4f020548c6 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -565,11 +565,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
diff --git a/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.ts b/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.ts
index 6979f519f2d2..bd2adfe74826 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.ts
@@ -266,7 +266,7 @@ export class ItemMoreOptionsComponent {
     await this.cipherArchiveService.archiveWithServer(this.cipher.id as CipherId, activeUserId);
     this.toastService.showToast({
       variant: "success",
-      message: this.i18nService.t("itemSentToArchive"),
+      message: this.i18nService.t("itemWasSentToArchive"),
     });
   }
 }
diff --git a/apps/browser/src/vault/popup/settings/archive.component.ts b/apps/browser/src/vault/popup/settings/archive.component.ts
index c3e078a92743..2a015e045401 100644
--- a/apps/browser/src/vault/popup/settings/archive.component.ts
+++ b/apps/browser/src/vault/popup/settings/archive.component.ts
@@ -127,7 +127,7 @@ export class ArchiveComponent {
 
     this.toastService.showToast({
       variant: "success",
-      message: this.i18nService.t("itemRemovedFromArchive"),
+      message: this.i18nService.t("itemUnarchived"),
     });
   }
 
diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index aa597a6bf97e..cfbaed2672b7 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -4123,11 +4123,11 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.html b/apps/web/src/app/vault/individual-vault/vault.component.html
index 17d7801a66f1..47c976374de9 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.html
+++ b/apps/web/src/app/vault/individual-vault/vault.component.html
@@ -72,7 +72,7 @@
       <bit-no-items [icon]="noItemIcon">
         <div slot="title" *ngIf="filter.type === 'archive'">{{ "noItemsInArchive" | i18n }}</div>
         <p slot="description" class="tw-text-center tw-max-w-md" *ngIf="filter.type === 'archive'">
-          {{ "archivedItemsDescription" | i18n }}
+          {{ "noItemsInArchiveDesc" | i18n }}
         </p>
         <div slot="title" *ngIf="filter.type !== 'archive'">{{ "noItemsInList" | i18n }}</div>
         <button
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts
index a1d376ef8988..38d0cc829cf6 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault.component.ts
@@ -610,7 +610,7 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
     await this.cipherArchiveService.archiveWithServer(cipher.id as CipherId, activeUserId);
     this.toastService.showToast({
       variant: "success",
-      message: this.i18nService.t("itemSentToArchive"),
+      message: this.i18nService.t("itemWasSentToArchive"),
     });
   }
 
@@ -634,7 +634,7 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
     await this.cipherArchiveService.archiveWithServer(cipherIds as CipherId[], activeUserId);
     this.toastService.showToast({
       variant: "success",
-      message: this.i18nService.t("itemSentToArchive"),
+      message: this.i18nService.t("itemWasSentToArchive"),
     });
 
     this.refresh();
@@ -651,7 +651,7 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
 
     this.toastService.showToast({
       variant: "success",
-      message: this.i18nService.t("itemRemovedFromArchive"),
+      message: this.i18nService.t("itemUnarchived"),
     });
   }
 
@@ -665,7 +665,7 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
     await this.cipherArchiveService.unarchiveWithServer(cipherIds as CipherId[], activeUserId);
     this.toastService.showToast({
       variant: "success",
-      message: this.i18nService.t("itemRemovedFromArchive"),
+      message: this.i18nService.t("bulkUnarchiveItems"),
     });
 
     this.refresh();
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index b5228ea752df..8fc32ef72d9a 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -11036,11 +11036,17 @@
   "noItemsInArchiveDesc": {
     "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
   },
-  "itemSentToArchive": {
-    "message": "Item sent to archive"
+  "itemWasSentToArchive": {
+    "message": "Item was sent to archive"
   },
-  "itemRemovedFromArchive": {
-    "message": "Item removed from archive"
+  "itemUnarchived": {
+    "message": "Item was unarchived"
+  },
+  "bulkArchiveItems": {
+    "message": "Items archived"
+  },
+  "bulkUnarchiveItems": {
+    "message": "Items unarchived"
   },
   "archiveItem": {
     "message": "Archive item"
@@ -11048,9 +11054,6 @@
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
-  "archivedItemsDescription": {
-    "message": "Archived items will appear here and will be excluded from general search results and autofill suggestions."
-  },
   "businessUnit": {
     "message": "Business Unit"
   },

From 981d85d12f19a649ad8b0dbf59479639bd3a7094 Mon Sep 17 00:00:00 2001
From: jng <jng@bitwarden.com>
Date: Fri, 26 Sep 2025 15:33:04 -0400
Subject: [PATCH 04/10] update translation keys to have an archive verb and
 noun differentiation

---
 apps/browser/src/_locales/en/messages.json         | 14 ++++++++++----
 .../item-more-options.component.html               |  2 +-
 .../vault/popup/settings/archive.component.html    |  2 +-
 .../settings/vault-settings-v2.component.html      |  2 +-
 apps/desktop/src/locales/en/messages.json          | 14 ++++++++++----
 .../vault-items/vault-cipher-row.component.html    |  4 ++--
 .../vault-items/vault-items.component.html         |  4 ++--
 .../components/vault-filter.component.ts           |  2 +-
 .../vault-header/vault-header.component.ts         |  2 +-
 apps/web/src/locales/en/messages.json              | 14 ++++++++++----
 10 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index 0c4f020548c6..1e8dfd2fab18 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -550,11 +550,17 @@
   "resetSearch": {
     "message": "Reset search"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveVerb": {
+    "message": "Archive",
+    "descripton": "Verb"
   },
-  "unarchive": {
-    "message": "Unarchive"
+  "archiveNoun": {
+    "message": "Archive",
+    "descripton": "Noun"
+  },
+  "unArchiveVerb": {
+    "message": "Unarchive",
+    "descripton": "Verb"
   },
   "itemsInArchive": {
     "message": "Items in archive"
diff --git a/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.html b/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.html
index 16cc04ce6125..7ee7e141ee57 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.html
@@ -40,7 +40,7 @@
     </ng-container>
     @if (canArchive$ | async) {
       <button type="button" bitMenuItem (click)="archive()" *ngIf="canArchive$ | async">
-        {{ "archive" | i18n }}
+        {{ "archiveVerb" | i18n }}
       </button>
     }
   </bit-menu>
diff --git a/apps/browser/src/vault/popup/settings/archive.component.html b/apps/browser/src/vault/popup/settings/archive.component.html
index 5fb57814fff1..f5f296fb8636 100644
--- a/apps/browser/src/vault/popup/settings/archive.component.html
+++ b/apps/browser/src/vault/popup/settings/archive.component.html
@@ -49,7 +49,7 @@ <h2 bitTypography="h6">
                     {{ "clone" | i18n }}
                   </button>
                   <button type="button" bitMenuItem (click)="unarchive(cipher)">
-                    {{ "unarchive" | i18n }}
+                    {{ "unArchiveVerb" | i18n }}
                   </button>
                   <button
                     type="button"
diff --git a/apps/browser/src/vault/popup/settings/vault-settings-v2.component.html b/apps/browser/src/vault/popup/settings/vault-settings-v2.component.html
index 630c55d00384..3c1278b4d44f 100644
--- a/apps/browser/src/vault/popup/settings/vault-settings-v2.component.html
+++ b/apps/browser/src/vault/popup/settings/vault-settings-v2.component.html
@@ -37,7 +37,7 @@
     @if (userCanArchive() || showArchiveFilter()) {
       <bit-item>
         <a bit-item-content routerLink="/archive">
-          {{ "archive" | i18n }}
+          {{ "archiveNoun" | i18n }}
           <i slot="end" class="bwi bwi-angle-right" aria-hidden="true"></i>
         </a>
       </bit-item>
diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index cfbaed2672b7..d95769250ba0 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -4108,11 +4108,17 @@
   "editShortcut": {
     "message": "Edit shortcut"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveVerb": {
+    "message": "Archive",
+    "descripton": "Verb"
   },
-  "unarchive": {
-    "message": "Unarchive"
+  "archiveNoun": {
+    "message": "Archive",
+    "descripton": "Noun"
+  },
+  "unArchiveVerb": {
+    "message": "Unarchive",
+    "descripton": "Verb"
   },
   "itemsInArchive": {
     "message": "Items in archive"
diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
index b7fa4be4b274..3222f5a48bf6 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
@@ -154,14 +154,14 @@
       @if (showArchiveButton) {
         <button bitMenuItem (click)="archive()" type="button">
           <i class="bwi bwi-fw bwi-archive" aria-hidden="true"></i>
-          {{ "archive" | i18n }}
+          {{ "archiveVerb" | i18n }}
         </button>
       }
 
       @if (showUnArchiveButton) {
         <button bitMenuItem (click)="unarchive()" type="button">
           <i class="bwi bwi-fw bwi-archive" aria-hidden="true"></i>
-          {{ "unarchive" | i18n }}
+          {{ "unArchiveVerb" | i18n }}
         </button>
       }
 
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.component.html b/apps/web/src/app/vault/components/vault-items/vault-items.component.html
index c1acf6290654..a2cff06084ba 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.component.html
@@ -86,7 +86,7 @@
 
             <button *ngIf="bulkArchiveAllowed" type="button" bitMenuItem (click)="bulkArchive()">
               <i class="bwi bwi-fw bwi-archive" aria-hidden="true"></i>
-              {{ "archive" | i18n }}
+              {{ "archiveVerb" | i18n }}
             </button>
 
             <button
@@ -96,7 +96,7 @@
               (click)="bulkUnarchive()"
             >
               <i class="bwi bwi-fw bwi-archive" aria-hidden="true"></i>
-              {{ "unarchive" | i18n }}
+              {{ "unArchiveVerb" | i18n }}
             </button>
 
             <button
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts b/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts
index 6feaa52d190f..b3c6b48f2d94 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts
@@ -433,7 +433,7 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
         [
           {
             id: "archive",
-            name: this.i18nService.t("archive"),
+            name: this.i18nService.t("archiveNoun"),
             type: "archive",
             icon: "bwi-archive",
           },
diff --git a/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts
index 63e6d391b424..aaa3a90aa980 100644
--- a/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts
@@ -140,7 +140,7 @@ export class VaultHeaderComponent {
     }
 
     if (this.filter.type === "archive") {
-      return this.i18nService.t("archive");
+      return this.i18nService.t("archiveNoun");
     }
 
     const activeOrganization = this.activeOrganization;
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 8fc32ef72d9a..ffb1239cf341 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -11021,11 +11021,17 @@
   "searchArchive": {
     "message": "Search archive"
   },
-  "archive": {
-    "message": "Archive"
+  "archiveVerb": {
+    "message": "Archive",
+    "descripton": "Verb"
   },
-  "unarchive": {
-    "message": "Unarchive"
+  "archiveNoun": {
+    "message": "Archive",
+    "descripton": "Noun"
+  },
+  "unArchiveVerb": {
+    "message": "Unarchive",
+    "descripton": "Verb"
   },
   "itemsInArchive": {
     "message": "Items in archive"

From 4255ae5d7ca371f270cf77e3d4bae9e3e0ef70bb Mon Sep 17 00:00:00 2001
From: jng <jng@bitwarden.com>
Date: Mon, 29 Sep 2025 18:54:58 -0400
Subject: [PATCH 05/10] if premium member loses premium and has archive items.
 apply filter changes, and item more option changes

---
 .../vault-items/vault-cipher-row.component.ts | 26 ++++++++++++++++++-
 .../vault-items/vault-items.component.html    |  1 +
 .../vault-items/vault-items.component.ts      |  1 +
 .../components/vault-filter.component.ts      |  6 +++++
 .../individual-vault/vault.component.html     |  1 +
 .../vault/individual-vault/vault.component.ts | 15 ++++++++++-
 6 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
index 5665267726c6..40c2b5c2cbc8 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
@@ -52,6 +52,10 @@ export class VaultCipherRowComponent<C extends CipherViewLike> implements OnInit
    * user has archive permissions
    */
   @Input() userCanArchive: boolean;
+  /**
+   * Enforge Org Data Ownership Policy Status
+   */
+  @Input() enforceOrgDataOwnershipPolicy: boolean;
 
   @Output() onEvent = new EventEmitter<VaultItemEvent<C>>();
 
@@ -80,6 +84,11 @@ export class VaultCipherRowComponent<C extends CipherViewLike> implements OnInit
     }
   }
 
+  // what buttons to hide here and how?
+  // if item has archivedDate but userCanArchive is false ONLY SHOW
+  // Edit, Unarchive, Trash
+  // make a "isArchivedItem" getter?
+
   protected get showArchiveButton() {
     return (
       this.userCanArchive &&
@@ -88,8 +97,9 @@ export class VaultCipherRowComponent<C extends CipherViewLike> implements OnInit
     );
   }
 
+  // If item is archived always show unarchive button, even if user is not premium
   protected get showUnArchiveButton() {
-    return this.userCanArchive && CipherViewLikeUtils.isArchived(this.cipher);
+    return CipherViewLikeUtils.isArchived(this.cipher);
   }
 
   protected get clickAction() {
@@ -116,7 +126,12 @@ export class VaultCipherRowComponent<C extends CipherViewLike> implements OnInit
     return CipherViewLikeUtils.hasAttachments(this.cipher);
   }
 
+  // Do not show attachments button if:
+  // item is archived AND user is not premium user
   protected get showAttachments() {
+    if (CipherViewLikeUtils.isArchived(this.cipher) && !this.userCanArchive) {
+      return false;
+    }
     return this.canEditCipher || this.hasAttachments;
   }
 
@@ -148,7 +163,16 @@ export class VaultCipherRowComponent<C extends CipherViewLike> implements OnInit
     );
   }
 
+  // Do NOT show clone button if:
+  // item is archived AND user is not premium user
+  // item is archived AND enforce org data ownership policy is on
   protected get showClone() {
+    if (
+      CipherViewLikeUtils.isArchived(this.cipher) &&
+      (!this.userCanArchive || this.enforceOrgDataOwnershipPolicy)
+    ) {
+      return false;
+    }
     return this.cloneable && !CipherViewLikeUtils.isDeleted(this.cipher);
   }
 
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.component.html b/apps/web/src/app/vault/components/vault-items/vault-items.component.html
index a2cff06084ba..69a1565bdb2b 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.component.html
@@ -178,6 +178,7 @@
           (checkedToggled)="selection.toggle(item)"
           (onEvent)="event($event)"
           [userCanArchive]="userCanArchive"
+          [enforceOrgDataOwnershipPolicy]="enforceOrgDataOwnershipPolicy"
         ></tr>
       </ng-container>
     </ng-template>
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.component.ts b/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
index cdcd19c5babf..635565a34dc5 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
@@ -64,6 +64,7 @@ export class VaultItemsComponent<C extends CipherViewLike> {
   @Input() addAccessToggle: boolean;
   @Input() activeCollection: CollectionView | undefined;
   @Input() userCanArchive: boolean;
+  @Input() enforceOrgDataOwnershipPolicy: boolean;
 
   private restrictedPolicies = toSignal(this.restrictedItemTypesService.restricted$);
 
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts b/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts
index b3c6b48f2d94..b87f8b7821cd 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts
@@ -252,12 +252,18 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
 
   async buildAllFilters(): Promise<VaultFilterList> {
     const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+    const hasArchiveCiphers = await firstValueFrom(
+      this.cipherService
+        .cipherViews$(userId)
+        .pipe(map((ciphers) => ciphers?.some((c) => !!c.archivedDate))),
+    );
     const builderFilter = {} as VaultFilterList;
     builderFilter.organizationFilter = await this.addOrganizationFilter();
     builderFilter.typeFilter = await this.addTypeFilter();
     builderFilter.folderFilter = await this.addFolderFilter();
     builderFilter.collectionFilter = await this.addCollectionFilter();
     if (
+      hasArchiveCiphers ||
       (await firstValueFrom(this.cipherArchiveService.userCanArchive$(userId))) ||
       (await firstValueFrom(this.cipherArchiveService.showArchiveVault$(userId)))
     ) {
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.html b/apps/web/src/app/vault/individual-vault/vault.component.html
index 47c976374de9..16fb1b3a3688 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.html
+++ b/apps/web/src/app/vault/individual-vault/vault.component.html
@@ -51,6 +51,7 @@
       [showAdminActions]="false"
       [showBulkAddToCollections]="true"
       [userCanArchive]="userCanArchive$ | async"
+      [enforceOrgDataOwnershipPolicy]="enforceOrgDataOwnershipPolicy$ | async"
       (onEvent)="onVaultItemsEvent($event)"
     >
     </app-vault-items>
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts
index 38d0cc829cf6..7fbf8850df44 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault.component.ts
@@ -39,13 +39,17 @@ import {
   getOrganizationById,
   OrganizationService,
 } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
 import { EventType } from "@bitwarden/common/enums";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -191,6 +195,13 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
     }),
   );
 
+  protected enforceOrgDataOwnershipPolicy$ = this.accountService.activeAccount$.pipe(
+    getUserId,
+    switchMap((userId) =>
+      this.policyService.policyAppliesToUser$(PolicyType.OrganizationDataOwnership, userId),
+    ),
+  );
+
   private userId$ = this.accountService.activeAccount$.pipe(getUserId);
 
   constructor(
@@ -225,6 +236,8 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
     private restrictedItemTypesService: RestrictedItemTypesService,
     private cipherArchiveService: CipherArchiveService,
     private organizationWarningsService: OrganizationWarningsService,
+    private configService: ConfigService,
+    private policyService: PolicyService,
   ) {}
 
   async ngOnInit() {
@@ -324,7 +337,7 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
       allowedCiphers$,
       filter$,
       this.currentSearchText$,
-      this.userCanArchive$,
+      this.configService.getFeatureFlag$(FeatureFlag.PM19148_InnovationArchive),
     ]).pipe(
       filter(([ciphers, filter]) => ciphers != undefined && filter != undefined),
       concatMap(async ([ciphers, filter, searchText, archiveEnabled]) => {

From 4efe1f206dd4ea139d26e929f2218759c396e409 Mon Sep 17 00:00:00 2001
From: jng <jng@bitwarden.com>
Date: Tue, 30 Sep 2025 11:56:39 -0400
Subject: [PATCH 06/10] updating unArchive text

---
 apps/browser/src/_locales/en/messages.json                   | 5 ++---
 apps/browser/src/vault/popup/settings/archive.component.html | 2 +-
 apps/desktop/src/locales/en/messages.json                    | 5 ++---
 .../components/vault-items/vault-cipher-row.component.html   | 2 +-
 .../vault/components/vault-items/vault-items.component.html  | 2 +-
 apps/web/src/locales/en/messages.json                        | 5 ++---
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index 1e8dfd2fab18..4e8cf12242b1 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -558,9 +558,8 @@
     "message": "Archive",
     "descripton": "Noun"
   },
-  "unArchiveVerb": {
-    "message": "Unarchive",
-    "descripton": "Verb"
+  "unArchive": {
+    "message": "Unarchive"
   },
   "itemsInArchive": {
     "message": "Items in archive"
diff --git a/apps/browser/src/vault/popup/settings/archive.component.html b/apps/browser/src/vault/popup/settings/archive.component.html
index f5f296fb8636..faaf0243fc78 100644
--- a/apps/browser/src/vault/popup/settings/archive.component.html
+++ b/apps/browser/src/vault/popup/settings/archive.component.html
@@ -49,7 +49,7 @@ <h2 bitTypography="h6">
                     {{ "clone" | i18n }}
                   </button>
                   <button type="button" bitMenuItem (click)="unarchive(cipher)">
-                    {{ "unArchiveVerb" | i18n }}
+                    {{ "unArchive" | i18n }}
                   </button>
                   <button
                     type="button"
diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index aeb8dbff26bd..2ca531c0db7b 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -4122,9 +4122,8 @@
     "message": "Archive",
     "descripton": "Noun"
   },
-  "unArchiveVerb": {
-    "message": "Unarchive",
-    "descripton": "Verb"
+  "unArchive": {
+    "message": "Unarchive"
   },
   "itemsInArchive": {
     "message": "Items in archive"
diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
index 3222f5a48bf6..858d99a39b66 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
@@ -161,7 +161,7 @@
       @if (showUnArchiveButton) {
         <button bitMenuItem (click)="unarchive()" type="button">
           <i class="bwi bwi-fw bwi-archive" aria-hidden="true"></i>
-          {{ "unArchiveVerb" | i18n }}
+          {{ "unArchive" | i18n }}
         </button>
       }
 
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.component.html b/apps/web/src/app/vault/components/vault-items/vault-items.component.html
index 69a1565bdb2b..d83906168699 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.component.html
@@ -96,7 +96,7 @@
               (click)="bulkUnarchive()"
             >
               <i class="bwi bwi-fw bwi-archive" aria-hidden="true"></i>
-              {{ "unArchiveVerb" | i18n }}
+              {{ "unArchive" | i18n }}
             </button>
 
             <button
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index e8e6d2c06b7a..6b23962a97ec 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -11055,9 +11055,8 @@
     "message": "Archive",
     "descripton": "Noun"
   },
-  "unArchiveVerb": {
-    "message": "Unarchive",
-    "descripton": "Verb"
+  "unArchive": {
+    "message": "Unarchive"
   },
   "itemsInArchive": {
     "message": "Items in archive"

From 1823bcf432a560f388fcd7f30e1be1a7e71bf8ea Mon Sep 17 00:00:00 2001
From: jng <jng@bitwarden.com>
Date: Tue, 30 Sep 2025 16:44:27 -0400
Subject: [PATCH 07/10] unarchive an archived item on edit if user loses
 premium

---
 .../vault-items/vault-cipher-row.component.ts |  5 ---
 .../components/cipher-form.component.spec.ts  | 35 ++++++++++++++++++-
 .../components/cipher-form.component.ts       | 19 +++++++++-
 3 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
index 40c2b5c2cbc8..c4974f4fd84b 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
@@ -84,11 +84,6 @@ export class VaultCipherRowComponent<C extends CipherViewLike> implements OnInit
     }
   }
 
-  // what buttons to hide here and how?
-  // if item has archivedDate but userCanArchive is false ONLY SHOW
-  // Edit, Unarchive, Trash
-  // make a "isArchivedItem" getter?
-
   protected get showArchiveButton() {
     return (
       this.userCanArchive &&
diff --git a/libs/vault/src/cipher-form/components/cipher-form.component.spec.ts b/libs/vault/src/cipher-form/components/cipher-form.component.spec.ts
index 970e6b1fb9a6..5a23f1d0e801 100644
--- a/libs/vault/src/cipher-form/components/cipher-form.component.spec.ts
+++ b/libs/vault/src/cipher-form/components/cipher-form.component.spec.ts
@@ -2,14 +2,18 @@ import { ChangeDetectorRef } from "@angular/core";
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { ReactiveFormsModule } from "@angular/forms";
 import { mock } from "jest-mock-extended";
+import { of } from "rxjs";
 
 import { ViewCacheService } from "@bitwarden/angular/platform/view-cache";
+import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { Fido2CredentialView } from "@bitwarden/common/vault/models/view/fido2-credential.view";
 import { ToastService } from "@bitwarden/components";
+import { UserId } from "@bitwarden/user-core";
 
 import { CipherFormConfig } from "../abstractions/cipher-form-config.service";
 import { CipherFormService } from "../abstractions/cipher-form.service";
@@ -23,6 +27,10 @@ describe("CipherFormComponent", () => {
 
   const decryptCipher = jest.fn().mockResolvedValue(new CipherView());
 
+  const mockAccountService = mock<AccountService>();
+  const mockCipherArchiveService = mock<CipherArchiveService>();
+  const mockAddEditFormService = { saveCipher: jest.fn(), decryptCipher };
+
   beforeEach(async () => {
     decryptCipher.mockClear();
 
@@ -32,13 +40,15 @@ describe("CipherFormComponent", () => {
         { provide: ChangeDetectorRef, useValue: {} },
         { provide: I18nService, useValue: { t: (key: string) => key } },
         { provide: ToastService, useValue: { showToast: jest.fn() } },
-        { provide: CipherFormService, useValue: { saveCipher: jest.fn(), decryptCipher } },
+        { provide: CipherFormService, useValue: mockAddEditFormService },
         {
           provide: CipherFormCacheService,
           useValue: { init: jest.fn(), getCachedCipherView: jest.fn() },
         },
         { provide: ViewCacheService, useValue: { signal: jest.fn(() => () => null) } },
         { provide: ConfigService, useValue: mock<ConfigService>() },
+        { provide: AccountService, useValue: mockAccountService },
+        { provide: CipherArchiveService, useValue: mockCipherArchiveService },
       ],
     }).compileComponents();
   });
@@ -53,6 +63,29 @@ describe("CipherFormComponent", () => {
     expect(component).toBeTruthy();
   });
 
+  describe("submit", () => {
+    beforeEach(() => {
+      component.config = { mode: "edit" } as CipherFormConfig;
+
+      component["updatedCipherView"] = new CipherView();
+      component["updatedCipherView"].archivedDate = new Date();
+    });
+
+    it("should remove archivedDate when user cannot archive and cipher is archived", async () => {
+      mockAccountService.activeAccount$ = of({ id: "user-id" as UserId } as Account);
+      mockCipherArchiveService.userCanArchive$.mockReturnValue(of(false));
+      mockAddEditFormService.saveCipher = jest.fn().mockResolvedValue(new CipherView());
+
+      const originalArchivedDate = component["updatedCipherView"]?.archivedDate;
+      expect(originalArchivedDate).not.toBeNull();
+
+      await component.submit();
+
+      expect(component["updatedCipherView"]?.archivedDate).toBeNull();
+      expect(mockCipherArchiveService.userCanArchive$).toHaveBeenCalledWith("user-id");
+    });
+  });
+
   describe("website", () => {
     it("should return null if updatedCipherView is null", () => {
       component["updatedCipherView"] = null as any;
diff --git a/libs/vault/src/cipher-form/components/cipher-form.component.ts b/libs/vault/src/cipher-form/components/cipher-form.component.ts
index 19e7f9d2d903..117dd98ba435 100644
--- a/libs/vault/src/cipher-form/components/cipher-form.component.ts
+++ b/libs/vault/src/cipher-form/components/cipher-form.component.ts
@@ -17,9 +17,12 @@ import {
 } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormBuilder, FormGroup, ReactiveFormsModule } from "@angular/forms";
-import { BehaviorSubject, Subject } from "rxjs";
+import { BehaviorSubject, firstValueFrom, Subject, switchMap } from "rxjs";
 
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
 import { CipherType, SecureNoteType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import {
@@ -301,6 +304,8 @@ export class CipherFormComponent implements AfterViewInit, OnInit, OnChanges, Ci
     private i18nService: I18nService,
     private changeDetectorRef: ChangeDetectorRef,
     private cipherFormCacheService: CipherFormCacheService,
+    private cipherArchiveService: CipherArchiveService,
+    private accountService: AccountService,
   ) {}
 
   /**
@@ -342,6 +347,18 @@ export class CipherFormComponent implements AfterViewInit, OnInit, OnChanges, Ci
       }
     }
 
+    const userCanArchive = await firstValueFrom(
+      this.accountService.activeAccount$.pipe(
+        getUserId,
+        switchMap((userId) => this.cipherArchiveService.userCanArchive$(userId)),
+      ),
+    );
+
+    // If the item is archived but user has lost archive permissions, unarchive the item.
+    if (!userCanArchive && this.updatedCipherView.archivedDate) {
+      this.updatedCipherView.archivedDate = null;
+    }
+
     const savedCipher = await this.addEditFormService.saveCipher(
       this.updatedCipherView,
       this.config,

From 1e3059f59ecfec79f0527be1e90a7ed5b0776915 Mon Sep 17 00:00:00 2001
From: jng <jng@bitwarden.com>
Date: Wed, 1 Oct 2025 13:06:22 -0400
Subject: [PATCH 08/10] updates for unarchive btn, refactor archive flag for
 less churn

---
 .../components/vault-items/vault-items.component.ts | 10 ++++------
 .../components/vault-filter.component.ts            | 13 ++-----------
 .../app/vault/individual-vault/vault.component.ts   |  5 +----
 .../vault/abstractions/cipher-archive.service.ts    |  1 +
 .../services/default-cipher-archive.service.ts      |  4 ++++
 5 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.component.ts b/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
index 635565a34dc5..5bf6064fc295 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
@@ -205,16 +205,14 @@ export class VaultItemsComponent<C extends CipherViewLike> {
     );
   }
 
+  // Bulk Unarchive button should appear for Archive vault even if user does not have archive permissions
   get bulkUnarchiveAllowed() {
-    if (this.selection.selected.length === 0 || !this.userCanArchive) {
+    if (this.selection.selected.length === 0) {
       return false;
     }
 
-    return (
-      this.userCanArchive &&
-      !this.selection.selected.find(
-        (item) => !item.cipher.archivedDate || item.cipher.organizationId,
-      )
+    return !this.selection.selected.find(
+      (item) => !item.cipher.archivedDate || item.cipher.organizationId,
     );
   }
 
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts b/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts
index 337bbef24e9e..ef15e6a35f73 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts
@@ -251,22 +251,13 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
   };
 
   async buildAllFilters(): Promise<VaultFilterList> {
-    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
-    const hasArchiveCiphers = await firstValueFrom(
-      this.cipherService
-        .cipherViews$(userId)
-        .pipe(map((ciphers) => ciphers?.some((c) => !!c.archivedDate))),
-    );
+    const hasArchiveFlag = await firstValueFrom(this.cipherArchiveService.hasArchiveFlagEnabled$());
     const builderFilter = {} as VaultFilterList;
     builderFilter.organizationFilter = await this.addOrganizationFilter();
     builderFilter.typeFilter = await this.addTypeFilter();
     builderFilter.folderFilter = await this.addFolderFilter();
     builderFilter.collectionFilter = await this.addCollectionFilter();
-    if (
-      hasArchiveCiphers ||
-      (await firstValueFrom(this.cipherArchiveService.userCanArchive$(userId))) ||
-      (await firstValueFrom(this.cipherArchiveService.showArchiveVault$(userId)))
-    ) {
+    if (hasArchiveFlag) {
       builderFilter.archiveFilter = await this.addArchiveFilter();
     }
     builderFilter.trashFilter = await this.addTrashFilter();
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts
index 20ff42faa6e9..d848038c3025 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault.component.ts
@@ -47,9 +47,7 @@ import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
 import { EventType } from "@bitwarden/common/enums";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -236,7 +234,6 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
     private restrictedItemTypesService: RestrictedItemTypesService,
     private cipherArchiveService: CipherArchiveService,
     private organizationWarningsService: OrganizationWarningsService,
-    private configService: ConfigService,
     private policyService: PolicyService,
   ) {}
 
@@ -337,7 +334,7 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
       allowedCiphers$,
       filter$,
       this.currentSearchText$,
-      this.configService.getFeatureFlag$(FeatureFlag.PM19148_InnovationArchive),
+      this.cipherArchiveService.hasArchiveFlagEnabled$(),
     ]).pipe(
       filter(([ciphers, filter]) => ciphers != undefined && filter != undefined),
       concatMap(async ([ciphers, filter, searchText, archiveEnabled]) => {
diff --git a/libs/common/src/vault/abstractions/cipher-archive.service.ts b/libs/common/src/vault/abstractions/cipher-archive.service.ts
index cb6c38ddf679..d33fc5e7cc7e 100644
--- a/libs/common/src/vault/abstractions/cipher-archive.service.ts
+++ b/libs/common/src/vault/abstractions/cipher-archive.service.ts
@@ -4,6 +4,7 @@ import { CipherId, UserId } from "@bitwarden/common/types/guid";
 import { CipherViewLike } from "@bitwarden/common/vault/utils/cipher-view-like-utils";
 
 export abstract class CipherArchiveService {
+  abstract hasArchiveFlagEnabled$(): Observable<boolean>;
   abstract archivedCiphers$(userId: UserId): Observable<CipherViewLike[]>;
   abstract userCanArchive$(userId: UserId): Observable<boolean>;
   abstract showArchiveVault$(userId: UserId): Observable<boolean>;
diff --git a/libs/common/src/vault/services/default-cipher-archive.service.ts b/libs/common/src/vault/services/default-cipher-archive.service.ts
index 5c627d687b20..a56a22474a34 100644
--- a/libs/common/src/vault/services/default-cipher-archive.service.ts
+++ b/libs/common/src/vault/services/default-cipher-archive.service.ts
@@ -27,6 +27,10 @@ export class DefaultCipherArchiveService implements CipherArchiveService {
     private configService: ConfigService,
   ) {}
 
+  hasArchiveFlagEnabled$(): Observable<boolean> {
+    return this.configService.getFeatureFlag$(FeatureFlag.PM19148_InnovationArchive);
+  }
+
   /**
    * Observable that contains the list of ciphers that have been archived.
    */

From ff9c525c57bfa2bd16fe346d4d406efe5ebb480b Mon Sep 17 00:00:00 2001
From: jng <jng@bitwarden.com>
Date: Wed, 1 Oct 2025 15:34:53 -0400
Subject: [PATCH 09/10] add services to cipher form stories

---
 .../src/cipher-form/cipher-form.stories.ts      | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/libs/vault/src/cipher-form/cipher-form.stories.ts b/libs/vault/src/cipher-form/cipher-form.stories.ts
index 25494350dc3a..816db091ef5e 100644
--- a/libs/vault/src/cipher-form/cipher-form.stories.ts
+++ b/libs/vault/src/cipher-form/cipher-form.stories.ts
@@ -10,7 +10,7 @@ import {
   moduleMetadata,
   StoryObj,
 } from "@storybook/angular";
-import { BehaviorSubject } from "rxjs";
+import { BehaviorSubject, of } from "rxjs";
 
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
 // eslint-disable-next-line no-restricted-imports
@@ -28,6 +28,7 @@ import { ClientType } from "@bitwarden/common/enums";
 import { UriMatchStrategy } from "@bitwarden/common/models/domain/domain-service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { CipherArchiveService } from "@bitwarden/common/vault/abstractions/cipher-archive.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { SshKeyData } from "@bitwarden/common/vault/models/data/ssh-key.data";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
@@ -154,6 +155,20 @@ export default {
             } as NudgeStatus),
           },
         },
+        {
+          provide: CipherArchiveService,
+          useValue: {
+            userCanArchive$: of(false),
+          },
+        },
+        {
+          provide: AccountService,
+          useValue: {
+            activeAccount$: of({
+              name: "User 1",
+            }),
+          } as Partial<AccountService>,
+        },
         {
           provide: CipherFormService,
           useClass: TestAddEditFormService,

From c068aa0979153bc2ca371c6d98042e52984da55c Mon Sep 17 00:00:00 2001
From: jng <jng@bitwarden.com>
Date: Wed, 1 Oct 2025 16:59:12 -0400
Subject: [PATCH 10/10] add refresh to archive calls in vault, update bulk
 archive copy

---
 .../vault-items/vault-cipher-row.component.ts      |  6 +++++-
 .../app/vault/individual-vault/vault.component.ts  |  8 ++++++--
 apps/web/src/locales/en/messages.json              | 14 +++++++++++---
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
index c4974f4fd84b..f47777c4d5a1 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
@@ -150,7 +150,11 @@ export class VaultCipherRowComponent<C extends CipherViewLike> implements OnInit
     return CipherViewLikeUtils.decryptionFailure(this.cipher);
   }
 
+  // Do Not show Assign to Collections option if item is archived
   protected get showAssignToCollections() {
+    if (CipherViewLikeUtils.isArchived(this.cipher)) {
+      return false;
+    }
     return (
       this.organizations?.length &&
       this.canAssignCollections &&
@@ -158,7 +162,7 @@ export class VaultCipherRowComponent<C extends CipherViewLike> implements OnInit
     );
   }
 
-  // Do NOT show clone button if:
+  // Do NOT show clone option if:
   // item is archived AND user is not premium user
   // item is archived AND enforce org data ownership policy is on
   protected get showClone() {
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts
index fc81d39ab08c..0b391343e4be 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault.component.ts
@@ -703,12 +703,14 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
       variant: "success",
       message: this.i18nService.t("itemWasSentToArchive"),
     });
+
+    this.refresh();
   }
 
   async bulkArchive(ciphers: C[]) {
     const confirmed = await this.dialogService.openSimpleDialog({
-      title: { key: "archiveItem" },
-      content: { key: "archiveItemConfirmDesc" },
+      title: { key: "archiveBulkItems" },
+      content: { key: "archiveBulkItemsConfirmDesc" },
       type: "info",
     });
 
@@ -744,6 +746,8 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
       variant: "success",
       message: this.i18nService.t("itemUnarchived"),
     });
+
+    this.refresh();
   }
 
   async bulkUnarchive(ciphers: C[]) {
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 8e410138d40c..7281b10b423f 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -11080,11 +11080,11 @@
   },
   "archiveNoun": {
     "message": "Archive",
-    "descripton": "Noun"
+    "description": "Noun"
   },
   "archiveVerb": {
     "message": "Archive",
-    "descripton": "Verb"
+    "description": "Verb"
   },
   "unArchive": {
     "message": "Unarchive"
@@ -11111,11 +11111,19 @@
     "message": "Items unarchived"
   },
   "archiveItem": {
-    "message": "Archive item"
+    "message": "Archive item",
+    "description": "Verb"
   },
   "archiveItemConfirmDesc": {
     "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive this item?"
   },
+  "archiveBulkItems": {
+    "message": "Archive items",
+    "description": "Verb"
+  },
+  "archiveBulkItemsConfirmDesc": {
+    "message": "Archived items are excluded from general search results and autofill suggestions. Are you sure you want to archive these items?"
+  },
   "businessUnit": {
     "message": "Business Unit"
   },