foreman_acd 0.2.1 → 0.3.0

data/webpack/components/ApplicationInstance/ApplicationInstanceActions.js

@@ -22,8 +22,10 @@ import {
   APPLICATION_INSTANCE_HOST_EDIT_CONFIRM,
   APPLICATION_INSTANCE_HOST_EDIT_CHANGE,
   APPLICATION_INSTANCE_HOST_EDIT_CANCEL,
-  APPLICATION_INSTANCE_PARAMETER_SELECTION_MODAL_OPEN,
-  APPLICATION_INSTANCE_PARAMETER_SELECTION_MODAL_CLOSE,
+  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_LOAD_APPLICATION_DEFINITION_REQUEST,
   APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_SUCCESS,
   APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_FAILURE,
@@ -32,6 +34,7 @@ import {
 export const initApplicationInstance = (
   appDefinition,
   hosts,
+  ansibleVarsAll,
   headerFormatter,
   inlineEditFormatter,
   inlineEditButtonsFormatter,
@@ -107,6 +110,7 @@ export const initApplicationInstance = (
 
   initialState.appDefinition = appDefinition;
   initialState.hosts = hosts;
+  initialState.ansibleVarsAll = ansibleVarsAll;
 
   dispatch({
     type: APPLICATION_INSTANCE_INIT,
@@ -184,27 +188,52 @@ export const changeEditApplicationInstanceHost = (value, additionalData) => ({
   },
 });
 
-export const openParameterSelectionModal = (additionalData) => dispatch => {
+export const openForemanParameterSelectionModal = (additionalData) => dispatch => {
   dispatch({
-    type: APPLICATION_INSTANCE_PARAMETER_SELECTION_MODAL_OPEN,
+    type: APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN,
     payload: {
       ...additionalData,
     }
   });
   dispatch(
-    setModalOpen({ id: 'AppInstanceParamSelection' })
+    setModalOpen({ id: 'AppInstanceForemanParamSelection' })
   );
 }
 
-export const closeParameterSelectionModal = (additionalData) => dispatch => {
+export const closeForemanParameterSelectionModal = (additionalData) => dispatch => {
   dispatch({
-    type: APPLICATION_INSTANCE_PARAMETER_SELECTION_MODAL_CLOSE,
+    type: APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE,
     payload: {
       ...additionalData,
     }
   });
 
   dispatch(
-    setModalClosed({ id: 'AppInstanceParamSelection' })
+    setModalClosed({ id: 'AppInstanceForemanParamSelection' })
+  );
+}
+
+export const openAnsibleParameterSelectionModal = (additionalData) => dispatch => {
+  dispatch({
+    type: APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN,
+    payload: {
+      ...additionalData,
+    }
+  });
+  dispatch(
+    setModalOpen({ id: 'AppInstanceAnsibleParamSelection' })
+  );
+}
+
+export const closeAnsibleParameterSelectionModal = (additionalData) => dispatch => {
+  dispatch({
+    type: APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE,
+    payload: {
+      ...additionalData,
+    }
+  });
+
+  dispatch(
+    setModalClosed({ id: 'AppInstanceAnsibleParamSelection' })
   );
 }

data/webpack/components/ApplicationInstance/ApplicationInstanceConstants.js

@@ -8,5 +8,7 @@ export const APPLICATION_INSTANCE_HOST_EDIT_ACTIVATE = 'APPLICATION_INSTANCE_HOS
 export const APPLICATION_INSTANCE_HOST_EDIT_CONFIRM = 'APPLICATION_INSTANCE_HOST_EDIT_CONFIRM';
 export const APPLICATION_INSTANCE_HOST_EDIT_CHANGE = 'APPLICATION_INSTANCE_HOST_EDIT_CHANGE';
 export const APPLICATION_INSTANCE_HOST_EDIT_CANCEL = 'APPLICATION_INSTANCE_HOST_EDIT_CANCEL';
-export const APPLICATION_INSTANCE_PARAMETER_SELECTION_MODAL_OPEN = 'APPLICATION_INSTANCE_PARAMETER_SELECTION_MODAL_OPEN';
-export const APPLICATION_INSTANCE_PARAMETER_SELECTION_MODAL_CLOSE = 'APPLICATION_INSTANCE_PARAMETER_SELECTION_MODAL_CLOSE';
+export const APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN = 'APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN';
+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';

data/webpack/components/ApplicationInstance/ApplicationInstanceReducer.js

@@ -17,10 +17,17 @@ import {
   APPLICATION_INSTANCE_HOST_EDIT_CONFIRM,
   APPLICATION_INSTANCE_HOST_EDIT_CHANGE,
   APPLICATION_INSTANCE_HOST_EDIT_CANCEL,
-  APPLICATION_INSTANCE_PARAMETER_SELECTION_MODAL_OPEN,
-  APPLICATION_INSTANCE_PARAMETER_SELECTION_MODAL_CLOSE,
+  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,
 } from './ApplicationInstanceConstants';
 
+import {
+  PARAMETER_SELECTION_PARAM_TYPE_FOREMAN,
+  PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE,
+} from '../ParameterSelection/ParameterSelectionConstants';
+
 export const initialState = Immutable({
   name: false,
   error: { errorMsg: '', status: '', statusText: '' },
@@ -40,6 +47,7 @@ const applicationInstanceConf = (state = initialState, action) => {
       return state.set('loading', true);
     }
     case APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_SUCCESS: {
+      let newState = {};
       const services = JSON.parse(payload.app_definition.services);
 
       // initialize all services count with 0
@@ -56,11 +64,18 @@ const applicationInstanceConf = (state = initialState, action) => {
         });
       }
 
-      return state.merge({
+      newState = {
         appDefinition: payload.app_definition,
         services: services,
         loading: false,
-      });
+      };
+
+      // Initialize ansibleVarsAll if there is no data available in app instance
+      if (state.ansibleVarsAll.length <= 0) {
+        newState['ansibleVarsAll'] = JSON.parse(payload.app_definition.ansible_vars_all);
+      }
+
+      return state.merge(newState);
     }
     case APPLICATION_INSTANCE_HOST_ADD: {
       let hosts = [];
@@ -71,7 +86,7 @@ const applicationInstanceConf = (state = initialState, action) => {
         index = Math.max(...hosts.map(e => e.id)) + 1;
       }
 
-      const newRow = {id: index, hostname: "", description: '', service: '', parameters: [], newEntry: true };
+      const newRow = {id: index, hostname: "", description: '', service: '', foremanParameters: [], ansibleParameters: [], newEntry: true };
       newRow.backup = cloneDeep(newRow)
       hosts.push(newRow);
 
@@ -131,7 +146,8 @@ const applicationInstanceConf = (state = initialState, action) => {
       // 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];
-          hosts[index].parameters = selectedService.parameters;
+          hosts[index].foremanParameters = selectedService.foremanParameters;
+          hosts[index].ansibleParameters = selectedService.ansibleParameters;
 
           const hostServiceId = Number(thisHost.service);
           const service = services.find(serv => serv['id'] == hostServiceId);
@@ -175,35 +191,35 @@ const applicationInstanceConf = (state = initialState, action) => {
         hosts: hosts
       });
     }
-    case APPLICATION_INSTANCE_PARAMETER_SELECTION_MODAL_OPEN: {
+    case APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN: {
       let parametersData = {};
 
-      if (payload && payload.rowData) {
-        const selectedService = state.services.filter(entry => entry.id == payload.rowData.service)[0];
+      const selectedService = state.services.filter(entry => entry.id == payload.rowData.service)[0];
+
+      parametersData.paramDefinition = {
+        id: selectedService.id,
+        name: selectedService.name,
+        dataId: selectedService.hostgroup,
+        hostId: payload.rowData.id,
+        // TODO: is this really correct? Guess it shoud be dataId and we should get rid of them
+        //hostgroup_id: selectedService.hostgroup,
+      };
+      parametersData.type = PARAMETER_SELECTION_PARAM_TYPE_FOREMAN;
+      parametersData.parameters = payload.rowData.foremanParameters;
+      parametersData.useDefaultValue = false;
+      parametersData.allowRowAdjustment = false;
+      parametersData.allowNameAdjustment = false;
+      parametersData.allowDescriptionAdjustment = false;
 
-        parametersData.serviceDefinition = {
-          id: selectedService.id,
-          name: selectedService.name,
-          hostgroup_id: selectedService.hostgroup,
-          hostId: payload.rowData.id,
-        };
-        parametersData.parameters = payload.rowData.parameters;
-
-        if (parametersData.parameters.length > 0) {
-          parametersData.mode = 'editInstance';
-        } else {
-          parametersData.mode = 'newInstance';
-        }
-      }
       return state.merge({
         parametersData: parametersData,
       });
     }
-    case APPLICATION_INSTANCE_PARAMETER_SELECTION_MODAL_CLOSE: {
+    case APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE: {
       if (payload.mode == 'save') {
         const hosts = cloneDeep(state.hosts);
-        const index = findIndex(hosts, { id: state.parametersData.serviceDefinition.hostId });
-        hosts[index].parameters = cloneDeep(payload.hostParameterSelection);
+        const index = findIndex(hosts, { id: state.parametersData.paramDefinition.hostId });
+        hosts[index].foremanParameters = cloneDeep(payload.parameterSelection);
 
         return state.merge({
           parametersData: null,
@@ -215,6 +231,62 @@ const applicationInstanceConf = (state = initialState, action) => {
         });
       }
     }
+    case APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN: {
+      let parametersData = {};
+
+      if ((payload.hasOwnProperty('isAllGroup')) && (payload.isAllGroup == true)) {
+        parametersData.parameters = state.ansibleVarsAll;
+        parametersData.paramDefinition = {
+          isAllGroup: true,
+        }
+      } else {
+        const selectedService = state.services.filter(entry => entry.id == payload.rowData.service)[0];
+
+        parametersData.paramDefinition = {
+          id: selectedService.id,
+          name: selectedService.name,
+          hostId: payload.rowData.id,
+          // TODO: is this really correct? Guess it shoud be dataId and we should get rid of them
+          //hostgroup_id: selectedService.hostgroup,
+        };
+        parametersData.parameters = payload.rowData.ansibleParameters;
+      }
+
+      parametersData.type = PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE;
+      parametersData.useDefaultValue = false;
+      parametersData.allowRowAdjustment = false;
+      parametersData.allowNameAdjustment = false;
+      parametersData.allowDescriptionAdjustment = false;
+
+      return state.merge({
+        parametersData: parametersData,
+      });
+    }
+    case APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE: {
+      let newState = {};
+      if (payload.mode == 'save') {
+        if ((state.parametersData.paramDefinition.hasOwnProperty('isAllGroup')) && (state.parametersData.paramDefinition.isAllGroup == true)) {
+          newState = {
+            parametersData: null,
+            ansibleVarsAll: cloneDeep(payload.parameterSelection),
+          };
+        } else {
+          const hosts = cloneDeep(state.hosts);
+          const index = findIndex(hosts, { id: state.parametersData.paramDefinition.hostId });
+          hosts[index].ansibleParameters = cloneDeep(payload.parameterSelection);
+
+          newState = {
+            parametersData: null,
+            hosts: hosts
+          };
+        }
+      } else {
+        newState = {
+          parametersData: null,
+        };
+      }
+      return state.merge(newState);
+    }
     default:
       return state;
   }

data/webpack/components/ApplicationInstance/ApplicationInstanceSelectors.js

@@ -4,5 +4,6 @@ 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 selectParametersData = state => applicationInstanceConf(state).parametersData;
 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/index.js

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

data/webpack/components/ParameterSelection/ParameterSelection.js

@@ -10,12 +10,6 @@ import DeleteTableEntry from '../common/DeleteTableEntry';
 import ExtSelect from '../common/ExtSelect';
 
 import {
-  isNewDefinition,
-  isEditDefinition,
-  isDefinition,
-  isNewInstance,
-  isEditInstance,
-  isInstance,
   transformForemanData,
 } from './ParameterSelectionHelper';
 
@@ -27,6 +21,8 @@ import {
 
 import {
   PARAMETER_SELECTION_TYPES,
+  PARAMETER_SELECTION_PARAM_TYPE_FOREMAN,
+  PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE,
 } from './ParameterSelectionConstants';
 
 import {
@@ -60,19 +56,28 @@ class ParameterSelection extends React.Component {
 
   componentDidMount() {
     const {
-      data: { mode, parameters, serviceDefinition },
+      data: { useDefaultValue, allowRowAdjustment, allowNameAdjustment, allowDescriptionAdjustment, parameters, paramDefinition },
       location,
       organization,
-      loadForemanDataUrl,
+      paramType,
+      paramDataUrl,
       initParameterSelection,
       sortParameter,
       deleteParameter,
       activateEditParameter,
       changeEditParameter,
-      loadForemanData,
+      loadParamData,
     } = this.props;
 
-    loadForemanData(serviceDefinition.hostgroup_id, { url: loadForemanDataUrl, clearParameters: false });
+    if (paramDataUrl !== undefined) {
+      switch (paramType) {
+        case PARAMETER_SELECTION_PARAM_TYPE_FOREMAN: {
+          loadParamData({ paramDefinition: paramDefinition, url: paramDataUrl, dataType: paramType, clearParameters: false });
+          break;
+        }
+        default: { }
+      }
+    }
 
     const inlineEditButtonsFormatter = inlineEditFormatterFactory({
       isEditing: additionalData => this.props.editMode,
@@ -85,7 +90,7 @@ class ParameterSelection extends React.Component {
             <Icon type="pf" name="edit" />
           </Button>
           <DeleteTableEntry
-            hidden={isInstance(mode)}
+            hidden={!allowRowAdjustment}
             disabled={false}
             onDeleteTableEntry={deleteParameter}
             additionalData={additionalData}
@@ -98,7 +103,7 @@ class ParameterSelection extends React.Component {
             <Icon type="pf" name="edit" />
           </Button>
           <DeleteTableEntry
-            hidden={isInstance(mode)}
+            hidden={!allowRowAdjustment}
             disabled={true}
             onDeleteTableEntry={deleteParameter}
             additionalData={additionalData}
@@ -152,6 +157,8 @@ class ParameterSelection extends React.Component {
       ),
     };
 
+    // TODO: should we differentiate between paramType FOREMAN and ANSIBLE?
+
     const inlineEditFormatter = inlineEditFormatterFactory({
       isEditing: additionalData => this.isEditing(additionalData),
       renderValue: (value, additionalData) => {
@@ -161,22 +168,25 @@ class ParameterSelection extends React.Component {
         } else if (additionalData.property == 'value') {
           switch (additionalData.rowData.type) {
             case 'computeprofile':
-              prettyValue = transformForemanData(this.props.foremanData['computeprofiles'])[value]
+              prettyValue = transformForemanData(this.props.paramData['computeprofiles'])[value]
               break;
             case 'domain':
-              prettyValue = transformForemanData(this.props.foremanData['domains'])[value]
+              prettyValue = transformForemanData(this.props.paramData['domains'])[value]
               break;
             case 'lifecycleenv':
-              prettyValue = transformForemanData(this.props.foremanData['lifecycle_environments'])[value]
+              prettyValue = transformForemanData(this.props.paramData['lifecycle_environments'])[value]
               break;
             case 'ptable':
-              prettyValue = transformForemanData(this.props.foremanData['ptables'])[value]
+              prettyValue = transformForemanData(this.props.paramData['ptables'])[value]
               break;
             case 'password':
               prettyValue = '****************'
               break;
             case 'puppetenv':
-              prettyValue = transformForemanData(this.props.foremanData['environments'])[value]
+              prettyValue = transformForemanData(this.props.paramData['environments'])[value]
+              break;
+            case 'text':
+              prettyValue = value
               break;
           }
         }
@@ -192,15 +202,15 @@ class ParameterSelection extends React.Component {
           case 'value':
             switch (additionalData.rowData.type) {
               case 'computeprofile':
-                return inlineEditFormatterImpl.renderEditSelect(value, additionalData, transformForemanData(this.props.foremanData['computeprofiles']));
+                return inlineEditFormatterImpl.renderEditSelect(value, additionalData, transformForemanData(this.props.paramData['computeprofiles']));
               case 'domain':
-                return inlineEditFormatterImpl.renderEditSelect(value, additionalData, transformForemanData(this.props.foremanData['domains']));
+                return inlineEditFormatterImpl.renderEditSelect(value, additionalData, transformForemanData(this.props.paramData['domains']));
               case 'lifecycleenv':
-                return inlineEditFormatterImpl.renderEditSelect(value, additionalData, transformForemanData(this.props.foremanData['lifecycle_environments']));
+                return inlineEditFormatterImpl.renderEditSelect(value, additionalData, transformForemanData(this.props.paramData['lifecycle_environments']));
               case 'puppetenv':
-                return inlineEditFormatterImpl.renderEditSelect(value, additionalData, transformForemanData(this.props.foremanData['environments']));
+                return inlineEditFormatterImpl.renderEditSelect(value, additionalData, transformForemanData(this.props.paramData['environments']));
               case 'ptable':
-                return inlineEditFormatterImpl.renderEditSelect(value, additionalData, transformForemanData(this.props.foremanData['ptables']));
+                return inlineEditFormatterImpl.renderEditSelect(value, additionalData, transformForemanData(this.props.paramData['ptables']));
               case 'password':
                 return inlineEditFormatterImpl.renderEditText(value, additionalData, 'password');
               case 'text':
@@ -215,9 +225,12 @@ class ParameterSelection extends React.Component {
     this.inlineEditFormatter = inlineEditFormatter;
 
     initParameterSelection(
-      mode,
-      serviceDefinition,
+      paramType,
+      paramDefinition,
       parameters,
+      useDefaultValue,
+      allowNameAdjustment,
+      allowDescriptionAdjustment,
       this.sortingFormatter,
       this.sortableTransform,
       this.inlineEditFormatter,
@@ -230,10 +243,9 @@ class ParameterSelection extends React.Component {
 
   render() {
     const {
-      data: { mode, applications },
+      data: { allowRowAdjustment, applications },
       location,
       organization,
-      loadForemanDataUrl,
       parameters,
       columns,
       sortingColumns,
@@ -241,8 +253,6 @@ class ParameterSelection extends React.Component {
       addParameter,
       confirmEditParameter,
       cancelEditParameter,
-      loadForemanData,
-      serviceDefinition,
     } = this.props;
 
     let sortedParameters;
@@ -279,7 +289,7 @@ class ParameterSelection extends React.Component {
         <div className="clearfix">
           <div className="form-group">
             <AddTableEntry
-               hidden={isInstance(mode)}
+               hidden={!allowRowAdjustment}
                disabled={ this.props.editMode }
                onAddTableEntry={ addParameter }
             />
@@ -319,7 +329,7 @@ class ParameterSelection extends React.Component {
               />
             </Table.PfProvider>
             <AddTableEntry
-               hidden={isInstance(mode)}
+               hidden={!allowRowAdjustment}
                disabled={ this.props.editMode }
                onAddTableEntry={ addParameter }
             />
@@ -334,7 +344,7 @@ ParameterSelection.defaultProps = {
   error: {},
   editMode: false,
   loading: false,
-  foremanData: {},
+  paramData: {},
   parameters: [],
   columns: [],
   sortingColumns: {},
@@ -342,18 +352,17 @@ ParameterSelection.defaultProps = {
 
 ParameterSelection.propTypes = {
   data: PropTypes.shape({
-    mode: PropTypes.string.isRequired,
     parameters: PropTypes.array,
-    serviceDefinition: PropTypes.object,
+    paramDefinition: PropTypes.object,
     applications: PropTypes.object,
   }).isRequired,
   location: PropTypes.string.isRequired,
   organization: PropTypes.string.isRequired,
-  loadForemanDataUrl: PropTypes.string,
+  paramDataUrl: PropTypes.string,
   initParameterSelection: PropTypes.func,
   editMode: PropTypes.bool.isRequired,
   loading: PropTypes.bool.isRequired,
-  foremanData: PropTypes.object.isRequired,
+  paramData: PropTypes.object.isRequired,
   parameterTypes: PropTypes.object,
   parameters: PropTypes.array,
   sortingColumns: PropTypes.object,
@@ -365,8 +374,8 @@ ParameterSelection.propTypes = {
   confirmEditParameter: PropTypes.func,
   cancelEditParameter: PropTypes.func,
   changeEditParameter: PropTypes.func,
-  loadForemanData: PropTypes.func,
-  serviceDefinition: PropTypes.object,
+  loadParamData: PropTypes.func,
+  paramDefinition: PropTypes.object,
 };
 
 export default ParameterSelection;