From 696ce485729d29b474f22188bc8a3b3dd7eb0e7b Mon Sep 17 00:00:00 2001
From: Shane Melton <smelton@bitwarden.com>
Date: Thu, 16 Apr 2026 11:30:52 -0700
Subject: [PATCH] [PM-35258] Add archive confirmation to Desktop and fix right
 click menu (#20208)

* [PM-35258] add archive confirmation dialog to vault item drawer

* [PM-35258] allow archiving organization items from context menu and more menu

* [PM-35258] fix right-click context menu opening copy menu instead of full options
---
 .../vault-cipher-row.component.html           |  1 +
 .../vault-items/vault-cipher-row.component.ts | 15 ++++--------
 .../src/vault/app/vault-v3/vault.component.ts |  2 +-
 .../vault-item-dialog.component.spec.ts       | 23 +++++++++++++++++++
 .../vault-item-dialog.component.ts            | 11 +++++++++
 5 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/apps/desktop/src/vault/app/vault-v3/vault-items/vault-cipher-row.component.html b/apps/desktop/src/vault/app/vault-v3/vault-items/vault-cipher-row.component.html
index de81c60c49d..e8d8052de15 100644
--- a/apps/desktop/src/vault/app/vault-v3/vault-items/vault-cipher-row.component.html
+++ b/apps/desktop/src/vault/app/vault-v3/vault-items/vault-cipher-row.component.html
@@ -93,6 +93,7 @@
     }
 
     <button
+      #optionsMenuTrigger="menuTrigger"
       [bitMenuTriggerFor]="cipherOptions"
       [disabled]="disabled()"
       bitIconButton="bwi-ellipsis-v"
diff --git a/apps/desktop/src/vault/app/vault-v3/vault-items/vault-cipher-row.component.ts b/apps/desktop/src/vault/app/vault-v3/vault-items/vault-cipher-row.component.ts
index c724b2777ab..1af54d32592 100644
--- a/apps/desktop/src/vault/app/vault-v3/vault-items/vault-cipher-row.component.ts
+++ b/apps/desktop/src/vault/app/vault-v3/vault-items/vault-cipher-row.component.ts
@@ -1,7 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { NgClass } from "@angular/common";
-import { Component, HostListener, ViewChild, computed, inject, input, output } from "@angular/core";
+import { Component, HostListener, computed, inject, input, output, viewChild } from "@angular/core";
 
 import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge/premium-badge.component";
 import { IconComponent } from "@bitwarden/angular/vault/components/icon.component";
@@ -13,11 +13,9 @@ import {
   CipherViewLikeUtils,
 } from "@bitwarden/common/vault/utils/cipher-view-like-utils";
 import {
-  AriaDisableDirective,
   BitIconButtonComponent,
   MenuModule,
   MenuTriggerForDirective,
-  TooltipDirective,
   TableModule,
   LinkModule,
 } from "@bitwarden/components";
@@ -46,9 +44,7 @@ interface CopyFieldConfig {
     NgClass,
     I18nPipe,
     TableModule,
-    AriaDisableDirective,
     OrganizationNameBadgeComponent,
-    TooltipDirective,
     BitIconButtonComponent,
     MenuModule,
     CopyCipherFieldDirective,
@@ -61,9 +57,7 @@ interface CopyFieldConfig {
 export class VaultCipherRowComponent<C extends CipherViewLike> {
   protected RowHeightClass = `tw-h-[75px]`;
 
-  // FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
-  // eslint-disable-next-line @angular-eslint/prefer-signals
-  @ViewChild(MenuTriggerForDirective, { static: false }) menuTrigger: MenuTriggerForDirective;
+  protected readonly menuTrigger = viewChild<MenuTriggerForDirective>("optionsMenuTrigger");
 
   protected readonly disabled = input<boolean>();
   protected readonly cipher = input<C>();
@@ -99,7 +93,6 @@ export class VaultCipherRowComponent<C extends CipherViewLike> {
 
   protected readonly showArchiveButton = computed(() => {
     return (
-      !this.cipher().organizationId &&
       !CipherViewLikeUtils.isArchived(this.cipher()) &&
       !CipherViewLikeUtils.isDeleted(this.cipher())
     );
@@ -295,8 +288,8 @@ export class VaultCipherRowComponent<C extends CipherViewLike> {
       return;
     }
 
-    if (!this.disabled() && this.menuTrigger) {
-      this.menuTrigger.toggleMenuOnRightClick(event);
+    if (!this.disabled() && this.menuTrigger()) {
+      this.menuTrigger().toggleMenuOnRightClick(event);
     }
   }
 }
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 569c8627a50..5a9849f5924 100644
--- a/apps/desktop/src/vault/app/vault-v3/vault.component.ts
+++ b/apps/desktop/src/vault/app/vault-v3/vault.component.ts
@@ -521,7 +521,7 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
       case "archive":
         if (event.items.length === 1) {
           const cipher = await this.cipherService.getFullCipherView(event.items[0]);
-          if (!cipher.organizationId && !cipher.isDeleted && !cipher.isArchived) {
+          if (!cipher.isDeleted && !cipher.isArchived) {
             if (!(await firstValueFrom(this.userCanArchive$))) {
               await this.premiumUpgradePromptService.promptForPremium();
               return;
diff --git a/libs/vault/src/vault-item-dialog/vault-item-dialog.component.spec.ts b/libs/vault/src/vault-item-dialog/vault-item-dialog.component.spec.ts
index fdc50e87f7b..17eee50e71c 100644
--- a/libs/vault/src/vault-item-dialog/vault-item-dialog.component.spec.ts
+++ b/libs/vault/src/vault-item-dialog/vault-item-dialog.component.spec.ts
@@ -249,6 +249,20 @@ describe("VaultItemDialogComponent", () => {
   });
 
   describe("archive", () => {
+    it("shows a confirmation dialog before archiving", async () => {
+      component.setTestCipher({ id: "cipher-id", collectionIds: [] } as any);
+      jest.spyOn(component as any, "updateCipherFromResponse").mockResolvedValue(undefined);
+
+      await component.archive();
+
+      expect(mockDialogService.openSimpleDialog).toHaveBeenCalledWith({
+        title: { key: "archiveItem" },
+        content: { key: "archiveItemDialogContent" },
+        acceptButtonText: { key: "archiveVerb" },
+        type: "info",
+      });
+    });
+
     it("calls archiveService.archiveWithServer with the cipher id and active user id", async () => {
       component.setTestCipher({ id: "cipher-id", collectionIds: [] } as any);
       jest.spyOn(component as any, "updateCipherFromResponse").mockResolvedValue(undefined);
@@ -260,6 +274,15 @@ describe("VaultItemDialogComponent", () => {
         "test-user-id",
       );
     });
+
+    it("does not archive when the user cancels the confirmation", async () => {
+      component.setTestCipher({ id: "cipher-id", collectionIds: [] } as any);
+      mockDialogService.openSimpleDialog.mockResolvedValueOnce(false);
+
+      await component.archive();
+
+      expect(mockArchiveService.archiveWithServer).not.toHaveBeenCalled();
+    });
   });
 
   describe("unarchive", () => {
diff --git a/libs/vault/src/vault-item-dialog/vault-item-dialog.component.ts b/libs/vault/src/vault-item-dialog/vault-item-dialog.component.ts
index 3a2994aaab1..0230afdb240 100644
--- a/libs/vault/src/vault-item-dialog/vault-item-dialog.component.ts
+++ b/libs/vault/src/vault-item-dialog/vault-item-dialog.component.ts
@@ -592,6 +592,17 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
   };
 
   archive = async () => {
+    const confirmed = await this.dialogService.openSimpleDialog({
+      title: { key: "archiveItem" },
+      content: { key: "archiveItemDialogContent" },
+      acceptButtonText: { key: "archiveVerb" },
+      type: "info",
+    });
+
+    if (!confirmed) {
+      return;
+    }
+
     const activeUserId = await firstValueFrom(this.userId$);
     try {
       const cipherResponse = await this.archiveService.archiveWithServer(