foreman_acd 0.9.5 → 0.10.0

data/webpack/components/SyncGitRepo/SyncGitRepo.js

@@ -1,69 +1,52 @@
-import React, { useState } from 'react'
+import React from 'react';
 import PropTypes from 'prop-types';
-import {
-  Icon,
-  Button,
-} from 'patternfly-react';
-import {
-  sprintf,
-  translate as __
-} from 'foremanReact/common/I18n';
-import {Select, TextInput} from 'foremanReact/components/common/forms/Select';
-import ScmTypeSelector from './components/ScmTypeSelector';
-import FormTextInput from './components/FormTextInput'
-import { arrayToObject } from '../../helper';
-import CommonForm from 'foremanReact/components/common/forms/CommonForm';
+import { Button } from 'patternfly-react';
 import $ from 'jquery';
-
-import {
-  FormControl,
-  inlineEditFormatterFactory,
-} from 'patternfly-react';
+import CommonForm from 'foremanReact/components/common/forms/CommonForm';
+import { translate as __ } from 'foremanReact/common/I18n';
+import ScmTypeSelector from './components/ScmTypeSelector';
+import FormTextInput from './components/FormTextInput';
 
 class SyncGitRepo extends React.Component {
-  constructor(props) {
-    super(props);
-  }
-
   validateParameters() {
     let result = true;
-    let msg = "";
+    let msg = '';
 
-    if (this.props.path === "" && this.props.scmType === 'directory') {
+    if (this.props.path === '' && this.props.scmType === 'directory') {
       result = false;
 
-      if (msg == "") {
-        msg += __("Directory path cannot be blank");
+      if (msg === '') {
+        msg += __('Directory path cannot be blank');
       }
     }
 
     if (this.props.scmType === 'git') {
-      if (this.props.gitUrl === "") {
+      if (this.props.gitUrl === '') {
         result = false;
 
-        if (msg == "") {
-          msg += __("Git URL cannot be blank");
+        if (msg === '') {
+          msg += __('Git URL cannot be blank');
         }
       }
     }
 
-    if (this.props.scmType !== "git" && this.props.scmType !== "directory" ) {
+    if (this.props.scmType !== 'git' && this.props.scmType !== 'directory') {
       result = false;
 
-      if (msg == "") {
-        msg += __("SCM Type cannot be blank");
+      if (msg === '') {
+        msg += __('SCM Type cannot be blank');
       }
     }
 
     return {
       validateResult: result,
-      validateMsg: msg
-    }
+      validateMsg: msg,
+    };
   }
 
   componentDidMount() {
     const {
-      data: {mode, scmType, path, gitCommit, gitUrl, appDefinitions},
+      data: { mode, scmType, path, gitCommit, gitUrl },
       initSyncGitRepo,
       loadScmType,
       loadPath,
@@ -77,20 +60,19 @@ class SyncGitRepo extends React.Component {
       loadPath(path);
       loadGitCommit(gitCommit);
       loadGitUrl(gitUrl);
-      handleGitRepoSync(this.props.scmType, this.props.path, this.props.gitCommit)
+      handleGitRepoSync(
+        this.props.scmType,
+        this.props.path,
+        this.props.gitCommit
+      );
     }
 
-    initSyncGitRepo(
-      scmType,
-      path,
-      gitCommit,
-      gitUrl,
-    );
-  };
+    initSyncGitRepo(scmType, path, gitCommit, gitUrl);
+  }
 
   render() {
     const {
-      data: {mode, scmTypes, organization, location, appDefinitions},
+      data: { scmTypes, appDefinitions },
       scmType,
       path,
       gitCommit,
@@ -102,101 +84,126 @@ class SyncGitRepo extends React.Component {
       handleGitRepoSync,
     } = this.props;
 
-    var url_validator = /^(ftp|http|https):\/\/[^ "]+$/;
+    const urlValidator = /^(ftp|http|https):\/\/[^ "]+$/;
 
-    let { validateResult, validateMsg } = this.validateParameters();
+    const { validateResult, validateMsg } = this.validateParameters();
 
+    /* eslint-disable jquery/no-attr */
     if (validateResult === false) {
-      $('input[type="submit"][name="commit"]').attr("disabled", true);
+      $('input[type="submit"][name="commit"]').attr('disabled', true);
     } else {
-      $('input[type="submit"][name="commit"]').attr("disabled", false);
+      $('input[type="submit"][name="commit"]').attr('disabled', false);
     }
+    /* eslint-enable jquery/no-attr */
 
     return (
       <span>
         <div>
           <ScmTypeSelector
             label="SCM Type *"
-            hidden={ false }
-            editable={ appDefinitions.length == 0 }
-            viewText={ scmTypes[scmType] }
-            options={ scmTypes }
-            onChange={ loadScmType }
-            selectValue={ scmType }
+            hidden={false}
+            editable={appDefinitions.length === 0}
+            viewText={scmTypes[scmType]}
+            options={scmTypes}
+            onChange={loadScmType}
+            selectValue={scmType}
           />
-          {(scmType === 'directory') ? (
-          <FormTextInput
-            label= 'Directory Path *'
-            editable= { appDefinitions.length == 0 }
-            viewText={ path }
-            onChange={ loadPath }
-            parameter="path"
-          /> ) : null }
-          {(scmType === 'git') ? (
-          <FormTextInput
-            label= 'Git Url *'
-            editable= { appDefinitions.length == 0 }
-            viewText={ gitUrl }
-            onChange={ loadGitUrl }
-            parameter="git_url"
-          /> ) : null }
-          {(!url_validator.test(gitUrl) && gitUrl)? (
-          <div className="form-group">
-            <div className="col-md-2"></div>
-            <div className="col-md-4"><pre>{ __("Git URL is wrong") }</pre></div>
-          </div>
-        ) : (<div></div>)}
-        {validateResult == false ? (
+          {scmType === 'directory' ? (
+            <FormTextInput
+              label="Directory Path *"
+              editable={appDefinitions.length === 0}
+              viewText={path}
+              onChange={loadPath}
+              parameter="path"
+            />
+          ) : null}
+          {scmType === 'git' ? (
+            <FormTextInput
+              label="Git Url *"
+              editable={appDefinitions.length === 0}
+              viewText={gitUrl}
+              onChange={loadGitUrl}
+              parameter="git_url"
+            />
+          ) : null}
+          {!urlValidator.test(gitUrl) && gitUrl ? (
             <div className="form-group">
-              <div className="col-md-2"></div>
-              <div className="col-md-4"><pre>{validateMsg}</pre></div>
+              <div className="col-md-2" />
+              <div className="col-md-4">
+                <pre>{__('Git URL is wrong')}</pre>
+              </div>
             </div>
-        ) : (<div></div>)}
-          {(scmType === "git") ? (
-          <FormTextInput
-            label="Git Branch/Commit/Tag"
-            editable= { appDefinitions.length == 0 }
-            viewText={ gitCommit }
-            onChange={ loadGitCommit }
-            parameter="git_commit"
-          /> ) : null }
-          {(scmType === "git") ? (
-          <CommonForm>
-          <span className="help-block help-inline">
-          <Button
-            bsStyle="default"
-            onClick={ (e) => handleGitRepoSync(gitUrl, gitCommit, scmType, e) }
-            >
-            {__('Sync Repository')} </Button>
-            </span>
+          ) : (
+            <div />
+          )}
+          {validateResult === false ? (
+            <div className="form-group">
+              <div className="col-md-2" />
+              <div className="col-md-4">
+                <pre>{validateMsg}</pre>
+              </div>
+            </div>
+          ) : (
+            <div />
+          )}
+          {scmType === 'git' ? (
+            <FormTextInput
+              label="Git Branch/Commit/Tag"
+              editable={appDefinitions.length === 0}
+              viewText={gitCommit}
+              onChange={loadGitCommit}
+              parameter="git_commit"
+            />
+          ) : null}
+          {scmType === 'git' ? (
+            <CommonForm>
+              <span className="help-block help-inline">
+                <Button
+                  bsStyle="default"
+                  onClick={e =>
+                    handleGitRepoSync(gitUrl, gitCommit, scmType, e)
+                  }
+                >
+                  {__('Sync Repository')}{' '}
+                </Button>
+              </span>
             </CommonForm>
-        ) : null }
-
+          ) : null}
         </div>
-          </span>
-        )};
+      </span>
+    );
+  }
 }
 
 SyncGitRepo.defaultProps = {
-  error: {},
-  scmType: "",
-  path: "",
-  gitCommit: "",
-  gitUrl: "",
-
-}
+  scmType: '',
+  path: '',
+  gitCommit: '',
+  gitUrl: '',
+};
 
 SyncGitRepo.propTypes = {
-  initSyncGitRepo: PropTypes.func,
-  loadScmType: PropTypes.func,
-  loadGitCommit: PropTypes.func,
-  loadPath: PropTypes.func,
-  loadGitUrl: PropTypes.func,
-  handleGitRepoSync: PropTypes.func,
-  scmType: PropTypes.string.isRequired,
-  path: PropTypes.string.isRequired,
+  data: PropTypes.shape({
+    appDefinitions: PropTypes.array.isRequired,
+    gitCommit: PropTypes.string.isRequired,
+    gitUrl: PropTypes.string.isRequired,
+    location: PropTypes.string,
+    mode: PropTypes.string,
+    organization: PropTypes.string,
+    path: PropTypes.string.isRequired,
+    scmType: PropTypes.string.isRequired,
+    scmTypes: PropTypes.object.isRequired,
+  }).isRequired,
   gitCommit: PropTypes.string,
   gitUrl: PropTypes.string,
+  handleGitRepoSync: PropTypes.func.isRequired,
+  initSyncGitRepo: PropTypes.func.isRequired,
+  loadScmType: PropTypes.func.isRequired,
+  loadGitCommit: PropTypes.func.isRequired,
+  loadPath: PropTypes.func.isRequired,
+  loadGitUrl: PropTypes.func.isRequired,
+  path: PropTypes.string,
+  scmType: PropTypes.string,
 };
 
 export default SyncGitRepo;

data/webpack/components/SyncGitRepo/SyncGitRepoActions.js

@@ -1,5 +1,4 @@
-import React from 'react';
-import { API, actionTypeGenerator } from 'foremanReact/redux/API';
+import { API } from 'foremanReact/redux/API';
 import { sprintf, translate as __ } from 'foremanReact/common/I18n';
 import { addToast } from 'foremanReact/components/ToastsList';
 
@@ -18,7 +17,7 @@ export const initSyncGitRepo = (
   scmType,
   path,
   gitCommit,
-  gitUrl,
+  gitUrl
 ) => dispatch => {
   const initialState = {};
 
@@ -33,91 +32,82 @@ export const initSyncGitRepo = (
   });
 };
 
-const errorHandler = (msg, err) => {
-  const error = {
-    errorMsg: __('Failed to fetch data from server.'),
-    statusText: err,
-  };
-  return { type: msg, payload: { error } };
-};
-
 export const handleGitRepoSync = (
-  gitUrl, gitCommit, scmType, e,
+  gitUrl,
+  gitCommit,
+  scmType,
+  e
 ) => async dispatch => {
   e.preventDefault();
-  //const { REQUEST, SUCCESS, FAILURE } = actionTypeGenerator(SYNC_GIT_REPOSITORY);
   dispatch({
     type: SYNC_GIT_REPO_REQUEST,
     payload: {
       git_commit: gitCommit,
       scm_type: scmType,
       git_url: gitUrl,
-    }});
+    },
+  });
   try {
-    const { data } = await API.post(
-      '/acd/ansible_playbooks/sync_git_repo', {"ansible_playbook": {"git_commit":gitCommit, "scm_type":scmType, "git_url":gitUrl}}
+    const { data } = await API.post('/acd/ansible_playbooks/sync_git_repo', {
+      ansible_playbook: {
+        git_commit: gitCommit,
+        scm_type: scmType,
+        git_url: gitUrl,
+      },
+    });
+    dispatch(
+      addToast({
+        type: 'success',
+        message: sprintf(__('Sucessfully synced git repository ')),
+        key: SYNC_GIT_REPO_SUCCESS,
+      })
     );
+    return dispatch({
+      type: SYNC_GIT_REPO_SUCCESS,
+      payload: {
+        git_commit: gitCommit,
+        git_url: gitUrl,
+        scm_type: scmType,
+      },
+      response: data,
+    });
+  } catch (error) {
     dispatch(
-        addToast({
-          type: 'success',
-          message: sprintf(
-            __('Sucessfully synced git repository ')
-          ),
-          key: SYNC_GIT_REPO_SUCCESS,
-        })
-      );
-      return dispatch({
-        type: SYNC_GIT_REPO_SUCCESS,
-        payload: {
-          git_commit: gitCommit,
-          git_url: gitUrl,
-          scm_type: scmType,
-        },
-        response: data,
-      });
-    } catch (error) {
-      dispatch(
-        addToast({
-          type: 'error',
-          message: sprintf(__('Error occurred while syncing git repository: %s'), error.response.data.message),
-          key: SYNC_GIT_REPO_FAILURE,
-        })
-      );
-      return dispatch({
-        type: SYNC_GIT_REPO_FAILURE,
-        payload: {
-          error: error,
-        },
-        response: error,
-      });
-    }
+      addToast({
+        type: 'error',
+        message: sprintf(
+          __('Error occurred while syncing git repository: %s'),
+          error.response.data.message
+        ),
+        key: SYNC_GIT_REPO_FAILURE,
+      })
+    );
+    return dispatch({
+      type: SYNC_GIT_REPO_FAILURE,
+      payload: {
+        error,
+      },
+      response: error,
+    });
+  }
 };
 
