foreman-tasks 13.1.0 → 13.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 270e537ec64af9327b2598da48e8422a56adc1716e45ee5105cb57c9bd2d1078
-  data.tar.gz: da3627e82bdecfcd63516cf3e973461b22762023374ee58ac105e7f9e66c2cf7
+  metadata.gz: a192677704918d5f7e81554fb38e70f389a795c021c4889f6f910fa992a1bed7
+  data.tar.gz: 000732f9d423e0bc8ba6293f7150a631de785535a94d6b5004d40922768897d1
 SHA512:
-  metadata.gz: dc37e5ebbdb2aa62a131d2828a619f00c68b1c6c262a78df83671801b7047eeafd2bd31fd43e52fff79d7a9b2bb69267a950bd2e71babc6569c20d55a90caab2
-  data.tar.gz: ba180fe7ad221035c14474ed9b1cc62795d2d90ff585fdc0304bda52432e43917829d016abd03e18e68ffcb9654f1a73864695d93fe1219214f7a14d43de0033
+  metadata.gz: d6e131b3624a79ef45aca8c87674938bcc7b2b8c1c0be6652251b6818f0bb1a4ad3843b976d2394901ffe861d7e153fdaeb764c1b44c0cdcbddb46d73d06c6f9
+  data.tar.gz: 95888cc143cb58b40d0485d6c67f71c95e9e8e88d08f086b31982f9cfc3693aee68cecd885984581e7fb704feee3978d6e601551b6b200413036f6cbfd0c3336

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '13.1.0'.freeze
+  VERSION = '13.2.0'.freeze
 end

data/webpack/ForemanTasks/Components/Chart/Chart.js

@@ -17,6 +17,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { findDOMNode } from 'react-dom';
 
