[PM-35318] Desktop v3/4 - Showing two "Archived" badge

libs/vault/src/cipher-view/item-details/item-details-v2.component.html

@@ -17,9 +17,6 @@
       >
         {{ cipher().name }}
       </h2>
-      @if (showArchiveBadge()) {
-        <span bitBadge> {{ "archived" | i18n }} </span>
-      }
     </div>
     <ng-container>
       <div class="tw-flex tw-flex-col tw-mt-2 md:tw-flex-row md:tw-flex-wrap">

libs/vault/src/cipher-view/item-details/item-details-v2.component.spec.ts

@@ -1,16 +1,13 @@
 import { ComponentRef } from "@angular/core";
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { By } from "@angular/platform-browser";
-import { mock, MockProxy } from "jest-mock-extended";
 import { of } from "rxjs";
 
 import { CollectionView } from "@bitwarden/common/admin-console/models/collections";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
-import { ClientType } from "@bitwarden/common/enums";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 
@@ -20,7 +17,6 @@ describe("ItemDetailsV2Component", () => {
   let component: ItemDetailsV2Component;
   let fixture: ComponentFixture<ItemDetailsV2Component>;
   let componentRef: ComponentRef<ItemDetailsV2Component>;
-  let mockPlatformUtilsService: MockProxy<PlatformUtilsService>;
 
   const cipher = {
     id: "cipher1",
@@ -51,19 +47,15 @@ describe("ItemDetailsV2Component", () => {
   } as FolderView;
 
   beforeEach(async () => {
-    mockPlatformUtilsService = mock<PlatformUtilsService>();
-
     await TestBed.configureTestingModule({
       imports: [ItemDetailsV2Component],
       providers: [
         { provide: I18nService, useValue: { t: (key: string) => key } },
-        { provide: PlatformUtilsService, useValue: { getClientType: () => ClientType.Web } },
         {
           provide: EnvironmentService,
           useValue: { environment$: of({ getIconsUrl: () => "https://icons.example.com" }) },
         },
         { provide: DomainSettingsService, useValue: { showFavicons$: of(true) } },
-        { provide: PlatformUtilsService, useValue: mockPlatformUtilsService },
       ],
     }).compileComponents();
   });
@@ -101,31 +93,4 @@ describe("ItemDetailsV2Component", () => {
     const owner = fixture.debugElement.query(By.css('[data-testid="owner"]'));
     expect(owner).toBeNull();
   });
-
-  it("should show archive badge when cipher is archived and client is Desktop", () => {
-    jest.spyOn(mockPlatformUtilsService, "getClientType").mockReturnValue(ClientType.Desktop);
-
-    const archivedCipher = { ...cipher, isArchived: true };
-    componentRef.setInput("cipher", archivedCipher);
-
-    expect((component as any).showArchiveBadge()).toBe(true);
-  });
-
-  it("should not show archive badge when cipher is not archived", () => {
-    jest.spyOn(mockPlatformUtilsService, "getClientType").mockReturnValue(ClientType.Desktop);
-
-    const unarchivedCipher = { ...cipher, isArchived: false };
-    componentRef.setInput("cipher", unarchivedCipher);
-
-    expect((component as any).showArchiveBadge()).toBe(false);
-  });
-
-  it("should not show archive badge when client is not Desktop", () => {
-    jest.spyOn(mockPlatformUtilsService, "getClientType").mockReturnValue(ClientType.Web);
-
-    const archivedCipher = { ...cipher, isArchived: true };
-    componentRef.setInput("cipher", archivedCipher);
-
-    expect((component as any).showArchiveBadge()).toBe(false);
-  });
 });

libs/vault/src/cipher-view/item-details/item-details-v2.component.ts

@@ -7,18 +7,15 @@ import { toSignal } from "@angular/core/rxjs-interop";
 import { fromEvent, map, startWith } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { ClientType } from "@bitwarden/client-type";
 import {
   CollectionView,
   CollectionTypes,
 } from "@bitwarden/common/admin-console/models/collections";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 import {
-  BadgeModule,
   CardComponent,
   FormFieldModule,
   LinkComponent,
@@ -40,7 +37,6 @@ import { OrgIconDirective } from "../../components/org-icon.directive";
     OrgIconDirective,
     FormFieldModule,
     LinkComponent,
-    BadgeModule,
   ],
 })
 export class ItemDetailsV2Component {
@@ -91,16 +87,7 @@ export class ItemDetailsV2Component {
     }
   });
 
-  protected readonly showArchiveBadge = computed(() => {
-    return (
-      this.cipher().isArchived && this.platformUtilsService.getClientType() === ClientType.Desktop
-    );
-  });
-
-  constructor(
-    private i18nService: I18nService,
-    private platformUtilsService: PlatformUtilsService,
-  ) {}
+  constructor(private i18nService: I18nService) {}
 
   toggleShowMore() {
     this.showAllDetails.update((value) => !value);

libs/vault/src/vault-item-dialog/vault-item-dialog.component.ts

@@ -33,6 +33,7 @@ import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
 import { CipherViewLike } from "@bitwarden/common/vault/utils/cipher-view-like-utils";
 import {
   AsyncActionsModule,
+  BadgeModule,
   BitIconButtonComponent,
   ButtonModule,
   CenterPositionStrategy,
@@ -130,6 +131,7 @@ export type VaultItemDialogResult = UnionOfValues<typeof VaultItemDialogResult>;
     CommonModule,
     CipherFormModule,
     AsyncActionsModule,
+    BadgeModule,
     ItemModule,
     PremiumBadgeComponent,
     I18nPipe,