+export const loadScmType = scmType => ({
+  type: SYNC_GIT_REPO_LOAD_SCM_TYPE,
+  scmType,
+});
 
-export const loadScmType = (scmType) => {
-  return ({
-    type: SYNC_GIT_REPO_LOAD_SCM_TYPE,
-    scmType: scmType,
-})
-};
-
-export const loadPath = (path) => {
-  return ({
-    type: SYNC_GIT_REPO_LOAD_PATH,
-    path: path,
-})
-};
+export const loadPath = path => ({
+  type: SYNC_GIT_REPO_LOAD_PATH,
+  path,
+});
 
-export const loadGitCommit = (gitCommit) => {
-  return ({
-    type: SYNC_GIT_REPO_LOAD_GIT_COMMIT,
-    gitCommit: gitCommit,
-})
-};
+export const loadGitCommit = gitCommit => ({
+  type: SYNC_GIT_REPO_LOAD_GIT_COMMIT,
+  gitCommit,
+});
 
-export const loadGitUrl = (gitUrl) => {
-  return ({
-    type: SYNC_GIT_REPO_LOAD_GIT_URL,
-    gitUrl: gitUrl,
-})
-};
+export const loadGitUrl = gitUrl => ({
+  type: SYNC_GIT_REPO_LOAD_GIT_URL,
+  gitUrl,
+});

