External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-23 16:47:45 -02:30
Code Issues Packages Projects Releases Wiki Activity

Lift config context one level higher.

Browse Source 
- Refactor About component to use config context.
- Update About component unit tests.
This commit is contained in:
kialam
2019-01-02 09:03:48 -07:00
parent 5fcdd16f54
commit f5119e5d97
3 changed files with 153 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
__tests__/components/About.test.jsx
View File

@@ -31,26 +31,4 @@ describe('<About />', () => {
expect(onAboutModalClose).toBeCalled(); expect(onAboutModalClose).toBeCalled();
aboutWrapper.unmount(); aboutWrapper.unmount();
}); });
test('sets error on api request failure', async () => {
api.get = jest.fn().mockImplementation(() => {
const err = new Error('404 error');
err.response = { status: 404, message: 'problem' };
return Promise.reject(err);
});
aboutWrapper = mount(
<I18nProvider>
<About isOpen />
</I18nProvider>
);
const aboutComponentInstance = aboutWrapper.find(About).instance();
await aboutComponentInstance.componentDidMount();
expect(aboutComponentInstance.state.error.response.status).toBe(404);
aboutWrapper.unmount();
});
test('API Config endpoint is valid', () => {
expect(API_CONFIG).toBeDefined();
});
}); });

227
src/App.jsx
View File

