foreman_acd 0.9.7 → 0.10.0

data/webpack/components/ParameterSelection/ParameterSelectionActions.js

@@ -1,30 +1,21 @@
-import React from 'react';
-import * as sort from 'sortabular';
 import { translate as __ } from 'foremanReact/common/I18n';
 
 import {
   actionHeaderCellFormatter,
   sortableHeaderCellFormatter,
   tableCellFormatter,
-  TABLE_SORT_DIRECTION
+  TABLE_SORT_DIRECTION,
 } from 'patternfly-react';
 
 import api from 'foremanReact/API';
 
-import {
-  propsToSnakeCase,
-  propsToCamelCase,
-} from 'foremanReact/common/helpers';
-
-import {
-  filterParameterTypes,
-} from './ParameterSelectionHelper';
-
 import {
   setModalOpen,
   setModalClosed,
 } from 'foremanReact/components/ForemanModal/ForemanModalActions';
 
+import { filterParameterTypes } from './ParameterSelectionHelper';
+
 import {
   PARAMETER_SELECTION_INIT,
   PARAMETER_SELECTION_TYPES,
@@ -37,7 +28,6 @@ import {
   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,
@@ -56,15 +46,15 @@ export const initParameterSelection = (
   sortingFormatter,
   sortableTransform,
   inlineEditFormatter,
-  inlineEditButtonsFormatter,
+  inlineEditButtonsFormatter
 ) => dispatch => {
   const initialState = {};
 
   initialState.sortingColumns = {
     name: {
       direction: TABLE_SORT_DIRECTION.ASC,
-        position: 0
-    }
+      position: 0,
+    },
   };
   initialState.paramDefinition = paramDefinition;
 
@@ -73,117 +63,136 @@ export const initParameterSelection = (
     valueLabel = __('Default value');
   }
 
-  initialState.columns = []
+  initialState.columns = [];
   const addToColumns = (obj, idx) => {
     obj.header.props.index = idx;
     initialState.columns.push(obj);
-  }
+  };
 
   let idx = 0;
-  addToColumns( {
+  addToColumns(
+    {
       property: 'name',
       header: {
         label: __('Name'),
         props: {
           sort: true,
           style: {
-            width: '25%'
-          }
+            width: '25%',
+          },
         },
         transforms: [sortableTransform],
         formatters: [sortingFormatter],
-        customFormatters: [sortableHeaderCellFormatter]
+        customFormatters: [sortableHeaderCellFormatter],
       },
       cell: {
-        formatters: [allowNameAdjustment ? inlineEditFormatter : tableCellFormatter]
-      }
-    }, idx++);
+        formatters: [
+          allowNameAdjustment ? inlineEditFormatter : tableCellFormatter,
+        ],
+      },
+    },
+    idx++
+  );
 
-  addToColumns( {
+  addToColumns(
+    {
       property: 'description',
       header: {
         label: __('Description'),
         props: {
           sort: true,
           style: {
-            width: '25%'
-          }
+            width: '25%',
+          },
         },
         transforms: [sortableTransform],
         formatters: [sortingFormatter],
-        customFormatters: [sortableHeaderCellFormatter]
+        customFormatters: [sortableHeaderCellFormatter],
       },
       cell: {
         props: {
-          index: 1
+          index: 1,
         },
-        formatters: [allowDescriptionAdjustment ? inlineEditFormatter : tableCellFormatter]
-      }
-    }, idx++);
+        formatters: [
+          allowDescriptionAdjustment ? inlineEditFormatter : tableCellFormatter,
+        ],
+      },
+    },
+    idx++
+  );
 
