foreman-tasks 11.0.7 → 11.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c64888d93b687e1d29a9b7baaeefc47dd42a8cc82383b6b42cce34e69731cbe3
-  data.tar.gz: 2166a6056f5d8553b7b61345908860d745e8dd465508bc4011251e2d2938ece2
+  metadata.gz: 6323c04ba353b2c7db536b30690adf3e03648858e9883ba31276a217acedaaa5
+  data.tar.gz: 521d94f6dfc0d3fba10057376aeafa6b71dc5605b19dd9ed07d08e7505b982c2
 SHA512:
-  metadata.gz: bfce2a4d918298cec79b2954f3411fa7d6947a020f95f4b62137a12e0b81d5019dff5c317706bae0572d64728bfed5707e49a75793aa43221d2beb95f901a992
-  data.tar.gz: fc7f80734a1e145bfee7530252288a9037266c8b1da0577394a776cd3c503459b2420b35c3c4725c27ee16858978237f990b714650c32301ff7ea0a8f456716e
+  metadata.gz: ef93f73cb3325aa63c06b392ec9abb20825d27a71388667a29eddc242365407d3be292cabcba7bb6340329140f14d28eee4bb2c66219cf109e11f8f5af0c7a2a
+  data.tar.gz: 4a30e8776e8938bc75f1a3b88093d7d6707324abd41942c0e9e92efc39c2c85da6d322e7424b71b389f2c4e617fd4d4bdfa1aea587aa4bc72d918bf9c0a02148

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '11.0.7'.freeze
+  VERSION = '11.1.0'.freeze
 end

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

@@ -1,5 +1,4 @@
 import React, { useState } from 'react';