@@ -137,120 +137,121 @@ class App extends React.Component {
[BackgroundImageSrc.filter]: '/assets/images/background-filter.svg' [BackgroundImageSrc.filter]: '/assets/images/background-filter.svg'
}} }}
/> />
<Switch> <ConfigContext.Provider value={config}>
<ConditionalRedirect <Switch>
shouldRedirect={() => api.isAuthenticated()} <ConditionalRedirect
redirectPath="/" shouldRedirect={() => api.isAuthenticated()}
path="/login" redirectPath="/"
component={() => <Login logo={logo} loginInfo={loginInfo} />} path="/login"
/> component={() => <Login logo={logo} loginInfo={loginInfo} />}
<Fragment> />
<Page <Fragment>
header={( <Page
<PageHeader header={(
logo={<TowerLogo onClick={this.onLogoClick} />} <PageHeader
toolbar={PageToolbar} logo={<TowerLogo onClick={this.onLogoClick} />}
showNavToggle toolbar={PageToolbar}
onNavToggle={this.onNavToggle} showNavToggle
/> onNavToggle={this.onNavToggle}
)} />
sidebar={( )}
<PageSidebar sidebar={(
isNavOpen={isNavOpen} <PageSidebar
nav={( isNavOpen={isNavOpen}
<I18n> nav={(
{({ i18n }) => ( <I18n>
<Nav aria-label={i18n._(t`Primary Navigation`)}> {({ i18n }) => (
<NavList> <Nav aria-label={i18n._(t`Primary Navigation`)}>
<NavExpandableGroup <NavList>
groupId="views_group" <NavExpandableGroup
title={i18n._("Views")} groupId="views_group"
routes={[ title={i18n._("Views")}
{ path: '/home', title: i18n._('Dashboard') }, routes={[
{ path: '/jobs', title: i18n._('Jobs') }, { path: '/home', title: i18n._('Dashboard') },
{ path: '/schedules', title: i18n._('Schedules') }, { path: '/jobs', title: i18n._('Jobs') },
{ path: '/portal', title: i18n._('Portal Mode') }, { path: '/schedules', title: i18n._('Schedules') },
]} { path: '/portal', title: i18n._('Portal Mode') },
/> ]}
<NavExpandableGroup />
groupId="resources_group" <NavExpandableGroup
title={i18n._("Resources")} groupId="resources_group"
routes={[ title={i18n._("Resources")}
{ path: '/templates', title: i18n._('Templates') }, routes={[
{ path: '/credentials', title: i18n._('Credentials') }, { path: '/templates', title: i18n._('Templates') },
{ path: '/projects', title: i18n._('Projects') }, { path: '/credentials', title: i18n._('Credentials') },
{ path: '/inventories', title: i18n._('Inventories') }, { path: '/projects', title: i18n._('Projects') },
{ path: '/inventory_scripts', title: i18n._('Inventory Scripts') } { path: '/inventories', title: i18n._('Inventories') },
]} { path: '/inventory_scripts', title: i18n._('Inventory Scripts') }
/> ]}
<NavExpandableGroup />
groupId="access_group" <NavExpandableGroup
title={i18n._("Access")} groupId="access_group"
routes={[ title={i18n._("Access")}
{ path: '/organizations', title: i18n._('Organizations') }, routes={[
{ path: '/users', title: i18n._('Users') }, { path: '/organizations', title: i18n._('Organizations') },
{ path: '/teams', title: i18n._('Teams') } { path: '/users', title: i18n._('Users') },
]} { path: '/teams', title: i18n._('Teams') }
/> ]}
<NavExpandableGroup />
groupId="administration_group" <NavExpandableGroup
title={i18n._("Administration")} groupId="administration_group"
routes={[ title={i18n._("Administration")}
{ path: '/credential_types', title: i18n._('Credential Types') }, routes={[
{ path: '/notification_templates', title: i18n._('Notifications') }, { path: '/credential_types', title: i18n._('Credential Types') },
{ path: '/management_jobs', title: i18n._('Management Jobs') }, { path: '/notification_templates', title: i18n._('Notifications') },
{ path: '/instance_groups', title: i18n._('Instance Groups') }, { path: '/management_jobs', title: i18n._('Management Jobs') },
{ path: '/applications', title: i18n._('Integrations') } { path: '/instance_groups', title: i18n._('Instance Groups') },
]} { path: '/applications', title: i18n._('Integrations') }
/> ]}
<NavExpandableGroup />
groupId="settings_group" <NavExpandableGroup
title={i18n._("Settings")} groupId="settings_group"
routes={[ title={i18n._("Settings")}
{ path: '/auth_settings', title: i18n._('Authentication') }, routes={[
{ path: '/jobs_settings', title: i18n._('Jobs') }, { path: '/auth_settings', title: i18n._('Authentication') },
{ path: '/system_settings', title: i18n._('System') }, { path: '/jobs_settings', title: i18n._('Jobs') },
{ path: '/ui_settings', title: i18n._('User Interface') }, { path: '/system_settings', title: i18n._('System') },
{ path: '/license', title: i18n._('License') } { path: '/ui_settings', title: i18n._('User Interface') },
]} { path: '/license', title: i18n._('License') }
/> ]}
</NavList> />
</Nav> </NavList>
)} </Nav>
</I18n> )}
)} </I18n>
/> )}
)} />
useCondensed )}
> useCondensed
<ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" exact path="/" component={() => (<Redirect to="/home" />)} /> >
<ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/home" component={Dashboard} /> <ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" exact path="/" component={() => (<Redirect to="/home" />)} />
<ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/jobs" component={Jobs} /> <ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/home" component={Dashboard} />
<ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/schedules" component={Schedules} /> <ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/jobs" component={Jobs} />
<ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/portal" component={Portal} /> <ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/schedules" component={Schedules} />
<ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/templates" component={Templates} /> <ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/portal" component={Portal} />
<ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/credentials" component={Credentials} /> <ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/templates" component={Templates} />
<ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/projects" component={Projects} /> <ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/credentials" component={Credentials} />
<ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/inventories" component={Inventories} /> <ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/projects" component={Projects} />
<ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/inventory_scripts" component={InventoryScripts} /> <ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/inventories" component={Inventories} />
<ConfigContext.Provider value={config}> <ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/inventory_scripts" component={InventoryScripts} />
<ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/organizations" component={Organizations} /> <ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/organizations" component={Organizations} />
</ConfigContext.Provider> <ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/users" component={Users} />
<ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/users" component={Users} /> <ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/teams" component={Teams} />
<ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/teams" component={Teams} /> <ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/credential_types" component={CredentialTypes} />
<ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/credential_types" component={CredentialTypes} /> <ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/notification_templates" component={NotificationTemplates} />
<ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/notification_templates" component={NotificationTemplates} /> <ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/management_jobs" component={ManagementJobs} />
<ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/management_jobs" component={ManagementJobs} /> <ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/instance_groups" component={InstanceGroups} />
<ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/instance_groups" component={InstanceGroups} /> <ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/applications" component={Applications} />
<ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/applications" component={Applications} /> <ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/auth_settings" component={AuthSettings} />
<ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/auth_settings" component={AuthSettings} /> <ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/jobs_settings" component={JobsSettings} />
<ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/jobs_settings" component={JobsSettings} /> <ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/system_settings" component={SystemSettings} />
<ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/system_settings" component={SystemSettings} /> <ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/ui_settings" component={UISettings} />
<ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/ui_settings" component={UISettings} /> <ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/license" component={License} />
<ConditionalRedirect shouldRedirect={() => !api.isAuthenticated()} redirectPath="/login" path="/license" component={License} />
</Page> </Page>
</Fragment> </Fragment>
</Switch> </Switch>
</ConfigContext.Provider>
</Fragment> </Fragment>
</I18nProvider> </I18nProvider>
); );