data/webpack/components/SyncGitRepo/SyncGitRepoReducer.js

@@ -24,54 +24,54 @@ const syncGitRepoConf = (state = initialState, action) => {
     }
     case SYNC_GIT_REPO_LOAD_SCM_TYPE: {
       let newState = {};
-      const scmType = action.scmType;
+      const { scmType } = action;
 
       newState = {
-        scmType: scmType,
+        scmType,
       };
 
       return state.merge(newState);
     }
     case SYNC_GIT_REPO_LOAD_PATH: {
       let newState = {};
-      const path = action.path;
+      const { path } = action;
 
       newState = {
-        path: path,
+        path,
       };
 
       return state.merge(newState);
     }
     case SYNC_GIT_REPO_LOAD_GIT_COMMIT: {
       let newState = {};
-      const gitCommit = action.gitCommit;
+      const { gitCommit } = action;
 
       newState = {
-        gitCommit: gitCommit,
+        gitCommit,
       };
 
       return state.merge(newState);
     }
     case SYNC_GIT_REPO_LOAD_GIT_URL: {
       let newState = {};
-      const gitUrl = action.gitUrl;
+      const { gitUrl } = action;
 
       newState = {
-        gitUrl: gitUrl,
+        gitUrl,
       };
 
       return state.merge(newState);
     }
     case SYNC_GIT_REPO_FAILURE: {
-       return state.merge({ error: payload.error, loading: false });
-     }
-     case SYNC_GIT_REPO_REQUEST: {
-       return state.set('loading', true);
-     }
-     case SYNC_GIT_REPO_SUCCESS: {
-       let newState = {};
-       return state.merge(newState);
-     }
+      return state.merge({ error: payload.error, loading: false });
+    }
+    case SYNC_GIT_REPO_REQUEST: {
+      return state.set('loading', true);
+    }
+    case SYNC_GIT_REPO_SUCCESS: {
+      const newState = {};
+      return state.merge(newState);
+    }
     default:
       return state;
   }

