foreman_puppet 10.1.3 → 11.1.0

data/webpack/src/Extends/Hosts/BulkActions/BulkChangePuppetEnvironment/index.js

@@ -0,0 +1,30 @@
+import React, { useContext } from 'react';
+import { ForemanActionsBarContext } from 'foremanReact/components/HostDetails/ActionsBar';
+import { useBulkModalOpen } from 'foremanReact/common/BulkModalStateHelper';
+import BulkChangePuppetEnvironmentModal from './BulkChangePuppetEnvironmentModal';
+
+const BulkChangePuppetEnvironmentScene = () => {
+  const {
+    selectAllHostsMode,
+    selectedCount,
+    fetchBulkParams,
+    refreshTableData,
+  } = useContext(ForemanActionsBarContext);
+  const { isOpen, close: closeModal } = useBulkModalOpen(
+    'bulk-change-puppet-environment'
+  );
+
+  return (
+    <BulkChangePuppetEnvironmentModal
+      fetchBulkParams={fetchBulkParams}
+      selectedCount={selectedCount}
+      selectAllHostsMode={selectAllHostsMode}
+      isOpen={isOpen}
+      closeModal={closeModal}
+      onSuccess={refreshTableData}
+    />
+  );
+};
+
+export { BulkChangePuppetEnvironmentModal };
+export default BulkChangePuppetEnvironmentScene;

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

@@ -1,66 +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 contextValue = {
-    selectAllHostsMode: false,
-    selectedCount: 2,
-    selectedResults: [1, 2],
-    fetchBulkParams,
+  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),
-        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/BulkChangePuppetProxy/index.js

@@ -11,6 +11,7 @@ const BulkChangePuppetProxyScene = () => {
     selectedCount,
     selectedResults,
     fetchBulkParams,
+    refreshTableData,
   } = useContext(ForemanActionsBarContext);
   const { isOpen, close: closeModal } = useBulkModalOpen(
     'bulk-change-puppet-proxy'
@@ -24,6 +25,7 @@ const BulkChangePuppetProxyScene = () => {
       selectAllHostsMode={selectAllHostsMode}
       isOpen={isOpen}
       closeModal={closeModal}
+      onSuccess={refreshTableData}
       selectMessage={__('Select a Puppet Proxy')}
       handleErrorMessage={__('Failed to change Puppet Proxy')}
       changeMessage={__('Change Puppet Proxy')}

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/BulkRemoveProxyCommon/index.js

@@ -5,12 +5,6 @@ import { useDispatch } from 'react-redux';
 import { Modal, Button, TextContent, Text } from '@patternfly/react-core';
 import { addToast } from 'foremanReact/components/ToastsList/slice';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { foremanUrl } from 'foremanReact/common/helpers';
-import { APIActions } from 'foremanReact/redux/API';
-import {
-  HOSTS_API_PATH,
-  API_REQUEST_KEY,
-} from 'foremanReact/routes/Hosts/constants';
 
 import {
   BULK_REMOVE_PUPPET_PROXY_KEY,
@@ -30,6 +24,7 @@ const BulkRemoveProxyCommon = ({
   removeMessage,
   allHostsMessage,
   someHostsMessage,
+  onSuccess: onSuccessCallback,
 }) => {
   const actionKey = isCAProxy
     ? BULK_REMOVE_PUPPET_CA_PROXY_KEY
@@ -57,13 +52,11 @@ const BulkRemoveProxyCommon = ({
         message: response.data.message,
       })
     );
-    dispatch(
-      APIActions.get({
-        key: API_REQUEST_KEY,
-        url: foremanUrl(HOSTS_API_PATH),
-      })
-    );
-    handleModalClose();
+    try {
+      if (onSuccessCallback) onSuccessCallback();
+    } finally {
+      handleModalClose();
+    }
   };
 
   const handleConfirm = () => {
@@ -153,12 +146,14 @@ BulkRemoveProxyCommon.propTypes = {
   removeMessage: PropTypes.string,
   allHostsMessage: PropTypes.string.isRequired,
   someHostsMessage: PropTypes.string.isRequired,
+  onSuccess: PropTypes.func,
 };
 
 BulkRemoveProxyCommon.defaultProps = {
   isOpen: false,
   closeModal: () => {},
   removeMessage: 'Remove Puppet (CA) Proxy',
+  onSuccess: undefined,
 };
 
 export default BulkRemoveProxyCommon;

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

@@ -1,65 +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 contextValue = {
+  const fetchBulkParams = jest.fn(() => 'id ^ (1,2)');
+  const refreshTableData = jest.fn();
+  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),
-        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/BulkRemovePuppetCAProxy/index.js

@@ -10,6 +10,7 @@ const BulkRemovePuppetCAProxyScene = () => {
     selectedCount,
     selectedResults,
     fetchBulkParams,
+    refreshTableData,
   } = useContext(ForemanActionsBarContext);
   const { isOpen, close: closeModal } = useBulkModalOpen(
     'bulk-remove-puppet-ca-proxy'
@@ -24,6 +25,7 @@ const BulkRemovePuppetCAProxyScene = () => {
       fetchBulkParams={fetchBulkParams}
       isOpen={isOpen}
       closeModal={closeModal}
+      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!'