foreman_acd 0.5.0 → 0.6.0

data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReport.js

@@ -5,6 +5,10 @@ import {
   VerticalTabs,
 } from 'patternfly-react-extensions';
 
+import {
+  translate as __
+} from 'foremanReact/common/I18n';
+
 import PowerStatus from 'foremanReact/components/hosts/powerStatus';
 import ReportViewer from './components/ReportViewer';
 
@@ -18,54 +22,20 @@ class ApplicationInstanceReport extends React.Component {
     const {
       data: { hosts, mode },
       initApplicationInstanceReport,
-      setActiveAndLoadLiveReport,
+      setActiveHost,
     } = this.props;
 
     initApplicationInstanceReport(hosts);
-
-    if (mode == 'liveReport') {
-      if (hosts.length > 0) {
-        const index = 0;
-        const url = `/api/v2/orchestration/${hosts[index].progress_report_id}/tasks`;
-        setActiveAndLoadLiveReport(index, url);
-      }
-    }
   };
 
   isActive(id) {
     return (this.props.activeHostId === id);
   }
 
-  collectLiveData(hosts) {
-    const {
-      setActiveAndLoadLiveReport,
-    } = this.props;
-    const tabs = []
-
-    for (const [index, value] of hosts.entries()) {
-      const url = `/api/v2/orchestration/${hosts[index].progress_report_id}/tasks`
-
-      tabs.push(
-        <VerticalTabs.Tab
-          id={index}
-          key={"vt_tab_"+index}
-          title={ value.name }
-          wrapStyle='nowrap'
-          onActivate={() => setActiveAndLoadLiveReport(index, url)}
-          active={this.isActive(index)}
-        />
-      );
-    }
-
-    return tabs;
-  }
-
   collectLastReportData(hosts) {
     const {
-      setActiveAndLoadLastReport,
+      setActiveHost,
     } = this.props;
-    // FIXME
-    const url = undefined;
 
     const tabs = []
     for (const [index, value] of hosts.entries()) {
@@ -75,7 +45,7 @@ class ApplicationInstanceReport extends React.Component {
           key={"vt_tab_"+index}
           title={ value.name }
           wrapStyle='nowrap'
-          onActivate={() => setActiveAndLoadLastReport(index, url)}
+          onActivate={() => setActiveHost(index)}
           active={this.isActive(index)}
         />
       );
@@ -84,43 +54,61 @@ class ApplicationInstanceReport extends React.Component {
     return tabs;
   }
 
-  liveReportStatus(host) {
-    return (
-      <span>Host: <a href={ host['hostUrl'] }>{ host['hostname'] }</a></span>
-    );
-  }
-
   lastReportStatus(host) {
-    return (
-      <div>
-        <span>Host: <a href={ host['hostUrl'] }>{ host['hostname'] }</a></span>
-        <span>&nbsp;|&nbsp;</span>
-        <span>Power Status: <PowerStatus data={{ id: host['id'], url: host['powerStatusUrl'] }} /></span>
-      </div>
-    )
+    if (!host['id']) {
+      return (
+        <div>
+          <span>Host: { host['name'] }</span>
+          <span>&nbsp;|&nbsp;</span>
+          <span>State: { __('not build') }</span>
+          <span>&nbsp;|&nbsp;</span>
+          <span>Power Status: { __('unknown') }</span>
+        </div>
+      )
+    } else {
+      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'] } data={{ id: host['id'], url: host['powerStatusUrl'] }} /></span>
+        </div>
+      )
+    }
   }
 
   render() {
     const {
-      data: { hosts, mode },
-      report,
+      data: { hosts, mode, appInstanceName, deployTaskUrl, configureJobUrl },
       activeHostId,
     } = this.props;
 
     let tabs = [];
     let reportStatus = undefined;
+    let report = undefined;
 
-    if (mode == 'liveReport') {
-      tabs = this.collectLiveData(hosts);
-      reportStatus = this.liveReportStatus(hosts[activeHostId])
-    } else if (mode == 'lastReport') {
-      tabs = this.collectLastReportData(hosts);
-      reportStatus = this.lastReportStatus(hosts[activeHostId])
+    tabs = this.collectLastReportData(hosts);
+    reportStatus = this.lastReportStatus(hosts[activeHostId]);
+
+    if (hosts[activeHostId]['progress_report']) {
+      report = hosts[activeHostId]['progress_report'];
     }
 
     return (
       <span>
+        <div className="deploy_status">
+          <div>
+            <div className="deploy_status_head">Deployment task</div>
+            <div className="deploy_status_content"><a href={ deployTaskUrl } >Last deployment task</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>
@@ -137,6 +125,9 @@ class ApplicationInstanceReport extends React.Component {
 
 ApplicationInstanceReport.defaultProps = {
   error: {},
+  appInstanceName: '',
+  deployTaskUrl: '',
+  configureJobUrl: '',
   hosts: [],
   report: [],
   activeHostId: 0,
@@ -144,10 +135,12 @@ ApplicationInstanceReport.defaultProps = {
 
 ApplicationInstanceReport.propTypes = {
   initApplicationInstanceReport: PropTypes.func,
+  appInstanceName: PropTypes.string,
+  deployTaskUrl: PropTypes.string,
+  configureJobUrl: PropTypes.string,
   hosts: PropTypes.array,
   report: PropTypes.array,
-  setActiveAndLoadLiveReport: PropTypes.func,
-  setActiveAndLoadLastReport: PropTypes.func,
+  setActiveHost: PropTypes.func,
   activeHostId: PropTypes.number,
 
 };

data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReport.scss

@@ -1,5 +1,21 @@
 @import '~@theforeman/vendor/scss/variables';
 
+.deploy_status {
+  padding-bottom: 80px;
+}
+
+.deploy_status_head {
+  float:left;
+  width:25%;
+  height:10%;
+}
+
+.deploy_status_content {
+  float:left;
+  width:75%;
+  height:10%;
+}
+
 .deploy_report_hosts {
   float:left;
   width:25%;
@@ -11,6 +27,7 @@
   width:75%;
   min-height: 300px;
   background-color: #ecf9fe;
+  padding: 10px;
   border: 1px solid #3dbff3;
 }
 

data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReportActions.js

@@ -11,10 +11,8 @@ import {
 } from 'foremanReact/common/helpers';
 
 import {
-  APPLICATION_INSTANCE_DEPLOY_INIT,
-  APPLICATION_INSTANCE_DEPLOY_LOAD_REPORT_REQUEST,
-  APPLICATION_INSTANCE_DEPLOY_LOAD_REPORT_SUCCESS,
-  APPLICATION_INSTANCE_DEPLOY_LOAD_REPORT_FAILURE,
+  APPLICATION_INSTANCE_REPORT_INIT,
+  APPLICATION_INSTANCE_REPORT_SET_ACTIVE_HOST,
 } from './ApplicationInstanceReportConstants';
 
 export const initApplicationInstanceReport = (
@@ -25,7 +23,7 @@ export const initApplicationInstanceReport = (
   initialState.hosts = hosts;
 
   dispatch({
-    type: APPLICATION_INSTANCE_DEPLOY_INIT,
+    type: APPLICATION_INSTANCE_REPORT_INIT,
     payload: initialState,
   });
 };
@@ -38,49 +36,7 @@ const errorHandler = (msg, err) => {
   return { type: msg, payload: { error } };
 };
 
-export const loadReport = (dispatch, getState, id, url, live, initial) => {
-
-  const reportState = getState().foremanAcd.applicationInstanceReport;
-
-  if (live) {
-    if ((reportState.activeHostId == id) || (initial == true)) {
-      setTimeout(() => {
-        loadReport(dispatch, getState, id, url, live, false);
-      }, 1600)
-    }
-  }
-
-  return api
-    .get(url, {}, {})
-    .then(({ data }) =>
-      dispatch({
-        type: APPLICATION_INSTANCE_DEPLOY_LOAD_REPORT_SUCCESS,
-        payload: data.results,
-      })
-    )
-    .catch(error => dispatch(errorHandler(APPLICATION_INSTANCE_DEPLOY_LOAD_REPORT_FAILURE, error)));
-};
-
-export const setActiveAndLoadLiveReport = (
-  id,
-  url,
-) => (dispatch, getState) => {
-  dispatch({
-    payload: { activeHostId: id },
-    type: APPLICATION_INSTANCE_DEPLOY_LOAD_REPORT_REQUEST
-  });
-
-  return loadReport(dispatch, getState, id, url, true, true);
-}
-
-export const setActiveAndLoadLastReport = (
-  id,
-  url,
-) => (dispatch, getState) => {
-  dispatch({
-    payload: { activeHostId: id },
-    type: APPLICATION_INSTANCE_DEPLOY_LOAD_REPORT_REQUEST
-  });
-
-  return loadReport(dispatch, getState, id, url, false, true);
-};
+export const setActiveHost = (id) => ({
+  type: APPLICATION_INSTANCE_REPORT_SET_ACTIVE_HOST,
+  payload: { activeHostId: id },
+});

data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReportConstants.js

@@ -1,4 +1,2 @@
-export const APPLICATION_INSTANCE_DEPLOY_INIT = 'APPLICATION_INSTANCE_DEPLOY_INIT';
-export const APPLICATION_INSTANCE_DEPLOY_LOAD_REPORT_REQUEST = 'APPLICATION_INSTANCE_DEPLOY_LOAD_REPORT_REQUEST';
-export const APPLICATION_INSTANCE_DEPLOY_LOAD_REPORT_SUCCESS = 'APPLICATION_INSTANCE_DEPLOY_LOAD_REPORT_SUCCESS';
-export const APPLICATION_INSTANCE_DEPLOY_LOAD_REPORT_FAILURE = 'APPLICATION_INSTANCE_DEPLOY_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';

data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReportReducer.js

@@ -7,10 +7,8 @@ import {
 } from 'lodash';
 
 import {
-  APPLICATION_INSTANCE_DEPLOY_INIT,
-  APPLICATION_INSTANCE_DEPLOY_LOAD_REPORT_REQUEST,
-  APPLICATION_INSTANCE_DEPLOY_LOAD_REPORT_SUCCESS,
-  APPLICATION_INSTANCE_DEPLOY_LOAD_REPORT_FAILURE,
+  APPLICATION_INSTANCE_REPORT_INIT,
+  APPLICATION_INSTANCE_REPORT_SET_ACTIVE_HOST,
 } from './ApplicationInstanceReportConstants';
 
 export const initialState = Immutable({
@@ -22,27 +20,15 @@ const applicationInstanceReport = (state = initialState, action) => {
   const { payload } = action;
 
   switch (action.type) {
-    case APPLICATION_INSTANCE_DEPLOY_INIT: {
+    case APPLICATION_INSTANCE_REPORT_INIT: {
       return state.merge(payload);
     }
-    case APPLICATION_INSTANCE_DEPLOY_LOAD_REPORT_REQUEST: {
+    case APPLICATION_INSTANCE_REPORT_SET_ACTIVE_HOST: {
       return state.merge({
         loading: true,
         activeHostId: payload.activeHostId,
       })
     }
-    case APPLICATION_INSTANCE_DEPLOY_LOAD_REPORT_SUCCESS: {
-      return state.merge({
-        report: payload,
-        loading: false,
-      });
-    }
-    case APPLICATION_INSTANCE_DEPLOY_LOAD_REPORT_FAILURE: {
-      return state.merge({
-        error: payload.error,
-        loading: false
-      });
-    }
     default: {
       return state;
     }

data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReportSelectors.js

@@ -1,5 +1,4 @@
 const applicationInstanceReport = state => state.foremanAcd.applicationInstanceReport;
 
 export const selectHosts = state => applicationInstanceReport(state).hosts;
-export const selectReport = state => applicationInstanceReport(state).report;
 export const selectActiveHostId = state => applicationInstanceReport(state).activeHostId;

data/webpack/components/ApplicationInstanceReport/components/ReportViewer.js

@@ -14,7 +14,7 @@ const ReportViewer= ({
   }
 
   return report.map((task, id) => (
-    <div key={"report_task_"+id} className="report_task">{task.name}</div>
+    <div key={"report_task_"+id} className="report_task">{task.name} -- {task.status}</div>
   ));
 };
 

data/webpack/components/ApplicationInstanceReport/index.js

@@ -7,13 +7,11 @@ import * as ApplicationInstanceReportActions from './ApplicationInstanceReportAc
 
 import {
   selectHosts,
-  selectReport,
   selectActiveHostId,
 } from './ApplicationInstanceReportSelectors';
 
 const mapStateToProps = state => ({
   hosts: selectHosts(state),
-  report: selectReport(state),
   activeHostId: selectActiveHostId(state),
 });
 

data/webpack/components/ParameterSelection/ParameterSelection.js

@@ -117,6 +117,7 @@ class ParameterSelection extends React.Component {
           />
            
           <LockTableEntry
+            hidden={!allowRowAdjustment}
             disabled={true}
             onLockTableEntry={lockParameter}
             additionalData={additionalData}
@@ -273,6 +274,7 @@ class ParameterSelection extends React.Component {
       addParameter,
       confirmEditParameter,
       cancelEditParameter,
+      editModeCallback,
     } = this.props;
 
     let sortedParameters;
@@ -304,6 +306,12 @@ class ParameterSelection extends React.Component {
       )(parameters);
     }
 
+    // Make sure that the component which includes the
+    // ParameterSelection is aware of the current editMode state
+    if (editModeCallback !== undefined) {
+      editModeCallback(this.props.editMode);
+    }
+
     return(
       <div>
         <div className="clearfix">
@@ -363,6 +371,7 @@ ParameterSelection.defaultProps = {
   parameters: [],
   columns: [],
   sortingColumns: {},
+  editModeCallback: undefined,
 };
 
 ParameterSelection.propTypes = {
@@ -381,6 +390,7 @@ ParameterSelection.propTypes = {
   parameterTypes: PropTypes.object,
   parameters: PropTypes.array,
   sortingColumns: PropTypes.object,
+  editModeCallback: PropTypes.func,
   columns: PropTypes.array,
   sortParameter: PropTypes.func,
   addParameter: PropTypes.func,

data/webpack/components/ParameterSelection/ParameterSelectionActions.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import * as sort from 'sortabular';
+import { translate as __ } from 'foremanReact/common/I18n';
 
 import {
   actionHeaderCellFormatter,
@@ -59,9 +60,9 @@ export const initParameterSelection = (
   };
   initialState.paramDefinition = paramDefinition;
 
-  let valueLabel = 'Value';
+  let valueLabel = __('Value');
   if (useDefaultValue) {
-    valueLabel = 'Default value';
+    valueLabel = __('Default value');
   }
 
   initialState.columns = []
@@ -74,7 +75,7 @@ export const initParameterSelection = (
   addToColumns( {
       property: 'name',
       header: {
-        label: 'Name',
+        label: __('Name'),
         props: {
           sort: true,
           style: {
@@ -93,7 +94,7 @@ export const initParameterSelection = (
   addToColumns( {
       property: 'description',
       header: {
-        label: 'Description',
+        label: __('Description'),
         props: {
           sort: true,
           style: {
@@ -116,7 +117,7 @@ export const initParameterSelection = (
     addToColumns( {
       property: 'type',
       header: {
-        label: 'Type',
+        label: __('Type'),
         props: {
           sort: true,
           style: {
@@ -157,7 +158,7 @@ export const initParameterSelection = (
   addToColumns( {
       property: 'actions',
       header: {
-        label: 'Actions',
+        label: __('Actions'),
         props: {
           style: {
             width: '10%'
@@ -184,7 +185,7 @@ export const initParameterSelection = (
 
 const errorHandler = (msg, err) => {
   const error = {
-    errorMsg: 'Failed to fetch data from server.',
+    errorMsg: __('Failed to fetch data from server.'),
     statusText: err,
   };
   return { type: msg, payload: { error } };