foreman_puppet 10.0.0 → 10.1.0

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

@@ -0,0 +1,164 @@
+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 { 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,
+  BULK_REMOVE_PUPPET_CA_PROXY_KEY,
+  bulkRemovePuppetProxyAction,
+} from './actions';
+import { bulkActionErrorToastParams } from '../toastHelpers';
+
+const BulkRemoveProxyCommon = ({
+  isCAProxy,
+  isOpen,
+  closeModal,
+  selectAllHostsMode,
+  selectedCount,
+  fetchBulkParams,
+  handleErrorMessage,
+  removeMessage,
+  allHostsMessage,
+  someHostsMessage,
+}) => {
+  const actionKey = isCAProxy
+    ? BULK_REMOVE_PUPPET_CA_PROXY_KEY
+    : BULK_REMOVE_PUPPET_PROXY_KEY;
+
+  const handleModalClose = () => {
+    closeModal();
+  };
+
+  const dispatch = useDispatch();
+
+  const handleError = response => {
+    handleModalClose();
+    dispatch(
+      addToast(
+        bulkActionErrorToastParams(response, handleErrorMessage, actionKey)
+      )
+    );
+  };
+
+  const handleSuccess = response => {
+    dispatch(
+      addToast({
+        type: 'success',
+        message: response.data.message,
+      })
+    );
+    dispatch(
+      APIActions.get({
+        key: API_REQUEST_KEY,
+        url: foremanUrl(HOSTS_API_PATH),
+      })
+    );
+    handleModalClose();
+  };
+
+  const handleConfirm = () => {
+    const requestBody = {
+      included: {
+        search: fetchBulkParams(),
+      },
+      ca_proxy: isCAProxy,
+    };
+
+    dispatch(
+      bulkRemovePuppetProxyAction(
+        actionKey,
+        requestBody,
+        handleSuccess,
+        handleError
+      )
+    );
+  };
+
+  const modalActions = [
+    <Button
+      key="add"
+      ouiaId="bulk-remove-proxy-common-modal-add-button"
+      variant="primary"
+      onClick={handleConfirm}
+    >
+      {removeMessage}
+    </Button>,
+    <Button
+      key="cancel"
+      ouiaId="bulk-remove-proxy-common-modal-cancel-button"
+      variant="link"
+      onClick={handleModalClose}
+    >
+      {__('Cancel')}
+    </Button>,
+  ];
+
+  return (
+    <Modal
+      isOpen={isOpen}
+      onClose={handleModalClose}
+      onEscapePress={handleModalClose}
+      title={removeMessage}
+      width="50%"
+      position="top"
+      actions={modalActions}
+      id="bulk-remove-proxy-common"
+      key="bulk-remove-proxy-common"
+      ouiaId="bulk-remove-proxy-common"
+    >
+      <TextContent>
+        <Text ouiaId="bulk-remove-proxy-common-options">
+          {selectAllHostsMode ? (
+            <FormattedMessage
+              id="bulk-remove-proxy-common-warning-message-all"
+              defaultMessage={allHostsMessage}
+              values={{
+                boldCount: <strong>{__('All')}</strong>,
+              }}
+            />
+          ) : (
+            <FormattedMessage
+              id="bulk-remove-proxy-common-warning-message"
+              defaultMessage={someHostsMessage}
+              values={{
+                count: selectedCount,
+                boldCount: <strong>{selectedCount}</strong>,
+              }}
+            />
+          )}
+        </Text>
+      </TextContent>
+    </Modal>
+  );
+};
+
+BulkRemoveProxyCommon.propTypes = {
+  isCAProxy: PropTypes.bool.isRequired,
+  isOpen: PropTypes.bool,
+  closeModal: PropTypes.func,
+  fetchBulkParams: PropTypes.func.isRequired,
+  selectedCount: PropTypes.number.isRequired,
+  selectAllHostsMode: PropTypes.bool.isRequired,
+  handleErrorMessage: PropTypes.string.isRequired,
+  removeMessage: PropTypes.string,
+  allHostsMessage: PropTypes.string.isRequired,
+  someHostsMessage: PropTypes.string.isRequired,
+};
+
+BulkRemoveProxyCommon.defaultProps = {
+  isOpen: false,
+  closeModal: () => {},
+  removeMessage: 'Remove Puppet (CA) Proxy',
+};
+
+export default BulkRemoveProxyCommon;

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

