foreman_remote_execution 8.1.2 → 8.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e893a2f960dd325ecee23b756b471f36814aae3f9f902421b18635bb69b6323a
-  data.tar.gz: d916b70de7e3419e6d546942b112adfb8733ab7b62fe168651404568e5489d35
+  metadata.gz: 438d5bf70f43c95193398aa589bdb0970fca5fdb5fd4a5a7afc60a28edff9abc
+  data.tar.gz: 63726b6cb27feea113d85eee1bfe3b6600ea91856ca8ad38ecd3c9be24686cba
 SHA512:
-  metadata.gz: 27b59e2db3824b75f8038f214e76dc5abbf941ae91ed188c4d6dae97351d189bba6502b2e71e7f4b41b6f21b46a8772e56ee5fc0ee5095d5a281333b7c86cec8
-  data.tar.gz: 23231766b5d3f07590acc887d36da711b3859a3bbd581b5192a4bce3a3db45f263984a57993949768dab62cefcccc7d0dde75489f722ed3600732155407182cf
+  metadata.gz: 996b52c405b4cab9c1c67bc7350a068bc95f73786d6bb86057b5c91537af6501218ce0bf0d1ce52f888bab5d9f9203d756c78479cac4b37bff2c479c1383edbc
+  data.tar.gz: 57e732c23d9cae6a7d576b394f2176359ad08e09574bff8a70db9171f56fc8fd106db61e24b9a3dc6c3860cd372b7fb6f8a79a8868a05d03ccda31ab0daee2f1

data/app/models/job_invocation.rb

@@ -253,8 +253,9 @@ class JobInvocation < ApplicationRecord
         acc.merge(key => 0)
       end
     else
-      counts  = task.sub_tasks_counts
-      done    = counts.values_at(*map.results).reduce(:+)
+      counts = task.sub_tasks_counts
+      counts.default = 0
+      done = counts.values_at(*map.results).reduce(:+)
       percent = progress(counts[:total], done)
       counts.merge(:progress => percent, :failed => counts.values_at(*map.status_to_task_result(:failed)).reduce(:+))
     end

data/app/models/template_invocation.rb

@@ -34,6 +34,7 @@ class TemplateInvocation < ApplicationRecord
       :cancelled => :cancelled,
       :error     => :failed,
       :pending   => :pending,
+      :running   => :pending,
       :success   => :success,
       :warning   => :failed,
     }.with_indifferent_access

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '8.1.2'.freeze
+  VERSION = '8.2.0'.freeze
 end

data/test/unit/job_invocation_test.rb

@@ -130,6 +130,7 @@ class JobInvocationTest < ActiveSupport::TestCase
         :failed    => 0,
         :pending   => 0,
         :progress  => 0,
+        :running   => 0,
       }
     end
     before { job_invocation.task = task }

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

@@ -0,0 +1,45 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Row, Label } from 'patternfly-react';
+import { noop } from 'foremanReact/common/helpers';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+import './TargetingHostsLabelsRow.scss';
+
+const TargetingHostsLabelsRow = ({ query, updateQuery }) => {
+  const onDeleteClick = keyToDelete => {
+    const { [keyToDelete]: deleted, ...queryWithoutDeleted } = query;
+    updateQuery(queryWithoutDeleted);
+  };
+
+  const queryEntries = Object.entries(query);
+
+  return (
+    queryEntries.length > 0 && (
+      <Row className="tasks-labels-row">
+        <span className="title">{__('Active Filters:')}</span>
+        {queryEntries.map(([key, value]) => (
+          <Label
+            bsStyle="info"
+            key={key}
+            onRemoveClick={() => onDeleteClick(key)}
+          >
+            {`${key} = ${value}`}
+          </Label>
+        ))}
+      </Row>
+    )
+  );
+};
+
+TargetingHostsLabelsRow.propTypes = {
+  query: PropTypes.object,
+  updateQuery: PropTypes.func,
+};
+
+TargetingHostsLabelsRow.defaultProps = {
+  query: {},
+  updateQuery: noop,
+};
+
+export default TargetingHostsLabelsRow;

data/webpack/react_app/components/TargetingHosts/TargetingHostsLabelsRow.scss

