External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 10:00:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix login after source variables change

Browse Source
This commit is contained in:
mabashian 2020-11-30 10:38:41 -05:00
parent 8a8bfc5176
commit 7ff82db691
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
awx/ui_next/src/screens/Login/Login.jsx
View File

@ -7,11 +7,10 @@ import styled from 'styled-components';
import { LoginForm, LoginPage as PFLoginPage } from '@patternfly/react-core';
import useRequest, { useDismissableError } from '../../util/useRequest';
import { RootAPI } from '../../api';
import { BrandName } from '../../variables';
import AlertModal from '../../components/AlertModal';
import ErrorDetail from '../../components/ErrorDetail';
import brandLogo from './brand-logo.svg';
const loginLogoSrc = '/static/media/logo-login.svg';
const LoginPage = styled(PFLoginPage)`
& .pf-c-brand {
@ -24,21 +23,27 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
isLoading: isCustomLoginInfoLoading,
error: customLoginInfoError,
request: fetchCustomLoginInfo,
result: { logo, loginInfo },
result: { brandName, logo, loginInfo },
} = useRequest(
useCallback(async () => {
const {
data: { custom_logo, custom_login_info },
} = await RootAPI.read();
const [
{
data: { custom_logo, custom_login_info },
},
{
data: { BRAND_NAME },
},
] = await Promise.all([RootAPI.read(), RootAPI.readAssetVariables()]);
const logoSrc = custom_logo
? `data:image/jpeg;${custom_logo}`
: brandLogo;
: loginLogoSrc;
return {
brandName: BRAND_NAME,
logo: logoSrc,
loginInfo: custom_login_info,
};
}, []),
{ logo: brandLogo, loginInfo: null }
{ brandName: null, logo: loginLogoSrc, loginInfo: null }
);
const {
@ -70,8 +75,6 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
await authenticate(values);
};
const brandName = BrandName;
if (isCustomLoginInfoLoading) {
return null;
}
@ -91,7 +94,11 @@ function AWXLogin({ alt, i18n, isAuthenticated }) {
<LoginPage
brandImgSrc={logo}
brandImgAlt={alt || brandName}
loginTitle={i18n._(t`Welcome to Ansible ${brandName}! Please Sign In.`)}
loginTitle={
brandName
? i18n._(t`Welcome to Ansible ${brandName}! Please Sign In.`)
: ''
}
textContent={loginInfo}
>
<Formik

10
awx/ui_next/src/screens/Login/Login.test.jsx
View File

@ -10,6 +10,12 @@ import AWXLogin from './Login';
jest.mock('../../api');
RootAPI.readAssetVariables.mockResolvedValue({
data: {
BRAND_NAME: 'AWX',
},
});
describe('<Login />', () => {
async function findChildren(wrapper) {
const [
@ -100,7 +106,7 @@ describe('<Login />', () => {
});
const { loginHeaderLogo } = await findChildren(wrapper);
const { alt, src } = loginHeaderLogo.props();
expect([alt, src]).toEqual(['AWX', 'brand-logo.svg']);
expect([alt, src]).toEqual(['AWX', '/static/media/logo-login.svg']);
done();
});
@ -123,7 +129,7 @@ describe('<Login />', () => {
});
const { loginHeaderLogo } = await findChildren(wrapper);
const { alt, src } = loginHeaderLogo.props();
expect([alt, src]).toEqual(['AWX', 'brand-logo.svg']);
expect([alt, src]).toEqual([null, '/static/media/logo-login.svg']);
expect(wrapper.find('AlertModal').length).toBe(1);
done();
});