foreman_acd 0.5.0 → 0.6.0

data/webpack/components/ApplicationDefinition/ApplicationDefinitionActions.js

@@ -30,6 +30,7 @@ import {
   APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE,
   APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN,
   APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE,
+  APPLICATION_DEFINITION_CHANGE_PARAMETER_SELECTION_MODE,
 } from './ApplicationDefinitionConstants';
 
 import {
@@ -293,3 +294,10 @@ export const closeAnsibleParameterSelectionModal = (additionalData) => dispatch
     setModalClosed({ id: 'AppDefinitionAnsibleParamSelection' })
   );
 }
+
+export const changeParameterSelectionMode = (additionalData) => ({
+  type: APPLICATION_DEFINITION_CHANGE_PARAMETER_SELECTION_MODE,
+  payload: {
+    ...additionalData,
+  },
+})

data/webpack/components/ApplicationDefinition/ApplicationDefinitionConstants.js

@@ -12,3 +12,4 @@ export const APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN = 'AP
 export const APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE = 'APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE';
 export const APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN = 'APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN';
 export const APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE = 'APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE';
+export const APPLICATION_DEFINITION_CHANGE_PARAMETER_SELECTION_MODE = 'APPLICATION_DEFINITION_CHANGE_PARAMETER_SELECTION_MODE';

data/webpack/components/ApplicationDefinition/ApplicationDefinitionReducer.js

@@ -21,6 +21,7 @@ import {
   APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE,
   APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN,
   APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE,
+  APPLICATION_DEFINITION_CHANGE_PARAMETER_SELECTION_MODE,
 } from './ApplicationDefinitionConstants';
 
 import {
@@ -109,6 +110,28 @@ const applicationDefinitionConf = (state = initialState, action) => {
       const services = cloneDeep(state.services);
       const index = findIndex(services, { id: payload.rowData.id });
 
+      const thisService = services[index];
+
+      if (thisService.name == '') {
+        window.alert("Every service needs to have a valid name.");
+        return state;
+      }
+
+      if (thisService.hostgroup == '') {
+        window.alert("Every service needs to be assigned to a hostgroup.");
+        return state;
+      }
+
+      if (thisService.ansibleGroup == '') {
+        window.alert("Every service needs to be assigned to a ansible group.");
+        return state;
+      }
+
+      if (state.services.filter(v => v.name === thisService.name && v.id != thisService.id).length > 0) {
+        window.alert("Service name already used in this Application Definition. Please make sure that every service name is unique.");
+        return state;
+      }
+
       delete services[index].backup;
       delete services[index].newEntry;
 
@@ -235,6 +258,9 @@ const applicationDefinitionConf = (state = initialState, action) => {
       }
       return state.merge(newState);
     }
+    case APPLICATION_DEFINITION_CHANGE_PARAMETER_SELECTION_MODE: {
+      return state.merge({ paramEditMode: payload.mode });
+    }
     default:
       return state;
   }

data/webpack/components/ApplicationDefinition/ApplicationDefinitionSelectors.js

@@ -6,3 +6,4 @@ export const selectServices = state => applicationDefinitionConf(state).services
 export const selectColumns = state => applicationDefinitionConf(state).columns;
 export const selectParametersData = state => applicationDefinitionConf(state).parametersData;
 export const selectAnsibleVarsAll = state => applicationDefinitionConf(state).ansibleVarsAll;
+export const selectParamEditMode = state => applicationDefinitionConf(state).paramEditMode;

data/webpack/components/ApplicationDefinition/index.js

