foreman_remote_execution 3.2.2 → 3.3.4

data/webpack/react_app/components/TargetingHosts/components/HostItem.js

@@ -0,0 +1,39 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { ActionButtons } from 'foremanReact/components/common/ActionButtons/ActionButtons';
+import HostStatus from './HostStatus';
+
+const HostItem = ({ name, link, status, actions }) => {
+  const hostLink = link ? (
+    <a href={link}>{name}</a>
+  ) : (
+    <a href="#" className="disabled">
+      {name}
+    </a>
+  );
+
+  return (
+    <tr id={`targeting-host-${name}`}>
+      <td className="host_name">{hostLink}</td>
+      <td className="host_status">
+        <HostStatus status={status} />
+      </td>
+      <td className="host_actions">
+        <ActionButtons buttons={[...actions]} />
+      </td>
+    </tr>
+  );
+};
+
+HostItem.propTypes = {
+  name: PropTypes.string.isRequired,
+  link: PropTypes.string.isRequired,
+  status: PropTypes.string.isRequired,
+  actions: PropTypes.array,
+};
+
+HostItem.defaultProps = {
+  actions: [],
+};
+
+export default HostItem;

data/webpack/react_app/components/TargetingHosts/components/HostStatus.js

@@ -0,0 +1,54 @@
+import React from 'react';
+import { Icon } from 'patternfly-react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+const HostStatus = ({ status }) => {
+  switch (status) {
+    case 'cancelled':
+      return (
+        <div>
+          <Icon type="pf" name="warning-triangle-o" /> {status}
+        </div>
+      );
+    case 'N/A':
+      return (
+        <div>
+          <Icon type="fa" name="question" /> {status}
+        </div>
+      );
+    case 'running':
+      return (
+        <div>
+          <Icon type="pf" name="running" /> {status}
+        </div>
+      );
+    case 'planned':
+      return (
+        <div>
+          <Icon type="pf" name="build" /> {status}
+        </div>
+      );
+    case 'warning':
+    case 'error':
+      return (
+        <div>
+          <Icon type="pf" name="error-circle-o" /> {__('failed')}
+        </div>
+      );
+    case 'success':
+      return (
+        <div>
+          <Icon type="pf" name="ok" /> {status}
+        </div>
+      );
+    default:
+      return <span>{status}</span>;
+  }
+};
+
+HostStatus.propTypes = {
+  status: PropTypes.string.isRequired,
+};
+
+export default HostStatus;

data/webpack/react_app/components/TargetingHosts/index.js

@@ -0,0 +1,37 @@
+import React, { useEffect } from 'react';
+import { useSelector, useDispatch } from 'react-redux';
+import { stopInterval } from 'foremanReact/redux/middlewares/IntervalMiddleware';
+import TargetingHosts from './TargetingHosts';
+
+import {
+  selectItems,
+  selectStatus,
+  selectAutoRefresh,
+} from './TargetingHostsSelectors';
+import { getData } from './TargetingHostsActions';
+import { TARGETING_HOSTS } from './TargetingHostsConsts';
+
+const WrappedTargetingHosts = () => {
+  const dispatch = useDispatch();
+  const autoRefresh = useSelector(selectAutoRefresh);
+  const items = useSelector(selectItems);
+  const status = useSelector(selectStatus);
+
+  useEffect(() => {
+    dispatch(getData());
+
+    return () => {
+      dispatch(stopInterval(TARGETING_HOSTS));
+    };
+  }, [dispatch]);
+
+  useEffect(() => {
+    if (autoRefresh === 'false') {
+      dispatch(stopInterval(TARGETING_HOSTS));
+    }
+  }, [autoRefresh, dispatch]);
+
+  return <TargetingHosts status={status} items={items} />;
+};
+
+export default WrappedTargetingHosts;

