@hmcts/ccd-case-ui-toolkit 4.9.0-ways-to-pay.2 → 4.9.0-ways-to-pay.3

package/RELEASE-NOTES.md

@@ -1,5 +1,8 @@
 ## RELEASE NOTES
 
+### Version 4.3.9-markdown-case-ref-EUI-3650
+**EUI-3650** Added formatting for case reference inside markdown
+
 ### Version 4.3.6-hotfix-EUI-4404
 **EUI-4404** Fix rendering of read-only Collection field within editable Complex field
 

package/dist/index.umd.js

@@ -1,6 +1,6 @@
 /**
  * @hmcts/ccd-case-ui-toolkit - Case UI Toolkit
- * @version v4.9.0-ways-to-pay.2
+ * @version v4.9.0-ways-to-pay.3
  * @link undefined
  * @license MIT
  */
@@ -18883,47 +18883,55 @@ var CaseEditPageComponent = /** @class */ (function () {
         CaseEditPageComponent_1.setFocusToTop();
     };
     // Adding validation message to show it as Error Summary
-    CaseEditPageComponent.prototype.generateErrorMessage = function (fields, container) {
+    CaseEditPageComponent.prototype.generateErrorMessage = function (fields, container, path) {
         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); })
+            .filter(function (casefield) { return !_this.pageValidationService.isHidden(casefield, _this.editForm, path); })
             .forEach(function (casefield) {
             var fieldElement = group.get(casefield.id);
             if (fieldElement) {
                 var label = casefield.label || 'Field';
-                var id = casefield.id;
+                var id_1 = casefield.id;
                 if (fieldElement['component'] && fieldElement['component'].parent) {
-                    id = "" + fieldElement['component'].idPrefix + id;
+                    if (fieldElement['component'].idPrefix.indexOf('_' + id_1 + '_') === -1) {
+                        id_1 = "" + fieldElement['component'].idPrefix + id_1;
+                    }
+                    else {
+                        id_1 = "" + fieldElement['component'].idPrefix;
+                    }
                 }
                 if (fieldElement.hasError('required')) {
-                    _this.validationErrors.push({ id: id, message: label + " is required" });
+                    _this.validationErrors.push({ id: id_1, message: label + " is required" });
                     fieldElement.markAsDirty();
                 }
                 else if (fieldElement.hasError('pattern')) {
-                    _this.validationErrors.push({ id: id, message: label + " is not valid" });
+                    _this.validationErrors.push({ id: id_1, message: label + " is not valid" });
                     fieldElement.markAsDirty();
                 }
                 else if (fieldElement.hasError('minlength')) {
-                    _this.validationErrors.push({ id: id, message: label + " is below the minimum length" });
+                    _this.validationErrors.push({ id: id_1, message: label + " is below the minimum length" });
                     fieldElement.markAsDirty();
                 }
                 else if (fieldElement.hasError('maxlength')) {
-                    _this.validationErrors.push({ id: id, message: label + " exceeds the maximum length" });
+                    _this.validationErrors.push({ id: id_1, message: label + " exceeds the maximum length" });
                     fieldElement.markAsDirty();
                 }
                 else if (fieldElement.invalid) {
                     if (casefield.isComplex()) {
-                        _this.generateErrorMessage(casefield.field_type.complex_fields, fieldElement);
+                        _this.generateErrorMessage(casefield.field_type.complex_fields, fieldElement, id_1);
                     }
                     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'));
+                            _this.generateErrorMessage(casefield.field_type.collection_field_type.complex_fields, c.get('value'), id_1);
                         });
                     }
                     else {
-                        _this.validationErrors.push({ id: id, message: "Select or fill the required " + casefield.label + " field" });
+                        _this.validationErrors.push({ id: id_1, message: "Select or fill the required " + casefield.label + " field" });
                         fieldElement.markAsDirty();
                     }
                 }
@@ -20765,10 +20773,13 @@ var PageValidationService = /** @class */ (function () {
         }
         return !(this.checkMandatoryField(caseField, theControl));
     };
