foreman_rh_cloud 12.0.0 → 12.1.0

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

@@ -10,6 +10,8 @@ exports[`Dashboard rendering with props 1`] = `
         "name": "Generating",
         "onClick": [Function],
         "props": Object {
+          "downloadButtonDisabled": [Function],
+          "downloadReports": [Function],
           "exitCode": "unknown",
           "restartProcess": [Function],
           "toggleFullScreen": [Function],
@@ -21,7 +23,6 @@ exports[`Dashboard rendering with props 1`] = `
         "name": "Uploading",
         "onClick": [Function],
         "props": Object {
-          "downloadReports": [Function],
           "exitCode": "unknown",
           "toggleFullScreen": [Function],
         },

data/webpack/ForemanInventoryUpload/Components/InventorySettings/AdvancedSetting/AdvancedSettingsConstants.js

@@ -8,6 +8,27 @@ export const settingsDict = {
       'Enable automatic upload of your hosts inventory to the Red Hat cloud'
     ),
   },
+  allowAutoInsightsMismatchDelete: {
+    name: 'allow_auto_insights_mismatch_delete',
+    label: __('Automatic mismatch deletion'),
+    tooltip: __(
+      'Enable automatic deletion of mismatched host records from the Red Hat cloud'
+    ),
+  },
+};
+
+// we don't use this anywhere, but leaving the comment just so you can, like, see
+// export const parentSettingsDict = {
+//   insightsMinimalDataCollection: {
+//     name: 'insights_minimal_data_collection',
+//     label: __('Minimal data collection'),
+//     tooltip: __(
+//       'Only send the minimum required data to Red Hat cloud, and obfuscate wherever possible'
+//     ),
+//   },
+// };
+
+export const childSettingsDict = {
   hostObfuscationEnabled: {
     name: 'obfuscate_inventory_hostnames',
     label: __('Obfuscate host names'),
@@ -20,16 +41,14 @@ export const settingsDict = {
   },
   excludePackagesEnabled: {
     name: 'exclude_installed_packages',
-    label: __('Exclude installed Packages'),
+    label: __('Exclude installed packages'),
     tooltip: __(
       'Exclude installed packages from being uploaded to the Red Hat cloud'
     ),
   },
-  allowAutoInsightsMismatchDelete: {
-    name: 'allow_auto_insights_mismatch_delete',
-    label: __('Automatic mismatch deletion'),
-    tooltip: __(
-      'Enable automatic deletion of mismatched host records from the Red Hat cloud'
-    ),
-  },
+};
+
+export const allSettingsDict = {
+  ...settingsDict,
+  ...childSettingsDict,
 };

data/webpack/ForemanInventoryUpload/Components/InventorySettings/AdvancedSetting/index.js

@@ -4,9 +4,8 @@ import { useSelector, useDispatch } from 'react-redux';
 import { selectSettings } from '../InventorySettingsSelectors';
 import { handleToggle } from './AdvancedSettingActions';
 import SwitcherPF4 from '../../../../common/Switcher/SwitcherPF4';
-import { settingsDict } from './AdvancedSettingsConstants';
 
-const AdvancedSetting = ({ setting }) => {
+const AdvancedSetting = ({ setting, settingsDict, isLocked, lockedValue }) => {
   const settingValue = useSelector(store => selectSettings(store)[setting]);
   const dispatch = useDispatch();
   const onToggle = () =>
@@ -16,7 +15,8 @@ const AdvancedSetting = ({ setting }) => {
       id={settingsDict[setting].name}
       label={settingsDict[setting].label}
       tooltip={settingsDict[setting].tooltip}
-      isChecked={settingValue}
+      isChecked={isLocked ? lockedValue : settingValue}
+      isDisabled={isLocked}
       onChange={onToggle}
     />
   );
@@ -24,6 +24,14 @@ const AdvancedSetting = ({ setting }) => {
 
 AdvancedSetting.propTypes = {
   setting: PropTypes.string.isRequired,
+  settingsDict: PropTypes.shape({}).isRequired,
+  isLocked: PropTypes.bool,
+  lockedValue: PropTypes.bool,
+};
+
+AdvancedSetting.defaultProps = {
+  isLocked: false,
+  lockedValue: true,
 };
 
 export default AdvancedSetting;

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

@@ -1,18 +1,79 @@
-import React from 'react';
+import React, { useState } from 'react';
+import { useSelector } from 'react-redux';
 import { translate as __ } from 'foremanReact/common/I18n';
+import { Flex, FlexItem } from '@patternfly/react-core';
 
 import AdvancedSetting from './AdvancedSetting';
-import { settingsDict } from './AdvancedSetting/AdvancedSettingsConstants';
+import {
+  childSettingsDict,
+  settingsDict,
+} from './AdvancedSetting/AdvancedSettingsConstants';
+import {
+  selectSubscriptionConnectionEnabled,
+  selectInsightsMinimalDataCollection,
+} from './InventorySettingsSelectors'; // Make sure this path is correct!
+import MinimalInventoryDropdown from './MinimalInventoryDropdown';
 
 import './InventorySettings.scss';
 
-const InventorySettings = () => (
-  <div className="inventory-settings">
-    <h3>{__('Settings')}</h3>
-    {Object.keys(settingsDict).map(key => (
-      <AdvancedSetting setting={key} key={key} />
-    ))}
-  </div>
-);
+const InventorySettings = () => {
+  const subscriptionConnectionEnabled = useSelector(
+    state => selectSubscriptionConnectionEnabled(state) // Added (state) =>
+  );
+  const insightsMinimalDataCollection = useSelector(
+    state => selectInsightsMinimalDataCollection(state) // Added (state) =>
+  );
+  const [chosenValue, setChosenValue] = useState(null);
+  const settingKeys = new Set(Object.keys(settingsDict));
+
+  if (!subscriptionConnectionEnabled) {
+    settingKeys.delete('autoUploadEnabled');
+  }
+
+  return (
+    <div className="inventory-settings">
+      <h3>{__('Settings')}</h3>
+      {[...settingKeys].map(key => {
+        const isChildSetting = Object.hasOwnProperty.call(
+          childSettingsDict,
+          key
+        );
+        return (
+          <AdvancedSetting
+            key={key}
+            setting={key}
+            settingsDict={isChildSetting ? childSettingsDict : settingsDict}
+            isLocked={
+              isChildSetting &&
+              (chosenValue === 'minimal' || insightsMinimalDataCollection)
+            }
+          />
+        );
+      })}
+      <MinimalInventoryDropdown setChosenValue={setChosenValue} />
+      {Object.keys(childSettingsDict).length > 0 && ( // Only render this section if there are child settings
+        <div style={{ marginTop: '1.5em' }}>
+          <Flex>
+            <FlexItem>
+              <span style={{ width: '6em' }} />
+            </FlexItem>
+            <FlexItem>
+              {Object.keys(childSettingsDict).map(key => (
+                <AdvancedSetting
+                  key={key}
+                  setting={key}
+                  settingsDict={childSettingsDict}
+                  isLocked={
+                    chosenValue === 'minimal' || insightsMinimalDataCollection
+                  }
+                />
+              ))}
+            </FlexItem>
+          </Flex>
+        </div>
+      )}
+    </div>
+  );
+};
 
 export default InventorySettings;

data/webpack/ForemanInventoryUpload/Components/InventorySettings/InventorySettingsSelectors.js

@@ -1,12 +1,21 @@
-import { selectAPIResponse } from 'foremanReact/redux/API/APISelectors';
+import {
+  selectAPIResponse,
+  selectAPIStatus,
+} from 'foremanReact/redux/API/APISelectors';
 import { INVENTORY_SETTINGS } from './InventorySettingsConstants';
 
 export const selectSettings = state =>
   selectAPIResponse(state, INVENTORY_SETTINGS);
 
+export const selectSettingsStatus = state =>
+  selectAPIStatus(state, INVENTORY_SETTINGS);
+
 export const selectAutoUploadEnabled = state =>
   selectSettings(state).autoUploadEnabled;
 
+export const selectSubscriptionConnectionEnabled = state =>
+  selectSettings(state).subscriptionConnectionEnabled;
+
 export const selectHostObfuscationEnabled = state =>
   selectSettings(state).hostObfuscationEnabled;
 
@@ -18,3 +27,6 @@ export const selectExcludePackages = state =>
 
 export const selectMismatchDelete = state =>
   selectSettings(state).allowAutoInsightsMismatchDelete;
+
+export const selectInsightsMinimalDataCollection = state =>
+  selectSettings(state).insightsMinimalDataCollection;

data/webpack/ForemanInventoryUpload/Components/InventorySettings/MinimalInventoryDropdown.js

@@ -0,0 +1,107 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { useDispatch, useSelector } from 'react-redux';
+import { translate as __ } from 'foremanReact/common/I18n';
+import {
+  Dropdown,
+  DropdownItem,
+  DropdownList,
+  MenuToggle,
+} from '@patternfly/react-core';
+
+import { childSettingsDict } from './AdvancedSetting/AdvancedSettingsConstants';
+import { setSetting } from './InventorySettingsActions';
+
+import { selectInsightsMinimalDataCollection } from './InventorySettingsSelectors';
+
+const MinimalInventoryDropdown = ({ setChosenValue }) => {
+  const dispatch = useDispatch();
+  const [isOpen, setIsOpen] = useState(false);
+  const dropdownValues = {
+    minimal: {
+      title: __('Minimal data collection'),
+      description: __(
+        'Only send the minimum required data to Red Hat cloud, obfuscation settings are disabled'
+      ),
+    },
+    optional: {
+      title: __('Optional data collection'),
+      description: __(
+        'Send additional data to enhance Insights services, as per the settings'
+      ),
+    },
+  };
+  const valueToBoolean = {
+    minimal: true,
+    optional: false,
+  };
+  const currentSettingBoolean = useSelector(
+    selectInsightsMinimalDataCollection
+  );
+  const currentDropdownValue = currentSettingBoolean ? 'minimal' : 'optional';
+  const onToggleClick = () => {
+    setIsOpen(!isOpen);
+  };
+  const onSelect = (_event, value) => {
+    setIsOpen(false);
+    setChosenValue(value);
+
+    dispatch(
+      setSetting({
+        setting: 'insights_minimal_data_collection',
+        value: valueToBoolean[value],
+      })
+    );
+
+    if (value === 'minimal') {
+      // If user wants to move to minimal data collection, turn on all related settings.
+      // These will be overridden by insights_minimal_data_collection anyway, but this takes care of the visuals.
+      Object.values(childSettingsDict).forEach(setting => {
+        dispatch(
+          setSetting({
+            setting: setting.name,
+            value: true,
+          })
+        );
+      });
+    }
+  };
+  return (
+    <Dropdown
+      isOpen={isOpen}
+      onSelect={onSelect}
+      onOpenChange={val => setIsOpen(val)}
+      toggle={toggleRef => (
+        <MenuToggle
+          ref={toggleRef}
+          isFullWidth
+          onClick={onToggleClick}
+          isExpanded={isOpen}
+        >
+          {dropdownValues[currentDropdownValue].title}
+        </MenuToggle>
+      )}
+      shouldFocusToggleOnSelect
+    >
+      <div style={{ maxWidth: '28em' }}>
+        <DropdownList>
+          {Object.entries(dropdownValues).map(([value, item]) => (
+            <DropdownItem
+              value={value}
+              key={value}
+              description={item.description}
+            >
+              {item.title}
+            </DropdownItem>
+          ))}
+        </DropdownList>
+      </div>
+    </Dropdown>
+  );
+};
+
+MinimalInventoryDropdown.propTypes = {
+  setChosenValue: PropTypes.func.isRequired,
+};
+
+export default MinimalInventoryDropdown;

data/webpack/ForemanInventoryUpload/Components/NavContainer/NavContainer.fixtures.js

@@ -1,12 +1,19 @@
 import React from 'react';
 import { noop } from 'foremanReact/common/helpers';
+import { translate as __ } from 'foremanReact/common/I18n';
 
 export const props = {
   items: [
     {
       icon: 'some-icon',
-      name: 'some-name',
-      component: () => <p>test</p>,
+      name: __('Generating'),
+      component: () => <p>test1</p>,
+      onClick: noop,
+    },
+    {
+      icon: 'other-icon',
+      name: __('Uploading'),
+      component: () => <p>test2</p>,
       onClick: noop,
     },
   ],

data/webpack/ForemanInventoryUpload/Components/NavContainer/NavContainer.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 import {
   TabContainer,
@@ -9,8 +10,10 @@ import {
   Icon,
   noop,
 } from 'patternfly-react';
+import { translate as __ } from 'foremanReact/common/I18n';
 import './navContainer.scss';
 import FullScreenModal from '../FullScreenModal';
+import { selectSubscriptionConnectionEnabled } from '../InventorySettings/InventorySettingsSelectors';
 
 const NavContainer = ({
   items,
@@ -18,8 +21,13 @@ const NavContainer = ({
   toggleFullScreen,
   terminalProps,
 }) => {
+  const subscriptionConnectionEnabled = useSelector(
+    selectSubscriptionConnectionEnabled
+  );
   const navItems = items.map((item, index) => {
     const { name, icon, onClick } = item;
+    if (name === __('Uploading') && !subscriptionConnectionEnabled) return null;
+
     return (
       <NavItem
         key={index}

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

@@ -1,25 +1,69 @@
 import React from 'react';
-import { mount, testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import { Provider } from 'react-redux';
+import configureMockStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import { screen, render } from '@testing-library/react';
+import { mount } from '@theforeman/test';
 import NavContainer from '../NavContainer';
 import { props } from '../NavContainer.fixtures';
 
-const fixtures = {
-  'render without Props': {},
-  'render with Props': props,
-};
+const middlewares = [thunk];
+const mockStore = configureMockStore(middlewares);
 
 describe('NavContainer', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(NavContainer, fixtures));
+  const renderOptions = {
+    API: {
+      INVENTORY_SETTINGS: {
+        response: { subscriptionConnectionEnabled: false },
+      },
+    },
+  };
 
-  it('click should call onTabClick prop', () => {
+  test('click should call onTabClick prop', () => {
     const onTabClick = jest.fn();
     const modifiedProps = {
       ...props,
     };
     modifiedProps.items[0].onClick = onTabClick;
-    const wrapper = mount(<NavContainer {...modifiedProps} />);
+    const store = mockStore(renderOptions);
+
+    const wrapper = mount(
+      <Provider store={store}>
+        <NavContainer {...modifiedProps} />
+      </Provider>
+    );
     wrapper.find('NavItem a').simulate('click');
     expect(onTabClick).toBeCalled();
   });
+
+  test('when subscription connection is enabled', () => {
+    const options = {
+      API: {
+        INVENTORY_SETTINGS: {
+          response: { subscriptionConnectionEnabled: true },
+        },
+      },
+    };
+    const store = mockStore(options);
+    render(
+      <Provider store={store}>
+        <NavContainer {...props} />
+      </Provider>
+    );
+
+    expect(screen.queryAllByText('Generating')).toHaveLength(1);
+    expect(screen.queryAllByText('Uploading')).toHaveLength(1);
+  });
+
+  test('when subscription connection is not enabled', () => {
+    const store = mockStore(renderOptions);
+    render(
+      <Provider store={store}>
+        <NavContainer {...props} />
+      </Provider>
+    );
+
+    expect(screen.queryAllByText('Generating')).toHaveLength(1);
+    expect(screen.queryAllByText('Uploading')).toHaveLength(0);
+  });
 });

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/PageDescription.js

@@ -1,68 +1,82 @@
 import React from 'react';
 import { Text } from '@patternfly/react-core';
+import { useSelector } from 'react-redux';
 
 import { translate as __ } from 'foremanReact/common/I18n';
 import { FormattedMessage } from 'react-intl';
+import { selectSubscriptionConnectionEnabled } from '../../../InventorySettings/InventorySettingsSelectors';
 
-export const PageDescription = () => (
-  <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
-        id="enable-upload-hint"
-        defaultMessage={__(
-          'To enable this reporting for all Foreman organizations, set {uploadButtonName} to on. The data will be reported automatically once per day.'
+export const PageDescription = () => {
+  const subscriptionConnectionEnabled = useSelector(
+    selectSubscriptionConnectionEnabled
+  );
+
+  return (
+    <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.'
         )}
-        values={{
-          uploadButtonName: <strong>{__('Automatic inventory upload')}</strong>,
-        }}
-      />
-    </Text>
-    <Text>
-      <FormattedMessage
-        id="restart-button-hint"
-        defaultMessage={__(
-          'To manually upload the data for a specific organization, select an organization and click {restartButtonName}.'
+      </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.'
         )}
-        values={{
-          restartButtonName: (
-            <strong>{__('Generate and upload report')}</strong>
-          ),
-        }}
-      />
-    </Text>
-    <Text>
-      {__('For more information about the Subscriptions service, see:')}
-      &nbsp;
-      <a
-        href="https://docs.redhat.com/en/documentation/subscription_central/1-latest/html/getting_started_with_the_subscriptions_service/index"
-        target="_blank"
-        rel="noopener noreferrer"
-      >
-        {__('About subscription watch')}
-      </a>
-    </Text>
-    <Text>
-      {__('For more information about Insights and Cloud Connector, see:')}
-      &nbsp;
-      <a
-        href="https://console.redhat.com/security/insights/"
-        target="_blank"
-        rel="noopener noreferrer"
-      >
-        {__('Red Hat Insights Data and Application Security')}
-      </a>
-    </Text>
-  </div>
-);
+      </Text>
+      {subscriptionConnectionEnabled && (
+        <Text>
+          <FormattedMessage
+            id="enable-upload-hint"
+            defaultMessage={__(
+              'To enable this reporting for all Foreman organizations, set {uploadButtonName} to on. The data will be reported automatically once per day.'
+            )}
+            values={{
+              uploadButtonName: (
+                <strong>{__('Automatic inventory upload')}</strong>
+              ),
+            }}
+          />
+        </Text>
+      )}
+      {subscriptionConnectionEnabled && (
+        <Text>
+          <FormattedMessage
+            id="restart-button-hint"
+            defaultMessage={__(
+              'To manually upload the data for a specific organization, select an organization and click {restartButtonName}.'
+            )}
+            values={{
+              restartButtonName: (
+                <strong>{__('Generate and upload report')}</strong>
+              ),
+            }}
+          />
+        </Text>
+      )}
+      <Text>
+        {__('For more information about the Subscriptions service, see:')}
+        &nbsp;
+        <a
+          href="https://docs.redhat.com/en/documentation/subscription_central/1-latest/html/getting_started_with_the_subscriptions_service/index"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          {__('About subscription watch')}
+        </a>
+      </Text>
+      <Text>
+        {__('For more information about Insights and Cloud Connector, see:')}
+        &nbsp;
+        <a
+          href="https://console.redhat.com/security/insights/"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          {__('Red Hat Insights Data and Application Security')}
+        </a>
+      </Text>
+    </div>
+  );
+};
 
 export default PageDescription;

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

@@ -1,11 +1,66 @@
-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 { PageDescription } from '../PageDescription';
 
-const fixtures = {
-  'render without Props': {},
-};
+jest.mock('react-intl', () => {
+  const actualReactIntl = jest.requireActual('react-intl');
+  return {
+    ...actualReactIntl,
+    FormattedMessage: ({ defaultMessage, id }) => defaultMessage || id,
+    useIntl: () => ({
+      formatMessage: ({ defaultMessage, id }) => defaultMessage || id,
+    }),
+  };
+});
+const middlewares = [thunk];
+const mockStore = configureMockStore(middlewares);
 
 describe('PageDescription', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(PageDescription, fixtures));
+  test('when subscription connection is enabled', () => {
+    const renderOptions = {
+      API: {
+        INVENTORY_SETTINGS: {
+          response: { subscriptionConnectionEnabled: true },
+        },
+      },
+    };
+    const store = mockStore(renderOptions);
+
+    render(
+      <Provider store={store}>
+        <PageDescription />
+      </Provider>
+    );
+    expect(
+      screen.queryAllByText(
+        /To enable this reporting for all Foreman organizations/
+      )
+    ).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}>
+        <PageDescription />
+      </Provider>
+    );
+
+    expect(
+      screen.queryAllByText(
+        /To enable this reporting for all Foreman organizations/
+      )
+    ).toHaveLength(0);
+  });
 });