Merge pull request #2135 from IDEMSInternational/refactor/popup-nav-d…

…ismiss refactor!: popup-nav-dismiss
IDEMSInternational · Nov 27, 2023 · 2123563 · 2123563
2 parents 3dc65f7 + c982229
commit 2123563
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/packages/data-models/flowTypes.ts b/packages/data-models/flowTypes.ts
@@ -380,7 +380,6 @@ export namespace FlowTypes {
     "audio_end",
     "audio_play",
     "changed",
-    "close_pop_up",
     "emit",
     "feedback",
     "go_to",

diff --git a/src/app/shared/components/template/services/template-nav.service.ts b/src/app/shared/components/template/services/template-nav.service.ts
@@ -76,7 +76,7 @@ export class TemplateNavService extends SyncServiceBase {
   /*****************************************************************************************************
    *  Nav Actions
    ****************************************************************************************************/
-  public handleNavAction(action: FlowTypes.TemplateRowAction) {
+  public async handleNavAction(action: FlowTypes.TemplateRowAction) {
     // TODO: Find more elegant way to get current root level template name
     const parentName = location.pathname.replace("/template/", "");
     const [templatename, key, value] = action.args;
@@ -85,9 +85,25 @@ export class TemplateNavService extends SyncServiceBase {
     // handle direct page or template navigation
     const navTarget = templatename.startsWith("/") ? [templatename] : ["template", templatename];
 
-    // If "dismiss_on_return" is set to true for the go_to action, dismiss the current popup before navigating away
-    if (key === "dismiss_on_return" && parseBoolean(value)) {
-      history.replaceState({}, "", location.pathname);
+    // If "dismiss_pop_up" is set to true for the go_to action, dismiss the current popup before navigating away
+    if (key === "dismiss_pop_up" && parseBoolean(value)) {
+      const { popup_child } = this.route.snapshot.queryParams;
+      if (popup_child) {
+        const popupDismissParams: INavQueryParams = {
+          popup_child: null,
+          popup_parent: null,
+          popup_parent_triggered_by: null,
+        };
+        // alter route history so that on back-nav popup will not be present
+        await this.router.navigate([], {
+          relativeTo: this.route,
+          queryParams: popupDismissParams,
+          queryParamsHandling: "merge",
+          replaceUrl: true,
+        });
+        // Dismiss open popup (without await to allow rest of nav to proceed await)
+        this.dismissPopup(popup_child);
+      }
     }
     return this.router.navigate(navTarget, {
       queryParams,