foreman_acd 0.9.5 → 0.10.0

data/webpack/components/ApplicationInstance/components/AppDefinitionSelector.js

@@ -1,9 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import ExtSelect from '../../common/ExtSelect';
-import RailsData from '../../common/RailsData'
+import RailsData from '../../common/RailsData';
 
-const AppDefinitionSelector= ({
+const AppDefinitionSelector = ({
   label,
   hidden,
   editable,
@@ -12,33 +12,32 @@ const AppDefinitionSelector= ({
   onChange,
   options,
   additionalData,
-}) =>{
-  return (
-    <div className="form-group">
-      <label className="col-md-2 control-label">{label}</label>
-      <div className="col-md-4">
-        <ExtSelect
-          hidden={hidden}
-          editable={editable}
-          viewText={viewText}
-          selectValue={selectValue}
-          onChange={onChange}
-          options={options}
-          additionalData={additionalData}
-        />
-        <RailsData
-          key='app_instance_id'
-          view='app_instance'
-          parameter='app_definition_id'
-          value={selectValue}
-        />
-      </div>
+}) => (
+  <div className="form-group">
+    <label className="col-md-2 control-label">{label}</label>
+    <div className="col-md-4">
+      <ExtSelect
+        hidden={hidden}
+        editable={editable}
+        viewText={viewText}
+        selectValue={selectValue}
+        onChange={onChange}
+        options={options}
+        additionalData={additionalData}
+      />
+      <RailsData
+        key="app_instance_id"
+        view="app_instance"
+        parameter="app_definition_id"
+        value={selectValue}
+      />
     </div>
-  );
-};
+  </div>
+);
 
 AppDefinitionSelector.propTypes = {
   label: PropTypes.string.isRequired,
+  hidden: PropTypes.bool,
   editable: PropTypes.bool.isRequired,
   viewText: PropTypes.string,
   selectValue: PropTypes.string,
@@ -47,4 +46,12 @@ AppDefinitionSelector.propTypes = {
   additionalData: PropTypes.object,
 };
 
+AppDefinitionSelector.defaultProps = {
+  hidden: false,
+  viewText: undefined,
+  selectValue: undefined,
+  options: undefined,
+  additionalData: undefined,
+};
+
 export default AppDefinitionSelector;

data/webpack/components/ApplicationInstance/components/Service.js

@@ -1,24 +1,13 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
 
-const Service= ({
-  name,
-  currentCount,
-  minCount,
-  maxCount,
-}) =>{
-  return (
-    <div>
-      <label>{name}:</label> {currentCount} ({__("Min/Max")}: {minCount}/{maxCount})
-    </div>
-  );
-};
-
-Service.defaultProps = {
-  minCount: 0,
-  maxCount: 0,
-  currentCount: 0,
-};
+const Service = ({ name, currentCount, minCount, maxCount }) => (
+  <div>
+    <label>{name}:</label> {currentCount} ({__('Min/Max')}: {minCount}/
+    {maxCount})
+  </div>
+);
 
 Service.propTypes = {
   name: PropTypes.string.isRequired,

data/webpack/components/ApplicationInstance/components/ServiceCounter.js

@@ -1,37 +1,44 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Service from './Service';
-import { arrayToObjectObj } from '../../../helper';
-import { cloneDeep } from 'lodash';
 
-const ServiceCounter= ({
-  title,
-  serviceList,
-}) =>{
-  if (serviceList == undefined || serviceList.length == 0) {
+const ServiceCounter = ({ title, serviceList }) => {
+  if (serviceList === undefined || serviceList.length === 0) {
     return null;
   }
-  const services = cloneDeep(arrayToObjectObj(serviceList, "id"));
+  const services = serviceList.map(service => (
+    <Service
+      key={service.id}
+      name={service.name}
+      currentCount={service.currentCount}
+      minCount={Number(service.minCount)}
+      maxCount={Number(service.maxCount)}
+    />
+  ));
 
   return (
     <div>
       <label className="service-counter-title">{title}</label>
-    {Object.keys(services).map(key => (
-      <Service
-        key={services[key].id}
-        name={services[key].name}
-        currentCount={services[key].currentCount}
-        minCount={Number(services[key].minCount)}
-        maxCount={Number(services[key].maxCount)}
-      />)
-    )}
+      {services}
     </div>
   );
 };
 
 ServiceCounter.propTypes = {
   title: PropTypes.string.isRequired,
-  serviceList: PropTypes.array,
+  serviceList: PropTypes.arrayOf(
+    PropTypes.shape({
+      id: PropTypes.number.isRequired,
+      name: PropTypes.string.isRequired,
+      currentCount: PropTypes.number.isRequired,
+      minCount: PropTypes.string.isRequired,
+      maxCount: PropTypes.string.isRequired,
+    })
+  ),
+};
+
+ServiceCounter.defaultProps = {
+  serviceList: undefined,
 };
 
 export default ServiceCounter;

data/webpack/components/ApplicationInstance/index.js

@@ -42,4 +42,3 @@ export default connect(
   mapStateToProps,
   mapDispatchToProps
 )(ApplicationInstance);
-

data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReport.js

@@ -1,48 +1,46 @@
-import React, { useState } from 'react'
+import React from 'react';
 import PropTypes from 'prop-types';
 
-import {
-  Icon,
-  Spinner,
-} from 'patternfly-react';
+import { Icon, Spinner } from 'patternfly-react';
 
-import {
-  VerticalTabs,
-} from 'patternfly-react-extensions';
+import { VerticalTabs } from 'patternfly-react-extensions';
 
-import {
-  translate as __
-} from 'foremanReact/common/I18n';
+import { translate as __ } from 'foremanReact/common/I18n';
 
 import PowerStatus from 'foremanReact/components/hosts/powerStatus';
 import ReportViewer from './components/ReportViewer';
 
 class ApplicationInstanceReport extends React.Component {
-
-  constructor(props) {
-    super(props);
-  }
-
   componentDidMount() {
     const {
-      data: { hosts, deploymentState, initialConfigureState, initialConfigureJobUrl },
+      data: {
+        hosts,
+        deploymentState,
+        initialConfigureState,
+        initialConfigureJobUrl,
+      },
       initApplicationInstanceReport,
-      setActiveHost,
     } = this.props;
 
-    initApplicationInstanceReport(hosts, deploymentState, initialConfigureState, initialConfigureJobUrl);
+    initApplicationInstanceReport(
+      hosts,
+      deploymentState,
+      initialConfigureState,
+      initialConfigureJobUrl
+    );
     this.reloadReportData();
-  };
+  }
 
   reloadReportData() {
     const {
       data: { appInstanceId, reportDataUrl },
-      deploymentState, initialConfigureState,
+      deploymentState,
+      initialConfigureState,
       loadReportData,
     } = this.props;
 
     // if both states are unknown, it means, that the component was just loaded. try again after a short timeout.
-    if (deploymentState == 'unknown' && initialConfigureState == 'unknown') {
+    if (deploymentState === 'unknown' && initialConfigureState === 'unknown') {
       setTimeout(() => {
         this.reloadReportData();
       }, 1000);
@@ -50,9 +48,14 @@ class ApplicationInstanceReport extends React.Component {
       return;
     }
 
-    if ((deploymentState != 'new' && deploymentState != 'finished' && deploymentState != 'failed') ||
-        (initialConfigureState == 'unconfigured' || initialConfigureState == 'scheduled' || initialConfigureState == 'pending')) {
-
+    if (
+      (deploymentState !== 'new' &&
+        deploymentState !== 'finished' &&
+        deploymentState !== 'failed') ||
+      initialConfigureState === 'unconfigured' ||
+      initialConfigureState === 'scheduled' ||
+      initialConfigureState === 'pending'
+    ) {
       loadReportData(reportDataUrl, appInstanceId);
 
       setTimeout(() => {
@@ -62,85 +65,104 @@ class ApplicationInstanceReport extends React.Component {
   }
 
   isActive(id) {
-    return (this.props.activeHostId === id);
+    return this.props.activeHostId === id;
   }
 
   collectLastReportData(hosts) {
-    const {
-      setActiveHost,
-    } = this.props;
+    const { setActiveHost } = this.props;
 
-    const tabs = []
-    for (const [index, value] of hosts.entries()) {
+    const tabs = [];
+    // for (const [index, value] of hosts.entries()) {
+    hosts.forEach((value, index) => {
       tabs.push(
         <VerticalTabs.Tab
           id={index}
-          key={"vt_tab_"+index}
-          title={ value.name }
-          wrapStyle='nowrap'
+          key={`vt_tab_${index}`}
+          title={value.name}
+          wrapStyle="nowrap"
           onActivate={() => setActiveHost(index)}
           active={this.isActive(index)}
         />
       );
-    }
+    });
 
     return tabs;
   }
 
+  // eslint-disable-next-line class-methods-use-this
   lastReportStatus(host) {
-    if (!host['id']) {
+    if (!host.id) {
       return (
         <div>
-          <span>Host: { host['name'] }</span>
+          <span>Host: {host.name}</span>
           <span>&nbsp;|&nbsp;</span>
-          <span>State: { __('not build') }</span>
+          <span>State: {__('not build')}</span>
           <span>&nbsp;|&nbsp;</span>
-          <span>Power Status: { __('unknown') }</span>
+          <span>Power Status: {__('unknown')}</span>
         </div>
-      )
-    } else {
-      const already_deployed_msg = __("Already existing host which was added to the application instance");
-      return (
-        <div>
-          <span>Host: <a href={ host['hostUrl'] }>{ host['name'] }</a></span>
-          <span>&nbsp;|&nbsp;</span>
-          <span>State: { host['build'] == true ? "in Build" : "Deployed" }</span>
-          <span>&nbsp;|&nbsp;</span>
-          <span>Power Status: <PowerStatus key={ "power_status_"+ host['id'] } id={ host['id'] } url={ host['powerStatusUrl'] } data={{ id: host['id'], url: host['powerStatusUrl'] }} /></span>
-          {host['isExistingHost'] ? (
-            <span>
-              &nbsp;|&nbsp; Existing host &nbsp;
-              <Icon style={{marginRight: 8, marginLeft: 2}} type="pf" name="info" title={already_deployed_msg} />
-            </span>
-          ) : (<span></span>)}
-        </div>
-      )
+      );
     }
+    const alreadyDeployedMsg = __(
+      'Already existing host which was added to the application instance'
+    );
+    return (
+      <div>
+        <span>
+          Host: <a href={host.hostUrl}>{host.name}</a>
+        </span>
+        <span>&nbsp;|&nbsp;</span>
+        <span>State: {host.build === true ? 'in Build' : 'Deployed'}</span>
+        <span>&nbsp;|&nbsp;</span>
+        <span>
+          Power Status:{' '}
+          <PowerStatus
+            key={`power_status_${host.id}`}
+            id={host.id}
+            url={host.powerStatusUrl}
+            data={{ id: host.id, url: host.powerStatusUrl }}
+          />
+        </span>
+        {host.isExistingHost ? (
+          <span>
+            &nbsp;|&nbsp; Existing host &nbsp;
+            <Icon
+              style={{ marginRight: 8, marginLeft: 2 }}
+              type="pf"
+              name="info"
+              title={alreadyDeployedMsg}
+            />
+          </span>
+        ) : (
+          <span />
+        )}
+      </div>
+    );
   }
 
   render() {
     const {
-      data: { appInstanceId, appInstanceName, deployTaskUrl, configureJobUrl, reportDataUrl },
-      activeHostId, hosts,
+      data: { deployTaskUrl, configureJobUrl },
+      activeHostId,
       deploymentState,
-      initialConfigureState, initialConfigureJobUrl, showInitialConfigureJob,
-      loadReportData,
+      hosts,
+      initialConfigureJobUrl,
+      initialConfigureState,
+      loading,
+      showInitialConfigureJob,
     } = this.props;
 
-    let tabs = [];
-    let reportStatus = undefined;
-    let report = undefined;
+    let report;
 
     // This handles the first call to render() in which the state hosts is always empty
-    if (hosts.length == 0) {
-      return (<span>No host</span>);
+    if (hosts.length === 0) {
+      return <span>No host</span>;
     }
 
-    tabs = this.collectLastReportData(hosts);
-    reportStatus = this.lastReportStatus(hosts[activeHostId]);
+    const tabs = this.collectLastReportData(hosts);
+    const reportStatus = this.lastReportStatus(hosts[activeHostId]);
 
-    if (hosts[activeHostId]['progress_report']) {
-      report = hosts[activeHostId]['progress_report'];
+    if (hosts[activeHostId].progress_report) {
+      report = hosts[activeHostId].progress_report;
     }
 
     return (
@@ -149,75 +171,110 @@ class ApplicationInstanceReport extends React.Component {
           <div>
             <div className="deploy_status_head">Host deployment state</div>
             <div className="deploy_status_content">
-              { (deploymentState != 'new' && deploymentState != 'finished' && deploymentState != 'failed') ? (<span><Spinner loading size='sm' /> &nbsp;</span>) : (<span></span>) }
-              { deploymentState }
+              {loading ||
+              (deploymentState !== 'new' &&
+                deploymentState !== 'finished' &&
+                deploymentState !== 'failed') ? (
+                <span>
+                  <Spinner loading size="sm" /> &nbsp;
+                </span>
+              ) : (
+                <span />
+              )}
+              {deploymentState}
             </div>
           </div>
           <div>
             <div className="deploy_status_head">Deployment task</div>
-            <div className="deploy_status_content"><a href={ deployTaskUrl } >Last deployment task</a></div>
-          </div>
-          { (showInitialConfigureJob == true) ? (
-          <div>
-            <div className="deploy_status_head">Configuration job</div>
             <div className="deploy_status_content">
-              { (initialConfigureState == 'scheduled' || initialConfigureState == 'pending') ? (<span><Spinner loading size='sm' /> &nbsp;</span>) : (<span></span>) }
-              { (initialConfigureState != 'unconfigured' && initialConfigureState != 'scheduled') ? (<a href={ initialConfigureJobUrl }>Configuration job</a>) : (<span></span>) }
-              { (initialConfigureState != 'unconfigured') ? (<span>&nbsp; State: { initialConfigureState }</span>) : (<span></span>) }
+              <a href={deployTaskUrl}>Last deployment task</a>
             </div>
           </div>
+          {showInitialConfigureJob === true ? (
+            <div>
+              <div className="deploy_status_head">Configuration job</div>
+              <div className="deploy_status_content">
+                {initialConfigureState === 'scheduled' ||
+                initialConfigureState === 'pending' ? (
+                  <span>
+                    <Spinner loading size="sm" /> &nbsp;
+                  </span>
+                ) : (
+                  <span />
+                )}
+                {initialConfigureState !== 'unconfigured' &&
+                initialConfigureState !== 'scheduled' ? (
+                  <a href={initialConfigureJobUrl}>Configuration job</a>
+                ) : (
+                  <span />
+                )}
+                {initialConfigureState !== 'unconfigured' ? (
+                  <span>&nbsp; State: {initialConfigureState}</span>
+                ) : (
+                  <span />
+                )}
+              </div>
+            </div>
           ) : (
-          <div>
-            <div className="deploy_status_head">Configuration job</div>
-            <div className="deploy_status_content"><a href={ configureJobUrl }>Configuration jobs</a></div>
-          </div>
-          ) }
+            <div>
+              <div className="deploy_status_head">Configuration job</div>
+              <div className="deploy_status_content">
+                <a href={configureJobUrl}>Configuration jobs</a>
+              </div>
+            </div>
+          )}
         </div>
         <div className="deploy_report_hosts">
           Hosts
-          <VerticalTabs id="vertical_tabs">
-            {tabs}
-          </VerticalTabs>
-        </div>
-        <div className="deploy_report_status">
-          {reportStatus}
+          <VerticalTabs id="vertical_tabs">{tabs}</VerticalTabs>
         </div>
+        <div className="deploy_report_status">{reportStatus}</div>
         <div className="deploy_report_tasks">
           <ReportViewer report={report} />
         </div>
       </span>
-    )};
+    );
+  }
 }
 
 ApplicationInstanceReport.defaultProps = {
-  error: {},
-  appInstanceName: '',
-  deployTaskUrl: '',
-  configureJobUrl: '',
-  hosts: [],
-  report: [],
+  data: {
+    initialConfigureJobUrl: undefined,
+  },
   activeHostId: 0,
+  configureJobUrl: '',
   deploymentState: 'unknown',
-  initialConfigureState: 'unknown',
+  deployTaskUrl: '',
+  hosts: [],
   initialConfigureJobUrl: '',
+  initialConfigureState: 'unknown',
+  loading: false,
   showInitialConfigureJob: false,
-}
+};
 
 ApplicationInstanceReport.propTypes = {
-  initApplicationInstanceReport: PropTypes.func,
-  appInstanceName: PropTypes.string,
-  deployTaskUrl: PropTypes.string,
+  data: PropTypes.shape({
+    hosts: PropTypes.array.isRequired,
+    deploymentState: PropTypes.string.isRequired,
+    appInstanceId: PropTypes.number.isRequired,
+    reportDataUrl: PropTypes.string.isRequired,
+    deployTaskUrl: PropTypes.string.isRequired,
+    configureJobUrl: PropTypes.string.isRequired,
+    initialConfigureState: PropTypes.string.isRequired,
+    initialConfigureJobUrl: PropTypes.string,
+  }),
+  activeHostId: PropTypes.number,
   configureJobUrl: PropTypes.string,
   deploymentState: PropTypes.string,
-  initialConfigureState: PropTypes.string,
+  deployTaskUrl: PropTypes.string,
+  hosts: PropTypes.array,
   initialConfigureJobUrl: PropTypes.string,
+  initialConfigureState: PropTypes.string,
+  loading: PropTypes.bool,
   showInitialConfigureJob: PropTypes.bool,
-  hosts: PropTypes.array,
-  deploymentState: PropTypes.string,
-  report: PropTypes.array,
-  setActiveHost: PropTypes.func,
-  loadReportData: PropTypes.func,
-  activeHostId: PropTypes.number,
+  initApplicationInstanceReport: PropTypes.func.isRequired,
+  loadReportData: PropTypes.func.isRequired,
+  setActiveHost: PropTypes.func.isRequired,
 };
 
 export default ApplicationInstanceReport;

data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReportActions.js

@@ -1,15 +1,5 @@
-import React from 'react';
 import api from 'foremanReact/API';
 
-import {
-  actionHeaderCellFormatter,
-} from 'patternfly-react';
-
-import {
-  propsToSnakeCase,
-  propsToCamelCase,
-} from 'foremanReact/common/helpers';
-
 import {
   APPLICATION_INSTANCE_REPORT_INIT,
   APPLICATION_INSTANCE_REPORT_SET_ACTIVE_HOST,
@@ -19,7 +9,10 @@ import {
 } from './ApplicationInstanceReportConstants';
 
 export const initApplicationInstanceReport = (
-  hosts, deploymentState, initialConfigureState, initialConfigureJobUrl,
+  hosts,
+  deploymentState,
+  initialConfigureState,
+  initialConfigureJobUrl
 ) => dispatch => {
   const initialState = {};
 
@@ -30,7 +23,7 @@ export const initApplicationInstanceReport = (
 
   // Decide if it should show only the initial Configure job state + URL or
   // the URL to all configuration jobs
-  if (initialConfigureState == 'unconfigured') {
+  if (initialConfigureState === 'unconfigured') {
     initialState.showInitialConfigureJob = true;
   } else {
     initialState.showInitialConfigureJob = false;
@@ -44,22 +37,24 @@ export const initApplicationInstanceReport = (
 
 export const loadReportData = (
   reportDataUrl,
-  appInstanceId,
-) => dispatch => {
+  appInstanceId
+) => async dispatch => {
   dispatch({ type: APPLICATION_INSTANCE_REPORT_LOAD_REPORT_REQUEST });
 
   const baseUrl = reportDataUrl;
-  const realUrl = baseUrl.replace("__id__", appInstanceId);
+  const realUrl = baseUrl.replace('__id__', appInstanceId);
 
-  return api
-    .get(realUrl, {}, {})
-    .then(({ data }) =>
-      dispatch({
-        type: APPLICATION_INSTANCE_REPORT_LOAD_REPORT_SUCCESS,
-        payload: { ...data }
-      })
-    )
-    .catch(error => dispatch(errorHandler(APPLICATION_INSTANCE_REPORT_LOAD_REPORT_FAILURE, error)));
+  try {
+    const { data } = await api.get(realUrl, {}, {});
+    dispatch({
+      type: APPLICATION_INSTANCE_REPORT_LOAD_REPORT_SUCCESS,
+      payload: { ...data },
+    });
+  } catch (error) {
+    dispatch(
+      errorHandler(APPLICATION_INSTANCE_REPORT_LOAD_REPORT_FAILURE, error)
+    );
+  }
 };
 
 const errorHandler = (msg, err) => {
@@ -70,7 +65,7 @@ const errorHandler = (msg, err) => {
   return { type: msg, payload: { error } };
 };
 
-export const setActiveHost = (id) => ({
+export const setActiveHost = id => ({
   type: APPLICATION_INSTANCE_REPORT_SET_ACTIVE_HOST,
   payload: { activeHostId: id },
 });

data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReportConstants.js

@@ -1,5 +1,10 @@
-export const APPLICATION_INSTANCE_REPORT_INIT = 'APPLICATION_INSTANCE_REPORT_INIT';
-export const APPLICATION_INSTANCE_REPORT_SET_ACTIVE_HOST = 'APPLICATION_INSTANCE_REPORT_SET_ACTIVE_HOST';
-export const APPLICATION_INSTANCE_REPORT_LOAD_REPORT_REQUEST = 'APPLICATION_INSTANCE_REPORT_LOAD_REPORT_REQUEST';
-export const APPLICATION_INSTANCE_REPORT_LOAD_REPORT_SUCCESS = 'APPLICATION_INSTANCE_REPORT_LOAD_REPORT_SUCCESS';
-export const APPLICATION_INSTANCE_REPORT_LOAD_REPORT_FAILURE = 'APPLICATION_INSTANCE_REPORT_LOAD_REPORT_FAILURE';
+export const APPLICATION_INSTANCE_REPORT_INIT =
+  'APPLICATION_INSTANCE_REPORT_INIT';
+export const APPLICATION_INSTANCE_REPORT_SET_ACTIVE_HOST =
+  'APPLICATION_INSTANCE_REPORT_SET_ACTIVE_HOST';
+export const APPLICATION_INSTANCE_REPORT_LOAD_REPORT_REQUEST =
+  'APPLICATION_INSTANCE_REPORT_LOAD_REPORT_REQUEST';
+export const APPLICATION_INSTANCE_REPORT_LOAD_REPORT_SUCCESS =
+  'APPLICATION_INSTANCE_REPORT_LOAD_REPORT_SUCCESS';
+export const APPLICATION_INSTANCE_REPORT_LOAD_REPORT_FAILURE =
+  'APPLICATION_INSTANCE_REPORT_LOAD_REPORT_FAILURE';