foreman_acd 0.7.0 → 0.9.2

data/webpack/components/ParameterSelection/__tests__/__snapshots__/ParameterSelection.test.js.snap

@@ -49,6 +49,54 @@ exports[`ParameterSelection should render ansible parameter selection 1`] = `
       />
     </div>
   </div>
+  <div>
+    <ForemanModal
+      dialogClassName="complex_data_modal"
+      id="ParameterSelectionComplexDataModal"
+      title="YAML Data Input"
+    >
+      <Header
+        closeButton={false}
+      />
+      <textarea
+        defaultValue=""
+        id="yamlData"
+        onChange={[Function]}
+        style={
+          Object {
+            "fontFamily": "Courier",
+            "height": "350px",
+            "width": "550px",
+          }
+        }
+      />
+      <Footer>
+        <div>
+          <div />
+          <Button
+            active={false}
+            block={false}
+            bsClass="btn"
+            bsStyle="primary"
+            disabled={false}
+            onClick={[Function]}
+          >
+            Save
+          </Button>
+          <Button
+            active={false}
+            block={false}
+            bsClass="btn"
+            bsStyle="default"
+            disabled={false}
+            onClick={[Function]}
+          >
+            Cancel
+          </Button>
+        </div>
+      </Footer>
+    </ForemanModal>
+  </div>
 </div>
 `;
 
@@ -101,5 +149,53 @@ exports[`ParameterSelection should render foreman parameter selection 1`] = `
       />
     </div>
   </div>
+  <div>
+    <ForemanModal
+      dialogClassName="complex_data_modal"
+      id="ParameterSelectionComplexDataModal"
+      title="YAML Data Input"
+    >
+      <Header
+        closeButton={false}
+      />
+      <textarea
+        defaultValue=""
+        id="yamlData"
+        onChange={[Function]}
+        style={
+          Object {
+            "fontFamily": "Courier",
+            "height": "350px",
+            "width": "550px",
+          }
+        }
+      />
+      <Footer>
+        <div>
+          <div />
+          <Button
+            active={false}
+            block={false}
+            bsClass="btn"
+            bsStyle="primary"
+            disabled={false}
+            onClick={[Function]}
+          >
+            Save
+          </Button>
+          <Button
+            active={false}
+            block={false}
+            bsClass="btn"
+            bsStyle="default"
+            disabled={false}
+            onClick={[Function]}
+          >
+            Cancel
+          </Button>
+        </div>
+      </Footer>
+    </ForemanModal>
+  </div>
 </div>
 `;

data/webpack/components/ParameterSelection/__tests__/__snapshots__/ParameterSelectionReducer.test.js.snap

