foreman_acd 0.4.0 → 0.9.0

data/webpack/__mocks__/foremanReact/components/ForemanModal.js

@@ -0,0 +1,7 @@
+const ForemanModal = () => {};
+const Header = s => s;
+const Footer = s => s;
+
+ForemanModal.Header = Header;
+ForemanModal.Footer = Footer;
+export default ForemanModal;

data/webpack/__mocks__/foremanReact/components/common/forms/CommonForm.js

@@ -0,0 +1,2 @@
+const CommonForm = () => jest.fn();
+export default CommonForm;

data/webpack/__mocks__/foremanReact/components/common/forms/TextInput.js

@@ -0,0 +1,2 @@
+const TextInput = () => jest.fn();
+export default TextInput;

data/webpack/__mocks__/foremanReact/components/hosts/powerStatus.js

@@ -0,0 +1 @@
+export const PowerStatus = () => jest.fn();

data/webpack/__snapshots__/helper.test.js.snap

@@ -0,0 +1,14 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`helper creates a object from an array 1`] = `
+<TableHeading
+  align=""
+  aria-label="TheLabel"
+  className=""
+  p1="1"
+  sort={false}
+  sortDirection=""
+>
+  MyValue
+</TableHeading>
+`;

data/webpack/components/ApplicationDefinition/ApplicationDefinition.js

@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import {
   Icon,
   Button,
+  MessageDialog,
 } from 'patternfly-react';
 import * as resolve from 'table-resolver';
 import ForemanModal from 'foremanReact/components/ForemanModal';
@@ -12,8 +13,9 @@ import ParameterSelection from '../ParameterSelection';
 import AddTableEntry from '../common/AddTableEntry';
 import DeleteTableEntry from '../common/DeleteTableEntry';
 import RailsData from '../common/RailsData';
