foreman-tasks 12.1.1 → 12.2.1

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/TasksDonutChart/TasksDonutChartHelper.test.js

@@ -99,15 +99,29 @@ describe('TasksDonutChartHelper', () => {
   });
 
   it('should create chart-data', () => {
-    expect(
-      createChartData({
-        last: 1,
-        older: 3,
-        time: '24h',
-        onLastClick: jest.fn(),
-        onOlderClick: jest.fn(),
-      })
-    ).toMatchSnapshot();
+    const onLastClick = jest.fn();
+    const onOlderClick = jest.fn();
+    const result = createChartData({
+      last: 1,
+      older: 3,
+      time: '24h',
+      onLastClick,
+      onOlderClick,
+    });
+
+    expect(result.columns).toEqual([
+      [LAST, 1],
+      [OLDER, 3],
+    ]);
+    expect(result.names[LAST]).toMatch(/1/);
+    expect(result.names[LAST]).toMatch(/24h/);
+    expect(result.names[OLDER]).toMatch(/3/);
+    expect(result.names[OLDER]).toMatch(/24h/);
+
+    result.onItemClick(LAST);
+    expect(onLastClick).toHaveBeenCalledTimes(1);
+    result.onItemClick(OLDER);
+    expect(onOlderClick).toHaveBeenCalledTimes(1);
   });
 
   it('should update chart-title', () => {

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/TasksCardsGrid.fixtures.js

@@ -8,18 +8,21 @@ export const MOCKED_DATA = {
     older: 5,
   },
   stopped: {
-    error: {
-      total: 8,
-      last: 1,
-    },
-    warning: {
-      total: 20,
-      last: 2,
-    },
-    success: {
-      total: 25,
-      last: 3,
+    results: {
+      error: {
+        total: 8,
+        last: 1,
+      },
+      warning: {
+        total: 20,
+        last: 2,
+      },
+      success: {
+        total: 25,
+        last: 3,
+      },
     },
+    other: 0,
   },
   scheduled: 1,
 };

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { CardGrid } from 'patternfly-react';
+import { Grid, GridItem } from '@patternfly/react-core';
 import { noop } from 'foremanReact/common/helpers';
 
 import RunningTasksCard from './Components/RunningTasksCard/RunningTasksCard';
@@ -15,26 +15,24 @@ import {
 import { timePropType, queryPropType } from '../../TasksDashboardPropTypes';
 
 const TasksCardsGrid = ({ time, query, data, updateQuery }) => (
-  <CardGrid matchHeight fluid>
-    <CardGrid.Row>
-      {[
-        [TASKS_DASHBOARD_AVAILABLE_QUERY_STATES.RUNNING, RunningTasksCard],
-        [TASKS_DASHBOARD_AVAILABLE_QUERY_STATES.PAUSED, PausedTasksCard],
-        [TASKS_DASHBOARD_AVAILABLE_QUERY_STATES.STOPPED, StoppedTasksCard],
-        [TASKS_DASHBOARD_AVAILABLE_QUERY_STATES.SCHEDULED, ScheduledTasksCard],
-      ].map(([key, Card]) => (
-        <CardGrid.Col key={key}>
-          <Card
-            matchHeight
-            data={data[key]}
-            query={query}
-            time={time}
-            updateQuery={updateQuery}
-          />
-        </CardGrid.Col>
-      ))}
-    </CardGrid.Row>
-  </CardGrid>
+  <Grid hasGutter className="tasks-cards-grid">
+    {[
+      [TASKS_DASHBOARD_AVAILABLE_QUERY_STATES.RUNNING, RunningTasksCard],
+      [TASKS_DASHBOARD_AVAILABLE_QUERY_STATES.PAUSED, PausedTasksCard],
+      [TASKS_DASHBOARD_AVAILABLE_QUERY_STATES.STOPPED, StoppedTasksCard],
+      [TASKS_DASHBOARD_AVAILABLE_QUERY_STATES.SCHEDULED, ScheduledTasksCard],
+    ].map(([key, Card]) => (
+      <GridItem key={key} sm={12} xl={6} xl2={3}>
+        <Card
+          isFullHeight
+          data={data[key]}
+          query={query}
+          time={time}
+          updateQuery={updateQuery}
+        />
+      </GridItem>
+    ))}
+  </Grid>
 );
 
 TasksCardsGrid.propTypes = {

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

@@ -1,5 +1,6 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
+import React from 'react';
+import { render } from '@testing-library/react';
+import '@testing-library/jest-dom';
 import {
   TASKS_DASHBOARD_AVAILABLE_TIMES,
   TASKS_DASHBOARD_AVAILABLE_QUERY_STATES,
@@ -7,15 +8,63 @@ import {
 import { MOCKED_DATA } from './TasksCardsGrid.fixtures';
 import TasksCardsGrid from './TasksCardsGrid';
 
-const fixtures = {
-  'render with minimal props': {},
-  'render with props': {
-    time: TASKS_DASHBOARD_AVAILABLE_TIMES.WEEK,
-    query: { state: TASKS_DASHBOARD_AVAILABLE_QUERY_STATES.RUNNING },
-    data: MOCKED_DATA,
-    updateQuery: jest.fn(),
-  },
-};
-
-describe('TasksCardsGrid', () =>
-  testComponentSnapshotsWithFixtures(TasksCardsGrid, fixtures));
+jest.mock('./Components/TasksDonutChart/TasksDonutChart', () => {
+  const React = require('react');
+  const Stub = () => <div data-testid="tasks-donut-chart-stub" />;
+  Stub.displayName = 'TasksDonutChart';
+  return Stub;
+});
+
+describe('TasksCardsGrid layout', () => {
+  it('uses PatternFly Grid with gutter and four responsive columns', () => {
+    const { container } = render(<TasksCardsGrid />);
+    const grid = container.querySelector('.tasks-cards-grid');
+    expect(grid).toBeInTheDocument();
+
+    const items = Array.from(grid.children);
+    expect(items).toHaveLength(4);
+
+    items.forEach(item => {
+      expect(item).toHaveClass('pf-m-12-col-on-sm');
+      expect(item).toHaveClass('pf-m-6-col-on-xl');
+      expect(item).toHaveClass('pf-m-3-col-on-2xl');
+    });
+  });
+
+  it('renders each card full-height and reflects dashboard query and data', () => {
+    const updateQuery = jest.fn();
+    const query = { state: TASKS_DASHBOARD_AVAILABLE_QUERY_STATES.RUNNING };
+    const { container } = render(
+      <TasksCardsGrid
+        query={query}
+        updateQuery={updateQuery}
+        time={TASKS_DASHBOARD_AVAILABLE_TIMES.WEEK}
+        data={MOCKED_DATA}
+      />
+    );
+
+    const cardIds = [
+      'running-tasks-card',
+      'paused-tasks-card',
+      'stopped-tasks-card',
+      'scheduled-tasks-card',
+    ];
+
+    cardIds.forEach(id => {
+      const card = container.querySelector(`#${id}`);
+      expect(card).toBeInTheDocument();
+      expect(card).toHaveClass('pf-m-full-height');
+    });
+
+    expect(container.querySelector('#running-tasks-card')).toHaveClass(
+      'selected-tasks-card'
+    );
+
+    const scheduledDataEl = container.querySelector(
+      '#scheduled-tasks-card .scheduled-data'
+    );
+    expect(scheduledDataEl?.textContent).toContain(
+      String(MOCKED_DATA[TASKS_DASHBOARD_AVAILABLE_QUERY_STATES.SCHEDULED])
+    );
+  });
+});

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksTimeRow/Components/TimeDropDown/TimeDropDown.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { DropdownButton, MenuItem } from 'patternfly-react';
+import { SimpleDropdown } from '@patternfly/react-templates';
 import { noop } from 'foremanReact/common/helpers';
 
 import { TASKS_DASHBOARD_AVAILABLE_TIMES } from '../../../../TasksDashboardConstants';
@@ -9,29 +9,21 @@ import { getQueryValueText } from '../../../../TasksDashboardHelper';
 const TimeDropDown = ({ id, className, selectedTime, onChange, ...props }) => {
   const availableTimes = Object.keys(TASKS_DASHBOARD_AVAILABLE_TIMES).map(
     key => ({
-      key,
-      text: getQueryValueText(key),
-      active: key === selectedTime,
+      value: key,
+      content: getQueryValueText(key),
+      onClick: () => key === selectedTime || onChange(key),
     })
   );
 
   return (
-    <DropdownButton
+    <SimpleDropdown
       id={id}
       className={className}
-      title={getQueryValueText(selectedTime)}
+      toggleVariant="plainText"
+      toggleContent={getQueryValueText(selectedTime)}
+      initialItems={availableTimes}
       {...props}
-    >
-      {availableTimes.map(({ key, text, active }) => (
-        <MenuItem
-          key={key}
-          active={active}
-          onClick={() => active || onChange(key)}
-        >
-          {text}
-        </MenuItem>
-      ))}
-    </DropdownButton>
+    />
   );
 };
 

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksTimeRow/Components/TimeDropDown/TimeDropDown.test.js

@@ -1,19 +1,55 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import React from 'react';
+import { render, screen, fireEvent, waitFor, within } from '@testing-library/react';
+import '@testing-library/jest-dom';
 
 import { TASKS_DASHBOARD_AVAILABLE_TIMES } from '../../../../TasksDashboardConstants';
 import TimeDropDown from './TimeDropDown';
 
-const createRequiredProps = () => ({ id: 'some-id' });
+describe('TimeDropDown interactions', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
 
-const fixtures = {
-  'render with minimal props': { ...createRequiredProps() },
-  'render with all props': {
-    ...createRequiredProps(),
-    className: 'some-class',
-    selectedTime: TASKS_DASHBOARD_AVAILABLE_TIMES.WEEK,
-    onChange: jest.fn(),
-  },
-};
+  it('calls onChange when a different time option is selected', async () => {
+    const onChange = jest.fn();
 
-describe('TimeDropDown', () =>
-  testComponentSnapshotsWithFixtures(TimeDropDown, fixtures));
+    render(
+      <TimeDropDown
+        id="time-dropdown"
+        selectedTime={TASKS_DASHBOARD_AVAILABLE_TIMES.H24}
+        onChange={onChange}
+      />
+    );
+
+    fireEvent.click(screen.getByRole('button', { name: /24h/i }));
+
+    const menu = await screen.findByRole('menu');
+    fireEvent.click(within(menu).getByRole('menuitem', { name: /^12h$/i }));
+
+    await waitFor(() => {
+      expect(onChange).toHaveBeenCalledTimes(1);
+      expect(onChange).toHaveBeenCalledWith(
+        TASKS_DASHBOARD_AVAILABLE_TIMES.H12
+      );
+    });
+  });
+
+  it('does not call onChange when the already-selected option is clicked', async () => {
+    const onChange = jest.fn();
+
+    render(
+      <TimeDropDown
+        id="time-dropdown"
+        selectedTime={TASKS_DASHBOARD_AVAILABLE_TIMES.WEEK}
+        onChange={onChange}
+      />
+    );
+
+    fireEvent.click(screen.getByRole('button', { name: /^week$/i }));
+
+    const menu = await screen.findByRole('menu');
+    fireEvent.click(within(menu).getByRole('menuitem', { name: /^week$/i }));
+
+    expect(onChange).not.toHaveBeenCalled();
+  });
+});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 12.1.1
+  version: 12.2.1
 platform: ruby
 authors:
 - Ivan Nečas
@@ -65,20 +65,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: factory_bot_rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.8.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -93,20 +79,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: theforeman-rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
 description: |
   The goal of this plugin is to unify the way of showing task statuses across the Foreman instance.
   It defines Task model for keeping the information about the tasks and Lock for assigning the tasks
@@ -417,12 +389,7 @@ files:
 - webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/TaskButtons.test.js
 - webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/TaskHelper.test.js
 - webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/TaskInfo.test.js
-- webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/Errors.test.js.snap
 - webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/Locks.test.js.snap
-- webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/Raw.test.js.snap
-- webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/RunningSteps.test.js.snap
-- webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/Task.test.js.snap
-- webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/TaskInfo.test.js.snap
 - webpack/ForemanTasks/Components/TaskDetails/TaskDetails.js
 - webpack/ForemanTasks/Components/TaskDetails/TaskDetails.scss
 - webpack/ForemanTasks/Components/TaskDetails/TaskDetailsActions.js
@@ -432,19 +399,14 @@ files:
 - webpack/ForemanTasks/Components/TaskDetails/__tests__/TaskDetails.fixtures.js
 - webpack/ForemanTasks/Components/TaskDetails/__tests__/TaskDetails.test.js
 - webpack/ForemanTasks/Components/TaskDetails/__tests__/TaskDetailsActions.test.js
-- webpack/ForemanTasks/Components/TaskDetails/__tests__/__snapshots__/TaskDetails.test.js.snap
-- webpack/ForemanTasks/Components/TaskDetails/__tests__/__snapshots__/TaskDetailsActions.test.js.snap
 - webpack/ForemanTasks/Components/TaskDetails/index.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/PausedTasksCard/PausedTasksCard.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/PausedTasksCard/PausedTasksCard.test.js
-- webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/PausedTasksCard/__snapshots__/PausedTasksCard.test.js.snap
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/RunningTasksCard/RunningTasksCard.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/RunningTasksCard/RunningTasksCard.test.js
-- webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/RunningTasksCard/__snapshots__/RunningTasksCard.test.js.snap
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/ScheduledTasksCard/ScheduledTasksCard.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/ScheduledTasksCard/ScheduledTasksCard.scss
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/ScheduledTasksCard/ScheduledTasksCard.test.js
-- webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/ScheduledTasksCard/__snapshots__/ScheduledTasksCard.test.js.snap
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/StoppedTasksCard/OtherInfo.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/StoppedTasksCard/OtherInfo.test.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/StoppedTasksCard/StoppedTasksCard.js
@@ -454,25 +416,20 @@ files:
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/TasksDonutCard/TasksDonutCard.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/TasksDonutCard/TasksDonutCard.scss
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/TasksDonutCard/TasksDonutCard.test.js
-- webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/TasksDonutCard/__snapshots__/TasksDonutCard.test.js.snap
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/TasksDonutChart/TasksDonutChart.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/TasksDonutChart/TasksDonutChart.scss
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/TasksDonutChart/TasksDonutChart.test.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/TasksDonutChart/TasksDonutChartConstants.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/TasksDonutChart/TasksDonutChartHelper.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/TasksDonutChart/TasksDonutChartHelper.test.js
-- webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/TasksDonutChart/__snapshots__/TasksDonutChart.test.js.snap
-- webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/TasksDonutChart/__snapshots__/TasksDonutChartHelper.test.js.snap
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/TasksCardsGrid.fixtures.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/TasksCardsGrid.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/TasksCardsGrid.test.js
-- webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/__snapshots__/TasksCardsGrid.test.js.snap
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksLabelsRow/TasksLabelsRow.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksLabelsRow/TasksLabelsRow.scss
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksLabelsRow/TasksLabelsRow.test.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksTimeRow/Components/TimeDropDown/TimeDropDown.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksTimeRow/Components/TimeDropDown/TimeDropDown.test.js
-- webpack/ForemanTasks/Components/TasksDashboard/Components/TasksTimeRow/Components/TimeDropDown/__snapshots__/TimeDropDown.test.js.snap
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksTimeRow/TasksTimeRow.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksTimeRow/TasksTimeRow.scss
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksTimeRow/TasksTimeRow.test.js
@@ -553,7 +510,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Foreman plugin for showing tasks information for resources and users
 test_files:

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

@@ -1,77 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Errors rendering render with Props 1`] = `
-<div>
-  <Alert
-    className=""
-    key="0"
-    onDismiss={null}
-    type="error"
-  >
-    <span>
-      Action
-      :
-    </span>
-    <span>
-      <pre>
-        Actions::Katello::EventQueue::Monitor
-      </pre>
-    </span>
-    <span>
-      Input
-      :
-    </span>
-    <span>
-      <pre>
-        {"locale"=&gt;"en",
- "current_request_id"=&gt;nil,
- "current_user_id"=&gt;4,
- "current_organization_id"=&gt;nil,
- "current_location_id"=&gt;nil}
-
-      </pre>
-    </span>
-    <span>
-      Output
-      :
-    </span>
-    <span>
-      <pre>
-        {}
-
-      </pre>
-    </span>
-    <span>
-      Exception
-      :
-    </span>
-    <span>
-      <pre>
-        RuntimeError
-        : 
-        Action Actions::Katello::EventQueue::Monitor is already active
-      </pre>
-    </span>
-    <span>
-      Backtrace
-      :
-    </span>
-    <span>
-      <pre>
-        /home/vagrant/.gem/ruby/gems/dynflow-1.2.3/lib/dynflow/action/singleton.rb:15:in \`rescue in singleton_lock!'
-/home/vagrant/.gem/ruby/gems/dynflow-1.2.3/lib/dynflow/action/singleton.rb:12:in \`singleton_lock!'
-      </pre>
-    </span>
-  </Alert>
-</div>
-`;
-
-exports[`Errors rendering render without Props 1`] = `
-<Alert
-  className=""
-  onDismiss={null}
-  type="success"
->
-  No errors
-</Alert>
-`;