@@ -0,0 +1,65 @@
+import React from 'react';
+import { mount } from '@theforeman/test';
+
+import { openBulkModal } from 'foremanReact/common/BulkModalStateHelper';
+import { ForemanActionsBarContext } from 'foremanReact/components/HostDetails/ActionsBar';
+
+import BulkRemovePuppetCAProxyScene from '../index';
+import BulkRemoveProxyCommon from '../../BulkRemoveProxyCommon';
+
+jest.mock('foremanReact/components/HostDetails/ActionsBar', () => ({
+  ForemanActionsBarContext: jest.requireActual('react').createContext(),
+}));
+
+jest.mock('../../BulkRemoveProxyCommon', () => ({
+  __esModule: true,
+  default: jest.fn(() => null),
+}));
+
+describe('BulkRemovePuppetCAProxyScene', () => {
+  const fetchBulkParams = jest.fn();
+  const contextValue = {
+    selectAllHostsMode: false,
+    selectedCount: 2,
+    selectedResults: [1, 2],
+    fetchBulkParams,
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    openBulkModal('bulk-remove-puppet-ca-proxy', false);
+  });
+
+  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}>
+        <BulkRemovePuppetCAProxyScene />
+      </ForemanActionsBarContext.Provider>
+    );
+
+    const componentType =
+      BulkRemoveProxyCommon.default || BulkRemoveProxyCommon;
+    const props = wrapper.find(componentType).props();
+
+    expect(props).toEqual(
+      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',
+      })
+    );
+
+    wrapper.unmount();
+  });
+});

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

@@ -0,0 +1,39 @@
+import React, { useContext } from 'react';
+import { ForemanActionsBarContext } from 'foremanReact/components/HostDetails/ActionsBar';
+import { useBulkModalOpen } from 'foremanReact/common/BulkModalStateHelper';
+import { translate as __ } from 'foremanReact/common/I18n';
+import BulkRemoveProxyCommon from '../BulkRemoveProxyCommon';
+
+const BulkRemovePuppetCAProxyScene = () => {
+  const {
+    selectAllHostsMode,
+    selectedCount,
+    selectedResults,
+    fetchBulkParams,
+  } = useContext(ForemanActionsBarContext);
+  const { isOpen, close: closeModal } = useBulkModalOpen(
+    'bulk-remove-puppet-ca-proxy'
+  );
+  return (
+    <BulkRemoveProxyCommon
+      isCAProxy
+      key="bulk-remove-puppet-ca-proxy"
+      selectAllHostsMode={selectAllHostsMode}
+      selectedCount={selectedCount}
+      selectedResults={selectedResults}
+      fetchBulkParams={fetchBulkParams}
+      isOpen={isOpen}
+      closeModal={closeModal}
+      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')}
+    />
+  );
+};
+
+export default BulkRemovePuppetCAProxyScene;

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

