foreman_acd 0.9.7 → 0.10.0

data/webpack/components/ApplicationDefinition/ApplicationDefinitionReducer.js

@@ -1,11 +1,7 @@
 import Immutable from 'seamless-immutable';
 import { translate as __ } from 'foremanReact/common/I18n';
 
-import {
-  cloneDeep,
-  findIndex,
-  findLastIndex,
-} from 'lodash';
+import { cloneDeep, findIndex } from 'lodash';
 
 import {
   APPLICATION_DEFINITION_INIT,
@@ -31,9 +27,7 @@ import {
   PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE,
 } from '../ParameterSelection/ParameterSelectionConstants';
 
-import {
-  transformAnsiblePlaybook,
-} from './ApplicationDefinitionHelper';
+import { transformAnsiblePlaybook } from './ApplicationDefinitionHelper';
 
 export const initialState = Immutable({
   name: false,
@@ -54,9 +48,14 @@ const applicationDefinitionConf = (state = initialState, action) => {
         alertModalText: '',
       });
     }
-   case APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_FAILURE: {
-      console.log("Error while loading ansible data: "+ payload.error);
-      return state.merge({ error: payload.error, loading: false });
+    case APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_FAILURE: {
+      return state.merge({
+        showAlertModal: true,
+        alertModalTitle: __('Error'),
+        alertModalText:
+          __('Failed to load Playbooks: ') + payload.error.errorMsg,
+        loading: false,
+      });
     }
     case APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_REQUEST: {
       return state.set('loading', true);
@@ -68,13 +67,14 @@ const applicationDefinitionConf = (state = initialState, action) => {
       const ansiblePlaybook = transformAnsiblePlaybook(payload);
 
       if (ansiblePlaybook.hasOwnProperty('groups')) {
-        allVars = ansiblePlaybook.groups['all']
+        allVars = ansiblePlaybook.groups.all;
       }
 
       newState = {
-        ansiblePlaybook: ansiblePlaybook,
-        ansibleVarsAll: allVars
-      }
+        ansiblePlaybook,
+        ansibleVarsAll: allVars,
+        loading: false,
+      };
 
       return state.merge(newState);
     }
@@ -82,27 +82,40 @@ const applicationDefinitionConf = (state = initialState, action) => {
       let services = [];
       let index = 1;
 
-      if ('services' in state && state.services !== undefined && state.services.length > 0) {
+      if (
+        'services' in state &&
+        state.services !== undefined &&
+        state.services.length > 0
+      ) {
         services = cloneDeep(state.services);
         index = Math.max(...services.map(e => e.id)) + 1;
       }
 
-      const newRow = { id: index, name: "", description: '', hostgroup: '',
-                       ansibleGroup: '', minCount: '', maxCount: '',
-                       foremanParameters: [], ansibleParameters: [], newEntry: true };
-      newRow.backup = cloneDeep(newRow)
+      const newRow = {
+        id: index,
+        name: '',
+        description: '',
+        hostgroup: '',
+        ansibleGroup: '',
+        minCount: '',
+        maxCount: '',
+        foremanParameters: [],
+        ansibleParameters: [],
+        newEntry: true,
+      };
+      newRow.backup = cloneDeep(newRow);
       services.push(newRow);
 
       return state.merge({
         editMode: true,
-        services: services
+        services,
       });
     }
     case APPLICATION_DEFINITION_SERVICE_DELETE: {
       const services = state.services.filter(v => v.id !== payload.rowData.id);
       return state.merge({
-        services: services,
-      })
+        services,
+      });
     }
     case APPLICATION_DEFINITION_SERVICE_EDIT_ACTIVATE: {
       const services = cloneDeep(state.services);
@@ -112,7 +125,7 @@ const applicationDefinitionConf = (state = initialState, action) => {
 
       return state.merge({
         editMode: true,
-        services: services
+        services,
       });
     }
     case APPLICATION_DEFINITION_SERVICE_EDIT_CONFIRM: {
@@ -121,51 +134,61 @@ const applicationDefinitionConf = (state = initialState, action) => {
 
       const thisService = services[index];
 
-      if (thisService.name == '') {
+      if (thisService.name === '') {
         return state.merge({
           showAlertModal: true,
-          alertModalTitle: __("Error"),
-          alertModalText: __("Every service needs to have a valid name."),
+          alertModalTitle: __('Error'),
+          alertModalText: __('Every service needs to have a valid name.'),
         });
       }
 
-      if (thisService.hostgroup == '') {
+      if (thisService.hostgroup === '') {
         return state.merge({
           showAlertModal: true,
-          alertModalTitle: __("Error"),
-          alertModalText: __("Every service needs to be assigned to a hostgroup."),
+          alertModalTitle: __('Error'),
+          alertModalText: __(
+            'Every service needs to be assigned to a hostgroup.'
+          ),
         });
       }
 
-      if (thisService.ansibleGroup == '') {
+      if (thisService.ansibleGroup === '') {
         return state.merge({
           showAlertModal: true,
-          alertModalTitle: __("Error"),
-          alertModalText: __("Every service needs to be assigned to an ansible group."),
+          alertModalTitle: __('Error'),
+          alertModalText: __(
+            'Every service needs to be assigned to an ansible group.'
+          ),
         });
       }
 
-      if (state.services.filter(v => v.name === thisService.name && v.id != thisService.id).length > 0) {
+      if (
+        state.services.filter(
+          v => v.name === thisService.name && v.id !== thisService.id
+        ).length > 0
+      ) {
         return state.merge({
           showAlertModal: true,
-          alertModalTitle: __("Error"),
-          alertModalText: __("Service name already used in this Application Definition. Please make sure that every service name is unique."),
+          alertModalTitle: __('Error'),
+          alertModalText: __(
+            'Service name already used in this Application Definition. Please make sure that every service name is unique.'
+          ),
         });
       }
 
       delete services[index].backup;
       delete services[index].newEntry;
 
-      let ansibleParameters = [];
       const selectedGroup = services[index].ansibleGroup;
 
       if (selectedGroup) {
-        services[index].ansibleParameters = state.ansiblePlaybook.groups[selectedGroup];
+        services[index].ansibleParameters =
+          state.ansiblePlaybook.groups[selectedGroup];
       }
 
       return state.merge({
         editMode: false,
-        services: services,
+        services,
       });
     }
     case APPLICATION_DEFINITION_SERVICE_EDIT_CHANGE: {
@@ -189,17 +212,17 @@ const applicationDefinitionConf = (state = initialState, action) => {
 
       return state.merge({
         editMode: false,
-        services: services
+        services,
       });
     }
     case APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN: {
-      let parametersData = {};
+      const parametersData = {};
 
       parametersData.paramDefinition = {
         id: payload.rowData.id,
         name: payload.rowData.name,
-        dataId: payload.rowData.hostgroup
-      }
+        dataId: payload.rowData.hostgroup,
+      };
 
       parametersData.type = PARAMETER_SELECTION_PARAM_TYPE_FOREMAN;
       parametersData.parameters = payload.rowData.foremanParameters;
@@ -209,39 +232,42 @@ const applicationDefinitionConf = (state = initialState, action) => {
       parametersData.allowDescriptionAdjustment = true;
 
       return state.merge({
-        parametersData: parametersData,
+        parametersData,
       });
     }
     case APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE: {
-      if (payload.mode == 'save') {
+      if (payload.mode === 'save') {
         const services = cloneDeep(state.services);
-        const index = findIndex(services, { id: state.parametersData.paramDefinition.id });
-        services[index].foremanParameters = cloneDeep(payload.parameterSelection);
-
-        return state.merge({
-          parametersData: null,
-          services: services,
+        const index = findIndex(services, {
+          id: state.parametersData.paramDefinition.id,
         });
-      } else {
+        services[index].foremanParameters = cloneDeep(
+          payload.parameterSelection
+        );
+
         return state.merge({
           parametersData: null,
+          services,
         });
       }
+      return state.merge({
+        parametersData: null,
+      });
     }
     case APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN: {
-      let parametersData = {};
+      const parametersData = {};
 
-      if ((payload.hasOwnProperty('isAllGroup')) && (payload.isAllGroup == true)) {
+      if (payload.hasOwnProperty('isAllGroup') && payload.isAllGroup === true) {
         parametersData.parameters = state.ansibleVarsAll;
         parametersData.paramDefinition = {
           isAllGroup: true,
-        }
-      } else  {
+        };
+      } else {
         parametersData.parameters = payload.rowData.ansibleParameters;
         parametersData.paramDefinition = {
           id: payload.rowData.id,
           name: payload.rowData.name,
-        }
+        };
       }
 
       parametersData.type = PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE;
@@ -251,25 +277,32 @@ const applicationDefinitionConf = (state = initialState, action) => {
       parametersData.allowDescriptionAdjustment = true;
 
       return state.merge({
-        parametersData: parametersData,
+        parametersData,
       });
     }
     case APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE: {
       let newState = {};
-      if (payload.mode == 'save') {
-        if ((state.parametersData.paramDefinition.hasOwnProperty('isAllGroup')) && (state.parametersData.paramDefinition.isAllGroup == true)) {
+      if (payload.mode === 'save') {
+        if (
+          state.parametersData.paramDefinition.hasOwnProperty('isAllGroup') &&
+          state.parametersData.paramDefinition.isAllGroup === true
+        ) {
           newState = {
             parametersData: null,
             ansibleVarsAll: cloneDeep(payload.parameterSelection),
           };
         } else {
           const services = cloneDeep(state.services);
-          const index = findIndex(services, { id: state.parametersData.paramDefinition.id });
-          services[index].ansibleParameters = cloneDeep(payload.parameterSelection);
+          const index = findIndex(services, {
+            id: state.parametersData.paramDefinition.id,
+          });
+          services[index].ansibleParameters = cloneDeep(
+            payload.parameterSelection
+          );
 
           newState = {
             parametersData: null,
-            services: services,
+            services,
           };
         }
       } else {

data/webpack/components/ApplicationDefinition/ApplicationDefinitionSelectors.js

@@ -1,13 +1,24 @@
-const applicationDefinitionConf = state => state.foremanAcd.applicationDefinitionConf;
+const applicationDefinitionConf = state =>
+  state.foremanAcd.applicationDefinitionConf;
 
-export const selectShowAlertModal = state => applicationDefinitionConf(state).showAlertModal;
-export const selectAlertModalText = state => applicationDefinitionConf(state).alertModalText;
-export const selectAlertModalTitle = state => applicationDefinitionConf(state).alertModalTitle;
-export const selectEditMode = state => applicationDefinitionConf(state).editMode;
-export const selectAnsiblePlaybook = state => applicationDefinitionConf(state).ansiblePlaybook;
-export const selectServices = state => applicationDefinitionConf(state).services;
+export const selectShowAlertModal = state =>
+  applicationDefinitionConf(state).showAlertModal;
+export const selectAlertModalText = state =>
+  applicationDefinitionConf(state).alertModalText;
+export const selectAlertModalTitle = state =>
+  applicationDefinitionConf(state).alertModalTitle;
+export const selectEditMode = state =>
+  applicationDefinitionConf(state).editMode;
+export const selectAnsiblePlaybook = state =>
+  applicationDefinitionConf(state).ansiblePlaybook;
+export const selectServices = state =>
+  applicationDefinitionConf(state).services;
 export const selectColumns = state => applicationDefinitionConf(state).columns;
-export const selectHiddenForemanParameterTypes = state => applicationDefinitionConf(state).hiddenForemanParameterTypes;
-export const selectParametersData = state => applicationDefinitionConf(state).parametersData;
-export const selectAnsibleVarsAll = state => applicationDefinitionConf(state).ansibleVarsAll;
-export const selectParamEditMode = state => applicationDefinitionConf(state).paramEditMode;
+export const selectHiddenForemanParameterTypes = state =>
+  applicationDefinitionConf(state).hiddenForemanParameterTypes;
+export const selectParametersData = state =>
+  applicationDefinitionConf(state).parametersData;
+export const selectAnsibleVarsAll = state =>
+  applicationDefinitionConf(state).ansibleVarsAll;
+export const selectParamEditMode = state =>
+  applicationDefinitionConf(state).paramEditMode;

data/webpack/components/ApplicationDefinition/__fixtures__/{applicationDefinitionConfData_1.fixtures.js → applicationDefinitionConfData1.fixtures.js}

@@ -1,151 +1,123 @@
-export const applicationDefinitionConfData_1 = {
+export const applicationDefinitionConfData1 = {
   name: false,
   error: {
     errorMsg: '',
     status: '',
-    statusText: ''
+    statusText: '',
   },
   columns: [
     {
       property: 'name',
       header: {
         label: 'Name',
-        formatters: [
-          null
-        ],
+        formatters: [null],
         props: {
           index: 0,
           style: {
-            width: '15%'
-          }
-        }
+            width: '15%',
+          },
+        },
       },
       cell: {
-        formatters: [
-          null
-        ]
-      }
+        formatters: [null],
+      },
     },
     {
       property: 'description',
       header: {
         label: 'Description',
-        formatters: [
-          null
-        ],
+        formatters: [null],
         props: {
           index: 1,
           style: {
-            width: '10%'
-          }
-        }
+            width: '10%',
+          },
+        },
       },
       cell: {
-        formatters: [
-          null
-        ]
-      }
+        formatters: [null],
+      },
     },
     {
       property: 'hostgroup',
       header: {
         label: 'Hostgroup',
-        formatters: [
-          null
-        ],
+        formatters: [null],
         props: {
           index: 2,
           style: {
-            width: '20%'
-          }
-        }
+            width: '20%',
+          },
+        },
       },
       cell: {
-        formatters: [
-          null
-        ]
-      }
+        formatters: [null],
+      },
     },
     {
       property: 'ansibleGroup',
       header: {
         label: 'Ansible Group',
-        formatters: [
-          null
-        ],
+        formatters: [null],
         props: {
           index: 3,
           style: {
-            width: '20%'
-          }
-        }
+            width: '20%',
+          },
+        },
       },
       cell: {
-        formatters: [
-          null
-        ]
-      }
+        formatters: [null],
+      },
     },
     {
       property: 'minCount',
       header: {
         label: 'min count',
-        formatters: [
-          null
-        ],
+        formatters: [null],
         props: {
           index: 4,
           style: {
-            width: '10%'
-          }
-        }
+            width: '10%',
+          },
+        },
       },
       cell: {
-        formatters: [
-          null
-        ]
-      }
+        formatters: [null],
+      },
     },
     {
       property: 'maxCount',
       header: {
         label: 'max count',
-        formatters: [
-          null
-        ],
+        formatters: [null],
         props: {
           index: 5,
           style: {
-            width: '10%'
-          }
-        }
+            width: '10%',
+          },
+        },
       },
       cell: {
-        formatters: [
-          null
-        ]
-      }
+        formatters: [null],
+      },
     },
     {
       property: 'actions',
       header: {
         label: 'Actions',
-        formatters: [
-          null
-        ],
+        formatters: [null],
         props: {
           index: 6,
           style: {
-            width: '15%'
-          }
-        }
+            width: '15%',
+          },
+        },
       },
       cell: {
-        formatters: [
-          null
-        ]
-      }
-    }
+        formatters: [null],
+      },
+    },
   ],
   ansiblePlaybook: {
     id: 2,
@@ -155,49 +127,49 @@ export const applicationDefinitionConfData_1 = {
         {
           id: 0,
           name: 'dummy_var',
-          value: '0'
-        }
+          value: '0',
+        },
       ],
       dbservers: [
         {
           id: 0,
           name: 'mysqlservice',
-          value: 'mysqld'
+          value: 'mysqld',
         },
         {
           id: 1,
           name: 'mysql_port',
-          value: '3306'
+          value: '3306',
         },
         {
           id: 2,
           name: 'dbuser',
-          value: 'webapp'
+          value: 'webapp',
         },
         {
           id: 3,
           name: 'dbname',
-          value: 'ANSAP01'
+          value: 'ANSAP01',
         },
         {
           id: 4,
           name: 'upassword',
-          value: 'Bond@007'
+          value: 'Bond@007',
         },
         {
           id: 5,
           name: 'masterpassword',
-          value: 'MySQL@007'
-        }
+          value: 'MySQL@007',
+        },
       ],
       all: [
         {
           id: 0,
           name: 'repository',
-          value: 'https://github.com/bennojoy/mywebapp.git'
-        }
-      ]
-    }
+          value: 'https://github.com/bennojoy/mywebapp.git',
+        },
+      ],
+    },
   },
   services: [
     {
@@ -215,7 +187,7 @@ export const applicationDefinitionConfData_1 = {
           name: 'CP',
           description: '',
           type: 'computeprofile',
-          value: '1'
+          value: '1',
         },
         {
           id: 2,
@@ -223,16 +195,16 @@ export const applicationDefinitionConfData_1 = {
           name: 'LE',
           description: '',
           type: 'lifecycleenv',
-          value: '1'
-        }
+          value: '1',
+        },
       ],
       ansibleParameters: [
         {
           id: 0,
           name: 'dummy_var',
-          value: '0'
-        }
-      ]
+          value: '0',
+        },
+      ],
     },
     {
       id: 2,
@@ -247,42 +219,42 @@ export const applicationDefinitionConfData_1 = {
         {
           id: 0,
           name: 'mysqlservice',
-          value: 'mysqld'
+          value: 'mysqld',
         },
         {
           id: 1,
           name: 'mysql_port',
           value: '3306',
-          locked: true
+          locked: true,
         },
         {
           id: 2,
           name: 'dbuser',
-          value: 'webapp'
+          value: 'webapp',
         },
         {
           id: 3,
           name: 'dbname',
-          value: 'ANSAP01'
+          value: 'ANSAP01',
         },
         {
           id: 4,
           name: 'upassword',
-          value: 'Bond@007'
+          value: 'Bond@007',
         },
         {
           id: 5,
           name: 'masterpassword',
-          value: 'MySQL@007'
-        }
-      ]
-    }
+          value: 'MySQL@007',
+        },
+      ],
+    },
   ],
   ansibleVarsAll: [
     {
       id: 0,
       name: 'repository',
-      value: 'https://github.com/bennojoy/mywebapp.git'
-    }
-  ]
-}
+      value: 'https://github.com/bennojoy/mywebapp.git',
+    },
+  ],
+};