@hmcts/ccd-case-ui-toolkit 4.18.16 → 4.18.17

package/RELEASE-NOTES.md

@@ -1,13 +1,5 @@
 ## RELEASE NOTES
 
-### Version 4.17.12-EUI-5743-Mandatory-field-validation-in-collection
-**EUI-5743** Bug fix for the Mandatory field validation in collection
-
-### Version 4.17.6-EUI-5736-unassigned-cases-pagination
-**EUI-5736** unassigned cases pagination
-
-### Version 4.12.1-EUI-5682-complex-table-collection-1
-**EUI-5682** Bug fix for the complex collection table view
 
 ### Version 4.12.1-EUI-5225-organisation-search
 **EUI-5225** Bug fix the organisation search functionality

package/dist/index.umd.js

@@ -1,6 +1,6 @@
 /**
  * @hmcts/ccd-case-ui-toolkit - Case UI Toolkit
- * @version v4.18.16
+ * @version v4.18.17
  * @link undefined
  * @license MIT
  */
@@ -26798,28 +26798,21 @@ var EventStartGuard = /** @class */ (function () {
     }
     EventStartGuard.prototype.canActivate = function (route) {
         var _this = this;
-        // Checks must be performed only for Work Allocation 2
-        if (this.appConfig.getWorkAllocationApiUrl().toLowerCase() === 'workallocation2') {
-            var caseId_1 = route.params['cid'];
-            var eventId_1 = route.params['eid'];
-            var taskId_1 = route.queryParams['tid'];
-            // TODO: NavigationExtras should be used once Angular upgrade changes have been incorporated
-            var isComplete = route.queryParams['isComplete'];
-            var caseInfoStr = this.sessionStorageService.getItem('caseInfo');
-            if (caseInfoStr) {
-                var caseInfo = JSON.parse(caseInfoStr);
-                if (caseInfo && caseInfo.cid === caseId_1) {
-                    if (isComplete) {
-                        return rxjs_1.of(true);
-                    }
-                    return this.workAllocationService.getTasksByCaseIdAndEventId(eventId_1, caseId_1, caseInfo.caseType, caseInfo.jurisdiction).pipe(operators_1.switchMap(function (payload) { return _this.checkForTasks(payload, caseId_1, eventId_1, taskId_1); }));
+        var caseId = route.params['cid'];
+        var eventId = route.params['eid'];
+        var taskId = route.queryParams['tid'];
+        // TODO: NavigationExtras should be used once Angular upgrade changes have been incorporated
+        var isComplete = route.queryParams['isComplete'];
+        var caseInfoStr = this.sessionStorageService.getItem('caseInfo');
+        if (caseInfoStr) {
+            var caseInfo = JSON.parse(caseInfoStr);
+            if (caseInfo && caseInfo.cid === caseId) {
+                if (isComplete) {
+                    return rxjs_1.of(true);
                 }
+                return this.workAllocationService.getTasksByCaseIdAndEventId(eventId, caseId, caseInfo.caseType, caseInfo.jurisdiction).pipe(operators_1.switchMap(function (payload) { return _this.checkForTasks(payload, caseId, eventId, taskId); }));
             }
         }
-        else {
-            // Checks not required, return true by default for Work Allocation 1
-            return rxjs_1.of(true);
-        }
     };
     EventStartGuard.prototype.checkForTasks = function (payload, caseId, eventId, taskId) {
         // Clear taskToComplete from session as we will be starting the process for new task
@@ -29685,12 +29678,21 @@ var ReadFieldsFilterPipe = /** @class */ (function () {
         }
         return ReadFieldsFilterPipe_1.isEmpty(field.value) ? value : field.value;
     };
-    ReadFieldsFilterPipe.evaluateConditionalShow = function (field, formValue, path) {
+    ReadFieldsFilterPipe.evaluateConditionalShow = function (field, formValue, path, formGroupAvaliable, fieldId) {
         if (field.display_context === 'HIDDEN') {
             field.hidden = true;
         }
         else if (field.show_condition) {
-            var cond = directives_1.ShowCondition.getInstance(field.show_condition);
+            var cond = void 0;
+            if (fieldId && field.show_condition.indexOf(fieldId) > -1 && !formGroupAvaliable && !!Object.keys(formValue).length) {
+                var search = fieldId + '.';
+                var searchRegExp = new RegExp(search, 'g');
+                var replaceWith = '';
+                cond = directives_1.ShowCondition.getInstance(field.show_condition.replace(searchRegExp, replaceWith));
+            }
+            else {
+                cond = directives_1.ShowCondition.getInstance(field.show_condition);
+            }
             field.hidden = !cond.match(formValue, path);
         }
         else {
@@ -29717,8 +29719,10 @@ var ReadFieldsFilterPipe = /** @class */ (function () {
         var fields = complexField.field_type.complex_fields || [];
         var values = complexField.value || {};
         var checkConditionalShowAgainst = values;
+        var formGroupAvailable = false;
         if (formGroup) {
             checkConditionalShowAgainst = formGroup.value;
+            formGroupAvailable = true;
         }
         return fields
             .map(function (f) {
@@ -29734,7 +29738,7 @@ var ReadFieldsFilterPipe = /** @class */ (function () {
                 f.display_context = complexField.display_context;
             }
             if (setupHidden) {
-                ReadFieldsFilterPipe_1.evaluateConditionalShow(f, checkConditionalShowAgainst, path);
+                ReadFieldsFilterPipe_1.evaluateConditionalShow(f, checkConditionalShowAgainst, path, formGroupAvailable, complexField.id);
             }
             return f;
         })