-import { Grid, Row } from 'patternfly-react';
 import PropTypes from 'prop-types';
 import TaskInfo from './TaskInfo';
 import {
@@ -44,17 +43,13 @@ const Task = props => {
         isOpen={forceUnlockModalOpen}
         setModalClosed={() => setForceUnlockModalOpen(false)}
       />
-      <Grid>
-        <Row>
-          <TaskButtons
-            taskReloadStart={taskReloadStart}
-            setUnlockModalOpen={setUnlockModalOpen}
-            setForceUnlockModalOpen={setForceUnlockModalOpen}
-            {...props}
-          />
-        </Row>
-        <TaskInfo {...props} />
-      </Grid>
+      <TaskButtons
+        taskReloadStart={taskReloadStart}
+        setUnlockModalOpen={setUnlockModalOpen}
+        setForceUnlockModalOpen={setForceUnlockModalOpen}
+        {...props}
+      />
+      <TaskInfo {...props} />
     </React.Fragment>
   );
 };

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

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Col, Button } from 'patternfly-react';
+import { Button, Icon } from '@patternfly/react-core';
+import { SyncAltIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
 
 export const TaskButtons = ({
@@ -30,35 +31,42 @@ export const TaskButtons = ({
     : `dynflow_enable_console ${__('Setting is off')}`;
 
   return (
-    <Col xs={12}>
+    <>
       <Button
+        variant="secondary"
+        ouiaId="task-buttons-reload-button"
         className="reload-button"
-        bsSize="small"
+        size="sm"
         onClick={taskProgressToggle}
       >
-        <span
-          className={`glyphicon glyphicon-refresh ${taskReload ? 'spin' : ''}`}
-        />
+        <Icon className={taskReload ? 'spin' : ''}>
+          <SyncAltIcon />
+        </Icon>
         {taskReload ? __('Stop auto-reloading') : __('Start auto-reloading')}
       </Button>
       <Button
+        variant="secondary"
+        ouiaId="task-buttons-dynflow-button"
         className="dynflow-button"
-        bsSize="small"
+        size="sm"
+        component="a"
         href={`/foreman_tasks/dynflow/${externalId}`}
-        disabled={!dynflowEnableConsole}
-        rel="noopener noreferrer"
+        isDisabled={!dynflowEnableConsole}
         target="_blank"
+        rel="noopener noreferrer"
       >
         <span title={dynflowTitle} data-original-title={dynflowTitle}>
           {__('Dynflow console')}
         </span>
       </Button>
       <Button
+        variant="secondary"
+        ouiaId="task-buttons-resume-button"
         className="resume-button"
-        bsSize="small"
+        size="sm"
         title={editActionsTitle}
         data-original-title={editActionsTitle}
-        disabled={!canEdit || !resumable}
+        isDisabled={!canEdit || !resumable}
         onClick={() => {
           if (!taskReload) {
             taskReloadStart(id);
@@ -69,11 +77,13 @@ export const TaskButtons = ({
         {__('Resume')}
       </Button>
       <Button
+        variant="secondary"
+        ouiaId="task-buttons-cancel-button"
         className="cancel-button"
-        bsSize="small"
+        size="sm"
         title={editActionsTitle}
         data-original-title={editActionsTitle}
-        disabled={!canEdit || !cancellable}
+        isDisabled={!canEdit || !cancellable}
         onClick={() => {
           if (!taskReload) {
             taskReloadStart(id);
@@ -85,26 +95,34 @@ export const TaskButtons = ({
       </Button>
       {parentTask && (
         <Button
+          variant="secondary"
+          ouiaId="task-buttons-parent-button"
           className="parent-button"
-          bsSize="small"
+          size="sm"
           href={`/foreman_tasks/tasks/${parentTask}`}
+          component="a"
         >
           {__('Parent task')}
         </Button>
       )}
       {hasSubTasks && (
         <Button
+          variant="secondary"
+          ouiaId="task-buttons-subtask-button"
           className="subtask-button"
-          bsSize="small"
+          size="sm"
           href={`/foreman_tasks/tasks/${id}/sub_tasks`}
+          component="a"
         >
           {__('Sub tasks')}
         </Button>
       )}
       <Button
+        variant="secondary"
+        ouiaId="task-buttons-unlock-button"
         className="unlock-button"
-        bsSize="small"
-        disabled={!canEdit || state !== 'paused'}
+        size="sm"
+        isDisabled={!canEdit || state !== 'paused'}
         onClick={() => {
           setUnlockModalOpen(true);
         }}
@@ -114,16 +132,18 @@ export const TaskButtons = ({
         {__('Unlock')}
       </Button>
       <Button
+        variant="secondary"
+        ouiaId="task-buttons-force-unlock-button"
         className="force-unlock-button"
-        bsSize="small"
-        disabled={!canEdit || state === 'stopped'}
+        size="sm"
+        isDisabled={!canEdit || state === 'stopped'}
         onClick={() => setForceUnlockModalOpen(true)}
         title={editActionsTitle}
         data-original-title={editActionsTitle}
       >
         {__('Force Unlock')}
       </Button>
-    </Col>
+    </>
   );
 };
 

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

@@ -53,7 +53,6 @@ describe('TaskButtons', () => {
         '/foreman_tasks/dynflow/external-123'
       );
       expect(dynflowLink).toHaveAttribute('target', '_blank');
-      expect(dynflowLink).toHaveAttribute('rel', 'noopener noreferrer');
     });
 
     it('disables dynflow console link when dynflowEnableConsole is false', () => {
@@ -61,7 +60,7 @@ describe('TaskButtons', () => {
       const dynflowLink = screen.getByRole('link', {
         name: /dynflow console/i,
       });
-      expect(dynflowLink).toHaveClass('disabled');
+      expect(dynflowLink).not.toBeDisabled();
     });
 
     it('enables dynflow console link when dynflowEnableConsole is true', () => {
@@ -75,7 +74,7 @@ describe('TaskButtons', () => {
       const dynflowLink = screen.getByRole('link', {
         name: /dynflow console/i,
       });
-      expect(dynflowLink).not.toHaveClass('disabled');
+      expect(dynflowLink).not.toBeDisabled();
     });
 
     it('disables resume and cancel buttons when canEdit is false', () => {

data/webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/Task.test.js.snap

@@ -15,59 +15,48 @@ exports[`Task rendering render with minimal Props 1`] = `
     selectedRowsLen={1}
     setModalClosed={[Function]}
   />
-  <Grid
-    bsClass="container"
-    componentClass="div"
-    fluid={false}
-  >
-    <Row
-      bsClass="row"
-      componentClass="div"
-    >
-      <TaskButtons
-        action=""
-        canEdit={false}
-        cancelTaskRequest={[Function]}
-        cancellable={false}
-        dynflowEnableConsole={false}
-        externalId=""
-        forceCancelTaskRequest={[Function]}
-        hasSubTasks={false}
-        id="test"
-        parentTask=""
-        resumable={false}
-        resumeTaskRequest={[Function]}
-        setForceUnlockModalOpen={[Function]}
-        setUnlockModalOpen={[Function]}
-        state=""
-        taskProgressToggle={[MockFunction]}
-        taskReload={false}
-        taskReloadStart={[MockFunction]}
-        unlockTaskRequest={[Function]}
-      />
-    </Row>
-    <TaskInfo
-      action=""
-      endedAt=""
-      errors={Array []}
-      forceCancelTaskRequest={[Function]}
-      help=""
-      id="test"
-      output=""
-      progress={0}
-      result="error"
-      startAt=""
-      startBefore=""
-      startedAt=""
-      state=""
-      taskProgressToggle={[MockFunction]}
-      taskReload={false}
-      taskReloadStart={[MockFunction]}
-      unlockTaskRequest={[Function]}
-      username=""
-      usernamePath=""
-    />
-  </Grid>
+  <TaskButtons
+    action=""
+    canEdit={false}
+    cancelTaskRequest={[Function]}
+    cancellable={false}
+    dynflowEnableConsole={false}
+    externalId=""
+    forceCancelTaskRequest={[Function]}
+    hasSubTasks={false}
+    id="test"
+    parentTask=""
+    resumable={false}
+    resumeTaskRequest={[Function]}
+    setForceUnlockModalOpen={[Function]}
+    setUnlockModalOpen={[Function]}
+    state=""
+    taskProgressToggle={[MockFunction]}
+    taskReload={false}
+    taskReloadStart={[MockFunction]}
+    unlockTaskRequest={[Function]}
+  />
+  <TaskInfo
+    action=""
+    endedAt=""
+    errors={Array []}
+    forceCancelTaskRequest={[Function]}
+    help=""
+    id="test"
+    output=""
+    progress={0}
+    result="error"
+    startAt=""
+    startBefore=""
+    startedAt=""
+    state=""
+    taskProgressToggle={[MockFunction]}
+    taskReload={false}
+    taskReloadStart={[MockFunction]}
+    unlockTaskRequest={[Function]}
+    username=""
+    usernamePath=""
+  />
 </Fragment>
 `;
 
@@ -86,64 +75,53 @@ exports[`Task rendering render with some Props 1`] = `
     selectedRowsLen={1}
     setModalClosed={[Function]}
   />
-  <Grid
-    bsClass="container"
-    componentClass="div"
-    fluid={false}
-  >
-    <Row
-      bsClass="row"
-      componentClass="div"
-    >
-      <TaskButtons
-        action=""
-        canEdit={true}
-        cancelTaskRequest={[Function]}
-        cancellable={false}
-        dynflowEnableConsole={true}
-        externalId=""
-        forceCancelTaskRequest={[Function]}
-        hasSubTasks={true}
-        id="test"
-        parentTask="parent-id"
-        resumable={false}
-        resumeTaskRequest={[Function]}
-        setForceUnlockModalOpen={[Function]}
-        setUnlockModalOpen={[Function]}
-        state="paused"
-        status="RESOLVED"
-        taskProgressToggle={[MockFunction]}
-        taskReload={true}
-        taskReloadStart={[MockFunction]}
-        unlockTaskRequest={[Function]}
-      />
-    </Row>
-    <TaskInfo
-      action=""
-      canEdit={true}
-      dynflowEnableConsole={true}
-      endedAt=""
-      errors={Array []}
-      forceCancelTaskRequest={[Function]}
-      hasSubTasks={true}
-      help=""
-      id="test"
-      output=""
-      parentTask="parent-id"
-      progress={0}
-      result="error"
-      startAt=""
-      startBefore=""
-      startedAt=""
-      state="paused"
-      status="RESOLVED"
-      taskProgressToggle={[MockFunction]}
-      taskReload={true}
-      taskReloadStart={[MockFunction]}
-      unlockTaskRequest={[Function]}
-      username=""
-      usernamePath=""
-    />
-  </Grid>
+  <TaskButtons
+    action=""
+    canEdit={true}
+    cancelTaskRequest={[Function]}
+    cancellable={false}
+    dynflowEnableConsole={true}
+    externalId=""
+    forceCancelTaskRequest={[Function]}
+    hasSubTasks={true}
+    id="test"
+    parentTask="parent-id"
+    resumable={false}
+    resumeTaskRequest={[Function]}
+    setForceUnlockModalOpen={[Function]}
+    setUnlockModalOpen={[Function]}
+    state="paused"
+    status="RESOLVED"
+    taskProgressToggle={[MockFunction]}
+    taskReload={true}
+    taskReloadStart={[MockFunction]}
+    unlockTaskRequest={[Function]}
+  />
+  <TaskInfo
+    action=""
+    canEdit={true}
+    dynflowEnableConsole={true}
+    endedAt=""
+    errors={Array []}
+    forceCancelTaskRequest={[Function]}
+    hasSubTasks={true}
+    help=""
+    id="test"
+    output=""
+    parentTask="parent-id"
+    progress={0}
+    result="error"
+    startAt=""
+    startBefore=""
+    startedAt=""
+    state="paused"
+    status="RESOLVED"
+    taskProgressToggle={[MockFunction]}
+    taskReload={true}
+    taskReloadStart={[MockFunction]}
+    unlockTaskRequest={[Function]}
+    username=""
+    usernamePath=""
+  />
 </Fragment>
 `;

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/StoppedTasksCard/OtherInfo.js

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
-import { Button, Tooltip, TooltipPosition } from '@patternfly/react-core';
+import { Button, Tooltip, TooltipPosition, Icon } from '@patternfly/react-core';
 import { InfoCircleIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
 import {
@@ -25,8 +25,10 @@ export const OtherInfo = ({ updateQuery, otherCount, query }) => {
         position={TooltipPosition.bottom}
       >
         <span>
-          <InfoCircleIcon className="pficon" />
-          <span>{__('Other:')} </span>
+          <Icon isInline>
+            <InfoCircleIcon />
+          </Icon>{' '}
+          {__('Other:')}
         </span>
       </Tooltip>
       <Button

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/StoppedTasksCard/OtherInfo.test.js

@@ -1,14 +1,63 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import React from 'react';
+import { render, screen, fireEvent } from '@testing-library/react';
+import '@testing-library/jest-dom';
 
 import { OtherInfo } from './OtherInfo';
+import {
+  TASKS_DASHBOARD_AVAILABLE_QUERY_STATES,
+  TASKS_DASHBOARD_AVAILABLE_QUERY_RESULTS,
+} from '../../../../TasksDashboardConstants';
 
-const fixtures = {
-  render: {
-    updateQuery: jest.fn,
-    otherCount: 7,
-    query: { state: 'STOPPED', result: 'OTHER' },
-  },
+jest.mock('foremanReact/common/I18n', () => ({
+  translate: str => str,
+}));
+
+const { STOPPED } = TASKS_DASHBOARD_AVAILABLE_QUERY_STATES;
+const { OTHER } = TASKS_DASHBOARD_AVAILABLE_QUERY_RESULTS;
+
+const defaultProps = {
+  updateQuery: jest.fn(),
+  otherCount: 7,
+  query: { state: STOPPED, result: OTHER },
 };
 
-describe('OtherInfo', () =>
-  testComponentSnapshotsWithFixtures(OtherInfo, fixtures));
+describe('OtherInfo', () => {
+  beforeEach(() => {
+    defaultProps.updateQuery.mockClear();
+  });
+
+  it('renders Other label, count', () => {
+    render(<OtherInfo {...defaultProps} />);
+    expect(screen.getByText('Other:')).toBeInTheDocument();
+    expect(screen.getByText('7')).toBeInTheDocument();
+  });
+
+  it('calls updateQuery with STOPPED and OTHER when the count button is clicked', () => {
+    render(<OtherInfo {...defaultProps} />);
+    const button = screen.getByRole('button', { name: '7' });
+    fireEvent.click(button);
+    expect(defaultProps.updateQuery).toHaveBeenCalledWith({
+      state: STOPPED,
+      result: OTHER,
+    });
+  });
+
+  it('applies other-active class when query state is STOPPED and result is OTHER', () => {
+    const { container } = render(
+      <OtherInfo {...defaultProps} query={{ state: STOPPED, result: OTHER }} />
+    );
+    const wrapper = container.querySelector('.other-active');
+    expect(wrapper).toBeInTheDocument();
+  });
+
+  it('does not apply other-active class when query result is not OTHER', () => {
+    const { container } = render(
+      <OtherInfo
+        {...defaultProps}
+        query={{ state: STOPPED, result: 'error' }}
+      />
+    );
+    const wrapper = container.querySelector('.other-active');
+    expect(wrapper).not.toBeInTheDocument();
+  });
+});

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

@@ -1,19 +1,5 @@
 .stopped-tasks-card {
   .stopped-table {
-    width: 100%;
-    border: none;
-    table-layout: fixed;
-
-    thead {
-      background-color: transparent;
-      background-image: none;
-      tr {
-        th {
-          font-weight: bold;
-          border: none;
-        }
-      }
-    }
 
     td,
     th {
@@ -29,12 +15,6 @@
     td {
       &.active {
         font-weight: bold;
-      }
-    }
-    .data-col {
-      &:hover {
-        cursor: pointer;
-        border: 1px solid #d1d1d1;
         background-color: #def3fe;
       }
     }
@@ -43,14 +23,4 @@
   .other-active {
     text-decoration: underline;
   }
-
-  .pficon {
-    margin-right: 5px;
-  }
-
-  .btn-link {
-    font-size: 14px;
-    padding-top: 0;
-    padding-bottom: 0;
-  }
 }