foreman_acd 0.0.6 → 0.6.0

data/webpack/components/ParameterSelection/ParameterSelection.scss

@@ -1 +1,10 @@
 @import '~@theforeman/vendor/scss/variables';
+
+.param_selection_modal {
+    margin-top: 0;
+    margin-bottom: 0;
+    height: 100%;
+    width: 80%;
+    max-width: none !important;
+}
+

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,37 +17,34 @@ import {
 } from 'foremanReact/common/helpers';
 
 import {
-  isNewDefinition,
-  isEditDefinition,
-  isDefinition,
-  isNewInstance,
-  isEditInstance,
-  isInstance,
   filterUsedParameterTypes,
 } from './ParameterSelectionHelper';
 
 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';
 
 export const initParameterSelection = (
-  mode,
-  appDefinition,
+  paramType,
+  paramDefinition,
   parameters,
+  useDefaultValue,
+  allowNameAdjustment,
+  allowDescriptionAdjustment,
   sortingFormatter,
   sortableTransform,
   inlineEditFormatter,
@@ -60,23 +58,28 @@ export const initParameterSelection = (
         position: 0
     }
   };
-  initialState.appDefinition = appDefinition;
+  initialState.paramDefinition = paramDefinition;
 
-  var 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],
@@ -84,15 +87,15 @@ 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: '25%'
@@ -106,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%'
@@ -125,23 +129,21 @@ export const initParameterSelection = (
         customFormatters: [sortableHeaderCellFormatter]
       },
       cell: {
-        props: {
-          index: 2
-        },
         // we are always using the inlineEditFormatter so that
         // the well formatted type name is shown
         formatters: [inlineEditFormatter]
       }
-    },
-    {
+    }, idx++);
+  }
+
+  addToColumns( {
       property: 'value',
       header: {
         label: valueLabel,
         props: {
-          index: 3,
           sort: true,
           style: {
-            width: '25%'
+            width: '20%'
           }
         },
         transforms: [sortableTransform],
@@ -149,96 +151,90 @@ export const initParameterSelection = (
         customFormatters: [sortableHeaderCellFormatter]
       },
       cell: {
-        props: {
-          index: 3
-        },
         formatters: [inlineEditFormatter]
       }
-    },
-    {
+    }, idx++);
+
+  addToColumns( {
       property: 'actions',
       header: {
-        label: 'Actions',
+        label: __('Actions'),
         props: {
-          index: 4
+          style: {
+            width: '10%'
+          }
         },
         formatters: [actionHeaderCellFormatter]
       },
       cell: {
-        props: {
-          index: 4
-        },
         formatters: [inlineEditButtonsFormatter]
       }
-    }
-  ];
+    }, idx++);
 
-  if ((isNewDefinition(mode)) || (isNewInstance(mode))) {
-    initialState.rows = [];
-  } else if ((isEditDefinition(mode)) || (isEditInstance(mode))) {
-    initialState.rows = parameters;
-    initialState.hostgroupId = appDefinition.hostgroup_id;
-  } else {
-    // FIXME: should never ever happen
-  }
+  initialState.parameters = parameters;
 
-  if (isNewDefinition(mode) || isNewInstance(mode)) {
-    initialState.parameterTypes = PARAMETER_TYPES;
-  } else {
-    initialState.parameterTypes = filterUsedParameterTypes(PARAMETER_TYPES, parameters);
+  if ((paramType == PARAMETER_SELECTION_PARAM_TYPE_FOREMAN) && (parameters)) {
+    initialState.parameterTypes = filterUsedParameterTypes(PARAMETER_SELECTION_TYPES, parameters);
   }
 
   dispatch({
-    type: INIT_PARAMETER_SELECTION,
+    type: PARAMETER_SELECTION_INIT,
     payload: initialState,
   });
 }
 
 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_ADD,
