foreman_acd 0.9.5 → 0.10.0

data/webpack/components/ParameterSelection/ParameterSelectionSelectors.js

@@ -3,11 +3,16 @@ const parameterState = state => state.foremanAcd.parameterSelectionParameters;
 export const selectLoading = state => parameterState(state).loading;
 export const selectEditMode = state => parameterState(state).editMode;
 export const selectParamData = state => parameterState(state).paramData;
-export const selectAllowedParameterTypes = state => parameterState(state).allowedParameterTypes;
-export const selectParameterTypes = state => parameterState(state).parameterTypes;
+export const selectAllowedParameterTypes = state =>
+  parameterState(state).allowedParameterTypes;
+export const selectParameterTypes = state =>
+  parameterState(state).parameterTypes;
 export const selectParameters = state => parameterState(state).parameters;
-export const selectSortingColumns = state => parameterState(state).sortingColumns;
+export const selectSortingColumns = state =>
+  parameterState(state).sortingColumns;
 export const selectColumns = state => parameterState(state).columns;
-export const selectParamDefinition = state => parameterState(state).paramDefinition;
+export const selectParamDefinition = state =>
+  parameterState(state).paramDefinition;
 export const selectHostgroupId = state => parameterState(state).hostgroupId;
-export const selectEditParamsRowIndex = state => parameterState(state).editParamsRowIndex;
+export const selectEditParamsRowIndex = state =>
+  parameterState(state).editParamsRowIndex;

data/webpack/components/ParameterSelection/__fixtures__/{parameterSelectionData_1.fixtures.js → parameterSelectionData1.fixtures.js}

@@ -1,68 +1,68 @@
-export const parameterSelectionData_1 = {
+export const parameterSelectionData1 = {
   editMode: false,
   error: {
     errorMsg: '',
     status: '',
-    statusText: ''
+    statusText: '',
   },
   paramData: {
     hostgroup_id: 1,
     environments: [
       {
         id: 1,
-        name: 'production'
-      }
+        name: 'production',
+      },
     ],
     lifecycle_environments: [
       {
         id: 1,
-        name: 'Library'
-      }
+        name: 'Library',
+      },
     ],
     domains: [
       {
         id: 1,
-        name: 'deploy3.dev.atix'
-      }
+        name: 'deploy3.dev.atix',
+      },
     ],
     computeprofiles: [
       {
         id: 1,
-        name: '1-Small'
+        name: '1-Small',
       },
       {
         id: 2,
-        name: '2-Medium'
+        name: '2-Medium',
       },
       {
         id: 3,
-        name: '3-Large'
+        name: '3-Large',
       },
       {
         id: 4,
-        name: 'Orchahosts-VM'
-      }
+        name: 'Orchahosts-VM',
+      },
     ],
     ptables: [
       {
         id: 125,
-        name: 'Kickstart default'
-      }
+        name: 'Kickstart default',
+      },
     ],
