foreman-tasks 11.0.5 → 11.0.7

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

@@ -0,0 +1,409 @@
+import React from 'react';
+import { render, screen, fireEvent } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { Provider } from 'react-redux';
+import { configureStore } from '@reduxjs/toolkit';
+import {
+  CancelModal,
+  ResumeModal,
+  CancelSelectedModal,
+  ResumeSelectedModal,
+  ForceUnlockModal,
+  ForceUnlockSelectedModal,
+} from '../index';
+
+// Mock the action creators
+jest.mock('../../../TasksTableActions', () => ({
+  cancelTask: jest.fn(() => ({ type: 'CANCEL_TASK' })),
+  resumeTask: jest.fn(() => ({ type: 'RESUME_TASK' })),
+}));
+
+jest.mock('../../../TasksBulkActions', () => ({
+  bulkCancelBySearch: jest.fn(() => ({ type: 'BULK_CANCEL_BY_SEARCH' })),
+  bulkCancelById: jest.fn(() => ({ type: 'BULK_CANCEL_BY_ID' })),
+  bulkResumeBySearch: jest.fn(() => ({ type: 'BULK_RESUME_BY_SEARCH' })),
+  bulkResumeById: jest.fn(() => ({ type: 'BULK_RESUME_BY_ID' })),
+  bulkForceUnlockBySearch: jest.fn(() => ({
+    type: 'BULK_FORCE_UNLOCK_BY_SEARCH',
+  })),
+  bulkForceUnlockById: jest.fn(() => ({ type: 'BULK_FORCE_UNLOCK_BY_ID' })),
+}));
+
+// Mock the selectors
+jest.mock('../ConfirmModalSelectors', () => ({
+  selectClicked: jest.fn(() => ({ taskId: '123', taskName: 'Test Task' })),
+  selectSelectedTasks: jest.fn(() => [
+    { id: 1, name: 'Task 1' },
+    { id: 2, name: 'Task 2' },
+  ]),
+  selectSelectedRowsLen: jest.fn(() => 2),
+}));
+
+jest.mock('../../../TasksTableSelectors', () => ({
+  selectAllRowsSelected: jest.fn(() => false),
+}));
+
+// Create a mock store
+const createMockStore = (initialState = {}) => {
+  return configureStore({
+    reducer: {
+      foremanTasks: (state = initialState, action) => state,
+    },
+    preloadedState: {
+      foremanTasks: initialState,
+    },
+  });
+};
+
+// Test wrapper component
+const TestWrapper = ({ children, store }) => (
+  <Provider store={store}>{children}</Provider>
+);
+
+describe('ConfirmModal Components', () => {
+  const defaultProps = {
+    isModalOpen: true,
+    setIsModalOpen: jest.fn(),
+    url: '/api/tasks',
+    parentTaskID: 'parent-123',
+  };
+
+  const mockStore = createMockStore();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('CancelModal', () => {
+    it('renders with correct title and content', () => {
+      render(
+        <TestWrapper store={mockStore}>
+          <CancelModal {...defaultProps} />
+        </TestWrapper>
+      );
+
+      expect(screen.getByText('Cancel Task')).toBeInTheDocument();
+      expect(
+        screen.getByText(
+          /This will cancel task "Test Task", putting it in the stopped state/
+        )
+      ).toBeInTheDocument();
+      expect(screen.getByText('No')).toBeInTheDocument();
+      expect(screen.getByText('Yes')).toBeInTheDocument();
+    });
+
+    it('calls setIsModalOpen when cancel button is clicked', () => {
+      const setIsModalOpen = jest.fn();
+
+      render(
+        <TestWrapper store={mockStore}>
+          <CancelModal {...defaultProps} setIsModalOpen={setIsModalOpen} />
+        </TestWrapper>
+      );
+
+      const cancelButton = screen.getByRole('button', { name: 'No' });
+      fireEvent.click(cancelButton);
+
+      expect(setIsModalOpen).toHaveBeenCalledWith(false);
+    });
+
+    it('calls setIsModalOpen when confirm button is clicked', () => {
+      const setIsModalOpen = jest.fn();
+
+      render(
+        <TestWrapper store={mockStore}>
+          <CancelModal {...defaultProps} setIsModalOpen={setIsModalOpen} />
+        </TestWrapper>
+      );
+
+      const confirmButton = screen.getByRole('button', { name: 'Yes' });
+      fireEvent.click(confirmButton);
+
+      expect(setIsModalOpen).toHaveBeenCalledWith(false);
+    });
+
+    it('does not render when isModalOpen is false', () => {
+      render(
+        <TestWrapper store={mockStore}>
+          <CancelModal {...defaultProps} isModalOpen={false} />
+        </TestWrapper>
+      );
+
+      expect(screen.queryByText('Cancel Task')).not.toBeInTheDocument();
+    });
+  });
+
+  describe('ResumeModal', () => {
+    it('renders with correct title and content', () => {
+      render(
+        <TestWrapper store={mockStore}>
+          <ResumeModal {...defaultProps} />
+        </TestWrapper>
+      );
+
+      expect(screen.getByText('Resume Task')).toBeInTheDocument();
+      expect(
+        screen.getByText(
+          /This will resume task "Test Task", putting it in the running state/
+        )
+      ).toBeInTheDocument();
+      expect(screen.getByText('No')).toBeInTheDocument();
+      expect(screen.getByText('Yes')).toBeInTheDocument();
+    });
+
+    it('calls setIsModalOpen when cancel button is clicked', () => {
+      const setIsModalOpen = jest.fn();
+
+      render(
+        <TestWrapper store={mockStore}>
+          <ResumeModal {...defaultProps} setIsModalOpen={setIsModalOpen} />
+        </TestWrapper>
+      );
+
+      const cancelButton = screen.getByRole('button', { name: 'No' });
+      fireEvent.click(cancelButton);
+
+      expect(setIsModalOpen).toHaveBeenCalledWith(false);
+    });
+
+    it('calls setIsModalOpen when confirm button is clicked', () => {
+      const setIsModalOpen = jest.fn();
+
+      render(
+        <TestWrapper store={mockStore}>
+          <ResumeModal {...defaultProps} setIsModalOpen={setIsModalOpen} />
+        </TestWrapper>
+      );
+
+      const confirmButton = screen.getByRole('button', { name: 'Yes' });
+      fireEvent.click(confirmButton);
+
+      expect(setIsModalOpen).toHaveBeenCalledWith(false);
+    });
+  });
+
+  describe('CancelSelectedModal', () => {
+    const selectedProps = {
+      ...defaultProps,
+      uriQuery: { search: 'test' },
+    };
+
+    it('renders with correct title and content', () => {
+      render(
+        <TestWrapper store={mockStore}>
+          <CancelSelectedModal {...selectedProps} />
+        </TestWrapper>
+      );
+
+      expect(screen.getByText('Cancel Selected Tasks')).toBeInTheDocument();
+      expect(
+        screen.getByText(
+          /This will cancel 2 task\(s\), putting them in the stopped state/
+        )
+      ).toBeInTheDocument();
+      expect(screen.getByText('No')).toBeInTheDocument();
+      expect(screen.getByText('Yes')).toBeInTheDocument();
+    });
+
+    it('calls setIsModalOpen when cancel button is clicked', () => {
+      const setIsModalOpen = jest.fn();
+
+      render(
+        <TestWrapper store={mockStore}>
+          <CancelSelectedModal
+            {...selectedProps}
+            setIsModalOpen={setIsModalOpen}
+          />
+        </TestWrapper>
+      );
+
+      const cancelButton = screen.getByRole('button', { name: 'No' });
+      fireEvent.click(cancelButton);
+
+      expect(setIsModalOpen).toHaveBeenCalledWith(false);
+    });
+
+    it('calls setIsModalOpen when confirm button is clicked', () => {
+      const setIsModalOpen = jest.fn();
+
+      render(
+        <TestWrapper store={mockStore}>
+          <CancelSelectedModal
+            {...selectedProps}
+            setIsModalOpen={setIsModalOpen}
+          />
+        </TestWrapper>
+      );
+
+      const confirmButton = screen.getByRole('button', { name: 'Yes' });
+      fireEvent.click(confirmButton);
+
+      expect(setIsModalOpen).toHaveBeenCalledWith(false);
+    });
+  });
+
+  describe('ResumeSelectedModal', () => {
+    const selectedProps = {
+      ...defaultProps,
+      uriQuery: { search: 'test' },
+    };
+
+    it('renders with correct title and content', () => {
+      render(
+        <TestWrapper store={mockStore}>
+          <ResumeSelectedModal {...selectedProps} />
+        </TestWrapper>
+      );
+
+      expect(screen.getByText('Resume Selected Tasks')).toBeInTheDocument();
+      expect(
+        screen.getByText(
+          /This will resume 2 task\(s\), putting them in the running state/
+        )
+      ).toBeInTheDocument();
+      expect(screen.getByText('No')).toBeInTheDocument();
+      expect(screen.getByText('Yes')).toBeInTheDocument();
+    });
+
+    it('calls setIsModalOpen when cancel button is clicked', () => {
+      const setIsModalOpen = jest.fn();
+
+      render(
+        <TestWrapper store={mockStore}>
+          <ResumeSelectedModal
+            {...selectedProps}
+            setIsModalOpen={setIsModalOpen}
+          />
+        </TestWrapper>
+      );
+
+      const cancelButton = screen.getByRole('button', { name: 'No' });
+      fireEvent.click(cancelButton);
+
+      expect(setIsModalOpen).toHaveBeenCalledWith(false);
+    });
+  });
+
+  describe('ForceUnlockModal', () => {
+    it('renders with correct title and content', () => {
+      render(
+        <TestWrapper store={mockStore}>
+          <ForceUnlockModal {...defaultProps} />
+        </TestWrapper>
+      );
+
+      expect(screen.getByText('Force Unlock Task')).toBeInTheDocument();
+      expect(
+        screen.getByText(
+          /This will force unlock task "Test Task". This may cause harm and should be used with caution/
+        )
+      ).toBeInTheDocument();
+      expect(screen.getByText('No')).toBeInTheDocument();
+      expect(screen.getByText('Yes')).toBeInTheDocument();
+    });
+
+    it('calls setIsModalOpen when cancel button is clicked', () => {
+      const setIsModalOpen = jest.fn();
+
+      render(
+        <TestWrapper store={mockStore}>
+          <ForceUnlockModal {...defaultProps} setIsModalOpen={setIsModalOpen} />
+        </TestWrapper>
+      );
+
+      const cancelButton = screen.getByRole('button', { name: 'No' });
+      fireEvent.click(cancelButton);
+
+      expect(setIsModalOpen).toHaveBeenCalledWith(false);
+    });
+  });
+
+  describe('ForceUnlockSelectedModal', () => {
+    const selectedProps = {
+      ...defaultProps,
+      uriQuery: { search: 'test' },
+    };
+
+    it('renders with correct title and content', () => {
+      render(
+        <TestWrapper store={mockStore}>
+          <ForceUnlockSelectedModal {...selectedProps} />
+        </TestWrapper>
+      );
+
+      expect(
+        screen.getByText('Force Unlock Selected Tasks')
+      ).toBeInTheDocument();
+      expect(
+        screen.getByText(
+          /This will force unlock 2 task\(s\). This may cause harm and should be used with caution/
+        )
+      ).toBeInTheDocument();
+      expect(screen.getByText('No')).toBeInTheDocument();
+      expect(screen.getByText('Yes')).toBeInTheDocument();
+    });
+
+    it('calls setIsModalOpen when cancel button is clicked', () => {
+      const setIsModalOpen = jest.fn();
+
+      render(
+        <TestWrapper store={mockStore}>
+          <ForceUnlockSelectedModal
+            {...selectedProps}
+            setIsModalOpen={setIsModalOpen}
+          />
+        </TestWrapper>
+      );
+
+      const cancelButton = screen.getByRole('button', { name: 'No' });
+      fireEvent.click(cancelButton);
+
+      expect(setIsModalOpen).toHaveBeenCalledWith(false);
+    });
+  });
+
+  describe('Accessibility', () => {
+    it('has proper ARIA attributes for all modals', () => {
+      const { rerender } = render(
+        <TestWrapper store={mockStore}>
+          <CancelModal {...defaultProps} />
+        </TestWrapper>
+      );
+
+      expect(screen.getByRole('dialog')).toBeInTheDocument();
+      expect(screen.getByRole('button', { name: 'No' })).toBeInTheDocument();
+      expect(screen.getByRole('button', { name: 'Yes' })).toBeInTheDocument();
+
+      // Test other modals
+      rerender(
+        <TestWrapper store={mockStore}>
+          <ResumeModal {...defaultProps} />
+        </TestWrapper>
+      );
+
+      expect(screen.getByRole('dialog')).toBeInTheDocument();
+      expect(screen.getByRole('button', { name: 'No' })).toBeInTheDocument();
+      expect(screen.getByRole('button', { name: 'Yes' })).toBeInTheDocument();
+    });
+  });
+
+  describe('Modal Visibility', () => {
+    it('handles modal visibility correctly for all components', () => {
+      const { rerender } = render(
+        <TestWrapper store={mockStore}>
+          <CancelModal {...defaultProps} isModalOpen={false} />
+        </TestWrapper>
+      );
+
+      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
+
+      rerender(
+        <TestWrapper store={mockStore}>
+          <ResumeModal {...defaultProps} isModalOpen={false} />
+        </TestWrapper>
+      );
+
+      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
+    });
+  });
+});

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

