foreman_acd 0.6.0 → 0.9.1

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

@@ -1,27 +1,69 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`ParameterSelectionSelectors should return ParamDefinition from parameterSelectionData_1 fixtures 1`] = `
+Object {
+  "dataId": "1",
+  "id": 1,
+  "name": "web",
+}
+`;
+
+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 {
+    "cell": Object {
+      "formatters": Array [
+        null,
+      ],
+    },
     "header": Object {
+      "customFormatters": Array [
+        null,
+      ],
+      "formatters": Array [
+        null,
+      ],
       "label": "Name",
       "props": Object {
         "index": 0,
         "sort": true,
         "style": Object {
-          "width": "20%",
+          "width": "25%",
         },
       },
+      "transforms": Array [
+        null,
+      ],
     },
     "property": "name",
   },
   Object {
     "cell": Object {
+      "formatters": Array [
+        null,
+      ],
       "props": Object {
         "index": 1,
       },
     },
     "header": Object {
+      "customFormatters": Array [
+        null,
+      ],
+      "formatters": Array [
+        null,
+      ],
       "label": "Description",
       "props": Object {
         "index": 1,
@@ -30,16 +72,25 @@ Array [
           "width": "25%",
         },
       },
+      "transforms": Array [
+        null,
+      ],
     },
     "property": "description",
   },
   Object {
     "cell": Object {
-      "props": Object {
-        "index": 2,
-      },
+      "formatters": Array [
+        null,
+      ],
     },
     "header": Object {
+      "customFormatters": Array [
+        null,
+      ],
+      "formatters": Array [
+        null,
+      ],
       "label": "Type",
       "props": Object {
         "index": 2,
@@ -48,37 +99,55 @@ Array [
           "width": "20%",
         },
       },
+      "transforms": Array [
+        null,
+      ],
     },
     "property": "type",
   },
   Object {
     "cell": Object {
-      "props": Object {
-        "index": 3,
-      },
+      "formatters": Array [
+        null,
+      ],
     },
     "header": Object {
+      "customFormatters": Array [
+        null,
+      ],
+      "formatters": Array [
+        null,
+      ],
       "label": "Default value",
       "props": Object {
         "index": 3,
         "sort": true,
         "style": Object {
-          "width": "25%",
+          "width": "20%",
         },
       },
+      "transforms": Array [
+        null,
+      ],
     },
     "property": "value",
   },
   Object {
     "cell": Object {
-      "props": Object {
-        "index": 4,
-      },
+      "formatters": Array [
+        null,
+      ],
     },
     "header": Object {
+      "formatters": Array [
+        null,
+      ],
       "label": "Actions",
       "props": Object {
         "index": 4,
+        "style": Object {
+          "width": "10%",
+        },
       },
     },
     "property": "actions",
@@ -88,45 +157,69 @@ Array [
 
 exports[`ParameterSelectionSelectors should return editMode from parameterSelectionData_1 fixtures 1`] = `false`;
 
-exports[`ParameterSelectionSelectors should return foremanData from parameterSelectionData_1 fixtures 1`] = `
+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`;
+
+exports[`ParameterSelectionSelectors should return paramData from parameterSelectionData_1 fixtures 1`] = `
 Object {
-  "computeprofiles": Array [],
-  "domains": Array [],
-  "environments": Array [
+  "computeprofiles": Array [
     Object {
       "id": 1,
-      "name": "production",
+      "name": "1-Small",
     },
     Object {
       "id": 2,
-      "name": "test",
+      "name": "2-Medium",
+    },
+    Object {
+      "id": 3,
+      "name": "3-Large",
+    },
+    Object {
+      "id": 4,
+      "name": "Orchahosts-VM",
+    },
+  ],
+  "dataType": "PARAMETER_SELECTION_PARAM_TYPE_FOREMAN",
+  "domains": Array [
+    Object {
+      "id": 1,
+      "name": "deploy3.dev.atix",
+    },
+  ],
+  "environments": Array [
+    Object {
+      "id": 1,
+      "name": "production",
     },
   ],
   "hostgroup_id": 1,
-  "lifecycle_environments": Array [],
-  "ptables": Array [
+  "lifecycle_environments": Array [
     Object {
-      "id": 105,
-      "name": "Kickstart default",
+      "id": 1,
+      "name": "Library",
     },
+  ],
+  "ptables": Array [
     Object {
-      "id": 104,
-      "name": "Kickstart default thin",
+      "id": 125,
+      "name": "Kickstart default",
     },
   ],
 }
 `;
 
-exports[`ParameterSelectionSelectors should return hostgroupId from parameterSelectionData_1 fixtures 1`] = `1`;
-
-exports[`ParameterSelectionSelectors should return loading from parameterSelectionData_1 fixtures 1`] = `false`;
-
 exports[`ParameterSelectionSelectors should return parameterTypes from parameterSelectionData_1 fixtures 1`] = `
 Object {
-  "computeprofile": "Compute profile",
   "domain": "Domain",
   "hostparam": "Host parameter",
-  "lifecycleenv": "Lifecycle environment",
+  "ip": "IP",
+  "password": "Root password",
+  "ptable": "Partition table",
+  "puppetenv": "Puppet environment",
 }
 `;
 
@@ -135,64 +228,22 @@ Array [
   Object {
     "description": "",
     "id": 1,
-    "name": "PuppetEnv",
-    "type": "puppetenv",
-    "value": "2",
+    "locked": false,
+    "name": "CP",
+    "type": "computeprofile",
+    "value": "1",
   },
   Object {
     "description": "",
     "id": 2,
-    "name": "PW",
-    "type": "password",
-    "value": "rooot",
-  },
-  Object {
-    "description": "",
-    "id": 3,
-    "name": "Blub",
-    "type": "hostparam",
-    "value": "awesome",
-  },
-  Object {
-    "description": "",
-    "id": 4,
-    "name": "111allo",
-    "type": "ip",
-    "value": "1.1.1.1",
-  },
-  Object {
-    "description": "",
-    "id": 5,
-    "name": "1111aasdfasf",
-    "type": "hostname",
-    "value": "dername",
-  },
-  Object {
-    "description": "",
-    "id": 6,
-    "name": "222nocheiner",
-    "type": "hostparam",
-    "value": "",
-  },
-  Object {
-    "description": "aa",
-    "id": 7,
-    "name": "aaaaa",
-    "type": "ptable",
-    "value": "",
-  },
-  Object {
-    "description": "",
-    "id": 8,
-    "name": "aaa",
-    "type": "hostparam",
-    "value": "2134234",
+    "locked": true,
+    "name": "LE",
+    "type": "lifecycleenv",
+    "value": "1",
   },
 ]
 `;
 
-exports[`ParameterSelectionSelectors should return serviceDefinition from parameterSelectionData_1 fixtures 1`] = `undefined`;
-
 exports[`ParameterSelectionSelectors should return sortingColumns from parameterSelectionData_1 fixtures 1`] = `
 Object {
   "name": Object {

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

@@ -0,0 +1,202 @@
+import React, { useState } 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 $ from 'jquery';
+
+import {
+  FormControl,
+  inlineEditFormatterFactory,
+} from 'patternfly-react';
+
+class SyncGitRepo extends React.Component {
+  constructor(props) {
+    super(props);
+  }
+
+  validateParameters() {
+    let result = true;
+    let msg = "";
+
+    if (this.props.path === "" && this.props.scmType === 'directory') {
+      result = false;
+
+      if (msg == "") {
+        msg += __("Directory path cannot be blank");
+      }
+    }
+
+    if (this.props.scmType === 'git') {
+      if (this.props.gitUrl === "") {
+        result = false;
+
+        if (msg == "") {
+          msg += __("Git URL cannot be blank");
+        }
+      }
+    }
+
+    if (this.props.scmType !== "git" && this.props.scmType !== "directory" ) {
+      result = false;
+
+      if (msg == "") {
+        msg += __("SCM Type cannot be blank");
+      }
+    }
+
+    return {
+      validateResult: result,
+      validateMsg: msg
+    }
+  }
+
+  componentDidMount() {
+    const {
+      data: {mode, scmType, path, gitCommit, gitUrl, appDefinitions},
+      initSyncGitRepo,
+      loadScmType,
+      loadPath,
+      loadGitCommit,
+      loadGitUrl,
+      handleGitRepoSync,
+    } = this.props;
+
+    if (mode === 'editInstance') {
+      loadScmType(scmType);
+      loadPath(path);
+      loadGitCommit(gitCommit);
+      loadGitUrl(gitUrl);
+      handleGitRepoSync(this.props.scmType, this.props.path, this.props.gitCommit)
+    }
+
+    initSyncGitRepo(
+      scmType,
+      path,
+      gitCommit,
+      gitUrl,
+    );
+  };
+
+  render() {
+    const {
+      data: {mode, scmTypes, organization, location, appDefinitions},
+      scmType,
+      path,
+      gitCommit,
+      gitUrl,
+      loadScmType,
+      loadPath,
+      loadGitCommit,
+      loadGitUrl,
+      handleGitRepoSync,
+    } = this.props;
+
+    var url_validator = /^(ftp|http|https):\/\/[^ "]+$/;
+
+    let { validateResult, validateMsg } = this.validateParameters();
+
+    if (validateResult === false) {
+      $('input[type="submit"][name="commit"]').attr("disabled", true);
+    } else {
+      $('input[type="submit"][name="commit"]').attr("disabled", false);
+    }
+
+    return (
+      <span>
+        <div>
+          <ScmTypeSelector
+            label="SCM Type *"
+            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 ? (
+            <div className="form-group">
+              <div className="col-md-2"></div>
+              <div className="col-md-4"><pre>{validateMsg}</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>
+            </CommonForm>
+        ) : null }
+
+        </div>
+          </span>
+        )};
+}
+
+SyncGitRepo.defaultProps = {
+  error: {},
+  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,
+  gitCommit: PropTypes.string,
+  gitUrl: PropTypes.string,
+};
+
+export default SyncGitRepo;

data/webpack/components/SyncGitRepo/SyncGitRepo.scss

@@ -0,0 +1 @@
+@import '~@theforeman/vendor/scss/variables';

data/webpack/components/SyncGitRepo/SyncGitRepoActions.js

@@ -0,0 +1,123 @@
+import React from 'react';
+import { API, actionTypeGenerator } from 'foremanReact/redux/API';
+import { sprintf, translate as __ } from 'foremanReact/common/I18n';
+import { addToast } from 'foremanReact/components/ToastsList';
+
+import {
+  SYNC_GIT_REPO_INIT,
+  SYNC_GIT_REPO_LOAD_SCM_TYPE,
+  SYNC_GIT_REPO_LOAD_PATH,
+  SYNC_GIT_REPO_LOAD_GIT_COMMIT,
+  SYNC_GIT_REPO_LOAD_GIT_URL,
+  SYNC_GIT_REPO_REQUEST,
+  SYNC_GIT_REPO_FAILURE,
+  SYNC_GIT_REPO_SUCCESS,
+} from './SyncGitRepoConstants';
+
+export const initSyncGitRepo = (
+  scmType,
+  path,
+  gitCommit,
+  gitUrl,
+) => dispatch => {
+  const initialState = {};
+
+  initialState.scmType = scmType;
+  initialState.path = path;
+  initialState.gitCommit = gitCommit;
+  initialState.gitUrl = gitUrl;
+
+  dispatch({
+    type: SYNC_GIT_REPO_INIT,
+    payload: initialState,
+  });
+};
+
+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,
+) => 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}}
+    );
+    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,
+      });
+    }
+};
+
+
+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 loadGitCommit = (gitCommit) => {
+  return ({
+    type: SYNC_GIT_REPO_LOAD_GIT_COMMIT,
+    gitCommit: gitCommit,
+})
+};
+
+export const loadGitUrl = (gitUrl) => {
+  return ({
+    type: SYNC_GIT_REPO_LOAD_GIT_URL,
+    gitUrl: gitUrl,
+})
+};

data/webpack/components/SyncGitRepo/SyncGitRepoConstants.js

@@ -0,0 +1,8 @@
+export const SYNC_GIT_REPO_INIT = 'SYNC_GIT_REPO_INIT';
+export const SYNC_GIT_REPO_LOAD_PATH = 'SYNC_GIT_REPO_LOAD_PATH';
+export const SYNC_GIT_REPO_LOAD_SCM_TYPE = 'SYNC_GIT_REPO_LOAD_SCM_TYPE';
+export const SYNC_GIT_REPO_LOAD_GIT_COMMIT = 'SYNC_GIT_REPO_LOAD_GIT_COMMIT';
+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';