@hmcts/ccd-case-ui-toolkit 4.9.16-wcag20-exui → 4.10.0-rc.2

package/RELEASE-NOTES.md

@@ -3,15 +3,9 @@
 ### Version 4.12.0
 Add refunds functionality
 
-### Version 4.9.16-wcag20-exui"
-**FPLA: Accessibility Issues Found in ExUI** FPLA: Accessibility Issues Found in ExUI
-
 ### Version 4.9.15-state-machine"
 **Task event completion and state machine** Task event completion and state machine
 
-### Version 4.3.9-markdown-case-ref-EUI-3650
-**EUI-3650** Added formatting for case reference inside markdown
-
 ### Version 4.7.6-tab-not-defined-error"
 **EUI-4562** Case details Active tasks tab on success not returning to active tasks page
 
@@ -22,9 +16,7 @@ Add refunds functionality
 **EUI-4562** Case details Active tasks tab on success not returning to active tasks page
 
 ### Version 4.7.6-hearings-tab
-**EUI-4441** Add hearings tab in case details
-
-### Version 4.7.6-hearings-tab
+**EUI-4441** Add hearings tab in case details 
 **EUI-4441** Add hearings tab in case details
 **EUI-4627** Can't access /hearings tab from URL
 

package/dist/index.umd.js

@@ -1,6 +1,6 @@
 /**
  * @hmcts/ccd-case-ui-toolkit - Case UI Toolkit
- * @version v4.9.16-wcag20-exui
+ * @version v4.10.0-rc.2
  * @link undefined
  * @license MIT
  */
