foreman-tasks 11.1.0 → 12.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6323c04ba353b2c7db536b30690adf3e03648858e9883ba31276a217acedaaa5
-  data.tar.gz: 521d94f6dfc0d3fba10057376aeafa6b71dc5605b19dd9ed07d08e7505b982c2
+  metadata.gz: 7ca02aa356eb223ac95653b1a27efcdf2b8b38a7dca41f947e9c29c7655632cb
+  data.tar.gz: c67e4b53d065a81e9744919e90b63743b8919d56116313e18ad468db0fac1be9
 SHA512:
-  metadata.gz: ef93f73cb3325aa63c06b392ec9abb20825d27a71388667a29eddc242365407d3be292cabcba7bb6340329140f14d28eee4bb2c66219cf109e11f8f5af0c7a2a
-  data.tar.gz: 4a30e8776e8938bc75f1a3b88093d7d6707324abd41942c0e9e92efc39c2c85da6d322e7424b71b389f2c4e617fd4d4bdfa1aea587aa4bc72d918bf9c0a02148
+  metadata.gz: a9380c9445247ccbca6896e389762c5c5f7356bfc876adad55b29adc2d75339ecc3a572274650c34ef67e363e396860d75edebb8d41884940e4de51564dbfc7f
+  data.tar.gz: 40edbd36d1f8dd923ec796497052e934361294835444eea0eff9a479303778cb21a3d2c73ac7e336418b7eb4994eb372133de564011916a654f417e54612f0d0

data/app/views/foreman_tasks/api/tasks/dependency_summary.json.rabl

@@ -0,0 +1,4 @@
+object @task
+
+attributes :id, :action, :state, :result
+node(:humanized) { @task.humanized[:action] }

data/app/views/foreman_tasks/api/tasks/details.json.rabl

@@ -18,3 +18,23 @@ node(:links) do
 end
 node(:username_path) { username_link_task(@task.owner, @task.username) }
 node(:dynflow_enable_console) { Setting['dynflow_enable_console'] }
+node(:depends_on) do
+  if @task.execution_plan
+    dynflow_uuids = ForemanTasks.dynflow.world.persistence.find_execution_plan_dependencies(@task.execution_plan.id)
+    ForemanTasks::Task.where(external_id: dynflow_uuids).map do |task|
+      partial('foreman_tasks/api/tasks/dependency_summary', :object => task)
+    end
+  else
+    []
+  end
+end
+node(:blocks) do
+  if @task.execution_plan
+    dynflow_uuids = ForemanTasks.dynflow.world.persistence.find_blocked_execution_plans(@task.execution_plan.id)
+    ForemanTasks::Task.where(external_id: dynflow_uuids).map do |task|
+      partial('foreman_tasks/api/tasks/dependency_summary', :object => task)
+    end
+  else
+    []
+  end
+end

data/lib/foreman_tasks/engine.rb

@@ -17,8 +17,10 @@ module ForemanTasks
     end
 
     initializer 'foreman_tasks.register_plugin', :before => :finisher_hook do
+      require 'foreman/cron'
+
       Foreman::Plugin.register :"foreman-tasks" do
-        requires_foreman '>= 3.15'
+        requires_foreman '>= 3.19'
         divider :top_menu, :parent => :monitor_menu, :last => true, :caption => N_('Foreman Tasks')
         menu :top_menu, :tasks,
              :url_hash => { :controller => 'foreman_tasks/tasks', :action => :index },
@@ -124,6 +126,9 @@ module ForemanTasks
         widget 'foreman_tasks/tasks/dashboard/latest_tasks_in_error_warning', :sizex => 6, :sizey => 1, :name => N_('Latest Warning/Error Tasks')
 
         register_gettext domain: "foreman_tasks"
+
+        # Register recurring task with Foreman::Cron framework
+        Foreman::Cron.register(:daily, 'foreman_tasks:cleanup')
       end
     end
 

data/lib/foreman_tasks/triggers.rb

@@ -25,5 +25,9 @@ module ForemanTasks
     def delay(action, delay_options, *args)
       foreman_tasks.delay(action, delay_options, *args)
     end
+
+    def chain(dependencies, action, *args)
+      foreman_tasks.chain(dependencies, action, *args)
+    end
   end
 end

data/lib/foreman_tasks/version.rb

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

data/lib/foreman_tasks.rb

@@ -62,6 +62,30 @@ module ForemanTasks
     ForemanTasks::Task::DynflowTask.where(:external_id => result.id).first!
   end
 
