foreman-tasks 0.17.0 → 0.17.1

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

@@ -56,9 +56,9 @@ exports[`TaskInfo rendering render with Props 1`] = `
       md={3}
       sm={6}
     >
-      <FormattedRelative
-        updateInterval={10000}
-        value={2019-06-17T13:04:09.000Z}
+      <Component
+        date="2019-06-17 16:04:09 +0300"
+        defaultValue="N/A"
       />
     </Col>
   </Row>
@@ -115,9 +115,9 @@ exports[`TaskInfo rendering render with Props 1`] = `
       md={3}
       sm={6}
     >
-      <FormattedRelative
-        updateInterval={10000}
-        value={2019-06-17T13:04:09.000Z}
+      <Component
+        date="2019-06-17 16:04:09 +0300"
+        defaultValue="N/A"
       />
     </Col>
   </Row>
@@ -168,7 +168,10 @@ exports[`TaskInfo rendering render with Props 1`] = `
       md={3}
       sm={6}
     >
-      N/A
+      <Component
+        date={null}
+        defaultValue="N/A"
+      />
     </Col>
   </Row>
   <Row
@@ -356,7 +359,10 @@ exports[`TaskInfo rendering render without Props 1`] = `
       md={3}
       sm={6}
     >
-      N/A
+      <Component
+        date=""
+        defaultValue="N/A"
+      />
     </Col>
   </Row>
   <Row
@@ -412,7 +418,10 @@ exports[`TaskInfo rendering render without Props 1`] = `
       md={3}
       sm={6}
     >
-      N/A
+      <Component
+        date=""
+        defaultValue="N/A"
+      />
     </Col>
   </Row>
   <Row
@@ -460,7 +469,10 @@ exports[`TaskInfo rendering render without Props 1`] = `
       md={3}
       sm={6}
     >
-      N/A
+      <Component
+        date=""
+        defaultValue="N/A"
+      />
     </Col>
   </Row>
   <Row

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

@@ -12,6 +12,10 @@ import {
   FOREMAN_TASK_DETAILS_TOGGLE_UNLOCK_MODAL,
   FOREMAN_TASK_DETAILS_TOGGLE_FORCE_UNLOCK_MODAL,
 } from './TaskDetailsConstants';