@@ -19090,55 +19090,47 @@ var CaseEditPageComponent = /** @class */ (function () {
         CaseEditPageComponent_1.setFocusToTop();
     };
     // Adding validation message to show it as Error Summary
-    CaseEditPageComponent.prototype.generateErrorMessage = function (fields, container, path) {
+    CaseEditPageComponent.prototype.generateErrorMessage = function (fields, container) {
         var _this = this;
         var group = container || this.editForm.controls['data'];
         fields.filter(function (casefield) { return !_this.caseFieldService.isReadOnly(casefield); })
-            .filter(function (casefield) { return !_this.pageValidationService.isHidden(casefield, _this.editForm, path); })
+            .filter(function (casefield) { return !_this.pageValidationService.isHidden(casefield, _this.editForm); })
             .forEach(function (casefield) {
             var fieldElement = group.get(casefield.id);
             if (fieldElement) {
                 var label = casefield.label || 'Field';
-                var id_1 = casefield.id;
+                var id = casefield.id;
                 if (fieldElement['component'] && fieldElement['component'].parent) {
-                    if (fieldElement['component'].idPrefix.indexOf('_' + id_1 + '_') === -1) {
-                        id_1 = "" + fieldElement['component'].idPrefix + id_1;
-                    }
-                    else {
-                        id_1 = "" + fieldElement['component'].idPrefix;
-                    }
+                    id = "" + fieldElement['component'].idPrefix + id;
                 }
                 if (fieldElement.hasError('required')) {
-                    _this.validationErrors.push({ id: id_1, message: label + " is required" });
+                    _this.validationErrors.push({ id: id, message: label + " is required" });
                     fieldElement.markAsDirty();
                 }
                 else if (fieldElement.hasError('pattern')) {
-                    _this.validationErrors.push({ id: id_1, message: label + " is not valid" });
+                    _this.validationErrors.push({ id: id, message: label + " is not valid" });
                     fieldElement.markAsDirty();
                 }
                 else if (fieldElement.hasError('minlength')) {
-                    _this.validationErrors.push({ id: id_1, message: label + " is below the minimum length" });
+                    _this.validationErrors.push({ id: id, message: label + " is below the minimum length" });
                     fieldElement.markAsDirty();
                 }
                 else if (fieldElement.hasError('maxlength')) {
-                    _this.validationErrors.push({ id: id_1, message: label + " exceeds the maximum length" });
+                    _this.validationErrors.push({ id: id, message: label + " exceeds the maximum length" });
                     fieldElement.markAsDirty();
                 }
                 else if (fieldElement.invalid) {
                     if (casefield.isComplex()) {
-                        _this.generateErrorMessage(casefield.field_type.complex_fields, fieldElement, id_1);
+                        _this.generateErrorMessage(casefield.field_type.complex_fields, fieldElement);
                     }
                     else if (casefield.isCollection() && casefield.field_type.collection_field_type.type === 'Complex') {
                         var fieldArray = fieldElement;
-                        if (fieldArray['component'] && fieldArray['component']['collItems'] && fieldArray['component']['collItems'].length > 0) {
-                            id_1 = "" + fieldArray['component']['collItems'][0].prefix;
-                        }
                         fieldArray.controls.forEach(function (c) {
-                            _this.generateErrorMessage(casefield.field_type.collection_field_type.complex_fields, c.get('value'), id_1);
+                            _this.generateErrorMessage(casefield.field_type.collection_field_type.complex_fields, c.get('value'));
                         });
                     }
                     else {
-                        _this.validationErrors.push({ id: id_1, message: "Select or fill the required " + casefield.label + " field" });
+                        _this.validationErrors.push({ id: id, message: "Select or fill the required " + casefield.label + " field" });
                         fieldElement.markAsDirty();
                     }
                 }
@@ -21651,13 +21643,10 @@ var PageValidationService = /** @class */ (function () {
         }
         return !(this.checkMandatoryField(caseField, theControl));
     };
-    PageValidationService.prototype.isHidden = function (caseField, editForm, path) {
+    PageValidationService.prototype.isHidden = function (caseField, editForm) {
         var formFields = editForm.getRawValue();
         var condition = conditional_show_model_1.ShowCondition.getInstance(caseField.show_condition);
-        if (path && path.indexOf('_' + caseField.id + '_') === -1) {
-            path = "" + path + caseField.id;
-        }
-        return !condition.match(formFields.data, path);
+        return !condition.match(formFields.data);
     };
     PageValidationService.prototype.checkOptionalField = function (caseField, theControl) {
         if (!theControl) {
@@ -26959,7 +26948,6 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 var core_1 = __webpack_require__(57208);
 var markdown_component_1 = __webpack_require__(86843);
 var ngx_md_1 = __webpack_require__(99978);
-var pipes_1 = __webpack_require__(32741);
 exports.forRoot = ngx_md_1.NgxMdModule.forRoot();
 var MarkdownModule = /** @class */ (function () {
     function MarkdownModule() {
@@ -26967,8 +26955,7 @@ var MarkdownModule = /** @class */ (function () {
     MarkdownModule = __decorate([
         core_1.NgModule({
             imports: [
-                exports.forRoot,
-                pipes_1.PipesModule
+                exports.forRoot
             ],
             declarations: [
                 markdown_component_1.MarkdownComponent
@@ -34982,7 +34969,10 @@ var IsCompoundPipe = /** @class */ (function () {
             return false;
         }
         if (IsCompoundPipe_1.COMPOUND_TYPES.indexOf(field.field_type.type) !== -1) {
-            return IsCompoundPipe_1.EXCLUDE.indexOf(field.field_type.id) === -1;
+            if (IsCompoundPipe_1.EXCLUDE.indexOf(field.field_type.id) !== -1) {
+                return false;
+            }
+            return true;
         }
         return false;
     };
@@ -39988,7 +39978,7 @@ var CaseReferencePipe = /** @class */ (function () {
             return draft_model_1.DRAFT_PREFIX;
         }
         else {
-            return String(caseReference).replace(/(?<!\/)(\d{4})(\d{4})(\d{4})(\d{4})/g, '$1-$2-$3-$4');
+            return String(caseReference).replace(/(\d{4})(\d{4})(\d{4})(\d{4})/, '$1-$2-$3-$4');
         }
     };
     CaseReferencePipe = __decorate([
@@ -42265,11 +42255,11 @@ var FieldsUtils = /** @class */ (function () {
                     if (isDynamicField) {
                         var dynamicListValue = _this.getDynamicListValue(rootCaseField.value, field.id);
                         if (dynamicListValue) {
-                            var list_items = dynamicListValue.list_items;
-                            var complexValue = dynamicListValue.value;
+                            var list_items = dynamicListValue[0].list_items;
+                            var complexValue = dynamicListValue.map(function (data) { return data.value; });
                             var value = {
                                 list_items: list_items,
-                                value: complexValue ? complexValue : undefined
+                                value: complexValue.length > 0 ? complexValue : undefined
                             };
                             field.value = __assign({}, value);
                             field.formatted_value = __assign({}, field.formatted_value, value);
@@ -42291,17 +42281,22 @@ var FieldsUtils = /** @class */ (function () {
         }
     };
     FieldsUtils.getDynamicListValue = function (jsonBlock, key) {
-        if (jsonBlock[key]) {
-            return jsonBlock[key];
+        var data = jsonBlock ? this.getNestedFieldValues(jsonBlock, key, []) : [];
+        return data.length > 0 ? data : null;
+    };
+    FieldsUtils.getNestedFieldValues = function (jsonData, key, output) {
+        if (output === void 0) { output = []; }
+        if (jsonData && jsonData[key]) {
+            output.push(jsonData[key]);
         }
         else {
-            for (var elementKey in jsonBlock) {
-                if (typeof jsonBlock === 'object' && jsonBlock.hasOwnProperty(elementKey)) {
-                    return this.getDynamicListValue(jsonBlock[elementKey], key);
+            for (var elementKey in jsonData) {
+                if (typeof jsonData === 'object' && jsonData.hasOwnProperty(elementKey)) {
+                    this.getNestedFieldValues(jsonData[elementKey], key, output);
                 }
             }
         }
-        return null;
+        return output;
     };
     FieldsUtils.prototype.buildCanShowPredicate = function (eventTrigger, form) {
         var currentState = this.getCurrentEventState(eventTrigger, form);
@@ -89137,7 +89132,7 @@ module.exports = "<!-- Current Page && Event trigger name -->\n<h1 class=\"headi
 /***/ 3808:
 /***/ ((module) => {
 
-module.exports = "<ng-container ccdConditionalShowForm [formGroup]=\"formGroup\" [caseFields]=\"fields\" [contextFields]=\"caseFields\" *ngFor=\"let field of fields\">\n  <div ccdLabelSubstitutor [caseField]=\"field\" [formGroup]=\"formGroup\" [contextFields]=\"caseFields\">\n    <ng-container [ngSwitch]=\"field | ccdIsReadOnlyAndNotCollection \">\n      <ccd-field-read *ngSwitchCase=\"true\"\n                      [caseField]=\"field\"\n                      [caseFields]=\"caseFields\"\n                      [withLabel]=\"true\"\n                      [formGroup]=\"formGroup\"\n                      [attr.field_id]=\"field.id\"\n                      [attr.field_type]=\"field.field_type.type\"\n      ></ccd-field-read>\n      <ng-container *ngSwitchCase=\"false\">\n        <ng-container *ngIf=\"!(field | ccdIsCompound); else CompoundRow\">\n          <ccd-field-write [caseField]=\"field\"\n                           [caseFields]=\"caseFields\"\n                           [formGroup]=\"formGroup\"\n                           [idPrefix]=\"\"\n                           [hidden]=\"field.hidden\"\n                           [attr.field_id]=\"field.id\"\n                           [attr.field_type]=\"field.field_type.type\"\n          >\n          </ccd-field-write>\n        </ng-container>\n        <ng-template #CompoundRow>\n          <ccd-field-write [caseField]=\"field\"\n                           [caseFields]=\"caseFields\"\n                           [formGroup]=\"formGroup\"\n                           [idPrefix]=\"field.id + '_'\"\n                           [hidden]=\"field.hidden\"\n                           [attr.field_id]=\"field.id\"\n                           [attr.field_type]=\"field.field_type.type\"\n          >\n\n          </ccd-field-write>\n        </ng-template>\n      </ng-container>\n    </ng-container>\n  </div>\n</ng-container>\n"
+module.exports = "<ng-container ccdConditionalShowForm [formGroup]=\"formGroup\" [caseFields]=\"fields\" [contextFields]=\"caseFields\"\n              *ngFor=\"let field of fields\">\n  <div ccdLabelSubstitutor\n       [caseField]=\"field\" [formGroup]=\"formGroup\" [contextFields]=\"caseFields\">\n    <ng-container [ngSwitch]=\"field | ccdIsReadOnlyAndNotCollection \">\n      <ccd-field-read *ngSwitchCase=\"true\" [caseField]=\"field\" [caseFields]=\"caseFields\" [withLabel]=\"true\"\n                      [formGroup]=\"formGroup\"></ccd-field-read>\n      <ng-container *ngSwitchCase=\"false\">\n        <ng-container *ngIf=\"!(field | ccdIsCompound); else CompoundRow\">\n          <ccd-field-write [caseField]=\"field\"\n                           [caseFields]=\"caseFields\"\n                           [formGroup]=\"formGroup\"\n                           [idPrefix]=\"\"\n                           [hidden]=\"field.hidden\">\n          </ccd-field-write>\n        </ng-container>\n        <ng-template #CompoundRow>\n          <ccd-field-write [caseField]=\"field\"\n                           [caseFields]=\"caseFields\"\n                           [formGroup]=\"formGroup\"\n                           [idPrefix]=\"field.id + '_'\"\n                           [hidden]=\"field.hidden\"></ccd-field-write>\n        </ng-template>\n      </ng-container>\n    </ng-container>\n  </div>\n</ng-container>\n"
 
 /***/ }),
 
@@ -89417,7 +89412,7 @@ module.exports = "<div class=\"spinner-container\">\n    <div class=\"spinner-in
 /***/ 6961:
 /***/ ((module) => {
 
-module.exports = "<div><markdown class=\"markdown\" [innerHTML]=\"content | ccdCaseReference\"></markdown></div>"
+module.exports = "<div><markdown class=\"markdown\" [innerHTML]=\"content\"></markdown></div>"
 
 /***/ }),
 
@@ -89515,7 +89510,7 @@ module.exports = "<ng-container [ngSwitch]=\"context\">\n  <ccd-read-complex-fie
 /***/ 93616:
 /***/ ((module) => {
 
-module.exports = "<div class=\"form-group\" [id]=\"id()\">\n\n  <h2 *ngIf=\"renderLabel\" class=\"heading-h2\">{{caseField | ccdFieldLabel}}</h2>\n  <fieldset *ngFor=\"let field of complexFields\">\n    <ng-container [ngSwitch]=\"field | ccdIsReadOnly\">\n      <ccd-field-read *ngSwitchCase=\"true\"\n                      ccdLabelSubstitutor\n                      [caseField]=\"buildField(field)\"\n                      [caseFields]=\"caseFields\"\n                      [formGroup]=\"formGroup\"\n                      [attr.field_id]=\"field.id\"\n                      [attr.field_type]=\"field.field_type.type\"\n                      [withLabel]=\"true\">\n      </ccd-field-read>\n      <ccd-field-write *ngSwitchCase=\"false\"\n                       ccdLabelSubstitutor\n                       [caseField]=\"field\"\n                       [caseFields]=\"caseFields\"\n                       [formGroup]=\"formGroup\"\n                       [parent]=\"complexGroup\"\n                       [attr.field_id]=\"field.id\"\n                       [attr.field_type]=\"field.field_type.type\"\n                       [idPrefix]=\"buildIdPrefix(field)\"\n                       [hidden]=\"field.hidden\"\n                       [isExpanded]=\"isExpanded\"\n                       [isInSearchBlock]=\"isInSearchBlock\">\n      </ccd-field-write>\n    </ng-container>\n  </fieldset>\n</div>\n"
+module.exports = "<div class=\"form-group\" [id]=\"id()\">\n\n  <h2 *ngIf=\"renderLabel\" class=\"heading-h2\">{{caseField | ccdFieldLabel}}</h2>\n  <ng-container *ngFor=\"let field of complexFields\">\n    <ng-container [ngSwitch]=\"field | ccdIsReadOnly\">\n      <ccd-field-read *ngSwitchCase=\"true\"\n                      ccdLabelSubstitutor\n                      [caseField]=\"buildField(field)\"\n                      [caseFields]=\"caseFields\"\n                      [formGroup]=\"formGroup\"\n                      [withLabel]=\"true\">\n      </ccd-field-read>\n      <ccd-field-write *ngSwitchCase=\"false\"\n                       ccdLabelSubstitutor\n                       [caseField]=\"field\"\n                       [caseFields]=\"caseFields\"\n                       [formGroup]=\"formGroup\"\n                       [parent]=\"complexGroup\"\n                       [idPrefix]=\"buildIdPrefix(field)\"\n                       [hidden]=\"field.hidden\"\n                       [isExpanded]=\"isExpanded\"\n                       [isInSearchBlock]=\"isInSearchBlock\">\n      </ccd-field-write>\n    </ng-container>\n  </ng-container>\n</div>\n"
 
 /***/ }),