+  # Chain a task to wait for dependency task(s) to finish before executing.
+  # The chained task remains 'scheduled' until all dependencies reach 'stopped' state.
+  #
+  # @param dependencies [ForemanTasks::Task, Array<ForemanTasks::Task>, ActiveRecord::Relation]
+  #   Dependency ForemanTasks task object(s) or an ActiveRecord relation of tasks.
+  # @param action [Class] Action class to execute
+  # @param args Arguments to pass to the action
+  # @return [ForemanTasks::Task::DynflowTask] The chained task
+  def self.chain(dependencies, action, *args)
+    plan_uuids =
+      if dependencies.is_a?(ActiveRecord::Relation)
+        dependencies.pluck(:external_id)
+      else
+        Array(dependencies).map(&:external_id)
+      end
+
+    if plan_uuids.any?(&:blank?)
+      raise ArgumentError, 'All dependency tasks must have external_id set'
+    end
+
+    result = dynflow.world.chain(plan_uuids, action, *args)
+    ForemanTasks::Task::DynflowTask.where(:external_id => result.id).first!
+  end
+
   def self.register_scheduled_task(task_class, cronline)
     ForemanTasks::RecurringLogic.transaction(isolation: :serializable) do
       return if ForemanTasks::RecurringLogic.joins(:tasks)

data/test/unit/chaining_test.rb

@@ -0,0 +1,62 @@
+require 'foreman_tasks_test_helper'
+
+module ForemanTasks
+  class ChainingTest < ActiveSupport::TestCase
+    include ForemanTasks::TestHelpers::WithInThreadExecutor
+
+    before do
+      User.current = User.where(:login => 'apiadmin').first
+    end
+
+    it 'creates a scheduled task chained to a dependency task' do
+      triggered = ForemanTasks.trigger(Support::DummyDynflowAction)
+      triggered.finished.wait(30)
+      dependency_task = ForemanTasks::Task::DynflowTask.find_by!(:external_id => triggered.id)
+
+      task = ForemanTasks.chain(dependency_task, Support::DummyDynflowAction)
+
+      assert_kind_of ForemanTasks::Task::DynflowTask, task
+      assert_predicate task, :scheduled?
+
+      dependencies = ForemanTasks.dynflow.world.persistence.find_execution_plan_dependencies(task.execution_plan.id)
+      assert_includes dependencies, dependency_task.external_id
+    end
+
+    it 'accepts multiple dependency tasks' do
+      triggered_1 = ForemanTasks.trigger(Support::DummyDynflowAction)
+      triggered_2 = ForemanTasks.trigger(Support::DummyDynflowAction)
+      triggered_1.finished.wait(30)
+      triggered_2.finished.wait(30)
+      dependency_task_1 = ForemanTasks::Task::DynflowTask.find_by!(:external_id => triggered_1.id)
+      dependency_task_2 = ForemanTasks::Task::DynflowTask.find_by!(:external_id => triggered_2.id)
+
+      task = ForemanTasks.chain([dependency_task_1, dependency_task_2], Support::DummyDynflowAction)
+
+      dependencies = ForemanTasks.dynflow.world.persistence.find_execution_plan_dependencies(task.execution_plan.id)
+      assert_includes dependencies, dependency_task_1.external_id
+      assert_includes dependencies, dependency_task_2.external_id
+    end
+
+    it 'accepts dependency task objects' do
+      triggered = ForemanTasks.trigger(Support::DummyDynflowAction)
+      triggered.finished.wait(30)
+      dependency_task = ForemanTasks::Task::DynflowTask.find_by!(:external_id => triggered.id)
+
+      task = ForemanTasks.chain(dependency_task, Support::DummyDynflowAction)
+
+      dependencies = ForemanTasks.dynflow.world.persistence.find_execution_plan_dependencies(task.execution_plan.id)
+      assert_includes dependencies, dependency_task.external_id
+    end
+
+    it 'accepts dependency tasks as a relation' do
+      triggered = ForemanTasks.trigger(Support::DummyDynflowAction)
+      triggered.finished.wait(30)
+      dependency_task = ForemanTasks::Task::DynflowTask.find_by!(:external_id => triggered.id)
+
+      task = ForemanTasks.chain(ForemanTasks::Task::DynflowTask.where(:id => dependency_task.id), Support::DummyDynflowAction)
+
+      dependencies = ForemanTasks.dynflow.world.persistence.find_execution_plan_dependencies(task.execution_plan.id)
+      assert_includes dependencies, dependency_task.external_id
+    end
+  end
+end

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

