foreman-tasks 12.2.2 → 12.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79e3003ee203359edba19b75adac7c38435b94081969faba3ad211601c559345
-  data.tar.gz: b3da633082735d6adf5a5d569744d3d5a6fa1d18d05568e7bc048b922205c674
+  metadata.gz: 200260a81901f7159c565c8188aa71de7b80bc0583b7cf3bf6432a2541130567
+  data.tar.gz: 3cb1afe2a7706fe328155ac0b32da0864155dfcb9e97a7b026283ba020f41489
 SHA512:
-  metadata.gz: 6614edd5d7578167024f5df26bc5f950862dd9a2411a75cfd3f591b19755acbc40a1ca4321eff752800023923bb574d0095aa8c81ab4fa953e030999cf3d4547
-  data.tar.gz: fcdd9f699f2a55d3e27bf014f8dbee0dd0e92e3d4f6b6b6921f0a4ba9841cf2cd8aa2392d0376667fa34a85ec41b53ad6e6ff25dae9443fcee9bd625350e82f2
+  metadata.gz: 26157491f3be0ce0e7386008c492476db1e49d28d28934f1139daec25771626d3e7813c3e858b501020f719930ad4fee3fcf6a54850bb661d4104b0628676993
+  data.tar.gz: d295b0470a35efb6a20801431614256612fdb16fb9f85f6c2c79ffdfaf0bd384656986d82f9d1bf0072b68366420884fbb552638152ccf9ca397f4c8a20a14c8

data/config/routes.rb

@@ -36,7 +36,6 @@ Foreman::Application.routes.draw do
 
     match '/tasks', to: '/react#index', via: :get
     match '/tasks/:id/sub_tasks', to: '/react#index', via: :get
-    match '/ex_tasks/:id', to: '/react#index', via: :get
 
     namespace :api do
       resources :recurring_logics, :only => [:index, :show, :update] do

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '12.2.2'.freeze
+  VERSION = '12.2.3'.freeze
 end

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

@@ -1,68 +1,174 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Alert, AlertVariant, Button } from '@patternfly/react-core';
+import {
+  Alert,
+  AlertVariant,
+  Button,
+  EmptyState,
+  EmptyStateBody,
+  EmptyStateHeader,
+  EmptyStateIcon,
+  EmptyStateVariant,
+  Flex,
+  FlexItem,
+  Grid,
+  GridItem,
+  Stack,
+  StackItem,
+} from '@patternfly/react-core';
+import { HourglassStartIcon } from '@patternfly/react-icons';
 import { translate as __, sprintf } from 'foremanReact/common/I18n';
 
