foreman_acd 0.2.1 → 0.7.0

data/webpack/components/ParameterSelection/ParameterSelectionActions.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import * as sort from 'sortabular';
+import { translate as __ } from 'foremanReact/common/I18n';
 
 import {
   actionHeaderCellFormatter,
@@ -16,18 +17,13 @@ import {
 } from 'foremanReact/common/helpers';
 
 import {
-  isNewDefinition,
-  isEditDefinition,
-  isDefinition,
-  isNewInstance,
-  isEditInstance,
-  isInstance,
   filterUsedParameterTypes,
 } from './ParameterSelectionHelper';
 
 import {
   PARAMETER_SELECTION_INIT,
   PARAMETER_SELECTION_TYPES,
+  PARAMETER_SELECTION_LOCK,
   PARAMETER_SELECTION_DELETE,
   PARAMETER_SELECTION_ADD,
   PARAMETER_SELECTION_EDIT_ACTIVATE,
@@ -35,15 +31,20 @@ import {
   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,
+  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';
 
 export const initParameterSelection = (
-  mode,
-  serviceDefinition,
+  paramType,
+  paramDefinition,
   parameters,
+  useDefaultValue,
+  allowNameAdjustment,
+  allowDescriptionAdjustment,
   sortingFormatter,
   sortableTransform,
   inlineEditFormatter,
@@ -57,23 +58,28 @@ export const initParameterSelection = (
         position: 0
     }
   };
-  initialState.serviceDefinition = serviceDefinition;
+  initialState.paramDefinition = paramDefinition;
 
-  let valueLabel = 'Value';
-  if (isDefinition(mode)) {
-    valueLabel = 'Default value';
+  let valueLabel = __('Value');
+  if (useDefaultValue) {
+    valueLabel = __('Default value');
   }
 
-  initialState.columns = [
-    {
+  initialState.columns = []
+  const addToColumns = (obj, idx) => {
+    obj.header.props.index = idx;
+    initialState.columns.push(obj);
+  }
+
+  let idx = 0;
+  addToColumns( {
       property: 'name',
       header: {
-        label: 'Name',
+        label: __('Name'),
         props: {
-          index: 0,
           sort: true,
           style: {
-            width: '20%'
+            width: '25%'
           }
         },
         transforms: [sortableTransform],
@@ -81,18 +87,18 @@ export const initParameterSelection = (
         customFormatters: [sortableHeaderCellFormatter]
       },
       cell: {
-        formatters: [isDefinition(mode) ? inlineEditFormatter : tableCellFormatter]
+        formatters: [allowNameAdjustment ? inlineEditFormatter : tableCellFormatter]
       }
-    },
-    {
+    }, idx++);
+
+  addToColumns( {
       property: 'description',
       header: {
-        label: 'Description',
+        label: __('Description'),
         props: {
-          index: 1,
           sort: true,
           style: {
-            width: '20%'
+            width: '25%'
           }
         },
         transforms: [sortableTransform],
@@ -103,15 +109,16 @@ export const initParameterSelection = (
         props: {
           index: 1
         },
-        formatters: [isDefinition(mode) ? inlineEditFormatter : tableCellFormatter]
+        formatters: [allowDescriptionAdjustment ? inlineEditFormatter : tableCellFormatter]
       }
-    },
-    {
+    }, idx++);
+
+  if (paramType == PARAMETER_SELECTION_PARAM_TYPE_FOREMAN) {
+    addToColumns( {
       property: 'type',
       header: {
-        label: 'Type',
+        label: __('Type'),
         props: {
-          index: 2,
           sort: true,
           style: {
             width: '20%'
@@ -126,13 +133,14 @@ export const initParameterSelection = (
         // the well formatted type name is shown
         formatters: [inlineEditFormatter]
       }
-    },
-    {
+    }, idx++);
+  }
+
+  addToColumns( {
       property: 'value',
       header: {
         label: valueLabel,
         props: {
-          index: 3,
           sort: true,
           style: {
             width: '20%'
@@ -145,15 +153,15 @@ export const initParameterSelection = (
       cell: {
         formatters: [inlineEditFormatter]
       }
-    },
-    {
+    }, idx++);
+
+  addToColumns( {
       property: 'actions',
       header: {
-        label: 'Actions',
+        label: __('Actions'),
         props: {
-          index: 4,
           style: {
-            width: '20%'
+            width: '10%'
           }
         },
         formatters: [actionHeaderCellFormatter]
@@ -161,21 +169,11 @@ export const initParameterSelection = (
       cell: {
         formatters: [inlineEditButtonsFormatter]
       }
-    }
-  ];
+    }, idx++);
 
-  if (isNewDefinition(mode)) {
-    initialState.parameters = [];
-  } else if ((isEditDefinition(mode)) || (isInstance(mode))) {
-    initialState.parameters = parameters;
-    initialState.hostgroupId = serviceDefinition.hostgroup_id;
-  } else {
-    // FIXME: should never ever happen
-  }
+  initialState.parameters = parameters;
 
-  if (isNewDefinition(mode)) {
-    initialState.parameterTypes = PARAMETER_SELECTION_TYPES;
-  } else {
+  if ((paramType == PARAMETER_SELECTION_PARAM_TYPE_FOREMAN) && (parameters)) {
     initialState.parameterTypes = filterUsedParameterTypes(PARAMETER_SELECTION_TYPES, parameters);
   }
 
@@ -187,12 +185,19 @@ export const initParameterSelection = (
 
 const errorHandler = (msg, err) => {
   const error = {
-    errorMsg: 'Failed to fetch data from server.',
+    errorMsg: __('Failed to fetch data from server.'),
     statusText: err,
   };
   return { type: msg, payload: { error } };
 };
 
+export const lockParameter = (additionalData) => ({
+  type: PARAMETER_SELECTION_LOCK,
+  payload: {
+    ...additionalData,
+  },
+});
+
 export const addParameter = (additionalData) => ({
   type: PARAMETER_SELECTION_ADD,
   payload: {
@@ -244,22 +249,23 @@ export const sortParameter = (selectedColumn, defaultSortingOrder) => ({
   },
 });
 
-export const loadForemanData = (
-  hostgroupId,
-  additionalData,
-) => dispatch => {
-  dispatch({ type: PARAMETER_SELECTION_LOAD_FOREMAN_DATA_REQUEST, payload: { clearParameters: additionalData.clearParameters } });
+export const loadParamData = (attr) => dispatch => {
+  dispatch( { type: PARAMETER_SELECTION_LOAD_PARAM_DATA_REQUEST, payload: { dataType: attr.dataType, clearParameters: attr.clearParameters } });
 
-  const realUrl = additionalData.url.replace("__id__", hostgroupId);
+  let realUrl = attr.url.replace("__id__", attr.paramDefinition.dataId);
+
+  if (attr.paramDefinition.hasOwnProperty('dataSubId')) {
+    realUrl = realUrl.replace("__subid__", attr.paramDefinition.dataSubId);
+  }
 
   return api
     .get(realUrl, {}, {})
     .then(({ data }) =>
       dispatch({
-        type: PARAMETER_SELECTION_LOAD_FOREMAN_DATA_SUCCESS,
-        payload: data,
+        type: PARAMETER_SELECTION_LOAD_PARAM_DATA_SUCCESS,
+        payload: { ...data, dataType: attr.dataType }
       })
     )
-    .catch(error => dispatch(errorHandler(PARAMETER_SELECTION_LOAD_FOREMAN_DATA_FAILURE, error)));
+    .catch(error => dispatch(errorHandler(PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE, error)));
 };
 

data/webpack/components/ParameterSelection/ParameterSelectionConstants.js

@@ -1,4 +1,5 @@
 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';
@@ -6,9 +7,11 @@ export const PARAMETER_SELECTION_EDIT_CONFIRM = 'PARAMETER_SELECTION_EDIT_CONFIR
 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_FOREMAN_DATA_REQUEST = 'PARAMETER_SELECTION_LOAD_FOREMAN_DATA_REQUEST';
-export const PARAMETER_SELECTION_LOAD_FOREMAN_DATA_SUCCESS = 'PARAMETER_SELECTION_LOAD_FOREMAN_DATA_SUCCESS';
-export const PARAMETER_SELECTION_LOAD_FOREMAN_DATA_FAILURE = 'PARAMETER_SELECTION_LOAD_FOREMAN_DATA_FAILURE';
+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';
 
 // Make sure the object is sorted by value
 //   (Compute Profile -> Partition table -> Root password)

data/webpack/components/ParameterSelection/ParameterSelectionHelper.js

@@ -2,38 +2,6 @@ import {
   cloneDeep,
 } from 'lodash';
 
-export const isNewDefinition = (mode) => {
-  if (mode == "newDefinition")
-    return true;
-  return false;
-}
-
-export const isEditDefinition = (mode) => {
-  if (mode == "editDefinition")
-    return true;
-  return false;
-}
-
-export const isDefinition = (mode) => {
-  return (isNewDefinition(mode) || isEditDefinition(mode))
-}
-
-export const isNewInstance = (mode) => {
-  if (mode == "newInstance")
-    return true;
-  return false;
-}
-
-export const isEditInstance = (mode) => {
-  if (mode == "editInstance")
-    return true;
-  return false;
-}
-
-export const isInstance = (mode) => {
-  return (isNewInstance(mode) || isEditInstance(mode))
-}
-
 export const transformForemanData = (fdata) => {
   if (fdata === undefined) {
     return "";

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,15 +23,13 @@ import {
   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,
+  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,
 } from './ParameterSelectionConstants';
 
-import {
-  APPLICATION_DEFINITION_PARAMETER_SELECTION_MODAL_CLOSE,
-} from '../ApplicationDefinition/ApplicationDefinitionConstants';
-
 export const initialState = Immutable({
   editMode: false,
   error: { errorMsg: '', status: '', statusText: '' },
@@ -52,7 +51,7 @@ 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: '', newEntry: true };
       newRow.backup = cloneDeep(newRow)
       parameters.push(newRow);
 
@@ -61,6 +60,20 @@ const parameterSelectionParameters = (state = initialState, action) => {
         parameters: parameters
       });
     }
+    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
+      });
+    }
     case PARAMETER_SELECTION_DELETE: {
       const parameters = state.parameters.filter(v => v.id !== payload.rowData.id);
       return state.merge({
@@ -127,18 +140,26 @@ const parameterSelectionParameters = (state = initialState, action) => {
         })
       );
     }
-    case PARAMETER_SELECTION_LOAD_FOREMAN_DATA_FAILURE: {
+    case PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE: {
       return state.merge({
         error: payload.error,
         loading: false
       });
     }
-    case PARAMETER_SELECTION_LOAD_FOREMAN_DATA_REQUEST: {
-      const newState = {
-        foremanData: {},
-        hostgroupId: -1,
-        loading: true
-      };
+    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: [] });
@@ -146,27 +167,18 @@ const parameterSelectionParameters = (state = initialState, action) => {
 
       return state.merge(newState);
     }
-    case PARAMETER_SELECTION_LOAD_FOREMAN_DATA_SUCCESS: {
-      return state.merge({
-        loading: false,
-        foremanData: payload,
-        hostgroupId: payload.hostgroup_id,
-      });
-    }
-    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);
-        }
-      });
+    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({
-        editMode: false,
-        parameters: parameters
-      });
+      return state.merge(newState);
     }
     default:
       return state;

data/webpack/components/ParameterSelection/ParameterSelectionSelectors.js

@@ -2,10 +2,10 @@ 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 selectParameters = state => parameterState(state).parameters;
 export const selectSortingColumns = state => parameterState(state).sortingColumns;
 export const selectColumns = state => parameterState(state).columns;
-export const selectServiceDefinition = state => parameterState(state).serviceDefinition;
+export const selectParamDefinition = state => parameterState(state).paramDefinition;
 export const selectHostgroupId = state => parameterState(state).hostgroupId;