Fix regression caused casefield not being transformed in address field, ensuring that this works for all writeable fields

Upgrade to new release of class-transformer which has a performance fix

Author: andywilkinshmcts

RELEASE-NOTES.md

@@ -1,4 +1,7 @@
 ## RELEASE NOTES
+### Version 2.68.0-prerelease-conditional-show-perf"
+**EUI-3055** Fix regression in address field
+
 ### Version 2.68.0-prerelease-conditional-show-perf"
 **EUI-3055** Better performance in edit forms through new show hide implementation
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/ccd-case-ui-toolkit",
-  "version": "2.68.0-prerelease-conditional-show-perf",
+  "version": "2.68.1-prerelease-conditional-show-perf",
   "engines": {
     "yarn": "^1.12.3",
     "npm": "^5.6.0"
@@ -96,7 +96,7 @@
     "@types/webpack-env": "^1.16.0",
     "angular2-template-loader": "^0.6.2",
     "awesome-typescript-loader": "^5.2.1",
-    "class-transformer": "0.1.10",
+    "class-transformer": "^0.3.2",
     "codacy-coverage": "^2.1.1",
     "codecov": "^3.0.0",
     "codelyzer": "^4.1.0",

src/shared/components/palette/address/write-address-field.component.ts

@@ -7,6 +7,8 @@ import { AddressesService } from '../../../services/addresses/addresses.service'
 import { FormControl, FormGroup } from '@angular/forms';
 import { IsCompoundPipe } from '../utils/is-compound.pipe';
 import { FocusElementDirective } from '../../../directives/focus-element';
+import { CaseField } from '../../../domain';
+import { plainToClassFromExist } from 'class-transformer';
 
 @Component({
   selector: 'ccd-write-address-field',
@@ -34,7 +36,7 @@ export class WriteAddressFieldComponent extends AbstractFieldWriteComponent impl
 
   missingPostcode = false;
 
-  constructor (addressesService: AddressesService, private isCompoundPipe: IsCompoundPipe) {
+  constructor(addressesService: AddressesService, private isCompoundPipe: IsCompoundPipe) {
     super();
     this.addressesService = addressesService;
   }
@@ -49,7 +51,6 @@ export class WriteAddressFieldComponent extends AbstractFieldWriteComponent impl
   }
 
   findAddress() {
-
     if (!this.postcode.value) {
       this.missingPostcode = true;
     } else {
@@ -91,7 +92,7 @@ export class WriteAddressFieldComponent extends AbstractFieldWriteComponent impl
 
   isComplexWithHiddenFields() {
     if (this.caseField.isComplex() && this.caseField.field_type.complex_fields
-      && this.caseField.field_type.complex_fields.some(cf => cf.hidden === true )) {
+      && this.caseField.field_type.complex_fields.some(cf => cf.hidden === true)) {
       return true;
     }
   }
@@ -124,13 +125,15 @@ export class WriteAddressFieldComponent extends AbstractFieldWriteComponent impl
   }
 
   ngOnChanges(changes: SimpleChanges) {
-    if (changes['caseField']) {
+    super.ngOnChanges(changes);
+    let change = changes['caseField'];
+    if (change) {
       this.setFormValue();
     }
   }
 
   createId(elementId: string): string {
-    return this.id() + '_' + elementId ;
+    return this.id() + '_' + elementId;
   }
 
   private defaultLabel(numberOfAddresses) {

src/shared/components/palette/base-field/abstract-field-write.component.ts

@@ -1,7 +1,9 @@
-import { Input } from '@angular/core';
+import { Input, OnChanges, SimpleChanges } from '@angular/core';
 import { AbstractFormFieldComponent } from './abstract-form-field.component';
+import { CaseField } from '../../../domain';
+import { plainToClassFromExist } from 'class-transformer';
 
-export abstract class AbstractFieldWriteComponent extends AbstractFormFieldComponent {
+export abstract class AbstractFieldWriteComponent extends AbstractFormFieldComponent implements OnChanges {
 
   @Input()
   isExpanded = false;
@@ -12,4 +14,25 @@ export abstract class AbstractFieldWriteComponent extends AbstractFormFieldCompo
   public id() {
     return this.idPrefix + this.caseField.id;
   }
+
+  public constructor() {
+    super();
+    this.fixCaseField();
+  }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    let change = changes['caseField'];
+    if (change) {
+      let cfNew = change.currentValue;
+      if (!(cfNew instanceof CaseField)) {
+        this.fixCaseField();
+      }
+    }
+  }
+
+  private fixCaseField() {
+    if (this.caseField && !(this.caseField instanceof CaseField)) {
+      this.caseField = plainToClassFromExist(new CaseField(), this.caseField);
+    }
+  }
 }

src/shared/directives/conditional-show/conditional-show-form.directive.ts

@@ -66,8 +66,6 @@ export class ConditionalShowFormDirective implements OnInit, OnDestroy {
           cf.hidden = !condResult;
         }
       }
-    } else {
-      console.log('No casefield bound  to control ' + JSON.stringify(c.value));
     }
   }
 

yarn.lock

@@ -2307,10 +2307,10 @@ circular-json@^0.5.5:
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.9.tgz#932763ae88f4f7dead7a0d09c8a51a4743a53b1d"
   integrity sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==
 
-class-transformer@0.1.10:
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/class-transformer/-/class-transformer-0.1.10.tgz#350f168ebb4c1f87edb18b98dd973681fc20fff7"
-  integrity sha512-QiNdUxEvTBiUtc0KiapGVHhgaqGQVEhOfL9UEBnb9xRfcwmDJT5ijIDwcwJUTwXaT/kGvZZB4JCGsiuR5adX6g==
+class-transformer@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/class-transformer/-/class-transformer-0.3.2.tgz#779ef5f124784324b40f8e927c774bd96cdecd4b"
+  integrity sha512-9QY6QXBH/+Gt1C3HBmJCrgY6+EFpIa6aLjfDnlXFx0zQl/HjrCE7qoaI0srNrxpMIfsobCpgUdDG5JYtJOpVsw==
 
 class-utils@^0.3.5:
   version "0.3.6"