foreman_acd 0.9.5 → 0.10.0

data/webpack/components/ApplicationDefinition/ApplicationDefinitionActions.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import api from 'foremanReact/API';
 
 import {
@@ -6,14 +5,7 @@ import {
   setModalClosed,
 } from 'foremanReact/components/ForemanModal/ForemanModalActions';
 
-import {
-  actionHeaderCellFormatter,
-} from 'patternfly-react';
-
-import {
-  propsToSnakeCase,
-  propsToCamelCase,
-} from 'foremanReact/common/helpers';
+import { actionHeaderCellFormatter } from 'patternfly-react';
 
 import {
   APPLICATION_DEFINITION_INIT,
@@ -34,13 +26,9 @@ import {
   APPLICATION_DEFINITION_CHANGE_PARAMETER_SELECTION_MODE,
 } from './ApplicationDefinitionConstants';
 
-import {
-  supportedPluginsToHiddenParameterTypes,
-} from '../../helper';
+import { supportedPluginsToHiddenParameterTypes } from '../../helper';
 
-import {
-  transformAnsiblePlaybook,
-} from './ApplicationDefinitionHelper';
+import { transformAnsiblePlaybook } from './ApplicationDefinitionHelper';
 
 export const initApplicationDefinition = (
   ansiblePlaybook,
@@ -49,7 +37,7 @@ export const initApplicationDefinition = (
   supportedPlugins,
   headerFormatter,
   inlineEditFormatter,
-  inlineEditButtonsFormatter,
+  inlineEditButtonsFormatter
 ) => dispatch => {
   const initialState = {};
 
@@ -62,13 +50,13 @@ export const initApplicationDefinition = (
         props: {
           index: 0,
           style: {
-            width: '15%'
-          }
+            width: '15%',
+          },
         },
       },
       cell: {
-        formatters: [inlineEditFormatter]
-      }
+        formatters: [inlineEditFormatter],
+      },
     },
     {
       property: 'description',
@@ -78,13 +66,13 @@ export const initApplicationDefinition = (
         props: {
           index: 1,
           style: {
-            width: '10%'
-          }
+            width: '10%',
+          },
         },
       },
       cell: {
-        formatters: [inlineEditFormatter]
-      }
+        formatters: [inlineEditFormatter],
+      },
     },
     {
       property: 'hostgroup',
@@ -94,13 +82,13 @@ export const initApplicationDefinition = (
         props: {
           index: 2,
           style: {
-            width: '20%'
-          }
+            width: '20%',
+          },
         },
       },
       cell: {
-        formatters: [inlineEditFormatter]
-      }
+        formatters: [inlineEditFormatter],
+      },
     },
     {
       property: 'ansibleGroup',
@@ -110,13 +98,13 @@ export const initApplicationDefinition = (
         props: {
           index: 3,
           style: {
-            width: '20%'
-          }
+            width: '20%',
+          },
         },
       },
       cell: {
-        formatters: [inlineEditFormatter]
-      }
+        formatters: [inlineEditFormatter],
+      },
     },
     {
       property: 'minCount',
@@ -126,13 +114,13 @@ export const initApplicationDefinition = (
         props: {
           index: 4,
           style: {
-            width: '10%'
-          }
+            width: '10%',
+          },
         },
       },
       cell: {
-        formatters: [inlineEditFormatter]
-      }
+        formatters: [inlineEditFormatter],
+      },
     },
     {
       property: 'maxCount',
@@ -142,13 +130,13 @@ export const initApplicationDefinition = (
         props: {
           index: 5,
           style: {
-            width: '10%'
-          }
+            width: '10%',
+          },
         },
       },
       cell: {
-        formatters: [inlineEditFormatter]
-      }
+        formatters: [inlineEditFormatter],
+      },
     },
     {
       property: 'actions',
@@ -158,14 +146,14 @@ export const initApplicationDefinition = (
         props: {
           index: 6,
           style: {
-            width: '15%'
-          }
+            width: '15%',
+          },
         },
       },
       cell: {
-        formatters: [inlineEditButtonsFormatter]
-      }
-    }
+        formatters: [inlineEditButtonsFormatter],
+      },
+    },
   ];
 
   if (ansiblePlaybook !== undefined) {
@@ -173,7 +161,9 @@ export const initApplicationDefinition = (
   }
   initialState.services = services;
   initialState.ansibleVarsAll = ansibleVarsAll;
-  initialState.hiddenForemanParameterTypes = supportedPluginsToHiddenParameterTypes(supportedPlugins);
+  initialState.hiddenForemanParameterTypes = supportedPluginsToHiddenParameterTypes(
+    supportedPlugins
+  );
 
   dispatch({
     type: APPLICATION_DEFINITION_INIT,
@@ -191,65 +181,71 @@ const errorHandler = (msg, err) => {
 
 export const closeAlertModal = () => ({
   type: APPLICATION_DEFINITION_CLOSE_ALERT_MODAL,
-  payload: {}
+  payload: {},
 });
 
 export const loadAnsibleData = (
   ansiblePlaybookId,
   additionalData
-) => dispatch => {
+) => async dispatch => {
   dispatch({ type: APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_REQUEST });
 
-  const baseUrl = additionalData.url;
-  const realUrl = baseUrl.replace("__id__", ansiblePlaybookId);
+  try {
+    const baseUrl = additionalData.url;
+    const realUrl = baseUrl.replace('__id__', ansiblePlaybookId);
+
+    const { data } = await api.get(realUrl, {}, {});
 
-  return api
-    .get(realUrl, {}, {})
-    .then(({ data }) =>
-      dispatch({
-        type: APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_SUCCESS,
-        payload: { ...data }
-      })
-    )
-    .catch(error => dispatch(errorHandler(APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_FAILURE, error)));
+    dispatch({
+      type: APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_SUCCESS,
+      payload: { ...data },
+    });
+  } catch (error) {
+    dispatch(
+      errorHandler(APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_FAILURE, error)
+    );
+  }
 };
 
-export const addApplicationDefinitionService = (additionalData) => ({
+export const addApplicationDefinitionService = additionalData => ({
   type: APPLICATION_DEFINITION_SERVICE_ADD,
   payload: {
     ...additionalData,
   },
 });
 
-export const deleteApplicationDefinitionService = (additionalData) => ({
+export const deleteApplicationDefinitionService = additionalData => ({
   type: APPLICATION_DEFINITION_SERVICE_DELETE,
   payload: {
     ...additionalData,
   },
 });
 
-export const activateEditApplicationDefinitionService = (additionalData) => ({
+export const activateEditApplicationDefinitionService = additionalData => ({
   type: APPLICATION_DEFINITION_SERVICE_EDIT_ACTIVATE,
   payload: {
     ...additionalData,
   },
 });
 
-export const confirmEditApplicationDefinitionService = (rowData) => ({
+export const confirmEditApplicationDefinitionService = rowData => ({
   type: APPLICATION_DEFINITION_SERVICE_EDIT_CONFIRM,
   payload: {
     ...rowData,
   },
 });
 
-export const cancelEditApplicationDefinitionService = (rowData) => ({
+export const cancelEditApplicationDefinitionService = rowData => ({
   type: APPLICATION_DEFINITION_SERVICE_EDIT_CANCEL,
   payload: {
     ...rowData,
   },
 });
 
-export const changeEditApplicationDefinitionService = (value, additionalData) => ({
+export const changeEditApplicationDefinitionService = (
+  value,
+  additionalData
+) => ({
   type: APPLICATION_DEFINITION_SERVICE_EDIT_CHANGE,
   payload: {
     value,
@@ -257,59 +253,51 @@ export const changeEditApplicationDefinitionService = (value, additionalData) =>
   },
 });
 
-export const openForemanParameterSelectionModal = (additionalData) => dispatch => {
+export const openForemanParameterSelectionModal = additionalData => dispatch => {
   dispatch({
     type: APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN,
     payload: {
       ...additionalData,
-    }
+    },
   });
-  dispatch(
-    setModalOpen({ id: 'AppDefinitionForemanParamSelection' })
-  );
-}
+  dispatch(setModalOpen({ id: 'AppDefinitionForemanParamSelection' }));
+};
 
-export const closeForemanParameterSelectionModal = (additionalData) => dispatch => {
+export const closeForemanParameterSelectionModal = additionalData => dispatch => {
   dispatch({
     type: APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE,
     payload: {
       ...additionalData,
-    }
+    },
   });
 
-  dispatch(
-    setModalClosed({ id: 'AppDefinitionForemanParamSelection' })
-  );
-}
+  dispatch(setModalClosed({ id: 'AppDefinitionForemanParamSelection' }));
+};
 
-export const openAnsibleParameterSelectionModal = (additionalData) => dispatch => {
+export const openAnsibleParameterSelectionModal = additionalData => dispatch => {
   dispatch({
     type: APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN,
     payload: {
       ...additionalData,
-    }
+    },
   });
-  dispatch(
-    setModalOpen({ id: 'AppDefinitionAnsibleParamSelection' })
-  );
-}
+  dispatch(setModalOpen({ id: 'AppDefinitionAnsibleParamSelection' }));
+};
 
-export const closeAnsibleParameterSelectionModal = (additionalData) => dispatch => {
+export const closeAnsibleParameterSelectionModal = additionalData => dispatch => {
   dispatch({
     type: APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE,
     payload: {
       ...additionalData,
-    }
+    },
   });
 
-  dispatch(
-    setModalClosed({ id: 'AppDefinitionAnsibleParamSelection' })
-  );
-}
+  dispatch(setModalClosed({ id: 'AppDefinitionAnsibleParamSelection' }));
+};
 
-export const changeParameterSelectionMode = (additionalData) => ({
+export const changeParameterSelectionMode = additionalData => ({
   type: APPLICATION_DEFINITION_CHANGE_PARAMETER_SELECTION_MODE,
   payload: {
     ...additionalData,
   },
-})
+});

data/webpack/components/ApplicationDefinition/ApplicationDefinitionConstants.js

@@ -1,16 +1,31 @@
 export const APPLICATION_DEFINITION_INIT = 'INIT_APPLICATION_DEFINITION_INIT';
-export const APPLICATION_DEFINITION_CLOSE_ALERT_MODAL = 'APPLICATION_DEFINITION_CLOSE_ALERT_MODAL';
-export const APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_REQUEST = 'APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_REQUEST';
-export const APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_SUCCESS = 'APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_SUCCESS';
-export const APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_FAILURE = 'APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_FAILURE';
-export const APPLICATION_DEFINITION_SERVICE_DELETE = 'APPLICATION_DEFINITION_SERVICE_DELETE';
-export const APPLICATION_DEFINITION_SERVICE_ADD = 'APPLICATION_DEFINITION_SERVICE_ADD';
-export const APPLICATION_DEFINITION_SERVICE_EDIT_ACTIVATE = 'APPLICATION_DEFINITION_SERVICE_EDIT_ACTIVATE';
-export const APPLICATION_DEFINITION_SERVICE_EDIT_CONFIRM = 'APPLICATION_DEFINITION_SERVICE_EDIT_CONFIRM';
-export const APPLICATION_DEFINITION_SERVICE_EDIT_CHANGE = 'APPLICATION_DEFINITION_SERVICE_EDIT_CHANGE';
-export const APPLICATION_DEFINITION_SERVICE_EDIT_CANCEL = 'APPLICATION_DEFINITION_SERVICE_EDIT_CANCEL';
-export const APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN = 'APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN';
-export const APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE = 'APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE';
-export const APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN = 'APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN';
-export const APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE = 'APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE';
-export const APPLICATION_DEFINITION_CHANGE_PARAMETER_SELECTION_MODE = 'APPLICATION_DEFINITION_CHANGE_PARAMETER_SELECTION_MODE';
+export const APPLICATION_DEFINITION_CLOSE_ALERT_MODAL =
+  'APPLICATION_DEFINITION_CLOSE_ALERT_MODAL';
+export const APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_REQUEST =
+  'APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_REQUEST';
+export const APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_SUCCESS =
+  'APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_SUCCESS';
+export const APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_FAILURE =
+  'APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_FAILURE';
+export const APPLICATION_DEFINITION_SERVICE_DELETE =
+  'APPLICATION_DEFINITION_SERVICE_DELETE';
+export const APPLICATION_DEFINITION_SERVICE_ADD =
+  'APPLICATION_DEFINITION_SERVICE_ADD';
+export const APPLICATION_DEFINITION_SERVICE_EDIT_ACTIVATE =
+  'APPLICATION_DEFINITION_SERVICE_EDIT_ACTIVATE';
+export const APPLICATION_DEFINITION_SERVICE_EDIT_CONFIRM =
+  'APPLICATION_DEFINITION_SERVICE_EDIT_CONFIRM';
+export const APPLICATION_DEFINITION_SERVICE_EDIT_CHANGE =
+  'APPLICATION_DEFINITION_SERVICE_EDIT_CHANGE';
+export const APPLICATION_DEFINITION_SERVICE_EDIT_CANCEL =
+  'APPLICATION_DEFINITION_SERVICE_EDIT_CANCEL';
+export const APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN =
+  'APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN';
+export const APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE =
+  'APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE';
+export const APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN =
+  'APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN';
+export const APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE =
+  'APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE';
+export const APPLICATION_DEFINITION_CHANGE_PARAMETER_SELECTION_MODE =
+  'APPLICATION_DEFINITION_CHANGE_PARAMETER_SELECTION_MODE';

data/webpack/components/ApplicationDefinition/ApplicationDefinitionHelper.js

@@ -1,22 +1,22 @@
 export function transformAnsiblePlaybook(playbook) {
-
-  const ansiblePlaybook = new Object;
-  ansiblePlaybook.id = playbook.id;
-  ansiblePlaybook.name = playbook.name;
-  ansiblePlaybook.groups = {};
+  const ansiblePlaybook = {
+    id: playbook.id,
+    name: playbook.name,
+    groups: {},
+  };
 
   if (playbook.hasOwnProperty('groups')) {
-    Object.entries(playbook.groups).forEach(([group_name,group_vars]) => {
-      ansiblePlaybook.groups[group_name] = [];
+    Object.entries(playbook.groups).forEach(([groupName, groupVars]) => {
+      ansiblePlaybook.groups[groupName] = [];
 
-      let id=0;
-      Object.entries(group_vars).forEach(([var_name,var_value]) => {
-        let entry = {
-          id: id,
-          name: var_name,
-          value: var_value
-        }
-        ansiblePlaybook.groups[group_name].push(entry);
+      let id = 0;
+      Object.entries(groupVars).forEach(([varName, varValue]) => {
+        const entry = {
+          id,
+          name: varName,
+          value: varValue,
+        };
+        ansiblePlaybook.groups[groupName].push(entry);
         id += 1;
       });
     });