-  if (paramType == PARAMETER_SELECTION_PARAM_TYPE_FOREMAN) {
-    addToColumns( {
-      property: 'type',
-      header: {
-        label: __('Type'),
-        props: {
-          sort: true,
-          style: {
-            width: '20%'
-          }
+  if (paramType === PARAMETER_SELECTION_PARAM_TYPE_FOREMAN) {
+    addToColumns(
+      {
+        property: 'type',
+        header: {
+          label: __('Type'),
+          props: {
+            sort: true,
+            style: {
+              width: '20%',
+            },
+          },
+          transforms: [sortableTransform],
+          formatters: [sortingFormatter],
+          customFormatters: [sortableHeaderCellFormatter],
+        },
+        cell: {
+          // we are always using the inlineEditFormatter so that
+          // the well formatted type name is shown
+          formatters: [inlineEditFormatter],
         },
-        transforms: [sortableTransform],
-        formatters: [sortingFormatter],
-        customFormatters: [sortableHeaderCellFormatter]
       },
-      cell: {
-        // we are always using the inlineEditFormatter so that
-        // the well formatted type name is shown
-        formatters: [inlineEditFormatter]
-      }
-    }, idx++);
+      idx++
+    );
   }
 
-  addToColumns( {
+  addToColumns(
+    {
       property: 'value',
       header: {
         label: valueLabel,
         props: {
           sort: true,
           style: {
-            width: '20%'
-          }
+            width: '20%',
+          },
         },
         transforms: [sortableTransform],
         formatters: [sortingFormatter],
-        customFormatters: [sortableHeaderCellFormatter]
+        customFormatters: [sortableHeaderCellFormatter],
       },
       cell: {
-        formatters: [inlineEditFormatter]
-      }
-    }, idx++);
+        formatters: [inlineEditFormatter],
+      },
+    },
+    idx++
+  );
 
-  addToColumns( {
+  addToColumns(
+    {
       property: 'actions',
       header: {
         label: __('Actions'),
         props: {
           style: {
-            width: '10%'
-          }
+            width: '10%',
+          },
         },
-        formatters: [actionHeaderCellFormatter]
+        formatters: [actionHeaderCellFormatter],
       },
       cell: {
-        formatters: [inlineEditButtonsFormatter]
-      }
-    }, idx++);
+        formatters: [inlineEditButtonsFormatter],
+      },
+    },
+    idx++
+  );
 
   initialState.parameters = parameters;
-  initialState.allowedParameterTypes = [];
+  initialState.allowedParameterTypes = {};
 
