foreman_acd 0.7.0 → 0.9.2

data/webpack/components/ApplicationInstance/ApplicationInstanceReducer.js

@@ -1,4 +1,6 @@
 import Immutable from 'seamless-immutable';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { calculateServiceUsage } from './ApplicationInstanceHelper';
 
 import {
   cloneDeep,
@@ -8,6 +10,7 @@ import {
 
 import {
   APPLICATION_INSTANCE_INIT,
+  APPLICATION_INSTANCE_CLOSE_ALERT_MODAL,
   APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_FAILURE,
   APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_REQUEST,
   APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_SUCCESS,
@@ -17,10 +20,13 @@ import {
   APPLICATION_INSTANCE_HOST_EDIT_CONFIRM,
   APPLICATION_INSTANCE_HOST_EDIT_CHANGE,
   APPLICATION_INSTANCE_HOST_EDIT_CANCEL,
+  APPLICATION_INSTANCE_HOST_EDIT_ERROR,
   APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN,
   APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE,
   APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN,
   APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE,
+  APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_OPEN,
+  APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_CLOSE,
   APPLICATION_INSTANCE_CHANGE_PARAMETER_SELECTION_MODE,
 } from './ApplicationInstanceConstants';
 
@@ -41,7 +47,15 @@ const applicationInstanceConf = (state = initialState, action) => {
     case APPLICATION_INSTANCE_INIT: {
       return state.merge(payload);
     }
+    case APPLICATION_INSTANCE_CLOSE_ALERT_MODAL: {
+      return state.merge({
+        showAlertModal: false,
+        alertModalTitle: '',
+        alertModalText: '',
+      });
+    }
    case APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_FAILURE: {
+      console.log("Error while loading application definition data: "+ payload.error);
       return state.merge({ error: payload.error, loading: false });
     }
     case APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_REQUEST: {
@@ -87,7 +101,7 @@ const applicationInstanceConf = (state = initialState, action) => {
         index = Math.max(...hosts.map(e => e.id)) + 1;
       }
 
-      const newRow = {id: index, hostname: "", description: '', service: '', foremanParameters: [], ansibleParameters: [], newEntry: true };
+      const newRow = {id: index, hostname: "", description: '', service: '', isExistingHost: false, foremanParameters: [], ansibleParameters: [], newEntry: true };
       newRow.backup = cloneDeep(newRow)
       hosts.push(newRow);
 
@@ -125,48 +139,28 @@ const applicationInstanceConf = (state = initialState, action) => {
     case APPLICATION_INSTANCE_HOST_EDIT_CONFIRM: {
       const hosts = cloneDeep(state.hosts);
       const index = findIndex(hosts, { id: payload.rowData.id });
-      const services = cloneDeep(state.services);
+      let services = cloneDeep(state.services);
 
       const thisHost = hosts[index];
 
-      if (thisHost.hostname == '') {
-        window.alert("Every host needs to have a valid name");
-        return state;
-      }
-
       // hostnames are lower case
       thisHost.hostname = thisHost.hostname.toLowerCase();
 
-      const hostnameRegex = /^[0-9a-z]([0-9a-z\-]{0,61}[0-9a-z])$/;
-
-      if (thisHost.hostname.match(hostnameRegex) == undefined) {
-        window.alert("The hostname uses not allowed characters. See https://en.wikipedia.org/wiki/Hostname#Syntax for more details.")
-        return state;
-      }
-
-      if (thisHost.service == '') {
-        window.alert("Every host needs to be assigned to a service.");
-        return state;
-      }
-
       if (state.hosts.filter(v => v.hostname === thisHost.hostname && v.id != thisHost.id).length > 0) {
-        window.alert("Host name already used in this Application Instance. Please make sure that every host name is unique.");
-        return state;
+        return state.merge({
+          showAlertModal: true,
+          alertModalTitle: __("Error"),
+          alertModalText: __("Host name already used in this Application Instance. Please make sure that every host name is unique."),
+        });
       }
 
       // Initialize the new Instance with the parameters of the Application Definition.
       if (thisHost.newEntry === true) {
-          const selectedService = state.services.filter(entry => entry.id == payload.rowData.service)[0];
+          const hostServiceId = Number(thisHost.service);
+          const selectedService = services.filter(entry => entry.id == hostServiceId)[0];
           hosts[index].foremanParameters = selectedService.foremanParameters;
           hosts[index].ansibleParameters = selectedService.ansibleParameters;
-
-          const hostServiceId = Number(thisHost.service);
-          const service = services.find(serv => serv['id'] == hostServiceId);
-          if ('currentCount' in service) {
-            service['currentCount'] += 1;
-          } else {
-            service['currentCount'] = 1;
-          }
+          services = calculateServiceUsage(hostServiceId, services);
       }
 
       delete hosts[index].backup;
@@ -202,6 +196,13 @@ const applicationInstanceConf = (state = initialState, action) => {
         hosts: hosts
       });
     }
+    case APPLICATION_INSTANCE_HOST_EDIT_ERROR: {
+      return state.merge({
+        showAlertModal: true,
+        alertModalTitle: __("Error"),
+        alertModalText: payload,
+      });
+    }
     case APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN: {
       let parametersData = {};
 
@@ -298,6 +299,46 @@ const applicationInstanceConf = (state = initialState, action) => {
       }
       return state.merge(newState);
     }
+    case APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_OPEN: {
+    }
+    case APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_CLOSE: {
+      if (payload.mode == 'save') {
+        let newState;
+        let hosts = [];
+        let index = 1;
+        let services = cloneDeep(state.services);
+
+        if ('hosts' in state && state.hosts !== undefined && state.hosts.length > 0) {
+          hosts = cloneDeep(state.hosts);
+          index = Math.max(...hosts.map(e => e.id));
+        }
+
+        payload.selectedHosts.forEach(host => {
+          if ((state.hosts == undefined) || (state.hosts.find(h => h.hostname == host.hostname) == undefined)) {
+            index += 1;
+            const selectedService = services.filter(entry => entry.id == host.serviceId)[0];
+            const newRow = {
+              id: index,
+              hostname: host.hostname,
+              description: '',
+              service: host.serviceId,
+              isExistingHost: true,
+              foremanParameters: [], // we will never set this because we don't want to change a already existing host.
+              ansibleParameters: selectedService.ansibleParameters,
+            }
+            hosts.push(newRow);
+            services = calculateServiceUsage(host.serviceId, services);
+          }
+        });
+
+        return state.merge({
+          hosts: hosts,
+          services, services
+        });
+      } else {
+        return state;
+      }
+    }
     case APPLICATION_INSTANCE_CHANGE_PARAMETER_SELECTION_MODE: {
       return state.merge({ paramEditMode: payload.mode });
     }

data/webpack/components/ApplicationInstance/ApplicationInstanceSelectors.js

@@ -1,9 +1,13 @@
 const applicationInstanceConf = state => state.foremanAcd.applicationInstanceConf;
 
+export const selectShowAlertModal = state => applicationInstanceConf(state).showAlertModal;
+export const selectAlertModalText = state => applicationInstanceConf(state).alertModalText;
+export const selectAlertModalTitle = state => applicationInstanceConf(state).alertModalTitle;
 export const selectEditMode = state => applicationInstanceConf(state).editMode;
 export const selectAppDefinition = state => applicationInstanceConf(state).appDefinition;
 export const selectHosts = state => applicationInstanceConf(state).hosts;
 export const selectColumns = state => applicationInstanceConf(state).columns;
+export const selectHiddenForemanParameterTypes = state => applicationInstanceConf(state).hiddenForemanParameterTypes;
 export const selectServices = state => applicationInstanceConf(state).services;
 export const selectParametersData = state => applicationInstanceConf(state).parametersData;
 export const selectAnsibleVarsAll = state => applicationInstanceConf(state).ansibleVarsAll;

data/webpack/components/ApplicationInstance/__fixtures__/applicationInstanceReducer.fixtures.js

@@ -20,6 +20,8 @@ export const editState = Immutable(editClone);
 
 // Payload Data
 export const initApplicationInstancePayload = applicationInstanceConfData_1;
+
+export const closeAlertModalPayload = { };
 export const addHostPayload = { };
 export const deleteHostPayload = {
   rowData: {

data/webpack/components/ApplicationInstance/__tests__/ApplicationInstance.test.js

@@ -13,6 +13,7 @@ const fixtures = {
       hosts: [],
       ansibleVarsAll: [],
     },
+    closeAlertModal: noop,
     loadApplicationDefinition: noop,
     initApplicationInstance: noop,
     addApplicationInstanceHost: noop,

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

@@ -5,6 +5,7 @@ import {
   successState,
   editState,
   initApplicationInstancePayload,
+  closeAlertModalPayload,
   addHostPayload,
   deleteHostPayload,
   activateEditHostPayload,
@@ -18,6 +19,7 @@ import {
 
 import {
   APPLICATION_INSTANCE_INIT,
+  APPLICATION_INSTANCE_CLOSE_ALERT_MODAL,
   APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_REQUEST,
   APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_SUCCESS,
   APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_FAILURE,
@@ -27,10 +29,13 @@ import {
   APPLICATION_INSTANCE_HOST_EDIT_CONFIRM,
   APPLICATION_INSTANCE_HOST_EDIT_CHANGE,
   APPLICATION_INSTANCE_HOST_EDIT_CANCEL,
+  APPLICATION_INSTANCE_HOST_EDIT_ERROR,
   APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN,
   APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE,
   APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN,
   APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE,
+  APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_OPEN,
+  APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_CLOSE,
   APPLICATION_INSTANCE_CHANGE_PARAMETER_SELECTION_MODE,
 } from '../ApplicationInstanceConstants';
 
@@ -50,6 +55,13 @@ const fixtures = {
       payload: initApplicationInstancePayload,
     },
   },
+  'should close alert modal': {
+    state: successState,
+    action: {
+      type: APPLICATION_INSTANCE_CLOSE_ALERT_MODAL,
+      payload: closeAlertModalPayload,
+    },
+  },
   'should add a host': {
     state: successState,
     action: {

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

@@ -1,10 +1,14 @@
 import { testSelectorsSnapshotWithFixtures } from 'react-redux-test-utils';
 
 import {
+  selectShowAlertModal,
+  selectAlertModalText,
+  selectAlertModalTitle,
   selectEditMode,
   selectAppDefinition,
   selectHosts,
   selectColumns,
+  selectHiddenForemanParameterTypes,
   selectServices,
   selectParametersData,
   selectAnsibleVarsAll,
@@ -22,6 +26,12 @@ const stateFactory = obj => ({
 });
 
 const fixtures = {
+  'should return showAlertModal from applicationInstanceConfData_1 fixtures': () =>
+    selectShowAlertModal(stateFactory(applicationInstanceConfData_1)),
+  'should return alertModalText from applicationInstanceConfData_1 fixtures': () =>
+    selectAlertModalText(stateFactory(applicationInstanceConfData_1)),
+  'should return alertModalTitle from applicationInstanceConfData_1 fixtures': () =>
+    selectAlertModalTitle(stateFactory(applicationInstanceConfData_1)),
   'should return editMode from applicationInstanceConfData_1 fixtures': () =>
     selectEditMode(stateFactory(applicationInstanceConfData_1)),
   'should return appDefinition from applicationInstanceConfData_1 fixtures': () =>
@@ -30,6 +40,8 @@ const fixtures = {
     selectHosts(stateFactory(applicationInstanceConfData_1)),
   'should return columns from applicationInstanceConfData_1 fixtures': () =>
     selectColumns(stateFactory(applicationInstanceConfData_1)),
+  'should return hiddenForemanParameterTypes from applicationInstanceConfData_1 fixtures': () =>
+    selectHiddenForemanParameterTypes(stateFactory(applicationInstanceConfData_1)),
   'should return services from applicationInstanceConfData_1 fixtures': () =>
     selectServices(stateFactory(applicationInstanceConfData_1)),
   'should return parametersData from applicationInstanceConfData_1 fixtures': () =>

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

@@ -2,8 +2,32 @@
 
 exports[`ApplicationInstance should render application instance 1`] = `
 <span>
+  <MessageDialog
+    accessibleDescription=""
+    accessibleName=""
+    className=""
+    enforceFocus={true}
+    footer={null}
+    icon={
+      <Icon
+        name="error-circle-o"
+        type="pf"
+      />
+    }
+    onHide={[Function]}
+    primaryAction={[Function]}
+    primaryActionButtonBsStyle="danger"
+    primaryActionButtonContent="OK"
+    primaryContent=""
+    secondaryAction={[Function]}
+    secondaryActionButtonBsStyle="default"
+    secondaryActionButtonContent={null}
+    secondaryContent={null}
+    show={false}
+    title=""
+  />
   <div
-    class="service-counter"
+    className="service-counter"
   >
     <ServiceCounter
       hostList={Array []}
@@ -19,12 +43,13 @@ exports[`ApplicationInstance should render application instance 1`] = `
         }
       }
       editable={false}
+      hidden={false}
       label="Application Definition"
       onChange={[Function]}
       selectValue=""
       viewText=""
     />
-    <p
+    <div
       style={
         Object {
           "paddingTop": 25,
@@ -34,7 +59,7 @@ exports[`ApplicationInstance should render application instance 1`] = `
       <pre>
         App Definition can't be blank
       </pre>
-    </p>
+    </div>
   </div>
   <div
     className="form-group"
@@ -75,6 +100,28 @@ exports[`ApplicationInstance should render application instance 1`] = `
       hidden={false}
       onAddTableEntry={[Function]}
     />
+    <span
+      style={
+        Object {
+          "marginLeft": 10,
+        }
+      }
+    >
+      <Button
+        active={false}
+        block={false}
+        bsClass="btn"
+        bsStyle="default"
+        disabled={true}
+        onClick={[Function]}
+      >
+        <Icon
+          name="server"
+          title="Add existing hosts"
+          type="pf"
+        />
+      </Button>
+    </span>
     <span
       style={
         Object {
@@ -88,7 +135,7 @@ exports[`ApplicationInstance should render application instance 1`] = `
         block={false}
         bsClass="btn"
         bsStyle="default"
-        disabled={false}
+        disabled={true}
         onClick={[Function]}
         style={
           Object {
@@ -97,7 +144,7 @@ exports[`ApplicationInstance should render application instance 1`] = `
         }
       >
         <span
-          title="change ansible variables for 'all'"
+          title="Change ansible variables for 'all'"
         >
           A
         </span>
@@ -118,6 +165,7 @@ exports[`ApplicationInstance should render application instance 1`] = `
       <Connect(ParameterSelection)
         data={Object {}}
         editModeCallback={[Function]}
+        hiddenParameterTypes={Array []}
         location="Default Location"
         organization="Default Organization"
         paramType="PARAMETER_SELECTION_PARAM_TYPE_FOREMAN"
@@ -192,15 +240,58 @@ exports[`ApplicationInstance should render application instance 1`] = `
       </Footer>
     </ForemanModal>
   </div>
+  <div>
+    <ForemanModal
+      dialogClassName="add_existing_hosts_modal"
+      id="AppInstanceAddExistingHosts"
+      title="Add existing hosts to an Application Instance"
+    >
+      <Header
+        closeButton={false}
+      >
+        Existing hosts selection
+      </Header>
+      <Connect(ExistingHostSelection)
+        allHosts={Array []}
+        location="Default Location"
+        organization="Default Organization"
+        services={Array []}
+      />
+      <Footer>
+        <div>
+          <Button
+            active={false}
+            block={false}
+            bsClass="btn"
+            bsStyle="primary"
+            disabled={false}
+            onClick={[Function]}
+          >
+            Save
+          </Button>
+          <Button
+            active={false}
+            block={false}
+            bsClass="btn"
+            bsStyle="default"
+            disabled={false}
+            onClick={[Function]}
+          >
+            Cancel
+          </Button>
+        </div>
+      </Footer>
+    </ForemanModal>
+  </div>
   <div />
   <RailsData
-    key="applications_instance"
+    key="application_instance_hosts_data"
     parameter="hosts"
     value="[]"
     view="app_instance"
   />
   <RailsData
-    key="applications_instance"
+    key="application_instance_ansible_data"
     parameter="ansible_vars_all"
     value="[]"
     view="app_instance"