foreman_acd 0.6.0 → 0.9.1

data/webpack/components/ExistingHostSelection/components/__tests__/ServiceSelector.test.js

@@ -0,0 +1,35 @@
+import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+
+import ServiceSelector from '../ServiceSelector';
+
+const noop = () => {};
+
+const data = [
+  { name: 'report 1', status: 'done' },
+  { name: 'report 2', status: 'pending' }
+];
+
+const fixtures = {
+  'should render the service selector': {
+    hidden: false,
+    label: 'Test Label',
+    viewText: 'view service',
+    selectValue: '1',
+    onChange: noop,
+    options: { first: 'first', second: 'second'},
+    additionalData: { moreData: 'moooore' },
+  },
+  'should render the hidden service selector': {
+    hidden: true,
+    label: 'Test Label',
+    viewText: 'view service',
+    selectValue: '1',
+    onChange: noop,
+    options: { first: 'first', second: 'second'},
+    additionalData: { },
+  },
+};
+
+describe('ServiceSelector', () =>
+  testComponentSnapshotsWithFixtures(ServiceSelector, fixtures));
+

data/webpack/components/ExistingHostSelection/components/__tests__/__snapshots__/ServiceSelector.test.js.snap

@@ -0,0 +1,77 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ServiceSelector should render the hidden service selector 1`] = `
+<div
+  className="form-group"
+>
+  <label
+    className="col-md-2 control-label"
+  >
+    Test Label
+  </label>
+  <div
+    className="col-md-4"
+  >
+    <ExtSelect
+      additionalData={Object {}}
+      editable={true}
+      hidden={true}
+      onChange={[Function]}
+      options={
+        Object {
+          "first": "first",
+          "second": "second",
+        }
+      }
+      selectValue="1"
+      viewText="view service"
+    />
+    <RailsData
+      key="service_id"
+      parameter="service_id"
+      value="1"
+      view="existing_host_selection"
+    />
+  </div>
+</div>
+`;
+
+exports[`ServiceSelector should render the service selector 1`] = `
+<div
+  className="form-group"
+>
+  <label
+    className="col-md-2 control-label"
+  >
+    Test Label
+  </label>
+  <div
+    className="col-md-4"
+  >
+    <ExtSelect
+      additionalData={
+        Object {
+          "moreData": "moooore",
+        }
+      }
+      editable={true}
+      hidden={false}
+      onChange={[Function]}
+      options={
+        Object {
+          "first": "first",
+          "second": "second",
+        }
+      }
+      selectValue="1"
+      viewText="view service"
+    />
+    <RailsData
+      key="service_id"
+      parameter="service_id"
+      value="1"
+      view="existing_host_selection"
+    />
+  </div>
+</div>
+`;

data/webpack/components/ExistingHostSelection/index.js

@@ -0,0 +1,26 @@
+import { bindActionCreators } from 'redux';
+import { connect } from 'react-redux';
+
+import './ExistingHostSelection.scss';
+import ExistingHostSelection from './ExistingHostSelection';
+import * as ExistingHostSelectionActions from './ExistingHostSelectionActions';
+
+import {
+  selectServiceId,
+  selectAvailableHosts,
+  selectAlreadyUsedHosts,
+} from './ExistingHostSelectionSelectors';
+
+const mapStateToProps = state => ({
+  serviceId: selectServiceId(state),
+  availableHosts: selectAvailableHosts(state),
+  alreadyUsedHosts: selectAlreadyUsedHosts(state),
+});
+
+const mapDispatchToProps = dispatch =>
+  bindActionCreators(ExistingHostSelectionActions, dispatch);
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ExistingHostSelection);

data/webpack/components/ParameterSelection/ParameterSelection.js

@@ -9,7 +9,8 @@ import AddTableEntry from '../common/AddTableEntry';
 import EditTableEntry from '../common/EditTableEntry';
 import DeleteTableEntry from '../common/DeleteTableEntry';
 import LockTableEntry from '../common/LockTableEntry';
-import ExtSelect from '../common/ExtSelect';
+import ForemanModal from 'foremanReact/components/ForemanModal';
+import * as YamlValidator from '../../js-yaml';
 
 import {
   transformForemanData,
@@ -32,6 +33,7 @@ import {
   Button,
   Table,
   FormControl,
+  InputGroup,
   defaultSortingOrder,
   customHeaderFormattersDefinition,
   inlineEditFormatterFactory,
@@ -47,12 +49,42 @@ class ParameterSelection extends React.Component {
 
   constructor(props) {
     super(props);
+    this.state = {textValue: ''};
   }
 
+  handleChange = event => {
+    this.setState({textValue: event.target.value});
+  };
+
   isEditing({rowData}) {
     return (rowData.backup !== undefined);
   }
 
+  yamlValidator() {
+    let result = true;
+    let msg = "";
+    try {
+      const doc = YamlValidator.load(this.state.textValue);
+    } catch (e) {
+      result = false;
+      msg = "Invalid Yaml: " + e.name + ": " + e.message;
+    }
+    return {
+      validateResult: result,
+      validateMsg: msg
+    }
+  }
+
+  yamlValue() {
+    if (this.props.editParamsRowIndex != undefined) {
+      let id = this.props.editParamsRowIndex;
+      if (this.props.parameters[id] != undefined) {
+        return this.props.parameters[id]['value'];
+      }
+    }
+    return '';
+  }
+
   // enables our custom header formatters extensions to reactabular
   customHeaderFormatters = customHeaderFormattersDefinition;
 
@@ -63,12 +95,15 @@ class ParameterSelection extends React.Component {
       organization,
       paramType,
       paramDataUrl,
+      hiddenParameterTypes,
       initParameterSelection,
       sortParameter,
       deleteParameter,
       lockParameter,
       activateEditParameter,
       changeEditParameter,
+      openParameterSelectionDialogBox,
+      closeParameterSelectionDialogBox,
       loadParamData,
     } = this.props;
 
@@ -165,6 +200,22 @@ class ParameterSelection extends React.Component {
           />
         </td>
       ),
+      renderEditComplexText: (value, additionalData, subtype='text') => (
+        <td className="editing">
+        <InputGroup>
+          <FormControl
+            type={subtype}
+            defaultValue={additionalData.rowData.isYaml == true ? '' : value}
+            onBlur={e => changeEditParameter(e.target.value, additionalData) }
+            readOnly={additionalData.rowData.isYaml}
+            placeholder={'Press YAML button for Yaml Data'}
+          />
+          <InputGroup.Button>
+            <Button onClick= {e => openParameterSelectionDialogBox(e)}> YAML </Button>
+          </InputGroup.Button>
+        </InputGroup>
+        </td>
+      ),
       renderEditSelect: (value, additionalData, options) => (
         <td className="editing">
           <Select
@@ -209,6 +260,10 @@ class ParameterSelection extends React.Component {
             case 'text':
               prettyValue = value
               break;
+            case 'complex':
+              prettyValue = additionalData.rowData.isYaml ? 'YAML value' : value;
+              break;
+
           }
         }
         return inlineEditFormatterImpl.renderValue(prettyValue, additionalData)
@@ -235,6 +290,8 @@ class ParameterSelection extends React.Component {
               case 'password':
                 return inlineEditFormatterImpl.renderEditText(value, additionalData, 'password');
               case 'text':
+              case 'complex':
+                return inlineEditFormatterImpl.renderEditComplexText(value, additionalData);
               default:
                 return inlineEditFormatterImpl.renderEditText(value, additionalData);
             }
@@ -243,12 +300,14 @@ class ParameterSelection extends React.Component {
         }
       }
     });
+
     this.inlineEditFormatter = inlineEditFormatter;
 
     initParameterSelection(
       paramType,
       paramDefinition,
       parameters,
+      hiddenParameterTypes,
       useDefaultValue,
       allowNameAdjustment,
       allowDescriptionAdjustment,
@@ -274,6 +333,7 @@ class ParameterSelection extends React.Component {
       addParameter,
       confirmEditParameter,
       cancelEditParameter,
+      closeParameterSelectionDialogBox,
       editModeCallback,
     } = this.props;
 
@@ -282,6 +342,7 @@ class ParameterSelection extends React.Component {
 
     if (newEntryIndex >= 0) {
       const newEntry = parameters[newEntryIndex];
+
       // sort all elements, besides the newEntry which will be
       // added to the end of the Array
       const tmpParameters = cloneDeep(parameters);
@@ -312,6 +373,8 @@ class ParameterSelection extends React.Component {
       editModeCallback(this.props.editMode);
     }
 
+    let { validateResult, validateMsg } = this.yamlValidator();
+
     return(
       <div>
         <div className="clearfix">
@@ -358,6 +421,38 @@ class ParameterSelection extends React.Component {
             />
           </div>
         </div>
+        <div>
+        <ForemanModal
+          id="ParameterSelectionComplexDataModal"
+          dialogClassName="complex_data_modal"
+          title={__("YAML Data Input")}
+
+        >
+          <ForemanModal.Header closeButton={false}>
+          </ForemanModal.Header>
+          <textarea id='yamlData'
+            defaultValue= {this.yamlValue()}
+            onChange={this.handleChange}
+            style={{width: "550px", height: "350px", fontFamily: "Courier"}}  />
+          <ForemanModal.Footer>
+            <div>
+            {validateResult == false ? (
+                <div className="form-group">
+                <div class="alert alert-danger alert-dismissable">
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                <span class="pficon pficon-close"></span>
+                </button>
+                <span class="pficon pficon-error-circle-o"></span>
+                  {validateMsg}
+                </div>
+                </div>
+            ) : (<div></div>)}
+              <Button bsStyle="primary" onClick ={() => closeParameterSelectionDialogBox({ mode: 'save' })}>{__("Save")}</Button>
+              <Button bsStyle="default" onClick={() => closeParameterSelectionDialogBox({ mode: 'cancel' })}>{__("Cancel")}</Button>
+            </div>
+          </ForemanModal.Footer>
+        </ForemanModal>
+        </div>
       </div>
     );
   }
@@ -370,7 +465,9 @@ ParameterSelection.defaultProps = {
   paramData: {},
   parameters: [],
   columns: [],
+  hiddenParameterTypes: [],
   sortingColumns: {},
+  editParamsRowIndex: [],
   editModeCallback: undefined,
 };
 
@@ -387,6 +484,8 @@ ParameterSelection.propTypes = {
   editMode: PropTypes.bool.isRequired,
   loading: PropTypes.bool.isRequired,
   paramData: PropTypes.object.isRequired,
+  hiddenParameterTypes: PropTypes.array.isRequired,
+  allowedParameterTypes: PropTypes.object,
   parameterTypes: PropTypes.object,
   parameters: PropTypes.array,
   sortingColumns: PropTypes.object,
@@ -400,8 +499,11 @@ ParameterSelection.propTypes = {
   confirmEditParameter: PropTypes.func,
   cancelEditParameter: PropTypes.func,
   changeEditParameter: PropTypes.func,
+  openParameterSelectionDialogBox: PropTypes.func,
+  closeParameterSelectionDialogBox: PropTypes.func,
   loadParamData: PropTypes.func,
   paramDefinition: PropTypes.object,
+  editParamsRowIndex: PropTypes.array,
 };
 
 export default ParameterSelection;

data/webpack/components/ParameterSelection/ParameterSelection.scss

@@ -8,3 +8,10 @@
     max-width: none !important;
 }
 
+.complex_data_modal {
+    margin-top: 0;
+    margin-bottom: 0;
+    height: 80%;
+    width: 40%;
+    max-width: none !important;
+}

data/webpack/components/ParameterSelection/ParameterSelectionActions.js

@@ -17,9 +17,14 @@ import {
 } from 'foremanReact/common/helpers';
 
 import {
-  filterUsedParameterTypes,
+  filterParameterTypes,
 } from './ParameterSelectionHelper';
 
+import {
+  setModalOpen,
+  setModalClosed,
+} from 'foremanReact/components/ForemanModal/ForemanModalActions';
+
 import {
   PARAMETER_SELECTION_INIT,
   PARAMETER_SELECTION_TYPES,
@@ -36,12 +41,15 @@ import {
   PARAMETER_SELECTION_LOAD_PARAM_DATA_REQUEST,
   PARAMETER_SELECTION_LOAD_PARAM_DATA_SUCCESS,
   PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE,
+  PARAMETER_SELECTION_COMPLEX_DATA_MODAL_OPEN,
+  PARAMETER_SELECTION_COMPLEX_DATA_MODAL_CLOSE,
 } from './ParameterSelectionConstants';
 
 export const initParameterSelection = (
   paramType,
   paramDefinition,
   parameters,
+  hiddenParameterTypes,
   useDefaultValue,
   allowNameAdjustment,
   allowDescriptionAdjustment,
@@ -174,9 +182,18 @@ export const initParameterSelection = (
   initialState.parameters = parameters;
 
   if ((paramType == PARAMETER_SELECTION_PARAM_TYPE_FOREMAN) && (parameters)) {
-    initialState.parameterTypes = filterUsedParameterTypes(PARAMETER_SELECTION_TYPES, parameters);
+    let pTypes = PARAMETER_SELECTION_TYPES;
+
+    // filter hidden parameters
+    hiddenParameterTypes.forEach(item => delete pTypes[item]);
+    initialState.allowedParameterTypes = pTypes;
+
+    // filter already used parameter types
+    initialState.parameterTypes = filterParameterTypes(pTypes, parameters);
   }
 
+  initialState.paramType = paramType;
+
   dispatch({
     type: PARAMETER_SELECTION_INIT,
     payload: initialState,
@@ -198,7 +215,33 @@ export const lockParameter = (additionalData) => ({
   },
 });
 
-export const addParameter = (additionalData) => ({
+export const openParameterSelectionDialogBox = (additionalData) => dispatch => {
+  dispatch({
+    type: PARAMETER_SELECTION_COMPLEX_DATA_MODAL_OPEN,
+    payload: {
+      ...additionalData,
+    }
+  });
+  dispatch(
+    setModalOpen({ id: 'ParameterSelectionComplexDataModal' })
+  );
+};
+
+export const closeParameterSelectionDialogBox = (additionalData) => dispatch => {
+  dispatch({
+    type: PARAMETER_SELECTION_COMPLEX_DATA_MODAL_CLOSE,
+    payload: {
+      ...additionalData,
+    }
+  });
+
+  dispatch(
+    setModalClosed({ id: 'ParameterSelectionComplexDataModal' })
+  );
+};
+
+export const addParameter = (additionalData) => (
+  {
   type: PARAMETER_SELECTION_ADD,
   payload: {
     ...additionalData,
@@ -268,4 +311,3 @@ export const loadParamData = (attr) => dispatch => {
     )
     .catch(error => dispatch(errorHandler(PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE, error)));
 };
-

data/webpack/components/ParameterSelection/ParameterSelectionConstants.js

@@ -12,6 +12,8 @@ export const PARAMETER_SELECTION_LOAD_PARAM_DATA_SUCCESS = 'PARAMETER_SELECTION_
 export const PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE = 'PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE';
 export const PARAMETER_SELECTION_PARAM_TYPE_FOREMAN = 'PARAMETER_SELECTION_PARAM_TYPE_FOREMAN';
 export const PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE = 'PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE';
+export const PARAMETER_SELECTION_COMPLEX_DATA_MODAL_OPEN = 'PARAMETER_SELECTION_COMPLEX_DATA_MODAL_OPEN';
+export const PARAMETER_SELECTION_COMPLEX_DATA_MODAL_CLOSE = 'PARAMETER_SELECTION_COMPLEX_DATA_MODAL_CLOSE';
 
 // Make sure the object is sorted by value
 //   (Compute Profile -> Partition table -> Root password)

data/webpack/components/ParameterSelection/ParameterSelectionHelper.js

@@ -11,10 +11,14 @@ export const transformForemanData = (fdata) => {
   return (result);
 }
 
-export const filterUsedParameterTypes = (options, parameters) => {
+export const filterParameterTypes = (options, parameters) => {
   const newOptions = cloneDeep(options);
+
   // hostparam can be used multiple times
   const alreadyUsed = parameters.map(item => item["type"]).filter(item => item != 'hostparam');
+
+  // remove already used items
   alreadyUsed.forEach(item => delete newOptions[item])
+
   return newOptions;
 }

data/webpack/components/ParameterSelection/ParameterSelectionReducer.js

@@ -7,7 +7,7 @@ import {
 } from 'lodash';
 
 import {
-  filterUsedParameterTypes,
+  filterParameterTypes,
 } from './ParameterSelectionHelper';
 
 import * as sort from 'sortabular';
@@ -23,17 +23,15 @@ import {
   PARAMETER_SELECTION_EDIT_CHANGE,
   PARAMETER_SELECTION_EDIT_CANCEL,
   PARAMETER_SELECTION_SORT,
-  PARAMETER_SELECTION_PARAM_TYPE_FOREMAN,
-  PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE,
   PARAMETER_SELECTION_LOAD_PARAM_DATA_REQUEST,
   PARAMETER_SELECTION_LOAD_PARAM_DATA_SUCCESS,
   PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE,
+  PARAMETER_SELECTION_PARAM_TYPE_FOREMAN,
+  PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE,
+  PARAMETER_SELECTION_COMPLEX_DATA_MODAL_OPEN,
+  PARAMETER_SELECTION_COMPLEX_DATA_MODAL_CLOSE,
 } from './ParameterSelectionConstants';
 
-import {
-  APPLICATION_DEFINITION_PARAMETER_SELECTION_MODAL_CLOSE,
-} from '../ApplicationDefinition/ApplicationDefinitionConstants';
-
 export const initialState = Immutable({
   editMode: false,
   error: { errorMsg: '', status: '', statusText: '' },
@@ -55,13 +53,16 @@ const parameterSelectionParameters = (state = initialState, action) => {
         index = Math.max(...parameters.map(e => e.id)) + 1;
       }
 
-      const newRow = {id: index, locked: false, name: "", description: '', type: '', value: '', newEntry: true };
+      const newRow = {id: index, locked: false, name: "", description: '', type: '', value: '', isYaml: false, newEntry: true };
+      if (state.paramType == 'PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE') {
+        newRow['type'] = 'complex';
+      }
       newRow.backup = cloneDeep(newRow)
       parameters.push(newRow);
-
       return state.merge({
         editMode: true,
-        parameters: parameters
+        parameters: parameters,
+        editParamsRowIndex: index,
       });
     }
     case PARAMETER_SELECTION_LOCK: {
@@ -82,7 +83,7 @@ const parameterSelectionParameters = (state = initialState, action) => {
       const parameters = state.parameters.filter(v => v.id !== payload.rowData.id);
       return state.merge({
         parameters: parameters,
-        parameterTypes: filterUsedParameterTypes(PARAMETER_SELECTION_TYPES, parameters),
+        parameterTypes: filterParameterTypes(state.allowedParameterTypes, parameters),
       })
     }
     case PARAMETER_SELECTION_EDIT_ACTIVATE: {
@@ -90,10 +91,10 @@ const parameterSelectionParameters = (state = initialState, action) => {
       const index = findIndex(parameters, { id: payload.rowData.id });
 
       parameters[index].backup = cloneDeep(parameters[index]);
-
       return state.merge({
         editMode: true,
-        parameters: parameters
+        parameters: parameters,
+        editParamsRowIndex: index,
       });
     }
     case PARAMETER_SELECTION_EDIT_CONFIRM: {
@@ -105,7 +106,7 @@ const parameterSelectionParameters = (state = initialState, action) => {
 
       return state.merge({
         editMode: false,
-        parameterTypes: filterUsedParameterTypes(PARAMETER_SELECTION_TYPES, parameters),
+        parameterTypes: filterParameterTypes(state.allowedParameterTypes, parameters),
         parameters: parameters
       });
     }
@@ -113,9 +114,15 @@ const parameterSelectionParameters = (state = initialState, action) => {
       const parameters = cloneDeep(state.parameters);
       const index = findIndex(parameters, { id: payload.rowData.id });
 
-      parameters[index][payload.property] = payload.value;
-
-      return state.set('parameters', parameters);
+      if (!parameters[index]['isYaml'] && payload.property == 'value') {
+        parameters[index]['value'] = payload.value;
+      } else if (payload.property != 'value') {
+        parameters[index][payload.property] = payload.value;
+      }
+      return state.merge({
+        parameters: parameters,
+        editParamsRowIndex: index
+      });
     }
     case PARAMETER_SELECTION_EDIT_CANCEL: {
       const parameters = cloneDeep(state.parameters);
@@ -184,20 +191,35 @@ const parameterSelectionParameters = (state = initialState, action) => {
 
       return state.merge(newState);
     }
-    case APPLICATION_DEFINITION_PARAMETER_SELECTION_MODAL_CLOSE: {
+    case PARAMETER_SELECTION_COMPLEX_DATA_MODAL_OPEN: {
+      return state;
+    }
+    case PARAMETER_SELECTION_COMPLEX_DATA_MODAL_CLOSE: {
+      let str;
+      let element = document.getElementById('yamlData');
+      if (element != null) {
+        str = element.value;
+      }
+      else {
+        str = '';
+      }
+      let newState = {};
+      let index = state.editParamsRowIndex;
       const parameters = cloneDeep(state.parameters);
-
-      parameters.forEach((param, index) => {
-        delete parameters[index].backup;
-        if (parameters[index].newEntry === true) {
-          parameters.splice(index, 1);
+      if (payload.mode == 'save') {
+        parameters[index]['value'] = str;
+        if (str == '') {
+          parameters[index]['isYaml'] = false;
+        } else {
+          parameters[index]['isYaml'] = true;
         }
-      });
-
-      return state.merge({
-        editMode: false,
-        parameters: parameters
-      });
+        newState = {
+          parameters: parameters,
+        };
+      } else {
+        newState = {};
+      }
+      return state.merge(newState);
     }
     default:
       return state;

data/webpack/components/ParameterSelection/ParameterSelectionSelectors.js

@@ -3,9 +3,11 @@ const parameterState = state => state.foremanAcd.parameterSelectionParameters;
 export const selectLoading = state => parameterState(state).loading;
 export const selectEditMode = state => parameterState(state).editMode;
 export const selectParamData = state => parameterState(state).paramData;
+export const selectAllowedParameterTypes = state => parameterState(state).allowedParameterTypes;
 export const selectParameterTypes = state => parameterState(state).parameterTypes;
 export const selectParameters = state => parameterState(state).parameters;
 export const selectSortingColumns = state => parameterState(state).sortingColumns;
 export const selectColumns = state => parameterState(state).columns;
 export const selectParamDefinition = state => parameterState(state).paramDefinition;
 export const selectHostgroupId = state => parameterState(state).hostgroupId;
+export const selectEditParamsRowIndex = state => parameterState(state).editParamsRowIndex;