+const RunningStepDetailBlock = ({ label, children }) => (
+  <GridItem span={12}>
+    <Flex
+      direction={{ default: 'column' }}
+      spaceItems={{ default: 'spaceItemsXs' }}
+    >
+      <FlexItem>
+        <strong>{label}</strong>
+      </FlexItem>
+      <FlexItem>{children}</FlexItem>
+    </Flex>
+  </GridItem>
+);
+
+RunningStepDetailBlock.propTypes = {
+  label: PropTypes.node.isRequired,
+  children: PropTypes.node.isRequired,
+};
+
 const RunningSteps = ({
+  executionPlan,
+  result,
   runningSteps,
   id,
   cancelStep,
   taskReload,
   taskReloadStart,
 }) => {
-  if (!runningSteps.length) return <span>{__('No running steps')}</span>;
-  return (
-    <div>
-      {runningSteps.map((step, i) => (
+  const planState = executionPlan?.state;
+  const resultIsPending = String(result) === 'pending';
+
+  if (!runningSteps.length) {
+    if (planState === 'running' && resultIsPending) {
+      return (
         <Alert
           variant={AlertVariant.warning}
           isInline
-          key={step.id || i}
-          ouiaId={`running-step-${i}`}
-          title={sprintf(__('Running step %s'), i + 1)}
+          ouiaId="running-steps-suspended-pending"
+          title={__('Temporarily suspended step(s)')}
         >
-          {step.cancellable && (
-            <p>
-              <Button
-                variant="danger"
-                size="sm"
-                ouiaId={`running-step-cancel-button-${i}`}
-                onClick={() => {
-                  if (!taskReload) {
-                    taskReloadStart(id);
-                  }
-                  cancelStep(id, step.id);
-                }}
-              >
-                {__('Cancel')}
-              </Button>
-            </p>
-          )}
-
-          <p>
-            <span>{__('Action')}:</span>
-            <span />
-          </p>
-          <pre>{step.action_class}</pre>
-          <p>
-            <span>{__('State')}:</span>
-            <span>{step.state}</span>
-          </p>
-          <span>{__('Input')}:</span>
-          <span>
-            <pre>{step.input}</pre>
-          </span>
-          <span>{__('Output')}:</span>
-          <span>
-            <pre>{step.output}</pre>
-          </span>
+          {__('The task is still being processed. Please wait.')}
         </Alert>
+      );
+    }
+
+    if (planState === 'planned' && resultIsPending) {
+      return (
+        <Grid>
+          <GridItem span={12}>
+            <Flex
+              direction={{ default: 'column' }}
+              alignItems={{ default: 'alignItemsCenter' }}
+              justifyContent={{ default: 'justifyContentCenter' }}
+              fullWidth={{ default: 'fullWidth' }}
+            >
+              <FlexItem>
+                <EmptyState variant={EmptyStateVariant.full}>
+                  <EmptyStateHeader
+                    titleText={__('Planned task')}
+                    headingLevel="h2"
+                    icon={<EmptyStateIcon icon={HourglassStartIcon} />}
+                  />
+                  <EmptyStateBody>
+                    {__('The task has not started yet.')}
+                  </EmptyStateBody>
+                </EmptyState>
+              </FlexItem>
+            </Flex>
+          </GridItem>
+        </Grid>
+      );
+    }
+
+    return <span>{__('No running steps')}</span>;
+  }
+
+  return (
+    <Stack hasGutter>
+      {runningSteps.map((step, i) => (
+        <StackItem key={step.id || i}>
+          <Alert
+            variant={AlertVariant.warning}
+            isInline
+            title={sprintf(__('Running step %s'), i + 1)}
+            ouiaId={`running-step-${i}`}
+          >
+            <Grid hasGutter>
+              {step.cancellable && (
+                <GridItem span={12}>
+                  <Flex>
+                    <FlexItem>
+                      <Button
+                        ouiaId={`running-step-${i}-cancel`}
+                        variant="danger"
+                        size="sm"
+                        onClick={() => {
+                          if (!taskReload) {
+                            taskReloadStart(id);
+                          }
+
+                          cancelStep(id, step.id);
+                        }}
+                      >
+                        {__('Cancel')}
+                      </Button>
+                    </FlexItem>
+                  </Flex>
+                </GridItem>
+              )}
+              <GridItem span={12}>
+                <Flex
+                  direction={{ default: 'row' }}
+                  spaceItems={{ default: 'spaceItemsSm' }}
+                  alignItems={{ default: 'alignItemsBaseline' }}
+                >
+                  <FlexItem>
+                    <strong>{`${__('Action')}:`}</strong>
+                  </FlexItem>
+                  <FlexItem>{step.action_class}</FlexItem>
+                </Flex>
+              </GridItem>
+              <GridItem span={12}>
+                <Flex
+                  direction={{ default: 'row' }}
+                  spaceItems={{ default: 'spaceItemsSm' }}
+                  alignItems={{ default: 'alignItemsBaseline' }}
+                >
+                  <FlexItem>
+                    <strong>{`${__('State')}:`}</strong>
+                  </FlexItem>
+                  <FlexItem>{step.state}</FlexItem>
+                </Flex>
+              </GridItem>
+              <RunningStepDetailBlock label={__('Input')}>
+                <pre>{step.input}</pre>
+              </RunningStepDetailBlock>
+              <RunningStepDetailBlock label={__('Output')}>
+                <pre>{step.output}</pre>
+              </RunningStepDetailBlock>
+            </Grid>
+          </Alert>
+        </StackItem>
       ))}
-    </div>
+    </Stack>
   );
 };
 
 RunningSteps.propTypes = {
+  executionPlan: PropTypes.shape({ state: PropTypes.string }),
+  result: PropTypes.string,
   runningSteps: PropTypes.array,
   id: PropTypes.string.isRequired,
   cancelStep: PropTypes.func.isRequired,
@@ -72,6 +178,8 @@ RunningSteps.propTypes = {
 
 RunningSteps.defaultProps = {
   runningSteps: [],
+  executionPlan: {},
+  result: undefined,
 };
 
 export default RunningSteps;

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.2
+  version: 12.2.3
 platform: ruby
 authors:
 - Ivan Nečas
@@ -478,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/Routes/ShowTask/ShowTask.js

@@ -1,10 +0,0 @@
-import React from 'react';
-
-const ShowTask = () => (
-  <div>
-    <h1>Hello Foreman Tasks</h1>
-    <h2>show-task-page</h2>
-  </div>
-);
-
-export default ShowTask;

data/webpack/ForemanTasks/Routes/ShowTask/__tests__/ShowTask.test.js

@@ -1,14 +0,0 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
-import ShowTask from '../ShowTask';
-
-const fixtures = {
-  'render without Props': {
-    history: {
-      push: jest.fn(),
-    },
-  },
-};
-
-describe('ShowTask', () =>
-  testComponentSnapshotsWithFixtures(ShowTask, fixtures));

data/webpack/ForemanTasks/Routes/ShowTask/__tests__/__snapshots__/ShowTask.test.js.snap

@@ -1,12 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ShowTask render without Props 1`] = `
-<div>
-  <h1>
-    Hello Foreman Tasks
-  </h1>
-  <h2>
-    show-task-page
-  </h2>
-</div>
-`;

data/webpack/ForemanTasks/Routes/ShowTask/index.js

@@ -1 +0,0 @@
-export { default } from './ShowTask';