@@ -12,6 +12,7 @@ import {
   selectColumns,
   selectParametersData,
   selectAnsibleVarsAll,
+  selectParamEditMode,
 } from './ApplicationDefinitionSelectors';
 
 const mapStateToProps = state => ({
@@ -21,6 +22,7 @@ const mapStateToProps = state => ({
   columns: selectColumns(state),
   parametersData: selectParametersData(state),
   ansibleVarsAll: selectAnsibleVarsAll(state),
+  paramEditMode: selectParamEditMode(state),
 });
 
 const mapDispatchToProps = dispatch =>

data/webpack/components/ApplicationInstance/ApplicationInstance.js

@@ -6,6 +6,10 @@ import {
 } from 'patternfly-react';
 import * as resolve from 'table-resolver';
 import ForemanModal from 'foremanReact/components/ForemanModal';
+import {
+  sprintf,
+  translate as __
+} from 'foremanReact/common/I18n';
 import Select from 'foremanReact/components/common/forms/Select';
 import ParameterSelection from '../ParameterSelection';
 import AddTableEntry from '../common/AddTableEntry';
@@ -37,16 +41,20 @@ class ApplicationInstance extends React.Component {
     return (rowData.backup !== undefined);
   }
 
+  addTableEntryAllowed() {
+    return this.props.editMode || this.props.appDefinition.id == ''
+  }
+
   validateParameters() {
     let result = true;
     let msg = "";
 
     this.props.hosts.forEach(h => {
-      if (h.parameters.map(e => e.value).filter(i => i == "").length > 0) {
+      if (h.foremanParameters.map(e => e.value).filter(i => i == "").length > 0) {
         result = false;
 
         if (msg == "") {
-          msg += "For some hosts the values for some parameters are missing. Check the values for these hosts:\n";
+          msg += __("For some hosts the values for some parameters are missing. Check the values for these hosts:\n");
         }
         msg += "- "+ h.hostname +"\n";
       }
@@ -55,22 +63,31 @@ class ApplicationInstance extends React.Component {
     const invalidMinServices = this.props.services.filter(s => (Number(s.minCount) != 0) && (s.currentCount < s.minCount));
     const invalidMaxServices = this.props.services.filter(s => (Number(s.maxCount) != 0) && (s.currentCount > s.maxCount));
 
+    console.log(invalidMinServices);
+
     if (invalidMinServices.length > 0 || invalidMaxServices.length > 0) {
       result = false;
 
       if (msg != "") {
         msg += "\n";
       }
-      msg += "Unachieved service counts: \n";
 
-      invalidMinServices.map(s => { msg += "- service "+ s.name +" expects at least "+ s.minCount +" configured hosts" });
-      invalidMaxServices.map(s => { msg += "- service "+ s.name +" expects no more than "+ s.maxCount +" configured hosts" });
+      msg += __("Unachieved service counts:");
+      msg += "\n";
+
+      invalidMinServices.map(s => { msg += sprintf(
+        __(`- service ${s.name} expects at ${s.minCount} least configured hosts\n`)
+      )});
+
+      invalidMaxServices.map(s => { msg += sprintf(
+        __(`- service ${s.name} expects no more than ${s.axCount} configured hosts\n`)
+      )});
     }
 
-    if (result === false) {
-      window.alert(msg);
+    return {
+      validateResult: result,
+      validateMsg: msg
     }
-    return result;
   }
 
   componentDidMount() {
@@ -98,21 +115,21 @@ class ApplicationInstance extends React.Component {
             bsStyle="default"
             onClick={() => activateEditApplicationInstanceHost(additionalData)}
           >
-            <Icon type="pf" name="edit" title="edit entry" />
+            <Icon type="pf" name="edit" title={__("edit entry")} />
           </Button>
           &nbsp;
           <Button
             bsStyle="default"
             onClick={() => openForemanParameterSelectionModal(additionalData)}
           >
-            <Icon type="pf" name="settings" title="change parameters" />
+            <Icon type="pf" name="settings" title={__("change parameters")} />
           </Button>
           &nbsp;
           <Button
             bsStyle="default"
             onClick={() => openAnsibleParameterSelectionModal(additionalData)}
           >
-            <span title="change ansible variables">A</span>
+            <span title={__("change ansible variables")}>A</span>
           </Button>
           &nbsp;
           <DeleteTableEntry
@@ -126,11 +143,11 @@ class ApplicationInstance extends React.Component {
       renderEdit: (value, additionalData) => (
         <td style={{ padding: '2px' }}>
           <Button bsStyle="default" disabled>
-            <Icon type="pf" name="edit" />
+            <Icon type="pf" name={__("edit")} />
           </Button>
           &nbsp;
           <Button bsStyle="default" disabled>
-            <Icon type="pf" name="settings" />
+            <Icon type="pf" name={__("settings")} />
           </Button>
           &nbsp;
           <Button bsStyle="default" disabled>
@@ -200,6 +217,12 @@ class ApplicationInstance extends React.Component {
           prettyValue = serviceList[value];
           return inlineEditFormatterImpl.renderValue(prettyValue, additionalData)
         }
+	if (additionalData.property == 'hostname') {
+	  if (additionalData.rowData.newEntry === true) {
+            return inlineEditFormatterImpl.renderEditText(value, additionalData);
+          }
+          return inlineEditFormatterImpl.renderValue(prettyValue, additionalData)
+        }
         return inlineEditFormatterImpl.renderEditText(prettyValue, additionalData);
       }
     });
@@ -228,13 +251,17 @@ class ApplicationInstance extends React.Component {
       closeForemanParameterSelectionModal,
       openAnsibleParameterSelectionModal,
       closeAnsibleParameterSelectionModal,
+      changeParameterSelectionMode,
       loadApplicationDefinition,
     } = this.props;
 
-    // Start from validation when pressing submit. This should be in componentDidMount() but
-    // unfortunatley then the event wasn't fired. To make sure, that the on-click is only added
-    // once, there is a workaround to check if a css class "bound" exists.
-    $('input[type="submit"][name="commit"]:not(.bound)').addClass('bound').on('click', () => this.validateParameters());
+    let { validateResult, validateMsg } = this.validateParameters();
+
+    if (validateResult == false) {
+      $('input[type="submit"][name="commit"]').attr("disabled", true);
+    } else {
+      $('input[type="submit"][name="commit"]').attr("disabled", false);
+    }
 
     return (
       <span>
@@ -255,13 +282,13 @@ class ApplicationInstance extends React.Component {
             selectValue={ appDefinition.id.toString() }
             additionalData={{url: appDefinitionUrl}}
           />
+          {appDefinition.id == '' ? (
+          <p style={{ paddingTop: 25 }}>
+            <pre>{ "App Definition can't be blank" }</pre>
+          </p>
+        ) : (<div></div>)}
         </div>
         <div className="form-group">
-          <AddTableEntry
-             hidden={ false }
-             disabled={ this.props.editMode }
-             onAddTableEntry={ addApplicationInstanceHost }
-          />
           <Table.PfProvider
             striped
             bordered
@@ -291,7 +318,7 @@ class ApplicationInstance extends React.Component {
           </Table.PfProvider>
           <AddTableEntry
             hidden={ false }
-            disabled={ this.props.editMode }
+            disabled={ this.addTableEntryAllowed() }
             onAddTableEntry={ addApplicationInstanceHost }
           />
           <span style={{ marginLeft: 30 }}>
@@ -304,7 +331,7 @@ class ApplicationInstance extends React.Component {
                 isAllGroup: true
               })}
             >
-              <span title="change ansible variables for 'all'">A</span>
+              <span title={__("change ansible variables for 'all'")}>A</span>
             </Button>
           </span>
         </div>
@@ -312,13 +339,14 @@ class ApplicationInstance extends React.Component {
           <ForemanModal
             id="AppInstanceForemanParamSelection"
             dialogClassName="param_selection_modal"
-            title="Foreman Parameter specification for Application Instance"
+            title={__("Foreman Parameter specification for Application Instance")}
           >
             <ForemanModal.Header closeButton={false}>
               Parameter specification
             </ForemanModal.Header>
             {this.props.parametersData ? (
               <ParameterSelection
+                editModeCallback={ (hide) => changeParameterSelectionMode({ mode: hide })}
                 paramType={ PARAMETER_SELECTION_PARAM_TYPE_FOREMAN }
                 location={ location }
                 organization={ organization }
@@ -329,8 +357,8 @@ class ApplicationInstance extends React.Component {
             }
             <ForemanModal.Footer>
               <div>
-                <Button bsStyle="primary" onClick={() => closeForemanParameterSelectionModal({ mode: 'save' })}>Save</Button>
-                <Button bsStyle="default" onClick={() => closeForemanParameterSelectionModal({ mode: 'cancel' })}>Cancel</Button>
+                <Button bsStyle="primary" disabled={this.props.paramEditMode} onClick={() => closeForemanParameterSelectionModal({ mode: 'save' })}>{__("Save")}</Button>
+                <Button bsStyle="default" disabled={this.props.paramEditMode} onClick={() => closeForemanParameterSelectionModal({ mode: 'cancel' })}>{__("Cancel")}</Button>
               </div>
             </ForemanModal.Footer>
           </ForemanModal>
@@ -339,13 +367,14 @@ class ApplicationInstance extends React.Component {
           <ForemanModal
             id="AppInstanceAnsibleParamSelection"
             dialogClassName="param_selection_modal"
-            title="Ansible group variables for Application Instance"
+            title={__("Ansible group variables for Application Instance")}
           >
             <ForemanModal.Header closeButton={false}>
               Parameter specification
             </ForemanModal.Header>
             {this.props.parametersData ? (
               <ParameterSelection
+                editModeCallback={ (hide) => changeParameterSelectionMode({ mode: hide })}
                 paramType={ PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE }
                 location={ location }
                 organization={ organization }
@@ -355,12 +384,17 @@ class ApplicationInstance extends React.Component {
             }
             <ForemanModal.Footer>
               <div>
-                <Button bsStyle="primary" onClick={() => closeAnsibleParameterSelectionModal({ mode: 'save' })}>Save</Button>
-                <Button bsStyle="default" onClick={() => closeAnsibleParameterSelectionModal({ mode: 'cancel' })}>Cancel</Button>
+                <Button bsStyle="primary" disabled={this.props.paramEditMode} onClick={() => closeAnsibleParameterSelectionModal({ mode: 'save' })}>{__("Save")}</Button>
+                <Button bsStyle="default" disabled={this.props.paramEditMode} onClick={() => closeAnsibleParameterSelectionModal({ mode: 'cancel' })}>{__("Cancel")}</Button>
               </div>
             </ForemanModal.Footer>
           </ForemanModal>
         </div>
+        {validateResult == false ? (
+          <p style={{ paddingTop: 25 }}>
+            <pre>{ validateMsg }</pre>
+          </p>
+        ) : (<div></div>)}
         <RailsData
           key='applications_instance'
           view='app_instance'
@@ -387,6 +421,7 @@ ApplicationInstance.defaultProps = {
   parametersData: {},
   columns: [],
   editParamsOfRowId: null,
+  paramEditMode: false,
 }
 
 ApplicationInstance.propTypes = {
@@ -408,7 +443,9 @@ ApplicationInstance.propTypes = {
   closeForemanParameterSelectionModal: PropTypes.func,
   openAnsibleParameterSelectionModal: PropTypes.func,
   closeAnsibleParameterSelectionModal: PropTypes.func,
+  changeParameterSelectionMode: PropTypes.func,
   parametersData: PropTypes.object,
+  paramEditMode: PropTypes.bool,
 };
 
 export default ApplicationInstance;

data/webpack/components/ApplicationInstance/ApplicationInstanceActions.js

@@ -29,6 +29,7 @@ import {
   APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_REQUEST,
   APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_SUCCESS,
   APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_FAILURE,
+  APPLICATION_INSTANCE_CHANGE_PARAMETER_SELECTION_MODE,
 } from './ApplicationInstanceConstants';
 
 export const initApplicationInstance = (
@@ -237,3 +238,10 @@ export const closeAnsibleParameterSelectionModal = (additionalData) => dispatch
     setModalClosed({ id: 'AppInstanceAnsibleParamSelection' })
   );
 }
+
+export const changeParameterSelectionMode = (additionalData) => ({
+  type: APPLICATION_INSTANCE_CHANGE_PARAMETER_SELECTION_MODE,
+  payload: {
+    ...additionalData,
+  },
+})

data/webpack/components/ApplicationInstance/ApplicationInstanceConstants.js

@@ -12,3 +12,4 @@ export const APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN = 'APPL
 export const APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE = 'APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE';
 export const APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN = 'APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN';
 export const APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE = 'APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE';
+export const APPLICATION_INSTANCE_CHANGE_PARAMETER_SELECTION_MODE = 'APPLICATION_INSTANCE_CHANGE_PARAMETER_SELECTION_MODE';

data/webpack/components/ApplicationInstance/ApplicationInstanceReducer.js

@@ -21,6 +21,7 @@ import {
   APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE,
   APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN,
   APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE,
+  APPLICATION_INSTANCE_CHANGE_PARAMETER_SELECTION_MODE,
 } from './ApplicationInstanceConstants';
 
 import {
@@ -133,13 +134,23 @@ const applicationInstanceConf = (state = initialState, action) => {
         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");
+        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 for this Application Instance. Please make sure that every host name is unique");
+        window.alert("Host name already used in this Application Instance. Please make sure that every host name is unique.");
         return state;
       }
 
@@ -287,6 +298,9 @@ const applicationInstanceConf = (state = initialState, action) => {
       }
       return state.merge(newState);
     }
+    case APPLICATION_INSTANCE_CHANGE_PARAMETER_SELECTION_MODE: {
+      return state.merge({ paramEditMode: payload.mode });
+    }
     default:
       return state;
   }

data/webpack/components/ApplicationInstance/ApplicationInstanceSelectors.js

@@ -7,3 +7,4 @@ export const selectColumns = state => applicationInstanceConf(state).columns;
 export const selectServices = state => applicationInstanceConf(state).services;
 export const selectParametersData = state => applicationInstanceConf(state).parametersData;
 export const selectAnsibleVarsAll = state => applicationInstanceConf(state).ansibleVarsAll;
+export const selectParamEditMode = state => applicationInstanceConf(state).paramEditMode;

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

@@ -9,7 +9,7 @@ const Service= ({
 }) =>{
   return (
     <div>
-      <label>{name}:</label> {currentCount} (Min/Max: {minCount}/{maxCount})
+      <label>{name}:</label> {currentCount} ({__("Min/Max")}: {minCount}/{maxCount})
     </div>
   );
 };

data/webpack/components/ApplicationInstance/index.js

@@ -13,6 +13,7 @@ import {
   selectColumns,
   selectParametersData,
   selectAnsibleVarsAll,
+  selectParamEditMode,
 } from './ApplicationInstanceSelectors';
 
 const mapStateToProps = state => ({
@@ -23,6 +24,7 @@ const mapStateToProps = state => ({
   columns: selectColumns(state),
   parametersData: selectParametersData(state),
   ansibleVarsAll: selectAnsibleVarsAll(state),
+  paramEditMode: selectParamEditMode(state),
 });
 
 const mapDispatchToProps = dispatch =>