diff --git a/awx/ui_next/src/screens/Login/brand-logo.svg b/awx/ui_next/public/static/media/logo-login.svg similarity index 100% rename from awx/ui_next/src/screens/Login/brand-logo.svg rename to awx/ui_next/public/static/media/logo-login.svg diff --git a/awx/ui_next/src/screens/Login/Login.jsx b/awx/ui_next/src/screens/Login/Login.jsx index ff0254b848..b6d3fe991c 100644 --- a/awx/ui_next/src/screens/Login/Login.jsx +++ b/awx/ui_next/src/screens/Login/Login.jsx @@ -7,7 +7,7 @@ import { LoginForm, LoginPage as PFLoginPage } from '@patternfly/react-core'; import { RootAPI } from '../../api'; import { BrandName } from '../../variables'; -import brandLogo from './brand-logo.svg'; +const loginLogoSrc = '/static/media/logo-login.svg'; const LoginPage = styled(PFLoginPage)` & .pf-c-brand { @@ -46,11 +46,13 @@ class AWXLogin extends Component { const { data: { custom_logo, custom_login_info }, } = await RootAPI.read(); - const logo = custom_logo ? `data:image/jpeg;${custom_logo}` : brandLogo; + const logo = custom_logo + ? `data:image/jpeg;${custom_logo}` + : loginLogoSrc; this.setState({ logo, loginInfo: custom_login_info }); } catch (err) { - this.setState({ logo: brandLogo }); + this.setState({ logo: loginLogoSrc }); } finally { this.setState({ isLoading: false }); } diff --git a/awx/ui_next/src/screens/Login/Login.test.jsx b/awx/ui_next/src/screens/Login/Login.test.jsx index 1a3dd47ec5..9f2245741e 100644 --- a/awx/ui_next/src/screens/Login/Login.test.jsx +++ b/awx/ui_next/src/screens/Login/Login.test.jsx @@ -98,7 +98,8 @@ describe('', () => { ); const { loginHeaderLogo } = await findChildren(loginWrapper); const { alt, src } = loginHeaderLogo.props(); - expect([alt, src]).toEqual(['AWX', 'brand-logo.svg']); + expect(alt).toEqual('AWX'); + expect(src).toContain('logo-login.svg'); done(); }); @@ -109,7 +110,8 @@ describe('', () => { ); const { loginHeaderLogo } = await findChildren(loginWrapper); const { alt, src } = loginHeaderLogo.props(); - expect([alt, src]).toEqual(['AWX', 'brand-logo.svg']); + expect(alt).toEqual('AWX'); + expect(src).toContain('logo-login.svg'); done(); });