foreman_acd 0.7.0 → 0.9.2

data/webpack/components/ApplicationInstance/ApplicationInstance.js

@@ -3,6 +3,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,6 +13,7 @@ import {
 } from 'foremanReact/common/I18n';
 import Select from 'foremanReact/components/common/forms/Select';
 import ParameterSelection from '../ParameterSelection';
+import ExistingHostSelection from '../ExistingHostSelection';
 import AddTableEntry from '../common/AddTableEntry';
 import DeleteTableEntry from '../common/DeleteTableEntry';
 import RailsData from '../common/RailsData';
@@ -41,7 +43,7 @@ class ApplicationInstance extends React.Component {
     return (rowData.backup !== undefined);
   }
 
-  addTableEntryAllowed() {
+  changeDataAllowed() {
     return this.props.editMode || this.props.appDefinition.id == ''
   }
 
@@ -90,7 +92,7 @@ class ApplicationInstance extends React.Component {
 
   componentDidMount() {
     const {
-      data: { mode, appDefinition, hosts, ansibleVarsAll, appDefinitionUrl },
+      data: { mode, appDefinition, hosts, ansibleVarsAll, appDefinitionUrl, supportedPlugins },
       initApplicationInstance,
       addApplicationInstanceHost,
       deleteApplicationInstanceHost,
@@ -105,29 +107,36 @@ class ApplicationInstance extends React.Component {
       loadApplicationDefinition(appDefinition.id, { url: appDefinitionUrl });
     }
 
+    const already_deployed_msg = __("This is an already deployed host. Changing the parameters is not possible!");
+
     const inlineEditButtonsFormatter = inlineEditFormatterFactory({
       isEditing: additionalData => this.props.editMode,
       renderValue: (value, additionalData) => (
         <td style={{ padding: '2px' }}>
+          { additionalData.rowData.isExistingHost == true ? (
+            <Icon style={{marginRight: 8, marginLeft: 2}} type="pf" name="info" title={already_deployed_msg} />
+          ) : (<span></span>)}
           <Button
             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")} />
-          </Button>
+          { additionalData.rowData.isExistingHost == false ? (
+            <Button
+              bsStyle="default"
+              onClick={() => openForemanParameterSelectionModal(additionalData)}
+            >
+              <Icon type="pf" name="settings" title={__("Change parameters")} />
+            </Button>
+          ) : (<span></span>)}
           &nbsp;
           <Button
             bsStyle="default"
             onClick={() => openAnsibleParameterSelectionModal(additionalData)}
           >
-            <span title={__("change ansible variables")}>A</span>
+            <span title={__("Change ansible variables")}>A</span>
           </Button>
           &nbsp;
           <DeleteTableEntry
@@ -140,13 +149,18 @@ class ApplicationInstance extends React.Component {
       ),
       renderEdit: (value, additionalData) => (
         <td style={{ padding: '2px' }}>
+          { additionalData.rowData.isExistingHost == true ? (
+            <Icon style={{marginRight: 8, marginLeft: 2}} type="pf" name="info" title={already_deployed_msg} />
+          ) : (<span></span>)}
           <Button bsStyle="default" disabled>
             <Icon type="pf" name={__("edit")} />
           </Button>
           &nbsp;
-          <Button bsStyle="default" disabled>
-            <Icon type="pf" name={__("settings")} />
-          </Button>
+          { additionalData.rowData.isExistingHost == false ? (
+            <Button bsStyle="default" disabled>
+              <Icon type="pf" name={__("settings")} />
+            </Button>
+          ) : (<span></span>)}
           &nbsp;
           <Button bsStyle="default" disabled>
             <span>A</span>
@@ -230,6 +244,7 @@ class ApplicationInstance extends React.Component {
       appDefinition,
       hosts,
       ansibleVarsAll,
+      supportedPlugins,
       this.headerFormatter,
       this.inlineEditFormatter,
       this.inlineEditButtonsFormatter,
@@ -239,16 +254,20 @@ class ApplicationInstance extends React.Component {
   render() {
     const {
       data: { mode, applications, organization, location, foremanDataUrl, appDefinitionUrl },
+      showAlertModal, alertModalText, alertModalTitle, closeAlertModal,
       appDefinition,
       services,
       hosts,
       columns,
+      hiddenForemanParameterTypes,
       addApplicationInstanceHost,
       confirmEditApplicationInstanceHost,
       cancelEditApplicationInstanceHost,
       closeForemanParameterSelectionModal,
       openAnsibleParameterSelectionModal,
       closeAnsibleParameterSelectionModal,
+      openAddExistingHostsModal,
+      closeAddExistingHostsModal,
       changeParameterSelectionMode,
       loadApplicationDefinition,
     } = this.props;
@@ -263,7 +282,17 @@ class ApplicationInstance extends React.Component {
 
     return (
       <span>
-        <div class="service-counter">
+        <MessageDialog
+          show={showAlertModal}
+          onHide={closeAlertModal}
+          primaryAction={closeAlertModal}
+          primaryActionButtonContent={__('OK')}
+          primaryActionButtonBsStyle={"danger"}
+          icon={<Icon type="pf" name="error-circle-o" />}
+          title={alertModalTitle}
+          primaryContent={alertModalText}
+        />
+        <div className="service-counter">
           <ServiceCounter
             title="Service counts"
             serviceList={ services }
@@ -273,6 +302,7 @@ class ApplicationInstance extends React.Component {
         <div>
           <AppDefinitionSelector
             label="Application Definition"
+            hidden={ false }
             editable={ mode == 'newInstance' }
             viewText={ appDefinition.name }
             options={ applications }
@@ -281,9 +311,9 @@ class ApplicationInstance extends React.Component {
             additionalData={{url: appDefinitionUrl}}
           />
           {appDefinition.id == '' ? (
-          <p style={{ paddingTop: 25 }}>
+          <div style={{ paddingTop: 25 }}>
             <pre>{ "App Definition can't be blank" }</pre>
-          </p>
+          </div>
         ) : (<div></div>)}
         </div>
         <div className="form-group">
@@ -309,27 +339,38 @@ class ApplicationInstance extends React.Component {
                 role: 'row',
                 isEditing: () => this.isEditing({ rowData }),
                 onCancel: () => cancelEditApplicationInstanceHost({ rowData, rowIndex }),
-                onConfirm: () => confirmEditApplicationInstanceHost({ rowData, rowIndex }),
+                onConfirm: () => confirmEditApplicationInstanceHost({ rowData, rowIndex, appDefinition }),
                 last: rowIndex === services.length - 1
               })}
             />
           </Table.PfProvider>
           <AddTableEntry
             hidden={ false }
-            disabled={ this.addTableEntryAllowed() }
+            disabled={ this.changeDataAllowed() }
             onAddTableEntry={ addApplicationInstanceHost }
           />
+          <span style={{ marginLeft: 10 }}>
+            <Button
+              bsStyle="default"
+              disabled={ this.changeDataAllowed() }
+              onClick={() => openAddExistingHostsModal({
+                isAllGroup: true
+              })}
+            >
+              <Icon title={__("Add existing hosts")} type="pf" name="server" />
+            </Button>
+          </span>
           <span style={{ marginLeft: 30 }}>
             Ansible group vars 'all':
             <Button
               style={{ marginLeft: 10 }}
               bsStyle="default"
-              disabled={ this.props.editMode }
+              disabled={ this.changeDataAllowed() }
               onClick={() => openAnsibleParameterSelectionModal({
                 isAllGroup: true
               })}
             >
-              <span title={__("change ansible variables for 'all'")}>A</span>
+              <span title={__("Change ansible variables for 'all'")}>A</span>
             </Button>
           </span>
         </div>
@@ -340,12 +381,13 @@ class ApplicationInstance extends React.Component {
             title={__("Foreman Parameter specification for Application Instance")}
           >
             <ForemanModal.Header closeButton={false}>
-              Parameter specification
+              {__("Parameter specification")}
             </ForemanModal.Header>
             {this.props.parametersData ? (
               <ParameterSelection
                 editModeCallback={ (hide) => changeParameterSelectionMode({ mode: hide })}
                 paramType={ PARAMETER_SELECTION_PARAM_TYPE_FOREMAN }
+                hiddenParameterTypes={ hiddenForemanParameterTypes }
                 location={ location }
                 organization={ organization }
                 paramDataUrl= { foremanDataUrl }
@@ -368,7 +410,7 @@ class ApplicationInstance extends React.Component {
             title={__("Ansible group variables for Application Instance")}
           >
             <ForemanModal.Header closeButton={false}>
-              Parameter specification
+              {__("Parameter specification")}
             </ForemanModal.Header>
             {this.props.parametersData ? (
               <ParameterSelection
@@ -388,19 +430,42 @@ class ApplicationInstance extends React.Component {
             </ForemanModal.Footer>
           </ForemanModal>
         </div>
+        <div>
+          <ForemanModal
+            id="AppInstanceAddExistingHosts"
+            dialogClassName="add_existing_hosts_modal"
+            title={__("Add existing hosts to an Application Instance")}
+          >
+            <ForemanModal.Header closeButton={false}>
+              {__("Existing hosts selection")}
+            </ForemanModal.Header>
+            <ExistingHostSelection
+              location={ location }
+              organization={ organization }
+              services={ services }
+              allHosts={ this.props.hosts }
+            />
+            <ForemanModal.Footer>
+              <div>
+                <Button bsStyle="primary" disabled={this.props.paramEditMode} onClick={() => closeAddExistingHostsModal({ mode: 'save' })}>{__("Save")}</Button>
+                <Button bsStyle="default" disabled={this.props.paramEditMode} onClick={() => closeAddExistingHostsModal({ mode: 'cancel' })}>{__("Cancel")}</Button>
+              </div>
+            </ForemanModal.Footer>
+          </ForemanModal>
+        </div>
         {validateResult == false ? (
-          <p style={{ paddingTop: 25 }}>
+          <div style={{ paddingTop: 25 }}>
             <pre>{ validateMsg }</pre>
-          </p>
+          </div>
         ) : (<div></div>)}
         <RailsData
-          key='applications_instance'
+          key='application_instance_hosts_data'
           view='app_instance'
           parameter='hosts'
           value={JSON.stringify(this.props.hosts)}
         />
         <RailsData
-          key='applications_instance'
+          key='application_instance_ansible_data'
           view='app_instance'
           parameter='ansible_vars_all'
           value={JSON.stringify(this.props.ansibleVarsAll)}
@@ -411,6 +476,9 @@ class ApplicationInstance extends React.Component {
 
 ApplicationInstance.defaultProps = {
   error: {},
+  showAlertModal: false,
+  alertModalText: '',
+  alertModalTitle: '',
   appDefinition: { "id": '', "name": '' },
   editMode: false,
   services: [],
@@ -418,18 +486,24 @@ ApplicationInstance.defaultProps = {
   ansibleVarsAll: [],
   parametersData: {},
   columns: [],
+  hiddenForemanParameterTypes: [],
   editParamsOfRowId: null,
   paramEditMode: false,
 }
 
 ApplicationInstance.propTypes = {
   initApplicationInstance: PropTypes.func,
+  showAlertModal: PropTypes.bool,
+  alertModalText: PropTypes.string,
+  alertModalTitle: PropTypes.string,
   editMode: PropTypes.bool.isRequired,
   services: PropTypes.array,
   appDefinition: PropTypes.object,
   columns: PropTypes.array,
+  hiddenForemanParameterTypes: PropTypes.array,
   hosts: PropTypes.array,
   ansibleVarsAll: PropTypes.array,
+  closeAlertModal: PropTypes.func,
   loadApplicationDefinition: PropTypes.func,
   addApplicationInstanceHost: PropTypes.func,
   deleteApplicationInstanceHost: PropTypes.func,
@@ -441,6 +515,8 @@ ApplicationInstance.propTypes = {
   closeForemanParameterSelectionModal: PropTypes.func,
   openAnsibleParameterSelectionModal: PropTypes.func,
   closeAnsibleParameterSelectionModal: PropTypes.func,
+  openAddExistingHostsModal: PropTypes.func,
+  closeAddExistingHostsModal: PropTypes.func,
   changeParameterSelectionMode: PropTypes.func,
   parametersData: PropTypes.object,
   paramEditMode: PropTypes.bool,

data/webpack/components/ApplicationInstance/ApplicationInstanceActions.js

@@ -16,26 +16,35 @@ import {
 
 import {
   APPLICATION_INSTANCE_INIT,
+  APPLICATION_INSTANCE_CLOSE_ALERT_MODAL,
   APPLICATION_INSTANCE_HOST_DELETE,
   APPLICATION_INSTANCE_HOST_ADD,
   APPLICATION_INSTANCE_HOST_EDIT_ACTIVATE,
   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_LOAD_APPLICATION_DEFINITION_REQUEST,
   APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_SUCCESS,
   APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_FAILURE,
   APPLICATION_INSTANCE_CHANGE_PARAMETER_SELECTION_MODE,
 } from './ApplicationInstanceConstants';
 
+import {
+  supportedPluginsToHiddenParameterTypes,
+} from '../../helper';
+
 export const initApplicationInstance = (
   appDefinition,
   hosts,
   ansibleVarsAll,
+  supportedPlugins,
   headerFormatter,
   inlineEditFormatter,
   inlineEditButtonsFormatter,
@@ -112,6 +121,7 @@ export const initApplicationInstance = (
   initialState.appDefinition = appDefinition;
   initialState.hosts = hosts;
   initialState.ansibleVarsAll = ansibleVarsAll;
+  initialState.hiddenForemanParameterTypes = supportedPluginsToHiddenParameterTypes(supportedPlugins);
 
   dispatch({
     type: APPLICATION_INSTANCE_INIT,
@@ -127,6 +137,11 @@ const errorHandler = (msg, err) => {
   return { type: msg, payload: { error } };
 };
 
+export const closeAlertModal = () => ({
+  type: APPLICATION_INSTANCE_CLOSE_ALERT_MODAL,
+  payload: {}
+});
+
 export const loadApplicationDefinition = (
   applicationDefinitionId,
   additionalData,
@@ -167,12 +182,84 @@ export const activateEditApplicationInstanceHost = (additionalData) => ({
   },
 });
 
-export const confirmEditApplicationInstanceHost = (rowData) => ({
-  type: APPLICATION_INSTANCE_HOST_EDIT_CONFIRM,
-  payload: {
-    ...rowData,
-  },
-});
+export const confirmEditApplicationInstanceHost = (
+  allData
+) => async(dispatch) => {
+
+  // Host name can not be empty
+
+  if (allData.rowData.hostname == '') {
+    dispatch({
+      type: APPLICATION_INSTANCE_HOST_EDIT_ERROR,
+      payload: __("Every host needs to have a valid name"),
+    });
+    return;
+  }
+
+  // Host name can only have specific characters
+
+  const hostname = allData.rowData.hostname.toLowerCase();
+  const hostnameRegex = /^[0-9a-z]([0-9a-z\-]{0,61}[0-9a-z])$/;
+
+  if (hostname.match(hostnameRegex) == undefined) {
+    dispatch({
+      type: APPLICATION_INSTANCE_HOST_EDIT_ERROR,
+      payload: __("The hostname uses not allowed characters. See https://en.wikipedia.org/wiki/Hostname#Syntax for more details."),
+    });
+    return;
+  }
+
+  // Service can not be empty
+
+  if (allData.rowData.service == '') {
+    dispatch({
+      type: APPLICATION_INSTANCE_HOST_EDIT_ERROR,
+      payload: __("Every host needs to be assigned to a service."),
+    });
+    return;
+  }
+
+  // Validation if host name is already used (only for new host entrys)
+
+  const url = '/acd/ui_acd_validate_hostname'
+  const validationData = {};
+
+  validationData['appDefId'] = allData.appDefinition.id;
+  validationData['serviceId'] = allData.rowData.service;
+  validationData['hostname'] = allData.rowData.hostname;
+
+  if (allData.rowData.newEntry === true) {
+    try {
+      const response = await api.get(url, {}, validationData);
+
+      if (response.data.result === true) {
+        dispatch({
+          type: APPLICATION_INSTANCE_HOST_EDIT_CONFIRM,
+          payload: {
+            ...allData,
+          }
+        });
+      } else {
+        dispatch({
+          type: APPLICATION_INSTANCE_HOST_EDIT_ERROR,
+          payload: __('Hostname \''+ allData.rowData.hostname +'\' is already used. This check also includes hosts outside this application instance.'),
+        });
+      }
+    } catch (error) {
+      dispatch({
+        type: APPLICATION_INSTANCE_HOST_EDIT_ERROR,
+        payload: __('Error during validation if hostname is already used.'),
+      });
+    }
+  } else {
+    dispatch({
+      type: APPLICATION_INSTANCE_HOST_EDIT_CONFIRM,
+      payload: {
+        ...allData,
+      }
+    });
+  }
+};
 
 export const cancelEditApplicationInstanceHost = (rowData) => ({
   type: APPLICATION_INSTANCE_HOST_EDIT_CANCEL,
@@ -239,6 +326,31 @@ export const closeAnsibleParameterSelectionModal = (additionalData) => dispatch
   );
 }
 
+export const openAddExistingHostsModal = (additionalData) => dispatch => {
+  dispatch({
+    type: APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_OPEN,
+    payload: {
+      ...additionalData,
+    }
+  });
+  dispatch(
+    setModalOpen({ id: 'AppInstanceAddExistingHosts' })
+  );
+}
+
+export const closeAddExistingHostsModal = (additionalData) => dispatch => {
+  dispatch({
+    type: APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_CLOSE,
+    payload: {
+      ...additionalData,
+    }
+  });
+
+  dispatch(
+    setModalClosed({ id: 'AppInstanceAddExistingHosts' })
+  );
+}
+
 export const changeParameterSelectionMode = (additionalData) => ({
   type: APPLICATION_INSTANCE_CHANGE_PARAMETER_SELECTION_MODE,
   payload: {

data/webpack/components/ApplicationInstance/ApplicationInstanceConstants.js

@@ -1,4 +1,5 @@
 export const APPLICATION_INSTANCE_INIT = 'APPLICATION_INSTANCE_INIT';
+export const APPLICATION_INSTANCE_CLOSE_ALERT_MODAL = 'APPLICATION_INSTANCE_CLOSE_ALERT_MODAL';
 export const APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_REQUEST = 'APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_REQUEST';
 export const APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_SUCCESS = 'APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_SUCCESS';
 export const APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_FAILURE = 'APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_FAILURE';
@@ -8,8 +9,11 @@ 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_HOST_EDIT_ERROR = 'APPLICATION_INSTANCE_HOST_EDIT_ERROR';
 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';
+export const APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_OPEN = 'APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_OPEN';
+export const APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_CLOSE = 'APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_CLOSE';
 export const APPLICATION_INSTANCE_CHANGE_PARAMETER_SELECTION_MODE = 'APPLICATION_INSTANCE_CHANGE_PARAMETER_SELECTION_MODE';

data/webpack/components/ApplicationInstance/ApplicationInstanceHelper.js

@@ -0,0 +1,15 @@
+
+function calculateServiceUsage(hostServiceId, services) {
+  const service = services.find(serv => serv['id'] == hostServiceId);
+  if ('currentCount' in service) {
+    service['currentCount'] += 1;
+  } else {
+    service['currentCount'] = 1;
+  }
+
+  return services;
+}
+
+export {
+  calculateServiceUsage,
+};