foreman_acd 0.9.5 → 0.10.0

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

@@ -5,14 +5,14 @@ import SyncGitRepo from '../SyncGitRepo';
 const noop = () => {};
 
 const fixtures = {
-  'should render ansible playbook': {
+  'should render empty ansible playbook': {
     data: {
-      scmType: "",
-      path: "",
-      gitCommit: "",
-      appDefinitions: "",
-      gitUrl: "",
+      path: '',
+      gitCommit: '',
+      appDefinitions: [],
+      gitUrl: '',
       scmTypes: {},
+      scmType: '',
     },
     initSyncGitRepo: noop,
     loadScmType: noop,
@@ -21,6 +21,80 @@ const fixtures = {
     loadGitUrl: noop,
     handleGitRepoSync: noop,
   },
+  'should render ansible playbook git-form': {
+    data: {
+      path: '',
+      gitCommit: '',
+      appDefinitions: [],
+      gitUrl: '',
+      scmTypes: {},
+      scmType: '',
+    },
+    scmType: 'git',
+    initSyncGitRepo: noop,
+    loadScmType: noop,
+    loadPath: noop,
+    loadGitCommit: noop,
+    loadGitUrl: noop,
+    handleGitRepoSync: noop,
+  },
+  'should render ansible playbook directory-form': {
+    data: {
+      path: '',
+      gitCommit: '',
+      appDefinitions: [],
+      gitUrl: '',
+      scmTypes: {},
+      scmType: '',
+    },
+    scmType: 'directory',
+    initSyncGitRepo: noop,
+    loadScmType: noop,
+    loadPath: noop,
+    loadGitCommit: noop,
+    loadGitUrl: noop,
+    handleGitRepoSync: noop,
+  },
+  'should render ansible playbook git-form with server-data': {
+    data: {
+      path: '',
+      gitCommit: '',
+      appDefinitions: [],
+      gitUrl: '',
+      scmTypes: { directory: 'directory', git: 'git' },
+      scmType: '',
+    },
+    path: '/ansible/play_hello.yaml',
+    gitCommit: 'main',
+    gitUrl: 'https://git.example.com/playbooks.git',
+    scmType: 'git',
+    initSyncGitRepo: noop,
+    loadScmType: noop,
+    loadPath: noop,
+    loadGitCommit: noop,
+    loadGitUrl: noop,
+    handleGitRepoSync: noop,
+  },
+  'should render ansible playbook directory-form with server-data': {
+    data: {
+      path: '',
+      gitCommit: '',
+      appDefinitions: [],
+      gitUrl: '',
+      scmTypes: { directory: 'directory', git: 'git' },
+      scmType: 'directory',
+    },
+    gitUrl: '',
+    path: '/ansible/play_hello.yaml',
+    gitCommit: '',
+    scmType: 'directory',
+    initSyncGitRepo: noop,
+    loadScmType: noop,
+    loadPath: noop,
+    loadGitCommit: noop,
+    loadGitUrl: noop,
+    handleGitRepoSync: noop,
+  },
 };
 
 describe('SyncGitRepo', () =>

data/webpack/components/SyncGitRepo/__tests__/SyncGitRepoSelectors.test.js

@@ -7,9 +7,7 @@ import {
   selectGitUrl,
 } from '../SyncGitRepoSelectors';
 
-import {
-  syncGitRepoConfData_1,
-} from '../__fixtures__/syncGitRepoConfData_1.fixtures';
+import { syncGitRepoConfData1 } from '../__fixtures__/syncGitRepoConfData1.fixtures';
 
 const stateFactory = obj => ({
   foremanAcd: {
@@ -18,14 +16,14 @@ const stateFactory = obj => ({
 });
 
 const fixtures = {
-  'should return scmType from syncGitRepoConfData_1 fixtures': () =>
-    selectScmType(stateFactory(syncGitRepoConfData_1)),
-  'should return path from syncGitRepoConfData_1 fixtures': () =>
-    selectPath(stateFactory(syncGitRepoConfData_1)),
-  'should return gitCommit from syncGitRepoConfData_1 fixtures': () =>
-    selectGitCommit(stateFactory(syncGitRepoConfData_1)),
-  'should return gitUrl from syncGitRepoConfData_1 fixtures': () =>
-    selectGitUrl(stateFactory(syncGitRepoConfData_1)),
+  'should return scmType from syncGitRepoConfData1 fixtures': () =>
+    selectScmType(stateFactory(syncGitRepoConfData1)),
+  'should return path from syncGitRepoConfData1 fixtures': () =>
+    selectPath(stateFactory(syncGitRepoConfData1)),
+  'should return gitCommit from syncGitRepoConfData1 fixtures': () =>
+    selectGitCommit(stateFactory(syncGitRepoConfData1)),
+  'should return gitUrl from syncGitRepoConfData1 fixtures': () =>
+    selectGitUrl(stateFactory(syncGitRepoConfData1)),
 };
 
 describe('SyncGitRepoSelectors', () =>

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

@@ -1,6 +1,196 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`SyncGitRepo should render ansible playbook 1`] = `
+exports[`SyncGitRepo should render ansible playbook directory-form 1`] = `
+<span>
+  <div>
+    <ScmTypeSelector
+      editable={true}
+      hidden={false}
+      label="SCM Type *"
+      onChange={[Function]}
+      options={Object {}}
+      selectValue="directory"
+      viewText=""
+    />
+    <FormTextInput
+      editable={true}
+      hidden={false}
+      label="Directory Path *"
+      onChange={[Function]}
+      parameter="path"
+      viewText=""
+    />
+    <div />
+    <div
+      className="form-group"
+    >
+      <div
+        className="col-md-2"
+      />
+      <div
+        className="col-md-4"
+      >
+        <pre>
+          Directory path cannot be blank
+        </pre>
+      </div>
+    </div>
+  </div>
+</span>
+`;
+
+exports[`SyncGitRepo should render ansible playbook directory-form with server-data 1`] = `
+<span>
+  <div>
+    <ScmTypeSelector
+      editable={true}
+      hidden={false}
+      label="SCM Type *"
+      onChange={[Function]}
+      options={
+        Object {
+          "directory": "directory",
+          "git": "git",
+        }
+      }
+      selectValue="directory"
+      viewText="directory"
+    />
+    <FormTextInput
+      editable={true}
+      hidden={false}
+      label="Directory Path *"
+      onChange={[Function]}
+      parameter="path"
+      viewText="/ansible/play_hello.yaml"
+    />
+    <div />
+    <div />
+  </div>
+</span>
+`;
+
+exports[`SyncGitRepo should render ansible playbook git-form 1`] = `
+<span>
+  <div>
+    <ScmTypeSelector
+      editable={true}
+      hidden={false}
+      label="SCM Type *"
+      onChange={[Function]}
+      options={Object {}}
+      selectValue="git"
+      viewText=""
+    />
+    <FormTextInput
+      editable={true}
+      hidden={false}
+      label="Git Url *"
+      onChange={[Function]}
+      parameter="git_url"
+      viewText=""
+    />
+    <div />
+    <div
+      className="form-group"
+    >
+      <div
+        className="col-md-2"
+      />
+      <div
+        className="col-md-4"
+      >
+        <pre>
+          Git URL cannot be blank
+        </pre>
+      </div>
+    </div>
+    <FormTextInput
+      editable={true}
+      hidden={false}
+      label="Git Branch/Commit/Tag"
+      onChange={[Function]}
+      parameter="git_commit"
+      viewText=""
+    />
+    <CommonForm>
+      <span
+        className="help-block help-inline"
+      >
+        <Button
+          active={false}
+          block={false}
+          bsClass="btn"
+          bsStyle="default"
+          disabled={false}
+          onClick={[Function]}
+        >
+          Sync Repository
+           
+        </Button>
+      </span>
+    </CommonForm>
+  </div>
+</span>
+`;
+
+exports[`SyncGitRepo should render ansible playbook git-form with server-data 1`] = `
+<span>
+  <div>
+    <ScmTypeSelector
+      editable={true}
+      hidden={false}
+      label="SCM Type *"
+      onChange={[Function]}
+      options={
+        Object {
+          "directory": "directory",
+          "git": "git",
+        }
+      }
+      selectValue="git"
+      viewText="git"
+    />
+    <FormTextInput
+      editable={true}
+      hidden={false}
+      label="Git Url *"
+      onChange={[Function]}
+      parameter="git_url"
+      viewText="https://git.example.com/playbooks.git"
+    />
+    <div />
+    <div />
+    <FormTextInput
+      editable={true}
+      hidden={false}
+      label="Git Branch/Commit/Tag"
+      onChange={[Function]}
+      parameter="git_commit"
+      viewText="main"
+    />
+    <CommonForm>
+      <span
+        className="help-block help-inline"
+      >
+        <Button
+          active={false}
+          block={false}
+          bsClass="btn"
+          bsStyle="default"
+          disabled={false}
+          onClick={[Function]}
+        >
+          Sync Repository
+           
+        </Button>
+      </span>
+    </CommonForm>
+  </div>
+</span>
+`;
+
+exports[`SyncGitRepo should render empty ansible playbook 1`] = `
 <span>
   <div>
     <ScmTypeSelector
@@ -10,6 +200,7 @@ exports[`SyncGitRepo should render ansible playbook 1`] = `
       onChange={[Function]}
       options={Object {}}
       selectValue=""
+      viewText=""
     />
     <div />
     <div

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

@@ -1,12 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`SyncGitRepoSelectors should return gitCommit from syncGitRepoConfData_1 fixtures 1`] = `"master"`;
+exports[`SyncGitRepoSelectors should return gitCommit from syncGitRepoConfData1 fixtures 1`] = `"master"`;
 
-exports[`SyncGitRepoSelectors should return gitUrl from syncGitRepoConfData_1 fixtures 1`] = `"https://github.com/alpha.git"`;
+exports[`SyncGitRepoSelectors should return gitUrl from syncGitRepoConfData1 fixtures 1`] = `"https://github.com/alpha.git"`;
 
-exports[`SyncGitRepoSelectors should return path from syncGitRepoConfData_1 fixtures 1`] = `"https://example.com"`;
+exports[`SyncGitRepoSelectors should return path from syncGitRepoConfData1 fixtures 1`] = `"https://example.com"`;
 
-exports[`SyncGitRepoSelectors should return scmType from syncGitRepoConfData_1 fixtures 1`] = `
+exports[`SyncGitRepoSelectors should return scmType from syncGitRepoConfData1 fixtures 1`] = `
 Object {
   "git": "git",
 }

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

@@ -1,42 +1,47 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import ExtTextInput from '../../common/ExtTextInput';
-import RailsData from '../../common/RailsData'
+import RailsData from '../../common/RailsData';
 
-const FormTextInput= ({
+const FormTextInput = ({
   label,
   hidden,
   editable,
   viewText,
   onChange,
   parameter,
-}) =>{
-  return (
-    <div >
-      <div  >
-        <ExtTextInput
-          label={label}
-          editable={editable}
-          viewText={viewText}
-          onChange={onChange}
-        />
-        <RailsData
-          key='ansible_playbook_form_data'
-          view='ansible_playbook'
-          parameter={parameter}
-          value={viewText}
-        />
-      </div>
+}) => (
+  <div>
+    <div>
+      <ExtTextInput
+        hidden={false}
+        label={label}
+        editable={editable}
+        viewText={viewText}
+        onChange={onChange}
+      />
+      <RailsData
+        key="ansible_playbook_form_data"
+        view="ansible_playbook"
+        parameter={parameter}
+        value={viewText}
+      />
     </div>
-  );
-};
+  </div>
+);
 
 FormTextInput.propTypes = {
   label: PropTypes.string.isRequired,
+  hidden: PropTypes.bool,
   editable: PropTypes.bool.isRequired,
   viewText: PropTypes.string,
   onChange: PropTypes.func.isRequired,
   parameter: PropTypes.string,
 };
+FormTextInput.defaultProps = {
+  hidden: false,
+  viewText: '',
+  parameter: '',
+};
 
 export default FormTextInput;

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

@@ -1,9 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import ExtSelect from '../../common/ExtSelect';
-import RailsData from '../../common/RailsData'
+import RailsData from '../../common/RailsData';
 
-const ScmTypeSelector= ({
+const ScmTypeSelector = ({
   label,
   hidden,
   editable,
@@ -11,37 +11,42 @@ const ScmTypeSelector= ({
   selectValue,
   onChange,
   options,
-}) =>{
-  return (
-    <div className="form-group">
-      <label className="col-md-2 control-label">{label}</label>
-      <div className="col-md-4">
-        <ExtSelect
-          hidden={hidden}
-          editable={editable}
-          viewText={viewText}
-          selectValue={selectValue}
-          onChange={onChange}
-          options={options}
-        />
-        <RailsData
-          key='ansible_playbook_scm_data'
-          view='ansible_playbook'
-          parameter='scm_type'
-          value={selectValue}
-        />
-      </div>
+}) => (
+  <div className="form-group">
+    <label className="col-md-2 control-label">{label}</label>
+    <div className="col-md-4">
+      <ExtSelect
+        hidden={hidden}
+        editable={editable}
+        viewText={viewText}
+        selectValue={selectValue}
+        onChange={onChange}
+        options={options}
+      />
+      <RailsData
+        key="ansible_playbook_scm_data"
+        view="ansible_playbook"
+        parameter="scm_type"
+        value={selectValue}
+      />
     </div>
-  );
-};
+  </div>
+);
 
 ScmTypeSelector.propTypes = {
   label: PropTypes.string.isRequired,
+  hidden: PropTypes.bool,
   editable: PropTypes.bool.isRequired,
   viewText: PropTypes.string,
   selectValue: PropTypes.string,
   onChange: PropTypes.func.isRequired,
   options: PropTypes.object,
 };
+ScmTypeSelector.defaultProps = {
+  hidden: false,
+  viewText: '',
+  selectValue: '',
+  options: {},
+};
 
 export default ScmTypeSelector;

data/webpack/components/SyncGitRepo/index.js

@@ -16,13 +16,10 @@ const mapStateToProps = state => ({
   scmType: selectScmType(state),
   gitCommit: selectGitCommit(state),
   path: selectPath(state),
-  gitUrl: selectGitUrl(state)
+  gitUrl: selectGitUrl(state),
 });
 
 const mapDispatchToProps = dispatch =>
   bindActionCreators(SyncGitRepoActions, dispatch);
 
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(SyncGitRepo);
+export default connect(mapStateToProps, mapDispatchToProps)(SyncGitRepo);

data/webpack/components/common/AddTableEntry.js

@@ -1,15 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import {
-  Icon,
-  Button,
-} from 'patternfly-react';
+import { Icon, Button } from 'patternfly-react';
 
-const AddTableEntry = ({
-  hidden,
-  disabled,
-  onAddTableEntry,
-}) =>{
+const AddTableEntry = ({ hidden, disabled, onAddTableEntry }) => {
   if (hidden) {
     return null;
   }
@@ -24,7 +17,7 @@ const AddTableEntry = ({
 AddTableEntry.propTypes = {
   hidden: PropTypes.bool.isRequired,
   disabled: PropTypes.bool.isRequired,
-  onAddTableEntry: PropTypes.func.isRequired
+  onAddTableEntry: PropTypes.func.isRequired,
 };
 
 export default AddTableEntry;

data/webpack/components/common/DeleteTableEntry.js

@@ -1,10 +1,6 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import {
-  Icon,
-  Button,
-  MessageDialog,
-} from 'patternfly-react';
+import { Icon, Button, MessageDialog } from 'patternfly-react';
 import { translate as __ } from 'foremanReact/common/I18n';
 
 const DeleteTableEntry = ({
@@ -12,14 +8,14 @@ const DeleteTableEntry = ({
   disabled,
   onDeleteTableEntry,
   additionalData,
-}) =>{
+}) => {
+  const [showModal, setShowModal] = useState(false);
+  const toggleModal = () => setShowModal(!showModal);
+
   if (hidden) {
     return null;
   }
 
-  const [showModal, setShowModal] = useState(false);
-  const toggleModal = () => setShowModal(!showModal);
-
   return (
     <span>
       <MessageDialog
@@ -32,12 +28,8 @@ const DeleteTableEntry = ({
         title={__('Confirm action')}
         primaryContent={__('Are you sure you wish to delete this item?')}
       />
-      <Button
-        bsStyle="default"
-        disabled={disabled}
-        onClick={toggleModal}
-      >
-        <Icon type="pf" name="delete" title={__("Delete entry")} />
+      <Button bsStyle="default" disabled={disabled} onClick={toggleModal}>
+        <Icon type="pf" name="delete" title={__('Delete entry')} />
       </Button>
     </span>
   );

data/webpack/components/common/EditTableEntry.js

@@ -1,9 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import {
-  Icon,
-  Button,
-} from 'patternfly-react';
+import { Icon, Button } from 'patternfly-react';
 import { translate as __ } from 'foremanReact/common/I18n';
 
 const EditTableEntry = ({
@@ -12,12 +9,12 @@ const EditTableEntry = ({
   handleLocking,
   onEditTableEntry,
   additionalData,
-}) =>{
+}) => {
   if (hidden) {
     return null;
   }
 
-  let title = 'edit this entry'
+  let title = 'edit this entry';
 
   if (handleLocking === true) {
     if (additionalData.rowData.locked === true) {
@@ -31,7 +28,7 @@ const EditTableEntry = ({
       <Button
         bsStyle="default"
         disabled={disabled}
-        onClick={() => onEditTableEntry(additionalData) }
+        onClick={() => onEditTableEntry(additionalData)}
       >
         <Icon type="pf" name="edit" title={__(title)} />
       </Button>
@@ -46,5 +43,8 @@ EditTableEntry.propTypes = {
   onEditTableEntry: PropTypes.func.isRequired,
   additionalData: PropTypes.object.isRequired,
 };
+EditTableEntry.defaultProps = {
+  hidden: false,
+};
 
 export default EditTableEntry;

data/webpack/components/common/ExtSelect.js

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import Select from 'foremanReact/components/common/forms/Select';
 
-const ExtSelect= ({
+const ExtSelect = ({
   hidden,
   editable,
   viewText,
@@ -10,22 +10,20 @@ const ExtSelect= ({
   onChange,
   options,
   additionalData,
-}) =>{
+}) => {
   if (hidden) {
     return null;
   }
 
   if (!editable) {
-    return (
-     <div>{viewText}</div>
-    );
+    return <div>{viewText}</div>;
   }
 
   return (
     <Select
-       value={selectValue}
-       onChange={e => onChange(e.target.value, additionalData) }
-       options={options}
+      value={selectValue}
+      onChange={e => onChange(e.target.value, additionalData)}
+      options={options}
     />
   );
 };
@@ -39,5 +37,11 @@ ExtSelect.propTypes = {
   options: PropTypes.object,
   additionalData: PropTypes.object,
 };
+ExtSelect.defaultProps = {
+  viewText: '',
+  selectValue: '',
+  options: {},
+  additionalData: {},
+};
 
 export default ExtSelect;