@@ -0,0 +1,61 @@
+import React from 'react';
+import { mount } from '@theforeman/test';
+
+import { openBulkModal } from 'foremanReact/common/BulkModalStateHelper';
+import { ForemanActionsBarContext } from 'foremanReact/components/HostDetails/ActionsBar';
+
+import BulkRemovePuppetProxyScene from '../index';
+import BulkRemoveProxyCommon from '../../BulkRemoveProxyCommon';
+
+jest.mock('foremanReact/components/HostDetails/ActionsBar', () => ({
+  ForemanActionsBarContext: jest.requireActual('react').createContext(),
+}));
+
+jest.mock('../../BulkRemoveProxyCommon', () => ({
+  __esModule: true,
+  default: jest.fn(() => null),
+}));
+
+describe('BulkRemovePuppetProxyScene', () => {
+  const fetchBulkParams = jest.fn();
+  const contextValue = {
+    selectAllHostsMode: false,
+    selectedCount: 2,
+    selectedResults: [1, 2],
+    fetchBulkParams,
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    openBulkModal('bulk-remove-puppet-proxy', false);
+  });
+
+  it('opens with bulk modal state and passes expected props', () => {
+    openBulkModal('bulk-remove-puppet-proxy', true);
+    const wrapper = mount(
+      <ForemanActionsBarContext.Provider value={contextValue}>
+        <BulkRemovePuppetProxyScene />
+      </ForemanActionsBarContext.Provider>
+    );
+
+    const componentType =
+      BulkRemoveProxyCommon.default || BulkRemoveProxyCommon;
+    const props = wrapper.find(componentType).props();
+
+    expect(props).toEqual(
+      expect.objectContaining({
+        isCAProxy: false,
+        selectAllHostsMode: false,
+        selectedCount: 2,
+        selectedResults: [1, 2],
+        fetchBulkParams,
+        isOpen: true,
+        closeModal: expect.any(Function),
+        handleErrorMessage: 'Failed to remove Puppet Proxy',
+        removeMessage: 'Remove Puppet Proxy',
+      })
+    );
+
+    wrapper.unmount();
+  });
+});

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

@@ -0,0 +1,39 @@
+import React, { useContext } from 'react';
+import { ForemanActionsBarContext } from 'foremanReact/components/HostDetails/ActionsBar';
+import { useBulkModalOpen } from 'foremanReact/common/BulkModalStateHelper';
+import { translate as __ } from 'foremanReact/common/I18n';
+import BulkRemoveProxyCommon from '../BulkRemoveProxyCommon';
+
+const BulkRemovePuppetProxyScene = () => {
+  const {
+    selectAllHostsMode,
+    selectedCount,
+    selectedResults,
+    fetchBulkParams,
+  } = useContext(ForemanActionsBarContext);
+  const { isOpen, close: closeModal } = useBulkModalOpen(
+    'bulk-remove-puppet-proxy'
+  );
+  return (
+    <BulkRemoveProxyCommon
+      isCAProxy={false}
+      key="bulk-remove-puppet-proxy"
+      selectAllHostsMode={selectAllHostsMode}
+      selectedCount={selectedCount}
+      selectedResults={selectedResults}
+      fetchBulkParams={fetchBulkParams}
+      isOpen={isOpen}
+      closeModal={closeModal}
+      handleErrorMessage={__('Failed to remove Puppet Proxy')}
+      allHostsMessage={__(
+        'Removing the Puppet proxy will affect {boldCount} selected hosts.'
+      )}
+      someHostsMessage={__(
+        'Removing the Puppet proxy will affect {boldCount} selected {count, plural, one {host} other {hosts}}.'
+      )}
+      removeMessage={__('Remove Puppet Proxy')}
+    />
+  );
+};
+
+export default BulkRemovePuppetProxyScene;

data/webpack/src/Extends/Hosts/BulkActions/__tests__/toastHelpers.test.js