-    dataType: 'PARAMETER_SELECTION_PARAM_TYPE_FOREMAN'
+    dataType: 'PARAMETER_SELECTION_PARAM_TYPE_FOREMAN',
   },
   hostgroupId: 1,
   loading: false,
   sortingColumns: {
     name: {
       direction: 'asc',
-      position: 0
-    }
+      position: 0,
+    },
   },
   paramDefinition: {
     id: 1,
     name: 'web',
-    dataId: '1'
+    dataId: '1',
   },
   columns: [
     {
@@ -72,25 +72,17 @@ export const parameterSelectionData_1 = {
         props: {
           sort: true,
           style: {
-            width: '25%'
+            width: '25%',
           },
-          index: 0
+          index: 0,
         },
-        transforms: [
-          null
-        ],
-        formatters: [
-          null
-        ],
-        customFormatters: [
-          null
-        ]
+        transforms: [null],
+        formatters: [null],
+        customFormatters: [null],
       },
       cell: {
-        formatters: [
-          null
-        ]
-      }
+        formatters: [null],
+      },
     },
     {
       property: 'description',
@@ -99,28 +91,20 @@ export const parameterSelectionData_1 = {
         props: {
           sort: true,
           style: {
-            width: '25%'
+            width: '25%',
           },
-          index: 1
+          index: 1,
         },
-        transforms: [
-          null
-        ],
-        formatters: [
-          null
-        ],
-        customFormatters: [
-          null
-        ]
+        transforms: [null],
+        formatters: [null],
+        customFormatters: [null],
       },
       cell: {
         props: {
-          index: 1
+          index: 1,
         },
-        formatters: [
-          null
-        ]
-      }
+        formatters: [null],
+      },
     },
     {
       property: 'type',
@@ -129,25 +113,17 @@ export const parameterSelectionData_1 = {
         props: {
           sort: true,
           style: {
-            width: '20%'
+            width: '20%',
           },
-          index: 2
+          index: 2,
         },
-        transforms: [
-          null
-        ],
-        formatters: [
-          null
-        ],
-        customFormatters: [
-          null
-        ]
+        transforms: [null],
+        formatters: [null],
+        customFormatters: [null],
       },
       cell: {
-        formatters: [
-          null
-        ]
-      }
+        formatters: [null],
+      },
     },
     {
       property: 'value',
@@ -156,25 +132,17 @@ export const parameterSelectionData_1 = {
         props: {
           sort: true,
           style: {
-            width: '20%'
+            width: '20%',
           },
-          index: 3
+          index: 3,
         },
-        transforms: [
-          null
-        ],
-        formatters: [
-          null
-        ],
-        customFormatters: [
-          null
-        ]
+        transforms: [null],
+        formatters: [null],
+        customFormatters: [null],
       },
       cell: {
-        formatters: [
-          null
-        ]
-      }
+        formatters: [null],
+      },
     },
     {
       property: 'actions',
@@ -182,20 +150,16 @@ export const parameterSelectionData_1 = {
         label: 'Actions',
         props: {
           style: {
-            width: '10%'
+            width: '10%',
           },
-          index: 4
+          index: 4,
         },
-        formatters: [
-          null
-        ]
+        formatters: [null],
       },
       cell: {
-        formatters: [
-          null
-        ]
-      }
-    }
+        formatters: [null],
+      },
+    },
   ],
   parameters: [
     {
@@ -204,7 +168,7 @@ export const parameterSelectionData_1 = {
       name: 'CP',
       description: '',
       type: 'computeprofile',
-      value: '1'
+      value: '1',
     },
     {
       id: 2,
@@ -212,23 +176,22 @@ export const parameterSelectionData_1 = {
       name: 'LE',
       description: '',
       type: 'lifecycleenv',
-      value: '1'
-    }
-  ],
-  allowedParameterTypes: [
-    'domain',
-    'hostparam',
-    'ip',
-    'ptable',
-    'puppetenv',
-    'password',
+      value: '1',
+    },
   ],
+  allowedParameterTypes: {
+    domain: 'Domain',
+    hostparam: 'Host parameter',
+    ip: 'IP',
+    ptable: 'Partition table',
+    puppetenv: 'Puppet environment',
+  },
   parameterTypes: {
     domain: 'Domain',
     hostparam: 'Host parameter',
     ip: 'IP',
     ptable: 'Partition table',
     puppetenv: 'Puppet environment',
-    password: 'Root password'
-  }
-}
+    password: 'Root password',
+  },
+};

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

@@ -1,26 +1,22 @@
 import Immutable from 'seamless-immutable';
-import {
-   cloneDeep,
-   findIndex,
-   findLastIndex,
-} from 'lodash';
+import { cloneDeep, findIndex } from 'lodash';
 
-import {
-  parameterSelectionData_1,
-} from '../__fixtures__/parameterSelectionData_1.fixtures';
+import { parameterSelectionData1 } from '../__fixtures__/parameterSelectionData1.fixtures';
 
-export const successState = Immutable(parameterSelectionData_1);
+export const successState = Immutable(parameterSelectionData1);
 
 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]);
+const editClone = parameterSelectionData1;
+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 initParameterSelectionPayload = parameterSelectionData1;
+export const addParameterPayload = {};
 export const lockParameterPayload = {
   rowData: {
     id: EDIT_ROW_ID,
@@ -47,14 +43,14 @@ export const cancelEditParameterPayload = {
   },
 };
 export const changeEditParameterPayload = {
-  value: "helloworld",
-  property: "value",
+  value: 'helloworld',
+  property: 'value',
   rowData: {
     id: EDIT_ROW_ID,
-  }
+  },
 };
 export const sortParameterPayload = {
-  selectedColumn: "type",
+  selectedColumn: 'type',
 };
 
 export const loadParamDataRequestPayload = {
@@ -65,12 +61,12 @@ export const loadParamDataSuccessPayload = {
   environments: [
     {
       id: 1,
-      name: "production"
+      name: 'production',
     },
     {
       id: 2,
-      name: "test"
-    }
+      name: 'test',
+    },
   ],
   lifecycle_environments: [],
   domains: [],
@@ -78,14 +74,14 @@ export const loadParamDataSuccessPayload = {
   ptables: [
     {
       id: 105,
-      name: "Kickstart default"
+      name: 'Kickstart default',
     },
     {
       id: 104,
-      name: "Kickstart default thin"
-    }
-  ]
+      name: 'Kickstart default thin',
+    },
+  ],
 };
 export const loadParamDataFailurePayload = {
-  error: "Something really bad happend",
+  error: 'Something really bad happend',
 };

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

