foreman_acd 0.9.7 → 0.10.0

data/webpack/components/ApplicationInstanceReport/__tests__/ApplicationInstanceReportSelectors.test.js

@@ -5,9 +5,7 @@ import {
   selectActiveHostId,
 } from '../ApplicationInstanceReportSelectors';
 
-import {
-  applicationInstanceReportData_1,
-} from '../__fixtures__/applicationInstanceReportData_1.fixtures';
+import { applicationInstanceReportData1 } from '../__fixtures__/applicationInstanceReportData1.fixtures';
 
 const stateFactory = obj => ({
   foremanAcd: {
@@ -16,10 +14,10 @@ const stateFactory = obj => ({
 });
 
 const fixtures = {
-  'should return hosts from applicationInstanceReportData_1 fixtures': () =>
-    selectHosts(stateFactory(applicationInstanceReportData_1)),
-  'should return activeHostId from applicationInstanceReportData_1 fixtures': () =>
-    selectActiveHostId(stateFactory(applicationInstanceReportData_1)),
+  'should return hosts from applicationInstanceReportData1 fixtures': () =>
+    selectHosts(stateFactory(applicationInstanceReportData1)),
+  'should return activeHostId from applicationInstanceReportData1 fixtures': () =>
+    selectActiveHostId(stateFactory(applicationInstanceReportData1)),
 };
 
 describe('ApplicationInstanceSelectors', () =>

data/webpack/components/ApplicationInstanceReport/__tests__/__snapshots__/ApplicationInstanceReportReducer.test.js.snap

@@ -712,7 +712,6 @@ Object {
       ],
     },
   ],
-  "loading": true,
   "name": false,
 }
 `;

data/webpack/components/ApplicationInstanceReport/__tests__/__snapshots__/ApplicationInstanceReportSelectors.test.js.snap

@@ -1,8 +1,8 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ApplicationInstanceSelectors should return activeHostId from applicationInstanceReportData_1 fixtures 1`] = `undefined`;
+exports[`ApplicationInstanceSelectors should return activeHostId from applicationInstanceReportData1 fixtures 1`] = `undefined`;
 
