foreman-tasks 11.0.5 → 11.0.7

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

@@ -2,14 +2,18 @@
 
 exports[`Task rendering render with minimal Props 1`] = `
 <Fragment>
-  <UnlockModal
+  <UnlockConfirmationModal
     id="unlockModal"
+    isOpen={false}
     onClick={[Function]}
+    setModalClosed={[Function]}
   />
-  <ForceUnlockModal
+  <ForceUnlockConfirmationModal
     id="forceUnlockModal"
+    isOpen={false}
     onClick={[Function]}
     selectedRowsLen={1}
+    setModalClosed={[Function]}
   />
   <Grid
     bsClass="container"
@@ -26,47 +30,32 @@ exports[`Task rendering render with minimal Props 1`] = `
         cancelTaskRequest={[Function]}
         cancellable={false}
         dynflowEnableConsole={false}
-        endedAt=""
-        errors={Array []}
         externalId=""
+        forceCancelTaskRequest={[Function]}
         hasSubTasks={false}
-        help=""
         id="test"
-        output=""
         parentTask=""
-        progress={0}
-        result="error"
         resumable={false}
         resumeTaskRequest={[Function]}
-        startAt=""
-        startBefore=""
-        startedAt=""
+        setForceUnlockModalOpen={[Function]}
+        setUnlockModalOpen={[Function]}
         state=""
         taskProgressToggle={[MockFunction]}
         taskReload={false}
         taskReloadStart={[MockFunction]}
-        username=""
-        usernamePath=""
+        unlockTaskRequest={[Function]}
       />
     </Row>
     <TaskInfo
       action=""
-      canEdit={false}
-      cancelTaskRequest={[Function]}
-      cancellable={false}
-      dynflowEnableConsole={false}
       endedAt=""
       errors={Array []}
-      externalId=""
-      hasSubTasks={false}
+      forceCancelTaskRequest={[Function]}
       help=""
       id="test"
       output=""
-      parentTask=""
       progress={0}
       result="error"
-      resumable={false}
-      resumeTaskRequest={[Function]}
       startAt=""
       startBefore=""
       startedAt=""
@@ -74,6 +63,7 @@ exports[`Task rendering render with minimal Props 1`] = `
       taskProgressToggle={[MockFunction]}
       taskReload={false}
       taskReloadStart={[MockFunction]}
+      unlockTaskRequest={[Function]}
       username=""
       usernamePath=""
     />
@@ -83,14 +73,18 @@ exports[`Task rendering render with minimal Props 1`] = `
 
 exports[`Task rendering render with some Props 1`] = `
 <Fragment>
-  <UnlockModal
+  <UnlockConfirmationModal
     id="unlockModal"
+    isOpen={false}
     onClick={[Function]}
+    setModalClosed={[Function]}
   />
-  <ForceUnlockModal
+  <ForceUnlockConfirmationModal
     id="forceUnlockModal"
+    isOpen={false}
     onClick={[Function]}
     selectedRowsLen={1}
+    setModalClosed={[Function]}
   />
   <Grid
     bsClass="container"
@@ -107,39 +101,30 @@ exports[`Task rendering render with some Props 1`] = `
         cancelTaskRequest={[Function]}
         cancellable={false}
         dynflowEnableConsole={true}
-        endedAt=""
-        errors={Array []}
         externalId=""
+        forceCancelTaskRequest={[Function]}
         hasSubTasks={true}
-        help=""
         id="test"
-        output=""
         parentTask="parent-id"
-        progress={0}
-        result="error"
         resumable={false}
         resumeTaskRequest={[Function]}
-        startAt=""
-        startBefore=""
-        startedAt=""
+        setForceUnlockModalOpen={[Function]}
+        setUnlockModalOpen={[Function]}
         state="paused"
         status="RESOLVED"
         taskProgressToggle={[MockFunction]}
         taskReload={true}
         taskReloadStart={[MockFunction]}
-        username=""
-        usernamePath=""
+        unlockTaskRequest={[Function]}
       />
     </Row>
     <TaskInfo
       action=""
       canEdit={true}
-      cancelTaskRequest={[Function]}
-      cancellable={false}
       dynflowEnableConsole={true}
       endedAt=""
       errors={Array []}
-      externalId=""
+      forceCancelTaskRequest={[Function]}
       hasSubTasks={true}
       help=""
       id="test"
