foreman_acd 0.7.0 → 0.9.0

data/webpack/components/ParameterSelection/index.js

@@ -14,6 +14,7 @@ import {
   selectSortingColumns,
   selectColumns,
   selectParamDefinition,
+  selectEditParamsRowIndex,
 } from './ParameterSelectionSelectors';
 
 const mapStateToProps = state => ({
@@ -25,6 +26,7 @@ const mapStateToProps = state => ({
   sortingColumns: selectSortingColumns(state),
   columns: selectColumns(state),
   paramDefinition: selectParamDefinition(state),
+  editParamsRowIndex: selectEditParamsRowIndex(state),
 });
 
 const mapDispatchToProps = dispatch =>
@@ -34,4 +36,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

@@ -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}>
@@ -30,5 +34,6 @@ function EasyHeaderFormatter(value, { column }) {
 export {
   arrayToObject,
   arrayToObjectObj,
+  shortHostname,
   EasyHeaderFormatter
 };

data/webpack/index.js

@@ -3,8 +3,11 @@ import injectReducer from 'foremanReact/redux/reducers/registerReducer';
 import ParameterSelection from './components/ParameterSelection';
 import SyncGitRepo from './components/SyncGitRepo';
 import ApplicationDefinition from './components/ApplicationDefinition';
+import ApplicationDefinitionImport from './components/ApplicationDefinitionImport';
 import ApplicationInstance from './components/ApplicationInstance';
 import ApplicationInstanceReport from './components/ApplicationInstanceReport';
+import ExistingHostSelection from './components/ExistingHostSelection';
+
 import reducer from './reducer';
 
 injectReducer('foremanAcd', reducer);
@@ -12,5 +15,7 @@ injectReducer('foremanAcd', reducer);
 componentRegistry.register({ name: 'ParameterSelection', type: ParameterSelection, });
 componentRegistry.register({ name: 'SyncGitRepo', type: SyncGitRepo, });
 componentRegistry.register({ name: 'ApplicationDefinition', type: ApplicationDefinition, });
+componentRegistry.register({ name: 'ApplicationDefinitionImport', type: ApplicationDefinitionImport, });
 componentRegistry.register({ name: 'ApplicationInstance', type: ApplicationInstance, });
 componentRegistry.register({ name: 'ApplicationInstanceReport', type: ApplicationInstanceReport, });
+componentRegistry.register({ name: 'ExistingHostSelection', type: ExistingHostSelection, });