+  type: PARAMETER_SELECTION_ADD,
   payload: {
     ...additionalData,
   },
 });
 
 export const deleteParameter = (additionalData) => ({
-  type: PARAMETER_DELETE,
+  type: PARAMETER_SELECTION_DELETE,
   payload: {
     ...additionalData,
   },
 });
 
 export const activateEditParameter = (additionalData) => ({
-  type: PARAMETER_EDIT_ACTIVATE,
+  type: PARAMETER_SELECTION_EDIT_ACTIVATE,
   payload: {
     ...additionalData,
   },
 });
 
 export const confirmEditParameter = (rowData) => ({
-  type: PARAMETER_EDIT_CONFIRM,
+  type: PARAMETER_SELECTION_EDIT_CONFIRM,
   payload: {
     ...rowData,
   },
 });
 
 export const cancelEditParameter = (rowData) => ({
-  type: PARAMETER_EDIT_CANCEL,
+  type: PARAMETER_SELECTION_EDIT_CANCEL,
   payload: {
     ...rowData,
   },
 });
 
 export const changeEditParameter = (value, additionalData) => ({
-  type: PARAMETER_EDIT_CHANGE,
+  type: PARAMETER_SELECTION_EDIT_CHANGE,
   payload: {
     value,
     ...additionalData,
@@ -246,49 +242,30 @@ export const changeEditParameter = (value, additionalData) => ({
 });
 
 export const sortParameter = (selectedColumn, defaultSortingOrder) => ({
-  type: PARAMETER_SORT,
+  type: PARAMETER_SELECTION_SORT,
   payload: {
     selectedColumn,
     defaultSortingOrder,
   },
 });
 
-export const loadParameterSelection = (
-  url,
-  applicationDefinitionId
-) => dispatch => {
-  dispatch({ type: LOAD_PARAMETER_SELECTION_REQUEST });
+export const loadParamData = (attr) => dispatch => {
+  dispatch( { type: PARAMETER_SELECTION_LOAD_PARAM_DATA_REQUEST, payload: { dataType: attr.dataType, clearParameters: attr.clearParameters } });
 
-  var realUrl = url.replace("__id__", applicationDefinitionId);
+  let realUrl = attr.url.replace("__id__", attr.paramDefinition.dataId);
 
-  return api
-    .get(realUrl, {}, {})
-    .then(({ data }) =>
-      dispatch({
-        type: LOAD_PARAMETER_SELECTION_SUCCESS,
-        payload: data,
-      })
-    )
-    .catch(error => dispatch(errorHandler(LOAD_PARAMETER_SELECTION_FAILURE, error)));
-};
-
-export const loadForemanData = (
-  url,
-  hostgroupId,
-  clearRows = false,
-) => dispatch => {
-  dispatch({ type: LOAD_FOREMAN_DATA_REQUEST, payload: { clearRows: clearRows } });
-
-  var realUrl = url.replace("__id__", hostgroupId);
+  if (attr.paramDefinition.hasOwnProperty('dataSubId')) {
+    realUrl = realUrl.replace("__subid__", attr.paramDefinition.dataSubId);
+  }
 
   return api
     .get(realUrl, {}, {})
     .then(({ data }) =>
       dispatch({
-        type: LOAD_FOREMAN_DATA_SUCCESS,
-        payload: data,
+        type: PARAMETER_SELECTION_LOAD_PARAM_DATA_SUCCESS,
+        payload: { ...data, dataType: attr.dataType }
       })
     )
-    .catch(error => dispatch(errorHandler(LOAD_FOREMAN_DATA_FAILURE, error)));
+    .catch(error => dispatch(errorHandler(PARAMETER_SELECTION_LOAD_PARAM_DATA_FAILURE, error)));
 };
 

data/webpack/components/ParameterSelection/ParameterSelectionConstants.js

@@ -1,27 +1,23 @@
-export const INIT_PARAMETER_SELECTION = 'INIT_PARAMETER_SELECTION';
-
-export const PARAMETER_DELETE = 'PARAMETER_DELETE';
-export const PARAMETER_ADD = 'PARAMETER_ADD';
-export const PARAMETER_EDIT_ACTIVATE = 'PARAMETER_EDIT_ACTIVATE';
-export const PARAMETER_EDIT_CONFIRM = 'PARAMETER_EDIT_CONFIRM';
-export const PARAMETER_EDIT_CHANGE = 'PARAMETER_EDIT_CHANGE';
-export const PARAMETER_EDIT_CANCEL = 'PARAMETER_EDIT_CANCEL';
-export const PARAMETER_SORT = 'PARAMETER_SORT';
-
-export const LOAD_PARAMETER_SELECTION_REQUEST = 'LOAD_PARAMETER_SELECTION_REQUEST';
-export const LOAD_PARAMETER_SELECTION_SUCCESS = 'LOAD_PARAMETER_SELECTION_SUCCESS';
-export const LOAD_PARAMETER_SELECTION_FAILURE = 'LOAD_PARAMETER_SELECTION_FAILURE';
-
-export const LOAD_FOREMAN_DATA_REQUEST = 'LOAD_FOREMAN_DATA_REQUEST';
-export const LOAD_FOREMAN_DATA_SUCCESS = 'LOAD_FOREMAN_DATA_SUCCESS';
-export const LOAD_FOREMAN_DATA_FAILURE = 'LOAD_FOREMAN_DATA_FAILURE';
+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_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';
 
 // Make sure the object is sorted by value
 //   (Compute Profile -> Partition table -> Root password)
-export const PARAMETER_TYPES = {
+export const PARAMETER_SELECTION_TYPES = {
   computeprofile: 'Compute profile',
   domain: 'Domain',
-  hostname: 'Hostname',
   hostparam: 'Host parameter',
   ip: 'IP',
   lifecycleenv: 'Lifecycle environment',

data/webpack/components/ParameterSelection/ParameterSelectionHelper.js

@@ -2,51 +2,19 @@ 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 "";
   }
-  var result = {};
+  const result = {};
   fdata.map(item => result[item.id] = item.name)
   return (result);
 }
 
 export const filterUsedParameterTypes = (options, parameters) => {
-  var newOptions = cloneDeep(options);
+  const newOptions = cloneDeep(options);
   // hostparam can be used multiple times
-  var alreadyUsed = parameters.map(item => item["type"]).filter(item => item != 'hostparam');
+  const alreadyUsed = parameters.map(item => item["type"]).filter(item => item != 'hostparam');
   alreadyUsed.forEach(item => delete newOptions[item])
   return newOptions;
 }