foreman_rh_cloud 13.2.9 → 13.2.11

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/test/unit/services/foreman_rh_cloud/url_remediations_retriever_test.rb

@@ -1,8 +1,8 @@
 require 'test_plugin_helper'
 
 class URLRemediationsRetrieverTest < ActiveSupport::TestCase
-  test 'Calls the given url' do
-    retreiver = ForemanRhCloud::URLRemediationsRetriever.new(
+  test 'Calls the given url with GET when no hosts in URL' do
+    retriever = ForemanRhCloud::URLRemediationsRetriever.new(
       organization_id: FactoryBot.create(:organization).id,
       url: 'http://test.example.com',
       payload: 'TEST_PAYLOAD',
@@ -11,19 +11,96 @@ class URLRemediationsRetrieverTest < ActiveSupport::TestCase
       }
     )
 
-    retreiver.stubs(:cert_auth_available?).returns(true)
+    retriever.stubs(:cert_auth_available?).returns(true)
 
     response = mock('response')
     response.stubs(:body).returns('TEST_RESPONSE')
-    retreiver.expects(:execute_cloud_request).with do |params|
+    retriever.expects(:execute_cloud_request).with do |params|
       params[:method] == :get &&
       params[:url] == 'http://test.example.com' &&
       params[:headers][:custom1] == 'TEST_HEADER' &&
       params[:payload] == "\"TEST_PAYLOAD\""
     end.returns(response)
 
-    actual = retreiver.create_playbook
+    actual = retriever.create_playbook
 
     assert_equal 'TEST_RESPONSE', actual
   end
+
+  test 'Uses POST with hosts in body when URL contains hosts query param' do
+    retriever = ForemanRhCloud::URLRemediationsRetriever.new(
+      organization_id: FactoryBot.create(:organization).id,
+      url: 'http://test.example.com/api/remediations/1234/playbook?hosts=uuid-1,uuid-2,uuid-3'
+    )
+
+    retriever.stubs(:cert_auth_available?).returns(true)
+
+    response = mock('response')
+    response.stubs(:body).returns('TEST_PLAYBOOK')
+    retriever.expects(:execute_cloud_request).with do |params|
+      params[:method] == :post &&
+      params[:url] == 'http://test.example.com/api/remediations/1234/playbook' &&
+      JSON.parse(params[:payload]) == ['uuid-1', 'uuid-2', 'uuid-3']
+    end.returns(response)
+
+    actual = retriever.create_playbook
+
+    assert_equal 'TEST_PLAYBOOK', actual
+  end
+
+  test 'Preserves other query params when extracting hosts' do
+    retriever = ForemanRhCloud::URLRemediationsRetriever.new(
+      organization_id: FactoryBot.create(:organization).id,
+      url: 'http://test.example.com/api/remediations/1234/playbook?hosts=uuid-1,uuid-2&localhost=false'
+    )
+
+    retriever.stubs(:cert_auth_available?).returns(true)
+
+    response = mock('response')
+    response.stubs(:body).returns('TEST_PLAYBOOK')
+    retriever.expects(:execute_cloud_request).with do |params|
+      params[:method] == :post &&
+      params[:url].include?('localhost=false') &&
+      !params[:url].include?('hosts=') &&
+      JSON.parse(params[:payload]) == ['uuid-1', 'uuid-2']
+    end.returns(response)
+
+    retriever.create_playbook
+  end
+
+  test 'Merges multiple hosts query params into a single array' do
+    retriever = ForemanRhCloud::URLRemediationsRetriever.new(
+      organization_id: FactoryBot.create(:organization).id,
+      url: 'http://test.example.com/api/remediations/1234/playbook?hosts=uuid-1&hosts=uuid-2'
+    )
+
+    retriever.stubs(:cert_auth_available?).returns(true)
+
+    response = mock('response')
+    response.stubs(:body).returns('TEST_PLAYBOOK')
+    retriever.expects(:execute_cloud_request).with do |params|
+      params[:method] == :post &&
+      params[:url] == 'http://test.example.com/api/remediations/1234/playbook' &&
+      JSON.parse(params[:payload]) == ['uuid-1', 'uuid-2']
+    end.returns(response)
+
+    retriever.create_playbook
+  end
+
+  test 'Falls back to GET when hosts query param is empty' do
+    retriever = ForemanRhCloud::URLRemediationsRetriever.new(
+      organization_id: FactoryBot.create(:organization).id,
+      url: 'http://test.example.com/api/remediations/1234/playbook?hosts='
+    )
+
+    retriever.stubs(:cert_auth_available?).returns(true)
+
+    response = mock('response')
+    response.stubs(:body).returns('TEST_PLAYBOOK')
+    retriever.expects(:execute_cloud_request).with do |params|
+      params[:method] == :get
+    end.returns(response)
+
+    retriever.create_playbook
+  end
 end

