foreman_rh_cloud 12.1.5 → 12.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abf912ff1170fb60a3b10a6d1178f71ad7a92662c2272a883179eb30a62e2c2e
-  data.tar.gz: 3ff64877a61a50890423e1d25980ea37e9fc3ae949f875be344b299f5580ab24
+  metadata.gz: 32fdc4ecba1d5949bce50e394de7cdd097697902c8ba47f47b14e26c96e44881
+  data.tar.gz: 0de08119aa42cce06a73dd7bce46d730e023d40b7f54b621cb6a3cef50fb0b63
 SHA512:
-  metadata.gz: 5792bc34bf4e7a254cacc14cd014b9e008378d695ddc5ae00afcbd5f10371840a53ecdd106f2a845531a2c174fab3c7d1b931ba0a6f766c749124adcbcff742f
-  data.tar.gz: dffa948ae7cca41a839be2c07f26193ccc11c9af71d84c07d4b0f256a0ad0e5763ce107cf69a22ecb6436212a5e68d09512a4043eb8eb5b01a2268c88d0d44fd
+  metadata.gz: 03ad7ffd1b43db38bdd6762d01b1bd88e7404702a43cd7be626a72892e73f498c990eab3a4cc1037fe63393cdc87d460cd1b87fa7770749e87b9e9a2bf949418
+  data.tar.gz: 403935258065a6cc0755b0d71ed9c3fa6a8652c59264c85da213aa21471d93af5efcde6a829f0e1606d949474b41ab6eaa7b9c573b0ecc74393dce786795f01f

data/config/routes.rb

@@ -38,8 +38,13 @@ Rails.application.routes.draw do
     unless ForemanRhCloud.with_local_advisor_engine?
       get 'inventory_upload', to: '/react#index'
     end
+    if ForemanRhCloud.with_local_advisor_engine?
+      get 'recommendations', to: '/react#index'
+      get 'recommendations/:rule_id', to: '/react#index'
+    end
     get 'insights_cloud', to: '/react#index' # Uses foreman's react controller
     get 'insights_vulnerability', to: '/react#index'
+    get 'insights_vulnerability/:cve_id', to: '/react#index'
   end
 
   scope :module => :'insights_cloud/api', :path => :redhat_access do

data/lib/foreman_rh_cloud/engine.rb

@@ -229,10 +229,15 @@ module ForemanRhCloud
         Katello::Api::V2::OrganizationsController.before_action(:local_find_taxonomy, only: :download_debug_certificate)
 
         Katello::Api::V2::RepositoriesController.include Foreman::Controller::SmartProxyAuth
+        # patch the callbacks order for :index, since find_product has to run after the user is already initialized
+        Katello::Api::V2::RepositoriesController.skip_before_action(:find_product, only: :index)
+        Katello::Api::V2::RepositoriesController.skip_before_action(:find_optional_organization, only: :index)
         Katello::Api::V2::RepositoriesController.add_smart_proxy_filters(
           :index,
           features: ForemanRhCloud.on_prem_smart_proxy_features
         )
+        Katello::Api::V2::RepositoriesController.before_action(:find_product, only: :index)
+        Katello::Api::V2::RepositoriesController.before_action(:find_optional_organization, only: :index)
       end
     end
 

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '12.1.5'.freeze
+  VERSION = '12.2.0'.freeze
 end

data/package.json

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

data/webpack/CveDetailsPage/CveDetailsPage.js

@@ -0,0 +1,20 @@
+import React from 'react';
+import { useParams } from 'react-router-dom';
+import { ScalprumComponent, ScalprumProvider } from '@scalprum/react-core';
+import { providerOptions } from '../common/ScalprumModule/ScalprumContext';
+
+const CveDetailsPage = () => {
+  const { cveId } = useParams();
+  const scope = 'vulnerability';
+  const module = './CveDetailPage';
+
+  return (
+    <ScalprumProvider {...providerOptions}>
+      <div className="rh-cloud-cve-details-page">
+        <ScalprumComponent scope={scope} module={module} cveId={cveId} />
+      </div>
+    </ScalprumProvider>
+  );
+};
+
+export default CveDetailsPage;