-import EasyHeaderFormatter from '../common/EasyHeaderFormatter';
 import AnsiblePlaybookSelector from './components/AnsiblePlaybookSelector';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { EasyHeaderFormatter } from '../../helper';
 
 import {
   Table,
@@ -49,6 +51,10 @@ class ApplicationDefinition extends React.Component {
     return ansibleGroupObj;
   }
 
+  addTableEntryAllowed() {
+    return this.props.editMode || this.props.ansiblePlaybook.id == ''
+  }
+
   componentDidMount() {
     const {
       data: { mode, ansiblePlaybook, ansibleDataUrl, services, ansibleVarsAll, hostgroups },
@@ -70,22 +76,23 @@ class ApplicationDefinition extends React.Component {
             bsStyle="default"
             onClick={() => activateEditApplicationDefinitionService(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
             hidden={false}
             disabled={false}
@@ -97,17 +104,18 @@ class ApplicationDefinition 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>
             <span>A</span>
           </Button>
+          &nbsp;
           <DeleteTableEntry
             hidden={false}
             disabled={true}
@@ -195,6 +203,7 @@ class ApplicationDefinition extends React.Component {
   render() {
     const {
       data: { organization, location, mode, ansiblePlaybooks, foremanDataUrl, ansibleDataUrl },
+      showAlertModal, alertModalText, alertModalTitle, closeAlertModal,
       ansiblePlaybook,
       services,
       columns,
@@ -204,15 +213,27 @@ class ApplicationDefinition extends React.Component {
       closeForemanParameterSelectionModal,
       openAnsibleParameterSelectionModal,
       closeAnsibleParameterSelectionModal,
+      changeParameterSelectionMode,
       ParameterSelectionModal,
       loadAnsibleData,
     } = this.props;
 
     return (
       <span>
+        <MessageDialog
+          show={showAlertModal}
+          onHide={closeAlertModal}
+          primaryAction={closeAlertModal}
+          primaryActionButtonContent={__('OK')}
+          primaryActionButtonBsStyle={"danger"}
+          icon={<Icon type="pf" name="error-circle-o" />}
+          title={alertModalTitle}
+          primaryContent={alertModalText}
+        />
         <div>
           <AnsiblePlaybookSelector
             label="Ansible Playbook"
+            hidden={ false }
             editable={ mode == 'newDefinition' }
             viewText={ ansiblePlaybook.name }
             options={ ansiblePlaybooks }
@@ -220,13 +241,14 @@ class ApplicationDefinition extends React.Component {
             selectValue={ ansiblePlaybook.id.toString() }
             additionalData={{url: ansibleDataUrl }}
           />
+          {ansiblePlaybook.id == '' ? (
+          <div style={{ paddingTop: 25 }}>
+            <pre>{ "Ansible Playbook can't be blank" }</pre>
+          </div>
+        ) : (<div></div>)}
+
         </div>
         <div className="form-group">
-          <AddTableEntry
-            hidden={ false }
-            disabled={ this.props.editMode }
-            onAddTableEntry={ addApplicationDefinitionService }
-          />
           <Table.PfProvider
             striped
             bordered
@@ -256,7 +278,7 @@ class ApplicationDefinition extends React.Component {
           </Table.PfProvider>
           <AddTableEntry
             hidden={ false }
-            disabled={ this.props.editMode }
+            disabled={ this.addTableEntryAllowed() }
             onAddTableEntry={ addApplicationDefinitionService }
           />
           <span style={{ marginLeft: 30 }}>
@@ -269,7 +291,7 @@ class ApplicationDefinition 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>
@@ -277,13 +299,14 @@ class ApplicationDefinition extends React.Component {
           <ForemanModal
             id="AppDefinitionForemanParamSelection"
             dialogClassName="param_selection_modal"
-            title="Foreman Parameter definition for Application Definition"
+            title={__("Foreman Parameter definition for Application Definition")}
           >
             <ForemanModal.Header closeButton={false}>
               Parameter definition
             </ForemanModal.Header>
             {this.props.parametersData ? (
               <ParameterSelection
+                editModeCallback={ (hide) => changeParameterSelectionMode({ mode: hide })}
                 paramType={ PARAMETER_SELECTION_PARAM_TYPE_FOREMAN }
                 location={ location }
                 organization={ organization }
@@ -294,8 +317,8 @@ class ApplicationDefinition 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>
@@ -304,13 +327,14 @@ class ApplicationDefinition extends React.Component {
           <ForemanModal
             id="AppDefinitionAnsibleParamSelection"
             dialogClassName="param_selection_modal"
-            title="Ansible variables for Application Definition"
+            title={__("Ansible variables for Application Definition")}
           >
             <ForemanModal.Header closeButton={false}>
               Parameter definition
             </ForemanModal.Header>
             {this.props.parametersData ? (
               <ParameterSelection
+                editModeCallback={ (hide) => changeParameterSelectionMode({ mode: hide })}
                 paramType={ PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE }
                 location={ location }
                 organization={ organization }
@@ -320,20 +344,20 @@ class ApplicationDefinition 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>
         <RailsData
-          key='applications_definition'
+          key='application_definition_services_data'
           view='app_definition'
           parameter='services'
           value={JSON.stringify(this.props.services)}
         />
         <RailsData
-          key='applications_definition'
+          key='application_definition_ansible_data'
           view='app_definition'
           parameter='ansible_vars_all'
           value={JSON.stringify(this.props.ansibleVarsAll)}
@@ -344,6 +368,9 @@ class ApplicationDefinition extends React.Component {
 
 ApplicationDefinition.defaultProps = {
   error: {},
+  showAlertModal: false,
+  alertModalText: '',
+  alertModalTitle: '',
   editMode: false,
   ansiblePlaybook: { "id": '', "name": '' },
   services: [],
@@ -351,15 +378,20 @@ ApplicationDefinition.defaultProps = {
   parametersData: {},
   columns: [],
   editParamsOfRowId: null,
+  paramEditMode: false,
 }
 
 ApplicationDefinition.propTypes = {
   initApplicationDefinition: PropTypes.func,
+  showAlertModal: PropTypes.bool,
+  alertModalText: PropTypes.string,
+  alertModalTitle: PropTypes.string,
   editMode: PropTypes.bool.isRequired,
   ansiblePlaybook: PropTypes.object,
   services: PropTypes.array,
   ansibleVarsAll: PropTypes.array,
   columns: PropTypes.array,
+  closeAlertModal: PropTypes.func,
   addApplicationDefinitionService: PropTypes.func,
   deleteApplicationDefinitionService: PropTypes.func,
   activateEditApplicationDefinitionService: PropTypes.func,
@@ -370,7 +402,9 @@ ApplicationDefinition.propTypes = {
   closeForemanParameterSelectionModal: PropTypes.func,
   openAnsibleParameterSelectionModal: PropTypes.func,
   closeAnsibleParameterSelectionModal: PropTypes.func,
+  changeParameterSelectionMode: PropTypes.func,
   parametersData: PropTypes.object,
+  paramEditMode: PropTypes.bool,
 };
 
 export default ApplicationDefinition;

data/webpack/components/ApplicationDefinition/ApplicationDefinitionActions.js

@@ -17,6 +17,7 @@ import {
 
 import {
   APPLICATION_DEFINITION_INIT,
+  APPLICATION_DEFINITION_CLOSE_ALERT_MODAL,
   APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_REQUEST,
   APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_SUCCESS,
   APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_FAILURE,
@@ -30,6 +31,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 {
@@ -181,6 +183,11 @@ const errorHandler = (msg, err) => {
   return { type: msg, payload: { error } };
 };
 
+export const closeAlertModal = () => ({
+  type: APPLICATION_DEFINITION_CLOSE_ALERT_MODAL,
+  payload: {}
+});
+
 export const loadAnsibleData = (
   ansiblePlaybookId,
   additionalData
@@ -293,3 +300,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

@@ -1,4 +1,5 @@
 export const APPLICATION_DEFINITION_INIT = 'INIT_APPLICATION_DEFINITION_INIT';
+export const APPLICATION_DEFINITION_CLOSE_ALERT_MODAL = 'APPLICATION_DEFINITION_CLOSE_ALERT_MODAL';
 export const APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_REQUEST = 'APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_REQUEST';
 export const APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_SUCCESS = 'APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_SUCCESS';
 export const APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_FAILURE = 'APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_FAILURE';
@@ -12,3 +13,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

@@ -1,4 +1,5 @@
 import Immutable from 'seamless-immutable';
+import { translate as __ } from 'foremanReact/common/I18n';
 
 import {
   cloneDeep,
@@ -8,6 +9,7 @@ import {
 
 import {
   APPLICATION_DEFINITION_INIT,
+  APPLICATION_DEFINITION_CLOSE_ALERT_MODAL,
   APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_REQUEST,
   APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_SUCCESS,
   APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_FAILURE,
@@ -21,6 +23,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 {
@@ -44,8 +47,15 @@ const applicationDefinitionConf = (state = initialState, action) => {
     case APPLICATION_DEFINITION_INIT: {
       return state.merge(payload);
     }
-
+    case APPLICATION_DEFINITION_CLOSE_ALERT_MODAL: {
+      return state.merge({
+        showAlertModal: false,
+        alertModalTitle: '',
+        alertModalText: '',
+      });
+    }
    case APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_FAILURE: {
+      console.log("Error while loading ansible data: "+ payload.error);
       return state.merge({ error: payload.error, loading: false });
     }
     case APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_REQUEST: {
@@ -109,6 +119,40 @@ 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 == '') {
+        return state.merge({
+          showAlertModal: true,
+          alertModalTitle: __("Error"),
+          alertModalText: __("Every service needs to have a valid name."),
+        });
+      }
+
+      if (thisService.hostgroup == '') {
+        return state.merge({
+          showAlertModal: true,
+          alertModalTitle: __("Error"),
+          alertModalText: __("Every service needs to be assigned to a hostgroup."),
+        });
+      }
+
+      if (thisService.ansibleGroup == '') {
+        return state.merge({
+          showAlertModal: true,
+          alertModalTitle: __("Error"),
+          alertModalText: __("Every service needs to be assigned to an ansible group."),
+        });
+      }
+
+      if (state.services.filter(v => v.name === thisService.name && v.id != thisService.id).length > 0) {
+        return state.merge({
+          showAlertModal: true,
+          alertModalTitle: __("Error"),
+          alertModalText: __("Service name already used in this Application Definition. Please make sure that every service name is unique."),
+        });
+      }
+
       delete services[index].backup;
       delete services[index].newEntry;
 
@@ -235,6 +279,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

@@ -1,8 +1,12 @@
 const applicationDefinitionConf = state => state.foremanAcd.applicationDefinitionConf;
 
+export const selectShowAlertModal = state => applicationDefinitionConf(state).showAlertModal;
+export const selectAlertModalText = state => applicationDefinitionConf(state).alertModalText;
+export const selectAlertModalTitle = state => applicationDefinitionConf(state).alertModalTitle;
 export const selectEditMode = state => applicationDefinitionConf(state).editMode;
 export const selectAnsiblePlaybook = state => applicationDefinitionConf(state).ansiblePlaybook;
 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;