From dd2c2b9720fe6870283952af0acd81166a23c1dc Mon Sep 17 00:00:00 2001
From: Hinton <oscar@oscarhinton.com>
Date: Tue, 3 May 2022 11:21:42 +0200
Subject: [PATCH]  Update Accounts form to use reactive forms and
 bit-form-field

---
 jslib                                         |  2 +-
 .../settings/account.component.html           | 79 ++++++++-----------
 .../settings/account.component.ts             | 31 +++++++-
 src/app/oss.module.ts                         |  3 +-
 4 files changed, 63 insertions(+), 52 deletions(-)

diff --git a/jslib b/jslib
index 2e2849b4..597e4594 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 2e2849b4def0534f3f72b7a84c3183ab0b1589f2
+Subproject commit 597e45940a3a96946b9d873fcccc6f90994b7716
diff --git a/src/app/organizations/settings/account.component.html b/src/app/organizations/settings/account.component.html
index 8995d8aa..4ad37ba7 100644
--- a/src/app/organizations/settings/account.component.html
+++ b/src/app/organizations/settings/account.component.html
@@ -14,59 +14,46 @@
   #form
   (ngSubmit)="submit()"
   [appApiAction]="formPromise"
-  ngNativeValidate
+  [formGroup]="formData"
 >
   <div class="row">
     <div class="col-6">
-      <div class="form-group">
-        <label for="name">{{ "organizationName" | i18n }}</label>
-        <input
-          id="name"
-          class="form-control"
-          type="text"
-          name="Name"
-          [(ngModel)]="org.name"
-          [disabled]="selfHosted"
-        />
-      </div>
-      <div class="form-group">
-        <label for="billingEmail">{{ "billingEmail" | i18n }}</label>
-        <input
-          id="billingEmail"
-          class="form-control"
-          type="text"
-          name="BillingEmail"
-          [(ngModel)]="org.billingEmail"
-          [disabled]="selfHosted"
-        />
-      </div>
-      <div class="form-group">
-        <label for="businessName">{{ "businessName" | i18n }}</label>
-        <input
-          id="businessName"
-          class="form-control"
-          type="text"
-          name="BusinessName"
-          [(ngModel)]="org.businessName"
-          [disabled]="selfHosted"
-        />
-      </div>
-      <div class="form-group">
-        <label for="identifier">{{ "identifier" | i18n }}</label>
-        <input
-          id="identifier"
-          class="form-control"
-          type="text"
-          name="Identifier"
-          [(ngModel)]="org.identifier"
-        />
-      </div>
+      <bit-form-field>
+        <bit-label>{{ "organizationName" | i18n }}</bit-label>
+        <input bitInput type="text" formControlName="name" />
+      </bit-form-field>
+
+      <bit-form-field>
+        <bit-label>{{ "billingEmail" | i18n }}</bit-label>
+        <input bitInput type="email" formControlName="billingEmail" />
+      </bit-form-field>
+
+      <bit-form-field>
+        <bit-label>{{ "businessName" | i18n }}</bit-label>
+        <input bitInput type="text" formControlName="businessName" />
+      </bit-form-field>
+
+      <bit-form-field>
+        <bit-label>{{ "identifier" | i18n }}</bit-label>
+        <input bitInput type="text" formControlName="identifier" />
+      </bit-form-field>
     </div>
     <div class="col-6">
-      <app-avatar data="{{ org.name }}" dynamic="true" size="75" fontSize="35"></app-avatar>
+      <app-avatar
+        [data]="formData.get('name').value"
+        dynamic="true"
+        size="75"
+        fontSize="35"
+      ></app-avatar>
     </div>
   </div>
-  <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+  <button
+    type="submit"
+    bit-button
+    buttonType="primary"
+    class="btn-submit"
+    [disabled]="form.loading"
+  >
     <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
     <span>{{ "save" | i18n }}</span>
   </button>
diff --git a/src/app/organizations/settings/account.component.ts b/src/app/organizations/settings/account.component.ts
index ec6b2259..43d22d09 100644
--- a/src/app/organizations/settings/account.component.ts
+++ b/src/app/organizations/settings/account.component.ts
@@ -1,4 +1,5 @@
 import { Component, ViewChild, ViewContainerRef } from "@angular/core";
+import { FormBuilder, Validators } from "@angular/forms";
 import { ActivatedRoute, Router } from "@angular/router";
 
 import { ModalService } from "jslib-angular/services/modal.service";
@@ -42,7 +43,15 @@ export class AccountComponent {
 
   private organizationId: string;
 
+  formData = this.formBuilder.group({
+    name: ["", [Validators.required]],
+    billingEmail: ["", [Validators.required, Validators.email]],
+    businessName: [],
+    identifier: [],
+  });
+
   constructor(
+    private formBuilder: FormBuilder,
     private modalService: ModalService,
     private apiService: ApiService,
     private i18nService: I18nService,
@@ -56,11 +65,25 @@ export class AccountComponent {
 
   async ngOnInit() {
     this.selfHosted = this.platformUtilsService.isSelfHost();
+
+    if (this.selfHosted) {
+      this.formData.disable();
+    } else {
+      this.formData.enable();
+    }
+
     this.route.parent.parent.params.subscribe(async (params) => {
       this.organizationId = params.organizationId;
       try {
         this.org = await this.apiService.getOrganization(this.organizationId);
         this.canUseApi = this.org.useApi;
+
+        this.formData.setValue({
+          name: this.org.name,
+          billingEmail: this.org.billingEmail,
+          businessName: this.org.businessName,
+          identifier: this.org.identifier,
+        });
       } catch (e) {
         this.logService.error(e);
       }
@@ -71,10 +94,10 @@ export class AccountComponent {
   async submit() {
     try {
       const request = new OrganizationUpdateRequest();
-      request.name = this.org.name;
-      request.businessName = this.org.businessName;
-      request.billingEmail = this.org.billingEmail;
-      request.identifier = this.org.identifier;
+      request.name = this.formData.get("name").value;
+      request.businessName = this.formData.get("businessName").value;
+      request.billingEmail = this.formData.get("billingEmail").value;
+      request.identifier = this.formData.get("identifier").value;
 
       // Backfill pub/priv key if necessary
       if (!this.org.hasPublicAndPrivateKeys) {
diff --git a/src/app/oss.module.ts b/src/app/oss.module.ts
index 4be1f094..bea4c1e4 100644
--- a/src/app/oss.module.ts
+++ b/src/app/oss.module.ts
@@ -53,7 +53,7 @@ import localeZhTw from "@angular/common/locales/zh-Hant";
 import { NgModule } from "@angular/core";
 import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 import { RouterModule } from "@angular/router";
-import { BadgeModule, ButtonModule } from "@bitwarden/components";
+import { BadgeModule, ButtonModule, FormFieldModule } from "@bitwarden/components";
 import { InfiniteScrollModule } from "ngx-infinite-scroll";
 import { ToastrModule } from "ngx-toastr";
 
@@ -280,6 +280,7 @@ registerLocaleData(localeZhTw, "zh-TW");
     ToastrModule,
     BadgeModule,
     ButtonModule,
+    FormFieldModule,
   ],
   declarations: [
     PremiumBadgeComponent,