-    PageValidationService.prototype.isHidden = function (caseField, editForm) {
+    PageValidationService.prototype.isHidden = function (caseField, editForm, path) {
         var formFields = editForm.getRawValue();
         var condition = conditional_show_model_1.ShowCondition.getInstance(caseField.show_condition);
-        return !condition.match(formFields.data);
+        if (path && path.indexOf('_' + caseField.id + '_') === -1) {
+            path = "" + path + caseField.id;
+        }
+        return !condition.match(formFields.data, path);
     };
     PageValidationService.prototype.checkOptionalField = function (caseField, theControl) {
         if (!theControl) {
@@ -25202,6 +25213,7 @@ 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() {
@@ -25209,7 +25221,8 @@ var MarkdownModule = /** @class */ (function () {
     MarkdownModule = __decorate([
         core_1.NgModule({
             imports: [
-                exports.forRoot
+                exports.forRoot,
+                pipes_1.PipesModule
             ],
             declarations: [
                 markdown_component_1.MarkdownComponent
@@ -26274,6 +26287,7 @@ __export(__webpack_require__(90654));
 __export(__webpack_require__(33262));
 __export(__webpack_require__(16291));
 __export(__webpack_require__(56503));
+__export(__webpack_require__(38645));
 
 
 /***/ }),
@@ -26292,6 +26306,64 @@ var PaletteContext;
 })(PaletteContext = exports.PaletteContext || (exports.PaletteContext = {}));
 
 
+/***/ }),
+
+/***/ 38645:
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    }
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+var abstract_field_read_component_1 = __webpack_require__(73860);
+var PaymentField = /** @class */ (function (_super) {
+    __extends(PaymentField, _super);
+    function PaymentField(appConfig, sessionStorage) {
+        var _this = _super.call(this) || this;
+        _this.appConfig = appConfig;
+        _this.sessionStorage = sessionStorage;
+        return _this;
+    }
+    PaymentField.prototype.getBaseURL = function () {
+        return this.appConfig.getPaymentsUrl();
+    };
+    PaymentField.prototype.getPayBulkScanBaseURL = function () {
+        return this.appConfig.getPayBulkScanBaseUrl();
+    };
+    PaymentField.prototype.getRefundsUrl = function () {
+        return this.appConfig.getRefundsUrl();
+    };
+    PaymentField.prototype.getUserRoles = function () {
+        var userDetails = JSON.parse(this.sessionStorage.getItem('userDetails') || null);
+        if (!userDetails || !userDetails.hasOwnProperty('roles')) {
+            return [];
+        }
+        return userDetails.roles;
+    };
+    PaymentField.prototype.getUserEmail = function () {
+        var userDetails = JSON.parse(this.sessionStorage.getItem('userDetails') || null);
+        if (!userDetails || !userDetails.hasOwnProperty('sub')) {
+            return '';
+        }
+        return userDetails.sub;
+    };
+    return PaymentField;
+}(abstract_field_read_component_1.AbstractFieldReadComponent));
+exports.PaymentField = PaymentField;
+
+
 /***/ }),
 
 /***/ 15440:
@@ -32407,31 +32479,25 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-var abstract_field_read_component_1 = __webpack_require__(73860);
 var core_1 = __webpack_require__(57208);
 var app_config_1 = __webpack_require__(35185);
+var session_storage_service_1 = __webpack_require__(95224);
+var payment_field_component_1 = __webpack_require__(38645);
 var CasePaymentHistoryViewerFieldComponent = /** @class */ (function (_super) {
     __extends(CasePaymentHistoryViewerFieldComponent, _super);
-    function CasePaymentHistoryViewerFieldComponent(appConfig) {
-        var _this = _super.call(this) || this;
-        _this.appConfig = appConfig;
-        return _this;
+    function CasePaymentHistoryViewerFieldComponent(appConfig, sessionStorage) {
+        return _super.call(this, appConfig, sessionStorage) || this;
     }
-    CasePaymentHistoryViewerFieldComponent.prototype.getBaseURL = function () {
-        return this.appConfig.getPaymentsUrl();
-    };
-    CasePaymentHistoryViewerFieldComponent.prototype.getPayBulkScanBaseURL = function () {
-        return this.appConfig.getPayBulkScanBaseUrl();
-    };
     CasePaymentHistoryViewerFieldComponent = __decorate([
         core_1.Component({
             selector: 'ccd-case-payment-history-viewer-field',
             template: __webpack_require__(69259),
         }),
-        __metadata("design:paramtypes", [app_config_1.AbstractAppConfig])
+        __metadata("design:paramtypes", [app_config_1.AbstractAppConfig,
+            session_storage_service_1.SessionStorageService])
     ], CasePaymentHistoryViewerFieldComponent);
     return CasePaymentHistoryViewerFieldComponent;
-}(abstract_field_read_component_1.AbstractFieldReadComponent));
+}(payment_field_component_1.PaymentField));
 exports.CasePaymentHistoryViewerFieldComponent = CasePaymentHistoryViewerFieldComponent;
 
 
@@ -33434,40 +33500,14 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 var core_1 = __webpack_require__(57208);
-var session_storage_service_1 = __webpack_require__(95224);
 var app_config_1 = __webpack_require__(35185);
-var base_field_1 = __webpack_require__(77238);
+var session_storage_service_1 = __webpack_require__(95224);
+var payment_field_component_1 = __webpack_require__(38645);
 var WaysToPayFieldComponent = /** @class */ (function (_super) {
     __extends(WaysToPayFieldComponent, _super);
     function WaysToPayFieldComponent(appConfig, sessionStorage) {
-        var _this = _super.call(this) || this;
-        _this.appConfig = appConfig;
-        _this.sessionStorage = sessionStorage;
-        return _this;
+        return _super.call(this, appConfig, sessionStorage) || this;
     }
-    WaysToPayFieldComponent.prototype.getBaseURL = function () {
-        return this.appConfig.getPaymentsUrl();
-    };
-    WaysToPayFieldComponent.prototype.getPayBulkScanBaseURL = function () {
-        return this.appConfig.getPayBulkScanBaseUrl();
-    };
-    WaysToPayFieldComponent.prototype.getRefundsUrl = function () {
-        return this.appConfig.getRefundsUrl();
-    };
-    WaysToPayFieldComponent.prototype.getUserRoles = function () {
-        var userDetails = JSON.parse(this.sessionStorage.getItem('userDetails') || null);
-        if (!userDetails || !userDetails.hasOwnProperty('roles')) {
-            return [];
-        }
-        return userDetails.roles;
-    };
-    WaysToPayFieldComponent.prototype.getUserEmail = function () {
-        var userDetails = JSON.parse(this.sessionStorage.getItem('userDetails') || null);
-        if (!userDetails || !userDetails.hasOwnProperty('sub')) {
-            return '';
-        }
-        return userDetails.sub;
-    };
     WaysToPayFieldComponent = __decorate([
         core_1.Component({
             selector: 'ccd-ways-to-pay-field',
@@ -33477,7 +33517,7 @@ var WaysToPayFieldComponent = /** @class */ (function (_super) {
             session_storage_service_1.SessionStorageService])
     ], WaysToPayFieldComponent);
     return WaysToPayFieldComponent;
-}(base_field_1.AbstractFieldWriteComponent));
+}(payment_field_component_1.PaymentField));
 exports.WaysToPayFieldComponent = WaysToPayFieldComponent;
 
 
@@ -38253,7 +38293,7 @@ var CaseReferencePipe = /** @class */ (function () {
             return draft_model_1.DRAFT_PREFIX;
         }
         else {
-            return String(caseReference).replace(/(\d{4})(\d{4})(\d{4})(\d{4})/, '$1-$2-$3-$4');
+            return String(caseReference).replace(/(?<!\/)(\d{4})(\d{4})(\d{4})(\d{4})/g, '$1-$2-$3-$4');
         }
     };
     CaseReferencePipe = __decorate([
@@ -70403,7 +70443,7 @@ module.exports = "<div class=\"spinner-container\">\n    <div class=\"spinner-in
 /***/ 6961:
 /***/ ((module) => {
 
-module.exports = "<div><markdown class=\"markdown\" [innerHTML]=\"content\"></markdown></div>"
+module.exports = "<div><markdown class=\"markdown\" [innerHTML]=\"content | ccdCaseReference\"></markdown></div>"
 
 /***/ }),
 
@@ -70697,7 +70737,7 @@ module.exports = "<div class=\"form-group\" [formGroup]=\"organisationFormGroup\
 /***/ 69259:
 /***/ ((module) => {
 
-module.exports = "<ccpay-payment-lib\n    [API_ROOT]=\"getBaseURL()\"\n    [CCD_CASE_NUMBER]=\"caseReference\"\n    [BULKSCAN_API_ROOT]=\"getPayBulkScanBaseURL()\"\n    [SELECTED_OPTION]=\"'CCDorException'\"\n    [ISBSENABLE]=\"'true'\"\n    [VIEW]=\"'case-transactions'\"\n></ccpay-payment-lib>\n"
+module.exports = "<ccpay-payment-lib\n    [API_ROOT]=\"getBaseURL()\"\n    [CCD_CASE_NUMBER]=\"caseReference\"\n    [BULKSCAN_API_ROOT]=\"getPayBulkScanBaseURL()\"\n    [SELECTED_OPTION]=\"'CCDorException'\"\n    [ISBSENABLE]=\"'true'\"\n    [VIEW]=\"'case-transactions'\"\n    [REFUNDS_API_ROOT]=\"getRefundsUrl()\"\n    [TAKEPAYMENT]=\"true\"\n    [SERVICEREQUEST]=\"true\"\n    [PAYMENT_GROUP_REF]=\"null\"\n    [EXC_REFERENCE]=\"caseReference\"\n    [DCN_NUMBER]=\"null\"\n    [LOGGEDINUSERROLES]=\"getUserRoles()\"\n></ccpay-payment-lib>\n"
 
 /***/ }),