From c23480030f74913b5bcab8bbe6f44f3ddaec64a7 Mon Sep 17 00:00:00 2001
From: Aileen Nowak <AileenCGN@gmail.com>
Date: Wed, 22 Mar 2023 14:00:00 +0000
Subject: [PATCH] Convert `getIframeUrl` to a getter and inject as source into
 iframe component

---
 .../app/components/gh-explore-iframe.hbs      |  2 +-
 .../admin/app/components/gh-explore-iframe.js |  5 ++-
 .../admin/app/components/gh-explore-modal.hbs |  2 +-
 ghost/admin/app/services/explore.js           | 34 +++++++++----------
 4 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/ghost/admin/app/components/gh-explore-iframe.hbs b/ghost/admin/app/components/gh-explore-iframe.hbs
index 0e25f80fce..25f3309c64 100644
--- a/ghost/admin/app/components/gh-explore-iframe.hbs
+++ b/ghost/admin/app/components/gh-explore-iframe.hbs
@@ -3,7 +3,7 @@
     class="explore-frame"
     frameborder="0"
     title="Explore"
-    {{did-update this.handleDarkModeChange this.feature.nightShift}}
     {{did-insert this.setup}}
+    {{did-update this.handleDarkModeChange this.feature.nightShift}}
     ...attributes
 ></iframe>
\ No newline at end of file
diff --git a/ghost/admin/app/components/gh-explore-iframe.js b/ghost/admin/app/components/gh-explore-iframe.js
index 9e7a9e2981..eec811159a 100644
--- a/ghost/admin/app/components/gh-explore-iframe.js
+++ b/ghost/admin/app/components/gh-explore-iframe.js
@@ -22,8 +22,7 @@ export default class GhExploreIframe extends Component {
         // Only begin setup when Explore window is toggled open
         // to avoid unnecessary loading of assets
         if (this.explore.exploreWindowOpen) {
-            console.log('Rebuild');
-            this.explore.getExploreIframe().src = this.explore.getIframeURL();
+            this.explore.getExploreIframe().src = this.explore.iframeURL;
         }
     }
 
@@ -34,7 +33,7 @@ export default class GhExploreIframe extends Component {
         }
 
         // only process messages coming from the explore iframe
-        if (event?.data && this.explore.getIframeURL().includes(event?.origin)) {
+        if (event?.data && this.explore.iframeURL.includes(event?.origin)) {
             if (event.data?.request === 'apiUrl') {
                 this._handleUrlRequest();
             }
diff --git a/ghost/admin/app/components/gh-explore-modal.hbs b/ghost/admin/app/components/gh-explore-modal.hbs
index e493665fb8..e05dcbcfde 100644
--- a/ghost/admin/app/components/gh-explore-modal.hbs
+++ b/ghost/admin/app/components/gh-explore-modal.hbs
@@ -1,5 +1,5 @@
 <div class="{{this.visibilityClass}}">
     <div class="gh-explore-container">
-        <GhExploreIframe></GhExploreIframe>
+        <GhExploreIframe src={{this.explore.iframeUrl}}></GhExploreIframe>
     </div>
 </div>
\ No newline at end of file
diff --git a/ghost/admin/app/services/explore.js b/ghost/admin/app/services/explore.js
index 76c154f3e4..e3fc8afa77 100644
--- a/ghost/admin/app/services/explore.js
+++ b/ghost/admin/app/services/explore.js
@@ -23,6 +23,21 @@ export default class ExploreService extends Service {
         return url.replace(/\/$/, '');
     }
 
+    get iframeURL() {
+        let url = this.exploreUrl;
+
+        if (window.location.hash && window.location.hash.includes(this.exploreRouteRoot)) {
+            let destinationRoute = window.location.hash.replace(this.exploreRouteRoot, '');
+
+            // Connect is an Ember route, do not use it as iframe src
+            if (destinationRoute && !destinationRoute.includes('connect')) {
+                url += destinationRoute.replace(/^\//, '');
+            }
+        }
+
+        return url;
+    }
+
     constructor() {
         super(...arguments);
 
@@ -53,21 +68,6 @@ export default class ExploreService extends Service {
         }
     }
 
-    getIframeURL() {
-        let url = this.exploreUrl;
-
-        if (window.location.hash && window.location.hash.includes(this.exploreRouteRoot)) {
-            let destinationRoute = window.location.hash.replace(this.exploreRouteRoot, '');
-
-            // Connect is an Ember route, do not use it as iframe src
-            if (destinationRoute && !destinationRoute.includes('connect')) {
-                url += destinationRoute.replace(/^\//, '');
-            }
-        }
-
-        return url;
-    }
-
     // Sends a route update to a child route in the BMA, because we can't control
     // navigating to it otherwise
     sendRouteUpdate(route) {
@@ -104,7 +104,7 @@ export default class ExploreService extends Service {
         // Begin loading the iframe and setting the src if it's not already set
         this.ensureIframeIsLoaded();
 
-        // Ensures correct "getIframeURL" calculation when syncing iframe location
+        // Ensures correct iframe URL calculation when syncing iframe location
         // in toggleExploreWindow
         window.location.hash = '/explore';
 
@@ -114,7 +114,7 @@ export default class ExploreService extends Service {
 
     ensureIframeIsLoaded() {
         if (this.getExploreIframe() && !this.getExploreIframe()?.src) {
-            this.getExploreIframe().src = this.getIframeURL();
+            this.getExploreIframe().src = this.iframeURL;
         }
     }