@@ -0,0 +1,26 @@
+@import '~@theforeman/vendor/scss/variables';
+
+.tasks-labels-row {
+  margin: 0;
+  padding: 10px;
+  .title {
+    font-weight: 600;
+    font-size: 13px;
+  }
+  .label {
+    font-size: 100%;
+
+    margin-left: 5px;
+    margin-right: 5px;
+    a {
+      padding-left: 10px;
+    }
+  }
+  .pficon-close {
+    color: $color-pf-white;
+  }
+  .compound-label-pf {
+    margin-left: 0;
+    margin: 10px;
+  }
+}

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

@@ -5,14 +5,18 @@ import { Grid } from 'patternfly-react';
 import SearchBar from 'foremanReact/components/SearchBar';
 import Pagination from 'foremanReact/components/Pagination';
 import { getControllerSearchProps } from 'foremanReact/constants';
+import { noop } from 'foremanReact/common/helpers';
 
 import TargetingHosts from './TargetingHosts';
 import { TARGETING_HOSTS_AUTOCOMPLETE } from './TargetingHostsConsts';
 import './TargetingHostsPage.scss';
+import TargetingHostsLabelsRow from './TargetingHostsLabelsRow';
 
 const TargetingHostsPage = ({
   handleSearch,
   searchQuery,
+  statusFilter,
+  statusFilterReset,
   apiStatus,
   items,
   totalHosts,
@@ -23,7 +27,7 @@ const TargetingHostsPage = ({
     <Grid.Row>
       <Grid.Col md={6} className="title_filter">
         <SearchBar
-          onSearch={query => handleSearch(query)}
+          onSearch={query => handleSearch(query, statusFilter)}
           data={{
             ...getControllerSearchProps('hosts', TARGETING_HOSTS_AUTOCOMPLETE),
             autocomplete: {
@@ -37,6 +41,10 @@ const TargetingHostsPage = ({
         />
       </Grid.Col>
     </Grid.Row>
+    <TargetingHostsLabelsRow
+      query={statusFilter}
+      updateQuery={statusFilterReset}
+    />
     <br />
     <TargetingHosts apiStatus={apiStatus} items={items} />
     <Pagination
@@ -53,6 +61,8 @@ TargetingHostsPage.propTypes = {
   handleSearch: PropTypes.func.isRequired,
   searchQuery: PropTypes.string.isRequired,
   apiStatus: PropTypes.string,
+  statusFilter: PropTypes.object,
+  statusFilterReset: PropTypes.func,
   items: PropTypes.array.isRequired,
   totalHosts: PropTypes.number.isRequired,
   handlePagination: PropTypes.func.isRequired,
@@ -61,6 +71,8 @@ TargetingHostsPage.propTypes = {
 
 TargetingHostsPage.defaultProps = {
   apiStatus: null,
+  statusFilter: {},
+  statusFilterReset: noop,
 };
 
 export default TargetingHostsPage;

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

@@ -18,3 +18,8 @@ export const selectTotalHosts = state =>
 
 export const selectIntervalExists = state =>
   selectDoesIntervalExist(state, TARGETING_HOSTS);
+
+const defaultStatusFilter = {};
+export const selectStatusFilter = state =>
+  state.foremanRemoteExecutionReducers.jobInvocations
+    .jobInvocationStateFilter || defaultStatusFilter;

data/webpack/react_app/components/TargetingHosts/__tests__/__snapshots__/TargetingHostsPage.test.js.snap

@@ -38,6 +38,9 @@ exports[`TargetingHostsPage renders 1`] = `
       />
     </Col>
   </Row>
+  <TargetingHostsLabelsRow
+    query={Object {}}
+  />
   <br />
   <TargetingHosts
     apiStatus="RESOLVED"

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

@@ -14,10 +14,23 @@ import {
   selectAutoRefresh,
   selectTotalHosts,
   selectIntervalExists,
+  selectStatusFilter,
 } from './TargetingHostsSelectors';
 import { getApiUrl } from './TargetingHostsHelpers';
 import { TARGETING_HOSTS } from './TargetingHostsConsts';
 import TargetingHostsPage from './TargetingHostsPage';
+import { chartFilter } from '../../redux/actions/jobInvocations';
+
+const buildSearchQuery = (query, stateFilter) => {
+  const filters = Object.entries(stateFilter).map(
+    ([key, value]) => `${key} = ${value}`
+  );
+  return [query, filters]
+    .flat()
+    .filter(x => x)
+    .map(x => `(${x})`)
+    .join(' AND ');
+};
 
 const WrappedTargetingHosts = () => {
   const dispatch = useDispatch();
@@ -27,6 +40,7 @@ const WrappedTargetingHosts = () => {
   const items = useSelector(selectItems);
   const apiStatus = useSelector(selectApiStatus);
   const totalHosts = useSelector(selectTotalHosts);
+  const statusFilter = useSelector(selectStatusFilter);
   const [searchQuery, setSearchQuery] = useState('');
   const [pagination, setPagination] = useState({
     page: 1,
@@ -36,11 +50,11 @@ const WrappedTargetingHosts = () => {
   const [apiUrl, setApiUrl] = useState(getApiUrl(searchQuery, pagination));
   const intervalExists = useSelector(selectIntervalExists);
 
-  const handleSearch = query => {
+  const handleSearch = (query, status) => {
     const defaultPagination = { page: 1, per_page: pagination.per_page };
     stopApiInterval();
 
-    setApiUrl(getApiUrl(query, defaultPagination));
+    setApiUrl(getApiUrl(buildSearchQuery(query, status), defaultPagination));
     setSearchQuery(query);
     setPagination(defaultPagination);
   };
@@ -48,7 +62,7 @@ const WrappedTargetingHosts = () => {
   const handlePagination = args => {
     stopApiInterval();
     setPagination(args);
-    setApiUrl(getApiUrl(searchQuery, args));
+    setApiUrl(getApiUrl(buildSearchQuery(searchQuery, statusFilter), args));
   };
 
   const stopApiInterval = () => {
@@ -81,10 +95,16 @@ const WrappedTargetingHosts = () => {
     };
   }, [dispatch, apiUrl, autoRefresh]);
 
+  useEffect(() => {
+    handleSearch(searchQuery, statusFilter);
+  }, [statusFilter, searchQuery]);
+
   return (
     <TargetingHostsPage
       handleSearch={handleSearch}
       searchQuery={searchQuery}
+      statusFilter={statusFilter}
+      statusFilterReset={_x => chartFilter(null)(dispatch, null)}
       apiStatus={apiStatus}
       items={items}
       totalHosts={totalHosts}

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

@@ -1,33 +1,48 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-const AggregateStatus = ({ statuses }) => (
+const AggregateStatus = ({ statuses, chartFilter }) => (
   <div id="aggregate_statuses">
     <p className="card-pf-aggregate-status-notifications">
-      <span className="card-pf-aggregate-status-notification">
+      <a
+        className="card-pf-aggregate-status-notification"
+        onClick={() => chartFilter('success')}
+      >
         <span id="success_count">
           <span className="pficon pficon-ok" />
           {statuses.success}
         </span>
-      </span>
-      <span className="card-pf-aggregate-status-notification">
+      </a>
+
+      <a
+        className="card-pf-aggregate-status-notification"
+        onClick={() => chartFilter('failed')}
+      >
         <span id="failed_count">
           <span className="pficon pficon-error-circle-o" />
           {statuses.failed}
         </span>
-      </span>
-      <span className="card-pf-aggregate-status-notification">
+      </a>
+
+      <a
+        className="card-pf-aggregate-status-notification"
+        onClick={() => chartFilter('pending')}
+      >
         <span id="pending_count">
           <span className="pficon pficon-running" />
           {statuses.pending}
         </span>
-      </span>
-      <span className="card-pf-aggregate-status-notification">
+      </a>
+
+      <a
+        className="card-pf-aggregate-status-notification"
+        onClick={() => chartFilter('cancelled')}
+      >
         <span id="cancelled_count">
           <span className="pficon pficon-close" />
           {statuses.cancelled}
         </span>
-      </span>
+      </a>
     </p>
   </div>
 );
@@ -39,6 +54,7 @@ AggregateStatus.propTypes = {
     pending: PropTypes.number,
     success: PropTypes.number,
   }).isRequired,
+  chartFilter: PropTypes.func.isRequired,
 };
 
 export default AggregateStatus;

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

@@ -7,7 +7,9 @@ jest.unmock('./index.js');
 describe('AggregateStatus', () => {
   describe('has no data', () => {
     it('renders cards with no data', () => {
-      const chartNumbers = shallow(<AggregateStatus statuses={{}} />);
+      const chartNumbers = shallow(
+        <AggregateStatus statuses={{}} chartFilter={_x => {}} />
+      );
       const success = chartNumbers.find('#success_count').text();
       const failed = chartNumbers.find('#failed_count').text();
       const pending = chartNumbers.find('#pending_count').text();
@@ -25,7 +27,9 @@ describe('AggregateStatus', () => {
         cancelled: 31,
         pending: 3,
       };
-      const chartNumbers = shallow(<AggregateStatus statuses={statuses} />);
+      const chartNumbers = shallow(
+        <AggregateStatus statuses={statuses} chartFilter={_x => {}} />
+      );
       const success = chartNumbers.find('#success_count').text();
       const failed = chartNumbers.find('#failed_count').text();
       const pending = chartNumbers.find('#pending_count').text();

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

@@ -10,6 +10,13 @@ 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 colorMap = {
+  '#5CB85C': 'success',
+  '#D9534F': 'failed',
+  '#DEDEDE': 'pending',
+  '#B7312D': 'cancelled',
+};
+
 class JobInvocationContainer extends React.Component {
   componentDidMount() {
     const {
@@ -21,9 +28,14 @@ class JobInvocationContainer extends React.Component {
   }
 
   render() {
-    const { jobInvocations, statuses } = this.props;
+    const { jobInvocations, statuses, chartFilter } = this.props;
     const iMax = colIndexOfMaxValue(jobInvocations);
 
+    const map = jobInvocations.reduce(
+      (acc, [label, _count, color]) => ({ [label]: colorMap[color], ...acc }),
+      {}
+    );
+
     return (
       <div id="job_invocations_chart_container">
         <DonutChart
@@ -32,8 +44,11 @@ class JobInvocationContainer extends React.Component {
             type: 'percent',
             secondary: (jobInvocations[iMax] || [])[0],
           }}
+          onclick={(d, element) => {
+            chartFilter(map[d.name]);
+          }}
         />
-        <AggregateStatus statuses={statuses} />
+        <AggregateStatus statuses={statuses} chartFilter={chartFilter} />
       </div>
     );
   }
@@ -63,10 +78,12 @@ JobInvocationContainer.propTypes = {
     pending: PropTypes.number,
     success: PropTypes.number,
   }),
+  chartFilter: PropTypes.func,
 };
 
 JobInvocationContainer.defaultProps = {
   startJobInvocationsPolling: JobInvocationActions.startJobInvocationsPolling,
+  chartFilter: JobInvocationActions.chartFilter,
   data: {},
   jobInvocations: [['property', 3, 'color']],
   statuses: {},

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

@@ -76,3 +76,11 @@ export const startJobInvocationsPolling = url => (dispatch, getState) => {
   });
   dispatch(getJobInvocations(url));
 };
+
+export const chartFilter = state => (dispatch, getState) => {
+  const filter = state ? { 'job_invocation.result': state.toLowerCase() } : {};
+  dispatch({
+    type: 'JOB_INVOCATION_CHART_FILTER',
+    payload: { filter },
+  });
+};

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

@@ -26,6 +26,8 @@ export default (state = initialState, action) => {
       return state
         .set('jobInvocations', payload.jobInvocations.job_invocations)
         .set('statuses', payload.jobInvocations.statuses);
+    case 'JOB_INVOCATION_CHART_FILTER':
+      return state.set('jobInvocationStateFilter', payload.filter);
     default:
       return state;
   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 8.1.2
+  version: 8.2.0
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-13 00:00:00.000000000 Z
+date: 2023-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -508,6 +508,8 @@ files:
 - webpack/react_app/components/TargetingHosts/TargetingHosts.js
 - webpack/react_app/components/TargetingHosts/TargetingHostsConsts.js
 - webpack/react_app/components/TargetingHosts/TargetingHostsHelpers.js
+- webpack/react_app/components/TargetingHosts/TargetingHostsLabelsRow.js
+- webpack/react_app/components/TargetingHosts/TargetingHostsLabelsRow.scss
 - webpack/react_app/components/TargetingHosts/TargetingHostsPage.js
 - webpack/react_app/components/TargetingHosts/TargetingHostsPage.scss
 - webpack/react_app/components/TargetingHosts/TargetingHostsSelectors.js