@@ -0,0 +1,93 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+  Alert,
+  AlertVariant,
+  Grid,
+  GridItem,
+  Title,
+} from '@patternfly/react-core';
+import { Table, Thead, Tbody, Tr, Th, Td } from '@patternfly/react-table';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+const DependencyTable = ({ title, tasks }) => {
+  const tableId = title.toLowerCase().replace(/\s+/g, '-');
+  return (
+    <div>
+      <Title headingLevel="h4" size="md" ouiaId={`${tableId}-title`}>
+        {title}
+      </Title>
+      {tasks.length === 0 ? (
+        <p className="text-muted">{__('None')}</p>
+      ) : (
+        <Table aria-label={title} variant="compact" ouiaId={`${tableId}-table`}>
+          <Thead>
+            <Tr ouiaId={`${tableId}-table-header`}>
+              <Th width={50}>{__('Action')}</Th>
+              <Th width={25}>{__('State')}</Th>
+              <Th width={25}>{__('Result')}</Th>
+            </Tr>
+          </Thead>
+          <Tbody>
+            {tasks.map(task => (
+              <Tr key={task.id} ouiaId={`${tableId}-table-row-${task.id}`}>
+                <Td>
+                  <a href={`/foreman_tasks/tasks/${task.id}`}>
+                    {task.humanized || task.action}
+                  </a>
+                </Td>
+                <Td>{task.state}</Td>
+                <Td>{task.result}</Td>
+              </Tr>
+            ))}
+          </Tbody>
+        </Table>
+      )}
+    </div>
+  );
+};
+
+DependencyTable.propTypes = {
+  title: PropTypes.string.isRequired,
+  tasks: PropTypes.array,
+};
+
+DependencyTable.defaultProps = {
+  tasks: [],
+};
+
+const Dependencies = ({ dependsOn, blocks }) => (
+  <div>
+    <Alert
+      variant={AlertVariant.info}
+      isInline
+      title={__('Task dependencies')}
+      ouiaId="task-dependencies-info-alert"
+    >
+      {__(
+        'This task may have dependencies on other tasks or may be blocking other tasks from executing. Dependencies are established through task chaining relationships.'
+      )}
+    </Alert>
+    <br />
+    <Grid hasGutter>
+      <GridItem span={6}>
+        <DependencyTable title={__('Depends on')} tasks={dependsOn} />
+      </GridItem>
+      <GridItem span={6}>
+        <DependencyTable title={__('Blocks')} tasks={blocks} />
+      </GridItem>
+    </Grid>
+  </div>
+);
+
+Dependencies.propTypes = {
+  dependsOn: PropTypes.array,
+  blocks: PropTypes.array,
+};
+
+Dependencies.defaultProps = {
+  dependsOn: [],
+  blocks: [],
+};
+
+export default Dependencies;

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

@@ -0,0 +1,92 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import Dependencies from '../Dependencies';
+
+describe('Dependencies', () => {
+  it('should render with no dependencies', () => {
+    const wrapper = mount(<Dependencies dependsOn={[]} blocks={[]} />);
+    expect(wrapper.find('Alert')).toHaveLength(1);
+    expect(wrapper.find('DependencyTable')).toHaveLength(2);
+    expect(wrapper.find('Table')).toHaveLength(0);
+    expect(wrapper.text()).toContain('None');
+  });
+
+  it('should render with depends_on dependencies', () => {
+    const dependsOn = [
+      {
+        id: '123',
+        action: 'Actions::FooBar',
+        humanized: 'Foo Bar Action',
+        state: 'stopped',
+        result: 'success',
+      },
+      {
+        id: '456',
+        action: 'Actions::BazQux',
+        humanized: 'Baz Qux Action',
+        state: 'running',
+        result: 'pending',
+      },
+    ];
+    const wrapper = mount(<Dependencies dependsOn={dependsOn} blocks={[]} />);
+    expect(wrapper.find('Table')).toHaveLength(1);
+    expect(wrapper.find('Tbody').find('Tr')).toHaveLength(2);
+    expect(wrapper.text()).toContain('Foo Bar Action');
+    expect(wrapper.text()).toContain('Baz Qux Action');
+    expect(wrapper.text()).toContain('stopped');
+    expect(wrapper.text()).toContain('success');
+  });
+
+  it('should render with blocks dependencies', () => {
+    const blocks = [
+      {
+        id: '789',
+        action: 'Actions::Test',
+        humanized: 'Test Action',
+        state: 'paused',
+        result: 'warning',
+      },
+    ];
+    const wrapper = mount(<Dependencies dependsOn={[]} blocks={blocks} />);
+    expect(wrapper.find('Table')).toHaveLength(1);
+    expect(wrapper.find('Tbody').find('Tr')).toHaveLength(1);
+    expect(wrapper.text()).toContain('Test Action');
+    expect(wrapper.text()).toContain('paused');
+    expect(wrapper.text()).toContain('warning');
+  });
+
+  it('should render with both dependency types', () => {
+    const dependsOn = [
+      {
+        id: '123',
+        action: 'Actions::Foo',
+        humanized: 'Foo Action',
+        state: 'stopped',
+        result: 'success',
+      },
+    ];
+    const blocks = [
+      {
+        id: '456',
+        action: 'Actions::Bar',
+        humanized: 'Bar Action',
+        state: 'running',
+        result: 'pending',
+      },
+      {
+        id: '789',
+        action: 'Actions::Baz',
+        humanized: 'Baz Action',
+        state: 'stopped',
+        result: 'error',
+      },
+    ];
+    const wrapper = mount(
+      <Dependencies dependsOn={dependsOn} blocks={blocks} />
+    );
+    expect(wrapper.find('Table')).toHaveLength(2);
+    expect(wrapper.text()).toContain('Foo Action');
+    expect(wrapper.text()).toContain('Bar Action');
+    expect(wrapper.text()).toContain('Baz Action');
+  });
+});

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

