foreman_rh_cloud 14.2.0 → 14.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91157d5050744236651134413110454e4d595e1e25644eb1676d58e4990476d1
-  data.tar.gz: acb8689d93c1d2aedf280049ff18075ad7989693ef75fea5a8b1babef63b447c
+  metadata.gz: 1c2ad7078753ff687e7dfa1cf410efbfbc3f1ad9b8dc74500f9e77bf0c9a7fc9
+  data.tar.gz: 9eb2679eb38c91fa3c1163915328d91959f7e6408e73bd4fc0c4d7fe98b9a0cf
 SHA512:
-  metadata.gz: 5f2378f058fde9220f4fa8ca17a094dfe6e32f3f33456304c0178ca3b5023abf8b6bfd09fdcbff064e914e063c4fc6a9b66536d6703e259a4f28569202c37813
-  data.tar.gz: 1d0adbd1839a3e73eada13ca910522407af5a66e838934ad327f8c36cb41058f5693c7d5d646caa3b7b1fba71670e184f24df1ee90b122d4fdd7f05338a845de
+  metadata.gz: 0e4cb92c3a41b257ebf018a988ced92b086aa5cec373214888bb22a3dc43f765a007f42182b1da6a058c97b8633d59e1239efef658c3e0d53744bb9b8fc41125
+  data.tar.gz: 780195de89dcac76c3774a8b48ae67c7c52ad8b2b4f1029020e1c1e42ec701092f2122ff4caec64de083cf01094ebac40b42cf1d0985d06fdbbc46838331d541

data/app/models/concerns/rh_cloud_host.rb

@@ -10,7 +10,8 @@ module RhCloudHost
     )
 
     has_many :insights_hits, through: :insights, source: :hits
-    scoped_search :relation => :insights, :on => :hits_count, :only_explicit => true, :rename => :insights_recommendations_count
+    scoped_search :on => :id, :rename => :insights_recommendations_count, :only_explicit => true,
+      :ext_method => :search_by_insights_recommendations_count, :complete_value => false
 
     has_one :insights_client_report_status_object, :class_name => '::InsightsClientReportStatus', :foreign_key => 'host_id'
     scoped_search :relation => :insights_client_report_status_object, :on => :status, :rename => :insights_client_report_status,
@@ -46,6 +47,40 @@ module RhCloudHost
   end
 
   module ClassMethods
+    def search_by_insights_recommendations_count(_key, operator, value)
+      if ForemanRhCloud.with_iop_smart_proxy?
+        raise ScopedSearch::QueryNotSupported.new(
+          _('Searching by recommendations count is not available in IoP mode.')
+        )
+      end
+
+      unless ScopedSearch::QueryBuilder::SQL_OPERATORS.value?(operator)
+        raise ScopedSearch::QueryNotSupported.new(
+          _('Unsupported operator for recommendations count search: %s') % operator
+        )
+      end
+
+      facet_table = InsightsFacet.table_name
+      hits_count_col = "COALESCE(#{facet_table}.hits_count, 0)"
+
+      if ['IN', 'NOT IN'].include?(operator)
+        values = value.is_a?(Array) ? value : value.to_s.split(',').map(&:strip)
+        placeholders = (['?'] * values.size).join(',')
+        condition = sanitize_sql_for_conditions(
+          ["#{hits_count_col} #{operator} (#{placeholders})", *values]
+        )
+      else
+        condition = sanitize_sql_for_conditions(
+          ["#{hits_count_col} #{operator} ?", value_to_sql(operator, value)]
+        )
+      end
+
+      {
+        joins: "LEFT JOIN #{facet_table} ON #{facet_table}.host_id = #{Host::Managed.table_name}.id",
+        conditions: condition,
+      }
+    end
+
     def search_by_insights_uuid(_key, operator, value)
       # Determine which facet table to search based on IoP mode
       facet_table = ForemanRhCloud.with_iop_smart_proxy? ? Katello::Host::SubscriptionFacet.table_name : InsightsFacet.table_name

data/config/routes.rb

