foreman_rh_cloud 12.0.0 → 12.1.1

data/webpack/ForemanInventoryUpload/Components/TabHeader/__tests__/TabHeader.test.js

@@ -1,13 +1,51 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
+import React from 'react';
+import { Provider } from 'react-redux';
+import configureMockStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import { screen, render } from '@testing-library/react';
+import { noop } from 'foremanReact/common/helpers';
 import TabHeader from '../TabHeader';
 
-const fixtures = {
-  'render without Props': {},
-  /** fixtures, props for the component */
-};
+const middlewares = [thunk];
+const mockStore = configureMockStore(middlewares);
 
 describe('TabHeader', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(TabHeader, fixtures));
+  test('when subscription connection is enabled', () => {
+    const renderOptions = {
+      API: {
+        INVENTORY_SETTINGS: {
+          response: { subscriptionConnectionEnabled: true },
+        },
+      },
+    };
+    const store = mockStore(renderOptions);
+
+    render(
+      <Provider store={store}>
+        <TabHeader exitCode="exit 0" onRestart={noop} toggleFullScreen={noop} />
+      </Provider>
+    );
+    expect(screen.queryAllByText('Generate and upload report')).toHaveLength(1);
+    expect(screen.queryAllByText('Full Screen')).toHaveLength(1);
+  });
+
+  test('when subscription connection is not enabled', () => {
+    const renderOptions = {
+      API: {
+        INVENTORY_SETTINGS: {
+          response: { subscriptionConnectionEnabled: false },
+        },
+      },
+    };
+    const store = mockStore(renderOptions);
+
+    render(
+      <Provider store={store}>
+        <TabHeader exitCode="exit 0" onRestart={noop} toggleFullScreen={noop} />
+      </Provider>
+    );
+
+    expect(screen.queryAllByText('Generate report')).toHaveLength(1);
+    expect(screen.queryAllByText('Full Screen')).toHaveLength(1);
+  });
 });

data/webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/InventoryAutoUpload.js

@@ -6,8 +6,8 @@ import { FormGroup, Grid } from 'patternfly-react';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { foremanUrl } from '../../../ForemanRhCloudHelpers';
 import Switcher from '../../../common/Switcher';
-import AdvancedSettings from './components/AdvancedSettings';
 import { settingsDict } from '../../Components/InventorySettings/AdvancedSetting/AdvancedSettingsConstants';
