foreman_rh_cloud 12.1.4 → 12.1.5

data/webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/__tests__/__snapshots__/InventoryAutoUpload.test.js.snap

@@ -41,6 +41,7 @@ exports[`InventoryAutoUpload rendering render with props 1`] = `
           position="right"
         >
           <Button
+            ouiaId="button-advanced-settings"
             style={
               Object {
                 "fontSize": "small",
@@ -68,6 +69,7 @@ exports[`InventoryAutoUpload rendering render with props 1`] = `
       >
         <Text
           component="p"
+          ouiaId="text-more-details"
         >
           <InfoAltIcon />
            
@@ -76,6 +78,7 @@ exports[`InventoryAutoUpload rendering render with props 1`] = `
           <Text
             component="a"
             href="/foreman_rh_cloud/inventory_upload"
+            ouiaId="text-details-link"
             rel="noopener noreferrer"
             target="_blank"
           >

data/webpack/ForemanRhCloudFills.js

@@ -1,10 +1,11 @@
 import React from 'react';
 import { addGlobalFill } from 'foremanReact/components/common/Fill/GlobalFill';
+import { translate as __ } from 'foremanReact/common/I18n';
 import InventoryAutoUploadSwitcher from './ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload';
 import NewHostDetailsTab from './InsightsHostDetailsTab/NewHostDetailsTab';
 import { InsightsTotalRiskChartWrapper } from './InsightsHostDetailsTab/InsightsTotalRiskChartWrapper';
 import { isNotRhelHost, vulnerabilityDisabled } from './ForemanRhCloudHelpers';
-import CVEsHostDetailsTab from './CVEsHostDetailsTab/CVEsHostDetailsTab';
+import CVEsHostDetailsTabWrapper from './CVEsHostDetailsTab/CVEsHostDetailsTab';
 
 const fills = [
   {
@@ -20,6 +21,7 @@ const fills = [
     weight: 400,
     metadata: {
       hideTab: isNotRhelHost,
+      title: __('Insights'),
     },
   },
   {
@@ -30,11 +32,12 @@ const fills = [
   },
   {
     slot: 'host-details-page-tabs',
-    name: 'CVEs',
-    component: props => <CVEsHostDetailsTab {...props} />,
+    name: 'Vulnerabilities',
+    component: props => <CVEsHostDetailsTabWrapper {...props} />,
     weight: 300,
     metadata: {
       hideTab: vulnerabilityDisabled,
+      title: __('Vulnerabilities'),
     },
   },
 ];

data/webpack/ForemanRhCloudPages.js

@@ -2,7 +2,7 @@ import React from 'react';
 import componentRegistry from 'foremanReact/components/componentRegistry';
 import { registerRoutes as foremanRegisterRoutes } from 'foremanReact/routes/RoutingService';
 import ForemanInventoryUpload from './ForemanInventoryUpload';
-import InsightsVulnerability from './InsightsVulnerability/InsightsVulnerability';
+import InsightsVulnerabilityListPage from './InsightsVulnerability/InsightsVulnerabilityListPage';
 import InsightsCloudSync from './InsightsCloudSync';
 import InsightsHostDetailsTab from './InsightsHostDetailsTab';
 
@@ -10,7 +10,10 @@ const pages = [
   { name: 'ForemanInventoryUpload', type: ForemanInventoryUpload },
   { name: 'InsightsCloudSync', type: InsightsCloudSync },
   { name: 'InsightsHostDetailsTab', type: InsightsHostDetailsTab },
-  { name: 'InsightsVulnerability', type: InsightsVulnerability },
+  {
+    name: 'InsightsVulnerabilityListPage',
+    type: InsightsVulnerabilityListPage,
+  },
 ];
 
 export const registerPages = () => {
@@ -31,7 +34,7 @@ export const routes = [
   {
     path: '/foreman_rh_cloud/insights_vulnerability',
     exact: true,
-    render: props => <InsightsVulnerability {...props} />,
+    render: props => <InsightsVulnerabilityListPage {...props} />,
   },
 ];
 

data/webpack/InsightsCloudSync/Components/InsightsTable/InsightsTable.js

@@ -75,6 +75,7 @@ const InsightsTable = ({
       />
       <Table
         className="rh-cloud-recommendations-table"
+        ouiaId="rh-cloud-recommendations-table"
         aria-label="Recommendations Table"
         onSelect={(_event, isSelected, rowId) =>
           onTableSelect(isSelected, rowId, rows, selectedIds)

data/webpack/InsightsCloudSync/Components/InsightsTable/SelectAllAlert.js

@@ -18,6 +18,7 @@ const SelectAllAlert = ({
       <Alert
         isInline
         variant="info"
+        ouiaId="alert-recommendations-selected"
         title={sprintf(__('Recommendations selected: %s.'), selectedCount)}
         actionLinks={
           <AlertActionLink onClick={selectAll}>
@@ -32,6 +33,7 @@ const SelectAllAlert = ({
     <Alert
       isInline
       variant="info"
+      ouiaId="alert-all-selected"
       title={__('All recommendations are now selected.')}
       actionLinks={
         <AlertActionLink onClick={clearAllSelection}>

data/webpack/InsightsCloudSync/Components/InsightsTable/__tests__/__snapshots__/InsightsTable.test.js.snap

@@ -83,6 +83,7 @@ exports[`InsightsTable rendering render with Props 1`] = `
     isTreeTable={false}
     onSelect={[Function]}
     onSort={[Function]}