@@ -9,6 +9,7 @@ import RunningSteps from './Components/RunningSteps';
 import Errors from './Components/Errors';
 import Locks from './Components/Locks';
 import Raw from './Components/Raw';
+import Dependencies from './Components/Dependencies';
 import { getTaskID } from './TasksDetailsHelper';
 import { TaskSkeleton } from './Components/TaskSkeleton';
 
@@ -20,6 +21,8 @@ const TaskDetails = ({
   runningSteps,
   locks,
   links,
+  dependsOn,
+  blocks,
   cancelStep,
   taskReloadStart,
   taskReloadStop,
@@ -90,7 +93,10 @@ const TaskDetails = ({
         <Tab eventKey={4} disabled={isLoading} title={__('Locks')}>
           <Locks locks={locks.concat(links)} />
         </Tab>
-        <Tab eventKey={5} disabled={isLoading} title={__('Raw')}>
+        <Tab eventKey={5} disabled={isLoading} title={__('Dependencies')}>
+          <Dependencies dependsOn={dependsOn} blocks={blocks} />
+        </Tab>
+        <Tab eventKey={6} disabled={isLoading} title={__('Raw')}>
           <Raw
             id={id}
             label={props.label}
@@ -116,9 +122,12 @@ TaskDetails.propTypes = {
   taskReloadStop: PropTypes.func.isRequired,
   taskReloadStart: PropTypes.func.isRequired,
   links: PropTypes.array,
+  dependsOn: PropTypes.array,
+  blocks: PropTypes.array,
   ...Task.propTypes,
   ...Errors.propTypes,
   ...Locks.propTypes,
+  ...Dependencies.propTypes,
   ...Raw.propTypes,
 };
 TaskDetails.defaultProps = {
@@ -127,10 +136,13 @@ TaskDetails.defaultProps = {
   APIerror: null,
   status: STATUS.PENDING,
   links: [],
+  dependsOn: [],
+  blocks: [],
   ...Task.defaultProps,
   ...RunningSteps.defaultProps,
   ...Errors.defaultProps,
   ...Locks.defaultProps,
+  ...Dependencies.defaultProps,
   ...Raw.defaultProps,
 };
 

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

@@ -109,3 +109,9 @@ export const selectAPIError = state =>
 export const selectIsLoading = state =>
   !!selectAPIByKey(state, FOREMAN_TASK_DETAILS).response &&
   selectStatus(state) === STATUS.PENDING;
+
+export const selectDependsOn = state =>
+  selectTaskDetailsResponse(state).depends_on || [];
+
+export const selectBlocks = state =>
+  selectTaskDetailsResponse(state).blocks || [];

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

@@ -58,6 +58,16 @@ exports[`TaskDetails rendering render with loading Props 1`] = `
     <Tab
       disabled={true}
       eventKey={5}
+      title="Dependencies"
+    >
+      <Dependencies
+        blocks={Array []}
+        dependsOn={Array []}
+      />
+    </Tab>
+    <Tab
+      disabled={true}
+      eventKey={6}
       title="Raw"
     >
       <Raw
@@ -136,6 +146,15 @@ exports[`TaskDetails rendering render with min Props 1`] = `
     </Tab>
     <Tab
       eventKey={5}
+      title="Dependencies"
+    >
+      <Dependencies
+        blocks={Array []}
+        dependsOn={Array []}
+      />
+    </Tab>
+    <Tab
+      eventKey={6}
       title="Raw"
     >
       <Raw

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

@@ -36,6 +36,8 @@ import {
   selectStatus,
   selectAPIError,
   selectIsLoading,
+  selectDependsOn,
+  selectBlocks,
 } from './TaskDetailsSelectors';
 
 const mapStateToProps = state => ({
@@ -71,6 +73,8 @@ const mapStateToProps = state => ({
   status: selectStatus(state),
   APIerror: selectAPIError(state),
   isLoading: selectIsLoading(state),
+  dependsOn: selectDependsOn(state),
+  blocks: selectBlocks(state),
 });
 
 const mapDispatchToProps = dispatch =>

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

@@ -1,6 +1,7 @@
 import React from 'react';
-import { DropdownButton, MenuItem } from 'patternfly-react';
 import PropTypes from 'prop-types';
+import { SimpleDropdown } from '@patternfly/react-templates';
+import { EllipsisVIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
 
 export const ActionSelectButton = ({
@@ -8,35 +9,35 @@ export const ActionSelectButton = ({
   onResume,
   onForceCancel,
   disabled,
-}) => (
-  <DropdownButton
-    title={__('Select Action')}
-    disabled={disabled}
-    id="selcted-action-type"
-  >
-    <MenuItem
-      title={__('Cancel selected tasks')}
-      onClick={onCancel}
-      eventKey="1"
-    >
-      {__('Cancel Selected')}
-    </MenuItem>
-    <MenuItem
-      title={__('Resume selected tasks')}
-      onClick={onResume}
-      eventKey="2"
-    >
-      {__('Resume Selected')}
-    </MenuItem>
-    <MenuItem
-      title={__('Force Cancel selected tasks')}
-      onClick={onForceCancel}
-      eventKey="3"
-    >
-      {__('Force Cancel Selected')}
-    </MenuItem>
-  </DropdownButton>
-);
+}) => {
+  const buttons = [
+    {
+      content: __('Cancel Selected'),
+      onClick: onCancel,
+      value: 1,
+    },
+    {
+      content: __('Resume Selected'),
+      onClick: onResume,
+      value: 2,
+    },
+    {
+      content: __('Force Cancel Selected'),
+      onClick: onForceCancel,
+      value: 3,
+    },
+  ];
+  return (
+    <SimpleDropdown
+      isDisabled={disabled}
+      ouiaId="tasks-table-action-select-dropdown"
+      toggleVariant="plain"
+      popperProps={{ position: 'right' }}
+      initialItems={buttons}
+      toggleContent={<EllipsisVIcon aria-hidden="true" />}
+    />
+  );
+};
 
 ActionSelectButton.propTypes = {
   disabled: PropTypes.bool,

data/webpack/ForemanTasks/Components/TasksTable/Components/__test__/ActionSelectButton.test.js

@@ -1,14 +1,81 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
+import React from 'react';
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import '@testing-library/jest-dom';
 import { ActionSelectButton } from '../ActionSelectButton';
 
-const fixtures = {
-  'renders with minimal props': {
-    onCancel: jest.fn(),
-    onResume: jest.fn(),
-    onForceCancel: jest.fn(),
-  },
-};
+const mockOnCancel = jest.fn();
+const mockOnResume = jest.fn();
+const mockOnForceCancel = jest.fn();
+
+describe('ActionSelectButton', () => {
+  const renderComponent = (props = {}) => {
+    const defaultProps = {
+      onCancel: mockOnCancel,
+      onResume: mockOnResume,
+      onForceCancel: mockOnForceCancel,
+      disabled: false,
+    };
+    return render(<ActionSelectButton {...defaultProps} {...props} />);
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders with minimal props', () => {
+    renderComponent();
+
+    const toggle = screen.getByRole('button');
+    expect(toggle).toBeInTheDocument();
+    expect(toggle).not.toBeDisabled();
+  });
+
+  it('renders disabled when disabled prop is true', () => {
+    renderComponent({ disabled: true });
+
+    const toggle = screen.getByRole('button');
+    expect(toggle).toBeDisabled();
+  });
+
+  it('opens dropdown and shows action options when toggle is clicked', async () => {
+    renderComponent();
+    const toggle = screen.getByRole('button');
+    fireEvent.click(toggle);
+
+    await waitFor(() => {
+      expect(screen.getByText('Cancel Selected')).toBeInTheDocument();
+      expect(screen.getByText('Resume Selected')).toBeInTheDocument();
+      expect(screen.getByText('Force Cancel Selected')).toBeInTheDocument();
+    });
+  });
+
+  it('calls onCancel when Cancel Selected is clicked', async () => {
+    renderComponent();
+    fireEvent.click(screen.getByRole('button'));
+    await waitFor(() => {
+      expect(screen.getByText('Cancel Selected')).toBeInTheDocument();
+    });
+    fireEvent.click(screen.getByText('Cancel Selected'));
+    expect(mockOnCancel).toHaveBeenCalledTimes(1);
+  });
+
+  it('calls onResume when Resume Selected is clicked', async () => {
+    renderComponent();
+    fireEvent.click(screen.getByRole('button'));
+    await waitFor(() => {
+      expect(screen.getByText('Resume Selected')).toBeInTheDocument();
+    });
+    fireEvent.click(screen.getByText('Resume Selected'));
+    expect(mockOnResume).toHaveBeenCalledTimes(1);
+  });
 
-describe('ActionSelectButton', () =>
-  testComponentSnapshotsWithFixtures(ActionSelectButton, fixtures));
+  it('calls onForceCancel when Force Cancel Selected is clicked', async () => {
+    renderComponent();
+    fireEvent.click(screen.getByRole('button'));
+    await waitFor(() => {
+      expect(screen.getByText('Force Cancel Selected')).toBeInTheDocument();
+    });
+    fireEvent.click(screen.getByText('Force Cancel Selected'));
+    expect(mockOnForceCancel).toHaveBeenCalledTimes(1);
+  });
+});

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

@@ -2,11 +2,11 @@ import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import URI from 'urijs';
 import { getURIsearch } from 'foremanReact/common/urlHelpers';
-import { Spinner, Button, Icon } from 'patternfly-react';
+import { Button, ToolbarItem, Spinner } from '@patternfly/react-core';
+import { RedoIcon } from '@patternfly/react-icons';
 import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { getURIQuery } from 'foremanReact/common/helpers';
-import ExportButton from 'foremanReact/routes/common/PageLayout/components/ExportButton/ExportButton';
 import { STATUS } from 'foremanReact/constants';
 import TasksDashboard from '../TasksDashboard';
 import TasksTable from './TasksTable';
@@ -127,25 +127,44 @@ const TasksTablePage = ({
         header={createHeader(props.actionName)}
         breadcrumbOptions={getBreadcrumbs(props.actionName)}
         toolbarButtons={
-          <React.Fragment>
-            <Button onClick={() => props.reloadPage(url, props.parentTaskID)}>
-              <Icon type="fa" name="refresh" /> {__('Refresh Data')}
-            </Button>
-            {props.status === STATUS.PENDING && <Spinner size="md" loading />}
-            <ExportButton
-              url={getCSVurl(history.location.pathname, uriQuery)}
-              title={__('Export All')}
-            />
-            <ActionSelectButton
-              disabled={
-                !props.permissions.edit ||
-                !(props.selectedRows.length || props.allRowsSelected)
-              }
-              onCancel={() => openModal(CANCEL_SELECTED_MODAL)}
-              onResume={() => openModal(RESUME_SELECTED_MODAL)}
-              onForceCancel={() => openModal(FORCE_UNLOCK_SELECTED_MODAL)}
-            />
-          </React.Fragment>
+          <>
+            <ToolbarItem>
+              <Button
+                ouiaId="tasks-table-refresh-data"
+                variant="primary"
+                onClick={() => props.reloadPage(url, props.parentTaskID)}
+                icon={<RedoIcon />}
+              >
+                {__('Refresh Data')}
+              </Button>
+            </ToolbarItem>
+            {props.status === STATUS.PENDING && (
+              <ToolbarItem>
+                <Spinner size="lg" />
+              </ToolbarItem>
+            )}
+            <ToolbarItem>
+              <Button
+                ouiaId="tasks-table-export-all"
+                variant="secondary"
+                component="a"
+                href={getCSVurl(history.location.pathname, uriQuery)}
+              >
+                {__('Export All')}
+              </Button>
+            </ToolbarItem>
+            <ToolbarItem>
+              <ActionSelectButton
+                disabled={
+                  !props.permissions.edit ||
+                  !(props.selectedRows.length || props.allRowsSelected)
+                }
+                onCancel={() => openModal(CANCEL_SELECTED_MODAL)}
+                onResume={() => openModal(RESUME_SELECTED_MODAL)}
+                onForceCancel={() => openModal(FORCE_UNLOCK_SELECTED_MODAL)}
+              />
+            </ToolbarItem>
+          </>
         }
         searchQuery={getURIsearch()}
         beforeToolbarComponent={

data/webpack/ForemanTasks/Components/TasksTable/__tests__/__snapshots__/TasksTablePage.test.js.snap

@@ -108,38 +108,39 @@ exports[`TasksTablePage rendering render with Breadcrubs and edit permissions 1`
     searchable={true}
     toolbarButtons={
       <React.Fragment>
-        <Button
-          active={false}
-          block={false}
-          bsClass="btn"
-          bsStyle="default"
-          disabled={false}
-          onClick={[Function]}
-        >
-          <Icon
-            name="refresh"
-            type="fa"
+        <ToolbarItem>
+          <Button
+            icon={<RedoIcon />}
+            onClick={[Function]}
+            ouiaId="tasks-table-refresh-data"
+            variant="primary"
+          >
+            Refresh Data
+          </Button>
+        </ToolbarItem>
+        <ToolbarItem>
+          <Spinner
+            size="lg"
           />
-           
-          Refresh Data
-        </Button>
-        <Spinner
-          className=""
-          inline={false}
-          inverse={false}
-          loading={true}
-          size="md"
-        />
-        <ExportButton
-          title="Export All"
-          url="/foreman_tasks/tasks.csv?search=%28state%3Dstopped%29"
-        />
-        <ActionSelectButton
-          disabled={true}
-          onCancel={[Function]}
-          onForceCancel={[Function]}
-          onResume={[Function]}
-        />
+        </ToolbarItem>
+        <ToolbarItem>
+          <Button
+            component="a"
+            href="/foreman_tasks/tasks.csv?search=%28state%3Dstopped%29"
+            ouiaId="tasks-table-export-all"
+            variant="secondary"
+          >
+            Export All
+          </Button>
+        </ToolbarItem>
+        <ToolbarItem>
+          <ActionSelectButton
+            disabled={true}
+            onCancel={[Function]}
+            onForceCancel={[Function]}
+            onResume={[Function]}
+          />
+        </ToolbarItem>
       </React.Fragment>
     }
   >
@@ -283,38 +284,39 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
     searchable={true}
     toolbarButtons={
       <React.Fragment>
-        <Button
-          active={false}
-          block={false}
-          bsClass="btn"
-          bsStyle="default"
-          disabled={false}
-          onClick={[Function]}
-        >
-          <Icon
-            name="refresh"
-            type="fa"
+        <ToolbarItem>
+          <Button
+            icon={<RedoIcon />}
+            onClick={[Function]}
+            ouiaId="tasks-table-refresh-data"
+            variant="primary"
+          >
+            Refresh Data
+          </Button>
+        </ToolbarItem>
+        <ToolbarItem>
+          <Spinner
+            size="lg"
+          />
+        </ToolbarItem>
+        <ToolbarItem>
+          <Button
+            component="a"
+            href="/foreman_tasks/tasks.csv?search=%28state%3Dstopped%29"
+            ouiaId="tasks-table-export-all"
+            variant="secondary"
+          >
+            Export All
+          </Button>
+        </ToolbarItem>
+        <ToolbarItem>
+          <ActionSelectButton
+            disabled={true}
+            onCancel={[Function]}
+            onForceCancel={[Function]}
+            onResume={[Function]}
           />
-           
-          Refresh Data
-        </Button>
-        <Spinner
-          className=""
-          inline={false}
-          inverse={false}
-          loading={true}
-          size="md"
-        />
-        <ExportButton
-          title="Export All"
-          url="/foreman_tasks/tasks.csv?search=%28state%3Dstopped%29"
-        />
-        <ActionSelectButton
-          disabled={true}
-          onCancel={[Function]}
-          onForceCancel={[Function]}
-          onResume={[Function]}
-        />
+        </ToolbarItem>
       </React.Fragment>
     }
   >

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 11.1.0
+  version: 12.0.0
 platform: ruby
 authors:
 - Ivan Nečas
@@ -234,6 +234,7 @@ files:
 - app/views/foreman_tasks/api/recurring_logics/main.json.rabl
 - app/views/foreman_tasks/api/recurring_logics/show.json.rabl
 - app/views/foreman_tasks/api/recurring_logics/update.json.rabl
+- app/views/foreman_tasks/api/tasks/dependency_summary.json.rabl
 - app/views/foreman_tasks/api/tasks/details.json.rabl
 - app/views/foreman_tasks/api/tasks/index.json.rabl
 - app/views/foreman_tasks/api/tasks/show.json.rabl
@@ -377,6 +378,7 @@ files:
 - test/unit/actions/proxy_action_test.rb
 - test/unit/actions/recurring_action_test.rb
 - test/unit/actions/trigger_proxy_batch_test.rb
+- test/unit/chaining_test.rb
 - test/unit/cleaner_test.rb
 - test/unit/config/environment.rb
 - test/unit/dynflow_console_authorizer_test.rb
@@ -398,6 +400,7 @@ files:
 - webpack/ForemanTasks/Components/TaskActions/TaskActionsConstants.js
 - webpack/ForemanTasks/Components/TaskActions/__snapshots__/TaskAction.test.js.snap
 - webpack/ForemanTasks/Components/TaskActions/index.js
+- webpack/ForemanTasks/Components/TaskDetails/Components/Dependencies.js
 - webpack/ForemanTasks/Components/TaskDetails/Components/Errors.js
 - webpack/ForemanTasks/Components/TaskDetails/Components/Locks.js
 - webpack/ForemanTasks/Components/TaskDetails/Components/Raw.js
@@ -407,6 +410,7 @@ files:
 - webpack/ForemanTasks/Components/TaskDetails/Components/TaskHelper.js
 - webpack/ForemanTasks/Components/TaskDetails/Components/TaskInfo.js
 - webpack/ForemanTasks/Components/TaskDetails/Components/TaskSkeleton.js
+- webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/Dependencies.test.js
 - webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/Errors.test.js
 - webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/Locks.test.js
 - webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/Raw.test.js
@@ -510,7 +514,6 @@ files:
 - webpack/ForemanTasks/Components/TasksTable/Components/__test__/SelectAllAlert.test.js
 - webpack/ForemanTasks/Components/TasksTable/Components/__test__/TableSelectionCell.test.js
 - webpack/ForemanTasks/Components/TasksTable/Components/__test__/TableSelectionHeaderCell.test.js
-- webpack/ForemanTasks/Components/TasksTable/Components/__test__/__snapshots__/ActionSelectButton.test.js.snap
 - webpack/ForemanTasks/Components/TasksTable/Components/__test__/__snapshots__/SelectAllAlert.test.js.snap
 - webpack/ForemanTasks/Components/TasksTable/Components/__test__/__snapshots__/TableSelectionCell.test.js.snap
 - webpack/ForemanTasks/Components/TasksTable/Components/__test__/__snapshots__/TableSelectionHeaderCell.test.js.snap
@@ -660,6 +663,7 @@ test_files:
 - test/unit/actions/proxy_action_test.rb
 - test/unit/actions/recurring_action_test.rb
 - test/unit/actions/trigger_proxy_batch_test.rb
+- test/unit/chaining_test.rb
 - test/unit/cleaner_test.rb
 - test/unit/config/environment.rb
 - test/unit/dynflow_console_authorizer_test.rb

data/webpack/ForemanTasks/Components/TasksTable/Components/__test__/__snapshots__/ActionSelectButton.test.js.snap

@@ -1,43 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ActionSelectButton renders with minimal props 1`] = `
-<DropdownButton
-  disabled={false}
-  id="selcted-action-type"
-  title="Select Action"
->
-  <MenuItem
-    bsClass="dropdown"
-    disabled={false}
-    divider={false}
-    eventKey="1"
-    header={false}
-    onClick={[MockFunction]}
-    title="Cancel selected tasks"
-  >
-    Cancel Selected
-  </MenuItem>
-  <MenuItem
-    bsClass="dropdown"
-    disabled={false}
-    divider={false}
-    eventKey="2"
-    header={false}
-    onClick={[MockFunction]}
-    title="Resume selected tasks"
-  >
-    Resume Selected
-  </MenuItem>
-  <MenuItem
-    bsClass="dropdown"
-    disabled={false}
-    divider={false}
-    eventKey="3"
-    header={false}
-    onClick={[MockFunction]}
-    title="Force Cancel selected tasks"
-  >
-    Force Cancel Selected
-  </MenuItem>
-</DropdownButton>
-`;