foreman-tasks 2.0.1 → 3.0.3

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

@@ -39,6 +39,7 @@ export const selectResults = createSelector(
         ...result.available_actions,
         stoppable: result.state !== 'stopped',
       },
+      canEdit: result.can_edit,
     }))
 );
 

data/webpack/ForemanTasks/Components/TasksTable/__tests__/TasksBulkActions.test.js

@@ -18,6 +18,7 @@ jest.mock('foremanReact/redux/API');
 const task = {
   id: 'some-id',
   name: 'some-name',
+  canEdit: true,
 };
 
 const fixtures = {
@@ -140,6 +141,18 @@ const fixtures = {
       url: 'some-url',
       parentTaskID: 'parent',
     }),
+  'handles bulkCancelById requests with canEdit false': () => {
+    const selected = [{ ...task, isCancellable: true, canEdit: false }];
+    return bulkCancelById({ selected, url: 'some-url' });
+  },
+  'handles bulkResumeById requests with canEdit false': () => {
+    const selected = [{ ...task, isResumable: false, canEdit: false }];
+    return bulkResumeById({ selected, url: 'some-url' });
+  },
+  'handles bulkForceCancelById requests with canEdit false': () => {
+    const selected = [{ ...task, isResumable: false, canEdit: false }];
+    return bulkForceCancelById({ selected, url: 'some-url' });
+  },
 };
 
 describe('TasksTable bulk actions', () => {

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

@@ -9,6 +9,7 @@ export const minProps = {
   unselectAllRows: jest.fn(),
   selectRow: jest.fn(),
   unselectRow: jest.fn(),
+  reloadPage: jest.fn(),
   selectedRows: [],
   pagination: {
     page: 1,

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

@@ -12,9 +12,10 @@ const history = {
 const fixtures = {
   'render with minimal props': { ...minProps, history },
 
-  'render with Breadcrubs': {
+  'render with Breadcrubs and edit permissions': {
     ...minProps,
     history,
+    results: [{ action: 'a', canEdit: true }],
     getBreadcrumbs: () => ({
       breadcrumbItems: [
         { caption: 'Tasks', url: `/foreman_tasks/tasks` },

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

@@ -30,6 +30,7 @@ exports[`SubTasksPage rendering render with minimal props 1`] = `
     }
   }
   parentTaskID="some-id"
+  reloadPage={[MockFunction]}
   results={
     Array [
       "a",

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

@@ -48,6 +48,22 @@ Array [
 ]
 `;
 
+exports[`TasksTable bulk actions handles bulkCancelById requests with canEdit false 1`] = `
+Array [
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "Not all the selected tasks can be cancelled",
+          "type": "warning",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+]
+`;
+
 exports[`TasksTable bulk actions handles bulkCancelBySearch requests 1`] = `
 Array [
   Array [
@@ -155,6 +171,22 @@ Array [
 ]
 `;
 
+exports[`TasksTable bulk actions handles bulkForceCancelById requests with canEdit false 1`] = `
+Array [
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "User has no permission for 1 task(s)",
+          "type": "warning",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+]
+`;
+
 exports[`TasksTable bulk actions handles bulkForceCancelBySearch requests 1`] = `
 Array [
   Array [
@@ -219,6 +251,22 @@ Array [
 ]
 `;
 
+exports[`TasksTable bulk actions handles bulkResumeById requests with canEdit false 1`] = `
+Array [
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "Not all the selected tasks can be resumed",
+          "type": "warning",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+]
+`;
+
 exports[`TasksTable bulk actions handles bulkResumeBySearch requests 1`] = `
 Array [
   Array [

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

@@ -21,6 +21,7 @@ exports[`TasksIndexPage rendering render with minimal props 1`] = `
       "perPage": 10,
     }
   }
+  reloadPage={[MockFunction]}
   results={
     Array [
       "a",

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

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
+exports[`TasksTablePage rendering render with Breadcrubs and edit permissions 1`] = `
 <div
   className="tasks-table-wrapper"
 >
@@ -66,15 +66,29 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
     }
     searchQuery="a=b"
     searchable={true}
-    toastNotifications="foreman-tasks-cancel"
     toolbarButtons={
       <React.Fragment>
+        <Button
+          active={false}
+          block={false}
+          bsClass="btn"
+          bsStyle="default"
+          disabled={false}
+          onClick={[Function]}
+        >
+          <Icon
+            name="refresh"
+            type="fa"
+          />
+           
+          Refresh Data
+        </Button>
         <Spinner
           className=""
           inline={false}
           inverse={false}
           loading={true}
-          size="lg"
+          size="md"
         />
         <ExportButton
           title="Export All"
@@ -112,10 +126,13 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
         }
       }
       parentTaskID={null}
+      reloadPage={[MockFunction]}
       results={
         Array [
-          "a",
-          "b",
+          Object {
+            "action": "a",
+            "canEdit": true,
+          },
         ]
       }
       selectPage={[MockFunction]}
@@ -184,15 +201,29 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
     }
     searchQuery="a=b"
     searchable={true}
-    toastNotifications="foreman-tasks-cancel"
     toolbarButtons={
       <React.Fragment>
+        <Button
+          active={false}
+          block={false}
+          bsClass="btn"
+          bsStyle="default"
+          disabled={false}
+          onClick={[Function]}
+        >
+          <Icon
+            name="refresh"
+            type="fa"
+          />
+           
+          Refresh Data
+        </Button>
         <Spinner
           className=""
           inline={false}
           inverse={false}
           loading={true}
-          size="lg"
+          size="md"
         />
         <ExportButton
           title="Export All"
@@ -230,6 +261,7 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
         }
       }
       parentTaskID={null}
+      reloadPage={[MockFunction]}
       results={
         Array [
           "a",

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

@@ -7,6 +7,7 @@ exports[`actionCellFormatter render 1`] = `
       "cancellable": true,
     }
   }
+  canEdit={true}
   id="some-id"
   name="some-name"
   taskActions={Object {}}

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/__test__/__snapshots__/selectionCellFormatter.test.js.snap

@@ -3,8 +3,10 @@
 exports[`selectionCellFormatter render 1`] = `
 <TableSelectionCell
   checked={true}
+  disabled={true}
   id="selectsome-index"
   label="Select row"
   onChange={[Function]}
+  title="You do not have permission"
 />
 `;

data/webpack/ForemanTasks/Components/TasksTable/formatters/__test__/actionCellFormatter.test.js

@@ -4,7 +4,7 @@ describe('actionCellFormatter', () => {
   it('render', () => {
     const data = [
       { cancellable: true },
-      { rowData: { action: 'some-name', id: 'some-id' } },
+      { rowData: { action: 'some-name', id: 'some-id', canEdit: true } },
     ];
     expect(actionCellFormatter({})(...data)).toMatchSnapshot();
   });

data/webpack/ForemanTasks/Components/TasksTable/formatters/__test__/selectionCellFormatter.test.js

@@ -5,7 +5,7 @@ describe('selectionCellFormatter', () => {
     expect(
       selectionCellFormatter(
         { isSelected: () => true },
-        { rowIndex: 'some-index' }
+        { rowIndex: 'some-index', rowData: {} }
       )
     ).toMatchSnapshot();
   });

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

@@ -4,13 +4,16 @@ import { ActionButton } from '../../common/ActionButtons/ActionButton';
 
 export const actionCellFormatter = taskActions => (
   value,
-  { rowData: { action, id } }
+  { rowData: { action, id, canEdit } }
 ) =>
   cellFormatter(
-    <ActionButton
-      id={id}
-      name={action}
-      taskActions={taskActions}
-      availableActions={value}
-    />
+    canEdit && (
+      <ActionButton
+        canEdit={canEdit}
+        id={id}
+        name={action}
+        taskActions={taskActions}
+        availableActions={value}
+      />
+    )
   );

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/TasksTable/formatters/selectionCellFormatter.js

@@ -1,9 +1,16 @@
 import React from 'react';
+import { translate as __ } from 'foremanReact/common/I18n';
 import TableSelectionCell from '../Components/TableSelectionCell';
 
 export default (selectionController, additionalData) => (
   <TableSelectionCell
     id={`select${additionalData.rowIndex}`}
+    disabled={!additionalData.rowData.canEdit}
+    title={
+      additionalData.rowData.canEdit
+        ? undefined
+        : __('You do not have permission')
+    }
     checked={selectionController.isSelected(additionalData)}
     onChange={() => selectionController.selectRow(additionalData)}
   />

data/webpack/ForemanTasks/Components/common/ActionButtons/ActionButton.js

@@ -4,45 +4,48 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import { ActionButtons } from 'foremanReact/components/common/ActionButtons/ActionButtons';
 
 export const ActionButton = ({
+  canEdit,
   id,
   name,
   availableActions: { resumable, cancellable, stoppable },
   taskActions,
 }) => {
   const buttons = [];
-  const isTitle = !(resumable || cancellable || stoppable);
+  const isTitle = canEdit && !(resumable || cancellable || stoppable);
   const title = isTitle ? __('Task cannot be canceled') : undefined;
-  if (resumable) {
-    buttons.push({
-      title: __('Resume'),
-      action: {
-        disabled: !resumable,
-        onClick: () => taskActions.resumeTask(id, name),
-        id: `task-resume-button-${id}`,
-      },
-    });
-  }
-  if (cancellable || (!stoppable && !resumable)) {
-    // Cancel is the default button that should be shown if no task action can be done
-    buttons.push({
-      title: __('Cancel'),
-      action: {
-        disabled: !cancellable,
-        onClick: () => taskActions.cancelTask(id, name),
-        id: `task-cancel-button-${id}`,
-      },
-    });
-  }
+  if (canEdit) {
+    if (resumable) {
+      buttons.push({
+        title: __('Resume'),
+        action: {
+          disabled: !resumable,
+          onClick: () => taskActions.resumeTask(id, name),
+          id: `task-resume-button-${id}`,
+        },
+      });
+    }
+    if (cancellable || (!stoppable && !resumable)) {
+      // Cancel is the default button that should be shown if no task action can be done
+      buttons.push({
+        title: __('Cancel'),
+        action: {
+          disabled: !cancellable,
+          onClick: () => taskActions.cancelTask(id, name),
+          id: `task-cancel-button-${id}`,
+        },
+      });
+    }
 
-  if (stoppable) {
-    buttons.push({
-      title: __('Force Cancel'),
-      action: {
-        disabled: !stoppable,
-        onClick: () => taskActions.forceCancelTask(id, name),
-        id: `task-force-cancel-button-${id}`,
-      },
-    });
+    if (stoppable) {
+      buttons.push({
+        title: __('Force Cancel'),
+        action: {
+          disabled: !stoppable,
+          onClick: () => taskActions.forceCancelTask(id, name),
+          id: `task-force-cancel-button-${id}`,
+        },
+      });
+    }
   }
   return (
     <span title={title}>
@@ -52,6 +55,7 @@ export const ActionButton = ({
 };
 
 ActionButton.propTypes = {
+  canEdit: PropTypes.bool,
   id: PropTypes.string.isRequired,
   name: PropTypes.string.isRequired,
   availableActions: PropTypes.shape({
@@ -65,3 +69,7 @@ ActionButton.propTypes = {
     forceCancelTask: PropTypes.func,
   }).isRequired,
 };
+
+ActionButton.defaultProps = {
+  canEdit: false,
+};

data/webpack/ForemanTasks/Components/common/ActionButtons/ActionButton.test.js

@@ -7,6 +7,7 @@ const resumeTask = jest.fn();
 const cancelTask = jest.fn();
 const forceCancelTask = jest.fn();
 const taskActions = { resumeTask, cancelTask, forceCancelTask };
+const minProps = { canEdit: true, id: 'id', name: 'some-name' };
 const fixtures = {
   'render with cancellable true props': {
     availableActions: {
@@ -14,8 +15,7 @@ const fixtures = {
       resumable: false,
     },
     taskActions,
-    id: 'id',
-    name: 'some-name',
+    ...minProps,
   },
   'render with resumable true props': {
     availableActions: {
@@ -23,8 +23,7 @@ const fixtures = {
       resumable: true,
     },
     taskActions,
-    id: 'id',
-    name: 'some-name',
+    ...minProps,
   },
   'render with stoppable and cancellable true props': {
     availableActions: {
@@ -32,8 +31,7 @@ const fixtures = {
       stoppable: true,
     },
     taskActions,
-    id: 'id',
-    name: 'some-name',
+    ...minProps,
   },
   'render with cancellable false props': {
     availableActions: {
@@ -41,8 +39,16 @@ const fixtures = {
       resumable: false,
     },
     taskActions,
-    id: 'id',
-    name: 'some-name',
+    ...minProps,
+  },
+  'render with canEdit false': {
+    availableActions: {
+      cancellable: false,
+      resumable: false,
+    },
+    taskActions,
+    ...minProps,
+    canEdit: false,
   },
 };
 
@@ -57,6 +63,7 @@ describe('ActionButton', () => {
         <ActionButton
           id={id}
           name={name}
+          canEdit
           availableActions={{ cancellable: true }}
           taskActions={taskActions}
         />
@@ -69,6 +76,7 @@ describe('ActionButton', () => {
         <ActionButton
           id={id}
           name={name}
+          canEdit
           availableActions={{ resumable: true }}
           taskActions={taskActions}
         />
@@ -81,6 +89,7 @@ describe('ActionButton', () => {
         <ActionButton
           id={id}
           name={name}
+          canEdit
           availableActions={{ stoppable: true }}
           taskActions={taskActions}
         />