1. Merge query handler always returns cancel

2. Fixed return type

Author: bryans99

demo/demo_merge_edit_frame.ts

@@ -25,6 +25,7 @@
  */
 
 import type {
+  CancellableEventResponse,
   DashboardTileMergeEvent,
   ILookerConnection,
   ILookerEmbedSDK,
@@ -75,25 +76,31 @@ const initializeControls = () => {
  * The default behavior is for the edit merge query page to be opened in a top
  * level window.
  */
-const openMergeQuery = (event: DashboardTileMergeEvent): any => {
-  if (
-    event.dashboard_modified &&
-    !window.confirm(
+const openMergeQuery = (
+  event: DashboardTileMergeEvent
+): CancellableEventResponse => {
+  let doMergeEdit = false
+  if (!event.dashboard_modified) {
+    doMergeEdit = true
+  } else {
+    doMergeEdit = window.confirm(
       'The dashboard has unsaved changes which may be lost if the merge query is edited. Proceed?'
     )
-  ) {
-    return
   }
-  window.open(`/merge_edit?merge_url=${encodeURI(event.url)}`)
-  updateStatus('Merge query edit opened in a new window')
+  if (doMergeEdit) {
+    window.open(`/merge_edit?merge_url=${encodeURIComponent(event.url)}`)
+    updateStatus('Merge query edit opened in a new window')
+  } else {
+    updateStatus('Merge query edit cancelled')
+  }
   return { cancel: true }
 }
 
 /**
  * The merge edit url is stored in history state
  */
 const getEmbedMergeEditUrl = () => {
-  const embedUrl = decodeURI(history.state?.merge_url || '')
+  const embedUrl = decodeURIComponent(history.state?.merge_url || '')
   return embedUrl || '/embed/preload'
 }
 

demo/demo_single_frame.ts

@@ -27,6 +27,7 @@
 // IDs for content to demonstrate can be configured in the .env file or in demo_config.ts
 
 import type {
+  CancellableEventResponse,
   DashboardTileMergeEvent,
   ILookerConnection,
   ILookerEmbedSDK,
@@ -122,17 +123,23 @@ const updateStatus = (status: string) => {
  * The default behavior is for the edit merge query page to be opened in a top
  * level window.
  */
-const openMergeQuery = (event: DashboardTileMergeEvent): any => {
-  if (
-    event.dashboard_modified &&
-    !window.confirm(
+const openMergeQuery = (
+  event: DashboardTileMergeEvent
+): CancellableEventResponse => {
+  let doMergeEdit = false
+  if (!event.dashboard_modified) {
+    doMergeEdit = true
+  } else {
+    doMergeEdit = window.confirm(
       'The dashboard has unsaved changes which may be lost if the merge query is edited. Proceed?'
     )
-  ) {
-    return
   }
-  window.open(`/merge_edit?merge_url=${encodeURI(event.url)}`)
-  updateStatus('Merge query edit opened in a new window')
+  if (doMergeEdit) {
+    window.open(`/merge_edit?merge_url=${encodeURIComponent(event.url)}`)
+    updateStatus('Merge query edit opened in a new window')
+  } else {
+    updateStatus('Merge query edit cancelled')
+  }
   return { cancel: true }
 }