From ea7577b6fb8660e2ada59ac81ae4f2adaf7b729f Mon Sep 17 00:00:00 2001
From: Vitor Gomes <vitorlgomes@hotmail.com>
Date: Fri, 29 Jan 2021 17:56:51 -0300
Subject: [PATCH 1/7] Hide query string from the site editor top bar

---
 CHANGELOG.md                                  | 10 ++++++++-
 .../EditorContainer/StoreIframe.tsx           |  9 +++++++-
 .../Topbar/ContextSelectors/index.tsx         |  2 +-
 .../EditorContainer/Topbar/UrlInput.tsx       | 21 +++++++++++++++++--
 4 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c34b37f1b..a9d3270ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Changed
+
+- Hides query strings from site editor top bar.
+
 ## [4.37.0] - 2021-02-09
 - Adds support for multi binding for redirect CSV managment
 
@@ -39,11 +43,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Site editor flag in the iframe URL.
 
 ## [4.32.0] - 2021-01-21
+
 ### Added
-- Adds binding selector for CMS Pages 
+
+- Adds binding selector for CMS Pages
 
 ## [4.31.1] - 2021-01-20
+
 ### Fixed
+
 - Sending blockId in `Form index` component even when is not changed to prevent unexpected behaviors
 
 ## [4.31.0] - 2021-01-13
