Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Prevent black background loaded with light full-app embedding (#67544)

Mahatthana (Kelvin) Nomsawadi7a36d9143a24
diff --git a/resources/frontend_client/index_template.html b/resources/frontend_client/index_template.html
index 98a9b3ebdc3..2c2c78696af 100644
--- a/resources/frontend_client/index_template.html
+++ b/resources/frontend_client/index_template.html
@@ -17,10 +17,6 @@
<meta name="base-href" content="{{{baseHref}}}" />
<meta name="uri" content="{{{uri}}}" />
- {{#hasColorSchemeMetaTag}}
- <meta name="color-scheme" content="light dark" />
- {{/hasColorSchemeMetaTag}}
-
{{{embedCode}}}
<title>{{{applicationName}}}</title>
diff --git a/src/metabase/server/routes/index.clj b/src/metabase/server/routes/index.clj
index 6c9a276993b..467c75f0fab 100644
--- a/src/metabase/server/routes/index.clj
+++ b/src/metabase/server/routes/index.clj
@@ -79,7 +79,7 @@
(throw (Exception. message e))))))
(defn- template-parameters
- [entrypoint-name embeddable? {:keys [uri params nonce]}]
+ [embeddable? {:keys [uri params nonce]}]
(let [{:keys [anon-tracking-enabled google-auth-client-id], :as public-settings} (setting/user-readable-values-map #{:public})
;; We disable `locale` parameter on static embeds/public links (metabase#50313)
should-load-locale-params? (not embeddable?)]
@@ -101,15 +101,12 @@
:baseHref (hiccup.util/escape-html (base-href))
:embedCode (when embeddable? (embed/head uri))
:enableGoogleAuth (boolean google-auth-client-id)
- :enableAnonTracking (boolean anon-tracking-enabled)
- ;; (metabase#65533) color-scheme meta tag breaks Modular embedding because it has a transparent background.
- ;; (metabase#66585) Also omit for static/public embedding to preserve legacy behavior for transparent iframes.
- :hasColorSchemeMetaTag (not (contains? #{"embed-sdk" "embed" "public"} entrypoint-name))}))
+ :enableAnonTracking (boolean anon-tracking-enabled)}))
(defn- load-entrypoint-template [entrypoint-name embeddable? opts]
(load-template
(str "frontend_client/" entrypoint-name ".html")
- (template-parameters entrypoint-name embeddable? opts)))
+ (template-parameters embeddable? opts)))
(defn- load-init-template []
(load-template
diff --git a/test/metabase/server/routes/index_test.clj b/test/metabase/server/routes/index_test.clj
index 542e645ebcb..6239b174a8c 100644
--- a/test/metabase/server/routes/index_test.clj
+++ b/test/metabase/server/routes/index_test.clj
@@ -76,12 +76,12 @@
(deftest load-entrypoint-template-contains-user-locale
(binding [i18n/*user-locale* "es"]
- (is (= "es" (:language (#'index/template-parameters "index" false {})))))
+ (is (= "es" (:language (#'index/template-parameters false {})))))
(binding [i18n/*user-locale* "en"]
- (is (= "en" (:language (#'index/template-parameters "index" false {})))))
+ (is (= "en" (:language (#'index/template-parameters false {})))))
(mt/with-temporary-setting-values [site-locale "es"]
;; site locale is used as the default
- (is (= "es" (:language (#'index/template-parameters "index" false {}))))
+ (is (= "es" (:language (#'index/template-parameters false {}))))
;; but we can override with the user locale
(binding [i18n/*user-locale* "fr"]
- (is (= "fr" (:language (#'index/template-parameters "index" false {})))))))
+ (is (= "fr" (:language (#'index/template-parameters false {})))))))