data/webpack/components/SyncGitRepo/__fixtures__/syncGitRepoConfData1.fixtures.js

@@ -0,0 +1,7 @@
+export const syncGitRepoConfData1 = {
+  path: 'https://example.com',
+  gitCommit: 'master',
+  scmType: { git: 'git' },
+  scmTypes: { git: 'git', directory: 'directory' },
+  gitUrl: 'https://github.com/alpha.git',
+};

data/webpack/components/SyncGitRepo/__fixtures__/syncGitRepoReducer.fixtures.js

@@ -1,44 +1,36 @@
 import Immutable from 'seamless-immutable';
-import {
-   cloneDeep,
-   findIndex,
-   findLastIndex,
-} from 'lodash';
 
-import {
-  syncGitRepoConfData_1,
-} from '../__fixtures__/syncGitRepoConfData_1.fixtures';
+import { syncGitRepoConfData1 } from '../__fixtures__/syncGitRepoConfData1.fixtures';
 
-export const successState = Immutable(syncGitRepoConfData_1);
+export const successState = Immutable(syncGitRepoConfData1);
 
 // Payload Data
-export const initSyncGitRepoPayload = syncGitRepoConfData_1;
+export const initSyncGitRepoPayload = syncGitRepoConfData1;
 
 export const loadPathPayload = {
-  path: 'https://example.com'
+  path: 'https://example.com',
 };
 
 export const loadGitCommitPayload = {
-  gitCommit: 'master'
+  gitCommit: 'master',
 };
 
 export const loadGitUrlPayload = {
-  gitUrl: 'https://github.com/alpha.git'
+  gitUrl: 'https://github.com/alpha.git',
 };
 
 export const loadScmTypePayload = {
   scmType: {
-    git: "git",
-  }
+    git: 'git',
+  },
 };
 
 export const handleGitRepoSyncRequestPayload = {
   clearRows: false,
 };
 
-export const handleGitRepoSyncSuccessPayload = {
-};
+export const handleGitRepoSyncSuccessPayload = {};
 
 export const handleGitRepoSyncFailurePayload = {
-  error: "Something really bad happend",
+  error: 'Something really bad happend',
 };