foreman_acd 0.7.0 → 0.9.2

data/webpack/components/ApplicationInstance/__tests__/__snapshots__/ApplicationInstanceReducer.test.js.snap

@@ -469,6 +469,7 @@ Object {
         "foremanParameters": Array [],
         "hostname": "",
         "id": 5,
+        "isExistingHost": false,
         "newEntry": true,
         "service": "",
       },
@@ -476,6 +477,7 @@ Object {
       "foremanParameters": Array [],
       "hostname": "",
       "id": 5,
+      "isExistingHost": false,
       "newEntry": true,
       "service": "",
     },
@@ -1114,6 +1116,275 @@ Object {
 }
 `;
 
+exports[`ApplicationInstanceReducer should close alert modal 1`] = `
+Object {
+  "alertModalText": "",
+  "alertModalTitle": "",
+  "ansibleVarsAll": Array [
+    Object {
+      "id": 0,
+      "name": "repository",
+      "value": "https://github.com/bennojoy/mywebapp.git",
+    },
+  ],
+  "appDefinition": Object {
+    "ansible_vars_all": "[{\\"id\\":0,\\"name\\":\\"repository\\",\\"value\\":\\"https://github.com/bennojoy/mywebapp.git\\"}]",
+    "created_at": "2021-03-11 12:51:34 +0100",
+    "description": "",
+    "id": 1,
+    "location_ids": Array [
+      2,
+    ],
+    "name": "LAMP",
+    "organization_ids": Array [
+      1,
+    ],
+    "services": "[{\\"id\\":1,\\"name\\":\\"web\\",\\"description\\":\\"\\",\\"hostgroup\\":\\"1\\",\\"ansibleGroup\\":\\"webservers\\",\\"minCount\\":\\"2\\",\\"maxCount\\":\\"\\",\\"foremanParameters\\":[{\\"id\\":1,\\"locked\\":false,\\"name\\":\\"CP\\",\\"description\\":\\"\\",\\"type\\":\\"computeprofile\\",\\"value\\":\\"1\\"},{\\"id\\":2,\\"locked\\":true,\\"name\\":\\"LE\\",\\"description\\":\\"\\",\\"type\\":\\"lifecycleenv\\",\\"value\\":\\"1\\"}],\\"ansibleParameters\\":[{\\"id\\":0,\\"name\\":\\"dummy_var\\",\\"value\\":\\"0\\"}]},{\\"id\\":2,\\"name\\":\\"db\\",\\"description\\":\\"\\",\\"hostgroup\\":\\"1\\",\\"ansibleGroup\\":\\"dbservers\\",\\"minCount\\":\\"1\\",\\"maxCount\\":\\"\\",\\"foremanParameters\\":[],\\"ansibleParameters\\":[{\\"id\\":0,\\"name\\":\\"mysqlservice\\",\\"value\\":\\"mysqld\\"},{\\"id\\":1,\\"name\\":\\"mysql_port\\",\\"value\\":\\"3306\\",\\"locked\\":true},{\\"id\\":2,\\"name\\":\\"dbuser\\",\\"value\\":\\"webapp\\"},{\\"id\\":3,\\"name\\":\\"dbname\\",\\"value\\":\\"ANSAP01\\"},{\\"id\\":4,\\"name\\":\\"upassword\\",\\"value\\":\\"Bond@007\\"},{\\"id\\":5,\\"name\\":\\"masterpassword\\",\\"value\\":\\"MySQL@007\\"}]}]",
+    "updated_at": "2021-03-13 00:06:12 +0100",
+  },
+  "columns": Array [
+    Object {
+      "cell": Object {
+        "formatters": Array [
+          null,
+        ],
+      },
+      "header": Object {
+        "formatters": Array [
+          null,
+        ],
+        "label": "Hostname",
+        "props": Object {
+          "index": 0,
+          "style": Object {
+            "width": "30%",
+          },
+        },
+      },
+      "property": "hostname",
+    },
+    Object {
+      "cell": Object {
+        "formatters": Array [
+          null,
+        ],
+      },
+      "header": Object {
+        "formatters": Array [
+          null,
+        ],
+        "label": "Description",
+        "props": Object {
+          "index": 1,
+          "style": Object {
+            "width": "30%",
+          },
+        },
+      },
+      "property": "description",
+    },
+    Object {
+      "cell": Object {
+        "formatters": Array [
+          null,
+        ],
+      },
+      "header": Object {
+        "formatters": Array [
+          null,
+        ],
+        "label": "Service",
+        "props": Object {
+          "index": 2,
+          "style": Object {
+            "width": "20%",
+          },
+        },
+      },
+      "property": "service",
+    },
+    Object {
+      "cell": Object {
+        "formatters": Array [
+          null,
+        ],
+      },
+      "header": Object {
+        "formatters": Array [
+          null,
+        ],
+        "label": "Actions",
+        "props": Object {
+          "index": 4,
+          "style": Object {
+            "width": "20%",
+          },
+        },
+      },
+      "property": "actions",
+    },
+  ],
+  "error": Object {
+    "errorMsg": "",
+    "status": "",
+    "statusText": "",
+  },
+  "hosts": Array [
+    Object {
+      "ansibleParameters": Array [
+        Object {
+          "id": 0,
+          "name": "mysqlservice",
+          "value": "mysqld",
+        },
+        Object {
+          "id": 1,
+          "name": "mysql_port",
+          "value": "3306",
+        },
+        Object {
+          "id": 2,
+          "name": "dbuser",
+          "value": "webapp",
+        },
+        Object {
+          "id": 3,
+          "name": "dbname",
+          "value": "ANSAP01",
+        },
+        Object {
+          "id": 4,
+          "name": "upassword",
+          "value": "Bond@007",
+        },
+        Object {
+          "id": 5,
+          "name": "masterpassword",
+          "value": "MySQL@007",
+        },
+      ],
+      "description": "",
+      "foremanParameters": Array [],
+      "hostname": "great-web-app-db-1",
+      "id": 4,
+      "service": "2",
+    },
+    Object {
+      "ansibleParameters": Array [
+        Object {
+          "id": 0,
+          "name": "dummy_var",
+          "value": "0",
+        },
+      ],
+      "description": "",
+      "foremanParameters": Array [],
+      "hostname": "great-web-app-web-1",
+      "id": 1,
+      "service": "1",
+    },
+    Object {
+      "ansibleParameters": Array [
+        Object {
+          "id": 0,
+          "name": "dummy_var",
+          "value": "0",
+        },
+      ],
+      "description": "",
+      "foremanParameters": Array [],
+      "hostname": "great-web-app-web-2",
+      "id": 2,
+      "service": "1",
+    },
+  ],
+  "loading": false,
+  "name": false,
+  "services": Array [
+    Object {
+      "ansibleGroup": "webservers",
+      "ansibleParameters": Array [
+        Object {
+          "id": 0,
+          "name": "dummy_var",
+          "value": "0",
+        },
+      ],
+      "currentCount": 2,
+      "description": "",
+      "foremanParameters": Array [
+        Object {
+          "description": "",
+          "id": 1,
+          "locked": false,
+          "name": "CP",
+          "type": "computeprofile",
+          "value": "1",
+        },
+        Object {
+          "description": "",
+          "id": 2,
+          "locked": true,
+          "name": "LE",
+          "type": "lifecycleenv",
+          "value": "1",
+        },
+      ],
+      "hostgroup": "1",
+      "id": 1,
+      "maxCount": "",
+      "minCount": "2",
+      "name": "web",
+    },
+    Object {
+      "ansibleGroup": "dbservers",
+      "ansibleParameters": Array [
+        Object {
+          "id": 0,
+          "name": "mysqlservice",
+          "value": "mysqld",
+        },
+        Object {
+          "id": 1,
+          "locked": true,
+          "name": "mysql_port",
+          "value": "3306",
+        },
+        Object {
+          "id": 2,
+          "name": "dbuser",
+          "value": "webapp",
+        },
+        Object {
+          "id": 3,
+          "name": "dbname",
+          "value": "ANSAP01",
+        },
+        Object {
+          "id": 4,
+          "name": "upassword",
+          "value": "Bond@007",
+        },
+        Object {
+          "id": 5,
+          "name": "masterpassword",
+          "value": "MySQL@007",
+        },
+      ],
+      "currentCount": 1,
+      "description": "",
+      "foremanParameters": Array [],
+      "hostgroup": "1",
+      "id": 2,
+      "maxCount": "",
+      "minCount": "1",
+      "name": "db",
+    },
+  ],
+  "showAlertModal": false,
+}
+`;
+
 exports[`ApplicationInstanceReducer should confirm edit host 1`] = `
 Object {
   "ansibleVarsAll": Array [

data/webpack/components/ApplicationInstance/__tests__/__snapshots__/ApplicationInstanceSelectors.test.js.snap

@@ -2,6 +2,10 @@
 
 exports[`ApplicationInstanceSelectors should return ParamEditMode from applicationInstanceConfData_1 fixtures 1`] = `undefined`;
 
+exports[`ApplicationInstanceSelectors should return alertModalText from applicationInstanceConfData_1 fixtures 1`] = `undefined`;
+
+exports[`ApplicationInstanceSelectors should return alertModalTitle from applicationInstanceConfData_1 fixtures 1`] = `undefined`;
+
 exports[`ApplicationInstanceSelectors should return ansibleVarsAll from applicationInstanceConfData_1 fixtures 1`] = `
 Array [
   Object {
@@ -117,6 +121,8 @@ Array [
 
 exports[`ApplicationInstanceSelectors should return editMode from applicationInstanceConfData_1 fixtures 1`] = `undefined`;
 
+exports[`ApplicationInstanceSelectors should return hiddenForemanParameterTypes from applicationInstanceConfData_1 fixtures 1`] = `undefined`;
+
 exports[`ApplicationInstanceSelectors should return hosts from applicationInstanceConfData_1 fixtures 1`] = `
 Array [
   Object {
@@ -274,3 +280,5 @@ Array [
   },
 ]
 `;
+
+exports[`ApplicationInstanceSelectors should return showAlertModal from applicationInstanceConfData_1 fixtures 1`] = `undefined`;

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

@@ -18,6 +18,7 @@ const AppDefinitionSelector= ({
       <label className="col-md-2 control-label">{label}</label>
       <div className="col-md-4">
         <ExtSelect
+          hidden={hidden}
           editable={editable}
           viewText={viewText}
           selectValue={selectValue}

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

@@ -15,7 +15,7 @@ const ServiceCounter= ({
 
   return (
     <div>
-      <label class="service-counter-title">{title}</label>
+      <label className="service-counter-title">{title}</label>
     {Object.keys(services).map(key => (
       <Service
         key={services[key].id}

data/webpack/components/ApplicationInstance/index.js

@@ -6,22 +6,30 @@ import ApplicationInstance from './ApplicationInstance';
 import * as ApplicationInstanceActions from './ApplicationInstanceActions';
 
 import {
+  selectShowAlertModal,
+  selectAlertModalText,
+  selectAlertModalTitle,
   selectEditMode,
   selectAppDefinition,
   selectHosts,
   selectServices,
   selectColumns,
+  selectHiddenForemanParameterTypes,
   selectParametersData,
   selectAnsibleVarsAll,
   selectParamEditMode,
 } from './ApplicationInstanceSelectors';
 
 const mapStateToProps = state => ({
+  showAlertModal: selectShowAlertModal(state),
+  alertModalText: selectAlertModalText(state),
+  alertModalTitle: selectAlertModalTitle(state),
   editMode: selectEditMode(state),
   appDefinition: selectAppDefinition(state),
   hosts: selectHosts(state),
   services: selectServices(state),
   columns: selectColumns(state),
+  hiddenForemanParameterTypes: selectHiddenForemanParameterTypes(state),
   parametersData: selectParametersData(state),
   ansibleVarsAll: selectAnsibleVarsAll(state),
   paramEditMode: selectParamEditMode(state),

data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReport.js

@@ -1,6 +1,11 @@
 import React, { useState } from 'react'
 import PropTypes from 'prop-types';
 
+import {
+  Icon,
+  Spinner,
+} from 'patternfly-react';
+
 import {
   VerticalTabs,
 } from 'patternfly-react-extensions';
@@ -20,14 +25,42 @@ class ApplicationInstanceReport extends React.Component {
 
   componentDidMount() {
     const {
-      data: { hosts, mode },
+      data: { hosts, deploymentState, initialConfigureState, initialConfigureJobUrl },
       initApplicationInstanceReport,
       setActiveHost,
     } = this.props;
 
-    initApplicationInstanceReport(hosts);
+    initApplicationInstanceReport(hosts, deploymentState, initialConfigureState, initialConfigureJobUrl);
+    this.reloadReportData();
   };
 
+  reloadReportData() {
+    const {
+      data: { appInstanceId, reportDataUrl },
+      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') {
+      setTimeout(() => {
+        this.reloadReportData();
+      }, 1000);
+
+      return;
+    }
+
+    if ((deploymentState != 'new' && deploymentState != 'finished' && deploymentState != 'failed') ||
+        (initialConfigureState == 'unconfigured' || initialConfigureState == 'scheduled' || initialConfigureState == 'pending')) {
+
+      loadReportData(reportDataUrl, appInstanceId);
+
+      setTimeout(() => {
+        this.reloadReportData();
+      }, 5000);
+    }
+  }
+
   isActive(id) {
     return (this.props.activeHostId === id);
   }
@@ -66,13 +99,20 @@ class ApplicationInstanceReport extends React.Component {
         </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'] } data={{ id: host['id'], url: host['powerStatusUrl'] }} /></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>
       )
     }
@@ -80,14 +120,22 @@ class ApplicationInstanceReport extends React.Component {
 
   render() {
     const {
-      data: { hosts, mode, appInstanceName, deployTaskUrl, configureJobUrl },
-      activeHostId,
+      data: { appInstanceId, appInstanceName, deployTaskUrl, configureJobUrl, reportDataUrl },
+      activeHostId, hosts,
+      deploymentState,
+      initialConfigureState, initialConfigureJobUrl, showInitialConfigureJob,
+      loadReportData,
     } = this.props;
 
     let tabs = [];
     let reportStatus = undefined;
     let report = undefined;
 
+    // This handles the first call to render() in which the state hosts is always empty
+    if (hosts.length == 0) {
+      return (<span>No host</span>);
+    }
+
     tabs = this.collectLastReportData(hosts);
     reportStatus = this.lastReportStatus(hosts[activeHostId]);
 
@@ -98,14 +146,32 @@ class ApplicationInstanceReport extends React.Component {
     return (
       <span>
         <div className="deploy_status">
+          <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 }
+            </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>) }
+            </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
@@ -131,6 +197,10 @@ ApplicationInstanceReport.defaultProps = {
   hosts: [],
   report: [],
   activeHostId: 0,
+  deploymentState: 'unknown',
+  initialConfigureState: 'unknown',
+  initialConfigureJobUrl: '',
+  showInitialConfigureJob: false,
 }
 
 ApplicationInstanceReport.propTypes = {
@@ -138,11 +208,16 @@ ApplicationInstanceReport.propTypes = {
   appInstanceName: PropTypes.string,
   deployTaskUrl: PropTypes.string,
   configureJobUrl: PropTypes.string,
+  deploymentState: PropTypes.string,
+  initialConfigureState: PropTypes.string,
+  initialConfigureJobUrl: PropTypes.string,
+  showInitialConfigureJob: PropTypes.bool,
   hosts: PropTypes.array,
+  deploymentState: PropTypes.string,
   report: PropTypes.array,
   setActiveHost: PropTypes.func,
+  loadReportData: PropTypes.func,
   activeHostId: PropTypes.number,
-
 };
 
 export default ApplicationInstanceReport;

data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReportActions.js

@@ -13,14 +13,28 @@ import {
 import {
   APPLICATION_INSTANCE_REPORT_INIT,
   APPLICATION_INSTANCE_REPORT_SET_ACTIVE_HOST,
+  APPLICATION_INSTANCE_REPORT_LOAD_REPORT_REQUEST,
+  APPLICATION_INSTANCE_REPORT_LOAD_REPORT_SUCCESS,
+  APPLICATION_INSTANCE_REPORT_LOAD_REPORT_FAILURE,
 } from './ApplicationInstanceReportConstants';
 
 export const initApplicationInstanceReport = (
-  hosts,
+  hosts, deploymentState, initialConfigureState, initialConfigureJobUrl,
 ) => dispatch => {
   const initialState = {};
 
   initialState.hosts = hosts;
+  initialState.deploymentState = deploymentState;
+  initialState.initialConfigureState = initialConfigureState;
+  initialState.initialConfigureJobUrl = initialConfigureJobUrl;
+
+  // Decide if it should show only the initial Configure job state + URL or
+  // the URL to all configuration jobs
+  if (initialConfigureState == 'unconfigured') {
+    initialState.showInitialConfigureJob = true;
+  } else {
+    initialState.showInitialConfigureJob = false;
+  }
 
   dispatch({
     type: APPLICATION_INSTANCE_REPORT_INIT,
@@ -28,6 +42,26 @@ export const initApplicationInstanceReport = (
   });
 };
 
+export const loadReportData = (
+  reportDataUrl,
+  appInstanceId,
+) => dispatch => {
+  dispatch({ type: APPLICATION_INSTANCE_REPORT_LOAD_REPORT_REQUEST });
+
+  const baseUrl = reportDataUrl;
+  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)));
+};
+
 const errorHandler = (msg, err) => {
   const error = {
     errorMsg: 'Failed to fetch data from server.',

data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReportConstants.js

@@ -1,2 +1,5 @@
 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';

data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReportReducer.js

@@ -9,6 +9,9 @@ import {
 import {
   APPLICATION_INSTANCE_REPORT_INIT,
   APPLICATION_INSTANCE_REPORT_SET_ACTIVE_HOST,
+  APPLICATION_INSTANCE_REPORT_LOAD_REPORT_REQUEST,
+  APPLICATION_INSTANCE_REPORT_LOAD_REPORT_SUCCESS,
+  APPLICATION_INSTANCE_REPORT_LOAD_REPORT_FAILURE,
 } from './ApplicationInstanceReportConstants';
 
 export const initialState = Immutable({
@@ -29,6 +32,22 @@ const applicationInstanceReport = (state = initialState, action) => {
         activeHostId: payload.activeHostId,
       })
     }
+    case APPLICATION_INSTANCE_REPORT_LOAD_REPORT_REQUEST: {
+      // Nothing to do
+      return state;
+    }
+    case APPLICATION_INSTANCE_REPORT_LOAD_REPORT_SUCCESS: {
+      return state.merge({
+        deploymentState: payload.deploymentState,
+        initialConfigureState: payload.initialConfigureState,
+        initialConfigureJobUrl: payload.initialConfigureJobUrl,
+        hosts: payload.hosts,
+      });
+    }
+    case APPLICATION_INSTANCE_REPORT_LOAD_REPORT_FAILURE: {
+      console.log("Error while loading report data: "+ payload.error);
+      return state.merge({ error: payload.error});
+    }
     default: {
       return state;
     }

data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReportSelectors.js

@@ -2,3 +2,7 @@ const applicationInstanceReport = state => state.foremanAcd.applicationInstanceR
 
 export const selectHosts = state => applicationInstanceReport(state).hosts;
 export const selectActiveHostId = state => applicationInstanceReport(state).activeHostId;
+export const selectDeploymentState = state => applicationInstanceReport(state).deploymentState;
+export const selectInitialConfigureState = state => applicationInstanceReport(state).initialConfigureState;
+export const selectInitialConfigureJobUrl = state => applicationInstanceReport(state).initialConfigureJobUrl;
+export const selectShowInitialConfigureJob = state => applicationInstanceReport(state).showInitialConfigureJob;