-exports[`ApplicationInstanceSelectors should return hosts from applicationInstanceReportData_1 fixtures 1`] = `
+exports[`ApplicationInstanceSelectors should return hosts from applicationInstanceReportData1 fixtures 1`] = `
 Array [
   Object {
     "build": false,

data/webpack/components/ApplicationInstanceReport/components/ReportViewer.js

@@ -1,10 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-const ReportViewer= ({
-  hidden,
-  report,
-}) =>{
+const ReportViewer = ({ hidden, report }) => {
   if (hidden) {
     return null;
   }
@@ -14,7 +11,9 @@ const ReportViewer= ({
   }
 
   return report.map((task, id) => (
-    <div key={"report_task_"+id} className="report_task">{task.name} -- {task.status}</div>
+    <div key={`report_task_${id}`} className="report_task">
+      {task.name} -- {task.status}
+    </div>
   ));
 };
 
@@ -23,4 +22,9 @@ ReportViewer.propTypes = {
   report: PropTypes.array,
 };
 
+ReportViewer.defaultProps = {
+  hidden: false,
+  report: undefined,
+};
+
 export default ReportViewer;

data/webpack/components/ApplicationInstanceReport/components/__tests__/ReportViewer.test.js

@@ -2,11 +2,9 @@ import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
 
 import ReportViewer from '../ReportViewer';
 
-const noop = () => {};
-
 const data = [
   { name: 'report 1', status: 'done' },
-  { name: 'report 2', status: 'pending' }
+  { name: 'report 2', status: 'pending' },
 ];
 
 const fixtures = {

data/webpack/components/ExistingHostSelection/ExistingHostSelection.js

@@ -1,41 +1,20 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { orderBy } from 'lodash';
+import { cloneDeep } from 'lodash';
+import { DualListControlled } from 'patternfly-react';
+import { translate as __ } from 'foremanReact/common/I18n';
 import ServiceSelector from './components/ServiceSelector';
 import { arrayToObject } from '../../helper';
 
-import {
-  cloneDeep,
-} from 'lodash';
-
-import {
-  Icon,
-  Button,
-  DualListControlled,
-} from 'patternfly-react';
-
 class ExistingHostSelection extends React.Component {
-
-  constructor(props) {
-    super(props);
-  }
-
   componentDidMount() {
-    const {
-      location,
-      organization,
-      services,
-      initExistingHostSelection,
-      allHosts,
-    } = this.props;
+    const { allHosts, initExistingHostSelection } = this.props;
 
     initExistingHostSelection(allHosts);
   }
 
   render() {
     const {
-      location,
-      organization,
       services,
       serviceId,
       availableHosts,
@@ -44,35 +23,39 @@ class ExistingHostSelection extends React.Component {
       hostSelectionChanged,
     } = this.props;
 
-    const serviceList = arrayToObject(services, "id", "name");
-    const load_hostgroup_url = "/api/v2/hostgroups/__hostgroup_id__/hosts"
+    const serviceList = arrayToObject(services, 'id', 'name');
+    const loadHostgroupUrl = '/api/v2/hostgroups/__hostgroup_id__/hosts';
 
-    return(
+    return (
       <div>
         <div className="row">
           <ServiceSelector
             label="Service"
-            hidden={ false }
-            selectValue={ this.props.serviceId ? this.props.serviceId.toString() : '0'}
-            options={ serviceList }
-            onChange={ loadHostsOfHostgroup }
-            additionalData={{ url: load_hostgroup_url, services: services }} />
+            hidden={false}
+            selectValue={serviceId ? serviceId.toString() : '0'}
+            options={serviceList}
+            onChange={loadHostsOfHostgroup}
+            additionalData={{ url: loadHostgroupUrl, services }}
+          />
         </div>
         <div className="row">
-          <label className="col-md-2 control-label">{ __("Hosts") }</label>
-          {this.props.serviceId != undefined ? (
-          <div className="col-md-6">
-            <DualListControlled
-              onChange={ hostSelectionChanged }
-              left={{
-                items: cloneDeep(availableHosts),
-              }}
-              right={{
-                items: cloneDeep(alreadyUsedHosts),
-              }}
-              allowHiddenInputs={false}
-            />
-          </div>) : (<span>{ __("Please select service first.") }</span>)}
+          <label className="col-md-2 control-label">{__('Hosts')}</label>
+          {serviceId !== undefined ? (
+            <div className="col-md-6">
+              <DualListControlled
+                onChange={hostSelectionChanged}
+                left={{
+                  items: cloneDeep(availableHosts),
+                }}
+                right={{
+                  items: cloneDeep(alreadyUsedHosts),
+                }}
+                allowHiddenInputs={false}
+              />
+            </div>
+          ) : (
+            <span>{__('Please select service first.')}</span>
+          )}
         </div>
       </div>
     );
@@ -80,25 +63,21 @@ class ExistingHostSelection extends React.Component {
 }
 
 ExistingHostSelection.defaultProps = {
+  allHosts: [],
   serviceId: undefined,
-  hostsInHostgroup: {},
   availableHosts: [],
   alreadyUsedHosts: [],
-  selectedHosts: [],
 };
 
 ExistingHostSelection.propTypes = {
-  location: PropTypes.string.isRequired,
-  organization: PropTypes.string.isRequired,
+  allHosts: PropTypes.array,
   services: PropTypes.array.isRequired,
-  initExistingHostSelection: PropTypes.func,
+  initExistingHostSelection: PropTypes.func.isRequired,
   serviceId: PropTypes.number,
-  hostsInHostgroup: PropTypes.object,
   availableHosts: PropTypes.array,
   alreadyUsedHosts: PropTypes.array,
-  selectedHosts: PropTypes.array,
-  loadHostsOfHostgroup: PropTypes.func,
-  hostSelectionChanged: PropTypes.func,
+  loadHostsOfHostgroup: PropTypes.func.isRequired,
+  hostSelectionChanged: PropTypes.func.isRequired,
 };
 
 export default ExistingHostSelection;

data/webpack/components/ExistingHostSelection/ExistingHostSelectionActions.js

@@ -1,14 +1,7 @@
-import React from 'react';
-import * as sort from 'sortabular';
 import { translate as __ } from 'foremanReact/common/I18n';
 
 import api from 'foremanReact/API';
 
-import {
-  propsToSnakeCase,
-  propsToCamelCase,
-} from 'foremanReact/common/helpers';
-
 import {
   EXISTING_HOST_SELECTION_INIT,
   EXISTING_HOST_SELECTION_LOAD_HOSTS_SUCCESS,
@@ -16,9 +9,7 @@ import {
   EXISTING_HOST_SELECTION_SELECTION_CHANGED,
 } from './ExistingHostSelectionConstants';
 
-export const initExistingHostSelection = (
-  allHosts,
-) => dispatch => {
+export const initExistingHostSelection = allHosts => dispatch => {
   const initialState = {};
 
   initialState.alreadyUsedHosts = undefined;
@@ -31,35 +22,37 @@ export const initExistingHostSelection = (
     type: EXISTING_HOST_SELECTION_INIT,
     payload: initialState,
   });
-}
+};
 
 export const loadHostsOfHostgroup = (
   serviceId,
   additionalData
-) => dispatch => {
+) => async dispatch => {
+  const selService = additionalData.services.filter(s => s.id === serviceId)[0];
+  const realUrl = additionalData.url.replace(
+    '__hostgroup_id__',
+    selService.hostgroup
+  );
 
-  const selService = additionalData.services.filter(s => (s.id == serviceId))[0];
-  const realUrl = additionalData.url.replace("__hostgroup_id__", selService.hostgroup);
-
-  return api
-    .get(realUrl, {}, {})
-    .then(({ data }) =>
-      dispatch({
-        type: EXISTING_HOST_SELECTION_LOAD_HOSTS_SUCCESS,
-        payload: {
-          hosts: data.results,
-          serviceId: parseInt(serviceId),
-        }
-      })
-    )
-    .catch(error => dispatch(errorHandler(EXISTING_HOST_SELECTION_LOAD_HOSTS_FAILURE, error)));
+  try {
+    const { data } = await api.get(realUrl, {}, {});
+    dispatch({
+      type: EXISTING_HOST_SELECTION_LOAD_HOSTS_SUCCESS,
+      payload: {
+        hosts: data.results,
+        serviceId: parseInt(serviceId, 10),
+      },
+    });
+  } catch (error) {
+    dispatch(errorHandler(EXISTING_HOST_SELECTION_LOAD_HOSTS_FAILURE, error));
+  }
 };
 
 export const hostSelectionChanged = ({ left, right }) => ({
   type: EXISTING_HOST_SELECTION_SELECTION_CHANGED,
   payload: {
     selection: right.items,
-  }
+  },
 });
 
 const errorHandler = (msg, err) => {

data/webpack/components/ExistingHostSelection/ExistingHostSelectionConstants.js

@@ -1,4 +1,7 @@
 export const EXISTING_HOST_SELECTION_INIT = 'EXISTING_HOST_SELECTION_INIT';
-export const EXISTING_HOST_SELECTION_LOAD_HOSTS_SUCCESS = 'EXISTING_HOST_SELECTION_LOAD_HOSTS_SUCCESS';
-export const EXISTING_HOST_SELECTION_LOAD_HOSTS_FAILURE = 'EXISTING_HOST_SELECTION_LOAD_HOSTS_FAILURE';
-export const EXISTING_HOST_SELECTION_SELECTION_CHANGED = 'EXISTING_HOST_SELECTION_SELECTION_CHANGED';
+export const EXISTING_HOST_SELECTION_LOAD_HOSTS_SUCCESS =
+  'EXISTING_HOST_SELECTION_LOAD_HOSTS_SUCCESS';
+export const EXISTING_HOST_SELECTION_LOAD_HOSTS_FAILURE =
+  'EXISTING_HOST_SELECTION_LOAD_HOSTS_FAILURE';
+export const EXISTING_HOST_SELECTION_SELECTION_CHANGED =
+  'EXISTING_HOST_SELECTION_SELECTION_CHANGED';

data/webpack/components/ExistingHostSelection/ExistingHostSelectionReducer.js

@@ -1,13 +1,7 @@
 import Immutable from 'seamless-immutable';
-
-import {
-  cloneDeep,
-  findIndex,
-  findLastIndex,
-} from 'lodash';
+import { translate as __ } from 'foremanReact/common/I18n';
 
 import { shortHostname } from '../../helper';
-import * as sort from 'sortabular';
 
 import {
   EXISTING_HOST_SELECTION_INIT,
@@ -29,10 +23,13 @@ const existingHostSelectionConf = (state = initialState, action) => {
       return state.merge(payload);
     }
     case EXISTING_HOST_SELECTION_LOAD_HOSTS_SUCCESS: {
-      let alreadyUsedHosts = [];
+      const alreadyUsedHosts = [];
 
       state.allHosts.forEach(host => {
-        if ((host.service == payload.serviceId) && (host.isExistingHost == true)) {
+        if (
+          host.service === payload.serviceId &&
+          host.isExistingHost === true
+        ) {
           alreadyUsedHosts.push({
             value: host.hostname,
             label: host.hostname,
@@ -42,11 +39,11 @@ const existingHostSelectionConf = (state = initialState, action) => {
         }
       });
 
-      let availableHosts = [];
-      let hostsInHostgroup = {};
+      const availableHosts = [];
+      const hostsInHostgroup = {};
       payload.hosts.forEach(host => {
-        let shortName = shortHostname(host.name);
-        if (state.allHosts.find(h => h.hostname == shortName) == undefined) {
+        const shortName = shortHostname(host.name);
+        if (state.allHosts.find(h => h.hostname === shortName) === undefined) {
           availableHosts.push({
             value: shortName,
             label: shortName,
@@ -56,9 +53,9 @@ const existingHostSelectionConf = (state = initialState, action) => {
       });
 
       return state.merge({
-        hostsInHostgroup: hostsInHostgroup,
-        availableHosts: availableHosts,
-        alreadyUsedHosts: alreadyUsedHosts,
+        hostsInHostgroup,
+        availableHosts,
+        alreadyUsedHosts,
         serviceId: payload.serviceId,
       });
     }
@@ -66,10 +63,10 @@ const existingHostSelectionConf = (state = initialState, action) => {
       return state.merge({ error: payload.error });
     }
     case EXISTING_HOST_SELECTION_SELECTION_CHANGED: {
-      let selectedHosts = [];
+      const selectedHosts = [];
 
       payload.selection.forEach(selHost => {
-        let hostData = state.hostsInHostgroup[selHost.value];
+        const hostData = state.hostsInHostgroup[selHost.value];
         selectedHosts.push({
           fqdn: hostData.name,
           hostname: shortHostname(hostData.name),
@@ -79,7 +76,7 @@ const existingHostSelectionConf = (state = initialState, action) => {
       });
 
       return state.merge({
-        selectedHosts: selectedHosts,
+        selectedHosts,
       });
     }
     default:

data/webpack/components/ExistingHostSelection/ExistingHostSelectionSelectors.js

@@ -2,7 +2,11 @@ const existingHostState = state => state.foremanAcd.existingHostSelectionConf;
 
 export const selectServiceId = state => existingHostState(state).serviceId;
 export const selectAllHosts = state => existingHostState(state).allHosts;
-export const selectHostsInHostgroup = state => existingHostState(state).selectHostsInHostgroup;
-export const selectAvailableHosts = state => existingHostState(state).availableHosts;
-export const selectAlreadyUsedHosts = state => existingHostState(state).alreadyUsedHosts;
-export const selectSelectedHosts = state => existingHostState(state).selectedHosts;
+export const selectHostsInHostgroup = state =>
+  existingHostState(state).selectHostsInHostgroup;
+export const selectAvailableHosts = state =>
+  existingHostState(state).availableHosts;
+export const selectAlreadyUsedHosts = state =>
+  existingHostState(state).alreadyUsedHosts;
+export const selectSelectedHosts = state =>
+  existingHostState(state).selectedHosts;

data/webpack/components/ExistingHostSelection/__fixtures__/existingHostSelectionConfData1.fixtures.js

@@ -0,0 +1,187 @@
+export const existingHostSelectionConfData1 = {
+  serviceId: 2,
+  error: {
+    errorMsg: '',
+    status: '',
+    statusText: '',
+  },
+  allHosts: [
+    {
+      id: 5,
+      hostname: 'isaac-anselm',
+      service: '1',
+      description: '',
+      foremanParameters: [],
+      ansibleParameters: [],
+    },
+  ],
+  alreadyUsedHosts: [
+    {
+      value: 'isaac-anselm',
+      label: 'isaac-anselm',
+      disabled: true,
+      tooltipText: 'Host already used for this application instance',
+    },
+  ],
+  selectedHosts: [],
+  hostsInHostgroup: {
+    '3': {
+      ip: null,
+      ip6: '',
+      environment_id: null,
+      environment_name: null,
+      last_report: null,
+      mac: '00:11:22:33:44:a1',
+      realm_id: null,
+      realm_name: null,
+      sp_mac: null,
+      sp_ip: null,
+      sp_name: null,
+      domain_id: 1,
+      domain_name: 'mylocal',
+      architecture_id: 1,
+      architecture_name: 'x86_64',
+      operatingsystem_id: 1,
+      operatingsystem_name: 'centos 7',
+      subnet_id: 1,
+      subnet_name: 'mylocal',
+      subnet6_id: null,
+      subnet6_name: null,
+      sp_subnet_id: null,
+      ptable_id: 118,
+      ptable_name: 'Kickstart default',
+      medium_id: 1,
+      medium_name: 'CentOS 7 mirror',
+      pxe_loader: 'PXELinux BIOS',
+      build: true,
+      comment: '',
+      disk: '',
+      installed_at: null,
+      model_id: null,
+      hostgroup_id: 1,
+      owner_id: 4,
+      owner_name: 'Admin User',
+      owner_type: 'User',
+      enabled: true,
+      managed: true,
+      use_image: null,
+      image_file: '',
+      uuid: null,
+      compute_resource_id: null,
+      compute_resource_name: null,
+      compute_profile_id: null,
+      compute_profile_name: null,
+      capabilities: ['build'],
+      provision_method: 'build',
+      certname: 'isaac-anselm.mylocal',
+      image_id: null,
+      image_name: null,
+      created_at: '2021-08-05 11:16:34 +0200',
+      updated_at: '2021-08-05 11:16:34 +0200',
+      last_compile: null,
+      global_status: 0,
+      global_status_label: 'Error',
+      uptime_seconds: null,
+      organization_id: 1,
+      organization_name: 'Default Organization',
+      location_id: 2,
+      location_name: 'Default Location',
+      puppet_status: 0,
+      model_name: null,
+      build_status: 2,
+      build_status_label: 'Token expired',
+      name: 'isaac-anselm.mylocal',
+      id: 3,
+      puppet_proxy_id: null,
+      puppet_proxy_name: null,
+      puppet_ca_proxy_id: null,
+      puppet_ca_proxy_name: null,
+      puppet_proxy: null,
+      puppet_ca_proxy: null,
+      hostgroup_name: 'base',
+      hostgroup_title: 'base',
+    },
+    '7': {
+      ip: null,
+      ip6: null,
+      environment_id: null,
+      environment_name: null,
+      last_report: null,
+      mac: '00:11:22:33:60:15',
+      realm_id: null,
+      realm_name: null,
+      sp_mac: null,
+      sp_ip: null,
+      sp_name: null,
+      domain_id: 1,
+      domain_name: 'mylocal',
+      architecture_id: 1,
+      architecture_name: 'x86_64',
+      operatingsystem_id: 1,
+      operatingsystem_name: 'centos 7',
+      subnet_id: 1,
+      subnet_name: 'mylocal',
+      subnet6_id: null,
+      subnet6_name: null,
+      sp_subnet_id: null,
+      ptable_id: 118,
+      ptable_name: 'Kickstart default',
+      medium_id: 1,
+      medium_name: 'CentOS 7 mirror',
+      pxe_loader: 'PXELinux BIOS',
+      build: true,
+      comment: null,
+      disk: null,
+      installed_at: null,
+      model_id: null,
+      hostgroup_id: 1,
+      owner_id: 4,
+      owner_name: 'Admin User',
+      owner_type: 'User',
+      enabled: true,
+      managed: true,
+      use_image: null,
+      image_file: '',
+      uuid: null,
+      compute_resource_id: null,
+      compute_resource_name: null,
+      compute_profile_id: null,
+      compute_profile_name: null,
+      capabilities: ['build'],
+      provision_method: 'build',
+      certname: 'lllllll.mylocal',
+      image_id: null,
+      image_name: null,
+      created_at: '2021-08-19 14:00:20 +0200',
+      updated_at: '2021-08-19 14:00:20 +0200',
+      last_compile: null,
+      global_status: 0,
+      global_status_label: 'Error',
+      uptime_seconds: null,
+      organization_id: 1,
+      organization_name: 'Default Organization',
+      location_id: 2,
+      location_name: 'Default Location',
+      puppet_status: 0,
+      model_name: null,
+      build_status: 2,
+      build_status_label: 'Token expired',
+      name: 'lllllll.mylocal',
+      id: 7,
+      puppet_proxy_id: null,
+      puppet_proxy_name: null,
+      puppet_ca_proxy_id: null,
+      puppet_ca_proxy_name: null,
+      puppet_proxy: null,
+      puppet_ca_proxy: null,
+      hostgroup_name: 'base',
+      hostgroup_title: 'base',
+    },
+  },
+  availableHosts: [
+    {
+      value: 'lllllll',
+      label: 'lllllll',
+    },
+  ],
+};