94
src/components/About.jsx
View File

@@ -5,42 +5,21 @@ import {
AboutModal, AboutModal,
TextContent, TextContent,
TextList, TextList,
TextListItem } from '@patternfly/react-core'; TextListItem
} from '@patternfly/react-core';
import heroImg from '@patternfly/patternfly-next/assets/images/pfbg_992.jpg'; import heroImg from '@patternfly/patternfly-next/assets/images/pfbg_992.jpg';
import brandImg from '../../images/tower-logo-white.svg'; import brandImg from '../../images/tower-logo-white.svg';
import logoImg from '../../images/tower-logo-login.svg'; import logoImg from '../../images/tower-logo-login.svg';
import api from '../api'; import { ConfigContext } from '../context';
import { API_CONFIG } from '../endpoints'; import PropTypes from 'prop-types';
class About extends React.Component { class About extends React.Component {
unmounting = false;
constructor (props) { constructor(props) {
super(props); super(props);
this.state = {
config: {},
error: false
};
} }
async componentDidMount () {
try {
const { data } = await api.get(API_CONFIG);
this.safeSetState({ config: data });
} catch (error) {
this.safeSetState({ error });
}
}
componentWillUnmount () {
this.unmounting = true;
}
safeSetState = obj => !this.unmounting && this.setState(obj);
createSpeechBubble = (version) => { createSpeechBubble = (version) => {
let text = `Tower ${version}`; let text = `Tower ${version}`;
let top = ''; let top = '';
@@ -63,28 +42,27 @@ class About extends React.Component {
onAboutModalClose(); onAboutModalClose();
}; };
render () { render() {
const { isOpen } = this.props; const { isOpen } = this.props;
const { config = {}, error } = this.state;
const { ansible_version = 'loading', version = 'loading' } = config;
return ( return (
<I18n> <I18n>
{({ i18n }) => ( {({ i18n }) => (
<AboutModal <ConfigContext.Consumer>
isOpen={isOpen} {({ ansible_version, version }) =>
onClose={this.handleModalToggle} <AboutModal
productName="Ansible Tower" isOpen={isOpen}
trademark={i18n._(t`Copyright 2018 Red Hat, Inc.`)} onClose={this.handleModalToggle}
brandImageSrc={brandImg} productName="Ansible Tower"
brandImageAlt={i18n._(t`Brand Image`)} trademark={i18n._(t`Copyright 2018 Red Hat, Inc.`)}
logoImageSrc={logoImg} brandImageSrc={brandImg}
logoImageAlt={i18n._(t`AboutModal Logo`)} brandImageAlt={i18n._(t`Brand Image`)}
heroImageSrc={heroImg} logoImageSrc={logoImg}
> logoImageAlt={i18n._(t`AboutModal Logo`)}
<pre> heroImageSrc={heroImg}
{ this.createSpeechBubble(version) } >
{` <pre>
{this.createSpeechBubble(version)}
{`
\\ \\
\\ ^__^ \\ ^__^
(oo)\\_______ (oo)\\_______
@@ -92,22 +70,28 @@ class About extends React.Component {
||----w | ||----w |
|| || || ||
`} `}
</pre> </pre>
<TextContent> <TextContent>
<TextList component="dl"> <TextList component="dl">
<TextListItem component="dt"> <TextListItem component="dt">
<Trans>Ansible Version</Trans> <Trans>Ansible Version</Trans>
</TextListItem> </TextListItem>
<TextListItem component="dd">{ ansible_version }</TextListItem> <TextListItem component="dd">{ansible_version}</TextListItem>
</TextList> </TextList>
</TextContent> </TextContent>
{ error ? <div>error</div> : ''} </AboutModal>
</AboutModal> }
</ConfigContext.Consumer>
)} )}
</I18n> </I18n>
); );
} }
} }
About.contextTypes = {
ansible_version: PropTypes.string,
version: PropTypes.string,
};
export default About; export default About;