From a700cbec20428e3c8b5ba444f7468dd98fccfb41 Mon Sep 17 00:00:00 2001
From: jaasen-livefront <jaasen@livefront.com>
Date: Wed, 22 Jan 2025 12:12:53 -0800
Subject: [PATCH 1/9] allow string or boolean disabled prop in input directive

---
 libs/components/src/input/input.directive.ts  | 19 +++++++++++++++++++
 .../custom-fields.component.html              |  1 +
 .../custom-fields/custom-fields.component.ts  |  8 ++++----
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/libs/components/src/input/input.directive.ts b/libs/components/src/input/input.directive.ts
index f6c6c3d542e..33f609911d3 100644
--- a/libs/components/src/input/input.directive.ts
+++ b/libs/components/src/input/input.directive.ts
@@ -80,6 +80,25 @@ export class BitInputDirective implements BitFormFieldControl {
 
   @Input() showErrorsWhenDisabled? = false;
 
+  @Input()
+  set disabled(value: boolean | string) {
+    this._disabled = this.coerceBooleanProperty(value);
+  }
+
+  get disabled(): boolean {
+    return this._disabled;
+  }
+
+  private _disabled: boolean = false;
+
+  @HostBinding("disabled") get isDisabled(): boolean {
+    return this.disabled;
+  }
+
+  private coerceBooleanProperty(value: boolean | string): boolean {
+    return value != null && `${value}` !== "false";
+  }
+
   get labelForId(): string {
     return this.id;
   }
diff --git a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html
index fab3c8f1ab1..16a4106945d 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html
+++ b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html
@@ -39,6 +39,7 @@ <h2 bitTypography="h6">{{ "customFields" | i18n }}</h2>
             type="password"
             data-testid="custom-hidden-field"
             class="tw-font-mono"
+            [disabled]="field.value.disabled"
           />
           <button
             type="button"
diff --git a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
index f17432a993b..47fc04b4dab 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
+++ b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
@@ -55,6 +55,7 @@ export type CustomField = {
   name: string;
   value: string | boolean | null;
   linkedId: LinkedIdType;
+  disabled?: boolean;
   /**
    * `newField` is set to true when the custom field is created.
    *
@@ -165,14 +166,13 @@ export class CustomFieldsComponent implements OnInit, AfterViewInit {
           value: value,
           linkedId: field.linkedId,
           newField: false,
+          disabled:
+            field.type === FieldType.Hidden &&
+            !this.cipherFormContainer.originalCipherView?.viewPassword,
         }),
       );
     });
 
-    if (!this.cipherFormContainer.originalCipherView?.viewPassword) {
-      this.customFieldsForm.disable();
-    }
-
     // Disable the form if in partial-edit mode
     // Must happen after the initial fields are populated
     if (this.cipherFormContainer.config.mode === "partial-edit") {

From 347bd75c4e33aa693e016230671e06cd98e3dac3 Mon Sep 17 00:00:00 2001
From: jaasen-livefront <jaasen@livefront.com>
Date: Wed, 22 Jan 2025 14:03:35 -0800
Subject: [PATCH 2/9] fix tests

---
 .../custom-fields/custom-fields.component.spec.ts    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.spec.ts b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.spec.ts
index 945f56821d2..01cc2e05251 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.spec.ts
+++ b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.spec.ts
@@ -100,6 +100,7 @@ describe("CustomFieldsComponent", () => {
           type: FieldType.Text,
           value: "text value",
           newField: false,
+          disabled: false,
         },
         {
           linkedId: null,
@@ -107,6 +108,7 @@ describe("CustomFieldsComponent", () => {
           type: FieldType.Hidden,
           value: "hidden value",
           newField: false,
+          disabled: false,
         },
         {
           linkedId: null,
@@ -114,8 +116,16 @@ describe("CustomFieldsComponent", () => {
           type: FieldType.Boolean,
           value: true,
           newField: false,
+          disabled: false,
+        },
+        {
+          linkedId: 1,
+          name: "linked label",
+          type: FieldType.Linked,
+          value: null,
+          newField: false,
+          disabled: false,
         },
-        { linkedId: 1, name: "linked label", type: FieldType.Linked, value: null, newField: false },
       ]);
     });
 

From 798c112a74f61c6c640f0d9affd68943292ac767 Mon Sep 17 00:00:00 2001
From: jaasen-livefront <jaasen@livefront.com>
Date: Wed, 22 Jan 2025 14:21:11 -0800
Subject: [PATCH 3/9] add test

---
 .../custom-fields/custom-fields.component.spec.ts   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.spec.ts b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.spec.ts
index 01cc2e05251..3be5b60f7e2 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.spec.ts
+++ b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.spec.ts
@@ -142,6 +142,19 @@ describe("CustomFieldsComponent", () => {
       expect(button).toBeFalsy();
     });
 
+    it("should disable the hidden field input when `viewPassword` is false", () => {
+      originalCipherView.viewPassword = false;
+      originalCipherView.fields = mockFieldViews;
+
+      component.ngOnInit();
+
+      fixture.detectChanges();
+
+      const input = fixture.debugElement.query(By.css('[data-testid="custom-hidden-field"]'));
+
+      expect(input.nativeElement.disabled).toBe(true);
+    });
+
     it("when `viewPassword` is true the user can see the view toggle option", () => {
       originalCipherView.viewPassword = true;
       originalCipherView.fields = mockFieldViews;

From ba59ae83e1383d24528721685f6cd2b9e87deb7e Mon Sep 17 00:00:00 2001
From: jaasen-livefront <jaasen@livefront.com>
Date: Wed, 22 Jan 2025 16:03:04 -0800
Subject: [PATCH 4/9] disable custom fields in partial edit

---
 .../components/custom-fields/custom-fields.component.ts      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
index 47fc04b4dab..c9d9efafc01 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
+++ b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
@@ -167,8 +167,9 @@ export class CustomFieldsComponent implements OnInit, AfterViewInit {
           linkedId: field.linkedId,
           newField: false,
           disabled:
-            field.type === FieldType.Hidden &&
-            !this.cipherFormContainer.originalCipherView?.viewPassword,
+            this.isPartialEdit ||
+            (field.type === FieldType.Hidden &&
+              !this.cipherFormContainer.originalCipherView?.viewPassword),
         }),
       );
     });

From 0a98b8159699289da6d91b9147c8b66a566e12bd Mon Sep 17 00:00:00 2001
From: jaasen-livefront <jaasen@livefront.com>
Date: Wed, 22 Jan 2025 16:04:45 -0800
Subject: [PATCH 5/9] disable custom fields in partial edit

---
 .../components/custom-fields/custom-fields.component.ts         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
index c9d9efafc01..5c0c9b4210b 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
+++ b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
@@ -167,7 +167,7 @@ export class CustomFieldsComponent implements OnInit, AfterViewInit {
           linkedId: field.linkedId,
           newField: false,
           disabled:
-            this.isPartialEdit ||
+            this.cipherFormContainer.config.mode === "partial-edit" ||
             (field.type === FieldType.Hidden &&
               !this.cipherFormContainer.originalCipherView?.viewPassword),
         }),

From 46e3dfe9f183eabd8c91904537151e6b47c249a9 Mon Sep 17 00:00:00 2001
From: jaasen-livefront <jaasen@livefront.com>
Date: Wed, 22 Jan 2025 17:02:32 -0800
Subject: [PATCH 6/9] manually disable inputs

---
 .../additional-options-section.component.html |  2 +-
 .../login-details-section.component.html      | 20 +++++++++++++++----
 .../login-details-section.component.ts        |  3 +++
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.html b/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.html
index c00f51c8eba..c0d4b150afc 100644
--- a/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.html
+++ b/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.html
@@ -6,7 +6,7 @@ <h2 bitTypography="h6">{{ "additionalOptions" | i18n }}</h2>
   <bit-card>
     <bit-form-field>
       <bit-label>{{ "notes" | i18n }}</bit-label>
-      <textarea bitInput rows="5" formControlName="notes"></textarea>
+      <textarea bitInput rows="5" formControlName="notes" [disabled]="isPartialEdit"></textarea>
     </bit-form-field>
     <bit-form-control
       *ngIf="passwordRepromptEnabled$ | async"
diff --git a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.html b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.html
index e31be492f93..ff5abcbb9d3 100644
--- a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.html
+++ b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.html
@@ -8,7 +8,7 @@ <h2 bitTypography="h6">
   <bit-card>
     <bit-form-field>
       <bit-label>{{ "username" | i18n }}</bit-label>
-      <input bitInput formControlName="username" />
+      <input bitInput formControlName="username" [disabled]="isPartialEdit" />
       <button
         type="button"
         bitIconButton="bwi-generate"
@@ -22,7 +22,13 @@ <h2 bitTypography="h6">
 
     <bit-form-field>
       <bit-label>{{ "password" | i18n }}</bit-label>
-      <input bitInput formControlName="password" type="password" class="tw-font-mono" />
+      <input
+        bitInput
+        formControlName="password"
+        type="password"
+        class="tw-font-mono"
+        [disabled]="isPartialEdit"
+      />
       <bit-hint *ngIf="loginDetailsForm.controls.password.enabled">
         <ng-container *ngIf="newPasswordGenerated">
           {{ "securePasswordGenerated" | i18n }}
@@ -74,7 +80,7 @@ <h2 bitTypography="h6">
       <bit-label>{{ "typePasskey" | i18n }}</bit-label>
       <input
         bitInput
-        disabled
+        [disabled]="isPartialEdit"
         [value]="fido2CredentialCreationDateValue"
         data-testid="passkey-field"
       />
@@ -106,7 +112,13 @@ <h2 bitTypography="h6">
           <p>{{ (canCaptureTotp ? "totpHelperWithCapture" : "totpHelper") | i18n }}</p>
         </bit-popover>
       </bit-label>
-      <input bitInput formControlName="totp" type="password" class="tw-font-mono" />
+      <input
+        bitInput
+        formControlName="totp"
+        type="password"
+        class="tw-font-mono"
+        [disabled]="isPartialEdit"
+      />
       <button
         type="button"
         bitIconButton
diff --git a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.ts b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.ts
index 92def705852..975d91acd4e 100644
--- a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.ts
+++ b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.ts
@@ -77,6 +77,8 @@ export class LoginDetailsSectionComponent implements OnInit {
 
   private datePipe = inject(DatePipe);
 
+  protected isPartialEdit = false;
+
   /**
    * A local reference to the Fido2 credentials for an existing login being edited.
    * These cannot be created in the form and thus have no form control.
@@ -149,6 +151,7 @@ export class LoginDetailsSectionComponent implements OnInit {
     }
 
     if (this.cipherFormContainer.config.mode === "partial-edit") {
+      this.isPartialEdit = true;
       this.loginDetailsForm.disable();
     }
   }

From 460feb0b725535f76475a7016a10eb3d3270713e Mon Sep 17 00:00:00 2001
From: jaasen-livefront <jaasen@livefront.com>
Date: Mon, 27 Jan 2025 11:23:12 -0800
Subject: [PATCH 7/9] revert changes to directive

---
 .../src/form-field/form-field.stories.ts      | 15 +++++++++
 libs/components/src/input/input.directive.ts  | 19 ------------
 .../additional-options-section.component.html |  2 +-
 .../custom-fields.component.html              |  1 -
 .../custom-fields.component.spec.ts           |  4 ---
 .../custom-fields/custom-fields.component.ts  | 31 ++++++++++---------
 .../login-details-section.component.html      | 25 +++------------
 .../login-details-section.component.ts        |  3 --
 8 files changed, 37 insertions(+), 63 deletions(-)

diff --git a/libs/components/src/form-field/form-field.stories.ts b/libs/components/src/form-field/form-field.stories.ts
index 738ac96bf76..7960f1001e2 100644
--- a/libs/components/src/form-field/form-field.stories.ts
+++ b/libs/components/src/form-field/form-field.stories.ts
@@ -263,6 +263,21 @@ export const Disabled: Story = {
   args: {},
 };
 
+export const DisabledWithArgs: Story = {
+  render: (args) => ({
+    props: {
+      disabled: true,
+    },
+    template: /*html*/ `
+      <bit-form-field>
+        <bit-label>Label</bit-label>
+        <input bitInput placeholder="Placeholder" [disabled]="disabled" />
+      </bit-form-field>
+    `,
+  }),
+  args: {},
+};
+
 export const Readonly: Story = {
   render: (args) => ({
     props: args,
diff --git a/libs/components/src/input/input.directive.ts b/libs/components/src/input/input.directive.ts
index 33f609911d3..f6c6c3d542e 100644
--- a/libs/components/src/input/input.directive.ts
+++ b/libs/components/src/input/input.directive.ts
@@ -80,25 +80,6 @@ export class BitInputDirective implements BitFormFieldControl {
 
   @Input() showErrorsWhenDisabled? = false;
 
-  @Input()
-  set disabled(value: boolean | string) {
-    this._disabled = this.coerceBooleanProperty(value);
-  }
-
-  get disabled(): boolean {
-    return this._disabled;
-  }
-
-  private _disabled: boolean = false;
-
-  @HostBinding("disabled") get isDisabled(): boolean {
-    return this.disabled;
-  }
-
-  private coerceBooleanProperty(value: boolean | string): boolean {
-    return value != null && `${value}` !== "false";
-  }
-
   get labelForId(): string {
     return this.id;
   }
diff --git a/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.html b/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.html
index c0d4b150afc..c00f51c8eba 100644
--- a/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.html
+++ b/libs/vault/src/cipher-form/components/additional-options/additional-options-section.component.html
@@ -6,7 +6,7 @@ <h2 bitTypography="h6">{{ "additionalOptions" | i18n }}</h2>
   <bit-card>
     <bit-form-field>
       <bit-label>{{ "notes" | i18n }}</bit-label>
-      <textarea bitInput rows="5" formControlName="notes" [disabled]="isPartialEdit"></textarea>
+      <textarea bitInput rows="5" formControlName="notes"></textarea>
     </bit-form-field>
     <bit-form-control
       *ngIf="passwordRepromptEnabled$ | async"
diff --git a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html
index 16a4106945d..fab3c8f1ab1 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html
+++ b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html
@@ -39,7 +39,6 @@ <h2 bitTypography="h6">{{ "customFields" | i18n }}</h2>
             type="password"
             data-testid="custom-hidden-field"
             class="tw-font-mono"
-            [disabled]="field.value.disabled"
           />
           <button
             type="button"
diff --git a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.spec.ts b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.spec.ts
index 3be5b60f7e2..05590a27f9a 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.spec.ts
+++ b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.spec.ts
@@ -100,7 +100,6 @@ describe("CustomFieldsComponent", () => {
           type: FieldType.Text,
           value: "text value",
           newField: false,
-          disabled: false,
         },
         {
           linkedId: null,
@@ -108,7 +107,6 @@ describe("CustomFieldsComponent", () => {
           type: FieldType.Hidden,
           value: "hidden value",
           newField: false,
-          disabled: false,
         },
         {
           linkedId: null,
@@ -116,7 +114,6 @@ describe("CustomFieldsComponent", () => {
           type: FieldType.Boolean,
           value: true,
           newField: false,
-          disabled: false,
         },
         {
           linkedId: 1,
@@ -124,7 +121,6 @@ describe("CustomFieldsComponent", () => {
           type: FieldType.Linked,
           value: null,
           newField: false,
-          disabled: false,
         },
       ]);
     });
diff --git a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
index 5c0c9b4210b..8f93b030538 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
+++ b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
@@ -55,7 +55,6 @@ export type CustomField = {
   name: string;
   value: string | boolean | null;
   linkedId: LinkedIdType;
-  disabled?: boolean;
   /**
    * `newField` is set to true when the custom field is created.
    *
@@ -159,19 +158,23 @@ export class CustomFieldsComponent implements OnInit, AfterViewInit {
         value = field.value === "true" ? true : false;
       }
 
-      this.fields.push(
-        this.formBuilder.group<CustomField>({
-          type: field.type,
-          name: field.name,
-          value: value,
-          linkedId: field.linkedId,
-          newField: false,
-          disabled:
-            this.cipherFormContainer.config.mode === "partial-edit" ||
-            (field.type === FieldType.Hidden &&
-              !this.cipherFormContainer.originalCipherView?.viewPassword),
-        }),
-      );
+      const customField = this.formBuilder.group<CustomField>({
+        type: field.type,
+        name: field.name,
+        value: value,
+        linkedId: field.linkedId,
+        newField: false,
+      });
+
+      if (
+        this.cipherFormContainer.config.mode === "partial-edit" ||
+        (field.type === FieldType.Hidden &&
+          !this.cipherFormContainer.originalCipherView?.viewPassword)
+      ) {
+        customField.controls.value.disable();
+      }
+
+      this.fields.push(customField);
     });
 
     // Disable the form if in partial-edit mode
diff --git a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.html b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.html
index ff5abcbb9d3..7610b0d4687 100644
--- a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.html
+++ b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.html
@@ -8,7 +8,7 @@ <h2 bitTypography="h6">
   <bit-card>
     <bit-form-field>
       <bit-label>{{ "username" | i18n }}</bit-label>
-      <input bitInput formControlName="username" [disabled]="isPartialEdit" />
+      <input bitInput formControlName="username" />
       <button
         type="button"
         bitIconButton="bwi-generate"
@@ -22,13 +22,7 @@ <h2 bitTypography="h6">
 
     <bit-form-field>
       <bit-label>{{ "password" | i18n }}</bit-label>
-      <input
-        bitInput
-        formControlName="password"
-        type="password"
-        class="tw-font-mono"
-        [disabled]="isPartialEdit"
-      />
+      <input bitInput formControlName="password" type="password" class="tw-font-mono" />
       <bit-hint *ngIf="loginDetailsForm.controls.password.enabled">
         <ng-container *ngIf="newPasswordGenerated">
           {{ "securePasswordGenerated" | i18n }}
@@ -78,12 +72,7 @@ <h2 bitTypography="h6">
 
     <bit-form-field *ngIf="hasPasskey">
       <bit-label>{{ "typePasskey" | i18n }}</bit-label>
-      <input
-        bitInput
-        [disabled]="isPartialEdit"
-        [value]="fido2CredentialCreationDateValue"
-        data-testid="passkey-field"
-      />
+      <input bitInput [value]="fido2CredentialCreationDateValue" data-testid="passkey-field" />
       <button
         type="button"
         bitIconButton="bwi-minus-circle"
@@ -112,13 +101,7 @@ <h2 bitTypography="h6">
           <p>{{ (canCaptureTotp ? "totpHelperWithCapture" : "totpHelper") | i18n }}</p>
         </bit-popover>
       </bit-label>
-      <input
-        bitInput
-        formControlName="totp"
-        type="password"
-        class="tw-font-mono"
-        [disabled]="isPartialEdit"
-      />
+      <input bitInput formControlName="totp" type="password" class="tw-font-mono" />
       <button
         type="button"
         bitIconButton
diff --git a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.ts b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.ts
index 975d91acd4e..92def705852 100644
--- a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.ts
+++ b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.ts
@@ -77,8 +77,6 @@ export class LoginDetailsSectionComponent implements OnInit {
 
   private datePipe = inject(DatePipe);
 
-  protected isPartialEdit = false;
-
   /**
    * A local reference to the Fido2 credentials for an existing login being edited.
    * These cannot be created in the form and thus have no form control.
@@ -151,7 +149,6 @@ export class LoginDetailsSectionComponent implements OnInit {
     }
 
     if (this.cipherFormContainer.config.mode === "partial-edit") {
-      this.isPartialEdit = true;
       this.loginDetailsForm.disable();
     }
   }

From a32299d0cfd2f7fba0232655b4e6138304220bd9 Mon Sep 17 00:00:00 2001
From: jaasen-livefront <jaasen@livefront.com>
Date: Mon, 27 Jan 2025 11:34:48 -0800
Subject: [PATCH 8/9] revert other changes

---
 .../src/form-field/form-field.stories.ts          | 15 ---------------
 .../login-details-section.component.html          |  7 ++++++-
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/libs/components/src/form-field/form-field.stories.ts b/libs/components/src/form-field/form-field.stories.ts
index 7960f1001e2..738ac96bf76 100644
--- a/libs/components/src/form-field/form-field.stories.ts
+++ b/libs/components/src/form-field/form-field.stories.ts
@@ -263,21 +263,6 @@ export const Disabled: Story = {
   args: {},
 };
 
-export const DisabledWithArgs: Story = {
-  render: (args) => ({
-    props: {
-      disabled: true,
-    },
-    template: /*html*/ `
-      <bit-form-field>
-        <bit-label>Label</bit-label>
-        <input bitInput placeholder="Placeholder" [disabled]="disabled" />
-      </bit-form-field>
-    `,
-  }),
-  args: {},
-};
-
 export const Readonly: Story = {
   render: (args) => ({
     props: args,
diff --git a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.html b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.html
index 7610b0d4687..e31be492f93 100644
--- a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.html
+++ b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.html
@@ -72,7 +72,12 @@ <h2 bitTypography="h6">
 
     <bit-form-field *ngIf="hasPasskey">
       <bit-label>{{ "typePasskey" | i18n }}</bit-label>
-      <input bitInput [value]="fido2CredentialCreationDateValue" data-testid="passkey-field" />
+      <input
+        bitInput
+        disabled
+        [value]="fido2CredentialCreationDateValue"
+        data-testid="passkey-field"
+      />
       <button
         type="button"
         bitIconButton="bwi-minus-circle"

From a962b600a5b15c0aacae74c7524d0aa8626da769 Mon Sep 17 00:00:00 2001
From: jaasen-livefront <jaasen@livefront.com>
Date: Mon, 27 Jan 2025 11:39:22 -0800
Subject: [PATCH 9/9] remove unnecessary check for partial-edit

---
 .../components/custom-fields/custom-fields.component.ts      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
index 8f93b030538..1b3b9009946 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
+++ b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
@@ -167,9 +167,8 @@ export class CustomFieldsComponent implements OnInit, AfterViewInit {
       });
 
       if (
-        this.cipherFormContainer.config.mode === "partial-edit" ||
-        (field.type === FieldType.Hidden &&
-          !this.cipherFormContainer.originalCipherView?.viewPassword)
+        field.type === FieldType.Hidden &&
+        !this.cipherFormContainer.originalCipherView?.viewPassword
       ) {
         customField.controls.value.disable();
       }