foreman_rh_cloud 12.0.0 → 12.1.1

data/test/unit/slice_generator_test.rb

@@ -35,6 +35,12 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
   end
 
+  def create_fact_values(host, facts)
+    facts.each do |fact_name, value|
+      FactoryBot.create(:fact_value, fact_name: fact_names[fact_name], value: value, host: host)
+    end
+  end
+
   def interesting_facts
     [
       'dmi::system::uuid',
@@ -52,6 +58,8 @@ class SliceGeneratorTest < ActiveSupport::TestCase
       'distribution::version',
       'distribution::id',
       'virt::is_guest',
+      'hypervisor::type',
+      'hypervisor::version',
       'dmi::system::manufacturer',
       'dmi::system::product_name',
       'dmi::chassis::asset_tag',
@@ -98,10 +106,210 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_equal 'test_nic1', actual_nic['name']
   end
 
+  test 'generates a report with minimal data collection' do
+    Setting[:insights_minimal_data_collection] = true
+    create_fact_values(@host,
+      'dmi::system::uuid' => 'D30B0B42-7824-2635-C62D-491394DE43F7',
+      'dmi::bios::vendor' => 'SeaBios',
+      'dmi::bios::version' => '10',
+      'cpu::cpu_socket(s)' => '2',
+      'cpu::cpu(s)' => '4',
+      'cpu::core(s)_per_socket' => '1',
+      'memory::memtotal' => '1024',
+      'insights_id' => '00000000-0073-0400-0000-000000000000')
+
+    batch = Host.where(id: @host.id).in_batches.first
+    generator = create_generator(batch)
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_equal 1, generator.hosts_count
+    assert_equal '1234', actual_host['account']
+    assert_not_nil(actual_system_profile = actual_host['system_profile'])
+    assert_not_nil actual_host['subscription_manager_id']
+    assert_equal 'D30B0B42-7824-2635-C62D-491394DE43F7', actual_host['bios_uuid']
+    assert_equal '00000000-0073-0400-0000-000000000000', actual_host['insights_id']
+    assert_equal 4, actual_system_profile['number_of_cpus']
+    assert_equal 2, actual_system_profile['number_of_sockets']
+    assert_equal 1_048_576, actual_system_profile['system_memory_bytes']
+    assert_equal 1, actual_system_profile['cores_per_socket']
+    assert_equal 'SeaBios', actual_host['bios_vendor']
+    assert_equal '10', actual_host['bios_version']
+    assert_equal '2', actual_host['cpu_socket(s)']
+    # Assert exclusion of non-minimal data collection fact
+    assert_nil actual_host['ip_addresses']
+    assert_nil actual_host['mac_addresses']
+    assert_nil actual_host['fqdn']
+  end
+
+  test 'generates a report with minimal data collection for a hypervisor' do
+    Setting[:insights_minimal_data_collection] = true
+    create_fact_values(@host,
+      'dmi::system::uuid' => 'D30B0B42-7824-2635-C62D-491394DE43F7',
+      'hypervisor::type' => 'VMware',
+      'hypervisor::version' => '6.7',
+      'cpu::cpu_socket(s)' => '2',
+      'cpu::cpu(s)' => '4',
+      'cpu::core(s)_per_socket' => '1',
+      'memory::memtotal' => '1024')
+
+    @host.subscription_facet.hypervisor = true
+    @host.subscription_facet.save!
+
+    batch = Host.where(id: @host.id).in_batches.first
+    generator = create_generator(batch)
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_not_nil(actual_system_profile = actual_host['system_profile'])
+    assert_equal 'D30B0B42-7824-2635-C62D-491394DE43F7', actual_host['bios_uuid']
+    assert_equal 'VMware', actual_host['hypervisor_type']
+    assert_equal '6.7', actual_host['hypervisor_version']
+    assert_equal '2', actual_host['cpu_socket(s)']
+    assert_equal 4, actual_system_profile['number_of_cpus']
+    assert_equal 2, actual_system_profile['number_of_sockets']
+    assert_equal 1_048_576, actual_system_profile['system_memory_bytes']
+    assert_equal 1, actual_system_profile['cores_per_socket']
+    assert_equal 1, generator.hosts_count
+    # Assert exclusion of non-minimal data collection facts
+    assert_nil actual_host['ip_addresses']
+    assert_nil actual_host['mac_addresses']
+    assert_nil actual_host['fqdn']
+    assert true, @host.subscription_facet.hypervisor?
+  end
+
+  test 'packages are excluded in the report with minimal data collection' do
+    Setting[:exclude_installed_packages] = false
+    Setting[:insights_minimal_data_collection] = true
+
+    installed_package = ::Katello::InstalledPackage.create(name: 'test-package', nvrea: 'test-package-1.0.x86_64', nvra: 'test-package-1.0.x86_64')
+    another_host = FactoryBot.create(
+      :host,
+      :with_subscription,
+      :with_content,
+      content_view: @host.content_views.first,
+      lifecycle_environment: @host.lifecycle_environments.first,
+      organization: @host.organization,
+      installed_packages: [installed_package]
+    )
+    create_fact_values(another_host,
+      'dmi::system::uuid' => 'D30B0B42-7824-2635-C62D-491394DE43F7',
+      'dmi::bios::vendor' => 'SeaBios',
+      'dmi::bios::version' => '10',
+      'cpu::cpu_socket(s)' => '2',
+      'cpu::cpu(s)' => '4',
+      'cpu::core(s)_per_socket' => '1',
+      'memory::memtotal' => '1024')
+
+    batch = Host.where(id: another_host.id).in_batches.first
+    generator = create_generator(batch)
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_not_nil(actual_host['system_profile'])
+    assert_not_nil(actual_system_profile = actual_host['system_profile'])
+    assert_not_nil actual_host['subscription_manager_id']
+    assert_equal 'D30B0B42-7824-2635-C62D-491394DE43F7', actual_host['bios_uuid']
+    assert_equal 4, actual_system_profile['number_of_cpus']
+    assert_equal 2, actual_system_profile['number_of_sockets']
+    assert_equal 1_048_576, actual_system_profile['system_memory_bytes']
+    assert_equal 1, actual_system_profile['cores_per_socket']
+    assert_equal 'SeaBios', actual_host['bios_vendor']
+    assert_equal '10', actual_host['bios_version']
+    assert_equal '2', actual_host['cpu_socket(s)']
+    assert_nil actual_host['installed_packages']
+  end
+
+  test 'generates a report with minimal data collection with ip setting overridden' do
+    Setting[:insights_minimal_data_collection] = true
+    Setting[:obfuscate_inventory_ips] = false
+    create_fact_values(@host,
+      'dmi::system::uuid' => 'D30B0B42-7824-2635-C62D-491394DE43F7',
+      'dmi::bios::vendor' => 'SeaBios',
+      'dmi::bios::version' => '10',
+      'cpu::cpu_socket(s)' => '2',
+      'cpu::cpu(s)' => '4',
+      'cpu::core(s)_per_socket' => '1',
+      'memory::memtotal' => '1024')
+
+    batch = Host.where(id: @host.id).in_batches.first
+    generator = create_generator(batch)
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_equal 1, generator.hosts_count
+    assert_not_nil(actual_host['system_profile'])
+    assert_not_nil(actual_system_profile = actual_host['system_profile'])
+    assert_not_nil actual_host['subscription_manager_id']
+    assert_equal 'D30B0B42-7824-2635-C62D-491394DE43F7', actual_host['bios_uuid']
+    assert_equal 4, actual_system_profile['number_of_cpus']
+    assert_equal 2, actual_system_profile['number_of_sockets']
+    assert_equal 1_048_576, actual_system_profile['system_memory_bytes']
+    assert_equal 1, actual_system_profile['cores_per_socket']
+    assert_equal 'SeaBios', actual_host['bios_vendor']
+    assert_equal '10', actual_host['bios_version']
+    assert_equal '2', actual_host['cpu_socket(s)']
+    # Assert exclusion of non-minimal data collection fact
+    assert_nil actual_host['ip_addresses']
+    assert_nil actual_host['mac_addresses']
+    assert_nil actual_host['fqdn']
+  end
+
+  test 'generates a report with minimal data collection with fqdn setting overridden' do
+    Setting[:insights_minimal_data_collection] = true
+    Setting[:obfuscate_inventory_hostnames] = false
+    create_fact_values(@host,
+      'dmi::system::uuid' => 'D30B0B42-7824-2635-C62D-491394DE43F7',
+      'dmi::bios::vendor' => 'SeaBios',
+      'dmi::bios::version' => '10',
+      'cpu::cpu_socket(s)' => '2',
+      'cpu::cpu(s)' => '4',
+      'cpu::core(s)_per_socket' => '1',
+      'memory::memtotal' => '1024')
+
+    batch = Host.where(id: @host.id).in_batches.first
+    generator = create_generator(batch)
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_not_nil(actual_host['system_profile'])
+    assert_not_nil(actual_system_profile = actual_host['system_profile'])
+    assert_not_nil actual_host['subscription_manager_id']
+    assert_equal 'D30B0B42-7824-2635-C62D-491394DE43F7', actual_host['bios_uuid']
+    assert_equal 4, actual_system_profile['number_of_cpus']
+    assert_equal 2, actual_system_profile['number_of_sockets']
+    assert_equal 1_048_576, actual_system_profile['system_memory_bytes']
+    assert_equal 1, actual_system_profile['cores_per_socket']
+    assert_equal 'SeaBios', actual_host['bios_vendor']
+    assert_equal '10', actual_host['bios_version']
+    assert_equal '2', actual_host['cpu_socket(s)']
+    # Assert exclusion of non-minimal data collection fact
+    assert_nil actual_host['ip_addresses']
+    assert_nil actual_host['mac_addresses']
+    assert_nil actual_host['fqdn']
+    assert_equal 1, generator.hosts_count
+  end
+
   test 'hosts report fields should be present if fact exist' do
-    FactoryBot.create(:fact_value, fact_name: fact_names['cpu::cpu(s)'], value: '4', host: @host)
-    FactoryBot.create(:fact_value, fact_name: fact_names['cpu::cpu_socket(s)'], value: '2', host: @host)
-    FactoryBot.create(:fact_value, fact_name: fact_names['cpu::core(s)_per_socket'], value: '1', host: @host)
+    create_fact_values(@host,
+      'cpu::cpu(s)' => '4',
+      'cpu::cpu_socket(s)' => '2',
+      'cpu::core(s)_per_socket' => '1')
 
     batch = Host.where(id: @host.id).in_batches.first
     generator = create_generator(batch)
@@ -704,7 +912,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
   end
 
   test 'passes valid bios_uuid field' do
-    FactoryBot.create(:fact_value, fact_name: fact_names['dmi::system::uuid'], value: 'D30B0B42-7824-2635-C62D-491394DE43F7', host: @host)
+    create_fact_values(@host, 'dmi::system::uuid' => 'D30B0B42-7824-2635-C62D-491394DE43F7')
 
     batch = Host.where(id: @host.id).in_batches.first
     generator = create_generator(batch)

data/webpack/ForemanInventoryUpload/Components/Dashboard/Dashboard.js

@@ -49,6 +49,7 @@ class Dashboard extends React.Component {
       showFullScreen,
       activeTab,
     } = this.props;
+    const downloadButtonDisabled = () => account.report_file_paths.length === 0;
     return (
       <NavContainer
         items={[
@@ -60,6 +61,8 @@ class Dashboard extends React.Component {
               ...generating,
               restartProcess: this.handleRestart,
               exitCode: account.generate_report_status,
+              downloadReports: this.handleDownload,
+              downloadButtonDisabled,
               toggleFullScreen: this.handleToggleFullScreen,
             },
             onClick: () => this.handleTabChange('generating'),
@@ -70,7 +73,6 @@ class Dashboard extends React.Component {
             component: ReportUpload,
             props: {
               ...uploading,
-              downloadReports: this.handleDownload,
               exitCode: account.upload_report_status,
               toggleFullScreen: this.handleToggleFullScreen,
             },
@@ -117,6 +119,7 @@ Dashboard.propTypes = {
   account: PropTypes.shape({
     generate_report_status: PropTypes.string,
     upload_report_status: PropTypes.string,
+    report_file_paths: PropTypes.arrayOf(PropTypes.string),
   }),
   showFullScreen: PropTypes.bool,
   toggleFullScreen: PropTypes.func,
@@ -136,6 +139,7 @@ Dashboard.defaultProps = {
   account: {
     generate_report_status: 'unknown',
     upload_report_status: 'unknown',
+    report_file_paths: [],
   },
   showFullScreen: false,
   toggleFullScreen: noop,

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}