foreman-tasks 12.2.1 → 12.2.3

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

@@ -5,16 +5,21 @@ import '@testing-library/jest-dom';
 import Dependencies from '../Dependencies';
 
 describe('Dependencies', () => {
-  it('renders info alert and None for both tables when there are no tasks', () => {
+  it('renders both sections with empty placeholders when there are no tasks', () => {
     render(<Dependencies dependsOn={[]} blocks={[]} />);
+
+    expect(
+      screen.getByRole('heading', { name: /task depends on/i })
+    ).toBeInTheDocument();
     expect(
-      screen.getByRole('heading', { name: /task dependencies/i })
+      screen.getByRole('heading', { name: /task blocks/i })
     ).toBeInTheDocument();
-    const noneLabels = screen.getAllByText(/^none$/i);
-    expect(noneLabels.length).toBeGreaterThanOrEqual(2);
+
+    expect(screen.getAllByText(/^none$/i)).toHaveLength(2);
+    expect(screen.queryByRole('grid')).not.toBeInTheDocument();
   });
 
-  it('renders depends_on tasks in the first table', () => {
+  it('renders depends-on tasks in the first grid', () => {
     const dependsOn = [
       {
         id: '123',
@@ -31,15 +36,39 @@ describe('Dependencies', () => {
         result: 'pending',
       },
     ];
+
     render(<Dependencies dependsOn={dependsOn} blocks={[]} />);
-    const table = screen.getByRole('grid', { name: /depends on/i });
-    expect(within(table).getByText('Foo Bar Action')).toBeInTheDocument();
-    expect(within(table).getByText('Baz Qux Action')).toBeInTheDocument();
-    expect(within(table).getByText('stopped')).toBeInTheDocument();
-    expect(within(table).getByText('success')).toBeInTheDocument();
+
+    const dependsGrid = screen.getByRole('grid', {
+      name: /task depends on/i,
+    });
+    expect(screen.queryAllByRole('grid')).toHaveLength(1);
+
+    expect(
+      within(dependsGrid).getByRole('columnheader', { name: /^name$/i })
+    ).toBeInTheDocument();
+
+    const bodyRows = within(dependsGrid)
+      .getAllByRole('row')
+      .slice(1);
+    expect(bodyRows).toHaveLength(2);
+
+    expect(
+      screen.getByRole('link', { name: 'Foo Bar Action' })
+    ).toHaveAttribute('href', '/foreman_tasks/tasks/123');
+    expect(
+      screen.getByRole('link', { name: 'Baz Qux Action' })
+    ).toHaveAttribute('href', '/foreman_tasks/tasks/456');
+
+    expect(within(dependsGrid).getByText('Stopped')).toBeInTheDocument();
+    expect(within(dependsGrid).getByText('Success')).toBeInTheDocument();
+    expect(within(dependsGrid).getByText('Running')).toBeInTheDocument();
+    expect(within(dependsGrid).getByText('Pending')).toBeInTheDocument();
+
+    expect(screen.getAllByText(/^none$/i)).toHaveLength(1);
   });
 
-  it('renders blocks in the second table', () => {
+  it('renders blocks in the second grid', () => {
     const blocks = [
       {
         id: '789',
@@ -49,14 +78,28 @@ describe('Dependencies', () => {
         result: 'warning',
       },
     ];
+
     render(<Dependencies dependsOn={[]} blocks={blocks} />);
-    const table = screen.getByRole('grid', { name: /^blocks$/i });
-    expect(within(table).getByText('Test Action')).toBeInTheDocument();
-    expect(within(table).getByText('paused')).toBeInTheDocument();
-    expect(within(table).getByText('warning')).toBeInTheDocument();
+
+    const blocksGrid = screen.getByRole('grid', { name: /task blocks/i });
+    expect(screen.queryAllByRole('grid')).toHaveLength(1);
+
+    const bodyRows = within(blocksGrid)
+      .getAllByRole('row')
+      .slice(1);
+    expect(bodyRows).toHaveLength(1);
+
+    expect(screen.getByRole('link', { name: 'Test Action' })).toHaveAttribute(
+      'href',
+      '/foreman_tasks/tasks/789'
+    );
+    expect(within(blocksGrid).getByText('Paused')).toBeInTheDocument();
+    expect(within(blocksGrid).getByText('Warning')).toBeInTheDocument();
+
+    expect(screen.getAllByText(/^none$/i)).toHaveLength(1);
   });
 
-  it('renders both tables when dependsOn and blocks are present', () => {
+  it('renders both grids when dependsOn and blocks are present', () => {
     const dependsOn = [
       {
         id: '123',
@@ -82,11 +125,29 @@ describe('Dependencies', () => {
         result: 'error',
       },
     ];
+
     render(<Dependencies dependsOn={dependsOn} blocks={blocks} />);
-    expect(screen.getByRole('grid', { name: /depends on/i })).toBeInTheDocument();
-    expect(screen.getByText('Foo Action')).toBeInTheDocument();
-    expect(screen.getByRole('grid', { name: /^blocks$/i })).toBeInTheDocument();
-    expect(screen.getByText('Bar Action')).toBeInTheDocument();
-    expect(screen.getByText('Baz Action')).toBeInTheDocument();
+
+    expect(
+      screen.getByRole('grid', { name: /task depends on/i })
+    ).toBeInTheDocument();
+    expect(
+      screen.getByRole('grid', { name: /task blocks/i })
+    ).toBeInTheDocument();
+
+    expect(screen.getByRole('link', { name: 'Foo Action' })).toHaveAttribute(
+      'href',
+      '/foreman_tasks/tasks/123'
+    );
+    expect(screen.getByRole('link', { name: 'Bar Action' })).toHaveAttribute(
+      'href',
+      '/foreman_tasks/tasks/456'
+    );
+    expect(screen.getByRole('link', { name: 'Baz Action' })).toHaveAttribute(
+      'href',
+      '/foreman_tasks/tasks/789'
+    );
+
+    expect(screen.queryByText(/^none$/i)).not.toBeInTheDocument();
   });
 });

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

@@ -1,28 +1,261 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import '@testing-library/jest-dom';
 
 import Locks from '../Locks';
 
-const fixtures = {
-  'render without Props': {},
-  'render with Props': {
-    locks: [
-      {
-        name: 'task_owner',
-        exclusive: false,
-        resource_type: 'User',
-        resource_id: 4,
-      },
-      {
-        name: 'task_owner2',
-        exclusive: false,
-        resource_type: 'User',
-        resource_id: 2,
-      },
-    ],
-  },
-};
-
 describe('Locks', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(Locks, fixtures));
+  it('renders empty state when there are no locks', () => {
+    const { container } = render(<Locks locks={[]} />);
+    expect(
+      screen.getByRole('heading', { name: /no resources/i })
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText(
+        /no resources currently associated with this task/i
+      )
+    ).toBeInTheDocument();
+  });
+
+  it('renders non-exclusive section with rows when there are only non-exclusive locks', () => {
+    render(
+      <Locks
+        locks={[
+          {
+            name: 'task_owner',
+            exclusive: false,
+            resource_type: 'User',
+            resource_id: 4,
+            link: null,
+          },
+          {
+            name: 'task_owner2',
+            exclusive: false,
+            resource_type: 'User',
+            resource_id: 2,
+            link: null,
+          },
+        ]}
+      />
+    );
+    expect(
+      screen.getByRole('heading', { name: 'Non-exclusive resources' })
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText(
+        /other tasks can access the resource simultaneously/i
+      )
+    ).toBeInTheDocument();
+    expect(screen.getAllByText('User')).toHaveLength(2);
+    expect(screen.getByText('id: 4')).toBeInTheDocument();
+    expect(screen.getByText('id: 2')).toBeInTheDocument();
+    expect(
+      screen.queryByRole('heading', { name: 'Exclusive resources' })
+    ).not.toBeInTheDocument();
+  });
+
+  it('renders exclusive section when there are only exclusive locks', () => {
+    render(
+      <Locks
+        locks={[
+          {
+            name: 'host_lock',
+            exclusive: true,
+            resource_type: 'Host',
+            resource_id: 1,
+            link: '/hosts/1',
+          },
+        ]}
+      />
+    );
+    expect(
+      screen.getByRole('heading', { name: 'Exclusive resources' })
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText(
+        /only this task can access the resource/i
+      )
+    ).toBeInTheDocument();
+    expect(screen.getByRole('link', { name: 'Host' })).toHaveAttribute(
+      'href',
+      '/hosts/1'
+    );
+    expect(screen.getByText('id: 1')).toBeInTheDocument();
+    expect(
+      screen.queryByRole('heading', { name: 'Non-exclusive resources' })
+    ).not.toBeInTheDocument();
+  });
+
+  it('renders both sections when locks are mixed', () => {
+    render(
+      <Locks
+        locks={[
+          {
+            name: 'a',
+            exclusive: false,
+            resource_type: 'Smart proxy',
+            resource_id: 7,
+            link: null,
+          },
+          {
+            name: 'b',
+            exclusive: true,
+            resource_type: 'Host managed',
+            resource_id: 1,
+            link: null,
+          },
+        ]}
+      />
+    );
+    expect(
+      screen.getByRole('heading', { name: 'Non-exclusive resources' })
+    ).toBeInTheDocument();
+    expect(
+      screen.getByRole('heading', { name: 'Exclusive resources' })
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText(
+        /other tasks can access the resource simultaneously/i
+      )
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText(/only this task can access the resource/i)
+    ).toBeInTheDocument();
+    expect(screen.getByText('Smart proxy')).toBeInTheDocument();
+    expect(screen.getByText('Host managed')).toBeInTheDocument();
+    expect(screen.getByText('id: 7')).toBeInTheDocument();
+    expect(screen.getByText('id: 1')).toBeInTheDocument();
+  });
+
+  it('renders a link for non-exclusive locks when lock.link is set', () => {
+    render(
+      <Locks
+        locks={[
+          {
+            name: 'proxy',
+            exclusive: false,
+            resource_type: 'Smart proxy',
+            resource_id: 7,
+            link: '/smart_proxies/7',
+          },
+        ]}
+      />
+    );
+    const link = screen.getByRole('link', { name: 'Smart proxy' });
+    expect(link).toHaveAttribute('href', '/smart_proxies/7');
+  });
+
+  it('formats string resource_id values in the row label', () => {
+    render(
+      <Locks
+        locks={[
+          {
+            name: 'x',
+            exclusive: false,
+            resource_type: 'Custom',
+            resource_id: 'uuid-abc',
+            link: null,
+          },
+        ]}
+      />
+    );
+    expect(screen.getByText('id: uuid-abc')).toBeInTheDocument();
+  });
+
+  it('sets ouia ids on populated container, tables, rows, and resource links', () => {
+    const { container } = render(
+      <Locks
+        locks={[
+          {
+            name: 'ne',
+            exclusive: false,
+            resource_type: 'A',
+            resource_id: 1,
+            link: '/non-exclusive/1',
+          },
+          {
+            name: 'ex',
+            exclusive: true,
+            resource_type: 'B',
+            resource_id: 2,
+            link: '/exclusive/2',
+          },
+        ]}
+      />
+    );
+    expect(
+      container.querySelector('[data-ouia-component-id="task-locks-populated"]')
+    ).toBeInTheDocument();
+    expect(
+      container.querySelector(
+        '[data-ouia-component-id="task-locks-non-exclusive-table"]'
+      )
+    ).toBeInTheDocument();
+    expect(
+      container.querySelector(
+        '[data-ouia-component-id="task-locks-exclusive-table"]'
+      )
+    ).toBeInTheDocument();
+    expect(
+      container.querySelector(
+        '[data-ouia-component-id="task-locks-non-exclusive-row-0"]'
+      )
+    ).toBeInTheDocument();
+    expect(
+      container.querySelector(
+        '[data-ouia-component-id="task-locks-exclusive-row-0"]'
+      )
+    ).toBeInTheDocument();
+    expect(
+      container.querySelector(
+        '[data-ouia-component-id="task-locks-non-exclusive-resource-type-link-0"]'
+      )
+    ).toBeInTheDocument();
+    expect(
+      container.querySelector(
+        '[data-ouia-component-id="task-locks-exclusive-resource-type-link-0"]'
+      )
+    ).toBeInTheDocument();
+  });
+
+  it('does not render resource_type as a link when lock.link is absent', () => {
+    render(
+      <Locks
+        locks={[
+          {
+            name: 'ex',
+            exclusive: true,
+            resource_type: 'Host managed',
+            resource_id: 1,
+            link: null,
+          },
+        ]}
+      />
+    );
+    expect(
+      screen.queryByRole('link', { name: 'Host managed' })
+    ).not.toBeInTheDocument();
+    expect(screen.getByText('Host managed')).toBeInTheDocument();
+  });
+
+  it('does not set resource-type link ouia id when lock.link is absent', () => {
+    const { container } = render(
+      <Locks
+        locks={[
+          {
+            name: 'ne',
+            exclusive: false,
+            resource_type: 'Thing',
+            resource_id: 1,
+            link: null,
+          },
+        ]}
+      />
+    );
+    expect(
+      container.querySelector(
+        '[data-ouia-component-id="task-locks-non-exclusive-resource-type-link-0"]'
+      )
+    ).not.toBeInTheDocument();
+  });
 });

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

@@ -27,6 +27,45 @@ describe('RunningSteps', () => {
     expect(screen.getByText(/no running steps/i)).toBeInTheDocument();
   });
 
+  it('shows suspended warning when plan is running, result pending, no steps', () => {
+    render(
+      <RunningSteps
+        {...baseProps}
+        runningSteps={[]}
+        executionPlan={{ state: 'running', cancellable: false }}
+        result="pending"
+      />
+    );
+
+    expect(
+      screen.getByRole('heading', {
+        level: 4,
+        name: /temporarily suspended step/i,
+      })
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText(/the task is still being processed/i)
+    ).toBeInTheDocument();
+  });
+
+  it('shows planned empty state when plan is planned, result pending, no steps', () => {
+    render(
+      <RunningSteps
+        {...baseProps}
+        runningSteps={[]}
+        executionPlan={{ state: 'planned', cancellable: false }}
+        result="pending"
+      />
+    );
+
+    expect(
+      screen.getByRole('heading', { level: 2, name: /planned task/i })
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText(/the task has not started yet/i)
+    ).toBeInTheDocument();
+  });
+
   it('renders running step fields and Cancel when step is cancellable', () => {
     const cancelStep = jest.fn();
     render(

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

@@ -30,7 +30,7 @@ const TaskDetails = ({
   ...props
 }) => {
   const id = getTaskID();
-  const { taskReload, status, isLoading } = props;
+  const { taskReload, status, isLoading, result } = props;
   const [activeTabKey, setActiveTabKey] = useState(1);
 
   useEffect(() => {
@@ -96,6 +96,8 @@ const TaskDetails = ({
           ouiaId="task-details-tab-running-steps"
         >
           <RunningSteps
+            executionPlan={executionPlan}
+            result={result}
             runningSteps={runningSteps}
             id={id}
             cancelStep={cancelStep}

data/webpack/Routes/routes.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import TasksTableIndexPage from '../ForemanTasks/Components/TasksTable/TasksIndexPage';
-import ShowTask from '../ForemanTasks/Routes/ShowTask/ShowTask';
 
 const ForemanTasksRoutes = [
   {
@@ -13,10 +12,6 @@ const ForemanTasksRoutes = [
     exact: true,
     render: props => <TasksTableIndexPage {...props} />,
   },
-  {
-    path: '/foreman_tasks/ex_tasks/:id',
-    render: props => <ShowTask {...props} />,
-  },
 ];
 
 export default ForemanTasksRoutes;

data/webpack/Routes/routes.test.js

@@ -12,14 +12,6 @@ jest.mock(
     }
 );
 
-jest.mock(
-  '../ForemanTasks/Routes/ShowTask/ShowTask',
-  () =>
-    function ShowTaskStub() {
-      return <div data-testid="show-task-stub" />;
-    }
-);
-
 const routerProps = {
   history: { push: jest.fn(), replace: jest.fn(), go: jest.fn() },
   location: {
@@ -43,7 +35,6 @@ describe('ForemanTasks routes', () => {
     ).toEqual([
       { path: '/foreman_tasks/tasks', exact: true },
       { path: '/foreman_tasks/tasks/:id/sub_tasks', exact: true },
-      { path: '/foreman_tasks/ex_tasks/:id', exact: undefined },
     ]);
   });
 
@@ -67,15 +58,6 @@ describe('ForemanTasks routes', () => {
           url: '/foreman_tasks/tasks/7/sub_tasks',
         },
       },
-      {
-        ...routerProps,
-        match: {
-          ...routerProps.match,
-          params: { id: '42' },
-          path: '/foreman_tasks/ex_tasks/:id',
-          url: '/foreman_tasks/ex_tasks/42',
-        },
-      },
     ];
 
     ForemanTasksRoutes.forEach((route, index) => {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 12.2.1
+  version: 12.2.3
 platform: ruby
 authors:
 - Ivan Nečas
@@ -389,7 +389,6 @@ 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__/Locks.test.js.snap
 - webpack/ForemanTasks/Components/TaskDetails/TaskDetails.js
 - webpack/ForemanTasks/Components/TaskDetails/TaskDetails.scss
 - webpack/ForemanTasks/Components/TaskDetails/TaskDetailsActions.js
@@ -479,11 +478,6 @@ files:
 - webpack/ForemanTasks/Components/common/urlHelpers.js
 - webpack/ForemanTasks/ForemanTasksReducers.js
 - webpack/ForemanTasks/ForemanTasksSelectors.js
-- webpack/ForemanTasks/Routes/ShowTask/ShowTask.js
-- webpack/ForemanTasks/Routes/ShowTask/__tests__/ShowTask.test.js
-- webpack/ForemanTasks/Routes/ShowTask/__tests__/__snapshots__/ShowTask.test.js.snap
-- webpack/ForemanTasks/Routes/ShowTask/index.js
-- webpack/ForemanTasks/Routes/ShowTask/showTask.scss
 - webpack/Routes/routes.js
 - webpack/Routes/routes.test.js
 - webpack/global_index.js

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

@@ -1,116 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Locks rendering render with Props 1`] = `
-<div>
-  <Alert
-    className=""
-    onDismiss={null}
-    type="info"
-  >
-    You can find resource locks on this page. Exclusive lock marked with locked icon means that no other task can use locked resource while this task is running. Non-exclusive lock marked with unlocked icon means other tasks can access the resource freely, it is only used to indicate the relation of this task with the resource
-  </Alert>
-  <CardGrid
-    className=""
-    matchHeight={false}
-  >
-    <Row
-      bsClass="row"
-      componentClass="div"
-    >
-      <Col
-        bsClass="col"
-        componentClass="div"
-        key="0"
-        md={4}
-        sm={4}
-        xs={6}
-      >
-        <ConditionalLink
-          link={null}
-        >
-          <Card
-            accented={true}
-            aggregated={false}
-            aggregatedMini={false}
-            cardRef={null}
-            className="card-pf-aggregate-status"
-            matchHeight={false}
-          >
-            <CardTitle
-              className=""
-            >
-              <span
-                className="fa fa-unlock-alt"
-              />
-              User
-            </CardTitle>
-            <CardBody
-              className=""
-            >
-              id:4
-              <br />
-            </CardBody>
-          </Card>
-        </ConditionalLink>
-      </Col>
-      <Col
-        bsClass="col"
-        componentClass="div"
-        key="1"
-        md={4}
-        sm={4}
-        xs={6}
-      >
-        <ConditionalLink
-          link={null}
-        >
-          <Card
-            accented={true}
-            aggregated={false}
-            aggregatedMini={false}
-            cardRef={null}
-            className="card-pf-aggregate-status"
-            matchHeight={false}
-          >
-            <CardTitle
-              className=""
-            >
-              <span
-                className="fa fa-unlock-alt"
-              />
-              User
-            </CardTitle>
-            <CardBody
-              className=""
-            >
-              id:2
-              <br />
-            </CardBody>
-          </Card>
-        </ConditionalLink>
-      </Col>
-    </Row>
-  </CardGrid>
-</div>
-`;
-
-exports[`Locks rendering render without Props 1`] = `
-<div>
-  <Alert
-    className=""
-    onDismiss={null}
-    type="info"
-  >
-    You can find resource locks on this page. Exclusive lock marked with locked icon means that no other task can use locked resource while this task is running. Non-exclusive lock marked with unlocked icon means other tasks can access the resource freely, it is only used to indicate the relation of this task with the resource
-  </Alert>
-  <CardGrid
-    className=""
-    matchHeight={false}
-  >
-    <Row
-      bsClass="row"
-      componentClass="div"
-    />
-  </CardGrid>
-</div>
-`;