foreman_rh_cloud 14.3.0 → 14.5.0

data/webpack/InsightsHostDetailsTab/components/ListItem/__tests__/ListItem.test.js

@@ -0,0 +1,111 @@
+import React from 'react';
+import { screen } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import userEvent from '@testing-library/user-event';
+import { Accordion } from '@patternfly/react-core';
+import { rtlHelpers } from 'foremanReact/common/rtlTestHelpers';
+import ListItem from '../ListItem';
+
+const { renderWithI18n } = rtlHelpers;
+
+const defaultProps = {
+  title: 'Test recommendation title',
+  totalRisk: 2,
+  resultsUrl:
+    'https://cloud.redhat.com/insights/advisor/recommendations/example',
+  solutionUrl: 'https://access.redhat.com/solutions/123456',
+};
+
+const renderListItem = (props = {}) =>
+  renderWithI18n(
+    <Accordion>
+      <ListItem {...defaultProps} {...props} />
+    </Accordion>
+  );
+
+describe('ListItem', () => {
+  it('renders the recommendation title when collapsed', async () => {
+    renderListItem();
+
+    expect(
+      await screen.findByText('Test recommendation title')
+    ).toBeInTheDocument();
+  });
+
+  it('renders the total risk label when collapsed', async () => {
+    renderListItem({ totalRisk: 2 });
+
+    expect(await screen.findByText('Moderate')).toBeInTheDocument();
+  });
+
+  it('does not show detail links before expanding', async () => {
+    renderListItem();
+
+    await screen.findByText('Test recommendation title');
+
+    expect(
+      screen.queryByRole('link', { name: /Knowledgebase article/i })
+    ).not.toBeInTheDocument();
+    expect(
+      screen.queryByRole('link', {
+        name: /Read more about it in RH cloud insights/i,
+      })
+    ).not.toBeInTheDocument();
+  });
+
+  it('shows detail links after expanding the recommendation', async () => {
+    renderListItem();
+
+    await userEvent.click(await screen.findByRole('button'));
+
+    const knowledgebaseLink = screen.getByRole('link', {
+      name: /Knowledgebase article/i,
+    });
+    expect(knowledgebaseLink).toHaveAttribute('href', defaultProps.solutionUrl);
+    expect(knowledgebaseLink).toHaveAttribute('target', '_blank');
+    expect(knowledgebaseLink).toHaveAttribute('rel', 'noopener noreferrer');
+
+    const insightsCloudLink = screen.getByRole('link', {
+      name: /Read more about it in RH cloud insights/i,
+    });
+    expect(insightsCloudLink).toHaveAttribute('href', defaultProps.resultsUrl);
+    expect(insightsCloudLink).toHaveAttribute('target', '_blank');
+    expect(insightsCloudLink).toHaveAttribute('rel', 'noopener noreferrer');
+  });
+
+  it('omits the knowledgebase link when no solution URL is provided', async () => {
+    renderListItem({ solutionUrl: '' });
+
+    await userEvent.click(await screen.findByRole('button'));
+
+    expect(
+      screen.queryByRole('link', { name: /Knowledgebase article/i })
+    ).not.toBeInTheDocument();
+
+    const insightsCloudLink = screen.getByRole('link', {
+      name: /Read more about it in RH cloud insights/i,
+    });
+    expect(insightsCloudLink).toBeInTheDocument();
+    expect(insightsCloudLink).toHaveAttribute('target', '_blank');
+    expect(insightsCloudLink).toHaveAttribute('rel', 'noopener noreferrer');
+  });
+
+  it('omits the insights cloud link when no results URL is provided', async () => {
+    renderListItem({ resultsUrl: '' });
+
+    await userEvent.click(await screen.findByRole('button'));
+
+    const knowledgebaseLink = screen.getByRole('link', {
+      name: /Knowledgebase article/i,
+    });
+    expect(knowledgebaseLink).toBeInTheDocument();
+    expect(knowledgebaseLink).toHaveAttribute('target', '_blank');
+    expect(knowledgebaseLink).toHaveAttribute('rel', 'noopener noreferrer');
+
+    expect(
+      screen.queryByRole('link', {
+        name: /Read more about it in RH cloud insights/i,
+      })
+    ).not.toBeInTheDocument();
+  });
+});

data/webpack/InsightsVulnerabilityActionsBar/__tests__/InsightsVulnerabilityActionsBar.test.js

@@ -1,13 +1,11 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
-import * as ForemanContext from 'foremanReact/Root/Context/ForemanContext';
 import { ForemanHostsIndexActionsBarContext } from 'foremanReact/components/HostsIndex';
 import * as ConfigHooks from '../../common/Hooks/ConfigHooks';
 import InsightsVulnerabilityActionsBar from '../index';
 
 jest.mock('../../common/Hooks/ConfigHooks');