@@ -147,8 +132,6 @@ exports[`Task rendering render with some Props 1`] = `
       parentTask="parent-id"
       progress={0}
       result="error"
-      resumable={false}
-      resumeTaskRequest={[Function]}
       startAt=""
       startBefore=""
       startedAt=""
@@ -157,6 +140,7 @@ exports[`Task rendering render with some Props 1`] = `
       taskProgressToggle={[MockFunction]}
       taskReload={true}
       taskReloadStart={[MockFunction]}
+      unlockTaskRequest={[Function]}
       username=""
       usernamePath=""
     />

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

@@ -89,34 +89,20 @@ exports[`TaskDetails rendering render with min Props 1`] = `
     >
       <Task
         action=""
-        canEdit={false}
-        cancelTaskRequest={[Function]}
-        cancellable={false}
-        dynflowEnableConsole={false}
         endedAt=""
-        errors={Array []}
         externalId=""
-        hasSubTasks={false}
-        help=""
+        forceCancelTaskRequest={[Function]}
         id="a15dd820-32f1-4ced-9ab7-c0fab8234c47"
         input={Array []}
         label=""
         output={Object {}}
-        parentTask=""
-        progress={0}
-        result="error"
         resumable={false}
-        resumeTaskRequest={[Function]}
-        startAt=""
-        startBefore=""
         startedAt=""
-        state=""
         status="RESOLVED"
         taskProgressToggle={[Function]}
         taskReload={false}
         taskReloadStart={[MockFunction]}
-        username=""
-        usernamePath=""
+        unlockTaskRequest={[Function]}
       />
     </Tab>
     <Tab

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

@@ -1,4 +1,3 @@
-import { selectForemanTasks } from '../../../../ForemanTasksSelectors';
 import {
   selectTasksTableQuery,
   selectResults,
@@ -6,15 +5,7 @@ import {
   selectItemCount,
   selectAllRowsSelected,
 } from '../../TasksTableSelectors';
-import { RESUME_MODAL, CANCEL_MODAL } from '../../TasksTableConstants';
-import { FORCE_UNLOCK_MODAL } from '../../../TaskActions/TaskActionsConstants';
 
-export const selectCofirmModal = state =>
-  selectForemanTasks(state).confirmModal || {};
-
-export const selectActionType = state => selectCofirmModal(state).actionType;
-export const selectActionText = state => selectCofirmModal(state).actionText;
-export const selectActionState = state => selectCofirmModal(state).actionState;
 export const selectClicked = state =>
   selectTasksTableQuery(state).clicked || {};
 
@@ -32,13 +23,6 @@ export const selectSelectedTasks = state => {
 };
 
 export const selectSelectedRowsLen = state => {
-  if (
-    [CANCEL_MODAL, RESUME_MODAL, FORCE_UNLOCK_MODAL].includes(
-      selectActionType(state)
-    )
-  ) {
-    return 1;
-  }
   if (selectAllRowsSelected(state)) {
     return selectItemCount(state);
   }

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

@@ -0,0 +1,70 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useDispatch } from 'react-redux';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { Button, Modal, ModalVariant } from '@patternfly/react-core';
+
+export const GenericConfirmModal = ({
+  isModalOpen,
+  setIsModalOpen,
+  title,
+  message,
+  onConfirm,
+  confirmButtonVariant,
+  ouiaIdPrefix,
+}) => {
+  const dispatch = useDispatch();
+
+  const handleConfirm = () => {
+    const action = onConfirm();
+    if (action) {
+      dispatch(action);
+    }
+    setIsModalOpen(false);
+  };
+
+  return (
+    <Modal
+      title={title}
+      variant={ModalVariant.small}
+      isOpen={isModalOpen}
+      onClose={() => setIsModalOpen(false)}
+      ouiaId={`${ouiaIdPrefix}-modal`}
+      actions={[
+        <Button
+          ouiaId={`${ouiaIdPrefix}-modal-confirm-button`}
+          key="confirm"
+          className="confirm-button"
+          variant={confirmButtonVariant}
+          onClick={handleConfirm}
+        >
+          {__('Yes')}
+        </Button>,
+        <Button
+          ouiaId={`${ouiaIdPrefix}-modal-cancel-button`}
+          key="cancel"
+          variant="secondary"
+          onClick={() => setIsModalOpen(false)}
+        >
+          {__('No')}
+        </Button>,
+      ]}
+    >
+      {message}
+    </Modal>
+  );
+};
+
+GenericConfirmModal.propTypes = {
+  isModalOpen: PropTypes.bool.isRequired,
+  setIsModalOpen: PropTypes.func.isRequired,
+  title: PropTypes.string.isRequired,
+  message: PropTypes.string.isRequired,
+  onConfirm: PropTypes.func.isRequired,
+  confirmButtonVariant: PropTypes.string,
+  ouiaIdPrefix: PropTypes.string.isRequired,
+};
+
+GenericConfirmModal.defaultProps = {
+  confirmButtonVariant: 'primary',
+};

data/webpack/ForemanTasks/Components/TasksTable/Components/ConfirmModal/__test__/ConfirmModalSelectors.test.js

@@ -1,8 +1,6 @@
 import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
 import {
-  selectActionText,
-  selectActionState,
-  selectActionType,
+  selectClicked,
   selectSelectedTasks,
   selectSelectedRowsLen,
 } from '../ConfirmModalSelectors';
@@ -10,11 +8,6 @@ import { CANCEL_MODAL } from '../../../TasksTableConstants';
 
 const state = {
   foremanTasks: {
-    confirmModal: {
-      actionText: 'some-text',
-      actionState: 'some-state',
-      actionType: 'some-type',
-    },
     tasksTable: {
       tasksTableContent: {
         results: [
@@ -28,26 +21,44 @@ const state = {
         ],
         itemCount: 10,
       },
-      tasksTableQuery: { selectedRows: [1, 2, 3] },
+      tasksTableQuery: {
+        selectedRows: [1, 2, 3],
+        clicked: { taskId: '1', taskName: 'test-task' },
+        allRowsSelected: false,
+      },
     },
   },
 };
 
 const fixtures = {
-  'should select actionText': () => selectActionText(state),
-  'should select actionState': () => selectActionState(state),
-  'should select actionType': () => selectActionType(state),
+  'should select clicked': () => selectClicked(state),
   'should select selectedTasks': () => selectSelectedTasks(state),
   'should select selectedRowsLen 1': () =>
     selectSelectedRowsLen({
       ...state,
-      foremanTasks: { confirmModal: { actionType: CANCEL_MODAL } },
+      foremanTasks: {
+        tasksTable: {
+          ...state.foremanTasks.tasksTable,
+          tasksTableQuery: {
+            ...state.foremanTasks.tasksTable.tasksTableQuery,
+            clicked: { modalType: CANCEL_MODAL },
+          },
+        },
+      },
     }),
   'should select selectedRowsLen all': () => selectSelectedRowsLen(state),
   'should select selectedRowsLen some': () =>
     selectSelectedRowsLen({
       ...state,
-      tasksTable: { tasksTableQuery: { allRowsSelected: true } },
+      foremanTasks: {
+        tasksTable: {
+          ...state.foremanTasks.tasksTable,
+          tasksTableQuery: {
+            ...state.foremanTasks.tasksTable.tasksTableQuery,
+            allRowsSelected: true,
+          },
+        },
+      },
     }),
 };
 

data/webpack/ForemanTasks/Components/TasksTable/Components/ConfirmModal/__test__/__snapshots__/ConfirmModalSelectors.test.js.snap

@@ -1,16 +1,17 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`TasksDashboard - Selectors should select actionState 1`] = `"some-state"`;
-
-exports[`TasksDashboard - Selectors should select actionText 1`] = `"some-text"`;
-
-exports[`TasksDashboard - Selectors should select actionType 1`] = `"some-type"`;
+exports[`TasksDashboard - Selectors should select clicked 1`] = `
+Object {
+  "taskId": "1",
+  "taskName": "test-task",
+}
+`;
 
-exports[`TasksDashboard - Selectors should select selectedRowsLen 1 1`] = `1`;
+exports[`TasksDashboard - Selectors should select selectedRowsLen 1 1`] = `3`;
 
 exports[`TasksDashboard - Selectors should select selectedRowsLen all 1`] = `3`;
 
-exports[`TasksDashboard - Selectors should select selectedRowsLen some 1`] = `3`;
+exports[`TasksDashboard - Selectors should select selectedRowsLen some 1`] = `0`;
 
 exports[`TasksDashboard - Selectors should select selectedTasks 1`] = `
 Array [