foreman_acd 0.4.0 → 0.9.0

data/webpack/components/ParameterSelection/ParameterSelectionReducer.js

@@ -15,6 +15,7 @@ import * as sort from 'sortabular';
 import {
   PARAMETER_SELECTION_INIT,
   PARAMETER_SELECTION_TYPES,
+  PARAMETER_SELECTION_LOCK,
   PARAMETER_SELECTION_DELETE,
   PARAMETER_SELECTION_ADD,
   PARAMETER_SELECTION_EDIT_ACTIVATE,
@@ -22,17 +23,15 @@ import {
   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,
+  PARAMETER_SELECTION_PARAM_TYPE_FOREMAN,
+  PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE,
+  PARAMETER_SELECTION_COMPLEX_DATA_MODAL_OPEN,
+  PARAMETER_SELECTION_COMPLEX_DATA_MODAL_CLOSE,
 } from './ParameterSelectionConstants';
 
-import {
-  APPLICATION_DEFINITION_PARAMETER_SELECTION_MODAL_CLOSE,
-} from '../ApplicationDefinition/ApplicationDefinitionConstants';
-
 export const initialState = Immutable({
   editMode: false,
   error: { errorMsg: '', status: '', statusText: '' },
@@ -54,12 +53,29 @@ const parameterSelectionParameters = (state = initialState, action) => {
         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: '', isYaml: false, newEntry: true };
+      if (state.paramType == 'PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE') {
+        newRow['type'] = 'complex';
+      }
       newRow.backup = cloneDeep(newRow)
       parameters.push(newRow);
-
       return state.merge({
         editMode: true,
+        parameters: parameters,
+        editParamsRowIndex: index,
+      });
+    }
+    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({
         parameters: parameters
       });
     }
@@ -75,10 +91,10 @@ const parameterSelectionParameters = (state = initialState, action) => {
       const index = findIndex(parameters, { id: payload.rowData.id });
 
       parameters[index].backup = cloneDeep(parameters[index]);
-
       return state.merge({
         editMode: true,
-        parameters: parameters
+        parameters: parameters,
+        editParamsRowIndex: index,
       });
     }
     case PARAMETER_SELECTION_EDIT_CONFIRM: {
@@ -98,9 +114,15 @@ const parameterSelectionParameters = (state = initialState, action) => {
       const parameters = cloneDeep(state.parameters);
       const index = findIndex(parameters, { id: payload.rowData.id });
 
-      parameters[index][payload.property] = payload.value;
-
-      return state.set('parameters', parameters);
+      if (!parameters[index]['isYaml'] && payload.property == 'value') {
+        parameters[index]['value'] = payload.value;
+      } else if (payload.property != 'value') {
+        parameters[index][payload.property] = payload.value;
+      }
+      return state.merge({
+        parameters: parameters,
+        editParamsRowIndex: index
+      });
     }
     case PARAMETER_SELECTION_EDIT_CANCEL: {
       const parameters = cloneDeep(state.parameters);
@@ -169,20 +191,35 @@ const parameterSelectionParameters = (state = initialState, action) => {
 
       return state.merge(newState);
     }
-    case APPLICATION_DEFINITION_PARAMETER_SELECTION_MODAL_CLOSE: {
+    case PARAMETER_SELECTION_COMPLEX_DATA_MODAL_OPEN: {
+      return state;
+    }
+    case PARAMETER_SELECTION_COMPLEX_DATA_MODAL_CLOSE: {
+      let str;
+      let element = document.getElementById('yamlData');
+      if (element != null) {
+        str = element.value;
+      }
+      else {
+        str = '';
+      }
+      let newState = {};
+      let index = state.editParamsRowIndex;
       const parameters = cloneDeep(state.parameters);
-
-      parameters.forEach((param, index) => {
-        delete parameters[index].backup;
-        if (parameters[index].newEntry === true) {
-          parameters.splice(index, 1);
+      if (payload.mode == 'save') {
+        parameters[index]['value'] = str;
+        if (str == '') {
+          parameters[index]['isYaml'] = false;
+        } else {
+          parameters[index]['isYaml'] = true;
         }
-      });
-
-      return state.merge({
-        editMode: false,
-        parameters: parameters
-      });
+        newState = {
+          parameters: parameters,
+        };
+      } else {
+        newState = {};
+      }
+      return state.merge(newState);
     }
     default:
       return state;

data/webpack/components/ParameterSelection/ParameterSelectionSelectors.js

@@ -9,3 +9,4 @@ export const selectSortingColumns = state => parameterState(state).sortingColumn
 export const selectColumns = state => parameterState(state).columns;
 export const selectParamDefinition = state => parameterState(state).paramDefinition;
 export const selectHostgroupId = state => parameterState(state).hostgroupId;
+export const selectEditParamsRowIndex = state => parameterState(state).editParamsRowIndex;

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

@@ -5,31 +5,51 @@ export const parameterSelectionData_1 = {
     status: '',
     statusText: ''
   },
-  foremanData: {
+  paramData: {
     hostgroup_id: 1,
     environments: [
       {
         id: 1,
         name: 'production'
+      }
+    ],
+    lifecycle_environments: [
+      {
+        id: 1,
+        name: 'Library'
+      }
+    ],
+    domains: [
+      {
+        id: 1,
+        name: 'deploy3.dev.atix'
+      }
+    ],
+    computeprofiles: [
+      {
+        id: 1,
+        name: '1-Small'
       },
       {
         id: 2,
-        name: 'test'
+        name: '2-Medium'
+      },
+      {
+        id: 3,
+        name: '3-Large'
+      },
+      {
+        id: 4,
+        name: 'Orchahosts-VM'
       }
     ],
-    lifecycle_environments: [],
-    domains: [],
-    computeprofiles: [],
     ptables: [
       {
-        id: 105,
+        id: 125,
         name: 'Kickstart default'
-      },
-      {
-        id: 104,
-        name: 'Kickstart default thin'
       }
-    ]
+    ],
+    dataType: 'PARAMETER_SELECTION_PARAM_TYPE_FOREMAN'
   },
   hostgroupId: 1,
   loading: false,
@@ -39,10 +59,10 @@ export const parameterSelectionData_1 = {
       position: 0
     }
   },
-  appDefinition: {
+  paramDefinition: {
     id: 1,
-    name: 'Test123',
-    hostgroup_id: 1
+    name: 'web',
+    dataId: '1'
   },
   columns: [
     {
@@ -50,30 +70,56 @@ export const parameterSelectionData_1 = {
       header: {
         label: 'Name',
         props: {
-          index: 0,
           sort: true,
           style: {
-            width: '20%'
-          }
+            width: '25%'
+          },
+          index: 0
         },
+        transforms: [
+          null
+        ],
+        formatters: [
+          null
+        ],
+        customFormatters: [
+          null
+        ]
       },
+      cell: {
+        formatters: [
+          null
+        ]
+      }
     },
     {
       property: 'description',
       header: {
         label: 'Description',
         props: {
-          index: 1,
           sort: true,
           style: {
             width: '25%'
-          }
+          },
+          index: 1
         },
+        transforms: [
+          null
+        ],
+        formatters: [
+          null
+        ],
+        customFormatters: [
+          null
+        ]
       },
       cell: {
         props: {
           index: 1
         },
+        formatters: [
+          null
+        ]
       }
     },
     {
@@ -81,17 +127,26 @@ export const parameterSelectionData_1 = {
       header: {
         label: 'Type',
         props: {
-          index: 2,
           sort: true,
           style: {
             width: '20%'
-          }
+          },
+          index: 2
         },
+        transforms: [
+          null
+        ],
+        formatters: [
+          null
+        ],
+        customFormatters: [
+          null
+        ]
       },
       cell: {
-        props: {
-          index: 2
-        },
+        formatters: [
+          null
+        ]
       }
     },
     {
@@ -99,17 +154,26 @@ export const parameterSelectionData_1 = {
       header: {
         label: 'Default value',
         props: {
-          index: 3,
           sort: true,
           style: {
-            width: '25%'
-          }
+            width: '20%'
+          },
+          index: 3
         },
+        transforms: [
+          null
+        ],
+        formatters: [
+          null
+        ],
+        customFormatters: [
+          null
+        ]
       },
       cell: {
-        props: {
-          index: 3
-        },
+        formatters: [
+          null
+        ]
       }
     },
     {
@@ -117,78 +181,46 @@ export const parameterSelectionData_1 = {
       header: {
         label: 'Actions',
         props: {
+          style: {
+            width: '10%'
+          },
           index: 4
         },
+        formatters: [
+          null
+        ]
       },
       cell: {
-        props: {
-          index: 4
-        },
+        formatters: [
+          null
+        ]
       }
     }
   ],
   parameters: [
     {
       id: 1,
-      name: 'PuppetEnv',
+      locked: false,
+      name: 'CP',
       description: '',
-      type: 'puppetenv',
-      value: '2'
+      type: 'computeprofile',
+      value: '1'
     },
     {
       id: 2,
-      name: 'PW',
-      description: '',
-      type: 'password',
-      value: 'rooot'
-    },
-    {
-      id: 3,
-      name: 'Blub',
-      description: '',
-      type: 'hostparam',
-      value: 'awesome'
-    },
-    {
-      id: 4,
-      name: '111allo',
-      description: '',
-      type: 'ip',
-      value: '1.1.1.1'
-    },
-    {
-      id: 5,
-      name: '1111aasdfasf',
-      description: '',
-      type: 'hostname',
-      value: 'dername'
-    },
-    {
-      id: 6,
-      name: '222nocheiner',
-      description: '',
-      type: 'hostparam',
-      value: ''
-    },
-    {
-      id: 7,
-      name: 'aaaaa',
-      description: 'aa',
-      type: 'ptable',
-      value: ''
-    },
-    {
-      id: 8,
-      name: 'aaa',
+      locked: true,
+      name: 'LE',
       description: '',
-      type: 'hostparam',
-      value: '2134234'
+      type: 'lifecycleenv',
+      value: '1'
     }
   ],
   parameterTypes: {
-    computeprofile: 'Compute profile',
     domain: 'Domain',
     hostparam: 'Host parameter',
-    lifecycleenv: 'Lifecycle environment'
+    ip: 'IP',
+    ptable: 'Partition table',
+    puppetenv: 'Puppet environment',
+    password: 'Root password'
   }
-};
+}

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', () =>