+import {
+  cancelTaskRequest,
+  resumeTaskRequest,
+} from '../TasksTable/TasksTableActions';
 
 export const taskReloadStop = timeoutId => {
   if (timeoutId) {
@@ -107,3 +111,5 @@ export const toggleUnlockModal = () => ({
 export const toggleForceUnlockModal = () => ({
   type: FOREMAN_TASK_DETAILS_TOGGLE_FORCE_UNLOCK_MODAL,
 });
+
+export { cancelTaskRequest, resumeTaskRequest };

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

@@ -58,7 +58,7 @@ export const selectLocks = state => selectTaskDetails(state).locks || [];
 export const selectUsernamePath = state =>
   selectTaskDetails(state).username_path || null;
 
-export const selectAction = state => selectTaskDetails(state).action || null;
+export const selectAction = state => selectTaskDetails(state).action || '';
 
 export const selectState = state => selectTaskDetails(state).state || null;
 

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

@@ -16,6 +16,7 @@ exports[`TaskDetails rendering render without Props 1`] = `
       <Task
         action=""
         allowDangerousActions={false}
+        cancelTaskRequest={[Function]}
         cancellable={false}
         endedAt=""
         error={Array []}
@@ -35,6 +36,7 @@ exports[`TaskDetails rendering render without Props 1`] = `
         refetchTaskDetails={[Function]}
         result="error"
         resumable={false}
+        resumeTaskRequest={[Function]}
         runningSteps={Array []}
         showForceUnlockModal={false}
         showUnlockModal={false}

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

@@ -38,7 +38,9 @@ class TasksDashboard extends React.Component {
 
   render() {
     const { time, query, tasksSummary, updateTime, updateQuery } = this.props;
-
+    const updateQueryHistory = labelQuery => {
+      updateQuery(labelQuery, this.props.history);
+    };
     return (
       <Grid fluid className="tasks-dashboard-grid">
         <TasksTimeRow time={time} updateTime={updateTime} />
@@ -46,9 +48,9 @@ class TasksDashboard extends React.Component {
           time={time}
           query={query}
           data={tasksSummary}
-          updateQuery={updateQuery}
+          updateQuery={updateQueryHistory}
         />
-        <TasksLabelsRow query={query} updateQuery={updateQuery} />
+        <TasksLabelsRow query={query} updateQuery={updateQueryHistory} />
       </Grid>
     );
   }
@@ -62,6 +64,7 @@ TasksDashboard.propTypes = {
   updateTime: PropTypes.func,
   updateQuery: PropTypes.func,
   fetchTasksSummary: PropTypes.func,
+  history: PropTypes.object.isRequired,
 };
 
 TasksDashboard.defaultProps = {

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

@@ -21,16 +21,15 @@ export const updateTime = time => ({
   payload: time,
 });
 
-export const updateQuery = query => (dispatch, getState) => {
+export const updateQuery = (query, history) => (dispatch, getState) => {
   if (query.time === TASKS_DASHBOARD_CURRENT_TIME)
     query.time = selectTime(getState());
 
+  resolveQuery(query, history);
   dispatch({
     type: FOREMAN_TASKS_DASHBOARD_UPDATE_QUERY,
     payload: query,
   });
-
-  resolveQuery(query);
 };
 
 export const fetchTasksSummary = time => async dispatch => {

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

@@ -1,4 +1,3 @@
-import URI from 'urijs';
 import { getURIQuery } from 'foremanReact/common/helpers';
 
 import {
@@ -6,6 +5,7 @@ import {
   TASKS_DASHBOARD_QUERY_KEYS_TEXT,
   TASKS_DASHBOARD_QUERY_VALUES_TEXT,
 } from './TasksDashboardConstants';
+import { updateURlQuery } from '../TasksTable/TasksTableHelpers';
 
 export const getQueryKeyText = key => TASKS_DASHBOARD_QUERY_KEYS_TEXT[key];
 
@@ -46,50 +46,19 @@ const queryFromUriQuery = uriQuery => {
   return query;
 };
 
-const uriQueryFromQuery = query => {
-  const uriQuery = {};
-
-  Object.entries(uriToQueryMap).forEach(([uriField, queryField]) => {
-    if (query[queryField]) uriQuery[uriField] = query[queryField];
-  });
-
-  if (uriQuery.time_mode === 'last') {
-    uriQuery.time_mode = 'recent';
-  }
-
-  return uriQuery;
-};
-
 export const getQueryFromUrl = () => {
   const uriQuery = getURIQuery(window.location.href);
 
   return queryFromUriQuery(uriQuery);
 };
 
-export const resolveQuery = query => {
-  const uriQuery = uriQueryFromQuery(query);
-
-  const uri = new URI(window.location.href);
-  const { search } = uri.query(true);
-
-  const data = { search, ...uriQuery, page: 1 };
-  const { $, tfm } = window;
-
-  uri.query(URI.buildQuery(data, true));
-  tfm.tools.showSpinner();
-  $.ajax({
-    type: 'get',
-    url: uri.toString(),
-    success(result) {
-      const res = $(`<div>${result}</div>`);
-
-      $('#tasks-table').html(res.find('#tasks-table'));
-    },
-    error({ statusText }) {
-      $('#tasks-table').html(statusText);
-    },
-    complete(result) {
-      tfm.tools.hideSpinner();
-    },
-  });
+export const resolveQuery = ({ state, result, mode, time }, history) => {
+  const uriQuery = {
+    state,
+    result,
+    time_mode: mode === 'last' ? 'recent' : mode,
+    time_horizon: time,
+    page: 1,
+  };
+  updateURlQuery(uriQuery, history);
 };

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

@@ -12,7 +12,6 @@ import {
 
 const initialState = Immutable({
   time: TASKS_DASHBOARD_AVAILABLE_TIMES.H24,
-  query: {},
   isLoadingTasksSummary: false,
   error: null,
   tasksSummary: TASKS_SUMMARY_ZERO,

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

@@ -3,7 +3,7 @@ import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
 import TasksDashboard from '../TasksDashboard';
 
 const fixtures = {
-  'render without Props': {},
+  'render without Props': { history: {} },
   /** fixtures, props for the component */
 };
 

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

@@ -5,7 +5,6 @@ Object {
   "error": [Error: some error],
   "isLoading": false,
   "isLoadingTasksSummary": false,
-  "query": Object {},
   "tasksSummary": Object {
     "paused": Object {
       "recent": 0,
@@ -44,7 +43,6 @@ Object {
   "error": null,
   "isLoading": true,
   "isLoadingTasksSummary": false,
-  "query": Object {},
   "tasksSummary": Object {
     "paused": Object {
       "recent": 0,
@@ -83,7 +81,6 @@ Object {
   "error": null,
   "isLoading": false,
   "isLoadingTasksSummary": false,
-  "query": Object {},
   "tasksSummary": "some-payload",
   "time": "H24",
 }
@@ -93,7 +90,7 @@ exports[`BreadcrumbBar reducer should handle FOREMAN_TASKS_DASHBOARD_INIT 1`] =
 Object {
   "error": null,
   "isLoadingTasksSummary": false,
-  "query": Object {},
+  "query": undefined,
   "tasksSummary": Object {
     "paused": Object {
       "recent": 0,
@@ -207,7 +204,6 @@ exports[`BreadcrumbBar reducer should handle FOREMAN_TASKS_DASHBOARD_UPDATE_TIME
 Object {
   "error": null,
   "isLoadingTasksSummary": false,
-  "query": Object {},
   "tasksSummary": Object {
     "paused": Object {
       "recent": 0,
@@ -245,7 +241,6 @@ exports[`BreadcrumbBar reducer should return the initial state 1`] = `
 Object {
   "error": null,
   "isLoadingTasksSummary": false,
-  "query": Object {},
   "tasksSummary": Object {
     "paused": Object {
       "recent": 0,

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

@@ -0,0 +1,30 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+import TasksTablePage from './';
+
+export const SubTasksPage = props => {
+  const getBreadcrumbs = actionName => ({
+    breadcrumbItems: [
+      { caption: __('Tasks'), url: `/foreman_tasks/tasks` },
+      {
+        caption: actionName,
+        url: `/foreman_tasks/tasks/${props.match.params.id}`,
+      },
+      { caption: __('Sub tasks') },
+    ],
+  });
+  return <TasksTablePage getBreadcrumbs={getBreadcrumbs} {...props} />;
+};
+
+SubTasksPage.propTypes = {
+  match: PropTypes.shape({
+    params: PropTypes.object,
+  }),
+};
+
+SubTasksPage.defaultProps = {
+  match: {
+    params: {},
+  },
+};

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

@@ -0,0 +1,53 @@
+import React from 'react';
+import { FormattedDate } from 'react-intl';
+import { isoCompatibleDate } from 'foremanReact/common/helpers';
+import { translate as __ } from 'foremanReact/common/I18n';
+import EllipsisWithTooltip from 'react-ellipsis-with-tooltip';
+import { cellFormatter } from 'foremanReact/components/common/table';
+import { ActionButton } from '../common/ActionButtons/ActionButton';
+
+export const dateCellFormmatter = value => {
+  if (value) {
+    const isoDate = isoCompatibleDate(value);
+    return (
+      <span>
+        <FormattedDate
+          value={isoDate}
+          day="2-digit"
+          month="long"
+          hour="2-digit"
+          minute="2-digit"
+          second="2-digit"
+          year="numeric"
+        />
+      </span>
+    );
+  }
+  return <span>{__('N/A')}</span>;
+};
+
+export const actionNameCellFormatter = url => (value, { rowData: { id } }) =>
+  cellFormatter(
+    <EllipsisWithTooltip>
+      <a href={`/${url}/${id}`}>{value}</a>
+    </EllipsisWithTooltip>
+  );
+
+export const actionCellFormatter = taskActions => (
+  value,
+  { rowData: { action, id } }
+) =>
+  cellFormatter(
+    <ActionButton
+      taskActions={taskActions}
+      availableActions={value}
+      id={id}
+      name={action}
+    />
+  );
+
+export const durationCellFormmatter = value => (
+  <span className="param-value" title={value.tooltip}>
+    {value.text}
+  </span>
+);

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

@@ -0,0 +1,10 @@
+import React from 'react';
+import { translate as __ } from 'foremanReact/common/I18n';
+import TasksTablePage from './';
+
+export const TasksIndexPage = props => {
+  const getBreadcrumbs = () => ({
+    breadcrumbItems: [{ caption: __('Tasks'), url: `/foreman_tasks/tasks` }],
+  });
+  return <TasksTablePage getBreadcrumbs={getBreadcrumbs} {...props} />;
+};

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

@@ -0,0 +1,119 @@
+import React, { useEffect } from 'react';
+import PropTypes from 'prop-types';
+import { Table } from 'foremanReact/components/common/table';
+import { STATUS } from 'foremanReact/constants';
+import MessageBox from 'foremanReact/components/common/MessageBox';
+import { translate as __ } from 'foremanReact/common/I18n';
+import Pagination from 'foremanReact/components/Pagination/PaginationWrapper';
+import { getURIQuery } from 'foremanReact/common/helpers';
+import createTasksTableSchema from './TasksTableSchema';
+import { updateURlQuery } from './TasksTableHelpers';
+
+const TasksTable = ({
+  getTableItems,
+  error,
+  status,
+  results,
+  history,
+  itemCount,
+  pagination,
+  cancelTask,
+  resumeTask,
+}) => {
+  const url = history.location.pathname + history.location.search;
+  const uriQuery = getURIQuery(url);
+
+  useEffect(() => {
+    getTableItems(url);
+  }, [history.location.search]);
+
+  if (status === STATUS.ERROR) {
+    return (
+      <MessageBox
+        key="tasks-table-error"
+        icontype="error-circle-o"
+        msg={__(`Could not receive data: ${error && error.message}`)}
+      />
+    );
+  }
+
+  if (status === STATUS.PENDING && results.length === 0) {
+    return <div />;
+  }
+
+  if (results.length === 0) {
+    return <span>{__('No Tasks')}</span>;
+  }
+
+  const changeTablePage = ({ page, perPage }) => {
+    updateURlQuery(
+      {
+        page,
+        per_page: perPage,
+      },
+      history
+    );
+  };
+
+  const setSortHistory = (by, order) => {
+    updateURlQuery({ sort_by: by, sort_order: order }, history);
+  };
+
+  const taskActions = {
+    cancel: (id, name) => {
+      cancelTask(id, name, url);
+    },
+    resume: (id, name) => {
+      resumeTask(id, name, url);
+    },
+  };
+
+  return (
+    <div className="tasks-table">
+      <Table
+        key="tasks-table"
+        columns={createTasksTableSchema(
+          setSortHistory,
+          uriQuery.sort_by,
+          uriQuery.sort_order,
+          taskActions
+        )}
+        rows={results}
+      />
+      <Pagination
+        className="tasks-pagination"
+        viewType="table"
+        itemCount={itemCount}
+        pagination={pagination}
+        onChange={changeTablePage}
+        dropdownButtonId="tasks-table-dropdown"
+      />
+    </div>
+  );
+};
+
+TasksTable.propTypes = {
+  results: PropTypes.array.isRequired,
+  getTableItems: PropTypes.func.isRequired,
+  status: PropTypes.oneOf(Object.keys(STATUS)),
+  error: PropTypes.instanceOf(Error),
+  itemCount: PropTypes.number.isRequired,
+  pagination: PropTypes.shape({
+    page: PropTypes.number,
+    perPage: PropTypes.number,
+  }),
+  history: PropTypes.object.isRequired,
+  cancelTask: PropTypes.func.isRequired,
+  resumeTask: PropTypes.func.isRequired,
+};
+
+TasksTable.defaultProps = {
+  status: STATUS.PENDING,
+  error: null,
+  pagination: {
+    page: 1,
+    perPage: 20,
+  },
+};
+
+export default TasksTable;