@@ -0,0 +1,67 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useSelector } from 'react-redux';
+import { sprintf } from 'foremanReact/common/I18n';
+import {
+  selectSelectedTasks,
+  selectSelectedRowsLen,
+} from './ConfirmModalSelectors';
+import { selectAllRowsSelected } from '../../TasksTableSelectors';
+import { GenericConfirmModal } from './GenericConfirmModal';
+
+export const createBulkTaskModal = ({
+  bulkActionBySearch,
+  bulkActionById,
+  title,
+  messageTemplate,
+  confirmButtonVariant = 'primary',
+  ouiaIdPrefix,
+}) => {
+  const BulkTaskModal = ({
+    isModalOpen,
+    setIsModalOpen,
+    url,
+    uriQuery,
+    parentTaskID,
+  }) => {
+    const allRowsSelected = useSelector(selectAllRowsSelected);
+    const selectedTasks = useSelector(selectSelectedTasks);
+    const selectedRowsLen = useSelector(selectSelectedRowsLen);
+
+    const handleConfirm = () =>
+      allRowsSelected
+        ? bulkActionBySearch({ query: uriQuery, parentTaskID })
+        : bulkActionById({
+            selected: selectedTasks,
+            url,
+            parentTaskID,
+          });
+
+    return (
+      <GenericConfirmModal
+        isModalOpen={isModalOpen}
+        setIsModalOpen={setIsModalOpen}
+        title={title}
+        message={sprintf(messageTemplate, { number: selectedRowsLen })}
+        onConfirm={handleConfirm}
+        confirmButtonVariant={confirmButtonVariant}
+        ouiaIdPrefix={ouiaIdPrefix}
+      />
+    );
+  };
+
+  BulkTaskModal.propTypes = {
+    isModalOpen: PropTypes.bool.isRequired,
+    setIsModalOpen: PropTypes.func.isRequired,
+    url: PropTypes.string.isRequired,
+    uriQuery: PropTypes.object,
+    parentTaskID: PropTypes.string,
+  };
+
+  BulkTaskModal.defaultProps = {
+    uriQuery: {},
+    parentTaskID: null,
+  };
+
+  return BulkTaskModal;
+};

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