data/webpack/CVEsHostDetailsTab/CVEsHostDetailsTab.js

@@ -3,6 +3,10 @@ import PropTypes from 'prop-types';
 import { ScalprumComponent, ScalprumProvider } from '@scalprum/react-core';
 import { createProviderOptions } from '../common/ScalprumModule/ScalprumContext';
 import { useInsightsPermissions } from '../common/Hooks/PermissionsHooks';
+import {
+  vulnerabilityDisabled,
+  useTabRedirect,
+} from '../ForemanRhCloudHelpers';
 import './CVEsHostDetailsTab.scss';
 
 const CVEsHostDetailsTab = ({ systemId }) => {
@@ -26,6 +30,15 @@ CVEsHostDetailsTab.propTypes = {
 
 const CVEsHostDetailsTabWrapper = ({ response }) => {
   const permissions = useInsightsPermissions();
+  const isHostDataLoaded = Boolean(response?.id);
+  const shouldHideTab = useTabRedirect(
+    isHostDataLoaded && vulnerabilityDisabled({ hostDetails: response })
+  );
+
+  if (shouldHideTab) {
+    return null;
+  }
+
   return (
     <ScalprumProvider {...createProviderOptions(permissions)}>
       <CVEsHostDetailsTab
@@ -38,10 +51,19 @@ const CVEsHostDetailsTabWrapper = ({ response }) => {
 
 CVEsHostDetailsTabWrapper.propTypes = {
   response: PropTypes.shape({
+    id: PropTypes.number,
+    operatingsystem_name: PropTypes.string,
+    vulnerability: PropTypes.shape({
+      enabled: PropTypes.bool,
+    }),
     subscription_facet_attributes: PropTypes.shape({
-      uuid: PropTypes.string.isRequired,
+      uuid: PropTypes.string,
     }),
-  }).isRequired,
+  }),
+};
+
+CVEsHostDetailsTabWrapper.defaultProps = {
+  response: {},
 };
 
 export default CVEsHostDetailsTabWrapper;

data/webpack/CVEsHostDetailsTab/__tests__/CVEsHostDetailsTab.test.js

@@ -1,6 +1,17 @@
 import React from 'react';
 import { render } from '@testing-library/react';
+import { MemoryRouter } from 'react-router-dom';
 import CVEsHostDetailsTabWrapper from '../CVEsHostDetailsTab';
+import { OVERVIEW_TAB_PATH } from '../../ForemanRhCloudHelpers';
+
+const mockHistoryReplace = jest.fn();
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useHistory: () => ({
+    replace: mockHistoryReplace,
+  }),
+}));
 
 jest.mock('foremanReact/Root/Context/ForemanContext', () => ({
   useForemanContext: () => ({
@@ -25,31 +36,44 @@ jest.mock('@scalprum/react-core', () => {
   };
 });
 
+const defaultResponse = {
+  id: 1,
+  operatingsystem_name: 'Red Hat Enterprise Linux 8',
+  vulnerability: { enabled: true },
+  subscription_facet_attributes: { uuid: '1-2-3' },
+};
+
 describe('CVEsHostDetailsTabWrapper', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
-  it('renders without crashing', () => {
+  it('renders without crashing and does not redirect for valid host', () => {
     const { container } = render(
-      <CVEsHostDetailsTabWrapper
-        response={{ subscription_facet_attributes: { uuid: '1-2-3' } }}
-      />
+      <MemoryRouter>
+        <CVEsHostDetailsTabWrapper response={defaultResponse} />
+      </MemoryRouter>
     );
     expect(
       container.querySelector(
         '.rh-cloud-insights-vulnerability-host-details-component'
       )
     ).toBeTruthy();
+    expect(mockHistoryReplace).not.toHaveBeenCalled();
   });
 
   it('remounts ScalprumComponent when systemId changes', () => {
     const { ScalprumComponent } = require('@scalprum/react-core');
 
+    const responseHostA = {
+      ...defaultResponse,
+      subscription_facet_attributes: { uuid: 'uuid-host-A' },
+    };
+
     const { rerender } = render(
-      <CVEsHostDetailsTabWrapper
-        response={{ subscription_facet_attributes: { uuid: 'uuid-host-A' } }}
-      />
+      <MemoryRouter>
+        <CVEsHostDetailsTabWrapper response={responseHostA} />
+      </MemoryRouter>
     );
 
     expect(mockUnmountTracker).not.toHaveBeenCalled();
@@ -58,10 +82,15 @@ describe('CVEsHostDetailsTabWrapper', () => {
       expect.anything()
     );
 
+    const responseHostB = {
+      ...defaultResponse,
+      subscription_facet_attributes: { uuid: 'uuid-host-B' },
+    };
+
     rerender(
-      <CVEsHostDetailsTabWrapper
-        response={{ subscription_facet_attributes: { uuid: 'uuid-host-B' } }}
-      />
+      <MemoryRouter>
+        <CVEsHostDetailsTabWrapper response={responseHostB} />
+      </MemoryRouter>
     );
 
     expect(mockUnmountTracker).toHaveBeenCalledTimes(1);
@@ -70,4 +99,38 @@ describe('CVEsHostDetailsTabWrapper', () => {
       expect.anything()
     );
   });
+
+  it('redirects to Overview when tab should be hidden', () => {
+    const nonRhelResponse = {
+      id: 2,
+      operatingsystem_name: 'Ubuntu 20.04',
+      vulnerability: { enabled: false },
+      subscription_facet_attributes: { uuid: '1-2-3' },
+    };
+
+    const { container } = render(
+      <MemoryRouter>
+        <CVEsHostDetailsTabWrapper response={nonRhelResponse} />
+      </MemoryRouter>
+    );
+
+    expect(mockHistoryReplace).toHaveBeenCalledWith(OVERVIEW_TAB_PATH);
+    expect(
+      container.querySelector(
+        '.rh-cloud-insights-vulnerability-host-details-component'
+      )
+    ).toBeNull();
+  });
+
+  it('does not redirect when host data is not yet loaded', () => {
+    const emptyResponse = { subscription_facet_attributes: { uuid: '1-2-3' } };
+
+    render(
+      <MemoryRouter>
+        <CVEsHostDetailsTabWrapper response={emptyResponse} />
+      </MemoryRouter>
+    );
+
+    expect(mockHistoryReplace).not.toHaveBeenCalled();
+  });
 });

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

@@ -1,13 +1,14 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
+import React from 'react';
+import { render, screen } from '@testing-library/react';
 import EmptyResults from '../EmptyResults';
 
-const fixtures = {
-  'render without Props': {},
-  /** fixtures, props for the component */
-};
-
 describe('EmptyResults', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(EmptyResults, fixtures));
+  it('renders the empty results message', () => {
+    render(<EmptyResults />);
+    expect(
+      screen.getByText(
+        "Oops! Couldn't find organization that matches your query"
+      )
+    ).toBeTruthy();
+  });
 });

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

@@ -1,13 +1,17 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
+import React from 'react';
+import { render, screen } from '@testing-library/react';
 import EmptyState from '../EmptyState';
 
-const fixtures = {
-  'render without Props': {},
-  /** fixtures, props for the component */
-};
-
 describe('EmptyState', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(EmptyState, fixtures));
+  it('renders fetching data message', () => {
+    render(<EmptyState />);
+    expect(
+      screen.getByText('Fetching data about your accounts')
+    ).toBeTruthy();
+  });
+
+  it('renders loading indicator', () => {
+    render(<EmptyState />);
+    expect(screen.getByText('Loading...')).toBeTruthy();
+  });
 });

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

@@ -1,13 +1,24 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
+import React from 'react';
+import { render, screen } from '@testing-library/react';
 import ErrorState from '../ErrorState';
 
-const fixtures = {
-  'render without Props': {},
-  /** fixtures, props for the component */
-};
-
 describe('ErrorState', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(ErrorState, fixtures));
+  it('renders the error message heading', () => {
+    render(<ErrorState error="Something went wrong" />);
+    expect(
+      screen.getByText(
+        'Encountered an error while trying to access the server:'
+      )
+    ).toBeTruthy();
+  });
+
+  it('renders the error description', () => {
+    render(<ErrorState error="Connection refused" />);
+    expect(screen.getByText('Connection refused')).toBeTruthy();
+  });
+
+  it('renders with empty error by default', () => {
+    const { container } = render(<ErrorState />);
+    expect(container.querySelector('.error_description')).toBeTruthy();
+  });
 });

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

@@ -1,13 +1,36 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import { Accordion } from '@patternfly/react-core';
 import ListItem from '../ListItem';
-import { props } from '../ListItem.fixtures';
 
-const fixtures = {
-  'render with Props': props,
-};
+jest.mock('../../../../Dashboard', () => () => null);
+
+const renderListItem = props =>
+  render(
+    <Accordion>
+      <ListItem {...props} />
+    </Accordion>
+  );
 
 describe('ListItem', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(ListItem, fixtures));
+  const defaultProps = {
+    label: 'test-org',
+    account: {
+      generated_status: 'unknown',
+      uploaded_status: 'unknown',
+      id: 1,
+    },
+  };
+
+  it('renders the account label', () => {
+    renderListItem(defaultProps);
+    expect(screen.getByText('test-org')).toBeTruthy();
+  });
+
+  it('renders Generated and Uploaded status labels', () => {
+    renderListItem(defaultProps);
+    expect(screen.getByText('Generated')).toBeTruthy();
+    expect(screen.getByText('Uploaded')).toBeTruthy();
+  });
+
 });

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