+import InventorySettings from '../../Components/InventorySettings/InventorySettings';
 
 const InventoryAutoUploadSwitcher = ({
   autoUploadEnabled,
@@ -44,12 +44,7 @@ const InventoryAutoUploadSwitcher = ({
               headerContent={
                 <strong>{__('Advanced Inventory Settings')}</strong>
               }
-              bodyContent={
-                <AdvancedSettings
-                  autoUploadEnabled={autoUploadEnabled}
-                  handleToggle={handleToggle}
-                />
-              }
+              bodyContent={<InventorySettings />}
               position="right"
             >
               <Button

data/webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/__tests__/__snapshots__/InventoryAutoUpload.test.js.snap

@@ -32,12 +32,7 @@ exports[`InventoryAutoUpload rendering render with props 1`] = `
         sm={5}
       >
         <Popover
-          bodyContent={
-            <Memo(Connect(AdvancedSettings))
-              autoUploadEnabled={true}
-              handleToggle={[Function]}
-            />
-          }
+          bodyContent={<InventorySettings />}
           headerContent={
             <strong>
               Advanced Inventory Settings

data/webpack/common/Switcher/SwitcherPF4.js

@@ -4,11 +4,19 @@ import { Switch } from '@patternfly/react-core';
 import { HelpLabel } from './HelpLabel';
 import './SwitcherPF4.scss';
 
-const SwitcherPF4 = ({ id, label, tooltip, isChecked, onChange }) => (
+const SwitcherPF4 = ({
+  id,
+  label,
+  tooltip,
+  isChecked,
+  onChange,
+  isDisabled,
+}) => (
   <Switch
     className="foreman-rh-cloud-switcher"
     id={`rh-cloud-switcher-${id}`}
     isChecked={isChecked}
+    isDisabled={isDisabled}
     onChange={onChange}
     label={
       <div>
@@ -24,6 +32,7 @@ SwitcherPF4.propTypes = {
   label: PropTypes.string,
   tooltip: PropTypes.string,
   isChecked: PropTypes.bool,
+  isDisabled: PropTypes.bool,
   onChange: PropTypes.func.isRequired,
 };
 
@@ -31,6 +40,7 @@ SwitcherPF4.defaultProps = {
   label: null,
   tooltip: null,
   isChecked: true,
+  isDisabled: false,
 };
 
 export default SwitcherPF4;

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 12.0.0
+  version: 12.1.1
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 bindir: bin
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_ansible
@@ -392,16 +392,14 @@ files:
 - webpack/ForemanInventoryUpload/Components/InventorySettings/InventorySettingsActions.js
 - webpack/ForemanInventoryUpload/Components/InventorySettings/InventorySettingsConstants.js
 - webpack/ForemanInventoryUpload/Components/InventorySettings/InventorySettingsSelectors.js
-- webpack/ForemanInventoryUpload/Components/InventorySettings/__tests__/InventorySettings.test.js
+- webpack/ForemanInventoryUpload/Components/InventorySettings/MinimalInventoryDropdown.js
 - webpack/ForemanInventoryUpload/Components/InventorySettings/__tests__/InventorySettingsActions.test.js
-- webpack/ForemanInventoryUpload/Components/InventorySettings/__tests__/__snapshots__/InventorySettings.test.js.snap
 - webpack/ForemanInventoryUpload/Components/InventorySettings/__tests__/__snapshots__/InventorySettingsActions.test.js.snap
 - webpack/ForemanInventoryUpload/Components/InventorySettings/index.js
 - webpack/ForemanInventoryUpload/Components/NavContainer/NavContainer.fixtures.js
 - webpack/ForemanInventoryUpload/Components/NavContainer/NavContainer.js
 - webpack/ForemanInventoryUpload/Components/NavContainer/NavContainerHelper.js
 - webpack/ForemanInventoryUpload/Components/NavContainer/__tests__/NavContainer.test.js
-- webpack/ForemanInventoryUpload/Components/NavContainer/__tests__/__snapshots__/NavContainer.test.js.snap
 - webpack/ForemanInventoryUpload/Components/NavContainer/index.js
 - webpack/ForemanInventoryUpload/Components/NavContainer/navContainer.scss
 - webpack/ForemanInventoryUpload/Components/PageHeader/PageHeader.js
@@ -423,7 +421,6 @@ files:
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudPingModal/index.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/PageDescription.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/__tests__/PageDescription.test.js
-- webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/__tests__/__snapshots__/PageDescription.test.js.snap
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/index.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/SettingsWarning/SettingsWarning.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/SettingsWarning/SettingsWarning.test.js
@@ -444,7 +441,6 @@ files:
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/index.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/ToolbarButtons/ToolbarButtons.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/ToolbarButtons/__tests__/ToolbarButtons.test.js
-- webpack/ForemanInventoryUpload/Components/PageHeader/components/ToolbarButtons/__tests__/__snapshots__/ToolbarButtons.test.js.snap
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/ToolbarButtons/index.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/ToolbarButtons/toolbarButtons.scss
 - webpack/ForemanInventoryUpload/Components/PageHeader/index.js
@@ -501,7 +497,6 @@ files:
 - webpack/ForemanInventoryUpload/Components/TabHeader/TabHeader.js
 - webpack/ForemanInventoryUpload/Components/TabHeader/TabHeaderHelper.js
 - webpack/ForemanInventoryUpload/Components/TabHeader/__tests__/TabHeader.test.js
-- webpack/ForemanInventoryUpload/Components/TabHeader/__tests__/__snapshots__/TabHeader.test.js.snap
 - webpack/ForemanInventoryUpload/Components/TabHeader/index.js
 - webpack/ForemanInventoryUpload/Components/TabHeader/tabHeader.scss
 - webpack/ForemanInventoryUpload/Components/Terminal/Terminal.fixtures.js
@@ -518,8 +513,6 @@ files:
 - webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/InventoryAutoUpload.js
 - webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/__tests__/InventoryAutoUpload.test.js
 - webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/__tests__/__snapshots__/InventoryAutoUpload.test.js.snap
-- webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/components/AdvancedSettings/AdvancedSettings.js
-- webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/components/AdvancedSettings/index.js
 - webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/index.js
 - webpack/ForemanInventoryUpload/__tests__/ForemanInventoryHelpers.test.js
 - webpack/ForemanInventoryUpload/__tests__/ForemanInventoryUpload.test.js
@@ -665,7 +658,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Summary of ForemanRhCloud.
 test_files:

data/webpack/ForemanInventoryUpload/Components/InventorySettings/__tests__/InventorySettings.test.js

@@ -1,13 +0,0 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
-import InventorySettings from '../InventorySettings';
-
-const fixtures = {
-  'render without Props': {},
-  /** fixtures, props for the component */
-};
-
-describe('InventorySettings', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(InventorySettings, fixtures));
-});

data/webpack/ForemanInventoryUpload/Components/InventorySettings/__tests__/__snapshots__/InventorySettings.test.js.snap

@@ -1,31 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`InventorySettings rendering render without Props 1`] = `
-<div
-  className="inventory-settings"
->
-  <h3>
-    Settings
-  </h3>
-  <AdvancedSetting
-    key="autoUploadEnabled"
-    setting="autoUploadEnabled"
-  />
-  <AdvancedSetting
-    key="hostObfuscationEnabled"
-    setting="hostObfuscationEnabled"
-  />
-  <AdvancedSetting
-    key="ipsObfuscationEnabled"
-    setting="ipsObfuscationEnabled"
-  />
-  <AdvancedSetting
-    key="excludePackagesEnabled"
-    setting="excludePackagesEnabled"
-  />
-  <AdvancedSetting
-    key="allowAutoInsightsMismatchDelete"
-    setting="allowAutoInsightsMismatchDelete"
-  />
-</div>
-`;

data/webpack/ForemanInventoryUpload/Components/NavContainer/__tests__/__snapshots__/NavContainer.test.js.snap

@@ -1,89 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`NavContainer rendering render with Props 1`] = `
-<ForwardRef
-  defaultActiveKey={0}
-  id="basic-tabs-pf"
->
-  <div
-    className="dashboard"
-  >
-    <Nav
-      bsClass="nav nav-tabs nav-tabs-pf"
-      justified={false}
-      pullLeft={false}
-      pullRight={false}
-      stacked={false}
-    >
-      <NavItem
-        active={false}
-        className="nav_item"
-        disabled={false}
-        eventKey={0}
-        key="0"
-        onClick={[Function]}
-      >
-        <Icon
-          name="some-icon"
-          size="2x"
-          type="fa"
-        />
-        <p>
-          some-name
-        </p>
-      </NavItem>
-    </Nav>
-    <TabContent
-      animation={true}
-      bsClass="tab"
-      componentClass="div"
-      mountOnEnter={false}
-      unmountOnExit={false}
-    >
-      <TabPane
-        bsClass="tab-pane"
-        eventKey={0}
-        key="0"
-      >
-        <component />
-      </TabPane>
-    </TabContent>
-    <FullScreenModal
-      showFullScreen={false}
-      terminalProps={Object {}}
-      toggleFullScreen={[Function]}
-    />
-  </div>
-</ForwardRef>
-`;
-
-exports[`NavContainer rendering render without Props 1`] = `
-<ForwardRef
-  defaultActiveKey={0}
-  id="basic-tabs-pf"
->
-  <div
-    className="dashboard"
-  >
-    <Nav
-      bsClass="nav nav-tabs nav-tabs-pf"
-      justified={false}
-      pullLeft={false}
-      pullRight={false}
-      stacked={false}
-    />
-    <TabContent
-      animation={true}
-      bsClass="tab"
-      componentClass="div"
-      mountOnEnter={false}
-      unmountOnExit={false}
-    />
-    <FullScreenModal
-      showFullScreen={false}
-      terminalProps={Object {}}
-      toggleFullScreen={[Function]}
-    />
-  </div>
-</ForwardRef>
-`;

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/__tests__/__snapshots__/PageDescription.test.js.snap

@@ -1,62 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`PageDescription rendering render without Props 1`] = `
-<div
-  id="inventory_page_description"
->
-  <Text>
-    The Red Hat Hybrid Cloud Console provides a set of cloud services, including Red Hat Insights and Subscriptions, that provide predictive analysis, remediation of issues, and unified subscription reporting for this Foreman instance.
-  </Text>
-  <Text>
-    The Foreman inventory upload plugin automatically uploads Foreman host inventory data to the Inventory service of Insights, where it can also be used by the Subscriptions service for subscription reporting. If you use the Subscriptions service, enabling inventory uploads is required.
-  </Text>
-  <Text>
-    <FormattedMessage
-      defaultMessage="To enable this reporting for all Foreman organizations, set {uploadButtonName} to on. The data will be reported automatically once per day."
-      id="enable-upload-hint"
-      values={
-        Object {
-          "uploadButtonName": <strong>
-            Automatic inventory upload
-          </strong>,
-        }
-      }
-    />
-  </Text>
-  <Text>
-    <FormattedMessage
-      defaultMessage="To manually upload the data for a specific organization, select an organization and click {restartButtonName}."
-      id="restart-button-hint"
-      values={
-        Object {
-          "restartButtonName": <strong>
-            Generate and upload report
-          </strong>,
-        }
-      }
-    />
-  </Text>
-  <Text>
-    For more information about the Subscriptions service, see:
-     
-    <a
-      href="https://docs.redhat.com/en/documentation/subscription_central/1-latest/html/getting_started_with_the_subscriptions_service/index"
-      rel="noopener noreferrer"
-      target="_blank"
-    >
-      About subscription watch
-    </a>
-  </Text>
-  <Text>
-    For more information about Insights and Cloud Connector, see:
-     
-    <a
-      href="https://console.redhat.com/security/insights/"
-      rel="noopener noreferrer"
-      target="_blank"
-    >
-      Red Hat Insights Data and Application Security
-    </a>
-  </Text>
-</div>
-`;

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/ToolbarButtons/__tests__/__snapshots__/ToolbarButtons.test.js.snap

@@ -1,10 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ToolbarButtons rendering render without Props 1`] = `
-<div
-  className="inventory_toolbar_buttons"
->
-  <ConnectedCloudConnectorButton />
-  <Connect(SyncButton) />
-</div>
-`;

data/webpack/ForemanInventoryUpload/Components/TabHeader/__tests__/__snapshots__/TabHeader.test.js.snap

@@ -1,43 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`TabHeader rendering render without Props 1`] = `
-<Row
-  bsClass="row"
-  className="tab-header"
-  componentClass="div"
->
-  <Col
-    bsClass="col"
-    componentClass="div"
-    sm={6}
-  >
-    <p>
-      Exit Code: 
-    </p>
-  </Col>
-  <Col
-    bsClass="col"
-    componentClass="div"
-    sm={6}
-  >
-    <div
-      className="tab-action-buttons"
-    >
-      <Button
-        active={false}
-        block={false}
-        bsClass="btn"
-        bsStyle="default"
-        disabled={false}
-        onClick={[Function]}
-      >
-        Full Screen
-        <Icon
-          name="arrows-alt"
-          type="fa"
-        />
-      </Button>
-    </div>
-  </Col>
-</Row>
-`;

data/webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/components/AdvancedSettings/AdvancedSettings.js

@@ -1,72 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Grid } from 'patternfly-react';
-import { translate as __ } from 'foremanReact/common/I18n';
-import Switcher from '../../../../../common/Switcher';
-import { settingsDict } from '../../../../Components/InventorySettings/AdvancedSetting/AdvancedSettingsConstants';
-
-const AdvancedSettings = ({
-  setSetting,
-  hostObfuscationEnabled,
-  ipsObfuscationEnabled,
-  excludePackagesEnabled,
-}) => (
-  <form style={{ padding: '5px' }}>
-    <Grid.Row>
-      <Switcher
-        id="obfuscate-hostnames"
-        label={__('Obfuscate host names')}
-        tooltip={__('Obfuscate host names sent to the Red Hat cloud')}
-        isChecked={hostObfuscationEnabled}
-        onChange={() =>
-          setSetting({
-            setting: settingsDict.hostObfuscationEnabled.name,
-            value: !hostObfuscationEnabled,
-          })
-        }
-        labelCol={8}
-      />
-    </Grid.Row>
-    <Grid.Row>
-      <Switcher
-        id="obfuscate-ip"
-        label={__('Obfuscate IPs')}
-        tooltip={__('Obfuscate ipv4 addresses sent to the Red Hat cloud')}
-        isChecked={ipsObfuscationEnabled}
-        onChange={() =>
-          setSetting({
-            setting: settingsDict.ipsObfuscationEnabled.name,
-            value: !ipsObfuscationEnabled,
-          })
-        }
-        labelCol={8}
-      />
-    </Grid.Row>
-    <Grid.Row>
-      <Switcher
-        id="exclude-packages"
-        label={__('Exclude packages')}
-        tooltip={__(
-          'Exclude packages from being uploaded to the Red Hat cloud'
-        )}
-        isChecked={excludePackagesEnabled}
-        onChange={() =>
-          setSetting({
-            setting: settingsDict.excludePackagesEnabled.name,
-            value: !excludePackagesEnabled,
-          })
-        }
-        labelCol={8}
-      />
-    </Grid.Row>
-  </form>
-);
-
-AdvancedSettings.propTypes = {
-  setSetting: PropTypes.func.isRequired,
-  hostObfuscationEnabled: PropTypes.bool.isRequired,
-  ipsObfuscationEnabled: PropTypes.bool.isRequired,
-  excludePackagesEnabled: PropTypes.bool.isRequired,
-};
-
-export default AdvancedSettings;

data/webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/components/AdvancedSettings/index.js

@@ -1,23 +0,0 @@
-import { bindActionCreators } from 'redux';
-import { connect } from 'react-redux';
-import { setSetting } from '../../../../Components/InventorySettings/InventorySettingsActions';
-import AdvancedSettings from './AdvancedSettings';
-import {
-  selectExcludePackages,
-  selectHostObfuscationEnabled,
-  selectIpsObfuscationEnabled,
-} from '../../../../Components/InventorySettings/InventorySettingsSelectors';
-
-// map state to props
-const mapStateToProps = state => ({
-  hostObfuscationEnabled: selectHostObfuscationEnabled(state),
-  ipsObfuscationEnabled: selectIpsObfuscationEnabled(state),
-  excludePackagesEnabled: selectExcludePackages(state),
-});
-
-// map action dispatchers to props
-const mapDispatchToProps = dispatch =>
-  bindActionCreators({ setSetting }, dispatch);
-
-// export connected component
-export default connect(mapStateToProps, mapDispatchToProps)(AdvancedSettings);