@@ -0,0 +1,51 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useSelector } from 'react-redux';
+import { sprintf } from 'foremanReact/common/I18n';
+import { selectClicked } from './ConfirmModalSelectors';
+import { GenericConfirmModal } from './GenericConfirmModal';
+
+export const createTaskModal = ({
+  actionCreator,
+  title,
+  messageTemplate,
+  confirmButtonVariant = 'primary',
+  ouiaIdPrefix,
+}) => {
+  const TaskModal = ({ isModalOpen, setIsModalOpen, url, parentTaskID }) => {
+    const { taskId, taskName } = useSelector(selectClicked);
+
+    const handleConfirm = () =>
+      actionCreator({
+        taskId,
+        taskName,
+        url,
+        parentTaskID,
+      });
+
+    return (
+      <GenericConfirmModal
+        isModalOpen={isModalOpen}
+        setIsModalOpen={setIsModalOpen}
+        title={title}
+        message={sprintf(messageTemplate, { taskName })}
+        onConfirm={handleConfirm}
+        confirmButtonVariant={confirmButtonVariant}
+        ouiaIdPrefix={ouiaIdPrefix}
+      />
+    );
+  };
+
+  TaskModal.propTypes = {
+    isModalOpen: PropTypes.bool.isRequired,
+    setIsModalOpen: PropTypes.func.isRequired,
+    url: PropTypes.string.isRequired,
+    parentTaskID: PropTypes.string,
+  };
+
+  TaskModal.defaultProps = {
+    parentTaskID: null,
+  };
+
+  return TaskModal;
+};

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

