foreman_puppet 11.0.0 → 11.2.0

data/webpack/src/Extends/Hosts/BulkActions/BulkChangePuppetProxy/__tests__/index.test.js

@@ -1,69 +1,182 @@
 import React from 'react';
-import { mount } from '@theforeman/test';
+import { act, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import '@testing-library/jest-dom';
 
 import { openBulkModal } from 'foremanReact/common/BulkModalStateHelper';
 import { ForemanActionsBarContext } from 'foremanReact/components/HostDetails/ActionsBar';
+import { rtlHelpers } from 'foremanReact/common/rtlTestHelpers';
+import { APIActions } from 'foremanReact/redux/API';
+import API from 'foremanReact/redux/API/API';
 
 import BulkChangePuppetProxyScene from '../index';
-import BulkChangeProxyCommon from '../../BulkChangeProxyCommon';
+import { BULK_CHANGE_PUPPET_PROXY_KEY } from '../../BulkChangeProxyCommon/actions';
 
-jest.mock('foremanReact/components/HostDetails/ActionsBar', () => ({
-  ForemanActionsBarContext: jest.requireActual('react').createContext(),
-}));
+jest.mock('foremanReact/redux/API', () => {
+  const actual = jest.requireActual('foremanReact/redux/API');
 
-jest.mock('../../BulkChangeProxyCommon', () => ({
-  __esModule: true,
-  default: jest.fn(() => null),
-}));
-
-describe('BulkChangePuppetProxyScene', () => {
-  const fetchBulkParams = jest.fn();
-  const refreshTableData = jest.fn();
-  const contextValue = {
-    selectAllHostsMode: false,
-    selectedCount: 2,
-    selectedResults: [1, 2],
-    fetchBulkParams,
-    refreshTableData,
+  return {
+    ...actual,
+    APIActions: {
+      ...actual.APIActions,
+      put: jest.fn(params => ({ type: 'MOCK_API_PUT', payload: params })),
+    },
   };
+});
+
+jest.mock('foremanReact/redux/API/APISelectors', () =>
+  jest.requireActual('foremanReact/redux/API/APISelectors')
+);
+
+const { renderWithStoreAndI18n } = rtlHelpers;
+
+const MODAL_ID = 'bulk-change-puppet-proxy';
+
+const fetchBulkParams = jest.fn(() => 'id ^ (1,2)');
+const refreshTableData = jest.fn();
+
+const defaultContextValue = {
+  selectAllHostsMode: false,
+  selectedCount: 2,
+  selectedResults: [1, 2],
+  fetchBulkParams,
+  refreshTableData,
+};
+
+const smartProxiesResponse = {
+  data: {
+    results: [{ id: 1, name: 'proxy1.example.com' }],
+  },
+};
 
+const renderScene = ({ contextValue = defaultContextValue } = {}) =>
+  renderWithStoreAndI18n(
+    <ForemanActionsBarContext.Provider value={contextValue}>
+      <BulkChangePuppetProxyScene />
+    </ForemanActionsBarContext.Provider>
+  );
+
+const selectPuppetProxy = async () => {
+  await act(async () => {
+    await userEvent.click(await screen.findByText('Select a Puppet Proxy'));
+  });
+  await act(async () => {
+    await userEvent.click(screen.getByText('proxy1.example.com'));
+  });
+};
+
+describe('BulkChangePuppetProxyScene', () => {
   beforeEach(() => {
+    openBulkModal(MODAL_ID, false);
+    API.get.mockImplementation(() => Promise.resolve(smartProxiesResponse));
+  });
+
+  afterEach(() => {
     jest.clearAllMocks();
-    openBulkModal('bulk-change-puppet-proxy', false);
   });
 
-  it('opens with bulk modal state and passes expected props', () => {
-    openBulkModal('bulk-change-puppet-proxy', true);
-    const wrapper = mount(
-      <ForemanActionsBarContext.Provider value={contextValue}>
-        <BulkChangePuppetProxyScene />
-      </ForemanActionsBarContext.Provider>
-    );
+  it('does not show the modal when bulk modal state is closed', () => {
+    renderScene();
 
-    const componentType =
-      BulkChangeProxyCommon.default || BulkChangeProxyCommon;
-    const props = wrapper.find(componentType).props();
+    expect(
+      screen.queryByRole('dialog', { name: 'Change Puppet Proxy' })
+    ).not.toBeInTheDocument();
+  });
 
-    expect(props).toEqual(
+  it('opens the modal with Puppet Proxy content when bulk modal is open', async () => {
+    openBulkModal(MODAL_ID, true);
+    renderScene();
+
+    expect(
+      await screen.findByRole('dialog', { name: 'Change Puppet Proxy' })
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText(/Changing the Puppet proxy will affect/)
+    ).toBeInTheDocument();
+    expect(screen.getByText('2')).toBeInTheDocument();
+    expect(
+      await screen.findByText('Select a Puppet Proxy')
+    ).toBeInTheDocument();
+    expect(screen.queryByText('Select a Puppet CA Proxy')).not.toBeInTheDocument();
+    expect(screen.queryByText('Change Puppet CA Proxy')).not.toBeInTheDocument();
+    expect(
+      await screen.findByRole('button', { name: 'Change Puppet Proxy' })
+    ).toBeDisabled();
+    expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
+  });
+
+  it('shows the all-hosts warning when select all hosts mode is enabled', async () => {
+    openBulkModal(MODAL_ID, true);
+    renderScene({
+      contextValue: { ...defaultContextValue, selectAllHostsMode: true },
+    });
+
+    await screen.findByRole('dialog', { name: 'Change Puppet Proxy' });
+    expect(screen.getByText('All')).toBeInTheDocument();
+  });
+
+  it('closes the modal when Cancel is clicked', async () => {
+    openBulkModal(MODAL_ID, true);
+    renderScene();
+
+    await screen.findByRole('dialog', { name: 'Change Puppet Proxy' });
+    await userEvent.click(screen.getByRole('button', { name: 'Cancel' }));
+
+    await waitFor(() => {
+      expect(
+        screen.queryByRole('dialog', { name: 'Change Puppet Proxy' })
+      ).not.toBeInTheDocument();
+    });
+  });
+
+  it('submits puppet proxy change request when confirm is clicked', async () => {
+    openBulkModal(MODAL_ID, true);
+    renderScene();
+
+    await screen.findByRole('dialog', { name: 'Change Puppet Proxy' });
+    await selectPuppetProxy();
+    await act(async () => {
+      await userEvent.click(
+        screen.getByRole('button', { name: 'Change Puppet Proxy' })
+      );
+    });
+
+    expect(fetchBulkParams).toHaveBeenCalledTimes(1);
+    expect(APIActions.put).toHaveBeenCalledWith(
       expect.objectContaining({
-        isCAProxy: false,
-        fetchBulkParams,
-        selectedCount: 2,
-        selectedResults: [1, 2],
-        selectAllHostsMode: false,
-        isOpen: true,
-        closeModal: expect.any(Function),
-        onSuccess: refreshTableData,
-        selectMessage: 'Select a Puppet Proxy',
-        handleErrorMessage: 'Failed to change Puppet Proxy',
-        changeMessage: 'Change Puppet Proxy',
-        allHostsMessage:
-          'Changing the Puppet proxy will affect {boldCount} selected hosts. Some hosts may already have been associated with the selected Puppet proxy.',
-        someHostsMessage:
-          'Changing the Puppet proxy will affect {boldCount} selected {count, plural, one {host} other {hosts}}. Some hosts may already have been associated with the selected Puppet proxy.',
+        key: BULK_CHANGE_PUPPET_PROXY_KEY,
+        params: {
+          included: {
+            search: 'id ^ (1,2)',
+          },
+          proxy_id: '1',
+          ca_proxy: false,
+        },
       })
     );
+  });
+
+  it('refreshes table data after successful change', async () => {
+    openBulkModal(MODAL_ID, true);
+    renderScene();
+
+    await screen.findByRole('dialog', { name: 'Change Puppet Proxy' });
+    await selectPuppetProxy();
+    await act(async () => {
+      await userEvent.click(
+        screen.getByRole('button', { name: 'Change Puppet Proxy' })
+      );
+    });
+
+    const { handleSuccess } = APIActions.put.mock.calls[0][0];
+
+    act(() => {
+      handleSuccess({ data: { message: 'Change started' } });
+    });
 
-    wrapper.unmount();
+    expect(refreshTableData).toHaveBeenCalledTimes(1);
+    expect(
+      screen.queryByRole('dialog', { name: 'Change Puppet Proxy' })
+    ).not.toBeInTheDocument();
   });
 });

data/webpack/src/Extends/Hosts/BulkActions/BulkRemoveProxyCommon/__tests__/actions.test.js

@@ -7,12 +7,6 @@ import {
   BULK_REMOVE_PUPPET_CA_PROXY_KEY,
 } from '../actions';
 
-jest.mock('foremanReact/redux/API', () => ({
-  APIActions: {
-    put: jest.fn(),
-  },
-}));
-
 describe('BulkRemoveProxyCommon actions', () => {
   const url = foremanUrl('/api/v2/hosts/bulk/remove_puppet_proxy');
 

data/webpack/src/Extends/Hosts/BulkActions/BulkRemovePuppetCAProxy/__tests__/index.test.js

@@ -1,68 +1,165 @@
 import React from 'react';
-import { mount } from '@theforeman/test';
+import { act, screen, within, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import '@testing-library/jest-dom';
 
+import { rtlHelpers } from 'foremanReact/common/rtlTestHelpers';
 import { openBulkModal } from 'foremanReact/common/BulkModalStateHelper';
 import { ForemanActionsBarContext } from 'foremanReact/components/HostDetails/ActionsBar';
+import { APIActions } from 'foremanReact/redux/API';
+import API from 'foremanReact/redux/API/API';
 
 import BulkRemovePuppetCAProxyScene from '../index';
-import BulkRemoveProxyCommon from '../../BulkRemoveProxyCommon';
+import { BULK_REMOVE_PUPPET_CA_PROXY_KEY } from '../../BulkRemoveProxyCommon/actions';
 
-jest.mock('foremanReact/components/HostDetails/ActionsBar', () => ({
-  ForemanActionsBarContext: jest.requireActual('react').createContext(),
-}));
-
-jest.mock('../../BulkRemoveProxyCommon', () => ({
-  __esModule: true,
-  default: jest.fn(() => null),
-}));
+const { renderWithStoreAndI18n } = rtlHelpers;
 
 describe('BulkRemovePuppetCAProxyScene', () => {
-  const fetchBulkParams = jest.fn();
+  const fetchBulkParams = jest.fn(() => 'id ^ (1,2)');
   const refreshTableData = jest.fn();
-  const contextValue = {
+  const defaultContextValue = {
     selectAllHostsMode: false,
     selectedCount: 2,
     selectedResults: [1, 2],
     fetchBulkParams,
     refreshTableData,
   };
+  let renderResult;
 
-  beforeEach(() => {
-    jest.clearAllMocks();
-    openBulkModal('bulk-remove-puppet-ca-proxy', false);
-  });
+  const renderScene = (contextOverrides = {}, isOpen = true) => {
+    openBulkModal('bulk-remove-puppet-ca-proxy', isOpen);
 
-  it('opens with bulk modal state and passes expected CA proxy props', () => {
-    openBulkModal('bulk-remove-puppet-ca-proxy', true);
-    const wrapper = mount(
-      <ForemanActionsBarContext.Provider value={contextValue}>
+    renderResult = renderWithStoreAndI18n(
+      <ForemanActionsBarContext.Provider
+        value={{ ...defaultContextValue, ...contextOverrides }}
+      >
         <BulkRemovePuppetCAProxyScene />
       </ForemanActionsBarContext.Provider>
     );
 
-    const componentType =
-      BulkRemoveProxyCommon.default || BulkRemoveProxyCommon;
-    const props = wrapper.find(componentType).props();
+    return renderResult;
+  };
+
+  beforeEach(() => {
+    openBulkModal('bulk-remove-puppet-ca-proxy', false);
+    APIActions.put.mockImplementation(params => ({
+      type: 'API_PUT',
+      payload: params,
+    }));
+  });
+
+  afterEach(() => {
+    renderResult?.unmount();
+    jest.clearAllMocks();
+  });
+
+  it('does not show the remove modal when bulk modal is closed', () => {
+    renderScene({}, false);
+
+    expect(
+      screen.queryByRole('dialog', { name: 'Remove Puppet CA Proxy' })
+    ).not.toBeInTheDocument();
+  });
+
+  it('shows the remove modal with warning for selected hosts when opened', async () => {
+    renderScene();
+
+    const dialog = await screen.findByRole('dialog', {
+      name: 'Remove Puppet CA Proxy',
+    });
 
-    expect(props).toEqual(
+    expect(dialog).toBeInTheDocument();
+    expect(
+      within(dialog).getByText(/Removing the Puppet CA proxy will affect/)
+    ).toBeInTheDocument();
+    expect(within(dialog).getByText('2', { selector: 'strong' })).toBeInTheDocument();
+    expect(within(dialog).getByText(/selected hosts/)).toBeInTheDocument();
+    expect(
+      within(dialog).getByText(
+        /Warning: If a Puppet Proxy is still set, the Puppet CA Proxy will fall back to that value after removal!/
+      )
+    ).toBeInTheDocument();
+    expect(
+      within(dialog).getByRole('button', { name: 'Remove Puppet CA Proxy' })
+    ).toBeInTheDocument();
+    expect(
+      within(dialog).getByRole('button', { name: 'Cancel' })
+    ).toBeInTheDocument();
+  });
+
+  it('shows all hosts warning message when select all hosts mode is enabled', async () => {
+    renderScene({ selectAllHostsMode: true });
+
+    const dialog = await screen.findByRole('dialog', {
+      name: 'Remove Puppet CA Proxy',
+    });
+
+    expect(
+      within(dialog).getByText(/Removing the Puppet CA proxy will affect/)
+    ).toBeInTheDocument();
+    expect(within(dialog).getByText('All', { selector: 'strong' })).toBeInTheDocument();
+    expect(within(dialog).getByText(/selected hosts/)).toBeInTheDocument();
+    expect(
+      within(dialog).getByText(
+        /Warning: If a Puppet Proxy is still set, the Puppet CA Proxy will fall back to that value after removal!/
+      )
+    ).toBeInTheDocument();
+  });
+
+  it('closes the modal when cancel is clicked', async () => {
+    renderScene();
+
+    await screen.findByRole('dialog', { name: 'Remove Puppet CA Proxy' });
+    await userEvent.click(screen.getByRole('button', { name: 'Cancel' }));
+
+    expect(
+      screen.queryByRole('dialog', { name: 'Remove Puppet CA Proxy' })
+    ).not.toBeInTheDocument();
+  });
+
+  it('submits CA proxy removal request when confirm is clicked', async () => {
+    renderScene();
+
+    await screen.findByRole('dialog', { name: 'Remove Puppet CA Proxy' });
+    await act(async () => {
+      await userEvent.click(
+        screen.getByRole('button', { name: 'Remove Puppet CA Proxy' })
+      );
+    });
+
+    expect(fetchBulkParams).toHaveBeenCalledTimes(1);
+    expect(APIActions.put).toHaveBeenCalledWith(
       expect.objectContaining({
-        isCAProxy: true,
-        selectAllHostsMode: false,
-        selectedCount: 2,
-        selectedResults: [1, 2],
-        fetchBulkParams,
-        isOpen: true,
-        closeModal: expect.any(Function),
-        onSuccess: refreshTableData,
-        handleErrorMessage: 'Failed to remove Puppet CA Proxy',
-        allHostsMessage:
-          'Removing the Puppet CA proxy will affect {boldCount} selected hosts. Warning: If a Puppet Proxy is still set, the Puppet CA Proxy will fall back to that value after removal!',
-        someHostsMessage:
-          'Removing the Puppet CA proxy will affect {boldCount} selected {count, plural, one {host} other {hosts}}. Warning: If a Puppet Proxy is still set, the Puppet CA Proxy will fall back to that value after removal!',
-        removeMessage: 'Remove Puppet CA Proxy',
+        key: BULK_REMOVE_PUPPET_CA_PROXY_KEY,
+        params: {
+          included: {
+            search: 'id ^ (1,2)',
+          },
+          ca_proxy: true,
+        },
       })
     );
+  });
+
+  it('refreshes table data after successful removal', async () => {
+    API.put.mockImplementation(() =>
+      Promise.resolve({ data: { message: 'Removal started' } })
+    );
+
+    renderScene();
+
+    await screen.findByRole('dialog', { name: 'Remove Puppet CA Proxy' });
+    await act(async () => {
+      await userEvent.click(
+        screen.getByRole('button', { name: 'Remove Puppet CA Proxy' })
+      );
+    });
 
-    wrapper.unmount();
+    await waitFor(() => {
+      expect(refreshTableData).toHaveBeenCalledTimes(1);
+    });
+    expect(
+      screen.queryByRole('dialog', { name: 'Remove Puppet CA Proxy' })
+    ).not.toBeInTheDocument();
   });
 });

data/webpack/src/Extends/Hosts/BulkActions/BulkRemovePuppetEnvironment/BulkRemovePuppetEnvironmentModal.js

@@ -0,0 +1,148 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { FormattedMessage } from 'react-intl';
+import { useDispatch } from 'react-redux';
+import { Modal, Button, TextContent, Text } from '@patternfly/react-core';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { addToast } from 'foremanReact/components/ToastsList/slice';
+import { useForemanOrganization } from 'foremanReact/Root/Context/ForemanContext';
+import { bulkActionErrorToastParams } from '../toastHelpers';
+import {
+  bulkChangePuppetEnvironment,
+  BULK_CHANGE_PUPPET_ENVIRONMENT_KEY,
+} from '../BulkChangePuppetEnvironment/actions';
+
+const BulkRemovePuppetEnvironmentModal = ({
+  isOpen,
+  closeModal,
+  selectAllHostsMode,
+  selectedCount,
+  fetchBulkParams,
+  onSuccess: onSuccessCallback,
+}) => {
+  const dispatch = useDispatch();
+  const currentOrganization = useForemanOrganization();
+
+  const handleModalClose = () => {
+    closeModal();
+  };
+
+  const handleError = response => {
+    handleModalClose();
+    dispatch(
+      addToast(
+        bulkActionErrorToastParams(
+          response,
+          __('Failed to remove Puppet Environment'),
+          BULK_CHANGE_PUPPET_ENVIRONMENT_KEY
+        )
+      )
+    );
+  };
+
+  const handleSuccess = response => {
+    dispatch(
+      addToast({
+        type: 'success',
+        message: response.data.message,
+      })
+    );
+    try {
+      if (onSuccessCallback) onSuccessCallback();
+    } finally {
+      handleModalClose();
+    }
+  };
+
+  const handleConfirm = () => {
+    const requestBody = {
+      included: {
+        search: fetchBulkParams(),
+      },
+      environment_id: null,
+      organization_id: currentOrganization?.id,
+    };
+
+    dispatch(
+      bulkChangePuppetEnvironment(requestBody, handleSuccess, handleError)
+    );
+  };
+
+  const modalActions = [
+    <Button
+      key="remove"
+      ouiaId="bulk-remove-puppet-environment-modal-remove-button"
+      variant="primary"
+      onClick={handleConfirm}
+    >
+      {__('Remove Puppet Environment')}
+    </Button>,
+    <Button
+      key="cancel"
+      ouiaId="bulk-remove-puppet-environment-modal-cancel-button"
+      variant="link"
+      onClick={handleModalClose}
+    >
+      {__('Cancel')}
+    </Button>,
+  ];
+
+  return (
+    <Modal
+      isOpen={isOpen}
+      onClose={handleModalClose}
+      onEscapePress={handleModalClose}
+      title={__('Remove Puppet Environment')}
+      width="50%"
+      position="top"
+      actions={modalActions}
+      id="bulk-remove-puppet-environment"
+      key="bulk-remove-puppet-environment"
+      ouiaId="bulk-remove-puppet-environment"
+    >
+      <TextContent>
+        <Text ouiaId="bulk-remove-puppet-environment-options">
+          {selectAllHostsMode ? (
+            <FormattedMessage
+              id="bulk-remove-puppet-environment-warning-message-all"
+              defaultMessage={__(
+                'Removing the Puppet environment will affect {boldCount} selected hosts.'
+              )}
+              values={{
+                boldCount: <strong>{__('All')}</strong>,
+              }}
+            />
+          ) : (
+            <FormattedMessage
+              id="bulk-remove-puppet-environment-warning-message"
+              defaultMessage={__(
+                'Removing the Puppet environment will affect {boldCount} selected {count, plural, one {host} other {hosts}}.'
+              )}
+              values={{
+                count: selectedCount,
+                boldCount: <strong>{selectedCount}</strong>,
+              }}
+            />
+          )}
+        </Text>
+      </TextContent>
+    </Modal>
+  );
+};
+
+BulkRemovePuppetEnvironmentModal.propTypes = {
+  isOpen: PropTypes.bool,
+  closeModal: PropTypes.func,
+  fetchBulkParams: PropTypes.func.isRequired,
+  onSuccess: PropTypes.func,
+  selectedCount: PropTypes.number.isRequired,
+  selectAllHostsMode: PropTypes.bool.isRequired,
+};
+
+BulkRemovePuppetEnvironmentModal.defaultProps = {
+  isOpen: false,
+  closeModal: () => {},
+  onSuccess: undefined,
+};
+
+export default BulkRemovePuppetEnvironmentModal;

data/webpack/src/Extends/Hosts/BulkActions/BulkRemovePuppetEnvironment/__tests__/BulkRemovePuppetEnvironmentModal.test.js

@@ -0,0 +1,80 @@
+import React from 'react';
+import { render, screen, fireEvent } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { IntlProvider } from 'react-intl';
+import { useDispatch } from 'react-redux';
+
+import BulkRemovePuppetEnvironmentModal from '../BulkRemovePuppetEnvironmentModal';
+import { bulkChangePuppetEnvironment } from '../../BulkChangePuppetEnvironment/actions';
+
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useDispatch: jest.fn(),
+}));
+
+jest.mock('foremanReact/Root/Context/ForemanContext', () => ({
+  useForemanOrganization: jest.fn(() => ({ id: 23 })),
+}));
+
+jest.mock('../../BulkChangePuppetEnvironment/actions', () => ({
+  bulkChangePuppetEnvironment: jest.fn(() => ({
+    type: 'BULK_CHANGE_PUPPET_ENVIRONMENT',
+  })),
+  BULK_CHANGE_PUPPET_ENVIRONMENT_KEY: 'BULK_CHANGE_PUPPET_ENVIRONMENT',
+}));
+
+describe('BulkRemovePuppetEnvironmentModal', () => {
+  const dispatch = jest.fn();
+
+  const renderComponent = (fetchBulkParams = jest.fn()) =>
+    render(
+      <IntlProvider locale="en">
+        <BulkRemovePuppetEnvironmentModal
+          isOpen
+          closeModal={jest.fn()}
+          fetchBulkParams={fetchBulkParams}
+          selectedCount={2}
+          selectAllHostsMode={false}
+        />
+      </IntlProvider>
+    );
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    useDispatch.mockReturnValue(dispatch);
+  });
+
+  it('renders the removal warning', () => {
+    renderComponent();
+
+    expect(
+      screen.getAllByText('Remove Puppet Environment')[0]
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText(/Removing the Puppet environment will affect/)
+    ).toBeInTheDocument();
+  });
+
+  it('submits organization scope with the bulk remove request', () => {
+    const fetchBulkParams = jest.fn(
+      () => 'organization = "Default Organization"'
+    );
+    renderComponent(fetchBulkParams);
+
+    fireEvent.click(
+      screen.getByRole('button', { name: 'Remove Puppet Environment' })
+    );
+
+    expect(bulkChangePuppetEnvironment).toHaveBeenCalledWith(
+      {
+        included: {
+          search: 'organization = "Default Organization"',
+        },
+        environment_id: null,
+        organization_id: 23,
+      },
+      expect.any(Function),
+      expect.any(Function)
+    );
+  });
+});