@@ -2,6 +2,14 @@
 
 exports[`ParameterSelectionReducer should activate edit parameter 1`] = `
 Object {
+  "allowedParameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "columns": Array [
     Object {
       "cell": Object {
@@ -136,6 +144,7 @@ Object {
     },
   ],
   "editMode": true,
+  "editParamsRowIndex": 1,
   "error": Object {
     "errorMsg": "",
     "status": "",
@@ -239,6 +248,14 @@ Object {
 
 exports[`ParameterSelectionReducer should add a parameter 1`] = `
 Object {
+  "allowedParameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "columns": Array [
     Object {
       "cell": Object {
@@ -373,6 +390,7 @@ Object {
     },
   ],
   "editMode": true,
+  "editParamsRowIndex": 3,
   "error": Object {
     "errorMsg": "",
     "status": "",
@@ -460,6 +478,7 @@ Object {
       "backup": Object {
         "description": "",
         "id": 3,
+        "isYaml": false,
         "locked": false,
         "name": "",
         "newEntry": true,
@@ -468,6 +487,7 @@ Object {
       },
       "description": "",
       "id": 3,
+      "isYaml": false,
       "locked": false,
       "name": "",
       "newEntry": true,
@@ -486,6 +506,14 @@ Object {
 
 exports[`ParameterSelectionReducer should cancel edit parameter 1`] = `
 Object {
+  "allowedParameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "columns": Array [
     Object {
       "cell": Object {
@@ -715,6 +743,14 @@ Object {
 
 exports[`ParameterSelectionReducer should change edit parameter 1`] = `
 Object {
+  "allowedParameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "columns": Array [
     Object {
       "cell": Object {
@@ -849,6 +885,7 @@ Object {
     },
   ],
   "editMode": false,
+  "editParamsRowIndex": 1,
   "error": Object {
     "errorMsg": "",
     "status": "",
@@ -952,6 +989,14 @@ Object {
 
 exports[`ParameterSelectionReducer should confirm edit parameter 1`] = `
 Object {
+  "allowedParameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "columns": Array [
     Object {
       "cell": Object {
@@ -1144,14 +1189,14 @@ Object {
     "id": 1,
     "name": "web",
   },
-  "parameterTypes": Object {
-    "domain": "Domain",
-    "hostparam": "Host parameter",
-    "ip": "IP",
-    "password": "Root password",
-    "ptable": "Partition table",
-    "puppetenv": "Puppet environment",
-  },
+  "parameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "parameters": Array [
     Object {
       "description": "",
@@ -1181,6 +1226,14 @@ Object {
 
 exports[`ParameterSelectionReducer should delete a parameter 1`] = `
 Object {
+  "allowedParameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "columns": Array [
     Object {
       "cell": Object {
@@ -1373,15 +1426,14 @@ Object {
     "id": 1,
     "name": "web",
   },
-  "parameterTypes": Object {
-    "domain": "Domain",
-    "hostparam": "Host parameter",
-    "ip": "IP",
-    "lifecycleenv": "Lifecycle environment",
-    "password": "Root password",
-    "ptable": "Partition table",
-    "puppetenv": "Puppet environment",
-  },
+  "parameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "parameters": Array [
     Object {
       "description": "",
@@ -1403,6 +1455,14 @@ Object {
 
 exports[`ParameterSelectionReducer should initialize component 1`] = `
 Object {
+  "allowedParameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "columns": Array [
     Object {
       "cell": Object {
@@ -1640,6 +1700,14 @@ Object {
 
 exports[`ParameterSelectionReducer should load param data be erroneous 1`] = `
 Object {
+  "allowedParameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "columns": Array [
     Object {
       "cell": Object {
@@ -1865,6 +1933,14 @@ Object {
 
 exports[`ParameterSelectionReducer should load param data be successful 1`] = `
 Object {
+  "allowedParameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "columns": Array [
     Object {
       "cell": Object {
@@ -2094,6 +2170,14 @@ Object {
 
 exports[`ParameterSelectionReducer should lock a parameter 1`] = `
 Object {
+  "allowedParameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "columns": Array [
     Object {
       "cell": Object {
@@ -2323,6 +2407,14 @@ Object {
 
 exports[`ParameterSelectionReducer should request load param data 1`] = `
 Object {
+  "allowedParameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "columns": Array [
     Object {
       "cell": Object {
@@ -2563,6 +2655,14 @@ Object {
 
 exports[`ParameterSelectionReducer should sort parameter 1`] = `
 Object {
+  "allowedParameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "columns": Array [
     Object {
       "cell": Object {

data/webpack/components/ParameterSelection/__tests__/__snapshots__/ParameterSelectionSelectors.test.js.snap

@@ -8,6 +8,17 @@ Object {
 }
 `;
 
+exports[`ParameterSelectionSelectors should return allowedParameterTypes from parameterSelectionData_1 fixtures 1`] = `
+Array [
+  "domain",
+  "hostparam",
+  "ip",
+  "ptable",
+  "puppetenv",
+  "password",
+]
+`;
+
 exports[`ParameterSelectionSelectors should return columns from parameterSelectionData_1 fixtures 1`] = `
 Array [
   Object {
@@ -146,6 +157,8 @@ Array [
 
 exports[`ParameterSelectionSelectors should return editMode from parameterSelectionData_1 fixtures 1`] = `false`;
 
+exports[`ParameterSelectionSelectors should return editParamsRowIndex from parameterSelectionData_1 fixtures 1`] = `undefined`;
+
 exports[`ParameterSelectionSelectors should return hostgroupId from parameterSelectionData_1 fixtures 1`] = `1`;
 
 exports[`ParameterSelectionSelectors should return loading from parameterSelectionData_1 fixtures 1`] = `false`;

data/webpack/components/ParameterSelection/index.js

@@ -9,22 +9,26 @@ import {
   selectLoading,
   selectEditMode,
   selectParamData,
+  selectAllowedParameterTypes,
   selectParameterTypes,
   selectParameters,
   selectSortingColumns,
   selectColumns,
   selectParamDefinition,
+  selectEditParamsRowIndex,
 } from './ParameterSelectionSelectors';
 
 const mapStateToProps = state => ({
   loading: selectLoading(state),
   editMode: selectEditMode(state),
   paramData: selectParamData(state),
+  allowedParameterTypes: selectAllowedParameterTypes(state),
   parameterTypes: selectParameterTypes(state),
   parameters: selectParameters(state),
   sortingColumns: selectSortingColumns(state),
   columns: selectColumns(state),
   paramDefinition: selectParamDefinition(state),
+  editParamsRowIndex: selectEditParamsRowIndex(state),
 });
 
 const mapDispatchToProps = dispatch =>
@@ -34,4 +38,3 @@ export default connect(
   mapStateToProps,
   mapDispatchToProps
 )(ParameterSelection);
-

data/webpack/components/SyncGitRepo/SyncGitRepo.js

@@ -9,7 +9,6 @@ import {
   translate as __
 } from 'foremanReact/common/I18n';
 import {Select, TextInput} from 'foremanReact/components/common/forms/Select';
-import RailsData from '../common/RailsData';
 import ScmTypeSelector from './components/ScmTypeSelector';
 import FormTextInput from './components/FormTextInput'
 import { arrayToObject } from '../../helper';
@@ -46,14 +45,6 @@ class SyncGitRepo extends React.Component {
           msg += __("Git URL cannot be blank");
         }
       }
-
-      if (this.props.gitCommit === "") {
-        result = false;
-
-        if (msg == "") {
-          msg += __("Git Branch/Commit/Tag cannot be blank");
-        }
-      }
     }
 
     if (this.props.scmType !== "git" && this.props.scmType !== "directory" ) {
@@ -126,6 +117,7 @@ class SyncGitRepo extends React.Component {
         <div>
           <ScmTypeSelector
             label="SCM Type *"
+            hidden={ false }
             editable={ appDefinitions.length == 0 }
             viewText={ scmTypes[scmType] }
             options={ scmTypes }
@@ -162,7 +154,7 @@ class SyncGitRepo extends React.Component {
         ) : (<div></div>)}
           {(scmType === "git") ? (
           <FormTextInput
-            label="Git Branch/Commit/Tag *"
+            label="Git Branch/Commit/Tag"
             editable= { appDefinitions.length == 0 }
             viewText={ gitCommit }
             onChange={ loadGitCommit }

data/webpack/components/SyncGitRepo/SyncGitRepoActions.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { API, actionTypeGenerator } from 'foremanReact/redux/API';
 import { sprintf, translate as __ } from 'foremanReact/common/I18n';
-import { addToast } from 'foremanReact/redux/actions/toasts';
+import { addToast } from 'foremanReact/components/ToastsList';
 
 import {
   SYNC_GIT_REPO_INIT,
@@ -12,7 +12,6 @@ import {
   SYNC_GIT_REPO_REQUEST,
   SYNC_GIT_REPO_FAILURE,
   SYNC_GIT_REPO_SUCCESS,
-  SYNC_GIT_REPOSITORY,
 } from './SyncGitRepoConstants';
 
 export const initSyncGitRepo = (
@@ -36,7 +35,7 @@ export const initSyncGitRepo = (
 
 const errorHandler = (msg, err) => {
   const error = {
-    errorMsg: 'Failed to fetch data from server.',
+    errorMsg: __('Failed to fetch data from server.'),
     statusText: err,
   };
   return { type: msg, payload: { error } };

data/webpack/components/SyncGitRepo/SyncGitRepoConstants.js

@@ -6,4 +6,3 @@ export const SYNC_GIT_REPO_LOAD_GIT_URL = 'SYNC_GIT_REPO_LOAD_GIT_URL';
 export const SYNC_GIT_REPO_REQUEST = 'SYNC_GIT_REPO_REQUEST';
 export const SYNC_GIT_REPO_SUCCESS = 'SYNC_GIT_REPO_SUCCESS';
 export const SYNC_GIT_REPO_FAILURE = 'SYNC_GIT_REPO_FAILURE';
-export const SYNC_GIT_REPOSITORY = 'ANSIBLE_PLAYBOOK_SYNC_GIT_REPOSITORY';

data/webpack/components/SyncGitRepo/__tests__/__snapshots__/SyncGitRepo.test.js.snap

@@ -5,6 +5,7 @@ exports[`SyncGitRepo should render ansible playbook 1`] = `
   <div>
     <ScmTypeSelector
       editable={true}
+      hidden={false}
       label="SCM Type *"
       onChange={[Function]}
       options={Object {}}

data/webpack/components/SyncGitRepo/components/FormTextInput.js

@@ -21,7 +21,7 @@ const FormTextInput= ({
           onChange={onChange}
         />
         <RailsData
-          key='ansible_playbook_id'
+          key='ansible_playbook_form_data'
           view='ansible_playbook'
           parameter={parameter}
           value={viewText}

data/webpack/components/SyncGitRepo/components/ScmTypeSelector.js

@@ -17,14 +17,15 @@ const ScmTypeSelector= ({
       <label className="col-md-2 control-label">{label}</label>
       <div className="col-md-4">
         <ExtSelect
-          editable={ editable }
+          hidden={hidden}
+          editable={editable}
           viewText={viewText}
           selectValue={selectValue}
           onChange={onChange}
           options={options}
         />
         <RailsData
-          key='ansible_playbook_id'
+          key='ansible_playbook_scm_data'
           view='ansible_playbook'
           parameter='scm_type'
           value={selectValue}

data/webpack/components/common/DeleteTableEntry.js

@@ -1,8 +1,9 @@
-import React from 'react';
+import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import {
   Icon,
   Button,
+  MessageDialog,
 } from 'patternfly-react';
 import { translate as __ } from 'foremanReact/common/I18n';
 
@@ -16,12 +17,25 @@ const DeleteTableEntry = ({
     return null;
   }
 
+  const [showModal, setShowModal] = useState(false);
+  const toggleModal = () => setShowModal(!showModal);
+
   return (
     <span>
+      <MessageDialog
+        show={showModal}
+        onHide={toggleModal}
+        primaryAction={() => onDeleteTableEntry(additionalData)}
+        secondaryAction={toggleModal}
+        primaryActionButtonContent={__('Confirm')}
+        secondaryActionButtonContent={__('Cancel')}
+        title={__('Confirm action')}
+        primaryContent={__('Are you sure you wish to delete this item?')}
+      />
       <Button
         bsStyle="default"
         disabled={disabled}
-        onClick={() => window.confirm(__("Are you sure you wish to delete this item?")) && onDeleteTableEntry(additionalData) }
+        onClick={toggleModal}
       >
         <Icon type="pf" name="delete" title={__("Delete entry")} />
       </Button>

data/webpack/components/common/__tests__/__snapshots__/DeleteTableEntry.test.js.snap

@@ -2,6 +2,25 @@
 
 exports[`DeleteTableEntry should render delete parameter 1`] = `
 <span>
+  <MessageDialog
+    accessibleDescription=""
+    accessibleName=""
+    className=""
+    enforceFocus={true}
+    footer={null}
+    icon={null}
+    onHide={[Function]}
+    primaryAction={[Function]}
+    primaryActionButtonBsStyle="primary"
+    primaryActionButtonContent="Confirm"
+    primaryContent="Are you sure you wish to delete this item?"
+    secondaryAction={[Function]}
+    secondaryActionButtonBsStyle="default"
+    secondaryActionButtonContent="Cancel"
+    secondaryContent={null}
+    show={false}
+    title="Confirm action"
+  />
   <Button
     active={false}
     block={false}
@@ -21,6 +40,25 @@ exports[`DeleteTableEntry should render delete parameter 1`] = `
 
 exports[`DeleteTableEntry should render disabled button 1`] = `
 <span>
+  <MessageDialog
+    accessibleDescription=""
+    accessibleName=""
+    className=""
+    enforceFocus={true}
+    footer={null}
+    icon={null}
+    onHide={[Function]}
+    primaryAction={[Function]}
+    primaryActionButtonBsStyle="primary"
+    primaryActionButtonContent="Confirm"
+    primaryContent="Are you sure you wish to delete this item?"
+    secondaryAction={[Function]}
+    secondaryActionButtonBsStyle="default"
+    secondaryActionButtonContent="Cancel"
+    secondaryContent={null}
+    show={false}
+    title="Confirm action"
+  />
   <Button
     active={false}
     block={false}

data/webpack/helper.js

@@ -19,6 +19,10 @@ function arrayToObjectObj(arr, id) {
   return rv;
 }
 
+function shortHostname(fqdn) {
+  return fqdn.split('.')[0];
+}
+
 function EasyHeaderFormatter(value, { column }) {
   return (
     <Table.Heading aria-label={column.header.label} {...column.header.props}>
@@ -27,8 +31,24 @@ function EasyHeaderFormatter(value, { column }) {
   );
 }
 
+function supportedPluginsToHiddenParameterTypes(supportedPlugins) {
+  let hiddenParameterTypes = [];
+
+  if (supportedPlugins['puppet'] == false) {
+    hiddenParameterTypes.push("puppetenv");
+  }
+
+  if (supportedPlugins['katello'] == false) {
+    hiddenParameterTypes.push("lifecycleenv");
+  }
+
+  return hiddenParameterTypes;
+}
+
 export {
   arrayToObject,
   arrayToObjectObj,
-  EasyHeaderFormatter
+  shortHostname,
+  EasyHeaderFormatter,
+  supportedPluginsToHiddenParameterTypes
 };