@@ -1,29 +1,79 @@
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import { ConfirmModal } from './ConfirmModal';
-import reducer from './ConfirmModalReducer';
-import tasksActions from './ConfirmModalActions';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { createTaskModal } from './createTaskModal';
+import { createBulkTaskModal } from './createBulkTaskModal';
 import {
-  selectActionText,
-  selectActionState,
-  selectActionType,
-  selectClicked,
-  selectSelectedRowsLen,
-} from './ConfirmModalSelectors';
-import { selectAllRowsSelected } from '../../TasksTableSelectors';
+  cancelTask,
+  forceCancelTask,
+  resumeTask,
+} from '../../TasksTableActions';
+import {
+  bulkCancelBySearch,
+  bulkCancelById,
+  bulkForceCancelBySearch,
+  bulkForceCancelById,
+  bulkResumeBySearch,
+  bulkResumeById,
+} from '../../TasksBulkActions';
+
+export const CancelModal = createTaskModal({
+  actionCreator: cancelTask,
+  title: __('Cancel Task'),
+  messageTemplate: __(
+    'This will cancel task "%(taskName)s", putting it in the stopped state. Are you sure?'
+  ),
+  confirmButtonVariant: 'primary',
+  ouiaIdPrefix: 'cancel',
+});
+
+export const CancelSelectedModal = createBulkTaskModal({
+  bulkActionBySearch: bulkCancelBySearch,
+  bulkActionById: bulkCancelById,
+  title: __('Cancel Selected Tasks'),
+  messageTemplate: __(
+    'This will cancel %(number)s task(s), putting them in the stopped state. Are you sure?'
+  ),
+  confirmButtonVariant: 'primary',
+  ouiaIdPrefix: 'cancel-selected',
+});
 