data/webpack/react_app/components/jobInvocations/AggregateStatus/index.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 
 const AggregateStatus = ({ statuses }) => (
   <div id="aggregate_statuses">
@@ -31,4 +32,13 @@ const AggregateStatus = ({ statuses }) => (
   </div>
 );
 
+AggregateStatus.propTypes = {
+  statuses: PropTypes.shape({
+    cancelled: PropTypes.number,
+    failed: PropTypes.number,
+    pending: PropTypes.number,
+    success: PropTypes.number,
+  }).isRequired,
+};
+
 export default AggregateStatus;

data/webpack/react_app/components/jobInvocations/AggregateStatus/index.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
-import { shallow } from 'enzyme';
-import AggregateStatus from './index.js';
+import { shallow } from '@theforeman/test';
+import AggregateStatus from './index';
 
 jest.unmock('./index.js');
 
@@ -20,7 +20,10 @@ describe('AggregateStatus', () => {
 
     it('renders cards with props passed', () => {
       const statuses = {
-        success: 19, failed: 20, cancelled: 31, pending: 3,
+        success: 19,
+        failed: 20,
+        cancelled: 31,
+        pending: 3,
       };
       const chartNumbers = shallow(<AggregateStatus statuses={statuses} />);
       const success = chartNumbers.find('#success_count').text();

data/webpack/react_app/components/jobInvocations/index.js

@@ -4,14 +4,18 @@ import Immutable from 'seamless-immutable';
 import PropTypes from 'prop-types';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import DonutChart from 'foremanReact/components/common/charts/DonutChart';
-import AggregateStatus from './AggregateStatus/index.js';
+import AggregateStatus from './AggregateStatus';
 import * as JobInvocationActions from '../../redux/actions/jobInvocations';
 
-const colIndexOfMaxValue = columns => columns.reduce((iMax, x, i, arr) => (x[1] > arr[iMax][1] ? i : iMax), 0);
+const colIndexOfMaxValue = columns =>
+  columns.reduce((iMax, x, i, arr) => (x[1] > arr[iMax][1] ? i : iMax), 0);
 
 class JobInvocationContainer extends React.Component {
   componentDidMount() {
-    const { startJobInvocationsPolling, data: { url } } = this.props;
+    const {
+      startJobInvocationsPolling,
+      data: { url },
+    } = this.props;
 
     startJobInvocationsPolling(url);
   }
@@ -22,15 +26,20 @@ class JobInvocationContainer extends React.Component {
 
     return (
       <div id="job_invocations_chart_container">
-        <DonutChart data={Immutable.asMutable(jobInvocations)}
-                    title={{type: 'percent', secondary: (jobInvocations[iMax] || [])[0]}}/>
+        <DonutChart
+          data={Immutable.asMutable(jobInvocations)}
+          title={{
+            type: 'percent',
+            secondary: (jobInvocations[iMax] || [])[0],
+          }}
+        />
         <AggregateStatus statuses={statuses} />
       </div>
     );
   }
 }
 
-const mapStateToProps = (state) => {
+const mapStateToProps = state => {
   const {
     jobInvocations,
     statuses,
@@ -62,4 +71,7 @@ JobInvocationContainer.defaultProps = {
   jobInvocations: [['property', 3, 'color']],
   statuses: {},
 };
-export default connect(mapStateToProps, JobInvocationActions)(JobInvocationContainer);
+export default connect(
+  mapStateToProps,
+  JobInvocationActions
+)(JobInvocationContainer);

data/webpack/react_app/redux/actions/jobInvocations/index.js

@@ -8,10 +8,10 @@ import {
 } from '../../consts';
 
 const defaultJobInvocationsPollingInterval = 1000;
-const jobInvocationsInterval = process.env.JOB_INVOCATIONS_POLLING ||
-  defaultJobInvocationsPollingInterval;
+const jobInvocationsInterval =
+  process.env.JOB_INVOCATIONS_POLLING || defaultJobInvocationsPollingInterval;
 
-const getJobInvocations = url => (dispatch, getState) => {
+const getJobInvocations = url => async (dispatch, getState) => {
   function onGetJobInvocationsSuccess({ data }) {
     // If the job has finished, stop polling
     if (data.finished) {
@@ -41,7 +41,7 @@ const getJobInvocations = url => (dispatch, getState) => {
     if (jobInvocationsInterval) {
       setTimeout(
         () => dispatch(getJobInvocations(url)),
-        jobInvocationsInterval,
+        jobInvocationsInterval
       );
     }
   }
@@ -52,10 +52,14 @@ const getJobInvocations = url => (dispatch, getState) => {
 
   if (getState().foremanRemoteExecutionReducers.jobInvocations.isPolling) {
     if (isDocumentVisible) {
-      API.get(url)
-        .then(onGetJobInvocationsSuccess)
-        .catch(onGetJobInvocationsFailed)
-        .then(triggerPolling);
+      try {
+        const data = await API.get(url);
+        onGetJobInvocationsSuccess(data);
+      } catch (error) {
+        onGetJobInvocationsFailed(error);
+      } finally {
+        triggerPolling();
+      }
     } else {
       // document is not visible, keep polling without api call
       triggerPolling();

data/webpack/react_app/redux/consts.js

@@ -2,5 +2,4 @@ export const JOB_INVOCATIONS_POLLING_STARTED =
   'JOB_INVOCATIONS_POLLING_STARTED';
 export const JOB_INVOCATIONS_GET_JOB_INVOCATIONS =
   'JOB_INVOCATIONS_GET_JOB_INVOCATIONS';
-export const JOB_INVOCATIONS_JOB_FINISHED =
-  'JOB_INVOCATIONS_JOB_FINISHED';
+export const JOB_INVOCATIONS_JOB_FINISHED = 'JOB_INVOCATIONS_JOB_FINISHED';

data/webpack/react_app/redux/reducers/jobInvocations/index.fixtures.js

@@ -15,26 +15,10 @@ export const pollingStarted = Immutable({
 export const jobInvocationsPayload = Immutable({
   jobInvocations: {
     job_invocations: [
-      [
-        'Success',
-        100,
-        '#B7312D',
-      ],
-      [
-        'Failed',
-        20,
-        '#B7312D',
-      ],
-      [
-        'Pending',
-        40,
-        '#B7312D',
-      ],
-      [
-        'Cancelled',
-        0,
-        '#B7312D',
-      ],
+      ['Success', 100, '#B7312D'],
+      ['Failed', 20, '#B7312D'],
+      ['Pending', 40, '#B7312D'],
+      ['Cancelled', 0, '#B7312D'],
     ],
     statuses: {
       cancelled: 0,
@@ -48,26 +32,10 @@ export const jobInvocationsPayload = Immutable({
 export const jobInvocationsReceived = Immutable({
   isPolling: true,
   jobInvocations: [
-    [
-      'Success',
-      100,
-      '#B7312D',
-    ],
-    [
-      'Failed',
-      20,
-      '#B7312D',
-    ],
-    [
-      'Pending',
-      40,
-      '#B7312D',
-    ],
-    [
-      'Cancelled',
-      0,
-      '#B7312D',
-    ],
+    ['Success', 100, '#B7312D'],
+    ['Failed', 20, '#B7312D'],
+    ['Pending', 40, '#B7312D'],
+    ['Cancelled', 0, '#B7312D'],
   ],
   statuses: {
     cancelled: 0,

data/webpack/react_app/redux/reducers/jobInvocations/index.test.js

@@ -18,20 +18,26 @@ describe('job invocations chart reducer', () => {
     expect(reducer(undefined, {})).toEqual(initialState);
   });
   it('should start polling given POLLING_STARTED', () => {
-    expect(reducer(initialState, {
-      type: JOB_INVOCATIONS_POLLING_STARTED,
-    })).toEqual(pollingStarted);
+    expect(
+      reducer(initialState, {
+        type: JOB_INVOCATIONS_POLLING_STARTED,
+      })
+    ).toEqual(pollingStarted);
   });
   it('should stop polling given JOB_FINISHED', () => {
-    expect(reducer(pollingStarted, {
-      type: JOB_INVOCATIONS_JOB_FINISHED,
-      payload: { jobInvocations: { job_invocations: [], statuses: {} } },
-    })).toEqual(initialState);
+    expect(
+      reducer(pollingStarted, {
+        type: JOB_INVOCATIONS_JOB_FINISHED,
+        payload: { jobInvocations: { job_invocations: [], statuses: {} } },
+      })
+    ).toEqual(initialState);
   });
   it('should receive job invocations given GET_JOB_INVOCATIONS', () => {
-    expect(reducer(pollingStarted, {
-      type: JOB_INVOCATIONS_GET_JOB_INVOCATIONS,
-      payload: jobInvocationsPayload,
-    })).toEqual(jobInvocationsReceived);
+    expect(
+      reducer(pollingStarted, {
+        type: JOB_INVOCATIONS_GET_JOB_INVOCATIONS,
+        payload: jobInvocationsPayload,
+      })
+    ).toEqual(jobInvocationsReceived);
   });
 });

data/webpack/test_setup.js

@@ -1,7 +1,8 @@
 import 'core-js/shim';
 import 'regenerator-runtime/runtime';
 
-import { configure } from 'enzyme';
+import { configure } from '@theforeman/test';
+// eslint-disable-next-line import/no-extraneous-dependencies
 import Adapter from 'enzyme-adapter-react-16';
 
 configure({ adapter: new Adapter() });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.3.4
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-29 00:00:00.000000000 Z
+date: 2020-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -90,16 +90,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.80.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.80.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -127,11 +127,10 @@ files:
 - ".babelrc.js"
 - ".eslintignore"
 - ".eslintrc"
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".hound.yml"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - ".tx/config"
 - Gemfile
 - LICENSE
@@ -205,6 +204,7 @@ files:
 - app/models/template_invocation_input_value.rb
 - app/overrides/execution_interface.rb
 - app/overrides/subnet_proxies.rb
+- app/services/default_proxy_proxy_selector.rb
 - app/services/remote_execution_proxy_selector.rb
 - app/services/ui_notifications/remote_execution_jobs/base_job_finish.rb
 - app/views/api/v2/foreign_input_sets/base.json.rabl
@@ -238,9 +238,6 @@ files:
 - app/views/job_invocations/_card_user_input.html.erb
 - app/views/job_invocations/_description_fields.html.erb
 - app/views/job_invocations/_form.html.erb
-- app/views/job_invocations/_host_actions_td.html.erb
-- app/views/job_invocations/_host_name_td.html.erb
-- app/views/job_invocations/_host_status_td.html.erb
 - app/views/job_invocations/_preview_hosts_list.html.erb
 - app/views/job_invocations/_preview_hosts_modal.html.erb
 - app/views/job_invocations/_rerun_taxonomies.html.erb
@@ -252,7 +249,7 @@ files:
 - app/views/job_invocations/new.html.erb
 - app/views/job_invocations/refresh.js.erb
 - app/views/job_invocations/show.html.erb
-- app/views/job_invocations/show.js.erb
+- app/views/job_invocations/show.json.erb
 - app/views/job_invocations/welcome.html.erb
 - app/views/job_templates/_custom_tab_headers.html.erb
 - app/views/job_templates/_custom_tabs.html.erb
@@ -396,7 +393,24 @@ files:
 - test/unit/renderer_scope_input.rb
 - test/unit/targeting_test.rb
 - test/unit/template_invocation_input_value_test.rb
+- webpack/__mocks__/foremanReact/common/I18n.js
+- webpack/__mocks__/foremanReact/components/common/ActionButtons/ActionButtons.js
+- webpack/__mocks__/foremanReact/constants.js
 - webpack/index.js
+- webpack/react_app/components/TargetingHosts/TargetingHosts.js
+- webpack/react_app/components/TargetingHosts/TargetingHostsActions.js
+- webpack/react_app/components/TargetingHosts/TargetingHostsConsts.js
+- webpack/react_app/components/TargetingHosts/TargetingHostsSelectors.js
+- webpack/react_app/components/TargetingHosts/__tests__/HostItem.test.js
+- webpack/react_app/components/TargetingHosts/__tests__/HostStatus.test.js
+- webpack/react_app/components/TargetingHosts/__tests__/TargetingHosts.test.js
+- webpack/react_app/components/TargetingHosts/__tests__/__snapshots__/HostItem.test.js.snap
+- webpack/react_app/components/TargetingHosts/__tests__/__snapshots__/HostStatus.test.js.snap
+- webpack/react_app/components/TargetingHosts/__tests__/__snapshots__/TargetingHosts.test.js.snap
+- webpack/react_app/components/TargetingHosts/__tests__/fixtures.js
+- webpack/react_app/components/TargetingHosts/components/HostItem.js
+- webpack/react_app/components/TargetingHosts/components/HostStatus.js
+- webpack/react_app/components/TargetingHosts/index.js
 - webpack/react_app/components/jobInvocations/AggregateStatus/index.js
 - webpack/react_app/components/jobInvocations/AggregateStatus/index.test.js
 - webpack/react_app/components/jobInvocations/index.js