@@ -0,0 +1,55 @@
+import { bulkActionErrorToastParams } from '../toastHelpers';
+
+jest.mock('foremanReact/components/HostsIndex/BulkActions/helpers', () => ({
+  failedHostsToastParams: jest.fn(params => params),
+}));
+
+describe('bulkActionErrorToastParams', () => {
+  const actionKey = 'BULK_ACTION_KEY';
+  const fallbackMessage = 'Fallback error';
+
+  it('uses the API error payload message when present', () => {
+    const response = {
+      data: {
+        error: {
+          message: 'API error',
+          failed_host_ids: [1, 2],
+        },
+      },
+    };
+
+    expect(
+      bulkActionErrorToastParams(response, fallbackMessage, actionKey)
+    ).toEqual({
+      message: 'API error',
+      failed_host_ids: [1, 2],
+      key: actionKey,
+    });
+  });
+
+  it('supports axios-style wrapped error responses', () => {
+    const response = {
+      response: {
+        data: {
+          error: {
+            message: 'Wrapped API error',
+          },
+        },
+      },
+    };
+
+    expect(
+      bulkActionErrorToastParams(response, fallbackMessage, actionKey)
+    ).toEqual({
+      message: 'Wrapped API error',
+      key: actionKey,
+    });
+  });
+
+  it('falls back to the generic message when the API message is missing', () => {
+    expect(bulkActionErrorToastParams({}, fallbackMessage, actionKey)).toEqual({
+      message: fallbackMessage,
+      key: actionKey,
+    });
+  });
+});

data/webpack/src/Extends/Hosts/BulkActions/toastHelpers.js

@@ -0,0 +1,17 @@
+import { failedHostsToastParams } from 'foremanReact/components/HostsIndex/BulkActions/helpers';
+
+export const bulkActionErrorToastParams = (
+  response,
+  fallbackMessage,
+  actionKey
+) => {
+  const error = response?.data?.error || response?.response?.data?.error || {};
+
+  return failedHostsToastParams({
+    ...error,
+    message: error.message || fallbackMessage,
+    key: actionKey,
+  });
+};
+
+export default bulkActionErrorToastParams;

data/webpack/src/foreman_puppet_host_form.test.js