+const DESTROY_DELAY_MS = 1000;
+
 let c3;
 
 class C3Chart extends React.Component {
@@ -44,7 +46,7 @@ class C3Chart extends React.Component {
       // Delaying the destroy a bit seems to resolve the issue.
       // The chart API methods are already bind explicitly, therefore we don't need
       // any special handling when passing the function.
-      setTimeout(this.chart.destroy, 1000);
+      setTimeout(this.chart.destroy, DESTROY_DELAY_MS);
       this.chart = null;
     } catch (err) {
       throw new Error('Internal C3 error', err);

data/webpack/ForemanTasks/Components/TaskActions/TaskActionHelpers.js

@@ -1,6 +1,11 @@
 import { translate as __, sprintf } from 'foremanReact/common/I18n';
 import { addToast } from 'foremanReact/components/ToastsList';
 import { getURIQuery } from 'foremanReact/common/helpers';
+import {
+  MINUTES_PER_HOUR,
+  SECONDS_PER_MINUTE,
+  MS_PER_SECOND,
+} from 'foremanReact/constants';
 import { TASKS_DASHBOARD_JS_QUERY_MODES } from '../TasksDashboard/TasksDashboardConstants';
 import { timeToHoursNumber } from '../TasksDashboard/TasksDashboardHelper';
 import {
@@ -25,7 +30,9 @@ export const convertDashboardQuery = () => {
   } = getTasksQuery();
 
   const hours = timeToHoursNumber(timeHorizon);
-  const timestamp = new Date(new Date() - hours * 60 * 60 * 1000);
+  const timestamp = new Date(
+    new Date() - hours * MINUTES_PER_HOUR * SECONDS_PER_MINUTE * MS_PER_SECOND
+  );
   let dashboardTime = '';
   const stateQuery = state ? `state=${state}` : '';
   let resultQuery = '';

data/webpack/ForemanTasks/Components/TaskActions/TaskActionsConstants.js

@@ -14,3 +14,4 @@ export const TASKS_FORCE_CANCEL_FAILURE = 'TASKS_FORCE_CANCEL_FAILURE';
 export const TASKS_UNLOCK_REQUEST = 'TASKS_UNLOCK_REQUEST';
 export const TASKS_UNLOCK_SUCCESS = 'TASKS_UNLOCK_SUCCESS';
 export const TASKS_UNLOCK_FAILURE = 'TASKS_UNLOCK_FAILURE';
+

data/webpack/ForemanTasks/Components/TaskDetails/Components/TaskButtons.scss

@@ -9,7 +9,7 @@
     -ms-transform-origin: 50% 50%; /* IE 9 */
   }
 
-  @-moz-keyframes spin {
+  @keyframes spin {
     from {
       -moz-transform: rotate(0deg);
     }
@@ -19,7 +19,7 @@
     }
   }
 
-  @-webkit-keyframes spin {
+  @keyframes spin {
     from {
       -webkit-transform: rotate(0deg);
     }

data/webpack/ForemanTasks/Components/TaskDetails/Components/TaskHelper.js

@@ -1,6 +1,7 @@
 import { translate as __, documentLocale } from 'foremanReact/common/I18n';
 import { isoCompatibleDate } from 'foremanReact/common/helpers';
 import humanizeDuration from 'humanize-duration';
+import { MS_PER_SECOND } from 'foremanReact/constants';
 
 export const durationInWords = (
   start,
@@ -16,7 +17,9 @@ export const durationInWords = (
       language: selectedLocale,
       fallbacks: ['en'],
     }),
-    tooltip: `${numberWithDelimiter((finish - start) / 1000)} ${__('seconds')}`,
+    tooltip: `${numberWithDelimiter((finish - start) / MS_PER_SECOND)} ${__(
+      'seconds'
+    )}`,
   };
 };
 

data/webpack/ForemanTasks/Components/TaskDetails/ExecutionDetails.js

@@ -14,18 +14,23 @@ const ExecutionDetails = ({
   failedSteps,
   result,
 }) => {
-  const showingRunningSteps =
-    state === 'running' ||
-    state === 'pending' ||
-    state === 'paused' ||
-    runningSteps.length > 0;
+  const hasFailedSteps = failedSteps.length > 0;
+  const hasRunningSteps = runningSteps.length > 0;
+  const isActiveExecutionState =
+    state === 'running' || state === 'pending' || state === 'paused';
+
+  // Prefer Errors when failed steps exist (e.g. paused-after-error). Only fall
+  // back to the RunningSteps empty state for active tasks with no failures.
+  const showRunningSteps =
+    hasRunningSteps || (isActiveExecutionState && !hasFailedSteps);
+  const showErrors = hasFailedSteps || !showRunningSteps;
 
   return (
     <div
       id="execution-details-panel"
       data-ouia-component-id="execution-details-panel"
     >
-      {showingRunningSteps ? (
+      {showRunningSteps && (
         <RunningSteps
           executionPlan={executionPlan}
           result={result}
@@ -35,7 +40,8 @@ const ExecutionDetails = ({
           taskReload={taskReload}
           taskReloadStart={taskReloadStart}
         />
-      ) : (
+      )}
+      {showErrors && (
         <Errors executionPlan={executionPlan} failedSteps={failedSteps} />
       )}
     </div>

data/webpack/ForemanTasks/Components/TaskDetails/TaskDetails.scss

@@ -3,6 +3,7 @@
   #pf-tab-section-1-task-details-tabs > button {
     margin-right: 3px;
   }
+
   .container {
     margin: 0;
   }

data/webpack/ForemanTasks/Components/TaskDetails/TaskDetailsActions.js

@@ -6,7 +6,11 @@ import {
   stopInterval,
 } from 'foremanReact/redux/middlewares/IntervalMiddleware';
 import { foremanTasksApiPath, foremanTasksPath } from '../common/urlHelpers';
-import { TASK_STEP_CANCEL, FOREMAN_TASK_DETAILS } from './TaskDetailsConstants';
+import {
+  TASK_STEP_CANCEL,
+  FOREMAN_TASK_DETAILS,
+  TASK_RELOAD_INTERVAL_MS,
+} from './TaskDetailsConstants';
 import {
   errorToastData,
   infoToastData,
@@ -30,7 +34,7 @@ export const taskReloadStart = id => dispatch => {
           dispatch(stopInterval(FOREMAN_TASK_DETAILS));
         },
       }),
-      5000
+      TASK_RELOAD_INTERVAL_MS
     )
   );
 };

data/webpack/ForemanTasks/Components/TaskDetails/TaskDetailsConstants.js

@@ -3,3 +3,5 @@ export const FOREMAN_TASK_DETAILS_SUCCESS = 'FOREMAN_TASK_DETAILS_SUCCESS';
 export const TASKS_PATH = '/foreman_tasks/tasks';
 export const TASK_STEP_CANCEL = 'TASK_STEP_CANCEL';
 export const VIEW_FOREMAN_TASKS = 'view_foreman_tasks';
+
+export const TASK_RELOAD_INTERVAL_MS = 5000;

data/webpack/ForemanTasks/Components/TaskDetails/TaskDetailsSelectors.js

@@ -5,7 +5,7 @@ import {
   selectAPIError as selectAPIErrorByKey,
 } from 'foremanReact/redux/API/APISelectors';
 import { selectDoesIntervalExist } from 'foremanReact/redux/middlewares/IntervalMiddleware/IntervalSelectors';
-import { STATUS } from 'foremanReact/constants';
+import { STATUS, PERCENT_MULTIPLIER } from 'foremanReact/constants';
 import { selectForemanTasks } from '../../ForemanTasksSelectors';
 import { FOREMAN_TASK_DETAILS } from './TaskDetailsConstants';
 
@@ -41,7 +41,7 @@ export const selectCancellable = state =>
 
 export const selectProgress = state =>
   selectTaskDetailsResponse(state).progress
-    ? Math.trunc(selectTaskDetailsResponse(state).progress * 100)
+    ? Math.trunc(selectTaskDetailsResponse(state).progress * PERCENT_MULTIPLIER)
     : 0;
 
 export const selectUsername = state =>

data/webpack/ForemanTasks/Components/TaskDetails/__tests__/ExecutionDetails.test.js

@@ -28,9 +28,13 @@ describe('ExecutionDetails', () => {
     );
 
     expect(
-      document.querySelector('[data-ouia-component-id="execution-details-panel"]')
+      document.querySelector(
+        '[data-ouia-component-id="execution-details-panel"]'
+      )
+    ).toBeInTheDocument();
+    expect(
+      document.getElementById('execution-details-panel')
     ).toBeInTheDocument();
-    expect(document.getElementById('execution-details-panel')).toBeInTheDocument();
   });
 
   it('shows Errors pane when stopped with no running steps', () => {
@@ -44,7 +48,9 @@ describe('ExecutionDetails', () => {
       />
     );
 
-    expect(screen.getByRole('heading', { name: /^no errors found$/i })).toBeInTheDocument();
+    expect(
+      screen.getByRole('heading', { name: /^no errors found$/i })
+    ).toBeInTheDocument();
     expect(
       screen.getByText(/the task finished with no errors or warnings/i)
     ).toBeInTheDocument();
@@ -127,9 +133,7 @@ describe('ExecutionDetails', () => {
         name: /action actions::katello::eventqueue::monitor is already active/i,
       })
     ).toBeInTheDocument();
-    expect(
-      screen.getByLabelText(/failed task errors/i)
-    ).toBeInTheDocument();
+    expect(screen.getByLabelText(/failed task errors/i)).toBeInTheDocument();
     expect(screen.getByText('Exception:')).toBeInTheDocument();
   });
 
@@ -191,4 +195,47 @@ describe('ExecutionDetails', () => {
     ).toBeInTheDocument();
     expect(screen.getByText('paused')).toBeInTheDocument();
   });
+
+  it('shows Errors when state is paused with failed steps', () => {
+    render(
+      <ExecutionDetails
+        {...rtlBaseProps}
+        {...fixtureFailedExecutionDetail}
+        state="paused"
+        executionPlan={{ state: 'paused', cancellable: false }}
+        runningSteps={[]}
+      />
+    );
+
+    expect(
+      screen.getByRole('tab', {
+        name: /action actions::katello::eventqueue::monitor is already active/i,
+      })
+    ).toBeInTheDocument();
+    expect(screen.getByLabelText(/failed task errors/i)).toBeInTheDocument();
+    expect(screen.getByText('Exception:')).toBeInTheDocument();
+    expect(screen.queryByText(/no running steps/i)).not.toBeInTheDocument();
+  });
+
+  it('shows Errors and RunningSteps when paused with both failed and running steps', () => {
+    render(
+      <ExecutionDetails
+        {...rtlBaseProps}
+        {...fixtureFailedExecutionDetail}
+        state="paused"
+        executionPlan={{ state: 'paused', cancellable: false }}
+        runningSteps={[
+          {
+            ...fixtureRunningExecutionDetail.runningSteps[0],
+            state: 'suspended',
+          },
+        ]}
+      />
+    );
+
+    expect(
+      screen.getByRole('heading', { name: 'Warning alert: Running step 1' })
+    ).toBeInTheDocument();
+    expect(screen.getByLabelText(/failed task errors/i)).toBeInTheDocument();
+  });
 });

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/StoppedTasksCard/StoppedTasksCard.scss