@@ -1,14 +1,30 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
+import React from 'react';
+import { render, screen } from '@testing-library/react';
 import ListItemStatus from '../ListItemStatus';
-import { props } from '../ListItemStatus.fixtures';
-
-const fixtures = {
-  'render without Props': {},
-  'render with Props': props,
-};
 
 describe('ListItemStatus', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(ListItemStatus, fixtures));
+  it('renders Generated and Uploaded labels', () => {
+    render(<ListItemStatus />);
+    expect(screen.getByText('Generated')).toBeTruthy();
+    expect(screen.getByText('Uploaded')).toBeTruthy();
+  });
+
+  it('shows dash placeholders for unknown status', () => {
+    render(
+      <ListItemStatus
+        account={{ generated_status: 'unknown', uploaded_status: 'unknown' }}
+      />
+    );
+    expect(screen.getAllByText('--')).toHaveLength(2);
+  });
+
+  it('renders with provided account statuses', () => {
+    render(
+      <ListItemStatus
+        account={{ generated_status: 'success', uploaded_status: 'running' }}
+      />
+    );
+    expect(screen.getByText('Generated')).toBeTruthy();
+    expect(screen.getByText('Uploaded')).toBeTruthy();
+  });
 });

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

@@ -1,14 +1,38 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
+import React from 'react';
+import { render, screen } from '@testing-library/react';
 import AccountList from '../AccountList';
