From 237002b6332165f40664e767c6886b993fd2a2eb Mon Sep 17 00:00:00 2001
From: Jordan Aasen <166539328+jaasen-livefront@users.noreply.github.com>
Date: Fri, 2 May 2025 14:21:08 -0700
Subject: [PATCH] [PM-20988][PM-20986][PM-20983][PM-20971][PM-21019] - Multiple
 defect fixes for desktop cipher form update (#14559)

* multiple bug fixes

* favor getters to local state

* fix tests
---
 apps/desktop/src/locales/en/messages.json     | 15 ++++++++++++++
 .../app/vault/item-footer.component.html      |  2 +-
 .../src/vault/app/vault/vault-v2.component.ts | 10 +++++++---
 .../view-identity-sections.component.html     |  6 +++---
 .../view-identity-sections.component.spec.ts  |  7 -------
 .../view-identity-sections.component.ts       | 20 +++++--------------
 6 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index 7dee2c111d9..e685c053529 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -2007,6 +2007,21 @@
     "message": "Premium",
     "description": "Premium membership"
   },
+  "freeOrgsCannotUseAttachments": {
+    "message": "Free organizations cannot use attachments"
+  },
+  "singleFieldNeedsAttention": {
+    "message": "1 field needs your attention."
+  },
+  "multipleFieldsNeedAttention": {
+    "message": "$COUNT$ fields need your attention.",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
   "cardExpiredTitle": {
     "message": "Expired card"
   },
diff --git a/apps/desktop/src/vault/app/vault/item-footer.component.html b/apps/desktop/src/vault/app/vault/item-footer.component.html
index 6915555c08b..824a2d481cf 100644
--- a/apps/desktop/src/vault/app/vault/item-footer.component.html
+++ b/apps/desktop/src/vault/app/vault/item-footer.component.html
@@ -44,7 +44,7 @@
     <button
       type="button"
       class="primary"
-      *ngIf="cipher.id && !cipher?.organizationId && !cipher.isDeleted && action !== 'clone'"
+      *ngIf="cipher.id && !cipher?.organizationId && !cipher.isDeleted && action === 'view'"
       (click)="clone()"
       appA11yTitle="{{ 'clone' | i18n }}"
     >
diff --git a/apps/desktop/src/vault/app/vault/vault-v2.component.ts b/apps/desktop/src/vault/app/vault/vault-v2.component.ts
index 05c6c5e261e..3d99dccdf6f 100644
--- a/apps/desktop/src/vault/app/vault/vault-v2.component.ts
+++ b/apps/desktop/src/vault/app/vault/vault-v2.component.ts
@@ -13,7 +13,7 @@ import { ActivatedRoute, Router } from "@angular/router";
 import { firstValueFrom, Subject, takeUntil, switchMap } from "rxjs";
 import { filter, map, take } from "rxjs/operators";
 
-import { CollectionView } from "@bitwarden/admin-console/common";
+import { CollectionService, CollectionView } from "@bitwarden/admin-console/common";
 import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { VaultViewPasswordHistoryService } from "@bitwarden/angular/services/view-password-history.service";
@@ -29,7 +29,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SyncService } from "@bitwarden/common/platform/sync";
-import { CipherId, UserId } from "@bitwarden/common/types/guid";
+import { CipherId, CollectionId, UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
 import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service";
@@ -175,6 +175,7 @@ export class VaultV2Component implements OnInit, OnDestroy {
     private cipherService: CipherService,
     private formConfigService: CipherFormConfigService,
     private premiumUpgradePromptService: PremiumUpgradePromptService,
+    private collectionService: CollectionService,
   ) {}
 
   async ngOnInit() {
@@ -359,7 +360,7 @@ export class VaultV2Component implements OnInit, OnDestroy {
     this.cipherId = cipher.id;
     this.cipher = cipher;
     this.collections =
-      this.vaultFilterComponent?.collections.fullList.filter((c) =>
+      this.vaultFilterComponent?.collections?.fullList.filter((c) =>
         cipher.collectionIds.includes(c.id),
       ) ?? null;
     this.action = "view";
@@ -548,6 +549,9 @@ export class VaultV2Component implements OnInit, OnDestroy {
     this.cipherId = null;
     this.action = "view";
     await this.vaultItemsComponent?.refresh().catch(() => {});
+    this.collections = await firstValueFrom(
+      this.collectionService.decryptedCollectionViews$(cipher.collectionIds as CollectionId[]),
+    );
     this.cipherId = cipher.id;
     this.cipher = cipher;
     if (this.activeUserId) {
diff --git a/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.html b/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.html
index e98905e8808..d2154abd098 100644
--- a/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.html
+++ b/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.html
@@ -1,4 +1,4 @@
-<bit-section *ngIf="showPersonalDetails">
+<bit-section *ngIf="hasPersonalDetails">
   <bit-section-header>
     <h2 bitTypography="h6">{{ "personalDetails" | i18n }}</h2>
   </bit-section-header>
@@ -66,7 +66,7 @@
   </read-only-cipher-card>
 </bit-section>
 
-<bit-section *ngIf="showIdentificationDetails">
+<bit-section *ngIf="hasIdentificationDetails">
   <bit-section-header>
     <h2 bitTypography="h6">{{ "identification" | i18n }}</h2>
   </bit-section-header>
@@ -155,7 +155,7 @@
   </read-only-cipher-card>
 </bit-section>
 
-<bit-section *ngIf="showContactDetails">
+<bit-section *ngIf="hasContactDetails">
   <bit-section-header>
     <h2 bitTypography="h6">{{ "contactInfo" | i18n }}</h2>
   </bit-section-header>
diff --git a/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.spec.ts b/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.spec.ts
index 5228124871f..ab745347ac5 100644
--- a/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.spec.ts
+++ b/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.spec.ts
@@ -43,7 +43,6 @@ describe("ViewIdentitySectionsComponent", () => {
         },
       } as CipherView;
 
-      component.ngOnInit();
       fixture.detectChanges();
 
       personalDetailSection = fixture.debugElement.query(By.directive(SectionHeaderComponent));
@@ -61,7 +60,6 @@ describe("ViewIdentitySectionsComponent", () => {
         },
       } as CipherView;
 
-      component.ngOnInit();
       fixture.detectChanges();
 
       const fields = fixture.debugElement.queryAll(By.directive(BitInputDirective));
@@ -86,7 +84,6 @@ describe("ViewIdentitySectionsComponent", () => {
         },
       } as CipherView;
 
-      component.ngOnInit();
       fixture.detectChanges();
 
       identificationDetailSection = fixture.debugElement.query(
@@ -106,7 +103,6 @@ describe("ViewIdentitySectionsComponent", () => {
         },
       } as CipherView;
 
-      component.ngOnInit();
       fixture.detectChanges();
 
       const fields = fixture.debugElement.queryAll(By.directive(BitInputDirective));
@@ -129,7 +125,6 @@ describe("ViewIdentitySectionsComponent", () => {
         },
       } as CipherView;
 
-      component.ngOnInit();
       fixture.detectChanges();
 
       contactDetailSection = fixture.debugElement.query(By.directive(SectionHeaderComponent));
@@ -151,7 +146,6 @@ describe("ViewIdentitySectionsComponent", () => {
         },
       } as CipherView;
 
-      component.ngOnInit();
       fixture.detectChanges();
 
       const fields = fixture.debugElement.queryAll(By.directive(BitInputDirective));
@@ -174,7 +168,6 @@ describe("ViewIdentitySectionsComponent", () => {
         },
       } as CipherView;
 
-      component.ngOnInit();
       fixture.detectChanges();
 
       let textarea = fixture.debugElement.query(By.css("textarea"));
diff --git a/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.ts b/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.ts
index fdd5bb66a55..80bf78abe6e 100644
--- a/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.ts
+++ b/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.ts
@@ -1,5 +1,5 @@
 import { NgIf } from "@angular/common";
-import { Component, Input, OnInit } from "@angular/core";
+import { Component, Input } from "@angular/core";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
@@ -28,19 +28,9 @@ import { ReadOnlyCipherCardComponent } from "../read-only-cipher-card/read-only-
     ReadOnlyCipherCardComponent,
   ],
 })
-export class ViewIdentitySectionsComponent implements OnInit {
+export class ViewIdentitySectionsComponent {
   @Input({ required: true }) cipher: CipherView | null = null;
 
-  showPersonalDetails: boolean = false;
-  showIdentificationDetails: boolean = false;
-  showContactDetails: boolean = false;
-
-  ngOnInit(): void {
-    this.showPersonalDetails = this.hasPersonalDetails();
-    this.showIdentificationDetails = this.hasIdentificationDetails();
-    this.showContactDetails = this.hasContactDetails();
-  }
-
   /** Returns all populated address fields */
   get addressFields(): string {
     if (!this.cipher) {
@@ -57,7 +47,7 @@ export class ViewIdentitySectionsComponent implements OnInit {
   }
 
   /** Returns true when any of the "personal detail" attributes are populated */
-  private hasPersonalDetails(): boolean {
+  get hasPersonalDetails(): boolean {
     if (!this.cipher) {
       return false;
     }
@@ -67,7 +57,7 @@ export class ViewIdentitySectionsComponent implements OnInit {
   }
 
   /** Returns true when any of the "identification detail" attributes are populated */
-  private hasIdentificationDetails(): boolean {
+  get hasIdentificationDetails(): boolean {
     if (!this.cipher) {
       return false;
     }
@@ -77,7 +67,7 @@ export class ViewIdentitySectionsComponent implements OnInit {
   }
 
   /** Returns true when any of the "contact detail" attributes are populated */
-  private hasContactDetails(): boolean {
+  get hasContactDetails(): boolean {
     if (!this.cipher) {
       return false;
     }