+    ouiaId="rh-cloud-recommendations-table"
     ouiaSafe={true}
     role="grid"
     rowLabeledBy="simple-node"

data/webpack/InsightsCloudSync/Components/RemediationModal/RemediationModal.js

@@ -46,6 +46,7 @@ const RemediationModal = ({
   return (
     <React.Fragment>
       <Button
+        ouiaId="button-remediate"
         variant="primary"
         isDisabled={isEmpty(selectedIds)}
         onClick={() => {
@@ -56,6 +57,7 @@ const RemediationModal = ({
       </Button>{' '}
       <Modal
         id="remediation-modal"
+        ouiaId="remediation-modal"
         appendTo={document.body}
         variant={ModalVariant.large}
         title={__('Remediation summary')}
@@ -71,6 +73,7 @@ const RemediationModal = ({
       >
         <Table
           className="remediations-table"
+          ouiaId="remediations-table"
           aria-label="remediations Table"
           cells={columns}
           rows={rows}

data/webpack/InsightsCloudSync/Components/RemediationModal/RemediationModalFooter.js

@@ -9,10 +9,20 @@ const ModalFooter = ({ toggleModal, resolutions, hostsIds }) => {
   token = token?.content || '';
   return (
     <form action={JOB_INVOCATION_PATH} method="post">
-      <Button type="submit" key="confirm" variant="primary">
+      <Button
+        type="submit"
+        ouiaId="button-confirm"
+        key="confirm"
+        variant="primary"
+      >
         {__('Remediate')}
       </Button>
-      <Button key="cancel" variant="link" onClick={toggleModal}>
+      <Button
+        key="cancel"
+        ouiaId="button-cancel"
+        variant="link"
+        onClick={toggleModal}
+      >
         {__('Cancel')}
       </Button>
       <input type="hidden" name="feature" value="rh_cloud_remediate_hosts" />

data/webpack/InsightsCloudSync/Components/RemediationModal/Resolutions.js

@@ -18,6 +18,7 @@ const Resolutions = ({
       {resolutions.map(({ id: resolution_id, description }) => (
         <Radio
           key={resolution_id}
+          ouiaId={`resolution-radio-${resolution_id}`}
           className="resolution-radio"
           id={resolution_id}
           isChecked={resolution_id === checkedID}

data/webpack/InsightsCloudSync/Components/ToolbarDropdown.js

@@ -19,11 +19,15 @@ const ToolbarDropdown = ({ onRecommendationSync }) => {
   const dropdownItems = [
     <DropdownItem
       key="recommendation-manual-sync"
+      ouiaId="recommendation-manual-sync"
       onClick={onRecommendationSync}
     >
       {__('Sync recommendations')}
     </DropdownItem>,
-    <DropdownItem key="cloud-advisor-systems-link">
+    <DropdownItem
+      key="cloud-advisor-systems-link"
+      ouiaId="cloud-advisor-systems-link"
+    >
       <a
         href={redHatAdvisorSystems()}
         target="_blank"
@@ -38,6 +42,7 @@ const ToolbarDropdown = ({ onRecommendationSync }) => {
   return (
     <Dropdown
       className="title-dropdown"
+      ouiaId="title-dropdown"
       onSelect={() => setIsDropdownOpen(false)}
       toggle={
         <KebabToggle onToggle={(_event, isOpen) => setIsDropdownOpen(isOpen)} />

data/webpack/InsightsVulnerability/InsightsVulnerabilityListPage.js

@@ -0,0 +1,21 @@
+import React from 'react';
+import { ScalprumComponent, ScalprumProvider } from '@scalprum/react-core';
+import { providerOptions } from '../common/ScalprumModule/ScalprumContext';
+
+const InsightsVulnerabilityListPage = () => {
+  const scope = 'vulnerability';
+  const module = './CveListPage';
+  return (
+    <div className="rh-cloud-insights-vulnerability-page">
+      <ScalprumComponent scope={scope} module={module} />
+    </div>
+  );
+};
+
+const InsightsVulnerabilityListPageWrap = () => (
+  <ScalprumProvider {...providerOptions}>
+    <InsightsVulnerabilityListPage />
+  </ScalprumProvider>
+);
+
+export default InsightsVulnerabilityListPageWrap;

data/webpack/InsightsVulnerability/InsightsVulnerabilityListPage.test.js

@@ -0,0 +1,20 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import InsightsVulnerabilityListPage from './InsightsVulnerabilityListPage';
+
+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('InsightsVulnerabilityListPage component', () => {
+  it('renders the container with correct class', () => {
+    const { container } = render(<InsightsVulnerabilityListPage />);
+    expect(
+      container.querySelector('.rh-cloud-insights-vulnerability-page')
+    ).toBeTruthy();
+  });
+});

data/webpack/InsightsVulnerabilityHostIndexExtensions/CVECountCell.js

@@ -0,0 +1,45 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { UnknownIcon } from '@patternfly/react-icons';
+import { Link } from 'react-router-dom';
+import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
+
+import { insightsCloudUrl } from '../InsightsCloudSync/InsightsCloudSyncHelpers';
+
+const vulnerabilityApiPath = path =>
+  insightsCloudUrl(`api/vulnerability/v1/${path}`);
+
+export const CVECountCell = ({ hostDetails }) => {
+  // eslint-disable-next-line camelcase
+  const uuid = hostDetails?.subscription_facet_attributes?.uuid;
+
+  const key = `HOST_CVE_COUNT_${uuid}`;
+  const response = useAPI(
+    uuid ? 'get' : null,
+    vulnerabilityApiPath(`systems?uuid=${uuid}`),
+    {
+      key,
+    }
+  );
+
+  if (uuid === undefined) {
+    return <UnknownIcon />;
+  }
+
+  // eslint-disable-next-line camelcase
+  const { cve_count } = (response.response?.data || [])[0]?.attributes || {};
+
+  const cveLink = (
+    // eslint-disable-next-line camelcase
+    <Link to={`hosts/${hostDetails.name}#/Vulnerabilities`}>{cve_count}</Link>
+  );
+
+  // eslint-disable-next-line camelcase
+  return cve_count === undefined ? <UnknownIcon /> : cveLink;
+};
+
+CVECountCell.propTypes = {
+  hostDetails: PropTypes.object.isRequired,
+};
+
+export default CVECountCell;

data/webpack/InsightsVulnerabilityHostIndexExtensions/__tests__/CVECountCell.test.js

@@ -0,0 +1,28 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import { API } from 'foremanReact/redux/API';
+import { CVECountCell } from '../CVECountCell';
+
+jest.mock('foremanReact/redux/API');
+API.get.mockImplementation(async () => ({
+  data: [
+    {
+      attributes: {
+        cve_count: 1,
+      },
+    },
+  ],
+}));
+
+describe('CVECountCell', () => {
+  it('renders an empty cves count column', () => {
+    const hostDetailsMock = {
+      name: 'test-host.example.com',
+      subscription_facet_attributes: {
+        uuid: null, // no subscription
+      },
+    };
+    render(<CVECountCell hostDetails={hostDetailsMock} />);
+    expect(screen.getByRole('img', { hidden: true })).toBeTruthy();
+  });
+});

data/webpack/common/DropdownToggle.js

@@ -6,6 +6,7 @@ const DropdownToggle = ({ items, ...props }) => {
   const [isOpen, setOpen] = useState(false);
   return (
     <Dropdown
+      ouiaId="toggle-dropdown"
       onSelect={() => setOpen(false)}
       toggle={<KebabToggle onToggle={(_event, value) => setOpen(value)} />}
       isOpen={isOpen}

data/webpack/common/ScalprumModule/ScalprumContext.js

@@ -0,0 +1,63 @@
+export const modulesConfig = {
+  vulnerability: {
+    name: 'vulnerability',
+    manifestLocation: `${window.location.origin}/assets/apps/vulnerability/fed-mods.json`,
+    cdnPath: `${window.location.origin}/assets/apps/vulnerability/`,
+  },
+};
+
+export const mockUser = {
+  entitlements: {},
+  identity: {
+    account_number: 'string',
+    org_id: 'FOREMAN',
+    internal: {
+      org_id: 'string',
+      account_id: 'string',
+    },
+    type: 'string',
+    user: {
+      username: 'string',
+      email: 'string',
+      first_name: 'string',
+      last_name: 'string',
+      is_active: 'boolean',
+      is_internal: 'boolean',
+      is_org_admin: 'boolean',
+      locale: 'string',
+    },
+  },
+};
+
+export const providerOptions = {
+  pluginSDKOptions: {
+    pluginLoaderOptions: {
+      transformPluginManifest: manifest => {
+        if (
+          manifest.baseURL === 'auto' &&
+          modulesConfig[manifest.name]?.cdnPath
+        ) {
+          const _cdnPath = modulesConfig[manifest.name]?.cdnPath;
+          return {
+            ...manifest,
+            baseURL: _cdnPath,
+            loadScripts: manifest.loadScripts.map(
+              script => `${_cdnPath}${script}`
+            ),
+          };
+        }
+        return manifest;
+      },
+    },
+  },
+  api: {
+    chrome: {
+      isBeta: () => false,
+      on: () => {},
+      auth: {
+        getUser: () => Promise.resolve(mockUser),
+      },
+    },
+  },
+  config: modulesConfig,
+};

data/webpack/common/Switcher/SwitcherPF4.js

@@ -14,6 +14,7 @@ const SwitcherPF4 = ({
 }) => (
   <Switch
     className="foreman-rh-cloud-switcher"
+    ouiaId="foreman-rh-cloud-switcher"
     id={`rh-cloud-switcher-${id}`}
     isChecked={isChecked}
     isDisabled={isDisabled}

data/webpack/common/Switcher/__tests__/__snapshots__/SwitcherPF4.test.js.snap

@@ -19,5 +19,6 @@ exports[`InsightsCloudSync helpers should return insights cloud Url 1`] = `
     </div>
   }
   onChange={[MockFunction]}
+  ouiaId="foreman-rh-cloud-switcher"
 />
 `;

data/webpack/common/Switcher/index.js

@@ -49,6 +49,7 @@ const Switcher = ({
     <Grid.Col sm={SwitchCol} style={{ marginBottom: '5px' }}>
       <Switch
         id={`rh-cloud-switcher-${id}`}
+        ouiaId={`rh-cloud-switcher-${id}`}
         isChecked={isChecked}
         onChange={onChange}
         label=" "

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 12.1.4
+  version: 12.1.5
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
@@ -114,6 +114,7 @@ files:
 - app/controllers/insights_cloud/hits_controller.rb
 - app/controllers/insights_cloud/settings_controller.rb
 - app/controllers/insights_cloud/tasks_controller.rb
+- app/controllers/insights_cloud/ui_requests_controller.rb
 - app/helpers/foreman_insights_host_helper.rb
 - app/helpers/foreman_inventory_upload_helper.rb
 - app/helpers/foreman_inventory_upload_host_helper.rb
@@ -135,11 +136,14 @@ files:
 - app/services/foreman_rh_cloud/cloud_presence.rb
 - app/services/foreman_rh_cloud/cloud_request.rb
 - app/services/foreman_rh_cloud/cloud_request_forwarder.rb
+- app/services/foreman_rh_cloud/gateway_request.rb
 - app/services/foreman_rh_cloud/hit_remediations_retriever.rb
 - app/services/foreman_rh_cloud/hits_uploader.rb
+- app/services/foreman_rh_cloud/insights_api_forwarder.rb
 - app/services/foreman_rh_cloud/insights_status_cleaner.rb
 - app/services/foreman_rh_cloud/remediations_retriever.rb
 - app/services/foreman_rh_cloud/rules_ingester.rb
+- app/services/foreman_rh_cloud/tags_auth.rb
 - app/services/foreman_rh_cloud/template_renderer_helper.rb
 - app/services/foreman_rh_cloud/url_remediations_retriever.rb
 - app/views/api/v2/advisor_engine/host_details.json.rabl
@@ -239,6 +243,7 @@ files:
 - test/controllers/insights_cloud/api/advisor_engine_controller_test.rb
 - test/controllers/insights_cloud/api/cloud_request_controller_test.rb
 - test/controllers/insights_cloud/api/machine_telemetries_controller_test.rb
+- test/controllers/insights_cloud/ui_requests_controller_test.rb
 - test/controllers/insights_sync/settings_controller_test.rb
 - test/controllers/inventory_upload/api/inventory_controller_test.rb
 - test/controllers/inventory_upload/cloud_status_controller_test.rb
@@ -275,8 +280,10 @@ files:
 - test/unit/services/foreman_rh_cloud/cloud_status_service_test.rb
 - test/unit/services/foreman_rh_cloud/hit_remediations_retriever_test.rb
 - test/unit/services/foreman_rh_cloud/hits_uploader_test.rb
+- test/unit/services/foreman_rh_cloud/insights_api_forwarder_test.rb
 - test/unit/services/foreman_rh_cloud/insights_status_cleaner_test.rb
 - test/unit/services/foreman_rh_cloud/rules_ingester_test.rb
+- test/unit/services/foreman_rh_cloud/tags_auth_test.rb
 - test/unit/services/foreman_rh_cloud/template_renderer_helper_test.rb
 - test/unit/services/foreman_rh_cloud/url_remediations_retriever_test.rb
 - test/unit/shell_process_job_test.rb
@@ -610,8 +617,10 @@ files:
 - webpack/InsightsHostDetailsTab/components/ListItem/ListItem.js
 - webpack/InsightsHostDetailsTab/components/ListItem/index.js
 - webpack/InsightsHostDetailsTab/index.js
-- webpack/InsightsVulnerability/InsightsVulnerability.js
-- webpack/InsightsVulnerability/InsightsVulnerability.test.js
+- webpack/InsightsVulnerability/InsightsVulnerabilityListPage.js
+- webpack/InsightsVulnerability/InsightsVulnerabilityListPage.test.js
+- webpack/InsightsVulnerabilityHostIndexExtensions/CVECountCell.js
+- webpack/InsightsVulnerabilityHostIndexExtensions/__tests__/CVECountCell.test.js
 - webpack/__mocks__/foremanReact/Root/Context/ForemanContext.js
 - webpack/__mocks__/foremanReact/common/I18n.js
 - webpack/__mocks__/foremanReact/common/MountingService.js
@@ -638,6 +647,7 @@ files:
 - webpack/common/ForemanTasks/ForemanTasksHelpers.js
 - webpack/common/ForemanTasks/index.js
 - webpack/common/Hooks/ConfigHooks.js
+- webpack/common/ScalprumModule/ScalprumContext.js
 - webpack/common/Switcher/HelpLabel.js
 - webpack/common/Switcher/SwitcherPF4.js
 - webpack/common/Switcher/SwitcherPF4.scss
@@ -671,7 +681,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Summary of ForemanRhCloud.
 test_files:
@@ -679,6 +689,7 @@ test_files:
 - test/controllers/insights_cloud/api/advisor_engine_controller_test.rb
 - test/controllers/insights_cloud/api/cloud_request_controller_test.rb
 - test/controllers/insights_cloud/api/machine_telemetries_controller_test.rb
+- test/controllers/insights_cloud/ui_requests_controller_test.rb
 - test/controllers/insights_sync/settings_controller_test.rb
 - test/controllers/inventory_upload/api/inventory_controller_test.rb
 - test/controllers/inventory_upload/cloud_status_controller_test.rb
@@ -715,8 +726,10 @@ test_files:
 - test/unit/services/foreman_rh_cloud/cloud_status_service_test.rb
 - test/unit/services/foreman_rh_cloud/hit_remediations_retriever_test.rb
 - test/unit/services/foreman_rh_cloud/hits_uploader_test.rb
+- test/unit/services/foreman_rh_cloud/insights_api_forwarder_test.rb
 - test/unit/services/foreman_rh_cloud/insights_status_cleaner_test.rb
 - test/unit/services/foreman_rh_cloud/rules_ingester_test.rb
+- test/unit/services/foreman_rh_cloud/tags_auth_test.rb
 - test/unit/services/foreman_rh_cloud/template_renderer_helper_test.rb
 - test/unit/services/foreman_rh_cloud/url_remediations_retriever_test.rb
 - test/unit/shell_process_job_test.rb

data/webpack/InsightsVulnerability/InsightsVulnerability.js

@@ -1,13 +0,0 @@
-import React from 'react';
-import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
-import { translate as __ } from 'foremanReact/common/I18n';
-
-const InsightsVulnerability = () => (
-  <PageLayout searchable={false} header={__('Vulnerability')}>
-    <div className="insights-vulnerability">
-      <p>This page is under development. Please check back soon for updates.</p>
-    </div>
-  </PageLayout>
-);
-
-export default InsightsVulnerability;

data/webpack/InsightsVulnerability/InsightsVulnerability.test.js

@@ -1,18 +0,0 @@
-import React from 'react';
-import { render, screen } from '@testing-library/react';
-import '@testing-library/jest-dom';
-import InsightsVulnerability from './InsightsVulnerability';
-
-describe('InsightsVulnerability component', () => {
-  it('renders the "under development" message', () => {
-    render(<InsightsVulnerability />);
-    expect(
-      screen.getByText(/this page is under development/i)
-    ).toBeInTheDocument();
-  });
-
-  it('renders the container with correct class', () => {
-    const { container } = render(<InsightsVulnerability />);
-    expect(container.querySelector('.insights-vulnerability')).toBeTruthy();
-  });
-});