foreman_acd 0.9.7 → 0.10.0

data/webpack/components/ApplicationInstance/__fixtures__/{applicationInstanceConfData_1.fixtures.js → applicationInstanceConfData1.fixtures.js}

@@ -1,9 +1,9 @@
-export const applicationInstanceConfData_1 = {
+export const applicationInstanceConfData1 = {
   name: false,
   error: {
     errorMsg: '',
     status: '',
-    statusText: ''
+    statusText: '',
   },
   loading: false,
   columns: [
@@ -11,97 +11,79 @@ export const applicationInstanceConfData_1 = {
       property: 'hostname',
       header: {
         label: 'Hostname',
-        formatters: [
-          null
-        ],
+        formatters: [null],
         props: {
           index: 0,
           style: {
-            width: '30%'
-          }
-        }
+            width: '30%',
+          },
+        },
       },
       cell: {
-        formatters: [
-          null
-        ]
-      }
+        formatters: [null],
+      },
     },
     {
       property: 'description',
       header: {
         label: 'Description',
-        formatters: [
-          null
-        ],
+        formatters: [null],
         props: {
           index: 1,
           style: {
-            width: '30%'
-          }
-        }
+            width: '30%',
+          },
+        },
       },
       cell: {
-        formatters: [
-          null
-        ]
-      }
+        formatters: [null],
+      },
     },
     {
       property: 'service',
       header: {
         label: 'Service',
-        formatters: [
-          null
-        ],
+        formatters: [null],
         props: {
           index: 2,
           style: {
-            width: '20%'
-          }
-        }
+            width: '20%',
+          },
+        },
       },
       cell: {
-        formatters: [
-          null
-        ]
-      }
+        formatters: [null],
+      },
     },
     {
       property: 'actions',
       header: {
         label: 'Actions',
-        formatters: [
-          null
-        ],
+        formatters: [null],
         props: {
           index: 4,
           style: {
-            width: '20%'
-          }
-        }
+            width: '20%',
+          },
+        },
       },
       cell: {
-        formatters: [
-          null
-        ]
-      }
-    }
+        formatters: [null],
+      },
+    },
   ],
   appDefinition: {
     id: 1,
     name: 'LAMP',
     description: '',
-    services: '[{"id":1,"name":"web","description":"","hostgroup":"1","ansibleGroup":"webservers","minCount":"2","maxCount":"","foremanParameters":[{"id":1,"locked":false,"name":"CP","description":"","type":"computeprofile","value":"1"},{"id":2,"locked":true,"name":"LE","description":"","type":"lifecycleenv","value":"1"}],"ansibleParameters":[{"id":0,"name":"dummy_var","value":"0"}]},{"id":2,"name":"db","description":"","hostgroup":"1","ansibleGroup":"dbservers","minCount":"1","maxCount":"","foremanParameters":[],"ansibleParameters":[{"id":0,"name":"mysqlservice","value":"mysqld"},{"id":1,"name":"mysql_port","value":"3306","locked":true},{"id":2,"name":"dbuser","value":"webapp"},{"id":3,"name":"dbname","value":"ANSAP01"},{"id":4,"name":"upassword","value":"Bond@007"},{"id":5,"name":"masterpassword","value":"MySQL@007"}]}]',
-    ansible_vars_all: '[{"id":0,"name":"repository","value":"https://github.com/bennojoy/mywebapp.git"}]',
-    location_ids: [
-      2
-    ],
-    organization_ids: [
-      1
-    ],
+    services:
+      '[{"id":1,"name":"web","description":"","hostgroup":"1","ansibleGroup":"webservers","minCount":"2","maxCount":"","foremanParameters":[{"id":1,"locked":false,"name":"CP","description":"","type":"computeprofile","value":"1"},{"id":2,"locked":true,"name":"LE","description":"","type":"lifecycleenv","value":"1"}],"ansibleParameters":[{"id":0,"name":"dummy_var","value":"0"}]},{"id":2,"name":"db","description":"","hostgroup":"1","ansibleGroup":"dbservers","minCount":"1","maxCount":"","foremanParameters":[],"ansibleParameters":[{"id":0,"name":"mysqlservice","value":"mysqld"},{"id":1,"name":"mysql_port","value":"3306","locked":true},{"id":2,"name":"dbuser","value":"webapp"},{"id":3,"name":"dbname","value":"ANSAP01"},{"id":4,"name":"upassword","value":"Bond@007"},{"id":5,"name":"masterpassword","value":"MySQL@007"}]}]',
+    ansible_vars_all:
+      '[{"id":0,"name":"repository","value":"https://github.com/bennojoy/mywebapp.git"}]',
+    location_ids: [2],
+    organization_ids: [1],
     created_at: '2021-03-11 12:51:34 +0100',
-    updated_at: '2021-03-13 00:06:12 +0100'
+    updated_at: '2021-03-13 00:06:12 +0100',
   },
   hosts: [
     {
@@ -114,34 +96,34 @@ export const applicationInstanceConfData_1 = {
         {
           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',
+        },
+      ],
     },
     {
       id: 1,
@@ -153,9 +135,9 @@ export const applicationInstanceConfData_1 = {
         {
           id: 0,
           name: 'dummy_var',
-          value: '0'
-        }
-      ]
+          value: '0',
+        },
+      ],
     },
     {
       id: 2,
@@ -167,17 +149,17 @@ export const applicationInstanceConfData_1 = {
         {
           id: 0,
           name: 'dummy_var',
-          value: '0'
-        }
-      ]
-    }
+          value: '0',
+        },
+      ],
+    },
   ],
   ansibleVarsAll: [
     {
       id: 0,
       name: 'repository',
-      value: 'https://github.com/bennojoy/mywebapp.git'
-    }
+      value: 'https://github.com/bennojoy/mywebapp.git',
+    },
   ],
   services: [
     {
@@ -195,7 +177,7 @@ export const applicationInstanceConfData_1 = {
           name: 'CP',
           description: '',
           type: 'computeprofile',
-          value: '1'
+          value: '1',
         },
         {
           id: 2,
@@ -203,17 +185,17 @@ export const applicationInstanceConfData_1 = {
           name: 'LE',
           description: '',
           type: 'lifecycleenv',
-          value: '1'
-        }
+          value: '1',
+        },
       ],
       ansibleParameters: [
         {
           id: 0,
           name: 'dummy_var',
-          value: '0'
-        }
+          value: '0',
+        },
       ],
