foreman_acd 0.0.6 → 0.6.0

data/webpack/components/ParameterSelection/ParameterSelectionReducer.js

@@ -13,23 +13,27 @@ import {
 import * as sort from 'sortabular';
 
 import {
-  INIT_PARAMETER_SELECTION,
-  PARAMETER_TYPES,
-  PARAMETER_DELETE,
-  PARAMETER_ADD,
-  PARAMETER_EDIT_ACTIVATE,
-  PARAMETER_EDIT_CONFIRM,
-  PARAMETER_EDIT_CHANGE,
-  PARAMETER_EDIT_CANCEL,
-  PARAMETER_SORT,
-  LOAD_PARAMETER_SELECTION_REQUEST,
-  LOAD_PARAMETER_SELECTION_SUCCESS,
-  LOAD_PARAMETER_SELECTION_FAILURE,
-  LOAD_FOREMAN_DATA_REQUEST,
-  LOAD_FOREMAN_DATA_SUCCESS,
-  LOAD_FOREMAN_DATA_FAILURE,
+  PARAMETER_SELECTION_INIT,
+  PARAMETER_SELECTION_TYPES,
+  PARAMETER_SELECTION_LOCK,
+  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_PARAM_TYPE_FOREMAN,
+  PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE,
+  PARAMETER_SELECTION_LOAD_PARAM_DATA_REQUEST,
+  PARAMETER_SELECTION_LOAD_PARAM_DATA_SUCCESS,
+  PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE,
 } from './ParameterSelectionConstants';
 
+import {
+  APPLICATION_DEFINITION_PARAMETER_SELECTION_MODAL_CLOSE,
+} from '../ApplicationDefinition/ApplicationDefinitionConstants';
+
 export const initialState = Immutable({
   editMode: false,
   error: { errorMsg: '', status: '', statusText: '' },
@@ -39,83 +43,97 @@ const parameterSelectionParameters = (state = initialState, action) => {
   const { payload } = action;
 
   switch (action.type) {
-    case INIT_PARAMETER_SELECTION: {
+    case PARAMETER_SELECTION_INIT: {
       return state.merge(payload);
     }
-    case PARAMETER_ADD: {
-      var rows = [];
-      var index = 0;
+    case PARAMETER_SELECTION_ADD: {
+      let parameters = [];
+      let index = 1;
 
-      if ('rows' in state && state.rows !== undefined && state.rows.length > 0) {
-        rows = cloneDeep(state.rows);
-        index = Math.max(...rows.map(e => e.id)) + 1;
+      if ('parameters' in state && state.parameters !== undefined && state.parameters.length > 0) {
+        parameters = cloneDeep(state.parameters);
+        index = Math.max(...parameters.map(e => e.id)) + 1;
       }
 
-      const newRow = {id: index, name: "", description: '', type: '', value: '', newEntry: true };
+      const newRow = {id: index, locked: false, name: "", description: '', type: '', value: '', newEntry: true };
       newRow.backup = cloneDeep(newRow)
-      rows.push(newRow);
+      parameters.push(newRow);
 
       return state.merge({
         editMode: true,
-        rows: rows
+        parameters: parameters
       });
     }
-    case PARAMETER_DELETE: {
-      var rows = state.rows.filter(v => v.id !== payload.rowData.id);
+    case PARAMETER_SELECTION_LOCK: {
+      const parameters = cloneDeep(state.parameters);
+      const index = findIndex(parameters, { id: payload.rowData.id });
+
+      if (parameters[index].locked !== undefined) {
+        parameters[index].locked = !parameters[index].locked;
+      } else {
+        parameters[index].locked = true;
+      }
+
       return state.merge({
-        rows: rows,
-        parameterTypes: filterUsedParameterTypes(PARAMETER_TYPES, rows),
+        parameters: parameters
+      });
+    }
+    case PARAMETER_SELECTION_DELETE: {
+      const parameters = state.parameters.filter(v => v.id !== payload.rowData.id);
+      return state.merge({
+        parameters: parameters,
+        parameterTypes: filterUsedParameterTypes(PARAMETER_SELECTION_TYPES, parameters),
       })
     }
-    case PARAMETER_EDIT_ACTIVATE: {
-      const rows = cloneDeep(state.rows);
-      const index = findIndex(rows, { id: payload.rowData.id });
+    case PARAMETER_SELECTION_EDIT_ACTIVATE: {
+      const parameters = cloneDeep(state.parameters);
+      const index = findIndex(parameters, { id: payload.rowData.id });
 
-      rows[index].backup = cloneDeep(rows[index]);
+      parameters[index].backup = cloneDeep(parameters[index]);
 
       return state.merge({
         editMode: true,
-        rows: rows
+        parameters: parameters
       });
     }
-    case PARAMETER_EDIT_CONFIRM: {
-      const rows = cloneDeep(state.rows);
-      const index = findIndex(rows, { id: payload.rowData.id });
+    case PARAMETER_SELECTION_EDIT_CONFIRM: {
+      const parameters = cloneDeep(state.parameters);
+      const index = findIndex(parameters, { id: payload.rowData.id });
 
-      delete rows[index].backup;
-      delete rows[index].newEntry;
+      delete parameters[index].backup;
+      delete parameters[index].newEntry;
 
       return state.merge({
         editMode: false,
-        parameterTypes: filterUsedParameterTypes(PARAMETER_TYPES, rows),
-        rows: rows
+        parameterTypes: filterUsedParameterTypes(PARAMETER_SELECTION_TYPES, parameters),
+        parameters: parameters
       });
     }
-    case PARAMETER_EDIT_CHANGE: {
-      const rows = cloneDeep(state.rows);
-      const index = findIndex(rows, { id: payload.rowData.id });
+    case PARAMETER_SELECTION_EDIT_CHANGE: {
+      const parameters = cloneDeep(state.parameters);
+      const index = findIndex(parameters, { id: payload.rowData.id });
 
-      rows[index][payload.property] = payload.value;
+      parameters[index][payload.property] = payload.value;
 
-      return state.set('rows', rows);
+      return state.set('parameters', parameters);
     }
-    case PARAMETER_EDIT_CANCEL: {
-      const rows = cloneDeep(state.rows);
-      const index = findIndex(rows, { id: payload.rowData.id });
+    case PARAMETER_SELECTION_EDIT_CANCEL: {
+      const parameters = cloneDeep(state.parameters);
+      const index = findIndex(parameters, { id: payload.rowData.id });
 
-      rows[index] = cloneDeep(rows[index].backup);
-      delete rows[index].backup;
+      parameters[index] = cloneDeep(parameters[index].backup);
+      delete parameters[index].backup;
 
-      if (rows[index].newEntry === true) {
-        rows.splice(index, 1);
+      if (parameters[index].newEntry === true) {
+        parameters.splice(index, 1);
       }
 
       return state.merge({
         editMode: false,
-        rows: rows
+        parameters: parameters
       });
     }
-    case PARAMETER_SORT: {
+    case PARAMETER_SELECTION_SORT: {
       const selectedColumn = payload.selectedColumn;
       return state.set(
         'sortingColumns',
@@ -126,45 +144,59 @@ const parameterSelectionParameters = (state = initialState, action) => {
         })
       );
     }
-    case LOAD_PARAMETER_SELECTION_FAILURE: {
-      return state.merge({ error: payload.error, loading: false });
-    }
-    case LOAD_PARAMETER_SELECTION_REQUEST: {
-      return state.set('loading', true);
-    }
-    case LOAD_PARAMETER_SELECTION_SUCCESS: {
-      return state.merge({
-        appDefinition: payload.app_definition,
-        loading: false,
-        rows: JSON.parse(payload.app_definition.parameters),
-        hostgroupId: payload.app_definition.hostgroup_id,
-        foremanData: payload.fdata,
-      });
-    }
-    case LOAD_FOREMAN_DATA_FAILURE: {
+    case PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE: {
       return state.merge({
         error: payload.error,
         loading: false
       });
     }
-    case LOAD_FOREMAN_DATA_REQUEST: {
-      var newState = {
-        foremanData: {},
-        hostgroupId: -1,
-        loading: true
-      };
-
-      if (payload.clearRows === true) {
-        Object.assign(newState, { rows: [] });
+    case PARAMETER_SELECTION_LOAD_PARAM_DATA_REQUEST: {
+      let newState = {};
+
+      if (payload.dataType == PARAMETER_SELECTION_PARAM_TYPE_FOREMAN) {
+        newState = {
+          paramData: {},
+          hostgroupId: -1,
+          loading: true
+        };
+      } else if (payload.dataType == PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE) {
+        newState = {
+          loading: true
+        };
+      }
+
+      if (payload.clearParameters === true) {
+        Object.assign(newState, { parameters: [] });
+      }
+
+      return state.merge(newState);
+    }
+    case PARAMETER_SELECTION_LOAD_PARAM_DATA_SUCCESS: {
+      let newState = {};
+
+      if (payload.dataType == PARAMETER_SELECTION_PARAM_TYPE_FOREMAN) {
+        newState = {
+          loading: false,
+          paramData: payload,
+          hostgroupId: payload.hostgroup_id,
+        };
       }
 
       return state.merge(newState);
     }
-    case LOAD_FOREMAN_DATA_SUCCESS: {
+    case APPLICATION_DEFINITION_PARAMETER_SELECTION_MODAL_CLOSE: {
+      const parameters = cloneDeep(state.parameters);
+
+      parameters.forEach((param, index) => {
+        delete parameters[index].backup;
+        if (parameters[index].newEntry === true) {
+          parameters.splice(index, 1);
+        }
+      });
+
       return state.merge({
-        loading: false,
-        foremanData: payload,
-        hostgroupId: payload.hostgroup_id,
+        editMode: false,
+        parameters: parameters
       });
     }
     default:

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,
   },
 };