@@ -9,49 +9,63 @@ import {
 
 const noop = () => {};
 
+const baseFixtures = {
+  loading: true,
+  location: 'Default Location',
+  organization: 'Default Organization',
+  editMode: false,
+  editModeCallback: noop,
+  paramDataUrl: '/acd/ui_acd_fdata/__id__',
+  paramType: '',
+  data: {},
+  initParameterSelection: noop,
+  addParameter: noop,
+  deleteParameter: noop,
+  lockParameter: noop,
+  activateEditParameter: noop,
+  confirmEditParameter: noop,
+  cancelEditParameter: noop,
+  changeEditParameter: noop,
+  sortParameter: noop,
+  openParameterSelectionDialogBox: noop,
+  closeParameterSelectionDialogBox: noop,
+  loadParamData: noop,
+};
+
 const fixtures = {
+  'should render loading': baseFixtures,
+
   'should render foreman parameter selection': {
-    location: "Default Location",
-    organization: "Default Organization",
-    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,
+    ...baseFixtures,
+    ...{
+      loading: false,
+      paramType: PARAMETER_SELECTION_PARAM_TYPE_FOREMAN,
+      data: {
+        type: PARAMETER_SELECTION_PARAM_TYPE_FOREMAN,
+        parameters: [],
+        useDefaultValue: true,
+        allowRowAdjustment: true,
+        allowNameAdjustment: true,
+        allowDescriptionAdjustment: true,
+      },
     },
-    addParameter: noop,
-    confirmEditParametre: noop,
-    cancelEditParameter: noop,
-    editModeCallback: noop,
-    loadParamData: noop,
-    initParameterSelection: noop,
   },
 
   'should render ansible parameter selection': {
-    location: "Default Location",
-    organization: "Default Organization",
-    editModeCallback: noop,
-    paramType: PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE,
-    data: {
-      type: PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE,
-      parameters: [],
-      useDefaultValue: false,
-      allowRowAdjustment: true,
-      allowNameAdjustment: true,
-      allowDescriptionAdjustment: true,
+    ...baseFixtures,
+    ...{
+      loading: false,
+      paramType: PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE,
+      data: {
+        type: PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE,
+        parameters: [],
+        useDefaultValue: false,
+        allowRowAdjustment: true,
+        allowNameAdjustment: true,
+        allowDescriptionAdjustment: true,
+      },
     },
-    addParameter: noop,
-    confirmEditParametre: noop,
-    cancelEditParameter: noop,
-    editModeCallback: noop,
-    loadParamData: noop,
-    initParameterSelection: noop,
-  }
+  },
 };
 
 describe('ParameterSelection', () =>

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

@@ -0,0 +1,76 @@
+// import {expect, jest, test} from '@jest/globals';
+import {
+  transformForemanData,
+  filterParameterTypes,
+} from '../ParameterSelectionHelper';
+
+describe('transformForemanData', () => {
+  const fdata = [
+    { id: 1, name: '1-Small' },
+    { id: 2, name: '2-Medium' },
+    { id: 3, name: '3-Large' },
+  ];
+
+  it('returns empty on undefined', () => {
+    expect(transformForemanData(undefined)).toEqual('');
+  });
+
+  it('returns object with "id" as key and "name" as value', () => {
+    expect(transformForemanData(fdata)).toEqual({
+      1: '1-Small',
+      2: '2-Medium',
+      3: '3-Large',
+    });
+  });
+});
+
+describe('filterParameterTypes', () => {
+  const parameters = [
+    {
+      id: 1,
+      locked: false,
+      name: 'Password',
+      description: '',
+      type: 'password',
+      value: '1234',
+      isYaml: false,
+    },
+    {
+      id: 2,
+      locked: false,
+      name: 'NotAllowed',
+      description: '',
+      type: 'not_allowed',
+      value: '1234',
+      isYaml: false,
+    },
+    {
+      id: 3,
+      locked: false,
+      name: 'HostParameter1',
+      description: '',
+      type: 'hostparam',
+      value: '1234',
+      isYaml: false,
+    },
+    {
+      id: 4,
+      locked: false,
+      name: 'HostParameter2',
+      description: '',
+      type: 'hostparam',
+      value: '1234',
+      isYaml: false,
+    },
+  ];
+
+  it('removes parameter-types present in parameters', () => {
+    expect(filterParameterTypes({ password: '' }, parameters)).toEqual({});
+  });
+
+  it('keeps "hostparam" in parameter-types', () => {
+    expect(filterParameterTypes({ hostparam: '' }, parameters)).toEqual({
+      hostparam: '',
+    });
+  });
+});

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

@@ -31,8 +31,6 @@ import {
   PARAMETER_SELECTION_LOAD_PARAM_DATA_REQUEST,
   PARAMETER_SELECTION_LOAD_PARAM_DATA_SUCCESS,
   PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE,
-  PARAMETER_SELECTION_COMPLEX_DATA_MODAL_OPEN,
-  PARAMETER_SELECTION_COMPLEX_DATA_MODAL_CLOSE,
 } from '../ParameterSelectionConstants';
 
 const fixtures = {

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

@@ -14,9 +14,7 @@ import {
   selectEditParamsRowIndex,
 } from '../ParameterSelectionSelectors';
 
-import {
-  parameterSelectionData_1,
-} from '../__fixtures__/parameterSelectionData_1.fixtures';
+import { parameterSelectionData1 } from '../__fixtures__/parameterSelectionData1.fixtures';
 
 const stateFactory = obj => ({
   foremanAcd: {
@@ -25,28 +23,28 @@ const stateFactory = obj => ({
 });
 
 const fixtures = {
-  'should return loading from parameterSelectionData_1 fixtures': () =>
-    selectLoading(stateFactory(parameterSelectionData_1)),
-  'should return editMode from parameterSelectionData_1 fixtures': () =>
-    selectEditMode(stateFactory(parameterSelectionData_1)),
-  'should return paramData from parameterSelectionData_1 fixtures': () =>
-    selectParamData(stateFactory(parameterSelectionData_1)),
-  'should return allowedParameterTypes from parameterSelectionData_1 fixtures': () =>
-    selectAllowedParameterTypes(stateFactory(parameterSelectionData_1)),
-  'should return parameterTypes from parameterSelectionData_1 fixtures': () =>
-    selectParameterTypes(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 ParamDefinition from parameterSelectionData_1 fixtures': () =>
-    selectParamDefinition(stateFactory(parameterSelectionData_1)),
-  'should return hostgroupId from parameterSelectionData_1 fixtures': () =>
-    selectHostgroupId(stateFactory(parameterSelectionData_1)),
-  'should return editParamsRowIndex from parameterSelectionData_1 fixtures': () =>
-    selectEditParamsRowIndex(stateFactory(parameterSelectionData_1)),
+  'should return loading from parameterSelectionData1 fixtures': () =>
+    selectLoading(stateFactory(parameterSelectionData1)),
+  'should return editMode from parameterSelectionData1 fixtures': () =>
+    selectEditMode(stateFactory(parameterSelectionData1)),
+  'should return paramData from parameterSelectionData1 fixtures': () =>
+    selectParamData(stateFactory(parameterSelectionData1)),
+  'should return allowedParameterTypes from parameterSelectionData1 fixtures': () =>
+    selectAllowedParameterTypes(stateFactory(parameterSelectionData1)),
+  'should return parameterTypes from parameterSelectionData1 fixtures': () =>
+    selectParameterTypes(stateFactory(parameterSelectionData1)),
+  'should return parameters from parameterSelectionData1 fixtures': () =>
+    selectParameters(stateFactory(parameterSelectionData1)),
+  'should return sortingColumns from parameterSelectionData1 fixtures': () =>
+    selectSortingColumns(stateFactory(parameterSelectionData1)),
+  'should return columns from parameterSelectionData1 fixtures': () =>
+    selectColumns(stateFactory(parameterSelectionData1)),
+  'should return ParamDefinition from parameterSelectionData1 fixtures': () =>
+    selectParamDefinition(stateFactory(parameterSelectionData1)),
+  'should return hostgroupId from parameterSelectionData1 fixtures': () =>
+    selectHostgroupId(stateFactory(parameterSelectionData1)),
+  'should return editParamsRowIndex from parameterSelectionData1 fixtures': () =>
+    selectEditParamsRowIndex(stateFactory(parameterSelectionData1)),
 };
 
 describe('ParameterSelectionSelectors', () =>