-      currentCount: 2
+      currentCount: 2,
     },
     {
       id: 2,
@@ -228,36 +210,36 @@ export const applicationInstanceConfData_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',
+        },
       ],
-      currentCount: 1
-    }
-  ]
-}
+      currentCount: 1,
+    },
+  ],
+};

data/webpack/components/ApplicationInstance/__fixtures__/applicationInstanceReducer.fixtures.js

@@ -1,28 +1,22 @@
 import Immutable from 'seamless-immutable';
-import {
-   cloneDeep,
-   findIndex,
-   findLastIndex,
-} from 'lodash';
+import { cloneDeep, findIndex } from 'lodash';
 
-import {
-  applicationInstanceConfData_1,
-} from '../__fixtures__/applicationInstanceConfData_1.fixtures';
+import { applicationInstanceConfData1 } from '../__fixtures__/applicationInstanceConfData1.fixtures';
 
-export const successState = Immutable(applicationInstanceConfData_1);
+export const successState = Immutable(applicationInstanceConfData1);
 
 const EDIT_ROW_ID = 2;
 
-const editClone = applicationInstanceConfData_1;
-const editIndex = findIndex(editClone.hosts, { id: EDIT_ROW_ID })
-editClone["hosts"][editIndex].backup = cloneDeep(editClone["hosts"][editIndex]);
+const editClone = applicationInstanceConfData1;
+const editIndex = findIndex(editClone.hosts, { id: EDIT_ROW_ID });
+editClone.hosts[editIndex].backup = cloneDeep(editClone.hosts[editIndex]);
 export const editState = Immutable(editClone);
 
 // Payload Data
-export const initApplicationInstancePayload = applicationInstanceConfData_1;
+export const initApplicationInstancePayload = applicationInstanceConfData1;
 