@@ -1,6 +1,5 @@
 .stopped-tasks-card {
   .stopped-table {
-
     td,
     th {
       text-align: center;

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/TasksDonutCard/TasksDonutCard.scss

@@ -5,6 +5,7 @@
       opacity: 0.6;
     }
   }
+
   .pf-v5-c-card__title-text {
     text-align: center;
     cursor: pointer;

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksLabelsRow/TasksLabelsRow.scss

@@ -1,5 +1,6 @@
 .tasks-labels-row {
   align-items: center;
+
   ul {
     margin: 0;
   }

data/webpack/ForemanTasks/Components/TasksDashboard/TasksDashboardHelper.js

@@ -1,5 +1,10 @@
 import { getURIQuery } from 'foremanReact/common/helpers';
 
+import {
+  HOURS_PER_HALF_DAY,
+  HOURS_PER_DAY,
+  DAYS_PER_WEEK,
+} from 'foremanReact/constants';
 import {
   TASKS_DASHBOARD_AVAILABLE_TIMES,
   TASKS_DASHBOARD_QUERY_KEYS_TEXT,
@@ -16,13 +21,13 @@ export const getQueryValueText = value =>
 export const timeToHoursNumber = time => {
   switch (time) {
     case TASKS_DASHBOARD_AVAILABLE_TIMES.H12:
-      return 12;
+      return HOURS_PER_HALF_DAY;
     case TASKS_DASHBOARD_AVAILABLE_TIMES.H24:
-      return 24;
+      return HOURS_PER_DAY;
     case TASKS_DASHBOARD_AVAILABLE_TIMES.WEEK:
-      return 24 * 7;
+      return HOURS_PER_DAY * DAYS_PER_WEEK;
     default:
-      return 24;
+      return HOURS_PER_DAY;
   }
 };
 

data/webpack/ForemanTasks/Components/TasksTable/TasksTableHelpers.js

@@ -2,6 +2,7 @@ import URI from 'urijs';
 import { translate as __, documentLocale } from 'foremanReact/common/I18n';
 import humanizeDuration from 'humanize-duration';
 import { isoCompatibleDate } from 'foremanReact/common/helpers';
+import { MS_PER_SECOND } from 'foremanReact/constants';
 import { convertDashboardQuery } from '../TaskActions/TaskActionHelpers';
 
 export const updateURlQuery = (query, history) => {
@@ -51,7 +52,7 @@ export const getDuration = (start, finish) => {
   const duration = finishDate - startDate;
   return {
     text:
-      duration > 0 && duration < 1000
+      duration > 0 && duration < MS_PER_SECOND
         ? __('Less than a second')
         : humanizeDuration(duration, dateOptions),
   };

data/webpack/ForemanTasks/Components/common/taskResultIcon.js

@@ -5,49 +5,59 @@ import {
   ExclamationCircleIcon,
   ExclamationTriangleIcon,
   QuestionCircleIcon,
+  InProgressIcon,
 } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
 
+const RESULT_ICONS = {
+  success: {
+    status: 'success',
+    title: () => __('Success'),
+    IconComponent: CheckCircleIcon,
+  },
+  error: {
+    status: 'danger',
+    title: () => __('Error'),
+    IconComponent: ExclamationCircleIcon,
+  },
+  warning: {
+    status: 'warning',
+    title: () => __('Warning'),
+    IconComponent: ExclamationTriangleIcon,
+  },
+};
+
+const UNKNOWN_RESULT_ICON = {
+  status: undefined,
+  title: () => __('Unknown'),
+  IconComponent: QuestionCircleIcon,
+};
+
 /**
  * Icon reflecting task state/result (aligned with TaskInfo / tasks table).
  *
  * @param {string} state Dynflow task state (e.g. stopped, running).
  * @param {string} [result] Result when stopped (success, error, warning, …).
+ * @param {boolean} isTitleIcon Whether the icon should be used as a title icon.
  * @returns {React.ReactElement}
  */
-export const taskResultIconEl = (state, result) => {
+export const taskResultIconEl = (state, result, isTitleIcon = false) => {
+  const size = isTitleIcon ? 'lg' : 'md';
+
   if (state && state !== 'stopped') {
     return (
-      <Icon title={__('Running')}>
-        <QuestionCircleIcon />
+      <Icon title={__('Running')} status="info" isInline size={size}>
+        <InProgressIcon />
       </Icon>
     );
   }
 
-  switch (result) {
-    case 'success':
-      return (
-        <Icon status="success" title={__('Success')}>
-          <CheckCircleIcon />
-        </Icon>
-      );
-    case 'error':
-      return (
-        <Icon status="danger" title={__('Error')}>
-          <ExclamationCircleIcon />
-        </Icon>
-      );
-    case 'warning':
-      return (
-        <Icon status="warning" title={__('Warning')}>
-          <ExclamationTriangleIcon />
-        </Icon>
-      );
-    default:
-      return (
-        <Icon title={__('Unknown')}>
-          <QuestionCircleIcon />
-        </Icon>
-      );
-  }
+  const { status, title, IconComponent } =
+    RESULT_ICONS[result] || UNKNOWN_RESULT_ICON;
+
+  return (
+    <Icon title={title()} status={status} isInline size={size}>
+      <IconComponent />
+    </Icon>
+  );
 };

data/webpack/ForemanTasks/Routes/ShowTaskDetails/TaskDetailsHeader.js

@@ -33,7 +33,7 @@ const TitleComponent = ({ action, state, result }) => (
         {action || __('Task Details')}
       </Title>
     </FlexItem>
-    <FlexItem>{taskResultIconEl(state, result)}</FlexItem>
+    <FlexItem>{taskResultIconEl(state, result, true)}</FlexItem>
   </Flex>
 );
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 13.1.0
+  version: 13.2.0
 platform: ruby
 authors:
 - Ivan Nečas
@@ -511,7 +511,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Foreman plugin for showing tasks information for resources and users
 test_files: