From 1e9a21e831c24bebef26734f76fbdc557cfdbd27 Mon Sep 17 00:00:00 2001
From: Shane Melton <smelton@bitwarden.com>
Date: Fri, 21 Mar 2025 11:46:31 -0700
Subject: [PATCH] [PM-19339] Innovation Archive - Extension cleanup (#13947)

* Ensure archivedDate is not lost on cipher re-encryption

* Fix archived item header spacing
---
 .../popup/settings/archive.component.html     | 99 +++++++++----------
 .../src/vault/services/cipher.service.ts      |  1 +
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/apps/browser/src/vault/popup/settings/archive.component.html b/apps/browser/src/vault/popup/settings/archive.component.html
index 8c5f2b60220..cd80673b2fd 100644
--- a/apps/browser/src/vault/popup/settings/archive.component.html
+++ b/apps/browser/src/vault/popup/settings/archive.component.html
@@ -14,60 +14,59 @@
           </h2>
           <span bitTypography="body1" slot="end">{{ archivedItems.length }}</span>
         </bit-section-header>
-      </bit-section>
-
-      <bit-item-group>
-        @for (cipher of archivedItems; track cipher.id) {
-          <bit-item>
-            <button
-              bit-item-content
-              type="button"
-              [appA11yTitle]="'viewItemTitle' | i18n: cipher.name"
-              (click)="view(cipher)"
-            >
-              <div slot="start" class="tw-justify-start tw-w-7 tw-flex">
-                <app-vault-icon [cipher]="cipher"></app-vault-icon>
-              </div>
-              <span data-testid="item-name">{{ cipher.name }}</span>
-              @if (cipher.hasAttachments) {
-                <i class="bwi bwi-paperclip bwi-sm" [appA11yTitle]="'attachments' | i18n"></i>
-              }
-              <span slot="secondary">{{ cipher.subTitle }}</span>
-            </button>
-            <bit-item-action slot="end">
+        <bit-item-group>
+          @for (cipher of archivedItems; track cipher.id) {
+            <bit-item>
               <button
+                bit-item-content
                 type="button"
-                bitIconButton="bwi-ellipsis-v"
-                size="small"
-                [attr.aria-label]="'moreOptionsLabel' | i18n: cipher.name"
-                [title]="'moreOptionsTitle' | i18n: cipher.name"
-                [bitMenuTriggerFor]="moreOptions"
-              ></button>
-              <bit-menu #moreOptions>
-                <button type="button" bitMenuItem (click)="edit(cipher)">
-                  {{ "edit" | i18n }}
-                </button>
-                <button type="button" bitMenuItem (click)="clone(cipher)">
-                  {{ "clone" | i18n }}
-                </button>
-                <button type="button" bitMenuItem (click)="unarchive(cipher)">
-                  {{ "unarchive" | i18n }}
-                </button>
+                [appA11yTitle]="'viewItemTitle' | i18n: cipher.name"
+                (click)="view(cipher)"
+              >
+                <div slot="start" class="tw-justify-start tw-w-7 tw-flex">
+                  <app-vault-icon [cipher]="cipher"></app-vault-icon>
+                </div>
+                <span data-testid="item-name">{{ cipher.name }}</span>
+                @if (cipher.hasAttachments) {
+                  <i class="bwi bwi-paperclip bwi-sm" [appA11yTitle]="'attachments' | i18n"></i>
+                }
+                <span slot="secondary">{{ cipher.subTitle }}</span>
+              </button>
+              <bit-item-action slot="end">
                 <button
                   type="button"
-                  bitMenuItem
-                  *appCanDeleteCipher="cipher"
-                  (click)="delete(cipher)"
-                >
-                  <span class="tw-text-danger">
-                    {{ "delete" | i18n }}
-                  </span>
-                </button>
-              </bit-menu>
-            </bit-item-action>
-          </bit-item>
-        }
-      </bit-item-group>
+                  bitIconButton="bwi-ellipsis-v"
+                  size="small"
+                  [attr.aria-label]="'moreOptionsLabel' | i18n: cipher.name"
+                  [title]="'moreOptionsTitle' | i18n: cipher.name"
+                  [bitMenuTriggerFor]="moreOptions"
+                ></button>
+                <bit-menu #moreOptions>
+                  <button type="button" bitMenuItem (click)="edit(cipher)">
+                    {{ "edit" | i18n }}
+                  </button>
+                  <button type="button" bitMenuItem (click)="clone(cipher)">
+                    {{ "clone" | i18n }}
+                  </button>
+                  <button type="button" bitMenuItem (click)="unarchive(cipher)">
+                    {{ "unarchive" | i18n }}
+                  </button>
+                  <button
+                    type="button"
+                    bitMenuItem
+                    *appCanDeleteCipher="cipher"
+                    (click)="delete(cipher)"
+                  >
+                    <span class="tw-text-danger">
+                      {{ "delete" | i18n }}
+                    </span>
+                  </button>
+                </bit-menu>
+              </bit-item-action>
+            </bit-item>
+          }
+        </bit-item-group>
+      </bit-section>
     } @else {
       <bit-no-items class="tw-flex tw-h-full tw-items-center tw-justify-center">
         <ng-container slot="title">
diff --git a/libs/common/src/vault/services/cipher.service.ts b/libs/common/src/vault/services/cipher.service.ts
index 08608f3121d..581b8c39c39 100644
--- a/libs/common/src/vault/services/cipher.service.ts
+++ b/libs/common/src/vault/services/cipher.service.ts
@@ -224,6 +224,7 @@ export class CipherService implements CipherServiceAbstraction {
     cipher.type = model.type;
     cipher.collectionIds = model.collectionIds;
     cipher.revisionDate = model.revisionDate;
+    cipher.archivedDate = model.archivedDate;
     cipher.reprompt = model.reprompt;
     cipher.edit = model.edit;