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

Move CardHeader styled component(s) outside of render functions. Refactors host options calls out to it's own function.

Browse Source
This commit is contained in:
mabashian 2019-11-04 15:27:47 -05:00
parent 01963b0ee7
commit d5e9716ceb
5 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
awx/ui_next/src/screens/Host/Host.jsx
View File

@ -18,6 +18,13 @@ import HostGroups from './HostGroups';
import HostCompletedJobs from './HostCompletedJobs';
import { HostsAPI } from '@api';
const CardHeader = styled(PFCardHeader)`
--pf-c-card--first-child--PaddingTop: 0;
--pf-c-card--child--PaddingLeft: 0;
--pf-c-card--child--PaddingRight: 0;
position: relative;
`;
class Host extends Component {
constructor(props) {
super(props);
@ -81,13 +88,6 @@ class Host extends Component {
},
];
const CardHeader = styled(PFCardHeader)`
--pf-c-card--first-child--PaddingTop: 0;
--pf-c-card--child--PaddingLeft: 0;
--pf-c-card--child--PaddingRight: 0;
position: relative;
`;
let cardHeader = (
<CardHeader style={{ padding: 0 }}>
<RoutedTabs

15
awx/ui_next/src/screens/Host/HostList/HostList.jsx
View File

@ -42,6 +42,7 @@ class HostsList extends Component {
this.handleSelect = this.handleSelect.bind(this);
this.handleHostDelete = this.handleHostDelete.bind(this);
this.handleDeleteErrorClose = this.handleDeleteErrorClose.bind(this);
this.loadActions = this.loadActions.bind(this);
this.loadHosts = this.loadHosts.bind(this);
this.handleHostToggle = this.handleHostToggle.bind(this);
this.handleHostToggleErrorClose = this.handleHostToggleErrorClose.bind(
@ -117,11 +118,8 @@ class HostsList extends Component {
}
}
async loadHosts() {
const { location } = this.props;
async loadActions() {
const { actions: cachedActions } = this.state;
const params = parseQueryString(QS_CONFIG, location.search);
let optionsPromise;
if (cachedActions) {
optionsPromise = Promise.resolve({ data: { actions: cachedActions } });
@ -129,7 +127,14 @@ class HostsList extends Component {
optionsPromise = HostsAPI.readOptions();
}
const promises = Promise.all([HostsAPI.read(params), optionsPromise]);
return optionsPromise;
}
async loadHosts() {
const { location } = this.props;
const params = parseQueryString(QS_CONFIG, location.search);
const promises = Promise.all([HostsAPI.read(params), this.loadActions()]);
this.setState({ contentError: null, hasContentLoading: true });
try {

14
awx/ui_next/src/screens/Job/Job.jsx
View File

@ -17,6 +17,13 @@ import JobDetail from './JobDetail';
import JobOutput from './JobOutput';
import { JOB_TYPE_URL_SEGMENTS } from '../../constants';
const CardHeader = styled(PFCardHeader)`
--pf-c-card--first-child--PaddingTop: 0;
--pf-c-card--child--PaddingLeft: 0;
--pf-c-card--child--PaddingRight: 0;
position: relative;
`;
class Job extends Component {
constructor(props) {
super(props);
@ -73,13 +80,6 @@ class Job extends Component {
{ name: i18n._(t`Details`), link: `${match.url}/details`, id: 1 },
];
const CardHeader = styled(PFCardHeader)`
--pf-c-card--first-child--PaddingTop: 0;
--pf-c-card--child--PaddingLeft: 0;
--pf-c-card--child--PaddingRight: 0;
position: relative;
`;
let cardHeader = (
<CardHeader>
<RoutedTabs match={match} history={history} tabsArray={tabsArray} />

14
awx/ui_next/src/screens/Organization/Organization.jsx
View File

@ -18,6 +18,13 @@ import OrganizationEdit from './OrganizationEdit';
import OrganizationTeams from './OrganizationTeams';
import { OrganizationsAPI } from '@api';
const CardHeader = styled(PFCardHeader)`
--pf-c-card--first-child--PaddingTop: 0;
--pf-c-card--child--PaddingLeft: 0;
--pf-c-card--child--PaddingRight: 0;
position: relative;
`;
class Organization extends Component {
constructor(props) {
super(props);
@ -133,13 +140,6 @@ class Organization extends Component {
});
}
const CardHeader = styled(PFCardHeader)`
--pf-c-card--first-child--PaddingTop: 0;
--pf-c-card--child--PaddingLeft: 0;
--pf-c-card--child--PaddingRight: 0;
position: relative;
`;
let cardHeader = (
<CardHeader style={{ padding: 0 }}>
<RoutedTabs

14
awx/ui_next/src/screens/Project/Project.jsx
View File

@ -19,6 +19,13 @@ import ProjectJobTemplates from './ProjectJobTemplates';
import ProjectSchedules from './ProjectSchedules';
import { OrganizationsAPI, ProjectsAPI } from '@api';
const CardHeader = styled(PFCardHeader)`
--pf-c-card--first-child--PaddingTop: 0;
--pf-c-card--child--PaddingLeft: 0;
--pf-c-card--child--PaddingRight: 0;
position: relative;
`;
class Project extends Component {
constructor(props) {
super(props);
@ -153,13 +160,6 @@ class Project extends Component {
tab.id = n;
});
const CardHeader = styled(PFCardHeader)`
--pf-c-card--first-child--PaddingTop: 0;
--pf-c-card--child--PaddingLeft: 0;
--pf-c-card--child--PaddingRight: 0;
position: relative;
`;
let cardHeader = (
<CardHeader style={{ padding: 0 }}>
<RoutedTabs