-jest.mock('foremanReact/Root/Context/ForemanContext');
 jest.mock('../InsightsVulnerabilityActionsBarActions');
 
 const mockContextValue = {
@@ -16,11 +14,9 @@ const mockContextValue = {
   setMenuOpen: jest.fn(),
 };
 
-const renderComponent = (contextOverrides = {}, orgId = 1) => {
+const renderComponent = (contextOverrides = {}) => {
   const contextValue = { ...mockContextValue, ...contextOverrides };
 
-  ForemanContext.useForemanOrganization.mockReturnValue({ id: orgId });
-
   return render(
     <ForemanHostsIndexActionsBarContext.Provider value={contextValue}>
       <InsightsVulnerabilityActionsBar />

data/webpack/IopPathwayDetails/IopPathwayDetails.js

@@ -0,0 +1,40 @@
+import React from 'react';
+import { useRouteMatch } from 'react-router-dom';
+import { ScalprumComponent, ScalprumProvider } from '@scalprum/react-core';
+
+import RemediationModal from '../InsightsCloudSync/Components/RemediationModal';
+import { createProviderOptions } from '../common/ScalprumModule/ScalprumContext';
+import { useInsightsPermissions } from '../common/Hooks/PermissionsHooks';
+
+const scope = 'advisor';
+const pathwayModule = './PathwayDetailsWrapped';
+
+const IopPathwayDetails = props => {
+  const pathwayMatch = useRouteMatch(
+    '/foreman_rh_cloud/recommendations/pathways/:slug'
+  );
+  const slug = pathwayMatch?.params?.slug;
+
+  return (
+    <div className="iop-pathway-details-scalprum advisor">
+      <ScalprumComponent
+        scope={scope}
+        module={pathwayModule}
+        pathwayId={slug}
+        IopRemediationModal={RemediationModal}
+        {...props}
+      />
+    </div>
+  );
+};
+
+const IopPathwayDetailsWrapped = props => {
+  const permissions = useInsightsPermissions();
+  return (
+    <ScalprumProvider {...createProviderOptions(permissions)}>
+      <IopPathwayDetails {...props} />
+    </ScalprumProvider>
+  );
+};
+
+export default IopPathwayDetailsWrapped;

data/webpack/IopRecommendationDetails/IopRecommendationDetails.js

@@ -8,30 +8,12 @@ import { useInsightsPermissions } from '../common/Hooks/PermissionsHooks';
 
 const scope = 'advisor';
 const module = './RecommendationDetailsWrapped';
-const pathwayModule = './PathwayDetailsWrapped';
 
 const IopRecommendationDetails = props => {
-  const pathwayMatch = useRouteMatch(
-    '/foreman_rh_cloud/recommendations/pathways/:slug'
-  );
   const urlParams = useRouteMatch('/foreman_rh_cloud/recommendations/:rule_id');
   // eslint-disable-next-line camelcase
   const ruleId = urlParams?.params?.rule_id;
 
-  if (pathwayMatch) {
-    return (
-      <div className="iop-pathway-details-scalprum advisor">
-        <ScalprumComponent
-          scope={scope}
-          module={pathwayModule}
-          pathwayId={pathwayMatch.params.slug}
-          IopRemediationModal={RemediationModal}
-          {...props}
-        />
-      </div>
-    );
-  }
-
   return (
     <div className="iop-recommendation-details-scalprum advisor">
       <ScalprumComponent

data/webpack/common/DropdownToggle.js

@@ -18,6 +18,7 @@ const DropdownToggle = ({ items, ...props }) => {
           aria-label={__('Table actions')}
           onClick={() => setOpen(prev => !prev)}
           isExpanded={isOpen}
+          ouiaId="toggle-dropdown-toggle"
         >
           <EllipsisVIcon />
         </MenuToggle>

data/webpack/common/Switcher/HelpLabel.js

@@ -1,18 +1,20 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Popover } from '@patternfly/react-core';
+import { Button, Popover } from '@patternfly/react-core';
 import { HelpIcon } from '@patternfly/react-icons';
 
 export const HelpLabel = ({ text, id, className }) => {
   if (!text) return null;
+
   return (
     <Popover id={`${id}-help`} bodyContent={text} aria-label="help-text">
-      <button
-        onClick={e => e.preventDefault()}
-        className={`pf-v5-c-form__group-label-help ${className}`}
+      <Button
+        variant="plain"
+        ouiaId={`help-button-${id}`}
+        className={className}
       >
         <HelpIcon />
-      </button>
+      </Button>
     </Popover>
   );
 };

data/webpack/test_setup.js

@@ -0,0 +1 @@
+import 'foremanJSTestSetup';

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 14.3.0
+  version: 14.5.0
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
@@ -107,7 +107,6 @@ files:
 - app/overrides/layouts/base/styles.html.erb.deface
 - app/services/foreman_rh_cloud/branch_info.rb
 - app/services/foreman_rh_cloud/cert_auth.rb
-- app/services/foreman_rh_cloud/cloud_connector.rb
 - app/services/foreman_rh_cloud/cloud_ping_service.rb
 - app/services/foreman_rh_cloud/cloud_presence.rb
 - app/services/foreman_rh_cloud/cloud_request.rb
@@ -464,6 +463,7 @@ files:
 - webpack/InsightsHostDetailsTab/__tests__/InsightsTotalRiskChart.test.js
 - webpack/InsightsHostDetailsTab/__tests__/NewHostDetailsTab.test.js
 - webpack/InsightsHostDetailsTab/components/ListItem/ListItem.js
+- webpack/InsightsHostDetailsTab/components/ListItem/__tests__/ListItem.test.js
 - webpack/InsightsHostDetailsTab/components/ListItem/index.js
 - webpack/InsightsHostDetailsTab/index.js
 - webpack/InsightsVulnerability/InsightsVulnerabilityListPage.js
@@ -475,21 +475,16 @@ files:
 - webpack/InsightsVulnerabilityActionsBar/index.js
 - webpack/InsightsVulnerabilityHostIndexExtensions/CVECountCell.js
 - webpack/InsightsVulnerabilityHostIndexExtensions/__tests__/CVECountCell.test.js
+- webpack/IopPathwayDetails/IopPathwayDetails.js
 - webpack/IopRecommendationDetails/IopRecommendationDetails.js
-- webpack/__mocks__/foremanReact/Root/Context/ForemanContext.js
-- webpack/__mocks__/foremanReact/common/I18n.js
 - webpack/__mocks__/foremanReact/common/MountingService.js
-- webpack/__mocks__/foremanReact/common/helpers.js
 - webpack/__mocks__/foremanReact/components/ConfirmModal/index.js
 - webpack/__mocks__/foremanReact/components/Head.js
 - webpack/__mocks__/foremanReact/components/HostsIndex/index.js
 - webpack/__mocks__/foremanReact/components/Layout/LayoutConstants.js
 - webpack/__mocks__/foremanReact/components/ToastsList/index.js
 - webpack/__mocks__/foremanReact/components/common/dates/RelativeDateTime.js
-- webpack/__mocks__/foremanReact/constants.js
 - webpack/__mocks__/foremanReact/redux.js
-- webpack/__mocks__/foremanReact/redux/API/APISelectors.js
-- webpack/__mocks__/foremanReact/redux/API/index.js
 - webpack/__mocks__/foremanReact/redux/middlewares/IntervalMiddleware.js
 - webpack/__mocks__/foremanReact/routes/RouterSelector.js
 - webpack/__mocks__/foremanReact/routes/common/PageLayout/PageLayout.js
@@ -512,6 +507,7 @@ files:
 - webpack/common/table/helpers.js
 - webpack/global_index.js
 - webpack/index.js
+- webpack/test_setup.js
 homepage: https://github.com/theforeman/foreman_rh_cloud
 licenses:
 - GPL-3.0

data/app/services/foreman_rh_cloud/cloud_connector.rb

@@ -1,74 +0,0 @@
-require 'securerandom'
-
-module ForemanRhCloud
-  class CloudConnector
-    CLOUD_CONNECTOR_USER = 'cloud_connector_user'.freeze
-    CLOUD_CONNECTOR_TOKEN_NAME = 'Cloud connector access token'.freeze
-    CLOUD_CONNECTOR_FEATURE = 'ansible_configure_cloud_connector'.freeze
-
-    def install
-      user = service_user
-      token_value = personal_access_token(user)
-      target_host = foreman_host
-      composer = nil
-
-      input = {
-        :satellite_cloud_connector_user => service_user.login,
-        :satellite_cloud_connector_password => token_value,
-      }
-
-      if (http_proxy = ForemanRhCloud.proxy_setting)
-        input[:satellite_cloud_connector_http_proxy] = http_proxy
-      end
-
-      Taxonomy.as_taxonomy(target_host.organization, target_host.location) do
-        composer = ::JobInvocationComposer.for_feature(
-          CLOUD_CONNECTOR_FEATURE,
-          [target_host.id],
-          input
-        )
-        composer.trigger!
-      end
-
-      composer.job_invocation
-    end
-
-    def latest_job
-      feature_id = RemoteExecutionFeature.find_by_label(CLOUD_CONNECTOR_FEATURE)&.id
-      return nil unless feature_id
-      JobInvocation.where(:remote_execution_feature_id => feature_id).includes(:task).reorder('foreman_tasks_tasks.started_at DESC').first
-    end
-
-    def personal_access_token(user)
-      access_token = PersonalAccessToken.find_by_name(CLOUD_CONNECTOR_TOKEN_NAME)
-
-      access_token&.destroy! # destroy the old token if exists
-
-      personal_access_token = PersonalAccessToken.new(:name => CLOUD_CONNECTOR_TOKEN_NAME, :user => user)
-      token_value = personal_access_token.generate_token
-      personal_access_token.save!
-
-      token_value
-    end
-
-    def service_user
-      user = User.find_by_login(CLOUD_CONNECTOR_USER)
-
-      if user.nil?
-        user = User.create!(
-          :login => CLOUD_CONNECTOR_USER,
-          :password => SecureRandom.base64(255),
-          :description => "This is a service user used by cloud connector to talk to the Satellite API",
-          :auth_source => AuthSourceInternal.first,
-          :admin => true
-        )
-      end
-
-      user
-    end
-
-    def foreman_host
-      ForemanRhCloud.foreman_host
-    end
-  end
-end

data/webpack/__mocks__/foremanReact/Root/Context/ForemanContext.js

@@ -1,6 +0,0 @@
-export const useForemanSettings = jest.fn(() => ({ perPage: 20 }));
-export const useForemanOrganization = jest.fn(() => ({
-  id: 1,
-  title: 'some-org',
-}));
-export const useForemanContext = jest.fn(() => ({ metadata: {} }));

data/webpack/__mocks__/foremanReact/common/I18n.js

@@ -1,6 +0,0 @@
-export { sprintf } from 'jed';
-
-export const translate = s => s;
-
-export const ngettext = (singular, plural, count) =>
-  count === 1 ? singular : plural;

data/webpack/__mocks__/foremanReact/common/helpers.js

@@ -1,14 +0,0 @@
-import camelCase from 'lodash/camelCase';
-
-export const getURIQuery = jest.fn(() => ({}));
-
-export const noop = Function.prototype;
-
-export const propsToCamelCase = ob => {
-  if (typeof ob !== 'object' || ob === null) return ob;
-
-  return Object.keys(ob).reduce((memo, key) => {
-    memo[camelCase(key)] = ob[key];
-    return memo;
-  }, {});
-};

data/webpack/__mocks__/foremanReact/constants.js

@@ -1,24 +0,0 @@
-export const STATUS = {
-  PENDING: 'PENDING',
-  RESOLVED: 'RESOLVED',
-  ERROR: 'ERROR',
-};
-
-export const getControllerSearchProps = (
-  controller,
-  id = 'searchBar',
-  canCreateBookmarks = true
-) => ({
-  controller,
-  autocomplete: {
-    id,
-    searchQuery: '',
-    url: `${controller}/auto_complete_search`,
-    useKeyShortcuts: true,
-  },
-  bookmarks: {
-    url: '/api/bookmarks',
-    canCreateBookmarks,
-    documentationUrl: `4.1.5Searching`,
-  },
-});

data/webpack/__mocks__/foremanReact/redux/API/APISelectors.js

@@ -1,24 +0,0 @@
-import { STATUS } from '../../constants';
-
-export const selectAPI = state => state.API || {};
-
-export const selectAPIByKey = (state, key) => selectAPI(state)[key] || {};
-
-export const selectAPIStatus = (state, key) =>
-  selectAPIByKey(state, key).status;
-
-export const selectAPIPayload = (state, key) =>
-  selectAPIByKey(state, key).payload || {};
-
-export const selectAPIResponse = (state, key) =>
-  selectAPIByKey(state, key).response || {};
-
-export const selectAPIError = (state, key) =>
-  selectAPIStatus(state, key) === STATUS.ERROR
-    ? selectAPIResponse(state, key)
-    : null;
-
-export const selectAPIErrorMessage = (state, key) => {
-  const error = selectAPIError(state, key);
-  return error && error.message;
-};

data/webpack/__mocks__/foremanReact/redux/API/index.js

@@ -1,12 +0,0 @@
-export const get = data => ({ type: 'get-some-type', ...data });
-export const put = data => ({ type: 'put-some-type', ...data });
-export const post = data => ({ type: 'post-some-type', ...data });
-export const patch = data => ({ type: 'patch-some-type', ...data });
-
-export const API = {
-  get: jest.fn(),
-  put: jest.fn(),
-  post: jest.fn(),
-  delete: jest.fn(),
-  patch: jest.fn(),
-};