@@ -37,7 +37,7 @@ describe('checkForUnavailablePuppetclasses', () => {
     );
 
     checkForUnavailablePuppetclasses();
-    expect($('#puppetclasses_unavailable_warning').length).toBe(1);
+    expect($('#puppetclasses_unavailable_warning')).toHaveLength(1);
   });
 
   it('does not add a warning if no unavailable classes are found', () => {
@@ -48,8 +48,8 @@ describe('checkForUnavailablePuppetclasses', () => {
     expect(
       $('#hostgroup .help-block')
         .first()
-        .children().length
-    ).toBe(0);
+        .children()
+    ).toHaveLength(0);
   });
 
   it('adds a warning sign to the tab if unavailable classes are found', () => {
@@ -58,7 +58,7 @@ describe('checkForUnavailablePuppetclasses', () => {
     );
     checkForUnavailablePuppetclasses();
     setTimeout(() => {
-      expect($('a .pficon').length).toBe(1);
+      expect($('a .pficon')).toHaveLength(1);
     }, 100);
   });
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_puppet
 version: !ruby/object:Gem::Version
-  version: 10.0.0
+  version: 10.1.0
 platform: ruby
 authors:
 - Ondřej Ezr
@@ -61,6 +61,7 @@ files:
 - app/controllers/foreman_puppet/api/v2/environments_controller.rb
 - app/controllers/foreman_puppet/api/v2/host_classes_controller.rb
 - app/controllers/foreman_puppet/api/v2/hostgroup_classes_controller.rb
+- app/controllers/foreman_puppet/api/v2/hosts_bulk_actions_controller.rb
 - app/controllers/foreman_puppet/api/v2/override_values_controller.rb
 - app/controllers/foreman_puppet/api/v2/puppet_base_controller.rb
 - app/controllers/foreman_puppet/api/v2/puppet_lookups_common_controller.rb
@@ -113,6 +114,7 @@ files:
 - app/models/foreman_puppet/puppetclass.rb
 - app/models/foreman_puppet/puppetclass_lookup_key.rb
 - app/prepend_views/api/v2/template_combinations/base.json.rabl
+- app/services/concerns/foreman_puppet/extensions/bulk_hosts_manager.rb
 - app/services/concerns/foreman_puppet/extensions/host_counter.rb
 - app/services/foreman_puppet/host_info_providers/config_groups_info.rb
 - app/services/foreman_puppet/host_info_providers/puppet_info.rb
@@ -282,6 +284,7 @@ files:
 - test/controllers/foreman_puppet/api/v2/host_classes_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/hostgroup_classes_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/hostgroups_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/hosts_bulk_actions_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/hosts_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/lookups_common_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/override_values_controller_test.rb
@@ -335,6 +338,7 @@ files:
 - test/models/foreman_puppet/report_test.rb
 - test/models/foreman_puppet/smart_proxy_test.rb
 - test/models/foreman_puppet/user_test.rb
+- test/services/foreman_puppet/bulk_hosts_manager_test.rb
 - test/services/foreman_puppet/host_counter_test.rb
 - test/services/foreman_puppet/host_info_providers/config_groups_info_test.rb
 - test/services/foreman_puppet/host_info_providers/puppet_info_test.rb
@@ -373,6 +377,24 @@ files:
 - webpack/src/Extends/Host/PuppetTab/helpers.js
 - webpack/src/Extends/Host/PuppetTab/index.js
 - webpack/src/Extends/Host/PuppetTab/styles.scss
+- webpack/src/Extends/Hosts/ActionsBar/ActionsBar.scss
+- webpack/src/Extends/Hosts/ActionsBar/index.js
+- webpack/src/Extends/Hosts/BulkActions/BulkChangeProxyCommon/__tests__/actions.test.js
+- webpack/src/Extends/Hosts/BulkActions/BulkChangeProxyCommon/actions.js
+- webpack/src/Extends/Hosts/BulkActions/BulkChangeProxyCommon/index.js
+- webpack/src/Extends/Hosts/BulkActions/BulkChangePuppetCAProxy/__tests__/index.test.js
+- webpack/src/Extends/Hosts/BulkActions/BulkChangePuppetCAProxy/index.js
+- webpack/src/Extends/Hosts/BulkActions/BulkChangePuppetProxy/__tests__/index.test.js
+- webpack/src/Extends/Hosts/BulkActions/BulkChangePuppetProxy/index.js
+- webpack/src/Extends/Hosts/BulkActions/BulkRemoveProxyCommon/__tests__/actions.test.js
+- webpack/src/Extends/Hosts/BulkActions/BulkRemoveProxyCommon/actions.js
+- webpack/src/Extends/Hosts/BulkActions/BulkRemoveProxyCommon/index.js
+- webpack/src/Extends/Hosts/BulkActions/BulkRemovePuppetCAProxy/__tests__/index.test.js
+- webpack/src/Extends/Hosts/BulkActions/BulkRemovePuppetCAProxy/index.js
+- webpack/src/Extends/Hosts/BulkActions/BulkRemovePuppetProxy/__tests__/index.test.js
+- webpack/src/Extends/Hosts/BulkActions/BulkRemovePuppetProxy/index.js
+- webpack/src/Extends/Hosts/BulkActions/__tests__/toastHelpers.test.js
+- webpack/src/Extends/Hosts/BulkActions/toastHelpers.js
 - webpack/src/ForemanPuppet.js
 - webpack/src/Router/__snapshots__/routes.test.js.snap
 - webpack/src/Router/index.js
@@ -404,7 +426,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Add Puppet features to Foreman
 test_files:
@@ -413,6 +435,7 @@ test_files:
 - test/controllers/foreman_puppet/api/v2/host_classes_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/hostgroup_classes_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/hostgroups_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/hosts_bulk_actions_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/hosts_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/lookups_common_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/override_values_controller_test.rb
@@ -466,6 +489,7 @@ test_files:
 - test/models/foreman_puppet/report_test.rb
 - test/models/foreman_puppet/smart_proxy_test.rb
 - test/models/foreman_puppet/user_test.rb
+- test/services/foreman_puppet/bulk_hosts_manager_test.rb
 - test/services/foreman_puppet/host_counter_test.rb
 - test/services/foreman_puppet/host_info_providers/config_groups_info_test.rb
 - test/services/foreman_puppet/host_info_providers/puppet_info_test.rb