@hmcts/ccd-case-ui-toolkit 6.16.0-query-management-write-view-v11 → 6.16.0-query-management-raise-query-trigger-v2

package/bundles/hmcts-ccd-case-ui-toolkit.umd.js

@@ -3707,7 +3707,6 @@
         }
         return CaseViewTrigger;
     }());
-    CaseViewTrigger.DELETE = 'DELETE';
 
     var CaseEvent = /** @class */ (function () {
         function CaseEvent() {
@@ -33931,6 +33930,12 @@
                 }] });
     })();
 
+    var CaseViewEventIds;
+    (function (CaseViewEventIds) {
+        CaseViewEventIds["DELETE"] = "DELETE";
+        CaseViewEventIds["QueryManagementRaiseQuery"] = "queryManagementRaiseQuery";
+    })(CaseViewEventIds || (CaseViewEventIds = {}));
+
     var DeleteOrCancelDialogComponent = /** @class */ (function () {
         function DeleteOrCancelDialogComponent(matDialogRef) {
             this.matDialogRef = matDialogRef;
@@ -34461,45 +34466,60 @@
             this.triggerText = CaseFullAccessViewComponent.TRIGGER_TEXT_START;
         };
         CaseFullAccessViewComponent.prototype.applyTrigger = function (trigger) {
-            var _this = this;
-            this.error = null;
-            var theQueryParams = {};
-            if (this.ignoreWarning) {
-                theQueryParams['ignoreWarning'] = this.ignoreWarning;
-            }
-            // we may need to take care of different triggers in the future
-            if (trigger.id === CaseViewTrigger.DELETE) {
-                var dialogRef = this.dialog.open(DeleteOrCancelDialogComponent, this.dialogConfig);
-                dialogRef.afterClosed().subscribe(function (result) {
-                    if (result === 'Delete') {
-                        _this.draftService.deleteDraft(_this.caseDetails.case_id)
-                            .subscribe(function (_) {
-                            _this.navigationNotifierService.announceNavigation({ action: exports.NavigationOrigin.DRAFT_DELETED });
-                        }, function (_) {
-                            _this.navigationNotifierService.announceNavigation({ action: exports.NavigationOrigin.ERROR_DELETING_DRAFT });
-                        });
+            return __awaiter(this, void 0, void 0, function () {
+                var theQueryParams, dialogRef;
+                var _this = this;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            this.error = null;
+                            theQueryParams = {};
+                            if (this.ignoreWarning) {
+                                theQueryParams['ignoreWarning'] = this.ignoreWarning;
+                            }
+                            if (!(trigger.id === CaseViewEventIds.QueryManagementRaiseQuery)) return [3 /*break*/, 2];
+                            return [4 /*yield*/, this.router.navigate(["/cases/query/" + this.caseDetails.case_id])];
+                        case 1:
+                            _a.sent();
+                            return [3 /*break*/, 3];
+                        case 2:
+                            if (trigger.id === CaseViewEventIds.DELETE) {
+                                dialogRef = this.dialog.open(DeleteOrCancelDialogComponent, this.dialogConfig);
+                                dialogRef.afterClosed().subscribe(function (result) {
+                                    if (result === 'Delete') {
+                                        _this.draftService.deleteDraft(_this.caseDetails.case_id)
+                                            .subscribe(function (_) {
+                                            _this.navigationNotifierService.announceNavigation({ action: exports.NavigationOrigin.DRAFT_DELETED });
+                                        }, function (_) {
+                                            _this.navigationNotifierService.announceNavigation({ action: exports.NavigationOrigin.ERROR_DELETING_DRAFT });
+                                        });
+                                    }
+                                });
+                            }
+                            else if (this.isDraft() && trigger.id !== CaseViewEventIds.DELETE) {
+                                theQueryParams[DRAFT_QUERY_PARAM] = this.caseDetails.case_id;
+                                theQueryParams[CaseFullAccessViewComponent.ORIGIN_QUERY_PARAM] = 'viewDraft';
+                                this.navigationNotifierService.announceNavigation({
+                                    action: exports.NavigationOrigin.DRAFT_RESUMED,
+                                    jid: this.caseDetails.case_type.jurisdiction.id,
+                                    ctid: this.caseDetails.case_type.id,
+                                    etid: trigger.id,
+                                    queryParams: theQueryParams
+                                });
+                            }
+                            else {
+                                this.navigationNotifierService.announceNavigation({
+                                    action: exports.NavigationOrigin.EVENT_TRIGGERED,
+                                    queryParams: theQueryParams,
+                                    etid: trigger.id,
+                                    relativeTo: this.route
+                                });
+                            }
+                            _a.label = 3;
+                        case 3: return [2 /*return*/];
                     }
                 });
-            }
-            else if (this.isDraft() && trigger.id !== CaseViewTrigger.DELETE) {
-                theQueryParams[DRAFT_QUERY_PARAM] = this.caseDetails.case_id;
-                theQueryParams[CaseFullAccessViewComponent.ORIGIN_QUERY_PARAM] = 'viewDraft';
-                this.navigationNotifierService.announceNavigation({
-                    action: exports.NavigationOrigin.DRAFT_RESUMED,
-                    jid: this.caseDetails.case_type.jurisdiction.id,
-                    ctid: this.caseDetails.case_type.id,
-                    etid: trigger.id,
-                    queryParams: theQueryParams
-                });
-            }
-            else {
-                this.navigationNotifierService.announceNavigation({
-                    action: exports.NavigationOrigin.EVENT_TRIGGERED,
-                    queryParams: theQueryParams,
-                    etid: trigger.id,
-                    relativeTo: this.route
-                });
-            }
+            });
         };
         CaseFullAccessViewComponent.prototype.hasTabsPresent = function () {
             return this.sortedTabs.length > 0 || this.prependedTabs.length > 0 || this.appendedTabs.length > 0;
@@ -34651,7 +34671,7 @@
             // Clone and sort tabs array
             this.sortedTabs = this.orderService.sort(this.caseDetails.tabs);
             this.caseFields = this.getTabFields();
-            this.sortedTabs = this.sortTabFieldsAndFilterTabs(this.sortedTabs);
+            // this.sortedTabs = this.sortTabFieldsAndFilterTabs(this.sortedTabs);
             this.formGroup = this.buildFormGroup(this.caseFields);
             if (this.caseDetails.triggers && this.error) {
                 this.resetErrors();