foreman_acd 0.9.7 → 0.10.0

data/webpack/components/ApplicationDefinition/__fixtures__/applicationDefinitionReducer.fixtures.js

@@ -1,26 +1,20 @@
 import Immutable from 'seamless-immutable';
-import {
-   cloneDeep,
-   findIndex,
-   findLastIndex,
-} from 'lodash';
+import { cloneDeep, findIndex } from 'lodash';
 
-import {
-  applicationDefinitionConfData_1,
-} from '../__fixtures__/applicationDefinitionConfData_1.fixtures';
+import { applicationDefinitionConfData1 } from '../__fixtures__/applicationDefinitionConfData1.fixtures';
 
-export const successState = Immutable(applicationDefinitionConfData_1);
+export const successState = Immutable(applicationDefinitionConfData1);
 
 const EDIT_ROW_ID = 2;
 
-const editClone = applicationDefinitionConfData_1;
-const editIndex = findIndex(editClone.services, { id: EDIT_ROW_ID })
-editClone["services"][editIndex].backup = cloneDeep(editClone["services"][editIndex]);
+const editClone = applicationDefinitionConfData1;
+const editIndex = findIndex(editClone.services, { id: EDIT_ROW_ID });
+editClone.services[editIndex].backup = cloneDeep(editClone.services[editIndex]);
 export const editState = Immutable(editClone);
 
 // Payload Data
-export const initApplicationDefinitionPayload = applicationDefinitionConfData_1;
-export const addServicePayload = { };
+export const initApplicationDefinitionPayload = applicationDefinitionConfData1;
+export const addServicePayload = {};
 export const deleteServicePayload = {
   rowData: {
     id: EDIT_ROW_ID,
@@ -42,11 +36,11 @@ export const cancelEditServicePayload = {
   },
 };
 export const changeEditServicePayload = {
-  value: "helloworld",
-  property: "name",
+  value: 'helloworld',
+  property: 'name',
   rowData: {
     id: EDIT_ROW_ID,
-  }
+  },
 };
 
 export const loadAnsibleDataRequestPayload = {
@@ -55,25 +49,51 @@ export const loadAnsibleDataRequestPayload = {
 
 export const loadAnsibleDataSuccessPayload = {
   id: 2,
-  name: "LAMP",
+  name: 'LAMP',
   groups: {
     webservers: {
-      dummy_var: "0"
+      dummy_var: '0',
     },
     dbservers: {
-      mysqlservice: "mysqld",
-      mysql_port: "3306",
-      dbuser: "webapp",
-      dbname: "ANSAP01",
-      upassword: "Bond@007",
-      masterpassword: "MySQL@007"
+      mysqlservice: 'mysqld',
+      mysql_port: '3306',
+      dbuser: 'webapp',
+      dbname: 'ANSAP01',
+      upassword: 'Bond@007',
+      masterpassword: 'MySQL@007',
     },
     all: {
-      repository: "https://github.com/bennojoy/mywebapp.git"
-    }
-  }
+      repository: 'https://github.com/bennojoy/mywebapp.git',
+    },
+  },
 };
 
 export const loadAnsibleDataFailurePayload = {
-  error: "Something really bad happend",
+  error: {
+    errorMsg: 'Something really bad happend',
+    statusText: {
+      message: 'Request failed with status code 500',
+      name: 'Error',
+      stack:
+        'Error: Request failed with status code 500\n    at createError (https://alma8-katello-devel.example.com/webpack/foreman-vendor.bundle-v13.0.1-development-5d3e5360b2af8f65b096.js:406679:15)\n    at settle (https://alma8-katello-devel.example.com/webpack/foreman-vendor.bundle-v13.0.1-development-5d3e5360b2af8f65b096.js:406954:12)\n    at XMLHttpRequest.handleLoad (https://alma8-katello-devel.example.com/webpack/foreman-vendor.bundle-v13.0.1-development-5d3e5360b2af8f65b096.js:406146:7)',
+      config: {
+        url: '/acd/ui_acd_ansible_data/1',
+        method: 'get',
+        headers: {
+          Accept: 'application/json, text/plain, */*',
+          'X-Requested-With': 'XMLHttpRequest',
+          'X-CSRF-Token':
+            'gDtRPi6lnKE-V65O-datPQ2mGRQwbw3i-y_hAjjKAYQ5WC_oqTwluCJZfsGkpihmJAi3IvAi1ZAc9N47KcjCbQ',
+        },
+        params: {},
+        transformRequest: [null],
+        transformResponse: [null],
+        timeout: 0,
+        xsrfCookieName: 'XSRF-TOKEN',
+        xsrfHeaderName: 'X-XSRF-TOKEN',
+        maxContentLength: -1,
+        maxBodyLength: -1,
+      },
+    },
+  },
 };

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