data/webpack/CveDetailsPage/CveDetailsPage.test.js

@@ -0,0 +1,31 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import CveDetailsPage from './CveDetailsPage';
+
+// Mock react-router-dom
+jest.mock('react-router-dom', () => ({
+  useParams: jest.fn(() => ({ cveId: 'CVE-2021-1234' })),
+}));
+
+jest.mock('@scalprum/react-core', () => ({
+  ScalprumComponent: jest.fn(props => (
+    <div data-testid="mock-scalprum-component">{JSON.stringify(props)}</div>
+  )),
+  ScalprumProvider: jest.fn(({ children }) => <div>{children}</div>),
+}));
+
+describe('CveDetailsPage component', () => {
+  it('renders the container with correct class', () => {
+    const { container } = render(<CveDetailsPage />);
+    expect(
+      container.querySelector('.rh-cloud-cve-details-page')
+    ).toBeTruthy();
+  });
+
+  it('passes cveId from URL params to ScalprumComponent', () => {
+    const { getByTestId } = render(<CveDetailsPage />);
+    const mockComponent = getByTestId('mock-scalprum-component');
+    expect(mockComponent.textContent).toContain('CVE-2021-1234');
+  });
+});

data/webpack/CveDetailsPage/index.js

@@ -0,0 +1 @@
+export { default } from './CveDetailsPage';

data/webpack/ForemanColumnExtensions/index.js

@@ -1,20 +1,15 @@
 import React from 'react';
+import { ScalprumComponent, ScalprumProvider } from '@scalprum/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { propsToCamelCase } from 'foremanReact/common/helpers';
 import { CVECountCell } from '../InsightsVulnerabilityHostIndexExtensions/CVECountCell';
+import { providerOptions } from '../common/ScalprumModule/ScalprumContext';
 