@@ -33,6 +33,7 @@ Rails.application.routes.draw do
   namespace :foreman_rh_cloud do
     get 'inventory_upload', to: 'foreman_rh_cloud#inventory_upload'
     get 'recommendations', to: 'foreman_rh_cloud#recommendations'
+    get 'recommendations/pathways/:slug', to: 'foreman_rh_cloud#recommendations'
     get 'recommendations/:rule_id', to: 'foreman_rh_cloud#recommendations'
     get 'insights_cloud', to: '/react#index' # Uses foreman's react controller
     get 'insights_vulnerability', to: '/react#index'

data/lib/foreman_inventory_upload/async/upload_report_direct_job.rb

@@ -59,11 +59,13 @@ module ForemanInventoryUpload
       def try_execute
         if content_disconnected?
           logger.info("Upload canceled: connection to Insights is not enabled. Report location: #{filename}")
+          done!
           return
         end
 
         unless organization.owner_details&.dig('upstreamConsumer', 'idCert')
           logger.info("Skipping organization '#{organization}', no candlepin certificate defined.")
+          done!
           return
         end
 

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '14.2.0'.freeze
+  VERSION = '14.3.0'.freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "14.2.0",
+  "version": "14.3.0",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {

data/test/jobs/upload_report_direct_job_test.rb

@@ -401,4 +401,33 @@ class UploadReportDirectJobTest < ActiveSupport::TestCase
       file.close
     end
   end
+
+  test 'mark as done when upload aborted due to missing certificate' do
+    # Remove certificate from organization
+    Organization.any_instance.stubs(:owner_details).returns({})
+
+    action = create_action(ForemanInventoryUpload::Async::UploadReportDirectJob)
+    action.expects(:action_subject).with(@organization)
+    plan_action(action, nil, @organization.id)
+
+    # Execute the action
+    action.send(:try_execute)
+
+    # Verify it is marked as done
+    assert action.done?
+  end
+
+  test 'mark as done when upload aborted due to disconnected mode' do
+    Setting.stubs(:[]).with(:subscription_connection_enabled).returns(false)
+
+    action = create_action(ForemanInventoryUpload::Async::UploadReportDirectJob)
+    action.expects(:action_subject).with(@organization)
+    plan_action(action, nil, @organization.id)
+
+    # Execute the action
+    action.send(:try_execute)
+
+    # Verify it is marked as done
+    assert action.done?
+  end
 end

data/test/unit/insights_facet_test.rb

@@ -6,6 +6,10 @@ class InsightsFacetTest < ActiveSupport::TestCase
     InsightsFacet.reset_counters(@host.insights.id, :hits_count)
   end
 
+  teardown do
+    ForemanRhCloud.unstub(:with_iop_smart_proxy?)
+  end
+
   test 'host with hits can be deleted' do
     assert_equal 1, @host.insights.hits.count
 
@@ -16,6 +20,7 @@ class InsightsFacetTest < ActiveSupport::TestCase
   end
 
   test 'search host by recommendations_count' do
+    ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
     FactoryBot.create(:host) # create another host with no recommendations
 
     assert_equal 1, Host.search_for('insights_recommendations_count = 1').count

data/test/unit/rh_cloud_host_test.rb

@@ -343,6 +343,74 @@ class RhCloudHostTest < ActiveSupport::TestCase
     end
   end
 
+  context 'scoped search on insights_recommendations_count' do
+    setup do
+      @org = FactoryBot.create(:organization)
+    end
+
+    teardown do
+      ForemanRhCloud.unstub(:with_iop_smart_proxy?)
+    end
+
+    test 'searches insights_facets.hits_count in non-IoP mode' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
+      host_with_hits = FactoryBot.create(:host, :with_insights_hits, organization: @org)
+      InsightsFacet.reset_counters(host_with_hits.insights.id, :hits_count)
+      host_without_hits = FactoryBot.create(:host, :managed, organization: @org)
+
+      results = Host::Managed.search_for('insights_recommendations_count = 1')
+
+      assert_includes results, host_with_hits
+      assert_not_includes results, host_without_hits
+    end
+
+    test 'supports greater-than operator in non-IoP mode' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
+      host_with_hits = FactoryBot.create(:host, :with_insights_hits, organization: @org)
+      InsightsFacet.reset_counters(host_with_hits.insights.id, :hits_count)
+      host_without_hits = FactoryBot.create(:host, :managed, organization: @org)
+
+      results = Host::Managed.search_for('insights_recommendations_count > 0')
+
+      assert_includes results, host_with_hits
+      assert_not_includes results, host_without_hits
+    end
+
+    test 'raises QueryNotSupported in IoP mode' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+
+      error = assert_raises(ScopedSearch::QueryNotSupported) do
+        Host::Managed.search_for('insights_recommendations_count = 1')
+      end
+
+      assert_match(/not available in IoP mode/, error.message)
+    end
+
+    test 'supports IN operator in non-IoP mode' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
+      host_with_hits = FactoryBot.create(:host, :with_insights_hits, organization: @org)
+      InsightsFacet.reset_counters(host_with_hits.insights.id, :hits_count)
+      host_without_hits = FactoryBot.create(:host, :managed, organization: @org)
+
+      results = Host::Managed.search_for('insights_recommendations_count ^ (1,2,3)')
+
+      assert_includes results, host_with_hits
+      assert_not_includes results, host_without_hits
+    end
+
+    test 'handles hosts without insights facets in non-IoP mode' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
+      host_without_facet = FactoryBot.create(:host, :managed, organization: @org)
+      host_with_facet = FactoryBot.create(:host, :with_insights_hits, organization: @org)
+      InsightsFacet.reset_counters(host_with_facet.insights.id, :hits_count)
+
+      results = Host::Managed.search_for('insights_recommendations_count = 1')
+
+      assert_includes results, host_with_facet
+      assert_not_includes results, host_without_facet
+    end
+  end
+
   test 'scoped search for user_omitted inventory status works' do
     host1 = FactoryBot.create(:host, :managed)
     host2 = FactoryBot.create(:host, :managed)

data/webpack/ForemanInventoryUpload/Components/AccountList/AccountList.js

@@ -8,6 +8,7 @@ import EmptyState from './Components/EmptyState';
 import ErrorState from './Components/ErrorState';
 import EmptyResults from './Components/EmptyResults';
 import { filterAccounts } from './AccountListHelper';
+import { ACCOUNT_STATUS_POLLING_INTERVAL_MS } from './AccountListConstants';
 import './accountList.scss';
 
 const AccountList = ({
@@ -21,7 +22,10 @@ const AccountList = ({
 }) => {
   useEffect(() => {
     fetchAccountsStatus();
-    const pollingID = setInterval(fetchAccountsStatus, 2000);
+    const pollingID = setInterval(
+      fetchAccountsStatus,
+      ACCOUNT_STATUS_POLLING_INTERVAL_MS
+    );
     startAccountStatusPolling(pollingID);
 
     return () => {

data/webpack/ForemanInventoryUpload/Components/AccountList/AccountListConstants.js

@@ -7,3 +7,8 @@ export const INVENTORY_ACCOUNT_STATUS_POLLING_START =
 export const INVENTORY_ACCOUNT_STATUS_POLLING_STOP =
   'INVENTORY_ACCOUNT_STATUS_POLLING_STOP';
 export const INVENTORY_PROCESS_RESTART = 'INVENTORY_PROCESS_RESTART';
+
+// How often to re-fetch account statuses while generation/upload is in
+// progress. Frequent enough to reflect status changes promptly, without
+// hammering the status endpoint.
+export const ACCOUNT_STATUS_POLLING_INTERVAL_MS = 2000;

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/EmptyResults/EmptyResults.js

@@ -1,14 +1,23 @@
 import React from 'react';
-import { EmptyState, Icon } from 'patternfly-react';
+import {
+  EmptyState,
+  EmptyStateHeader,
+  EmptyStateIcon,
+  EmptyStateVariant,
+} from '@patternfly/react-core';
+import { OutlinedMehIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
 import './emptyResults.scss';
 
 const inventoryEmptyResults = () => (
-  <EmptyState>
-    <EmptyState.Title>
-      <Icon className="no_results_icon" name="meh-o" />
-      {__("Oops! Couldn't find organization that matches your query")}
-    </EmptyState.Title>
+  <EmptyState variant={EmptyStateVariant.lg}>
+    <EmptyStateIcon icon={OutlinedMehIcon} />
+    <EmptyStateHeader
+      titleText={
+        <>{__("Oops! Couldn't find organization that matches your query")}</>
+      }
+      headingLevel="h2"
+    />
   </EmptyState>
 );
 

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/EmptyResults/emptyResults.scss

@@ -1,9 +1,5 @@
 .rh-cloud-inventory-page {
-  .blank-slate-pf {
+  .pf-v5-c-empty-state {
     margin-top: 100px;
-
-    .no_results_icon {
-      margin-right: 5px;
-    }
   }
 }

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/EmptyState/EmptyState.js

@@ -1,15 +1,23 @@
 import React from 'react';
-import { EmptyState, Spinner } from 'patternfly-react';
+import {
+  EmptyState,
+  EmptyStateHeader,
+  EmptyStateIcon,
+  EmptyStateBody,
+  EmptyStateVariant,
+  Spinner,
+} from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import './emptyState.scss';
 
 const inventoryEmptyState = () => (
-  <EmptyState>
-    <Spinner loading inline size="lg" />
-    <EmptyState.Title>
-      {__('Fetching data about your accounts')}
-    </EmptyState.Title>
-    <EmptyState.Info>{__('Loading...')}</EmptyState.Info>
+  <EmptyState variant={EmptyStateVariant.lg}>
+    <EmptyStateIcon icon={Spinner} />
+    <EmptyStateHeader
+      titleText={<>{__('Fetching data about your accounts')}</>}
+      headingLevel="h2"
+    />
+    <EmptyStateBody>{__('Loading...')}</EmptyStateBody>
   </EmptyState>
 );
 

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/EmptyState/__tests__/EmptyState.test.js

@@ -5,9 +5,7 @@ import EmptyState from '../EmptyState';
 describe('EmptyState', () => {
   it('renders fetching data message', () => {
     render(<EmptyState />);
-    expect(
-      screen.getByText('Fetching data about your accounts')
-    ).toBeTruthy();
+    expect(screen.getByText('Fetching data about your accounts')).toBeTruthy();
   });
 
   it('renders loading indicator', () => {

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/EmptyState/emptyState.scss

@@ -1,9 +1,5 @@
 .rh-cloud-inventory-page {
-  .blank-slate-pf {
+  .pf-v5-c-empty-state {
     margin-top: 100px;
-
-    .spinner {
-      float: none;
-    }
   }
 }

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/ErrorState/ErrorState.js

@@ -1,12 +1,12 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Icon } from 'patternfly-react';
+import { TimesIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
 import './errorState.scss';
 
 const ErrorState = ({ error }) => (
   <div className="error_state">
-    <Icon className="error_icon" name="times" size="2x" />
+    <TimesIcon className="error_icon" size="xl" />
     <p>{__('Encountered an error while trying to access the server:')}</p>
     <p className="error_description">{error}</p>
   </div>

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/ListItem/__tests__/ListItem.test.js

@@ -32,5 +32,4 @@ describe('ListItem', () => {
     expect(screen.getByText('Generated')).toBeTruthy();
     expect(screen.getByText('Uploaded')).toBeTruthy();
   });
-
 });

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

@@ -3,9 +3,7 @@ import { render, screen } from '@testing-library/react';
 import AccountList from '../AccountList';
 import { accounts } from '../AccountList.fixtures';
 
-jest.mock('../Components/ListItem', () => ({ label }) => (
-  <div>{label}</div>
-));
+jest.mock('../Components/ListItem', () => ({ label }) => <div>{label}</div>);
 
 describe('AccountList', () => {
   it('renders account labels', () => {
@@ -26,9 +24,7 @@ describe('AccountList', () => {
 
   it('shows empty state when accounts are empty', () => {
     render(<AccountList accounts={{}} />);
-    expect(
-      screen.getByText('Fetching data about your accounts')
-    ).toBeTruthy();
+    expect(screen.getByText('Fetching data about your accounts')).toBeTruthy();
   });
 
   it('shows error state when error is present', () => {

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/Components/ClearButton/ClearButton.js

@@ -1,19 +1,22 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { noop } from 'foremanReact/common/helpers';
-import { Icon, OverlayTrigger, Tooltip } from 'patternfly-react';
+import { Tooltip, Button } from '@patternfly/react-core';
+import { TimesIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
 
 const ClearButton = ({ onClear }) => (
-  <OverlayTrigger
-    overlay={
-      <Tooltip id="inventory_filter_clear_overlay">{__('Clear')}</Tooltip>
-    }
-    placement="top"
-    trigger={['hover', 'focus']}
-  >
-    <Icon name="close" className="inventory-clear-button" onClick={onClear} />
-  </OverlayTrigger>
+  <Tooltip content={__('Clear')} position="top">
+    <Button
+      variant="plain"
+      className="inventory-clear-button"
+      onClick={onClear}
+      aria-label={__('Clear')}
+      ouiaId="inventory-clear-button"
+    >
+      <TimesIcon />
+    </Button>
+  </Tooltip>
 );
 
 ClearButton.propTypes = {

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/InventoryFilter.js

@@ -1,11 +1,17 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { FormGroup, TextInput } from '@patternfly/react-core';
+import {
+  FormGroup,
+  TextInput,
+  InputGroup,
+  InputGroupItem,
+  Button,
+} from '@patternfly/react-core';
+import { TimesIcon } from '@patternfly/react-icons';
 import { noop } from 'foremanReact/common/helpers';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { useForemanOrganization } from 'foremanReact/Root/Context/ForemanContext';
-import ClearButton from './Components/ClearButton';
 import './inventoryFilter.scss';
 import { ANY_ORGANIZATION } from './InventoryFilterConstants';
 
@@ -24,15 +30,28 @@ const InventoryFilter = ({
   return (
     <form id="inventory_filter_form">
       <FormGroup>
-        <TextInput
-          id="inventory_filter_input"
-          ouiaId="inventory_filter_input"
-          value={filterTerm}
-          type="text"
-          placeholder={__('Filter..')}
-          onChange={(e, v) => handleFilterChange(v)}
-        />
-        <ClearButton onClear={handleFilterClear} />
+        <InputGroup>
+          <InputGroupItem isFill>
+            <TextInput
+              id="inventory_filter_input"
+              ouiaId="inventory_filter_input"
+              value={filterTerm}
+              type="text"
+              placeholder={__('Filter..')}
+              onChange={(e, v) => handleFilterChange(v)}
+            />
+          </InputGroupItem>
+          <InputGroupItem>
+            <Button
+              ouiaId="inventory-filter-clear-button"
+              variant="plain"
+              aria-label={__('Clear')}
+              onClick={handleFilterClear}
+            >
+              <TimesIcon />
+            </Button>
+          </InputGroupItem>
+        </InputGroup>
       </FormGroup>
     </form>
   );

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/integration.test.js

@@ -31,7 +31,9 @@ describe('InventoryFilter integration test', () => {
 
     const actions = store.getActions();
     const filterAction = actions.find(
-      a => a.type === INVENTORY_FILTER_UPDATE && a.payload.filterTerm === 'some_new_filter'
+      a =>
+        a.type === INVENTORY_FILTER_UPDATE &&
+        a.payload.filterTerm === 'some_new_filter'
     );
     expect(filterAction).toBeTruthy();
   });

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/inventoryFilter.scss

@@ -1,28 +1,34 @@
 #inventory_filter_form {
-  .pf-v5-c-form__group-control {
-    display: -ms-flexbox;
-    display: -webkit-flex;
-    display: flex;
-    -webkit-flex-direction: row;
-    -ms-flex-direction: row;
-    flex-direction: row;
-    -webkit-flex-wrap: nowrap;
-    -ms-flex-wrap: nowrap;
-    flex-wrap: nowrap;
-    -webkit-justify-content: flex-end;
-    -ms-flex-pack: end;
-    justify-content: flex-end;
-    -webkit-align-content: center;
-    -ms-flex-line-pack: center;
-    align-content: center;
-    -webkit-align-items: center;
-    -ms-flex-align: center;
-    align-items: center;
+  .pf-v5-c-form__group {
     margin-bottom: 0;
+  }
+
+  .pf-v5-c-input-group {
+    width: 100%;
+    position: relative;
+
+    .pf-v5-c-input-group__item {
+      &:last-child {
+        position: absolute;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        display: flex;
+        align-items: center;
+        pointer-events: auto;
+
+        .pf-v5-c-button {
+          margin-right: 8px;
+        }
+      }
+
+      &:first-child {
+        flex: 1;
 
-    .inventory-clear-button {
-      position: absolute;
-      right: 27px;
+        .pf-v5-c-form-control {
+          padding-right: 40px;
+        }
+      }
     }
   }
 }

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

@@ -52,12 +52,12 @@ const InventorySettings = () => {
       })}
       <MinimalInventoryDropdown setChosenValue={setChosenValue} />
       {Object.keys(childSettingsDict).length > 0 && ( // Only render this section if there are child settings
-        <div style={{ marginTop: '1.5em' }}>
+        <div className="child-settings">
           <Flex>
-            <FlexItem>
-              <span style={{ width: '6em' }} />
+            <FlexItem flex={{ default: 'flexNone' }}>
+              <span className="child-settings-spacer" />
             </FlexItem>
-            <FlexItem>
+            <FlexItem flex={{ default: 'flex_1' }}>
               {Object.keys(childSettingsDict).map(key => (
                 <AdvancedSetting
                   key={key}

data/webpack/ForemanInventoryUpload/Components/InventorySettings/InventorySettings.scss

@@ -1,14 +1,27 @@
 .rh-cloud-inventory-page {
   .inventory-settings {
-    border: 1px solid #ededed;
-    border-radius: 4px;
+    border: 1px solid var(--pf-v5-global--BorderColor--100);
+    border-radius: var(--pf-v5-global--BorderRadius--sm);
     padding: 10px;
-    margin-bottom: 15px;
+    margin-bottom: var(--pf-v5-global--spacer--md);
+    margin-left: 20px;
     float: right;
+    max-width: 450px;
 
     h3 {
       margin-top: 0;
+      margin-bottom: 10px;
       font-weight: 600;
+      font-size: var(--pf-v5-global--FontSize--md);
+    }
+
+    .child-settings {
+      margin-top: 10px;
+      margin-left: 0;
+
+      .child-settings-spacer {
+        display: none;
+      }
     }
   }
 }

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

@@ -72,6 +72,7 @@ const MinimalInventoryDropdown = ({ setChosenValue }) => {
       isOpen={isOpen}
       onSelect={onSelect}
       onOpenChange={val => setIsOpen(val)}
+      popperProps={{ width: '350px' }}
       toggle={toggleRef => (
         <MenuToggle
           ref={toggleRef}
@@ -84,20 +85,18 @@ const MinimalInventoryDropdown = ({ setChosenValue }) => {
       )}
       shouldFocusToggleOnSelect
     >
-      <div style={{ maxWidth: '28em' }}>
-        <DropdownList>
-          {Object.entries(dropdownValues).map(([value, item]) => (
-            <DropdownItem
-              value={value}
-              key={value}
-              description={item.description}
-              ouiaId={`inventory-dropdownItem-${value}`}
-            >
-              {item.title}
-            </DropdownItem>
-          ))}
-        </DropdownList>
-      </div>
+      <DropdownList>
+        {Object.entries(dropdownValues).map(([value, item]) => (
+          <DropdownItem
+            value={value}
+            key={value}
+            description={item.description}
+            ouiaId={`inventory-dropdownItem-${value}`}
+          >
+            {item.title}
+          </DropdownItem>
+        ))}
+      </DropdownList>
     </Dropdown>
   );
 };