foreman_acd 0.6.0 → 0.7.0

data/webpack/components/ParameterSelection/__fixtures__/parameterSelectionReducer.fixtures.js

@@ -11,15 +11,21 @@ import {
 
 export const successState = Immutable(parameterSelectionData_1);
 
-const EDIT_ROW_ID = 5;
+const EDIT_ROW_ID = 2;
 
 const editClone = parameterSelectionData_1;
 const editIndex = findIndex(editClone.parameters, { id: EDIT_ROW_ID })
 editClone["parameters"][editIndex].backup = cloneDeep(editClone["parameters"][editIndex]);
 export const editState = Immutable(editClone);
 
+// Payload Data
 export const initParameterSelectionPayload = parameterSelectionData_1;
 export const addParameterPayload = { };
+export const lockParameterPayload = {
+  rowData: {
+    id: EDIT_ROW_ID,
+  },
+};
 export const deleteParameterPayload = {
   rowData: {
     id: EDIT_ROW_ID,
@@ -51,10 +57,10 @@ export const sortParameterPayload = {
   selectedColumn: "type",
 };
 
-export const loadForemanDataRequestPayload = {
+export const loadParamDataRequestPayload = {
   clearRows: false,
 };
-export const loadForemanDataSuccessPayload = {
+export const loadParamDataSuccessPayload = {
   hostgroup_id: 1,
   environments: [
     {
@@ -80,6 +86,6 @@ export const loadForemanDataSuccessPayload = {
     }
   ]
 };
-export const loadForemanDataFailurePayload = {
+export const loadParamDataFailurePayload = {
   error: "Something really bad happend",
 };

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

@@ -3,65 +3,55 @@ import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
 import ParameterSelection from '../ParameterSelection';
 
 import {
-  newDefinition,
-  editDefinition,
-  newInstance,
-  editInstance,
-} from '../__fixtures__/parameterSelection.fixtures'
-
-jest.mock('foremanReact/components/common/forms/Select');
+  PARAMETER_SELECTION_PARAM_TYPE_FOREMAN,
+  PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE,
+} from '../ParameterSelectionConstants';
 
 const noop = () => {};
 
 const fixtures = {
-  'should render newDefinition': {
+  'should render foreman parameter selection': {
     location: "Default Location",
     organization: "Default Organization",
-    loadForemanDataUrl: "/acd/ui_acd_fdata/__id__",
-    loading: false,
-    data: newDefinition,
-    error: { statusText: '', errorMsg: '' },
-    initParameterSelection: noop,
-    loadForemanData: noop,
+    editModeCallback: noop,
+    paramDataUrl: "/acd/ui_acd_fdata/__id__",
+    paramType: PARAMETER_SELECTION_PARAM_TYPE_FOREMAN,
+    data: {
+      type: PARAMETER_SELECTION_PARAM_TYPE_FOREMAN,
+      parameters: [],
+      useDefaultValue: true,
+      allowRowAdjustment: true,
+      allowNameAdjustment: true,
+      allowDescriptionAdjustment: true,
+    },
     addParameter: noop,
-    deleteParameter: noop,
-  },
-  'should render editDefinition': {
-    location: "Default Location",
-    organization: "Default Organization",
-    loadForemanDataUrl: "/acd/ui_acd_fdata/__id__",
-    loading: false,
-    data: editDefinition,
-    error: { statusText: '', errorMsg: '' },
+    confirmEditParametre: noop,
+    cancelEditParameter: noop,
+    editModeCallback: noop,
+    loadParamData: noop,
     initParameterSelection: noop,
-    loadForemanData: noop,
-    addParameter: noop,
-    deleteParameter: noop,
   },
-  'should render newInstance': {
+
+  'should render ansible parameter selection': {
     location: "Default Location",
     organization: "Default Organization",
-    loading: false,
-    loadForemanDataUrl: "/acd/ui_acd_fdata/__id__",
-    data: newInstance,
-    error: { statusText: '', errorMsg: '' },
-    initParameterSelection: noop,
-    loadForemanData: noop,
+    editModeCallback: noop,
+    paramType: PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE,
+    data: {
+      type: PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE,
+      parameters: [],
+      useDefaultValue: false,
+      allowRowAdjustment: true,
+      allowNameAdjustment: true,
+      allowDescriptionAdjustment: true,
+    },
     addParameter: noop,
-    deleteParameter: noop,
-  },
-  'should render editInstance': {
-    location: "Default Location",
-    organization: "Default Organization",
-    loading: false,
-    loadForemanDataUrl: "/acd/ui_acd_fdata/__id__",
-    data: editInstance,
-    error: { statusText: '', errorMsg: '' },
+    confirmEditParametre: noop,
+    cancelEditParameter: noop,
+    editModeCallback: noop,
+    loadParamData: noop,
     initParameterSelection: noop,
-    loadForemanData: noop,
-    addParameter: noop,
-    deleteParameter: noop,
-  },
+  }
 };
 
 describe('ParameterSelection', () =>

data/webpack/components/ParameterSelection/__tests__/ParameterSelectionReducer.test.js

@@ -6,22 +6,21 @@ import {
   editState,
   initParameterSelectionPayload,
   addParameterPayload,
+  lockParameterPayload,
   deleteParameterPayload,
   activateEditParameterPayload,
   confirmEditParameterPayload,
   cancelEditParameterPayload,
   changeEditParameterPayload,
   sortParameterPayload,
-  loadForemanDataRequestPayload,
-  loadForemanDataSuccessPayload,
-  loadForemanDataFailurePayload,
-  loadParameterSelectionRequestPayload,
-  loadParameterSelectionSuccessPayload,
-  loadParameterSelectionFailurePayload,
+  loadParamDataRequestPayload,
+  loadParamDataSuccessPayload,
+  loadParamDataFailurePayload,
 } from '../__fixtures__/parameterSelectionReducer.fixtures';
 
 import {
   PARAMETER_SELECTION_INIT,
+  PARAMETER_SELECTION_LOCK,
   PARAMETER_SELECTION_DELETE,
   PARAMETER_SELECTION_ADD,
   PARAMETER_SELECTION_EDIT_ACTIVATE,
@@ -29,9 +28,9 @@ import {
   PARAMETER_SELECTION_EDIT_CHANGE,
   PARAMETER_SELECTION_EDIT_CANCEL,
   PARAMETER_SELECTION_SORT,
-  PARAMETER_SELECTION_LOAD_FOREMAN_DATA_REQUEST,
-  PARAMETER_SELECTION_LOAD_FOREMAN_DATA_SUCCESS,
-  PARAMETER_SELECTION_LOAD_FOREMAN_DATA_FAILURE,
+  PARAMETER_SELECTION_LOAD_PARAM_DATA_REQUEST,
+  PARAMETER_SELECTION_LOAD_PARAM_DATA_SUCCESS,
+  PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE,
 } from '../ParameterSelectionConstants';
 
 const fixtures = {
@@ -57,6 +56,13 @@ const fixtures = {
       payload: addParameterPayload,
     },
   },
+  'should lock a parameter': {
+    state: successState,
+    action: {
+      type: PARAMETER_SELECTION_LOCK,
+      payload: lockParameterPayload,
+    },
+  },
   'should delete a parameter': {
     state: successState,
     action: {
@@ -71,6 +77,13 @@ const fixtures = {
       payload: activateEditParameterPayload,
     },
   },
+  'should change edit parameter': {
+    state: editState,
+    action: {
+      type: PARAMETER_SELECTION_EDIT_CHANGE,
+      payload: changeEditParameterPayload,
+    },
+  },
   'should confirm edit parameter': {
     state: editState,
     action: {
@@ -85,13 +98,6 @@ const fixtures = {
       payload: cancelEditParameterPayload,
     },
   },
-  'should change edit parameter': {
-    state: editState,
-    action: {
-      type: PARAMETER_SELECTION_EDIT_CHANGE,
-      payload: changeEditParameterPayload,
-    },
-  },
   'should sort parameter': {
     state: successState,
     action: {
@@ -99,25 +105,25 @@ const fixtures = {
       payload: sortParameterPayload,
     },
   },
-  'should request load foreman data': {
+  'should request load param data': {
     state: successState,
     action: {
-      type: PARAMETER_SELECTION_LOAD_FOREMAN_DATA_REQUEST,
-      payload: loadForemanDataRequestPayload,
+      type: PARAMETER_SELECTION_LOAD_PARAM_DATA_REQUEST,
+      payload: loadParamDataRequestPayload,
     },
   },
-  'should load foreman data be successful': {
+  'should load param data be successful': {
     state: successState,
     action: {
-      type: PARAMETER_SELECTION_LOAD_FOREMAN_DATA_SUCCESS,
-      payload: loadForemanDataSuccessPayload,
+      type: PARAMETER_SELECTION_LOAD_PARAM_DATA_SUCCESS,
+      payload: loadParamDataSuccessPayload,
     },
   },
-  'should load foreman data be erroneous': {
+  'should load param data be erroneous': {
     state: successState,
     action: {
-      type: PARAMETER_SELECTION_LOAD_FOREMAN_DATA_FAILURE,
-      payload: loadForemanDataFailurePayload,
+      type: PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE,
+      payload: loadParamDataFailurePayload,
     },
   },
 };

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

@@ -3,12 +3,12 @@ import { testSelectorsSnapshotWithFixtures } from 'react-redux-test-utils';
 import {
   selectLoading,
   selectEditMode,
-  selectForemanData,
+  selectParamData,
   selectParameterTypes,
   selectParameters,
   selectSortingColumns,
   selectColumns,
-  selectServiceDefinition,
+  selectParamDefinition,
   selectHostgroupId,
 } from '../ParameterSelectionSelectors';
 
@@ -27,8 +27,8 @@ const fixtures = {
     selectLoading(stateFactory(parameterSelectionData_1)),
   'should return editMode from parameterSelectionData_1 fixtures': () =>
     selectEditMode(stateFactory(parameterSelectionData_1)),
-  'should return foremanData from parameterSelectionData_1 fixtures': () =>
-    selectForemanData(stateFactory(parameterSelectionData_1)),
+  'should return paramData from parameterSelectionData_1 fixtures': () =>
+    selectParamData(stateFactory(parameterSelectionData_1)),
   'should return parameterTypes from parameterSelectionData_1 fixtures': () =>
     selectParameterTypes(stateFactory(parameterSelectionData_1)),
   'should return parameters from parameterSelectionData_1 fixtures': () =>
@@ -37,8 +37,8 @@ const fixtures = {
     selectSortingColumns(stateFactory(parameterSelectionData_1)),
   'should return columns from parameterSelectionData_1 fixtures': () =>
     selectColumns(stateFactory(parameterSelectionData_1)),
-  'should return serviceDefinition from parameterSelectionData_1 fixtures': () =>
-    selectServiceDefinition(stateFactory(parameterSelectionData_1)),
+  'should return ParamDefinition from parameterSelectionData_1 fixtures': () =>
+    selectParamDefinition(stateFactory(parameterSelectionData_1)),
   'should return hostgroupId from parameterSelectionData_1 fixtures': () =>
     selectHostgroupId(stateFactory(parameterSelectionData_1)),
 };

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

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ParameterSelection should render editDefinition 1`] = `
+exports[`ParameterSelection should render ansible parameter selection 1`] = `
 <div>
   <div
     className="clearfix"
@@ -8,11 +8,6 @@ exports[`ParameterSelection should render editDefinition 1`] = `
     <div
       className="form-group"
     >
-      <AddTableEntry
-        disabled={false}
-        hidden={false}
-        onAddTableEntry={[Function]}
-      />
       <TablePfProvider
         bordered={true}
         className=""
@@ -57,64 +52,7 @@ exports[`ParameterSelection should render editDefinition 1`] = `
 </div>
 `;
 
-exports[`ParameterSelection should render editInstance 1`] = `
-<div>
-  <div
-    className="clearfix"
-  >
-    <div
-      className="form-group"
-    >
-      <AddTableEntry
-        disabled={false}
-        hidden={true}
-        onAddTableEntry={[Function]}
-      />
-      <TablePfProvider
-        bordered={true}
-        className=""
-        columns={Array []}
-        components={
-          Object {
-            "body": Object {
-              "cell": [Function],
-              "row": [Function],
-            },
-            "header": Object {
-              "cell": [Function],
-            },
-          }
-        }
-        condensed={false}
-        dataTable={true}
-        hover={true}
-        inlineEdit={true}
-        striped={true}
-      >
-        <Header
-          headerRows={
-            Array [
-              Array [],
-            ]
-          }
-        />
-        <Body
-          onRow={[Function]}
-          rowKey="id"
-          rows={Array []}
-        />
-      </TablePfProvider>
-      <AddTableEntry
-        disabled={false}
-        hidden={true}
-        onAddTableEntry={[Function]}
-      />
-    </div>
-  </div>
-</div>
-`;
-
-exports[`ParameterSelection should render newDefinition 1`] = `
+exports[`ParameterSelection should render foreman parameter selection 1`] = `
 <div>
   <div
     className="clearfix"
@@ -122,11 +60,6 @@ exports[`ParameterSelection should render newDefinition 1`] = `
     <div
       className="form-group"
     >
-      <AddTableEntry
-        disabled={false}
-        hidden={false}
-        onAddTableEntry={[Function]}
-      />
       <TablePfProvider
         bordered={true}
         className=""
@@ -170,60 +103,3 @@ exports[`ParameterSelection should render newDefinition 1`] = `
   </div>
 </div>
 `;
-
-exports[`ParameterSelection should render newInstance 1`] = `
-<div>
-  <div
-    className="clearfix"
-  >
-    <div
-      className="form-group"
-    >
-      <AddTableEntry
-        disabled={false}
-        hidden={true}
-        onAddTableEntry={[Function]}
-      />
-      <TablePfProvider
-        bordered={true}
-        className=""
-        columns={Array []}
-        components={
-          Object {
-            "body": Object {
-              "cell": [Function],
-              "row": [Function],
-            },
-            "header": Object {
-              "cell": [Function],
-            },
-          }
-        }
-        condensed={false}
-        dataTable={true}
-        hover={true}
-        inlineEdit={true}
-        striped={true}
-      >
-        <Header
-          headerRows={
-            Array [
-              Array [],
-            ]
-          }
-        />
-        <Body
-          onRow={[Function]}
-          rowKey="id"
-          rows={Array []}
-        />
-      </TablePfProvider>
-      <AddTableEntry
-        disabled={false}
-        hidden={true}
-        onAddTableEntry={[Function]}
-      />
-    </div>
-  </div>
-</div>
-`;