-const RecommendationsCell = hostDetails => {
+const HostedRecommendationsCell = hostDetails => {
   const insightsAttributes = propsToCamelCase(
     // eslint-disable-next-line camelcase
     hostDetails?.insights_attributes ?? {}
   );
-  // Local insights advisor
-  if (insightsAttributes.useLocalAdvisorEngine) {
-    // TODO: Replace this placeholder with the actual local advisor integration
-    return <span>Local advisor placeholder</span>;
-  }
-
-  // Hosted insights advisor
   const { insightsHitsCount: hitsCount } = insightsAttributes;
   if (hitsCount === undefined || hitsCount === null) return '—';
   const hostname = hostDetails?.name;
@@ -23,6 +18,36 @@ const RecommendationsCell = hostDetails => {
   return <a href={hitsUrl}>{hitsCount}</a>;
 };
 
+const IopRecommendationsCell = hostDetails => {
+  const scope = 'advisor';
+  const module = './RecommendationsCellWrapped';
+
+  return (
+    <span className="rh-cloud-insights-recommendations-cell">
+      <ScalprumComponent scope={scope} module={module} />
+    </span>
+  );
+};
+
+const IopRecommendationsCellWrapped = hostDetails => (
+  <ScalprumProvider {...providerOptions}>
+    <IopRecommendationsCell hostDetails={hostDetails} />
+  </ScalprumProvider>
+);
+
+const RecommendationsCell = hostDetails => {
+  const insightsAttributes = propsToCamelCase(
+    // eslint-disable-next-line camelcase
+    hostDetails?.insights_attributes ?? {}
+  );
+
+  return insightsAttributes.useLocalAdvisorEngine ? (
+    <IopRecommendationsCellWrapped hostDetails={hostDetails} />
+  ) : (
+    <HostedRecommendationsCell hostDetails={hostDetails} />
+  );
+};
+
 const insightsCategoryName = __('Insights');
 
 const hostsIndexColumnExtensions = [

data/webpack/ForemanRhCloudPages.js

@@ -1,19 +1,24 @@
+/* eslint-disable spellcheck/spell-checker */
 import React from 'react';
 import componentRegistry from 'foremanReact/components/componentRegistry';
 import { registerRoutes as foremanRegisterRoutes } from 'foremanReact/routes/RoutingService';
 import ForemanInventoryUpload from './ForemanInventoryUpload';
 import InsightsVulnerabilityListPage from './InsightsVulnerability/InsightsVulnerabilityListPage';
 import InsightsCloudSync from './InsightsCloudSync';
+import IopRecommendationDetails from './IopRecommendationDetails/IopRecommendationDetails';
 import InsightsHostDetailsTab from './InsightsHostDetailsTab';
+import CveDetailsPage from './CveDetailsPage';
 
 const pages = [
   { name: 'ForemanInventoryUpload', type: ForemanInventoryUpload },
   { name: 'InsightsCloudSync', type: InsightsCloudSync },
+  { name: 'IopRecommendationDetails', type: IopRecommendationDetails },
   { name: 'InsightsHostDetailsTab', type: InsightsHostDetailsTab },
   {
     name: 'InsightsVulnerabilityListPage',
     type: InsightsVulnerabilityListPage,
   },
+  { name: 'CveDetailsPage', type: CveDetailsPage },
 ];
 
 export const registerPages = () => {
@@ -26,6 +31,11 @@ export const routes = [
     exact: true,
     render: props => <InsightsCloudSync {...props} />,
   },
+  {
+    path: '/foreman_rh_cloud/recommendations',
+    exact: false,
+    render: props => <IopRecommendationDetails {...props} />,
+  },
   {
     path: '/foreman_rh_cloud/inventory_upload',
     exact: true,
@@ -36,6 +46,11 @@ export const routes = [
     exact: true,
     render: props => <InsightsVulnerabilityListPage {...props} />,
   },
+  {
+    path: '/foreman_rh_cloud/insights_vulnerability/:cveId',
+    exact: true,
+    render: props => <CveDetailsPage {...props} />,
+  },
 ];
 
 export const registerRoutes = () => {

data/webpack/InsightsCloudSync/InsightsCloudSync.js

@@ -1,7 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
+import { ScalprumComponent, ScalprumProvider } from '@scalprum/react-core';
 import InsightsTable from './Components/InsightsTable';
+import { useAdvisorEngineConfig } from '../common/Hooks/ConfigHooks';
+import { foremanUrl } from '../ForemanRhCloudHelpers';
 import RemediationModal from './Components/RemediationModal';
 import {
   INSIGHTS_SYNC_PAGE_TITLE,
@@ -11,7 +14,9 @@ import './InsightsCloudSync.scss';
 import Pagination from './Components/InsightsTable/Pagination';
 import ToolbarDropdown from './Components/ToolbarDropdown';
 import InsightsSettings from './Components/InsightsSettings';
+import { providerOptions } from '../common/ScalprumModule/ScalprumContext';
 
+// Hosted Insights advisor
 const InsightsCloudSync = ({ syncInsights, query, fetchInsights }) => {
   const onRecommendationSync = () => syncInsights(fetchInsights, query);
   const toolbarButtons = (
@@ -54,4 +59,37 @@ InsightsCloudSync.defaultProps = {
   query: '',
 };
 
-export default InsightsCloudSync;
+// Local Insights advisor
+const scope = 'advisor';
+const module = './ListWrapped';
+
+export const generateRuleUrl = ruleId =>
+  foremanUrl(`/foreman_rh_cloud/recommendations/${ruleId}`);
+
+const IopRecommendationsPage = props => (
+  <ScalprumComponent
+    scope={scope}
+    module={module}
+    IopRemediationModal={RemediationModal}
+    generateRuleUrl={generateRuleUrl}
+    {...props}
+  />
+);
+
+const IopRecommendationsPageWrapped = props => (
+  <ScalprumProvider {...providerOptions}>
+    <IopRecommendationsPage {...props} />
+  </ScalprumProvider>
+);
+
+const RecommendationsPage = props => {
+  const isLocalAdvisorEngine = useAdvisorEngineConfig();
+
+  return isLocalAdvisorEngine ? (
+    <IopRecommendationsPageWrapped {...props} />
+  ) : (
+    <InsightsCloudSync {...props} />
+  );
+};
+
+export default RecommendationsPage;

data/webpack/InsightsCloudSync/__snapshots__/InsightsCloudSync.test.js.snap

@@ -1,54 +1,10 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`InsightsCloudSync render 1`] = `
-<div
-  className="rh-cloud-insights"
->
-  <Connect(InsightsSettings) />
-  <PageLayout
-    beforeToolbarComponent={null}
-    header="Red Hat Insights"
-    onSearch={[Function]}
-    searchProps={
-      Object {
-        "autocomplete": Object {
-          "id": "searchBar",
-          "searchQuery": "",
-          "url": "/insights_cloud/hits/auto_complete_search",
-          "useKeyShortcuts": true,
-        },
-        "bookmarks": Object {
-          "canCreateBookmarks": true,
-          "documentationUrl": "4.1.5Searching",
-          "url": "/api/bookmarks",
-        },
-        "controller": "insights_hits",
-      }
-    }
-    searchQuery=""
-    searchable={true}
-    toolbarButtons={
-      <React.Fragment>
-        <span
-          className="insights-toolbar-buttons"
-        >
-          <Memo(Connect(RemediationModal)) />
-          <ToolbarDropdown
-            onRecommendationSync={[Function]}
-          />
-        </span>
-        <span
-          className="pull-right"
-        >
-          <Pagination
-            isCompact={true}
-            variant="top"
-          />
-        </span>
-      </React.Fragment>
-    }
-  >
-    <Connect(InsightsTable) />
-  </PageLayout>
-</div>
+<InsightsCloudSync
+  fetchInsights={[Function]}
+  query=""
+  status="RESOLVED"
+  syncInsights={[Function]}
+/>
 `;

data/webpack/InsightsHostDetailsTab/NewHostDetailsTab.js

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
 import SearchBar from 'foremanReact/components/SearchBar';
 import { translate as __ } from 'foremanReact/common/I18n';
+import { ScalprumComponent, ScalprumProvider } from '@scalprum/react-core';
 import { Grid, GridItem } from '@patternfly/react-core';
 import {
   Dropdown,
@@ -21,7 +22,10 @@ import {
 } from '../InsightsCloudSync/Components/InsightsTable/InsightsTableSelectors';
 import { redHatAdvisorSystems } from '../InsightsCloudSync/InsightsCloudSyncHelpers';
 import { useAdvisorEngineConfig } from '../common/Hooks/ConfigHooks';
+import { generateRuleUrl } from '../InsightsCloudSync/InsightsCloudSync';
+import { providerOptions } from '../common/ScalprumModule/ScalprumContext';
 
+// Hosted Insights advisor
 const NewHostDetailsTab = ({ hostName, router }) => {
   const dispatch = useDispatch();
   const query = useSelector(selectSearch);
@@ -104,4 +108,50 @@ NewHostDetailsTab.defaultProps = {
   router: {},
 };
 
-export default NewHostDetailsTab;
+// Local Insights advisor
+const scope = 'advisor';
+// eslint-disable-next-line spellcheck/spell-checker
+const module = './HostDetailsLightspeedTabWrapped';
+
+const IopInsightsTab = props => (
+  <ScalprumComponent
+    scope={scope}
+    module={module}
+    IopRemediationModal={RemediationModal}
+    generateRuleUrl={generateRuleUrl}
+    {...props}
+  />
+);
+
+const IopInsightsTabWrapped = props => (
+  <ScalprumProvider {...providerOptions}>
+    <IopInsightsTab {...props} />
+  </ScalprumProvider>
+);
+
+const LightspeedTab = props => {
+  const { response } = props;
+  const isLocalAdvisorEngine =
+    // eslint-disable-next-line camelcase
+    response?.insights_attributes?.use_local_advisor_engine;
+
+  return isLocalAdvisorEngine ? (
+    <IopInsightsTabWrapped {...props} />
+  ) : (
+    <NewHostDetailsTab {...props} />
+  );
+};
+
+LightspeedTab.propTypes = {
+  response: PropTypes.shape({
+    insights_attributes: {
+      use_local_advisor_engine: PropTypes.bool,
+    },
+  }),
+};
+
+LightspeedTab.defaultProps = {
+  response: {},
+};
+
+export default LightspeedTab;

data/webpack/IopRecommendationDetails/IopRecommendationDetails.js

@@ -0,0 +1,44 @@
+import React from 'react';
+import { useRouteMatch } from 'react-router-dom';
+import { ScalprumComponent, ScalprumProvider } from '@scalprum/react-core';
+
+import RemediationModal from '../InsightsCloudSync/Components/RemediationModal';
+import { providerOptions } from '../common/ScalprumModule/ScalprumContext';
+
+const scope = 'advisor';
+const module = './RecommendationDetailsWrapped';
+
+const invScope = 'inventory';
+const invModule = './HybridInventoryTabs';
+
+const IopRecommendationDetails = props => {
+  const urlParams = useRouteMatch('/foreman_rh_cloud/recommendations/:rule_id');
+  // eslint-disable-next-line camelcase
+  const ruleId = urlParams?.params?.rule_id;
+  return (
+    <div className="rh-cloud-recommendation-details-cell">
+      <ScalprumComponent
+        scope={scope}
+        module={module}
+        IopRemediationModal={RemediationModal}
+        ruleId={ruleId}
+        {...props}
+      />
+      <ScalprumComponent
+        scope={invScope}
+        module={invModule}
+        IopRemediationModal={RemediationModal}
+        ruleId={ruleId}
+        {...props}
+      />
+    </div>
+  );
+};
+
+const IopRecommendationDetailsWrapped = props => (
+  <ScalprumProvider {...providerOptions}>
+    <IopRecommendationDetails {...props} />
+  </ScalprumProvider>
+);
+
+export default IopRecommendationDetailsWrapped;

data/webpack/common/ScalprumModule/ScalprumContext.js

@@ -4,6 +4,16 @@ export const modulesConfig = {
     manifestLocation: `${window.location.origin}/assets/apps/vulnerability/fed-mods.json`,
     cdnPath: `${window.location.origin}/assets/apps/vulnerability/`,
   },
+  advisor: {
+    name: 'advisor',
+    manifestLocation: `${window.location.origin}/assets/apps/advisor/fed-mods.json`,
+    cdnPath: `${window.location.origin}/assets/apps/advisor/`,
+  },
+  inventory: {
+    name: 'inventory',
+    manifestLocation: `${window.location.origin}/assets/apps/inventory/fed-mods.json`,
+    cdnPath: `${window.location.origin}/assets/apps/inventory/`,
+  },
 };
 
 export const mockUser = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 12.1.5
+  version: 12.2.0
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
@@ -292,6 +292,9 @@ files:
 - webpack/CVEsHostDetailsTab/CVEsHostDetailsTab.js
 - webpack/CVEsHostDetailsTab/__tests__/CVEsHostDetailsTab.test.js
 - webpack/CVEsHostDetailsTab/index.js
+- webpack/CveDetailsPage/CveDetailsPage.js
+- webpack/CveDetailsPage/CveDetailsPage.test.js
+- webpack/CveDetailsPage/index.js
 - webpack/ForemanColumnExtensions/index.js
 - webpack/ForemanInventoryUpload/Components/AccountList/AccountList.fixtures.js
 - webpack/ForemanInventoryUpload/Components/AccountList/AccountList.js
@@ -621,6 +624,7 @@ files:
 - webpack/InsightsVulnerability/InsightsVulnerabilityListPage.test.js
 - webpack/InsightsVulnerabilityHostIndexExtensions/CVECountCell.js
 - webpack/InsightsVulnerabilityHostIndexExtensions/__tests__/CVECountCell.test.js
+- webpack/IopRecommendationDetails/IopRecommendationDetails.js
 - webpack/__mocks__/foremanReact/Root/Context/ForemanContext.js
 - webpack/__mocks__/foremanReact/common/I18n.js
 - webpack/__mocks__/foremanReact/common/MountingService.js