-import { props } from '../AccountList.fixtures';
+import { accounts } from '../AccountList.fixtures';
 
-const fixtures = {
-  'render with props': props,
-  'show empty results': { ...props, filterTerm: 'not_matching_term' },
-};
+jest.mock('../Components/ListItem', () => ({ label }) => (
+  <div>{label}</div>
+));
 
 describe('AccountList', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(AccountList, fixtures));
+  it('renders account labels', () => {
+    render(<AccountList accounts={accounts} />);
+    Object.keys(accounts).forEach(label => {
+      expect(screen.getByText(label)).toBeTruthy();
+    });
+  });
+
+  it('shows empty results when filterTerm matches nothing', () => {
+    render(<AccountList accounts={accounts} filterTerm="not_matching_term" />);
+    expect(
+      screen.getByText(
+        "Oops! Couldn't find organization that matches your query"
+      )
+    ).toBeTruthy();
+  });
+
+  it('shows empty state when accounts are empty', () => {
+    render(<AccountList accounts={{}} />);
+    expect(
+      screen.getByText('Fetching data about your accounts')
+    ).toBeTruthy();
+  });
+
+  it('shows error state when error is present', () => {
+    render(<AccountList accounts={{}} error="Server error" />);
+    expect(screen.getByText('Server error')).toBeTruthy();
+  });
 });