-const mapStateToProps = state => ({
-  actionText: selectActionText(state),
-  actionType: selectActionType(state),
-  actionState: selectActionState(state),
-  allRowsSelected: selectAllRowsSelected(state),
-  clicked: selectClicked(state),
-  selectedRowsLen: selectSelectedRowsLen(state),
+export const ForceUnlockModal = createTaskModal({
+  actionCreator: forceCancelTask,
+  title: __('Force Unlock Task'),
+  messageTemplate: __(
+    'This will force unlock task "%(taskName)s". This may cause harm and should be used with caution. Are you sure?'
+  ),
+  confirmButtonVariant: 'danger',
+  ouiaIdPrefix: 'force-unlock',
 });
 
-const mapDispatchToProps = dispatch =>
-  bindActionCreators(tasksActions, dispatch);
+export const ForceUnlockSelectedModal = createBulkTaskModal({
+  bulkActionBySearch: bulkForceCancelBySearch,
+  bulkActionById: bulkForceCancelById,
+  title: __('Force Unlock Selected Tasks'),
+  messageTemplate: __(
+    'This will force unlock %(number)s task(s). This may cause harm and should be used with caution. Are you sure?'
+  ),
+  confirmButtonVariant: 'danger',
+  ouiaIdPrefix: 'force-unlock-selected',
+});
 
-export const reducers = { confirmModal: reducer };
+export const ResumeModal = createTaskModal({
+  actionCreator: resumeTask,
+  title: __('Resume Task'),
+  messageTemplate: __(
+    'This will resume task "%(taskName)s", putting it in the running state. Are you sure?'
+  ),
+  confirmButtonVariant: 'primary',
+  ouiaIdPrefix: 'resume',
+});
 
-export default connect(mapStateToProps, mapDispatchToProps)(ConfirmModal);
+export const ResumeSelectedModal = createBulkTaskModal({
+  bulkActionBySearch: bulkResumeBySearch,
+  bulkActionById: bulkResumeById,
+  title: __('Resume Selected Tasks'),
+  messageTemplate: __(
+    'This will resume %(number)s task(s), putting them in the running state. Are you sure?'
+  ),
+  confirmButtonVariant: 'primary',
+  ouiaIdPrefix: 'resume-selected',
+});

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

@@ -8,8 +8,11 @@ import Pagination from 'foremanReact/components/Pagination';
 import { getURIQuery } from 'foremanReact/common/helpers';
 import createTasksTableSchema from './TasksTableSchema';
 import { updateURlQuery } from './TasksTableHelpers';
-import { RESUME_MODAL, CANCEL_MODAL } from './TasksTableConstants';
-import { FORCE_UNLOCK_MODAL } from '../TaskActions/TaskActionsConstants';
+import {
+  RESUME_MODAL,
+  CANCEL_MODAL,
+  FORCE_UNLOCK_MODAL,
+} from './TasksTableConstants';
 
 const TasksTable = ({
   getTableItems,

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

@@ -16,7 +16,7 @@ export const CANCEL_MODAL = 'cancelConfirmModal';
 export const RESUME_MODAL = 'resumeConfirmModal';
 export const CANCEL_SELECTED_MODAL = 'cancelSelectedConfirmModal';
 export const RESUME_SELECTED_MODAL = 'resumeSelectedConfirmModal';
-export const CONFIRM_MODAL = 'ConfirmModal';
+export const FORCE_UNLOCK_MODAL = 'forceUnlockConfirmModal';
 export const FORCE_UNLOCK_SELECTED_MODAL = 'forceUnlockSelectedConfirmModal';
 
 export const UPDATE_CLICKED = 'UPDATE_CLICKED';