diff --git a/react/components/EditorContainer/StoreIframe.tsx b/react/components/EditorContainer/StoreIframe.tsx
index fed233f5c..2a2049cdd 100644
--- a/react/components/EditorContainer/StoreIframe.tsx
+++ b/react/components/EditorContainer/StoreIframe.tsx
@@ -32,11 +32,18 @@ const StoreIframe: React.FunctionComponent<Props> = ({ path }) => {
 
   let src = path ? `/${path}` : '/'
 
+  if (window?.location.search && !src.includes(window.location.search)) {
+    src = src + `${window.location.search}`
+  }
+
   if (binding && !src.includes('__bindingAddress')) {
+    console.log('PASSOU')
     src += `${getJoiner(src)}__bindingAddress=${binding.canonicalBaseAddress}`
   }
 
-  src += `${getJoiner(src)}__siteEditor`
+  if (!src.includes('__siteEditor')) {
+    src += `${getJoiner(src)}__siteEditor=true`
+  }
 
   return (
     <iframe
diff --git a/react/components/EditorContainer/Topbar/ContextSelectors/index.tsx b/react/components/EditorContainer/Topbar/ContextSelectors/index.tsx
index 8d9c51c94..79ac90e41 100644
--- a/react/components/EditorContainer/Topbar/ContextSelectors/index.tsx
+++ b/react/components/EditorContainer/Topbar/ContextSelectors/index.tsx
@@ -96,7 +96,7 @@ const ContextSelectors: React.FC<WithApolloClient<Props>> = ({
         if (newBinding && editor.iframeWindow) {
           setBinding(newBinding)
 
-          editor.iframeWindow.location.search = `__bindingAddress=${newBinding.canonicalBaseAddress}&__siteEditor`
+          editor.iframeWindow.location.search = `__bindingAddress=${newBinding.canonicalBaseAddress}&__siteEditor=true`
         }
       }
     },
diff --git a/react/components/EditorContainer/Topbar/UrlInput.tsx b/react/components/EditorContainer/Topbar/UrlInput.tsx
index 2b212161e..7977fa324 100644
--- a/react/components/EditorContainer/Topbar/UrlInput.tsx
+++ b/react/components/EditorContainer/Topbar/UrlInput.tsx
@@ -8,9 +8,26 @@ const UrlInput = () => {
 
   const editor = useEditorContext()
 
+  const resolveUrlPath = (pathname: string, searchQueries: string) => {
+    const searchParams = new URLSearchParams(searchQueries)
+    const blacklistedSearchQueries = ['__siteEditor', '__bindingAddress']
+
+    blacklistedSearchQueries.forEach(query => {
+      searchParams.delete(query)
+    })
+
+    if (searchParams.toString().length) {
+      return pathname + `?${searchParams.toString()}`
+    }
+
+    return pathname
+  }
+
   const urlPath = editor.iframeWindow
-    ? editor.iframeWindow.location.pathname +
-      editor.iframeWindow.location.search
+    ? resolveUrlPath(
+        editor.iframeWindow.location.pathname,
+        editor.iframeWindow.location.search
+      )
     : ''
 
   const [url, setUrl] = React.useState(urlPath)

From 51d5416a02b345c642e02a56b8be5067518ec302 Mon Sep 17 00:00:00 2001
From: Vitor Gomes <vitorlgomes@hotmail.com>
Date: Fri, 29 Jan 2021 17:58:03 -0300
Subject: [PATCH 2/7] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9d3270ef..02be51710 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 
-- Hides query strings from site editor top bar.
+- Hides query strings from the site editor top bar.
 
 ## [4.37.0] - 2021-02-09
 - Adds support for multi binding for redirect CSV managment

From 2b84f44912d44d4bfbad41dc7f2a0e69d62eb1b7 Mon Sep 17 00:00:00 2001
From: Vitor Gomes <vitorlgomes@hotmail.com>
Date: Thu, 11 Feb 2021 20:15:23 -0300
Subject: [PATCH 3/7] Rebase + hide only selected query strings

---
 react/components/EditorContainer/StoreIframe.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/react/components/EditorContainer/StoreIframe.tsx b/react/components/EditorContainer/StoreIframe.tsx
index 2a2049cdd..f2f060cb1 100644
--- a/react/components/EditorContainer/StoreIframe.tsx
+++ b/react/components/EditorContainer/StoreIframe.tsx
@@ -37,7 +37,6 @@ const StoreIframe: React.FunctionComponent<Props> = ({ path }) => {
   }
 
   if (binding && !src.includes('__bindingAddress')) {
-    console.log('PASSOU')
     src += `${getJoiner(src)}__bindingAddress=${binding.canonicalBaseAddress}`
   }
 

From 016baf9cced65a9f5925f8fe02cd6bff3633b8d6 Mon Sep 17 00:00:00 2001
From: Vitor Gomes <vitorlgomes@hotmail.com>
Date: Thu, 11 Feb 2021 20:22:44 -0300
Subject: [PATCH 4/7] Format code

---
 react/components/EditorContainer/Topbar/UrlInput.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/react/components/EditorContainer/Topbar/UrlInput.tsx b/react/components/EditorContainer/Topbar/UrlInput.tsx
index 7977fa324..42a974a04 100644
--- a/react/components/EditorContainer/Topbar/UrlInput.tsx
+++ b/react/components/EditorContainer/Topbar/UrlInput.tsx
@@ -10,9 +10,9 @@ const UrlInput = () => {
 
   const resolveUrlPath = (pathname: string, searchQueries: string) => {
     const searchParams = new URLSearchParams(searchQueries)
-    const blacklistedSearchQueries = ['__siteEditor', '__bindingAddress']
+    const SEARCH_QUERIES_BLACKLIST = ['__siteEditor', '__bindingAddress']
 
-    blacklistedSearchQueries.forEach(query => {
+    SEARCH_QUERIES_BLACKLIST.forEach(query => {
       searchParams.delete(query)
     })
 

From b966fe0409c4cd04ab757e3d0ab1d471c37c2b8d Mon Sep 17 00:00:00 2001
From: Vitor Gomes <vitorlgomes@hotmail.com>
Date: Fri, 12 Feb 2021 17:17:27 -0300
Subject: [PATCH 5/7] Change variable

---
 react/components/EditorContainer/Topbar/UrlInput.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/react/components/EditorContainer/Topbar/UrlInput.tsx b/react/components/EditorContainer/Topbar/UrlInput.tsx
index 42a974a04..f764f330f 100644
--- a/react/components/EditorContainer/Topbar/UrlInput.tsx
+++ b/react/components/EditorContainer/Topbar/UrlInput.tsx
@@ -10,9 +10,9 @@ const UrlInput = () => {
 
   const resolveUrlPath = (pathname: string, searchQueries: string) => {
     const searchParams = new URLSearchParams(searchQueries)
-    const SEARCH_QUERIES_BLACKLIST = ['__siteEditor', '__bindingAddress']
+    const SEARCH_QUERIES_TO_HIDE = ['__siteEditor', '__bindingAddress']
 
-    SEARCH_QUERIES_BLACKLIST.forEach(query => {
+    SEARCH_QUERIES_TO_HIDE.forEach(query => {
       searchParams.delete(query)
     })
 

From 9edd23eb725911e23a18519a7e2516f009c0233c Mon Sep 17 00:00:00 2001
From: Vitor Gomes <vitorlgomes@hotmail.com>
Date: Thu, 25 Feb 2021 20:04:01 -0300
Subject: [PATCH 6/7] Remove unused condition

---
 react/components/EditorContainer/StoreIframe.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/react/components/EditorContainer/StoreIframe.tsx b/react/components/EditorContainer/StoreIframe.tsx
index f2f060cb1..1b04a5231 100644
--- a/react/components/EditorContainer/StoreIframe.tsx
+++ b/react/components/EditorContainer/StoreIframe.tsx
@@ -32,9 +32,9 @@ const StoreIframe: React.FunctionComponent<Props> = ({ path }) => {
 
   let src = path ? `/${path}` : '/'
 
-  if (window?.location.search && !src.includes(window.location.search)) {
-    src = src + `${window.location.search}`
-  }
+  // if (window?.location.search && !src.includes(window.location.search)) {
+  //   src = src + `${window.location.search}`
+  // }
 
   if (binding && !src.includes('__bindingAddress')) {
     src += `${getJoiner(src)}__bindingAddress=${binding.canonicalBaseAddress}`

From 9a64f23a758796e42f0e820cbd5117eba7c790fc Mon Sep 17 00:00:00 2001
From: Vitor Gomes <vitorlgomes@hotmail.com>
Date: Thu, 25 Feb 2021 20:04:53 -0300
Subject: [PATCH 7/7] Remove comment

---
 react/components/EditorContainer/StoreIframe.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/react/components/EditorContainer/StoreIframe.tsx b/react/components/EditorContainer/StoreIframe.tsx
index 1b04a5231..0cbdf2b94 100644
--- a/react/components/EditorContainer/StoreIframe.tsx
+++ b/react/components/EditorContainer/StoreIframe.tsx
@@ -32,10 +32,6 @@ const StoreIframe: React.FunctionComponent<Props> = ({ path }) => {
 
   let src = path ? `/${path}` : '/'
 
-  // if (window?.location.search && !src.includes(window.location.search)) {
-  //   src = src + `${window.location.search}`
-  // }
-
   if (binding && !src.includes('__bindingAddress')) {
     src += `${getJoiner(src)}__bindingAddress=${binding.canonicalBaseAddress}`
   }