CONSOLE-4404: set the global customLogo url even for customLogoFiles …

…argument, using the static images when to customLogos are configured
openshift · Feb 17, 2025 · d88af9e · d88af9e
1 parent 2c1a2a7
commit d88af9e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/frontend/public/components/masthead.jsx b/frontend/public/components/masthead.jsx
@@ -17,10 +17,10 @@ import { MastheadToolbar } from './masthead-toolbar';
 import { useCustomLogoURL, getBrandingDetails } from './utils/branding';
 
 export const Masthead = React.memo(({ isMastheadStacked, isNavOpen, onNavToggle }) => {
-  const { productName, logoImg } = getBrandingDetails();
+  const { productName, staticLogo } = getBrandingDetails();
   const navigate = useNavigate();
   const defaultRoute = '/';
-  const logoUrl = useCustomLogoURL() || logoImg;
+  const logoUrl = useCustomLogoURL();
   const logoProps = {
     href: defaultRoute,
     // use onClick to prevent browser reload
@@ -48,7 +48,7 @@ export const Masthead = React.memo(({ isMastheadStacked, isNavOpen, onNavToggle
             {window.SERVER_FLAGS.customLogoURL ? (
               <Brand src={logoUrl} alt={productName} />
             ) : (
-              <ReactSVG src={logoUrl} aria-hidden className="pf-v6-c-brand" />
+              <ReactSVG src={staticLogo} aria-hidden className="pf-v6-c-brand" />
             )}
           </MastheadLogo>
         </MastheadBrand>

diff --git a/frontend/public/components/utils/branding.ts b/frontend/public/components/utils/branding.ts
@@ -71,7 +71,7 @@ export const useCustomLogoURL = (type: CUSTOM_LOGO = MASTHEAD_TYPE): string => {
           return THEME_LIGHT;
         },
       );
-      const fetchURL = `${window.SERVER_FLAGS.basePath}custom-logo?type=${type}&theme=${reqTheme}-theme`;
+      const fetchURL = `${window.SERVER_FLAGS.customLogoURL}?type=${type}&theme=${reqTheme}-theme`;
       const response = await fetch(fetchURL);
       if (!response.ok) {
         throw new Error(`Failed to fetch ${fetchURL}: ${response.statusText}`);

diff --git a/pkg/server/server.go b/pkg/server/server.go
@@ -766,7 +766,7 @@ func (s *Server) indexHandler(w http.ResponseWriter, r *http.Request) {
 
 	s.CSRFVerifier.SetCSRFCookie(s.BaseURL.Path, w)
 
-	if s.CustomLogoFile != "" {
+	if s.CustomLogoFile != "" || s.CustomLogoFiles != "" {
 		jsg.CustomLogoURL = proxy.SingleJoiningSlash(s.BaseURL.Path, customLogoEndpoint)
 	}