foreman-tasks 12.2.3 → 13.0.0

data/webpack/Routes/routes.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import TasksTableIndexPage from '../ForemanTasks/Components/TasksTable/TasksIndexPage';
+import TaskDetailsPage from '../ForemanTasks/Routes/ShowTaskDetails/TaskDetailsPage';
 
 const ForemanTasksRoutes = [
   {
@@ -7,6 +8,11 @@ const ForemanTasksRoutes = [
     exact: true,
     render: props => <TasksTableIndexPage {...props} />,
   },
+  {
+    path: '/foreman_tasks/tasks/:id',
+    exact: true,
+    render: props => <TaskDetailsPage {...props} />,
+  },
   {
     path: '/foreman_tasks/tasks/:id/sub_tasks',
     exact: true,

data/webpack/Routes/routes.test.js

@@ -12,6 +12,14 @@ jest.mock(
     }
 );
 
+jest.mock(
+  '../ForemanTasks/Routes/ShowTaskDetails/TaskDetailsPage',
+  () =>
+    function TaskDetailsPageStub() {
+      return <div data-testid="task-details-page-stub" />;
+    }
+);
+
 const routerProps = {
   history: { push: jest.fn(), replace: jest.fn(), go: jest.fn() },
   location: {
@@ -34,6 +42,7 @@ describe('ForemanTasks routes', () => {
       ForemanTasksRoutes.map(({ path, exact }) => ({ path, exact }))
     ).toEqual([
       { path: '/foreman_tasks/tasks', exact: true },
+      { path: '/foreman_tasks/tasks/:id', exact: true },
       { path: '/foreman_tasks/tasks/:id/sub_tasks', exact: true },
     ]);
   });
@@ -53,9 +62,9 @@ describe('ForemanTasks routes', () => {
         ...routerProps,
         match: {
           ...routerProps.match,
-          params: { id: '7' },
-          path: '/foreman_tasks/tasks/:id/sub_tasks',
-          url: '/foreman_tasks/tasks/7/sub_tasks',
+          params: { id: '99' },
+          path: '/foreman_tasks/tasks/:id',
+          url: '/foreman_tasks/tasks/99',
         },
       },
     ];
@@ -63,8 +72,10 @@ describe('ForemanTasks routes', () => {
     ForemanTasksRoutes.forEach((route, index) => {
       const { unmount } = render(route.render(propsByIndex[index]));
 
-      if (index === 2) {
-        expect(screen.getByTestId('show-task-stub')).toBeInTheDocument();
+      if (index === 1) {
+        expect(
+          screen.getByTestId('task-details-page-stub')
+        ).toBeInTheDocument();
       } else {
         expect(
           screen.getByTestId('tasks-table-index-stub')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 12.2.3
+  version: 13.0.0
 platform: ruby
 authors:
 - Ivan Nečas
@@ -219,7 +219,6 @@ files:
 - app/views/foreman_tasks/tasks/_lock_card.html.erb
 - app/views/foreman_tasks/tasks/dashboard/_latest_tasks_in_error_warning.html.erb
 - app/views/foreman_tasks/tasks/dashboard/_tasks_status.html.erb
-- app/views/foreman_tasks/tasks/show.html.erb
 - app/views/tasks_mailer/long_tasks.html.erb
 - app/views/tasks_mailer/long_tasks.text.erb
 - babel.config.js
@@ -331,6 +330,7 @@ files:
 - test/graphql/queries/tasks_query_test.rb
 - test/helpers/foreman_tasks/foreman_tasks_helper_test.rb
 - test/helpers/foreman_tasks/tasks_helper_test.rb
+- test/integration/tasks_test.rb
 - test/lib/actions/middleware/keep_current_request_id_test.rb
 - test/lib/actions/middleware/keep_current_taxonomies_test.rb
 - test/lib/actions/middleware/keep_current_timezone_test.rb
@@ -343,6 +343,7 @@ files:
 - test/support/dummy_task_group.rb
 - test/support/history_tasks_builder.rb
 - test/tasks/generate_task_actions_test.rb
+- test/test_plugin_helper.rb
 - test/unit/actions/action_with_sub_plans_test.rb
 - test/unit/actions/bulk_action_test.rb
 - test/unit/actions/proxy_action_test.rb
@@ -368,10 +369,10 @@ files:
 - webpack/ForemanTasks/Components/TaskActions/TaskActionHelpers.js
 - webpack/ForemanTasks/Components/TaskActions/TaskActionHelpers.test.js
 - 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/Errors.scss
 - webpack/ForemanTasks/Components/TaskDetails/Components/Locks.js
 - webpack/ForemanTasks/Components/TaskDetails/Components/Raw.js
 - webpack/ForemanTasks/Components/TaskDetails/Components/RunningSteps.js
@@ -398,6 +399,7 @@ 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__/TaskDetailsSelectors.test.js
 - 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
@@ -447,10 +449,6 @@ files:
 - webpack/ForemanTasks/Components/TasksDashboard/__tests__/TasksDashboardHelper.test.js
 - webpack/ForemanTasks/Components/TasksDashboard/__tests__/TasksDashboardReducer.test.js
 - webpack/ForemanTasks/Components/TasksDashboard/__tests__/TasksDashboardSelectors.test.js
-- webpack/ForemanTasks/Components/TasksDashboard/__tests__/__snapshots__/TasksDashboard.test.js.snap
-- webpack/ForemanTasks/Components/TasksDashboard/__tests__/__snapshots__/TasksDashboardActions.test.js.snap
-- webpack/ForemanTasks/Components/TasksDashboard/__tests__/__snapshots__/TasksDashboardReducer.test.js.snap
-- webpack/ForemanTasks/Components/TasksDashboard/__tests__/__snapshots__/TasksDashboardSelectors.test.js.snap
 - webpack/ForemanTasks/Components/TasksDashboard/index.js
 - webpack/ForemanTasks/Components/TasksTable/Components/ActionSelectButton.js
 - webpack/ForemanTasks/Components/TasksTable/Components/CellActionButton.js
@@ -475,9 +473,12 @@ files:
 - webpack/ForemanTasks/Components/common/ClickConfirmation/index.js
 - webpack/ForemanTasks/Components/common/ToastsHelpers/ToastTypesConstants.js
 - webpack/ForemanTasks/Components/common/ToastsHelpers/index.js
+- webpack/ForemanTasks/Components/common/taskResultIcon.js
 - webpack/ForemanTasks/Components/common/urlHelpers.js
 - webpack/ForemanTasks/ForemanTasksReducers.js
 - webpack/ForemanTasks/ForemanTasksSelectors.js
+- webpack/ForemanTasks/Routes/ShowTaskDetails/TaskDetailsPage.js
+- webpack/ForemanTasks/Routes/ShowTaskDetails/__tests__/TaskDetailsPage.test.js
 - webpack/Routes/routes.js
 - webpack/Routes/routes.test.js
 - webpack/global_index.js
@@ -523,6 +524,7 @@ test_files:
 - test/graphql/queries/tasks_query_test.rb
 - test/helpers/foreman_tasks/foreman_tasks_helper_test.rb
 - test/helpers/foreman_tasks/tasks_helper_test.rb
+- test/integration/tasks_test.rb
 - test/lib/actions/middleware/keep_current_request_id_test.rb
 - test/lib/actions/middleware/keep_current_taxonomies_test.rb
 - test/lib/actions/middleware/keep_current_timezone_test.rb
@@ -535,6 +537,7 @@ test_files:
 - test/support/dummy_task_group.rb
 - test/support/history_tasks_builder.rb
 - test/tasks/generate_task_actions_test.rb
+- test/test_plugin_helper.rb
 - test/unit/actions/action_with_sub_plans_test.rb
 - test/unit/actions/bulk_action_test.rb
 - test/unit/actions/proxy_action_test.rb

data/app/views/foreman_tasks/tasks/show.html.erb

@@ -1,18 +0,0 @@
-<% stylesheet 'foreman_tasks/foreman_tasks' %>
-<% content_for(:javascripts) do %>
-  <%= webpacked_plugins_js_for :'foreman-tasks' %>
-<% end %>
-<% content_for(:stylesheets) do %>
-  <%= webpacked_plugins_css_for :'foreman-tasks' %>
-<% end %>
-
-<% title _("Details of %s task") % @task.to_s %>
-
-<%= breadcrumbs(
-  items: breadcrumb_items,
-  name_field: 'action',
-  resource_url: foreman_tasks_api_tasks_path,
-  switcher_item_url: foreman_tasks_task_path(:id => ':id')
-) %>
-
-<%= react_component('TaskDetails')  %>

data/webpack/ForemanTasks/Components/TaskActions/__snapshots__/TaskAction.test.js.snap

@@ -1,233 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Tasks actions should cancelTaskRequest and fail 1`] = `
-Array [
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "Trying to cancel some-name task",
-          "type": "info",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-  Array [
-    Object {
-      "type": "TASKS_CANCEL_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "payload": [Error: Network Error],
-      "type": "TASKS_CANCEL_FAILURE",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "some-name Task execution task has to be cancellable",
-          "type": "warning",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-]
-`;
-
-exports[`Tasks actions should cancelTaskRequest and succeed 1`] = `
-Array [
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "Trying to cancel some-name task",
-          "type": "info",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-  Array [
-    Object {
-      "type": "TASKS_CANCEL_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "type": "TASKS_CANCEL_SUCCESS",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "some-name Task execution was cancelled",
-          "type": "success",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-]
-`;
-
-exports[`Tasks actions should forceCancelTaskRequest and fail 1`] = `
-Array [
-  Array [
-    Object {
-      "type": "TASKS_FORCE_CANCEL_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "type": "TASKS_FORCE_CANCEL_FAILURE",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "some-name Task execution cannot be cancelled with force at the moment.",
-          "type": "warning",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-]
-`;
-
-exports[`Tasks actions should forceCancelTaskRequest and succeed 1`] = `
-Array [
-  Array [
-    Object {
-      "type": "TASKS_FORCE_CANCEL_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "type": "TASKS_FORCE_CANCEL_SUCCESS",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "some-name Task execution resources were unlocked with force.",
-          "type": "success",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-]
-`;
-
-exports[`Tasks actions should resumeTaskRequest and fail 1`] = `
-Array [
-  Array [
-    Object {
-      "type": "TASKS_RESUME_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "payload": [Error: Network Error],
-      "type": "TASKS_RESUME_FAILURE",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "some-name Task execution could not be resumed",
-          "type": "error",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-]
-`;
-
-exports[`Tasks actions should resumeTaskRequest and succeed 1`] = `
-Array [
-  Array [
-    Object {
-      "type": "TASKS_RESUME_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "type": "TASKS_RESUME_SUCCESS",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "some-name Task execution was resumed",
-          "type": "success",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-]
-`;
-
-exports[`Tasks actions should unlockTaskRequest and fail 1`] = `
-Array [
-  Array [
-    Object {
-      "type": "TASKS_FORCE_CANCEL_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "type": "TASKS_FORCE_CANCEL_FAILURE",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "some-name Task execution cannot be cancelled with force at the moment.",
-          "type": "warning",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-]
-`;
-
-exports[`Tasks actions should unlockTaskRequest and succeed 1`] = `
-Array [
-  Array [
-    Object {
-      "type": "TASKS_UNLOCK_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "type": "TASKS_UNLOCK_SUCCESS",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "some-name Task execution resources were unlocked ",
-          "type": "success",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-]
-`;

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

@@ -1,51 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`TasksDashboard rendering render without Props 1`] = `
-<div
-  className="tasks-dashboard-grid"
->
-  <TasksTimeRow
-    time="H24"
-    updateTime={[Function]}
-  />
-  <TasksCardsGrid
-    data={
-      Object {
-        "paused": Object {
-          "last": 0,
-          "older": 0,
-        },
-        "running": Object {
-          "last": 0,
-          "older": 0,
-        },
-        "scheduled": 0,
-        "stopped": Object {
-          "other": 0,
-          "results": Object {
-            "error": Object {
-              "last": 0,
-              "total": 0,
-            },
-            "success": Object {
-              "last": 0,
-              "total": 0,
-            },
-            "warning": Object {
-              "last": 0,
-              "total": 0,
-            },
-          },
-        },
-      }
-    }
-    query={Object {}}
-    time="H24"
-    updateQuery={[Function]}
-  />
-  <TasksLabelsRow
-    query={Object {}}
-    updateQuery={[Function]}
-  />
-</div>
-`;

data/webpack/ForemanTasks/Components/TasksDashboard/__tests__/__snapshots__/TasksDashboardActions.test.js.snap

@@ -1,151 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`TasksDashboard - Actions should fetch-tasks-summary and fail 1`] = `
-Array [
-  Array [
-    Object {
-      "type": "FOREMAN_TASKS_DASHBOARD_FETCH_TASKS_SUMMARY_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "payload": [Error: wrong time],
-      "type": "FOREMAN_TASKS_DASHBOARD_FETCH_TASKS_SUMMARY_FAILURE",
-    },
-  ],
-]
-`;
-
-exports[`TasksDashboard - Actions should fetch-tasks-summary and success 1`] = `
-Array [
-  Array [
-    Object {
-      "type": "FOREMAN_TASKS_DASHBOARD_FETCH_TASKS_SUMMARY_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "tasksSummary": Object {
-          "paused": Object {
-            "recent": 0,
-            "total": 54,
-          },
-          "running": Object {
-            "recent": 0,
-            "total": 3,
-          },
-          "scheduled": Object {
-            "recent": 0,
-            "total": 7,
-          },
-          "stopped": Object {
-            "by_result": Object {
-              "cancelled": Object {
-                "recent": 0,
-                "total": 105,
-              },
-              "error": Object {
-                "recent": 0,
-                "total": 121,
-              },
-              "success": Object {
-                "recent": 0,
-                "total": 532,
-              },
-              "warning": Object {
-                "recent": 0,
-                "total": 10,
-              },
-            },
-            "recent": 0,
-            "total": 768,
-          },
-        },
-      },
-      "type": "FOREMAN_TASKS_DASHBOARD_FETCH_TASKS_SUMMARY_SUCCESS",
-    },
-  ],
-]
-`;
-
-exports[`TasksDashboard - Actions should fetch-tasks-summary for subtasks and success 1`] = `
-Array [
-  Array [
-    Object {
-      "type": "FOREMAN_TASKS_DASHBOARD_FETCH_TASKS_SUMMARY_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "tasksSummary": Object {
-          "paused": Object {
-            "recent": 0,
-            "total": 7,
-          },
-          "running": Object {
-            "recent": 0,
-            "total": 3,
-          },
-          "scheduled": Object {
-            "recent": 0,
-            "total": 7,
-          },
-          "stopped": Object {
-            "by_result": Object {
-              "cancelled": Object {
-                "recent": 0,
-                "total": 0,
-              },
-              "error": Object {
-                "recent": 0,
-                "total": 0,
-              },
-              "success": Object {
-                "recent": 0,
-                "total": 0,
-              },
-              "warning": Object {
-                "recent": 0,
-                "total": 0,
-              },
-            },
-            "recent": 0,
-            "total": 0,
-          },
-        },
-      },
-      "type": "FOREMAN_TASKS_DASHBOARD_FETCH_TASKS_SUMMARY_SUCCESS",
-    },
-  ],
-]
-`;
-
-exports[`TasksDashboard - Actions should initialize-dashboard 1`] = `
-Object {
-  "payload": Object {
-    "query": "some-query",
-    "time": "some-time",
-  },
-  "type": "FOREMAN_TASKS_DASHBOARD_INIT",
-}
-`;
-
-exports[`TasksDashboard - Actions should update-query 1`] = `
-Array [
-  Array [
-    Object {
-      "payload": "some-query",
-      "type": "FOREMAN_TASKS_DASHBOARD_UPDATE_QUERY",
-    },
-  ],
-]
-`;
-
-exports[`TasksDashboard - Actions should update-time 1`] = `
-Object {
-  "payload": "some-time",
-  "type": "FOREMAN_TASKS_DASHBOARD_UPDATE_TIME",
-}
-`;