@@ -7,11 +7,11 @@ const noop = () => {};
 const fixtures = {
   'should render application definition': {
     data: {
-      location: "Default Location",
-      organization: "Default Organization",
+      location: 'Default Location',
+      organization: 'Default Organization',
       hostgroups: [],
-      foremanDataUrl: "url/does/not/exist",
-      ansibleDataUrl: "url/does/not/exist",
+      foremanDataUrl: 'url/does/not/exist',
+      ansibleDataUrl: 'url/does/not/exist',
       services: [],
       ansibleVarsAll: [],
     },

data/webpack/components/ApplicationDefinition/__tests__/ApplicationDefinitionHelper.test.js

@@ -0,0 +1,16 @@
+import { transformAnsiblePlaybook } from '../ApplicationDefinitionHelper';
+
+describe('transformAnsiblePlaybook()', () => {
+  const playbook = {
+    id: 42,
+    name: "Don't Panic",
+  };
+
+  it('returns empty playbook for invalid input', () => {
+    expect(transformAnsiblePlaybook(playbook)).toEqual({
+      id: playbook.id,
+      name: playbook.name,
+      groups: {},
+    });
+  });
+});

data/webpack/components/ApplicationDefinition/__tests__/ApplicationDefinitionReducer.test.js

@@ -27,11 +27,6 @@ import {
   APPLICATION_DEFINITION_SERVICE_EDIT_CONFIRM,
   APPLICATION_DEFINITION_SERVICE_EDIT_CHANGE,
   APPLICATION_DEFINITION_SERVICE_EDIT_CANCEL,
-  APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN,
-  APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE,
-  APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN,
-  APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE,
-  APPLICATION_DEFINITION_CHANGE_PARAMETER_SELECTION_MODE,
 } from '../ApplicationDefinitionConstants';
 
 const fixtures = {

data/webpack/components/ApplicationDefinition/__tests__/ApplicationDefinitionSelectors.test.js

@@ -14,9 +14,7 @@ import {
   selectParamEditMode,
 } from '../ApplicationDefinitionSelectors';
 
-import {
-  applicationDefinitionConfData_1,
-} from '../__fixtures__/applicationDefinitionConfData_1.fixtures';
+import { applicationDefinitionConfData1 } from '../__fixtures__/applicationDefinitionConfData1.fixtures';
 
 const stateFactory = obj => ({
   foremanAcd: {
@@ -25,28 +23,30 @@ const stateFactory = obj => ({
 });
 
 const fixtures = {
-  'should return showAlertModal from applicationDefinitionConfData_1 fixtures': () =>
-    selectShowAlertModal(stateFactory(applicationDefinitionConfData_1)),
-  'should return alertModalText from applicationDefinitionConfData_1 fixtures': () =>
-    selectAlertModalText(stateFactory(applicationDefinitionConfData_1)),
-  'should return alertModalTitle from applicationDefinitionConfData_1 fixtures': () =>
-    selectAlertModalTitle(stateFactory(applicationDefinitionConfData_1)),
-  'should return editMode from applicationDefinitionConfData_1 fixtures': () =>
-    selectEditMode(stateFactory(applicationDefinitionConfData_1)),
-  'should return ansiblePlaybook from applicationDefinitionConfData_1 fixtures': () =>
-    selectAnsiblePlaybook(stateFactory(applicationDefinitionConfData_1)),
-  'should return services from applicationDefinitionConfData_1 fixtures': () =>
-    selectServices(stateFactory(applicationDefinitionConfData_1)),
-  'should return parametersData from applicationDefinitionConfData_1 fixtures': () =>
-    selectParametersData(stateFactory(applicationDefinitionConfData_1)),
-  'should return columns from applicationDefinitionConfData_1 fixtures': () =>
-    selectColumns(stateFactory(applicationDefinitionConfData_1)),
-  'should return hiddenForemanParameterTypes from applicationDefinitionConfData_1 fixtures': () =>
-    selectHiddenForemanParameterTypes(stateFactory(applicationDefinitionConfData_1)),
-  'should return ansibleVarsAll from applicationDefinitionConfData_1 fixtures': () =>
-    selectAnsibleVarsAll(stateFactory(applicationDefinitionConfData_1)),
-  'should return ParamEditMode from applicationDefinitionConfData_1 fixtures': () =>
-    selectParamEditMode(stateFactory(applicationDefinitionConfData_1)),
+  'should return showAlertModal from applicationDefinitionConfData1 fixtures': () =>
+    selectShowAlertModal(stateFactory(applicationDefinitionConfData1)),
+  'should return alertModalText from applicationDefinitionConfData1 fixtures': () =>
+    selectAlertModalText(stateFactory(applicationDefinitionConfData1)),
+  'should return alertModalTitle from applicationDefinitionConfData1 fixtures': () =>
+    selectAlertModalTitle(stateFactory(applicationDefinitionConfData1)),
+  'should return editMode from applicationDefinitionConfData1 fixtures': () =>
+    selectEditMode(stateFactory(applicationDefinitionConfData1)),
+  'should return ansiblePlaybook from applicationDefinitionConfData1 fixtures': () =>
+    selectAnsiblePlaybook(stateFactory(applicationDefinitionConfData1)),
+  'should return services from applicationDefinitionConfData1 fixtures': () =>
+    selectServices(stateFactory(applicationDefinitionConfData1)),
+  'should return parametersData from applicationDefinitionConfData1 fixtures': () =>
+    selectParametersData(stateFactory(applicationDefinitionConfData1)),
+  'should return columns from applicationDefinitionConfData1 fixtures': () =>
+    selectColumns(stateFactory(applicationDefinitionConfData1)),
+  'should return hiddenForemanParameterTypes from applicationDefinitionConfData1 fixtures': () =>
+    selectHiddenForemanParameterTypes(
+      stateFactory(applicationDefinitionConfData1)
+    ),
+  'should return ansibleVarsAll from applicationDefinitionConfData1 fixtures': () =>
+    selectAnsibleVarsAll(stateFactory(applicationDefinitionConfData1)),
+  'should return ParamEditMode from applicationDefinitionConfData1 fixtures': () =>
+    selectParamEditMode(stateFactory(applicationDefinitionConfData1)),
 };
 
 describe('ApplicationDefinitionSelectors', () =>

data/webpack/components/ApplicationDefinition/__tests__/__snapshots__/ApplicationDefinitionReducer.test.js.snap

@@ -2152,6 +2152,8 @@ Object {
 
 exports[`ApplicationDefintionReducer should load param data be erroneous 1`] = `
 Object {
+  "alertModalText": "Failed to load Playbooks: Something really bad happend",
+  "alertModalTitle": "Error",
   "ansiblePlaybook": Object {
     "groups": Object {
       "all": Array [
@@ -2353,7 +2355,11 @@ Object {
       "property": "actions",
     },
   ],
-  "error": "Something really bad happend",
+  "error": Object {
+    "errorMsg": "",
+    "status": "",
+    "statusText": "",
+  },
   "loading": false,
   "name": false,
   "services": Array [
@@ -2435,6 +2441,7 @@ Object {
       "name": "db",
     },
   ],
+  "showAlertModal": true,
 }
 `;
 
@@ -2646,6 +2653,7 @@ Object {
     "status": "",
     "statusText": "",
   },
+  "loading": false,
   "name": false,
   "services": Array [
     Object {

data/webpack/components/ApplicationDefinition/__tests__/__snapshots__/ApplicationDefinitionSelectors.test.js.snap

@@ -1,12 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ApplicationDefinitionSelectors should return ParamEditMode from applicationDefinitionConfData_1 fixtures 1`] = `undefined`;
+exports[`ApplicationDefinitionSelectors should return ParamEditMode from applicationDefinitionConfData1 fixtures 1`] = `undefined`;
 
-exports[`ApplicationDefinitionSelectors should return alertModalText from applicationDefinitionConfData_1 fixtures 1`] = `undefined`;
+exports[`ApplicationDefinitionSelectors should return alertModalText from applicationDefinitionConfData1 fixtures 1`] = `undefined`;
 
-exports[`ApplicationDefinitionSelectors should return alertModalTitle from applicationDefinitionConfData_1 fixtures 1`] = `undefined`;
+exports[`ApplicationDefinitionSelectors should return alertModalTitle from applicationDefinitionConfData1 fixtures 1`] = `undefined`;
 
-exports[`ApplicationDefinitionSelectors should return ansiblePlaybook from applicationDefinitionConfData_1 fixtures 1`] = `
+exports[`ApplicationDefinitionSelectors should return ansiblePlaybook from applicationDefinitionConfData1 fixtures 1`] = `
 Object {
   "groups": Object {
     "all": Array [
@@ -61,7 +61,7 @@ Object {
 }
 `;
 
-exports[`ApplicationDefinitionSelectors should return ansibleVarsAll from applicationDefinitionConfData_1 fixtures 1`] = `
+exports[`ApplicationDefinitionSelectors should return ansibleVarsAll from applicationDefinitionConfData1 fixtures 1`] = `
 Array [
   Object {
     "id": 0,
@@ -71,7 +71,7 @@ Array [
 ]
 `;
 
-exports[`ApplicationDefinitionSelectors should return columns from applicationDefinitionConfData_1 fixtures 1`] = `
+exports[`ApplicationDefinitionSelectors should return columns from applicationDefinitionConfData1 fixtures 1`] = `
 Array [
   Object {
     "cell": Object {
@@ -216,13 +216,13 @@ Array [
 ]
 `;
 
-exports[`ApplicationDefinitionSelectors should return editMode from applicationDefinitionConfData_1 fixtures 1`] = `undefined`;
+exports[`ApplicationDefinitionSelectors should return editMode from applicationDefinitionConfData1 fixtures 1`] = `undefined`;
 
-exports[`ApplicationDefinitionSelectors should return hiddenForemanParameterTypes from applicationDefinitionConfData_1 fixtures 1`] = `undefined`;
+exports[`ApplicationDefinitionSelectors should return hiddenForemanParameterTypes from applicationDefinitionConfData1 fixtures 1`] = `undefined`;
 
-exports[`ApplicationDefinitionSelectors should return parametersData from applicationDefinitionConfData_1 fixtures 1`] = `undefined`;
+exports[`ApplicationDefinitionSelectors should return parametersData from applicationDefinitionConfData1 fixtures 1`] = `undefined`;
 
-exports[`ApplicationDefinitionSelectors should return services from applicationDefinitionConfData_1 fixtures 1`] = `
+exports[`ApplicationDefinitionSelectors should return services from applicationDefinitionConfData1 fixtures 1`] = `
 Array [
   Object {
     "ansibleGroup": "webservers",
@@ -304,4 +304,4 @@ Array [
 ]
 `;
 
-exports[`ApplicationDefinitionSelectors should return showAlertModal from applicationDefinitionConfData_1 fixtures 1`] = `undefined`;
+exports[`ApplicationDefinitionSelectors should return showAlertModal from applicationDefinitionConfData1 fixtures 1`] = `undefined`;

data/webpack/components/ApplicationDefinition/components/AnsiblePlaybookSelector.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 AnsiblePlaybookSelector= ({
+const AnsiblePlaybookSelector = ({
   label,
   hidden,
   editable,
@@ -12,39 +12,44 @@ const AnsiblePlaybookSelector= ({
   onChange,
   options,
   additionalData,
-}) =>{
-  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}
-          additionalData={additionalData}
-        />
-        <RailsData
-          key='ansible_playbook_data'
-          view='app_definition'
-          parameter='acd_ansible_playbook_id'
-          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}
+        additionalData={additionalData}
+      />
+      <RailsData
+        key="ansible_playbook_data"
+        view="app_definition"
+        parameter="acd_ansible_playbook_id"
+        value={selectValue}
+      />
     </div>
-  );
-};
+  </div>
+);
 
 AnsiblePlaybookSelector.propTypes = {
   label: PropTypes.string.isRequired,
   editable: PropTypes.bool.isRequired,
   viewText: PropTypes.string,
   selectValue: PropTypes.string,
+  hidden: PropTypes.bool.isRequired,
   onChange: PropTypes.func.isRequired,
   options: PropTypes.object,
   additionalData: PropTypes.object,
 };
+AnsiblePlaybookSelector.defaultProps = {
+  viewText: '',
+  selectValue: '',
+  options: undefined,
+  additionalData: undefined,
+};
 
 export default AnsiblePlaybookSelector;

data/webpack/components/ApplicationDefinition/components/__tests__/AnsiblePlaybookSelector.test.js

@@ -12,7 +12,7 @@ const fixtures = {
     viewText: 'myText',
     selectValue: '1',
     onChange: noop,
-    options: { first: 'first', second: 'second'},
+    options: { first: 'first', second: 'second' },
     additionalData: { moreData: 'moooore' },
   },
   'should render hidden ansible playbook selector': {
@@ -22,7 +22,7 @@ const fixtures = {
     viewText: 'myText',
     selectValue: '1',
     onChange: noop,
-    options: { first: 'first', second: 'second'},
+    options: { first: 'first', second: 'second' },
     additionalData: { moreData: 'moooore' },
   },
   'should render not editable ansible playbook selector': {
@@ -32,7 +32,7 @@ const fixtures = {
     viewText: 'myText',
     selectValue: '1',
     onChange: noop,
-    options: { first: 'first', second: 'second'},
+    options: { first: 'first', second: 'second' },
     additionalData: { moreData: 'moooore' },
   },
 };

data/webpack/components/ApplicationDefinition/index.js

@@ -40,4 +40,3 @@ export default connect(
   mapStateToProps,
   mapDispatchToProps
 )(ApplicationDefinition);
-