foreman_acd 0.0.3 → 0.3.0

data/webpack/components/ParameterSelection/ParameterSelectionSelectors.js

@@ -1,15 +1,11 @@
-import { differenceBy, slice, includes, uniq } from 'lodash';
-import Immutable from 'seamless-immutable';
-import { createSelector } from 'reselect';
-
 const parameterState = state => state.foremanAcd.parameterSelectionParameters;
 
 export const selectLoading = state => parameterState(state).loading;
 export const selectEditMode = state => parameterState(state).editMode;
-export const selectForemanData = state => parameterState(state).foremanData;
+export const selectParamData = state => parameterState(state).paramData;
 export const selectParameterTypes = state => parameterState(state).parameterTypes;
-export const selectRows = state => parameterState(state).rows;
+export const selectParameters = state => parameterState(state).parameters;
 export const selectSortingColumns = state => parameterState(state).sortingColumns;
 export const selectColumns = state => parameterState(state).columns;
-export const selectAppDefinition = state => parameterState(state).appDefinition;
+export const selectParamDefinition = state => parameterState(state).paramDefinition;
 export const selectHostgroupId = state => parameterState(state).hostgroupId;

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

@@ -1,21 +1,14 @@
 export const newDefinition = {
-  organization: "Default Organization",
-  location: "Default Location",
-  hostgroups: {
-    "1": "centos7"
+  mode: "newDefinition",
+  serviceDefinition: {
+    id: 1,
+    name: "Test123",
+    hostgroup_id: 1
   },
-  loadForemanDataUrl: "/acd/ui_acd_fdata/__id__",
-  mode: "newDefinition"
 };
 export const editDefinition = {
-  organization: "Default Organization",
-  location: "Default Location",
-  hostgroups: {
-    "1": "centos7"
-  },
-  loadForemanDataUrl: "/acd/ui_acd_fdata/__id__",
   mode: "editDefinition",
-  appDefinition: {
+  serviceDefinition: {
     id: 1,
     name: "Test123",
     hostgroup_id: 1
@@ -82,21 +75,19 @@ export const editDefinition = {
 
 export const newInstance = {
   mode: "newInstance",
-  organization: "Default Organization",
-  location: "Default Location",
   applications: {
     "1": "Test123",
     "2": "sowasvonneu"
   },
-  loadParameterSelectionUrl: "/acd/ui_acd_app/__id__",
-  loadForemanDataUrl: "/acd/ui_acd_fdata/__id__"
+  serviceDefinition: {
+    id: 1,
+    name: "Test123",
+    hostgroup_id: 1
+  },
 };
 export const editInstance = {
   mode: "editInstance",
-  organization: "Default Organization",
-  location: "Default Location",
-  loadForemanDataUrl: "/acd/ui_acd_fdata/__id__",
-  appDefinition: {
+  serviceDefinition: {
     id: 1,
     name: "Test123",
     hostgroup_id: 1

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

@@ -127,7 +127,7 @@ export const parameterSelectionData_1 = {
       }
     }
   ],
-  rows: [
+  parameters: [
     {
       id: 1,
       name: 'PuppetEnv',

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

@@ -13,9 +13,9 @@ export const successState = Immutable(parameterSelectionData_1);
 
 const EDIT_ROW_ID = 5;
 
-var editClone = parameterSelectionData_1;
-var editIndex = findIndex(editClone.rows, { id: EDIT_ROW_ID })
-editClone["rows"][editIndex].backup = cloneDeep(editClone["rows"][editIndex]);
+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);
 
 export const initParameterSelectionPayload = parameterSelectionData_1;
@@ -83,45 +83,3 @@ export const loadForemanDataSuccessPayload = {
 export const loadForemanDataFailurePayload = {
   error: "Something really bad happend",
 };
-
-export const loadParameterSelectionRequestPayload = { };
-export const loadParameterSelectionSuccessPayload = {
-  app_definition: {
-    id: 2,
-    name: "sowasvonneu",
-    description: "",
-    hostgroup_id: 1,
-    parameters: "[{\"id\":0,\"name\":\"richtigneu\",\"description\":\"\",\"type\":\"puppetenv\",\"value\":\"1\"},{\"id\":1,\"name\":\"ganzgut\",\"description\":\"\",\"type\":\"ip\",\"value\":\"1.1.1.2\"}]",
-    created_at: "2019-11-13 17:47:27 +0100",
-    updated_at: "2019-11-13 17:47:27 +0100"
-  },
-  fdata: {
-    hostgroup_id: 1,
-    environments: [
-      {
-        id: 1,
-        name: "production"
-      },
-      {
-        id: 2,
-        name: "test"
-      }
-    ],
-    lifecycle_environments: [],
-    domains: [],
-    computeprofiles: [],
-    ptables: [
-      {
-        id: 105,
-        name: "Kickstart default"
-      },
-      {
-        id: 104,
-        name: "Kickstart default thin"
-      }
-    ]
-  }
-};
-export const loadParameterSelectionFailurePayload = {
-  error: "Something really bad happend",
-};

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

@@ -15,32 +15,52 @@ const noop = () => {};
 
 const fixtures = {
   'should render newDefinition': {
+    location: "Default Location",
+    organization: "Default Organization",
+    loadForemanDataUrl: "/acd/ui_acd_fdata/__id__",
     loading: false,
     data: newDefinition,
     error: { statusText: '', errorMsg: '' },
     initParameterSelection: noop,
     loadForemanData: noop,
+    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: '' },
     initParameterSelection: noop,
     loadForemanData: noop,
+    addParameter: noop,
+    deleteParameter: noop,
   },
   'should render newInstance': {
+    location: "Default Location",
+    organization: "Default Organization",
     loading: false,
+    loadForemanDataUrl: "/acd/ui_acd_fdata/__id__",
     data: newInstance,
     error: { statusText: '', errorMsg: '' },
     initParameterSelection: noop,
     loadForemanData: noop,
+    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: '' },
     initParameterSelection: noop,
     loadForemanData: noop,
+    addParameter: noop,
+    deleteParameter: noop,
   },
 };
 

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

@@ -21,20 +21,17 @@ import {
 } from '../__fixtures__/parameterSelectionReducer.fixtures';
 
 import {
-  INIT_PARAMETER_SELECTION,
-  PARAMETER_DELETE,
-  PARAMETER_ADD,
-  PARAMETER_EDIT_ACTIVATE,
-  PARAMETER_EDIT_CONFIRM,
-  PARAMETER_EDIT_CHANGE,
-  PARAMETER_EDIT_CANCEL,
-  PARAMETER_SORT,
-  LOAD_FOREMAN_DATA_REQUEST,
-  LOAD_FOREMAN_DATA_SUCCESS,
-  LOAD_FOREMAN_DATA_FAILURE,
-  LOAD_PARAMETER_SELECTION_REQUEST,
-  LOAD_PARAMETER_SELECTION_SUCCESS,
-  LOAD_PARAMETER_SELECTION_FAILURE,
+  PARAMETER_SELECTION_INIT,
+  PARAMETER_SELECTION_DELETE,
+  PARAMETER_SELECTION_ADD,
+  PARAMETER_SELECTION_EDIT_ACTIVATE,
+  PARAMETER_SELECTION_EDIT_CONFIRM,
+  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,
 } from '../ParameterSelectionConstants';
 
 const fixtures = {
@@ -49,101 +46,80 @@ const fixtures = {
   'should initialize component': {
     state: initialState,
     action: {
-      type: INIT_PARAMETER_SELECTION,
+      type: PARAMETER_SELECTION_INIT,
       payload: initParameterSelectionPayload,
     },
   },
   'should add a parameter': {
     state: successState,
     action: {
-      type: PARAMETER_ADD,
+      type: PARAMETER_SELECTION_ADD,
       payload: addParameterPayload,
     },
   },
   'should delete a parameter': {
     state: successState,
     action: {
-      type: PARAMETER_DELETE,
+      type: PARAMETER_SELECTION_DELETE,
       payload: deleteParameterPayload,
     },
   },
   'should activate edit parameter': {
     state: successState,
     action: {
-      type: PARAMETER_EDIT_ACTIVATE,
+      type: PARAMETER_SELECTION_EDIT_ACTIVATE,
       payload: activateEditParameterPayload,
     },
   },
   'should confirm edit parameter': {
     state: editState,
     action: {
-      type: PARAMETER_EDIT_CONFIRM,
+      type: PARAMETER_SELECTION_EDIT_CONFIRM,
       payload: confirmEditParameterPayload,
     },
   },
   'should cancel edit parameter': {
     state: editState,
     action: {
-      type: PARAMETER_EDIT_CANCEL,
+      type: PARAMETER_SELECTION_EDIT_CANCEL,
       payload: cancelEditParameterPayload,
     },
   },
   'should change edit parameter': {
     state: editState,
     action: {
-      type: PARAMETER_EDIT_CHANGE,
+      type: PARAMETER_SELECTION_EDIT_CHANGE,
       payload: changeEditParameterPayload,
     },
   },
   'should sort parameter': {
     state: successState,
     action: {
-      type: PARAMETER_SORT,
+      type: PARAMETER_SELECTION_SORT,
       payload: sortParameterPayload,
     },
   },
   'should request load foreman data': {
     state: successState,
     action: {
-      type: LOAD_FOREMAN_DATA_REQUEST,
+      type: PARAMETER_SELECTION_LOAD_FOREMAN_DATA_REQUEST,
       payload: loadForemanDataRequestPayload,
     },
   },
   'should load foreman data be successful': {
     state: successState,
     action: {
-      type: LOAD_FOREMAN_DATA_SUCCESS,
+      type: PARAMETER_SELECTION_LOAD_FOREMAN_DATA_SUCCESS,
       payload: loadForemanDataSuccessPayload,
     },
   },
   'should load foreman data be erroneous': {
     state: successState,
     action: {
-      type: LOAD_FOREMAN_DATA_FAILURE,
+      type: PARAMETER_SELECTION_LOAD_FOREMAN_DATA_FAILURE,
       payload: loadForemanDataFailurePayload,
     },
   },
-  'should request parameter selection': {
-    state: initialState,
-    action: {
-      type: LOAD_PARAMETER_SELECTION_REQUEST,
-      payload: loadParameterSelectionRequestPayload,
-    },
-  },
-  'should load parameter selection be successful': {
-    state: initialState,
-    action: {
-      type: LOAD_PARAMETER_SELECTION_SUCCESS,
-      payload: loadParameterSelectionSuccessPayload,
-    },
-  },
-  'should load parameter selection be erroneous': {
-    state: initialState,
-    action: {
-      type: LOAD_PARAMETER_SELECTION_FAILURE,
-      payload: loadParameterSelectionFailurePayload,
-    },
-  },
 };
 
 describe('ParameterSelectionReducer', () =>

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

@@ -5,10 +5,10 @@ import {
   selectEditMode,
   selectForemanData,
   selectParameterTypes,
-  selectRows,
+  selectParameters,
   selectSortingColumns,
   selectColumns,
-  selectAppDefinition,
+  selectServiceDefinition,
   selectHostgroupId,
 } from '../ParameterSelectionSelectors';
 
@@ -31,14 +31,14 @@ const fixtures = {
     selectForemanData(stateFactory(parameterSelectionData_1)),
   'should return parameterTypes from parameterSelectionData_1 fixtures': () =>
     selectParameterTypes(stateFactory(parameterSelectionData_1)),
-  'should return rows from parameterSelectionData_1 fixtures': () =>
-    selectRows(stateFactory(parameterSelectionData_1)),
+  'should return parameters from parameterSelectionData_1 fixtures': () =>
+    selectParameters(stateFactory(parameterSelectionData_1)),
   'should return sortingColumns from parameterSelectionData_1 fixtures': () =>
     selectSortingColumns(stateFactory(parameterSelectionData_1)),
   'should return columns from parameterSelectionData_1 fixtures': () =>
     selectColumns(stateFactory(parameterSelectionData_1)),
-  'should return appDefinition from parameterSelectionData_1 fixtures': () =>
-    selectAppDefinition(stateFactory(parameterSelectionData_1)),
+  'should return serviceDefinition from parameterSelectionData_1 fixtures': () =>
+    selectServiceDefinition(stateFactory(parameterSelectionData_1)),
   'should return hostgroupId from parameterSelectionData_1 fixtures': () =>
     selectHostgroupId(stateFactory(parameterSelectionData_1)),
 };

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

@@ -8,61 +8,11 @@ exports[`ParameterSelection should render editDefinition 1`] = `
     <div
       className="form-group"
     >
-      <label
-        className="col-md-2 control-label"
-      >
-        Host Group
-      </label>
-      <div
-        className="col-md-4"
-      >
-        <div />
-        <input
-          id="foreman_acd_app_definition_hostgroup_id"
-          name="foreman_acd_app_definition[hostgroup_id]"
-          type="hidden"
-          value={-1}
-        />
-      </div>
-    </div>
-  </div>
-  <div
-    className="clearfix"
-  >
-    <div
-      className="form-group"
-    >
-      <label
-        className="col-md-1 control-label"
-      >
-        Application parameters
-      </label>
-      <div
-        className="col-md-5"
-      >
-         
-      </div>
-    </div>
-  </div>
-  <div
-    className="clearfix"
-  >
-    <div
-      className="form-group"
-    >
-      <Button
-        active={false}
-        block={false}
-        bsClass="btn"
-        bsStyle="default"
-        disabled={true}
-        onClick={[Function]}
-      >
-        <Icon
-          name="plus"
-          type="fa"
-        />
-      </Button>
+      <AddTableEntry
+        disabled={false}
+        hidden={false}
+        onAddTableEntry={[Function]}
+      />
       <TablePfProvider
         bordered={true}
         className=""
@@ -97,26 +47,12 @@ exports[`ParameterSelection should render editDefinition 1`] = `
           rows={Array []}
         />
       </TablePfProvider>
-      <Button
-        active={false}
-        block={false}
-        bsClass="btn"
-        bsStyle="default"
-        disabled={true}
-        onClick={[Function]}
-      >
-        <Icon
-          name="plus"
-          type="fa"
-        />
-      </Button>
+      <AddTableEntry
+        disabled={false}
+        hidden={false}
+        onAddTableEntry={[Function]}
+      />
     </div>
-    <input
-      id="foreman_acd_app_definition_parameters"
-      name="foreman_acd_app_definition[parameters]"
-      type="hidden"
-      value="[]"
-    />
   </div>
 </div>
 `;
@@ -129,48 +65,11 @@ exports[`ParameterSelection should render editInstance 1`] = `
     <div
       className="form-group"
     >
-      <label
-        className="col-md-2 control-label"
-      >
-        Application Definition
-      </label>
-      <div
-        className="col-md-4"
-      >
-        <div />
-        <input
-          id="foreman_acd_app_instance_app_definition_id"
-          name="foreman_acd_app_instance[app_definition_id]"
-          type="hidden"
-          value=""
-        />
-      </div>
-    </div>
-  </div>
-  <div
-    className="clearfix"
-  >
-    <div
-      className="form-group"
-    >
-      <label
-        className="col-md-1 control-label"
-      >
-        Application parameters
-      </label>
-      <div
-        className="col-md-5"
-      >
-         
-      </div>
-    </div>
-  </div>
-  <div
-    className="clearfix"
-  >
-    <div
-      className="form-group"
-    >
+      <AddTableEntry
+        disabled={false}
+        hidden={true}
+        onAddTableEntry={[Function]}
+      />
       <TablePfProvider
         bordered={true}
         className=""
@@ -205,13 +104,12 @@ exports[`ParameterSelection should render editInstance 1`] = `
           rows={Array []}
         />
       </TablePfProvider>
+      <AddTableEntry
+        disabled={false}
+        hidden={true}
+        onAddTableEntry={[Function]}
+      />
     </div>
-    <input
-      id="foreman_acd_app_instance_parameters"
-      name="foreman_acd_app_instance[parameters]"
-      type="hidden"
-      value="[]"
-    />
   </div>
 </div>
 `;
@@ -224,71 +122,11 @@ exports[`ParameterSelection should render newDefinition 1`] = `
     <div
       className="form-group"
     >
-      <label
-        className="col-md-2 control-label"
-      >
-        Host Group
-      </label>
-      <div
-        className="col-md-4"
-      >
-        <Select
-          allowClear={true}
-          key="key"
-          onChange={[Function]}
-          options={
-            Object {
-              "1": "centos7",
-            }
-          }
-          value="-1"
-        />
-        <input
-          id="foreman_acd_app_definition_hostgroup_id"
-          name="foreman_acd_app_definition[hostgroup_id]"
-          type="hidden"
-          value={-1}
-        />
-      </div>
-    </div>
-  </div>
-  <div
-    className="clearfix"
-  >
-    <div
-      className="form-group"
-    >
-      <label
-        className="col-md-1 control-label"
-      >
-        Application parameters
-      </label>
-      <div
-        className="col-md-5"
-      >
-         
-      </div>
-    </div>
-  </div>
-  <div
-    className="clearfix"
-  >
-    <div
-      className="form-group"
-    >
-      <Button
-        active={false}
-        block={false}
-        bsClass="btn"
-        bsStyle="default"
-        disabled={true}
-        onClick={[Function]}
-      >
-        <Icon
-          name="plus"
-          type="fa"
-        />
-      </Button>
+      <AddTableEntry
+        disabled={false}
+        hidden={false}
+        onAddTableEntry={[Function]}
+      />
       <TablePfProvider
         bordered={true}
         className=""
@@ -323,26 +161,12 @@ exports[`ParameterSelection should render newDefinition 1`] = `
           rows={Array []}
         />
       </TablePfProvider>
-      <Button
-        active={false}
-        block={false}
-        bsClass="btn"
-        bsStyle="default"
-        disabled={true}
-        onClick={[Function]}
-      >
-        <Icon
-          name="plus"
-          type="fa"
-        />
-      </Button>
+      <AddTableEntry
+        disabled={false}
+        hidden={false}
+        onAddTableEntry={[Function]}
+      />
     </div>
-    <input
-      id="foreman_acd_app_definition_parameters"
-      name="foreman_acd_app_definition[parameters]"
-      type="hidden"
-      value="[]"
-    />
   </div>
 </div>
 `;
@@ -355,59 +179,11 @@ exports[`ParameterSelection should render newInstance 1`] = `
     <div
       className="form-group"
     >
-      <label
-        className="col-md-2 control-label"
-      >
-        Application Definition
-      </label>
-      <div
-        className="col-md-4"
-      >
-        <Select
-          allowClear={true}
-          key="key"
-          onChange={[Function]}
-          options={
-            Object {
-              "1": "Test123",
-              "2": "sowasvonneu",
-            }
-          }
-          value=""
-        />
-        <input
-          id="foreman_acd_app_instance_app_definition_id"
-          name="foreman_acd_app_instance[app_definition_id]"
-          type="hidden"
-          value=""
-        />
-      </div>
-    </div>
-  </div>
-  <div
-    className="clearfix"
-  >
-    <div
-      className="form-group"
-    >
-      <label
-        className="col-md-1 control-label"
-      >
-        Application parameters
-      </label>
-      <div
-        className="col-md-5"
-      >
-         
-      </div>
-    </div>
-  </div>
-  <div
-    className="clearfix"
-  >
-    <div
-      className="form-group"
-    >
+      <AddTableEntry
+        disabled={false}
+        hidden={true}
+        onAddTableEntry={[Function]}
+      />
       <TablePfProvider
         bordered={true}
         className=""
@@ -442,13 +218,12 @@ exports[`ParameterSelection should render newInstance 1`] = `
           rows={Array []}
         />
       </TablePfProvider>
+      <AddTableEntry
+        disabled={false}
+        hidden={true}
+        onAddTableEntry={[Function]}
+      />
     </div>
-    <input
-      id="foreman_acd_app_instance_parameters"
-      name="foreman_acd_app_instance[parameters]"
-      type="hidden"
-      value="[]"
-    />
   </div>
 </div>
 `;