foreman-tasks 2.0.3 → 3.0.4

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

@@ -57,17 +57,20 @@ exports[`TasksCardsGrid render with minimal props 1`] = `
         className=""
         data={
           Object {
-            "error": Object {
-              "last": 0,
-              "total": 0,
-            },
-            "success": Object {
-              "last": 0,
-              "total": 0,
-            },
-            "warning": Object {
-              "last": 0,
-              "total": 0,
+            "other": 0,
+            "results": Object {
+              "error": Object {
+                "last": 0,
+                "total": 0,
+              },
+              "success": Object {
+                "last": 0,
+                "total": 0,
+              },
+              "warning": Object {
+                "last": 0,
+                "total": 0,
+              },
             },
           }
         }

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

@@ -11,6 +11,7 @@ export const TASKS_DASHBOARD_AVAILABLE_QUERY_RESULTS = {
   ERROR: 'error',
   WARNING: 'warning',
   SUCCESS: 'success',
+  OTHER: 'other',
 };
 
 export const TASKS_DASHBOARD_AVAILABLE_QUERY_MODES = {
@@ -44,6 +45,7 @@ export const TASKS_DASHBOARD_QUERY_VALUES_TEXT = {
   [TASKS_DASHBOARD_AVAILABLE_QUERY_RESULTS.ERROR]: __('error'),
   [TASKS_DASHBOARD_AVAILABLE_QUERY_RESULTS.WARNING]: __('warning'),
   [TASKS_DASHBOARD_AVAILABLE_QUERY_RESULTS.SUCCESS]: __('success'),
+  [TASKS_DASHBOARD_AVAILABLE_QUERY_RESULTS.OTHER]: __('other'),
   [TASKS_DASHBOARD_AVAILABLE_QUERY_MODES.LAST]: __('last'),
   [TASKS_DASHBOARD_AVAILABLE_QUERY_MODES.OLDER]: __('older'),
   [TASKS_DASHBOARD_AVAILABLE_TIMES.H24]: __('24h'),

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

@@ -12,6 +12,9 @@ export const selectTime = state =>
 
 export const selectQuery = state => selectTasksDashboard(state).query || {};
 
+export const calcStoppedOther = data =>
+  (data?.cancelled?.total || 0) + (data?.pending?.total || 0);
+
 export const selectTasksSummary = state => {
   const { running, paused, stopped, scheduled } =
     selectTasksDashboard(state).tasksSummary || TASKS_SUMMARY_ZERO;
@@ -26,18 +29,21 @@ export const selectTasksSummary = state => {
       older: paused.total - paused.recent,
     },
     stopped: {
-      error: {
-        total: stopped.by_result.error.total,
-        last: stopped.by_result.error.recent,
-      },
-      warning: {
-        total: stopped.by_result.warning.total,
-        last: stopped.by_result.warning.recent,
-      },
-      success: {
-        total: stopped.by_result.success.total,
-        last: stopped.by_result.success.recent,
+      results: {
+        error: {
+          total: stopped.by_result.error.total,
+          last: stopped.by_result.error.recent,
+        },
+        warning: {
+          total: stopped.by_result.warning.total,
+          last: stopped.by_result.warning.recent,
+        },
+        success: {
+          total: stopped.by_result.success.total,
+          last: stopped.by_result.success.recent,
+        },
       },
+      other: calcStoppedOther(stopped.by_result),
     },
     scheduled: scheduled.total,
   };

data/webpack/ForemanTasks/Components/TasksDashboard/__tests__/TasksDashboardSelectors.test.js

@@ -4,8 +4,32 @@ import {
   selectTime,
   selectQuery,
   selectTasksSummary,
+  calcStoppedOther,
 } from '../TasksDashboardSelectors';
 
+const stoppedResult = {
+  error: {
+    total: 9,
+    recent: 1,
+  },
+  warning: {
+    total: 8,
+    recent: 2,
+  },
+  success: {
+    total: 7,
+    recent: 3,
+  },
+  cancelled: {
+    total: 5,
+    recent: 3,
+  },
+  pending: {
+    total: 11,
+    recent: 4,
+  },
+};
+
 const state = {
   foremanTasks: {
     tasksDashboard: {
@@ -21,20 +45,7 @@ const state = {
           total: 9,
         },
         stopped: {
-          by_result: {
-            error: {
-              total: 9,
-              recent: 1,
-            },
-            warning: {
-              total: 8,
-              recent: 2,
-            },
-            success: {
-              total: 7,
-              recent: 3,
-            },
-          },
+          by_result: stoppedResult,
         },
         scheduled: {
           total: 6,
@@ -55,6 +66,7 @@ const fixtures = {
   'should select tasks-summary': () => selectTasksSummary(state),
   'should select tasks-summary when state is empty': () =>
     selectTasksSummary({}),
+  'should calcStoppedOther': () => calcStoppedOther(stoppedResult),
 };
 
 describe('TasksDashboard - Selectors', () =>

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

@@ -24,17 +24,20 @@ exports[`TasksDashboard rendering render without Props 1`] = `
         },
         "scheduled": 0,
         "stopped": Object {
-          "error": Object {
-            "last": 0,
-            "total": 0,
-          },
-          "success": Object {
-            "last": 0,
-            "total": 0,
-          },
-          "warning": Object {
-            "last": 0,
-            "total": 0,
+          "other": 0,
+          "results": Object {
+            "error": Object {
+              "last": 0,
+              "total": 0,
+            },
+            "success": Object {
+              "last": 0,
+              "total": 0,
+            },
+            "warning": Object {
+              "last": 0,
+              "total": 0,
+            },
           },
         },
       }

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