-  if ((paramType == PARAMETER_SELECTION_PARAM_TYPE_FOREMAN) && (parameters)) {
-    let pTypes = PARAMETER_SELECTION_TYPES;
+  if (paramType === PARAMETER_SELECTION_PARAM_TYPE_FOREMAN && parameters) {
+    const pTypes = PARAMETER_SELECTION_TYPES;
 
     // filter hidden parameters
     hiddenParameterTypes.forEach(item => delete pTypes[item]);
@@ -199,7 +208,7 @@ export const initParameterSelection = (
     type: PARAMETER_SELECTION_INIT,
     payload: initialState,
   });
-}
+};
 
 const errorHandler = (msg, err) => {
   const error = {
@@ -209,68 +218,63 @@ const errorHandler = (msg, err) => {
   return { type: msg, payload: { error } };
 };
 
-export const lockParameter = (additionalData) => ({
+export const lockParameter = additionalData => ({
   type: PARAMETER_SELECTION_LOCK,
   payload: {
     ...additionalData,
   },
 });
 
-export const openParameterSelectionDialogBox = (additionalData) => dispatch => {
+export const openParameterSelectionDialogBox = additionalData => dispatch => {
   dispatch({
     type: PARAMETER_SELECTION_COMPLEX_DATA_MODAL_OPEN,
     payload: {
       ...additionalData,
-    }
+    },
   });
-  dispatch(
-    setModalOpen({ id: 'ParameterSelectionComplexDataModal' })
-  );
+  dispatch(setModalOpen({ id: 'ParameterSelectionComplexDataModal' }));
 };
 
-export const closeParameterSelectionDialogBox = (additionalData) => dispatch => {
+export const closeParameterSelectionDialogBox = additionalData => dispatch => {
   dispatch({
     type: PARAMETER_SELECTION_COMPLEX_DATA_MODAL_CLOSE,
     payload: {
       ...additionalData,
-    }
+    },
   });
 
-  dispatch(
-    setModalClosed({ id: 'ParameterSelectionComplexDataModal' })
-  );
+  dispatch(setModalClosed({ id: 'ParameterSelectionComplexDataModal' }));
 };
 
-export const addParameter = (additionalData) => (
-  {
+export const addParameter = additionalData => ({
   type: PARAMETER_SELECTION_ADD,
   payload: {
     ...additionalData,
   },
 });
 
-export const deleteParameter = (additionalData) => ({
+export const deleteParameter = additionalData => ({
   type: PARAMETER_SELECTION_DELETE,
   payload: {
     ...additionalData,
   },
 });
 
-export const activateEditParameter = (additionalData) => ({
+export const activateEditParameter = additionalData => ({
   type: PARAMETER_SELECTION_EDIT_ACTIVATE,
   payload: {
     ...additionalData,
   },
 });
 
-export const confirmEditParameter = (rowData) => ({
+export const confirmEditParameter = rowData => ({
   type: PARAMETER_SELECTION_EDIT_CONFIRM,
   payload: {
     ...rowData,
   },
 });
 
-export const cancelEditParameter = (rowData) => ({
+export const cancelEditParameter = rowData => ({
   type: PARAMETER_SELECTION_EDIT_CANCEL,
   payload: {
     ...rowData,
@@ -293,22 +297,28 @@ export const sortParameter = (selectedColumn, defaultSortingOrder) => ({
   },
 });
 
-export const loadParamData = (attr) => dispatch => {
-  dispatch( { type: PARAMETER_SELECTION_LOAD_PARAM_DATA_REQUEST, payload: { dataType: attr.dataType, clearParameters: attr.clearParameters } });
+export const loadParamData = attr => async dispatch => {
+  dispatch({
+    type: PARAMETER_SELECTION_LOAD_PARAM_DATA_REQUEST,
+    payload: { dataType: attr.dataType, clearParameters: attr.clearParameters },
+  });
 
-  let realUrl = attr.url.replace("__id__", attr.paramDefinition.dataId);
+  let realUrl = attr.url.replace('__id__', attr.paramDefinition.dataId);
 
   if (attr.paramDefinition.hasOwnProperty('dataSubId')) {
-    realUrl = realUrl.replace("__subid__", attr.paramDefinition.dataSubId);
+    realUrl = realUrl.replace('__subid__', attr.paramDefinition.dataSubId);
   }
 
-  return api
-    .get(realUrl, {}, {})
-    .then(({ data }) =>
-      dispatch({
-        type: PARAMETER_SELECTION_LOAD_PARAM_DATA_SUCCESS,
-        payload: { ...data, dataType: attr.dataType }
-      })
-    )
-    .catch(error => dispatch(errorHandler(PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE, error)));
+  try {
+    const { data } = await api.get(realUrl, {}, {});
+
+    return dispatch({
+      type: PARAMETER_SELECTION_LOAD_PARAM_DATA_SUCCESS,
+      payload: { ...data, dataType: attr.dataType },
+    });
+  } catch (error) {
+    return dispatch(
+      errorHandler(PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE, error)
+    );
+  }
 };

data/webpack/components/ParameterSelection/ParameterSelectionConstants.js

@@ -2,18 +2,29 @@ export const PARAMETER_SELECTION_INIT = 'INIT_PARAMETER_SELECTION_INIT';
 export const PARAMETER_SELECTION_LOCK = 'PARAMETER_SELECTION_LOCK';
 export const PARAMETER_SELECTION_DELETE = 'PARAMETER_SELECTION_DELETE';
 export const PARAMETER_SELECTION_ADD = 'PARAMETER_SELECTION_ADD';
-export const PARAMETER_SELECTION_EDIT_ACTIVATE = 'PARAMETER_SELECTION_EDIT_ACTIVATE';
-export const PARAMETER_SELECTION_EDIT_CONFIRM = 'PARAMETER_SELECTION_EDIT_CONFIRM';
-export const PARAMETER_SELECTION_EDIT_CHANGE = 'PARAMETER_SELECTION_EDIT_CHANGE';
-export const PARAMETER_SELECTION_EDIT_CANCEL = 'PARAMETER_SELECTION_EDIT_CANCEL';
+export const PARAMETER_SELECTION_EDIT_ACTIVATE =
+  'PARAMETER_SELECTION_EDIT_ACTIVATE';
+export const PARAMETER_SELECTION_EDIT_CONFIRM =
+  'PARAMETER_SELECTION_EDIT_CONFIRM';
+export const PARAMETER_SELECTION_EDIT_CHANGE =
+  'PARAMETER_SELECTION_EDIT_CHANGE';
+export const PARAMETER_SELECTION_EDIT_CANCEL =
+  'PARAMETER_SELECTION_EDIT_CANCEL';
 export const PARAMETER_SELECTION_SORT = 'PARAMETER_SELECTION_SORT';
-export const PARAMETER_SELECTION_LOAD_PARAM_DATA_REQUEST = 'PARAMETER_SELECTION_LOAD_PARAM_DATA_REQUEST';
-export const PARAMETER_SELECTION_LOAD_PARAM_DATA_SUCCESS = 'PARAMETER_SELECTION_LOAD_PARAM_DATA_SUCCESS';
-export const PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE = 'PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE';
-export const PARAMETER_SELECTION_PARAM_TYPE_FOREMAN = 'PARAMETER_SELECTION_PARAM_TYPE_FOREMAN';
-export const PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE = 'PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE';
-export const PARAMETER_SELECTION_COMPLEX_DATA_MODAL_OPEN = 'PARAMETER_SELECTION_COMPLEX_DATA_MODAL_OPEN';
-export const PARAMETER_SELECTION_COMPLEX_DATA_MODAL_CLOSE = 'PARAMETER_SELECTION_COMPLEX_DATA_MODAL_CLOSE';
+export const PARAMETER_SELECTION_LOAD_PARAM_DATA_REQUEST =
+  'PARAMETER_SELECTION_LOAD_PARAM_DATA_REQUEST';
+export const PARAMETER_SELECTION_LOAD_PARAM_DATA_SUCCESS =
+  'PARAMETER_SELECTION_LOAD_PARAM_DATA_SUCCESS';
+export const PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE =
+  'PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE';
+export const PARAMETER_SELECTION_PARAM_TYPE_FOREMAN =
+  'PARAMETER_SELECTION_PARAM_TYPE_FOREMAN';
+export const PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE =
+  'PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE';
+export const PARAMETER_SELECTION_COMPLEX_DATA_MODAL_OPEN =
+  'PARAMETER_SELECTION_COMPLEX_DATA_MODAL_OPEN';
+export const PARAMETER_SELECTION_COMPLEX_DATA_MODAL_CLOSE =
+  'PARAMETER_SELECTION_COMPLEX_DATA_MODAL_CLOSE';
 
 // Make sure the object is sorted by value
 //   (Compute Profile -> Partition table -> Root password)

data/webpack/components/ParameterSelection/ParameterSelectionHelper.js

@@ -1,24 +1,26 @@
-import {
-  cloneDeep,
-} from 'lodash';
+import { cloneDeep } from 'lodash';
 
-export const transformForemanData = (fdata) => {
+export const transformForemanData = fdata => {
   if (fdata === undefined) {
-    return "";
+    return '';
   }
   const result = {};
-  fdata.map(item => result[item.id] = item.name)
-  return (result);
-}
+  fdata.forEach(item => {
+    result[item.id] = item.name;
+  });
+  return result;
+};
 
 export const filterParameterTypes = (options, parameters) => {
   const newOptions = cloneDeep(options);
 
   // hostparam can be used multiple times
-  const alreadyUsed = parameters.map(item => item["type"]).filter(item => item != 'hostparam');
+  const alreadyUsed = parameters
+    .map(item => item.type)
+    .filter(item => item !== 'hostparam');
 
   // remove already used items
-  alreadyUsed.forEach(item => delete newOptions[item])
+  alreadyUsed.forEach(item => delete newOptions[item]);
 
   return newOptions;
-}
+};

data/webpack/components/ParameterSelection/ParameterSelectionReducer.js

@@ -1,20 +1,13 @@
 import Immutable from 'seamless-immutable';
 
-import {
-  cloneDeep,
-  findIndex,
-  findLastIndex,
-} from 'lodash';
-
-import {
-  filterParameterTypes,
-} from './ParameterSelectionHelper';
+import { cloneDeep, findIndex } from 'lodash';
 
 import * as sort from 'sortabular';
 
+import { filterParameterTypes } from './ParameterSelectionHelper';
+
 import {
   PARAMETER_SELECTION_INIT,
-  PARAMETER_SELECTION_TYPES,
   PARAMETER_SELECTION_LOCK,
   PARAMETER_SELECTION_DELETE,
   PARAMETER_SELECTION_ADD,
@@ -33,6 +26,7 @@ import {
 } from './ParameterSelectionConstants';
 
 export const initialState = Immutable({
+  loading: true,
   editMode: false,
   error: { errorMsg: '', status: '', statusText: '' },
 });
@@ -48,20 +42,33 @@ const parameterSelectionParameters = (state = initialState, action) => {
       let parameters = [];
       let index = 1;
 
-      if ('parameters' in state && state.parameters !== undefined && state.parameters.length > 0) {
+      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, locked: false, name: "", description: '', type: '', value: '', isYaml: false, newEntry: true };
-      if (state.paramType == 'PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE') {
-        newRow['type'] = 'complex';
+      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)
+      newRow.backup = cloneDeep(newRow);
       parameters.push(newRow);
       return state.merge({
         editMode: true,
-        parameters: parameters,
+        parameters,
         editParamsRowIndex: index,
       });
     }
@@ -76,15 +83,20 @@ const parameterSelectionParameters = (state = initialState, action) => {
       }
 
       return state.merge({
-        parameters: parameters
+        parameters,
       });
     }
     case PARAMETER_SELECTION_DELETE: {
-      const parameters = state.parameters.filter(v => v.id !== payload.rowData.id);
+      const parameters = state.parameters.filter(
+        v => v.id !== payload.rowData.id
+      );
       return state.merge({
-        parameters: parameters,
-        parameterTypes: filterParameterTypes(state.allowedParameterTypes, parameters),
-      })
+        parameters,
+        parameterTypes: filterParameterTypes(
+          state.allowedParameterTypes,
+          parameters
+        ),
+      });
     }
     case PARAMETER_SELECTION_EDIT_ACTIVATE: {
       const parameters = cloneDeep(state.parameters);
@@ -93,7 +105,7 @@ const parameterSelectionParameters = (state = initialState, action) => {
       parameters[index].backup = cloneDeep(parameters[index]);
       return state.merge({
         editMode: true,
-        parameters: parameters,
+        parameters,
         editParamsRowIndex: index,
       });
     }
@@ -106,22 +118,25 @@ const parameterSelectionParameters = (state = initialState, action) => {
 
       return state.merge({
         editMode: false,
-        parameterTypes: filterParameterTypes(state.allowedParameterTypes, parameters),
-        parameters: parameters
+        parameterTypes: filterParameterTypes(
+          state.allowedParameterTypes,
+          parameters
+        ),
+        parameters,
       });
     }
     case PARAMETER_SELECTION_EDIT_CHANGE: {
       const parameters = cloneDeep(state.parameters);
       const index = findIndex(parameters, { id: payload.rowData.id });
 
-      if (!parameters[index]['isYaml'] && payload.property == 'value') {
-        parameters[index]['value'] = payload.value;
-      } else if (payload.property != 'value') {
+      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
+        parameters,
+        editParamsRowIndex: index,
       });
     }
     case PARAMETER_SELECTION_EDIT_CANCEL: {
@@ -137,38 +152,38 @@ const parameterSelectionParameters = (state = initialState, action) => {
 
       return state.merge({
         editMode: false,
-        parameters: parameters
+        parameters,
       });
     }
     case PARAMETER_SELECTION_SORT: {
-      const selectedColumn = payload.selectedColumn;
+      const { selectedColumn } = payload;
       return state.set(
         'sortingColumns',
         sort.byColumn({
           sortingColumns: state.sortingColumns,
           sortingOrder: payload.defaultSortingOrder,
-          selectedColumn
+          selectedColumn,
         })
       );
     }
     case PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE: {
       return state.merge({
         error: payload.error,
-        loading: false
+        loading: false,
       });
     }
     case PARAMETER_SELECTION_LOAD_PARAM_DATA_REQUEST: {
       let newState = {};
 
-      if (payload.dataType == PARAMETER_SELECTION_PARAM_TYPE_FOREMAN) {
+      if (payload.dataType === PARAMETER_SELECTION_PARAM_TYPE_FOREMAN) {
         newState = {
           paramData: {},
           hostgroupId: -1,
-          loading: true
+          loading: true,
         };
-      } else if (payload.dataType == PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE) {
+      } else if (payload.dataType === PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE) {
         newState = {
-          loading: true
+          loading: true,
         };
       }
 
@@ -181,7 +196,7 @@ const parameterSelectionParameters = (state = initialState, action) => {
     case PARAMETER_SELECTION_LOAD_PARAM_DATA_SUCCESS: {
       let newState = {};
 
-      if (payload.dataType == PARAMETER_SELECTION_PARAM_TYPE_FOREMAN) {
+      if (payload.dataType === PARAMETER_SELECTION_PARAM_TYPE_FOREMAN) {
         newState = {
           loading: false,
           paramData: payload,
@@ -196,25 +211,24 @@ const parameterSelectionParameters = (state = initialState, action) => {
     }
     case PARAMETER_SELECTION_COMPLEX_DATA_MODAL_CLOSE: {
       let str;
-      let element = document.getElementById('yamlData');
-      if (element != null) {
+      const element = document.getElementById('yamlData');
+      if (element !== null) {
         str = element.value;
-      }
-      else {
+      } else {
         str = '';
       }
       let newState = {};
-      let index = state.editParamsRowIndex;
+      const index = state.editParamsRowIndex;
       const parameters = cloneDeep(state.parameters);
-      if (payload.mode == 'save') {
-        parameters[index]['value'] = str;
-        if (str == '') {
-          parameters[index]['isYaml'] = false;
+      if (payload.mode === 'save') {
+        parameters[index].value = str;
+        if (str === '') {
+          parameters[index].isYaml = false;
         } else {
-          parameters[index]['isYaml'] = true;
+          parameters[index].isYaml = true;
         }
         newState = {
-          parameters: parameters,
+          parameters,
         };
       } else {
         newState = {};