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

Fix merge conflicts and linting errors

Browse Source
This commit is contained in:
Marliana Lara
2019-01-25 16:49:46 -05:00
parent 21298c8872
commit 9048c34a7d
4 changed files with 61 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
__tests__/components/Breadcrumbs.test.jsx
View File

@@ -53,7 +53,7 @@ describe('<Breadcrumb />', () => {
]; ];
routes.forEach(([location, crumbLength]) => { routes.forEach(([location, crumbLength]) => {
const breadcrumbWrapper = mount( breadcrumbWrapper = mount(
<MemoryRouter initialEntries={[location]}> <MemoryRouter initialEntries={[location]}>
<Breadcrumbs <Breadcrumbs
breadcrumbConfig={config} breadcrumbConfig={config}
@@ -63,8 +63,6 @@ describe('<Breadcrumb />', () => {
expect(breadcrumbWrapper.find('BreadcrumbItem')).toHaveLength(crumbLength); expect(breadcrumbWrapper.find('BreadcrumbItem')).toHaveLength(crumbLength);
breadcrumbWrapper.unmount(); breadcrumbWrapper.unmount();
})
}); });
});
}); });

88
src/pages/Organizations/components/OrganizationBreadcrumb.jsx
View File

@@ -1,88 +0,0 @@
import React, { Fragment } from 'react';
import { Trans } from '@lingui/macro';
import {
PageSection,
PageSectionVariants,
Breadcrumb,
BreadcrumbItem,
BreadcrumbHeading
} from '@patternfly/react-core';
import {
Link
} from 'react-router-dom';
import getTabName from '../utils';
const OrganizationBreadcrumb = ({ parentObj, organization, currentTab, location }) => {
const { light } = PageSectionVariants;
let breadcrumb = '';
if (parentObj !== 'loading') {
const generateCrumb = (noLastLink = false) => (
<Fragment>
{parentObj
.map(({ url, name }, index) => {
let elem;
if (noLastLink && parentObj.length - 1 === index) {
elem = (<BreadcrumbHeading className="heading" key={name}>{name}</BreadcrumbHeading>);
} else {
elem = (
<BreadcrumbItem key={name}>
<Link
key={name}
to={{ pathname: url, state: { breadcrumb: parentObj, organization } }}
>
{name}
</Link>
</BreadcrumbItem>
);
}
return elem;
})
.reduce((prev, curr) => [prev, curr])}
</Fragment>
);
if (currentTab && currentTab !== 'details') {
breadcrumb = (
<Fragment>
{generateCrumb()}
<BreadcrumbHeading className="heading">
{getTabName(currentTab)}
</BreadcrumbHeading>
</Fragment>
);
} else if (location.pathname.indexOf('edit') > -1) {
breadcrumb = (
<Fragment>
{generateCrumb()}
<BreadcrumbHeading className="heading">
<Trans>Edit</Trans>
</BreadcrumbHeading>
</Fragment>
);
} else if (location.pathname.indexOf('add') > -1) {
breadcrumb = (
<Fragment>
{generateCrumb()}
<BreadcrumbHeading className="heading">
<Trans>Add</Trans>
</BreadcrumbHeading>
</Fragment>
);
} else {
breadcrumb = (
<Fragment>
{generateCrumb(true)}
</Fragment>
);
}
}
return (
<PageSection variant={light} className="pf-m-condensed">
<Breadcrumb>{breadcrumb}</Breadcrumb>
</PageSection>
);
};
export default OrganizationBreadcrumb;

14
src/pages/Organizations/screens/OrganizationAdd.jsx
View File

@@ -1,11 +1,8 @@
import React, { Fragment } from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { withRouter } from 'react-router-dom'; import { withRouter } from 'react-router-dom';
import { Trans } from '@lingui/macro';
import { import {
PageSection, PageSection,
PageSectionVariants,
Title,
Form, Form,
FormGroup, FormGroup,
TextInput, TextInput,
@@ -22,8 +19,6 @@ import { ConfigContext } from '../../../context';
import Lookup from '../../../components/Lookup'; import Lookup from '../../../components/Lookup';
import AnsibleSelect from '../../../components/AnsibleSelect'; import AnsibleSelect from '../../../components/AnsibleSelect';
const { light } = PageSectionVariants;
const format = (data) => { const format = (data) => {
const results = data.results.map((result) => ({ const results = data.results.map((result) => ({
id: result.id, id: result.id,
@@ -132,12 +127,6 @@ class OrganizationAdd extends React.Component {
const enabled = name.length > 0; // TODO: add better form validation const enabled = name.length > 0; // TODO: add better form validation
return ( return (
<Fragment>
<PageSection variant={light} className="pf-m-condensed">
<Title size="2xl">
<Trans>Organization Add</Trans>
</Title>
</PageSection>
<PageSection> <PageSection>
<Card> <Card>
<CardBody> <CardBody>
@@ -197,7 +186,6 @@ class OrganizationAdd extends React.Component {
</CardBody> </CardBody>
</Card> </Card>
</PageSection> </PageSection>
</Fragment>
); );
} }
} }