@@ -1,5 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`TasksDashboard - Selectors should calcStoppedOther 1`] = `16`;
+
 exports[`TasksDashboard - Selectors should select query 1`] = `"some-query"`;
 
 exports[`TasksDashboard - Selectors should select query when state is empty 1`] = `Object {}`;
@@ -21,10 +23,18 @@ Object {
     },
     "stopped": Object {
       "by_result": Object {
+        "cancelled": Object {
+          "recent": 3,
+          "total": 5,
+        },
         "error": Object {
           "recent": 1,
           "total": 9,
         },
+        "pending": Object {
+          "recent": 4,
+          "total": 11,
+        },
         "success": Object {
           "recent": 3,
           "total": 7,
@@ -54,17 +64,20 @@ Object {
   },
   "scheduled": 6,
   "stopped": Object {
-    "error": Object {
-      "last": 1,
-      "total": 9,
-    },
-    "success": Object {
-      "last": 3,
-      "total": 7,
-    },
-    "warning": Object {
-      "last": 2,
-      "total": 8,
+    "other": 16,
+    "results": Object {
+      "error": Object {
+        "last": 1,
+        "total": 9,
+      },
+      "success": Object {
+        "last": 3,
+        "total": 7,
+      },
+      "warning": Object {
+        "last": 2,
+        "total": 8,
+      },
     },
   },
 }
@@ -82,17 +95,20 @@ Object {
   },
   "scheduled": 0,
   "stopped": Object {
-    "error": Object {
-      "last": 0,
-      "total": 0,
-    },
-    "success": Object {
-      "last": 0,
-      "total": 0,
-    },
-    "warning": Object {
-      "last": 0,
-      "total": 0,
+    "other": 0,
+    "results": Object {
+      "error": Object {
+        "last": 0,
+        "total": 0,
+      },
+      "success": Object {
+        "last": 0,
+        "total": 0,
+      },
+      "warning": Object {
+        "last": 0,
+        "total": 0,
+      },
     },
   },
 }

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

@@ -14,14 +14,6 @@ export const getApiPathname = url => {
   return uri.pathname().replace('foreman_tasks/', 'foreman_tasks/api/');
 };
 
-export const resolveSearchQuery = (search, history) => {
-  const uriQuery = {
-    search,
-    page: 1,
-  };
-  updateURlQuery(uriQuery, history);
-};
-
 export const getCSVurl = (path, query) => {
   let url = new URI(path);
   url = url.pathname(`${url.pathname()}.csv`);

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

@@ -1,5 +1,6 @@
 import React 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 PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
@@ -10,7 +11,7 @@ import { STATUS } from 'foremanReact/constants';
 import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
 import TasksDashboard from '../TasksDashboard';
 import TasksTable from './TasksTable';
-import { resolveSearchQuery, getCSVurl } from './TasksTableHelpers';
+import { getCSVurl, updateURlQuery } from './TasksTableHelpers';
 import ConfirmModal from './Components/ConfirmModal/';
 import {
   TASKS_SEARCH_PROPS,
@@ -35,8 +36,17 @@ const TasksTablePage = ({
 }) => {
   const url = history.location.pathname + history.location.search;
   const uriQuery = getURIQuery(url);
-  const onSearch = searchQuery => {
-    resolveSearchQuery(searchQuery, history);
+  const onSearch = search => {
+    const uri = new URI(url);
+    if (uri.search(true).search === search && uri.search(true).page === '1') {
+      props.getTableItems(uri);
+    } else {
+      const newUriQuery = {
+        search,
+        page: 1,
+      };
+      updateURlQuery(newUriQuery, history);
+    }
   };
 
   const { setModalOpen, setModalClosed } = useForemanModal({
@@ -60,7 +70,6 @@ const TasksTablePage = ({
         onSearch={onSearch}
         header={createHeader(props.actionName)}
         breadcrumbOptions={getBreadcrumbs(props.actionName)}
-        toastNotifications="foreman-tasks-cancel"
         toolbarButtons={
           <React.Fragment>
             <Button onClick={() => props.reloadPage(url, props.parentTaskID)}>

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

@@ -14,16 +14,6 @@
   }
 }
 
-.param-name {
-  display: inline-block;
-  width: 10em;
-}
-
-.task-details pre {
-  white-space: pre;
-  word-break: normal;
-}
-
 .tasks-time-row .time-label {
   float: left;
 }

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

@@ -66,7 +66,6 @@ exports[`TasksTablePage rendering render with Breadcrubs and edit permissions 1`
     }
     searchQuery="a=b"
     searchable={true}
-    toastNotifications="foreman-tasks-cancel"
     toolbarButtons={
       <React.Fragment>
         <Button
@@ -202,7 +201,6 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
     }
     searchQuery="a=b"
     searchable={true}
-    toastNotifications="foreman-tasks-cancel"
     toolbarButtons={
       <React.Fragment>
         <Button

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

@@ -4,6 +4,8 @@ exports[`actionNameCellFormatter render 1`] = `
 <a
   href="/some-url/some-id"
 >
-  action-name
+  <EllipisWithTooltip>
+    action-name
+  </EllipisWithTooltip>
 </a>
 `;

data/webpack/ForemanTasks/Components/TasksTable/formatters/actionNameCellFormatter.js

@@ -1,5 +1,10 @@
 import React from 'react';
 import { cellFormatter } from 'foremanReact/components/common/table';
+import EllipsisWithTooltip from 'react-ellipsis-with-tooltip';
 
 export const actionNameCellFormatter = url => (value, { rowData: { id } }) =>
-  cellFormatter(<a href={`/${url}/${id}`}>{value}</a>);
+  cellFormatter(
+    <a href={`/${url}/${id}`}>
+      <EllipsisWithTooltip>{value}</EllipsisWithTooltip>
+    </a>
+  );

data/webpack/ForemanTasks/Components/common/urlHelpers.js

@@ -0,0 +1,7 @@
+import { foremanUrl } from 'foremanReact/common/helpers';
+
+export const foremanTasksApiPath = path =>
+  foremanUrl(`/foreman_tasks/api/tasks/${path}`);
+
+export const foremanTasksPath = path =>
+  foremanUrl(`/foreman_tasks/tasks/${path}`);

data/webpack/ForemanTasks/ForemanTasksReducers.js

@@ -1,13 +1,11 @@
 import { combineReducers } from 'redux';
 import { reducers as tasksDashboardReducers } from './Components/TasksDashboard';
-import { reducers as taskDetailsReducers } from './Components/TaskDetails';
 import { reducers as tasksTableReducers } from './Components/TasksTable';
 import { reducers as confirmModalReducers } from './Components/TasksTable/Components/ConfirmModal';
 
 const reducers = {
   foremanTasks: combineReducers({
     ...tasksDashboardReducers,
-    ...taskDetailsReducers,
     ...tasksTableReducers,
     ...confirmModalReducers,
   }),

data/webpack/__mocks__/foremanReact/common/helpers.js

@@ -2,3 +2,5 @@ export const getURIQuery = jest.fn(() => ({}));
 
 export const isoCompatibleDate = date => date;
 export const noop = Function.prototype;
+
+export const foremanUrl = path => `foreman${path}`;

data/webpack/__mocks__/foremanReact/redux/API/APISelectors.js

@@ -0,0 +1,10 @@
+export const selectAPIResponse = (state, key) => ({
+  data: {
+    text: 'some-data',
+    key,
+  },
+});
+
+export const selectAPIStatus = (state, key) => 'PENDING';
+export const selectAPIByKey = (state, key) => state[key];
+export const selectAPIError = (state, key) => ({ error: `${key} ERRROR` });

data/webpack/__mocks__/foremanReact/redux/API/index.js

@@ -0,0 +1,10 @@
+export const API = {
+  get: jest.fn(),
+  put: jest.fn(),
+  post: jest.fn(),
+  delete: jest.fn(),
+  patch: jest.fn(),
+};
+
+export const get = data => ({ type: 'get-some-type', ...data });
+export const post = data => ({ type: 'post-some-type', ...data });