-export const closeAlertModalPayload = { };
-export const addHostPayload = { };
+export const closeAlertModalPayload = {};
+export const addHostPayload = {};
 export const deleteHostPayload = {
   rowData: {
     id: EDIT_ROW_ID,
@@ -44,11 +38,11 @@ export const cancelEditHostPayload = {
   },
 };
 export const changeEditHostPayload = {
-  value: "helloworld",
-  property: "name",
+  value: 'helloworld',
+  property: 'name',
   rowData: {
     id: EDIT_ROW_ID,
-  }
+  },
 };
 
 export const loadApplicationDefinitionRequestPayload = {
@@ -58,23 +52,21 @@ export const loadApplicationDefinitionRequestPayload = {
 export const loadApplicationDefinitionSuccessPayload = {
   app_definition: {
     id: 1,
-    name: "LAMP",
-    description: "",
-    services: "[{\"id\":1,\"name\":\"web\",\"description\":\"\",\"hostgroup\":\"1\",\"ansibleGroup\":\"webservers\",\"minCount\":\"2\",\"maxCount\":\"\",\"foremanParameters\":[{\"id\":1,\"locked\":false,\"name\":\"CP\",\"description\":\"\",\"type\":\"computeprofile\",\"value\":\"1\"},{\"id\":2,\"locked\":true,\"name\":\"LE\",\"description\":\"\",\"type\":\"lifecycleenv\",\"value\":\"1\"}],\"ansibleParameters\":[{\"id\":0,\"name\":\"dummy_var\",\"value\":\"0\"}]},{\"id\":2,\"name\":\"db\",\"description\":\"\",\"hostgroup\":\"1\",\"ansibleGroup\":\"dbservers\",\"minCount\":\"1\",\"maxCount\":\"\",\"foremanParameters\":[],\"ansibleParameters\":[{\"id\":0,\"name\":\"mysqlservice\",\"value\":\"mysqld\"},{\"id\":1,\"name\":\"mysql_port\",\"value\":\"3306\",\"locked\":true},{\"id\":2,\"name\":\"dbuser\",\"value\":\"webapp\"},{\"id\":3,\"name\":\"dbname\",\"value\":\"ANSAP01\"},{\"id\":4,\"name\":\"upassword\",\"value\":\"Bond@007\"},{\"id\":5,\"name\":\"masterpassword\",\"value\":\"MySQL@007\"}]}]",
-    "ansible_vars_all": "[{\"id\":0,\"name\":\"repository\",\"value\":\"https://github.com/bennojoy/mywebapp.git\"}]",
-    location_ids: [
-      2
-    ],
-    organization_ids: [
-      1
-    ],
-    created_at: "2021-03-11 12:51:34 +0100",
-    updated_at: "2021-03-13 00:06:12 +0100"
+    name: 'LAMP',
+    description: '',
+    services:
+      '[{"id":1,"name":"web","description":"","hostgroup":"1","ansibleGroup":"webservers","minCount":"2","maxCount":"","foremanParameters":[{"id":1,"locked":false,"name":"CP","description":"","type":"computeprofile","value":"1"},{"id":2,"locked":true,"name":"LE","description":"","type":"lifecycleenv","value":"1"}],"ansibleParameters":[{"id":0,"name":"dummy_var","value":"0"}]},{"id":2,"name":"db","description":"","hostgroup":"1","ansibleGroup":"dbservers","minCount":"1","maxCount":"","foremanParameters":[],"ansibleParameters":[{"id":0,"name":"mysqlservice","value":"mysqld"},{"id":1,"name":"mysql_port","value":"3306","locked":true},{"id":2,"name":"dbuser","value":"webapp"},{"id":3,"name":"dbname","value":"ANSAP01"},{"id":4,"name":"upassword","value":"Bond@007"},{"id":5,"name":"masterpassword","value":"MySQL@007"}]}]',
+    ansible_vars_all:
+      '[{"id":0,"name":"repository","value":"https://github.com/bennojoy/mywebapp.git"}]',
+    location_ids: [2],
+    organization_ids: [1],
+    created_at: '2021-03-11 12:51:34 +0100',
+    updated_at: '2021-03-13 00:06:12 +0100',
   },
   foreman_data: null,
-  ansible_data: null
+  ansible_data: null,
 };
 
 export const loadApplicationDefinitionFailurePayload = {
-  error: "Something really bad happend",
+  error: 'Something really bad happend',
 };

data/webpack/components/ApplicationInstance/__tests__/ApplicationInstance.test.js

@@ -4,19 +4,84 @@ import ApplicationInstance from '../ApplicationInstance';
 
 const noop = () => {};
 
+const baseFixtures = {
+  data: {
+    mode: '',
+    location: 'Default Location',
+    organization: 'Default Organization',
+    appDefinition: {},
+    hosts: [],
+    ansibleVarsAll: [],
+  },
+  activateEditApplicationInstanceHost: noop,
+  addApplicationInstanceHost: noop,
+  cancelEditApplicationInstanceHost: noop,
+  changeEditApplicationInstanceHost: noop,
+  changeParameterSelectionMode: noop,
+  closeAddExistingHostsModal: noop,
+  closeAlertModal: noop,
+  closeAnsibleParameterSelectionModal: noop,
+  closeForemanParameterSelectionModal: noop,
+  confirmEditApplicationInstanceHost: noop,
+  deleteApplicationInstanceHost: noop,
+  initApplicationInstance: noop,
+  loadApplicationDefinition: noop,
+  openForemanParameterSelectionModal: noop,
+  openAnsibleParameterSelectionModal: noop,
+  openAddExistingHostsModal: noop,
+};
+
 const fixtures = {
-  'should render application instance': {
+  'should render without optional-values': baseFixtures,
+  'should render newInstance': {
+    ...baseFixtures,
+    data: {
+      ...baseFixtures.data,
+      mode: 'newInstance',
+      applications: {
+        '1': 'dummy-definition',
+        '2': 'test-definition',
+      },
+      supportedPlugins: {
+        puppet: false,
+        katello: true,
+      },
+    },
+  },
+  'should render editInstance': {
+    ...baseFixtures,
     data: {
-      location: "Default Location",
-      organization: "Default Organization",
-      appDefinition: {},
-      hosts: [],
-      ansibleVarsAll: [],
+      ...baseFixtures.data,
+      mode: 'editInstance',
+      appDefinition: {
+        id: 2,
+        name: 'test-definition',
+      },
+      hosts: [
+        {
+          id: 1,
+          hostname: 'grafana-host',
+          service: '1',
+          description: '',
+          isExistingHost: false,
+          foremanParameters: [],
+          ansibleParameters: [],
+        },
+        {
+          id: 2,
+          hostname: 'prometheus-host',
+          service: '2',
+          description: '',
+          isExistingHost: false,
+          foremanParameters: [],
+          ansibleParameters: [],
+        },
+      ],
+      supportedPlugins: {
+        puppet: false,
+        katello: true,
+      },
     },
-    closeAlertModal: noop,
-    loadApplicationDefinition: noop,
-    initApplicationInstance: noop,
-    addApplicationInstanceHost: noop,
   },
 };
 

data/webpack/components/ApplicationInstance/__tests__/ApplicationInstanceReducer.test.js

@@ -29,14 +29,6 @@ import {
   APPLICATION_INSTANCE_HOST_EDIT_CONFIRM,
   APPLICATION_INSTANCE_HOST_EDIT_CHANGE,
   APPLICATION_INSTANCE_HOST_EDIT_CANCEL,
-  APPLICATION_INSTANCE_HOST_EDIT_ERROR,
-  APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN,
-  APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE,
-  APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN,
-  APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE,
-  APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_OPEN,
-  APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_CLOSE,
-  APPLICATION_INSTANCE_CHANGE_PARAMETER_SELECTION_MODE,
 } from '../ApplicationInstanceConstants';
 
 const fixtures = {

data/webpack/components/ApplicationInstance/__tests__/ApplicationInstanceSelectors.test.js

@@ -15,9 +15,7 @@ import {
   selectParamEditMode,
 } from '../ApplicationInstanceSelectors';
 
-import {
-  applicationInstanceConfData_1,
-} from '../__fixtures__/applicationInstanceConfData_1.fixtures';
+import { applicationInstanceConfData1 } from '../__fixtures__/applicationInstanceConfData1.fixtures';
 
 const stateFactory = obj => ({
   foremanAcd: {
@@ -26,30 +24,32 @@ const stateFactory = obj => ({
 });
 
 const fixtures = {
-  'should return showAlertModal from applicationInstanceConfData_1 fixtures': () =>
-    selectShowAlertModal(stateFactory(applicationInstanceConfData_1)),
-  'should return alertModalText from applicationInstanceConfData_1 fixtures': () =>
-    selectAlertModalText(stateFactory(applicationInstanceConfData_1)),
-  'should return alertModalTitle from applicationInstanceConfData_1 fixtures': () =>
-    selectAlertModalTitle(stateFactory(applicationInstanceConfData_1)),
-  'should return editMode from applicationInstanceConfData_1 fixtures': () =>
-    selectEditMode(stateFactory(applicationInstanceConfData_1)),
-  'should return appDefinition from applicationInstanceConfData_1 fixtures': () =>
-    selectAppDefinition(stateFactory(applicationInstanceConfData_1)),
-  'should return hosts from applicationInstanceConfData_1 fixtures': () =>
-    selectHosts(stateFactory(applicationInstanceConfData_1)),
-  'should return columns from applicationInstanceConfData_1 fixtures': () =>
-    selectColumns(stateFactory(applicationInstanceConfData_1)),
-  'should return hiddenForemanParameterTypes from applicationInstanceConfData_1 fixtures': () =>
-    selectHiddenForemanParameterTypes(stateFactory(applicationInstanceConfData_1)),
-  'should return services from applicationInstanceConfData_1 fixtures': () =>
-    selectServices(stateFactory(applicationInstanceConfData_1)),
-  'should return parametersData from applicationInstanceConfData_1 fixtures': () =>
-    selectParametersData(stateFactory(applicationInstanceConfData_1)),
-  'should return ansibleVarsAll from applicationInstanceConfData_1 fixtures': () =>
-    selectAnsibleVarsAll(stateFactory(applicationInstanceConfData_1)),
-  'should return ParamEditMode from applicationInstanceConfData_1 fixtures': () =>
-    selectParamEditMode(stateFactory(applicationInstanceConfData_1)),
+  'should return showAlertModal from applicationInstanceConfData1 fixtures': () =>
+    selectShowAlertModal(stateFactory(applicationInstanceConfData1)),
+  'should return alertModalText from applicationInstanceConfData1 fixtures': () =>
+    selectAlertModalText(stateFactory(applicationInstanceConfData1)),
+  'should return alertModalTitle from applicationInstanceConfData1 fixtures': () =>
+    selectAlertModalTitle(stateFactory(applicationInstanceConfData1)),
+  'should return editMode from applicationInstanceConfData1 fixtures': () =>
+    selectEditMode(stateFactory(applicationInstanceConfData1)),
+  'should return appDefinition from applicationInstanceConfData1 fixtures': () =>
+    selectAppDefinition(stateFactory(applicationInstanceConfData1)),
+  'should return hosts from applicationInstanceConfData1 fixtures': () =>
+    selectHosts(stateFactory(applicationInstanceConfData1)),
+  'should return columns from applicationInstanceConfData1 fixtures': () =>
+    selectColumns(stateFactory(applicationInstanceConfData1)),
+  'should return hiddenForemanParameterTypes from applicationInstanceConfData1 fixtures': () =>
+    selectHiddenForemanParameterTypes(
+      stateFactory(applicationInstanceConfData1)
+    ),
+  'should return services from applicationInstanceConfData1 fixtures': () =>
+    selectServices(stateFactory(applicationInstanceConfData1)),
+  'should return parametersData from applicationInstanceConfData1 fixtures': () =>
+    selectParametersData(stateFactory(applicationInstanceConfData1)),
+  'should return ansibleVarsAll from applicationInstanceConfData1 fixtures': () =>
+    selectAnsibleVarsAll(stateFactory(applicationInstanceConfData1)),
+  'should return ParamEditMode from applicationInstanceConfData1 fixtures': () =>
+    selectParamEditMode(stateFactory(applicationInstanceConfData1)),
 };
 
 describe('ApplicationInstanceSelectors', () =>