Skip to content

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

Closes UXW-2237 click on admin logo error (#65581)

Sébastien5660df7a8550
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LogoIcon.jsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LogoIcon.jsx
index 2ff450083fe..b8a33827d38 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LogoIcon.jsx
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LogoIcon.jsx
@@ -46,10 +46,16 @@ class LogoIcon extends Component {
}
}
- loadImage(url) {
- if (this.xhr) {
- this.xhr.abort();
- this.xhr = null;
+ componentWillUnmount() {
+ if (this.abortController) {
+ this.abortController.abort();
+ this.abortController = null;
+ }
+ }
+
+ async loadImage(url) {
+ if (this.abortController) {
+ this.abortController.abort();
}
removeAllChildren(this._container);
@@ -69,14 +75,22 @@ class LogoIcon extends Component {
this.loadImageFallback(url);
}
} else {
- const xhr = (this.xhr = new XMLHttpRequest());
- xhr.open("GET", url);
- xhr.onload = () => {
- if (xhr.status < 200 || xhr.status >= 300) {
+ this.abortController = new AbortController();
+ try {
+ const response = await fetch(url, {
+ signal: this.abortController.signal,
+ });
+
+ if (!response.ok) {
+ this.loadImageFallback(url);
return;
}
- const svg =
- xhr.responseXML && xhr.responseXML.getElementsByTagName("svg")[0];
+
+ const text = await response.text();
+ const parser = new DOMParser();
+ const doc = parser.parseFromString(text, "image/svg+xml");
+ const svg = doc.getElementsByTagName("svg")[0];
+
if (svg) {
svg.setAttribute("fill", "currentcolor");
this.updateSize(svg);
@@ -86,11 +100,11 @@ class LogoIcon extends Component {
} else {
this.loadImageFallback(url);
}
- };
- xhr.onerror = () => {
- this.loadImageFallback(url);
- };
- xhr.send();
+ } catch (error) {
+ if (error.name !== "AbortError") {
+ this.loadImageFallback(url);
+ }
+ }
}
}
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LogoIcon.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LogoIcon.unit.spec.tsx
new file mode 100644
index 00000000000..3bde6938387
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LogoIcon.unit.spec.tsx
@@ -0,0 +1,115 @@
+import fetchMock from "fetch-mock";
+
+import { mockSettings } from "__support__/settings";
+import { renderWithProviders, screen, waitFor } from "__support__/ui";
+import { createMockSettings } from "metabase-types/api/mocks";
+import { createMockState } from "metabase-types/store/mocks";
+
+import LogoIcon from "./LogoIcon";
+
+const setup = (props = {}, settingsOverrides = {}) => {
+ const storeInitialState = createMockState({
+ settings: mockSettings(createMockSettings(settingsOverrides)),
+ });
+
+ return renderWithProviders(<LogoIcon {...props} />, { storeInitialState });
+};
+
+describe("LogoIcon", () => {
+ it("should render a data URI SVG inline", async () => {
+ const svgData = '<svg data-testid="my-svg"><circle r="10"/></svg>';
+ const dataUri = `data:image/svg+xml,${svgData}`;
+
+ setup({}, { "application-logo-url": dataUri });
+
+ // Wait for the component to process the data URI
+ await waitFor(() => {
+ expect(screen.getByTestId("my-svg")).toBeInTheDocument();
+ });
+
+ const svg = screen.getByTestId("my-svg");
+ expect(svg).toHaveAttribute("fill", "currentcolor");
+ });
+
+ it("should make fetch request and handle unmount correctly (metabase#65543)", async () => {
+ const svgContent = '<svg data-testid="fetch-svg"><circle r="5"/></svg>';
+ fetchMock.get("https://example.com/logo.svg", svgContent);
+
+ const { unmount } = setup(
+ {},
+ { "application-logo-url": "https://example.com/logo.svg" },
+ );
+
+ // Wait for fetch to be called
+ await waitFor(() => {
+ expect(fetchMock.callHistory.calls().length).toBeGreaterThan(0);
+ });
+
+ // Verify content is rendered (img fallback is acceptable in test env)
+ await waitFor(() => {
+ const container = screen.getByTestId("main-logo");
+ expect(container.children.length).toBeGreaterThan(0);
+ });
+
+ unmount();
+
+ // Verify fetch was called with correct URL
+ const calls = fetchMock.callHistory.calls();
+ expect(calls[0].url).toBe("https://example.com/logo.svg");
+ });
+
+ it("should use default logo URL when no setting is provided", async () => {
+ const svgContent = '<svg data-testid="default-svg"><circle r="5"/></svg>';
+ fetchMock.get("http://localhost//app/assets/img/logo.svg", svgContent);
+
+ setup();
+
+ // Wait for fetch to be called
+ await waitFor(() => {
+ expect(fetchMock.callHistory.calls().length).toBeGreaterThan(0);
+ });
+
+ // Verify content is rendered
+ await waitFor(() => {
+ const container = screen.getByTestId("main-logo");
+ expect(container.children.length).toBeGreaterThan(0);
+ });
+
+ // Verify fetch was called with default URL (may be absolute in test env)
+ const calls = fetchMock.callHistory.calls();
+ expect(calls[0].url).toContain("app/assets/img/logo.svg");
+ });
+
+ it("should make fetch request for external SVG", async () => {
+ const svgContent = '<svg data-testid="fetch-svg"><circle r="5"/></svg>';
+ fetchMock.get("https://example.com/logo.svg", svgContent);
+
+ setup({}, { "application-logo-url": "https://example.com/logo.svg" });
+
+ // Wait for fetch to be called
+ await waitFor(() => {
+ expect(fetchMock.callHistory.calls().length).toBeGreaterThan(0);
+ });
+
+ // Verify content is rendered
+ await waitFor(() => {
+ const container = screen.getByTestId("main-logo");
+ expect(container.children.length).toBeGreaterThan(0);
+ });
+
+ // Verify fetch was called with correct URL
+ const calls = fetchMock.callHistory.calls();
+ expect(calls[0].url).toBe("https://example.com/logo.svg");
+ });
+
+ it("should fall back to img element on fetch error", async () => {
+ fetchMock.get("https://example.com/logo.svg", 404);
+
+ setup({}, { "application-logo-url": "https://example.com/logo.svg" });
+
+ await waitFor(() => {
+ const container = screen.getByTestId("main-logo");
+ expect(container.querySelector("img")).toBeInTheDocument();
+ });
+ });
+});
diff --git a/frontend/src/metabase/admin/utils.js b/frontend/src/metabase/admin/utils.js
index ab6ccaa0d5e..af1d975ec8c 100644
--- a/frontend/src/metabase/admin/utils.js
+++ b/frontend/src/metabase/admin/utils.js
@@ -1,3 +1,4 @@
+import { useLayoutEffect } from "react";
import { push, replace, routerActions } from "react-router-redux";
import { connectedReduxRedirect } from "redux-auth-wrapper/history3/redirect";
@@ -29,11 +30,9 @@ const mapDispatchToProps = {
};
const _RedirectToAllowedSettings = ({ adminItems, replace }) => {
- if (adminItems.length === 0) {
- replace("/unauthorized");
- } else {
- replace(adminItems[0].path);
- }
+ useLayoutEffect(() => {
+ replace(adminItems.length === 0 ? "/unauthorized" : adminItems[0].path);
+ }, [adminItems, replace]);
return null;
};
diff --git a/frontend/src/metabase/lib/dom.js b/frontend/src/metabase/lib/dom.js
index 550db2fb4cd..12457b17a00 100644
--- a/frontend/src/metabase/lib/dom.js
+++ b/frontend/src/metabase/lib/dom.js
@@ -460,6 +460,10 @@ export function getUrlTarget(url) {
}
export function removeAllChildren(element) {
+ if (!element) {
+ return;
+ }
+
while (element.firstChild) {
element.removeChild(element.firstChild);
}