foreman_rh_cloud 12.2.0 → 12.2.2

data/webpack/CVEsHostDetailsTab/CVEsHostDetailsTab.scss

@@ -0,0 +1,3 @@
+div.rh-cloud-insights-vulnerability-host-details-component {
+  padding: 24px;
+}

data/webpack/CveDetailsPage/CveDetailsPage.js

@@ -10,7 +10,7 @@ const CveDetailsPage = () => {
 
   return (
     <ScalprumProvider {...providerOptions}>
-      <div className="rh-cloud-cve-details-page">
+      <div className="rh-cloud-cve-details-page vulnerability">
         <ScalprumComponent scope={scope} module={module} cveId={cveId} />
       </div>
     </ScalprumProvider>

data/webpack/CveDetailsPage/CveDetailsPage.test.js

@@ -18,9 +18,7 @@ jest.mock('@scalprum/react-core', () => ({
 describe('CveDetailsPage component', () => {
   it('renders the container with correct class', () => {
     const { container } = render(<CveDetailsPage />);
-    expect(
-      container.querySelector('.rh-cloud-cve-details-page')
-    ).toBeTruthy();
+    expect(container.querySelector('.rh-cloud-cve-details-page')).toBeTruthy();
   });
 
   it('passes cveId from URL params to ScalprumComponent', () => {

data/webpack/ForemanColumnExtensions/index.js

@@ -1,9 +1,10 @@
 import React from 'react';
-import { ScalprumComponent, ScalprumProvider } from '@scalprum/react-core';
+import PropTypes from 'prop-types';
+import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
+import { Link } from 'react-router-dom';
 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 HostedRecommendationsCell = hostDetails => {
   const insightsAttributes = propsToCamelCase(
@@ -18,22 +19,26 @@ const HostedRecommendationsCell = hostDetails => {
   return <a href={hitsUrl}>{hitsCount}</a>;
 };
 
-const IopRecommendationsCell = hostDetails => {
-  const scope = 'advisor';
-  const module = './RecommendationsCellWrapped';
+const IopRecommendationsCell = ({ hostDetails }) => {
+  // eslint-disable-next-line camelcase
+  const uuid = hostDetails?.insights_attributes?.uuid;
+  const { response } = useAPI(
+    uuid ? 'get' : null,
+    `/insights_cloud/api/insights/v1/system/${uuid}`,
+    { key: `HOST_RECS_COUNT_${uuid}` }
+  );
 
-  return (
-    <span className="rh-cloud-insights-recommendations-cell">
-      <ScalprumComponent scope={scope} module={module} />
-    </span>
+  const hits = response?.hits;
+  return hits === undefined ? (
+    '—'
+  ) : (
+    <Link to={`hosts/${hostDetails.name}#/Insights`}>{hits}</Link>
   );
 };
 
-const IopRecommendationsCellWrapped = hostDetails => (
-  <ScalprumProvider {...providerOptions}>
-    <IopRecommendationsCell hostDetails={hostDetails} />
-  </ScalprumProvider>
-);
+IopRecommendationsCell.propTypes = {
+  hostDetails: PropTypes.object.isRequired,
+};
 
 const RecommendationsCell = hostDetails => {
   const insightsAttributes = propsToCamelCase(
@@ -42,7 +47,7 @@ const RecommendationsCell = hostDetails => {
   );
 
   return insightsAttributes.useLocalAdvisorEngine ? (
-    <IopRecommendationsCellWrapped hostDetails={hostDetails} />
+    <IopRecommendationsCell hostDetails={hostDetails} />
   ) : (
     <HostedRecommendationsCell hostDetails={hostDetails} />
   );

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/PageDescription.js

@@ -3,6 +3,7 @@ import { Text } from '@patternfly/react-core';
 import { useSelector } from 'react-redux';
 
 import { translate as __ } from 'foremanReact/common/I18n';
+import { getDocsURL } from 'foremanReact/common/helpers';
 import { FormattedMessage } from 'react-intl';
 import { selectSubscriptionConnectionEnabled } from '../../../InventorySettings/InventorySettingsSelectors';
 
@@ -53,6 +54,28 @@ export const PageDescription = () => {
           />
         </Text>
       )}
+      <Text ouiaId="text-minimal-data-collection">
+        <FormattedMessage
+          id="minimal-data-collection-message"
+          defaultMessage={__(
+            'Learn more about {minimalDataCollectionSetting}.'
+          )}
+          values={{
+            minimalDataCollectionSetting: (
+              <a
+                href={getDocsURL(
+                  'Managing_Hosts',
+                  'setting-minimal-data-collection'
+                )}
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                {__('setting minimal data collection')}
+              </a>
+            ),
+          }}
+        />
+      </Text>
       <Text ouiaId="text-more-info-subscription">
         {__('For more information about the Subscriptions service, see:')}
         &nbsp;

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/__tests__/PageDescription.test.js

@@ -15,6 +15,8 @@ jest.mock('react-intl', () => {
     }),
   };
 });
+jest.mock('foremanReact/common/helpers', () => ({ getDocsURL: () => {} }));
+
 const middlewares = [thunk];
 const mockStore = configureMockStore(middlewares);
 

data/webpack/ForemanRhCloudPages.js

@@ -8,6 +8,7 @@ import InsightsCloudSync from './InsightsCloudSync';
 import IopRecommendationDetails from './IopRecommendationDetails/IopRecommendationDetails';
 import InsightsHostDetailsTab from './InsightsHostDetailsTab';
 import CveDetailsPage from './CveDetailsPage';
+import './common/styles.scss';
 
 const pages = [
   { name: 'ForemanInventoryUpload', type: ForemanInventoryUpload },

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

@@ -3,7 +3,15 @@ import React from 'react';
 import { orderBy } from 'lodash';
 import Resolutions from './Resolutions';
 
-export const modifyRows = (remediations, setResolutions, setHostsIds) => {
+export const getResolutionId = (selectedResolution, id) =>
+  `${id}_${selectedResolution}`;
+
+export const modifyRows = (
+  remediations,
+  setResolutions,
+  setHostsIds,
+  isIop
+) => {
   if (remediations.length === 0) return [];
 
   const resolutionToSubmit = [];
@@ -15,9 +23,22 @@ export const modifyRows = (remediations, setResolutions, setHostsIds) => {
   ).map(({ id, host_id, hostname, title, resolutions, reboot }) => {
     hostsIdsToSubmit.add(host_id);
     const selectedResolution = resolutions[0]?.id;
+    /* eslint-disable spellcheck/spell-checker */
+
+    // For IoP: {
+    //  hit_id: "c7c6727e-2966-4f7c-87f1-20ef14db7a2d",
+    //  rule_id: "hardening_ssh_client_alive|OPENSSH_HARDENING_CLIENT_ALIVE",
+    //  resolution_type: "less_secure",
+    //  resolution_id:"hardening_ssh_client_alive|OPENSSH_HARDENING_CLIENT_ALIVE_less_secure",
+    // }
+    // for Hosted, hit_id and rule_id will be Foreman database IDs
+
+    /* eslint-enable spellcheck/spell-checker */
     resolutionToSubmit.push({
-      hit_id: id,
-      resolution_id: selectedResolution /** defaults to the first resolution if many */,
+      hit_id: isIop ? host_id : id,
+      rule_id: id,
+      resolution_type: selectedResolution /** defaults to the first resolution if many */,
+      resolution_id: getResolutionId(selectedResolution, id),
     });
     return {
       cells: [
@@ -25,10 +46,11 @@ export const modifyRows = (remediations, setResolutions, setHostsIds) => {
         title,
         <div>
           <Resolutions
-            hit_id={id}
+            hit_id={isIop ? host_id : id}
             resolutions={resolutions}
             setResolutions={setResolutions}
             selectedResolution={selectedResolution}
+            isIop={isIop}
           />
         </div>,
         reboot,

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

@@ -1,5 +1,6 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import React, { useEffect } from 'react';
+import Immutable from 'seamless-immutable';
 import PropTypes from 'prop-types';
 import {
   Table,
@@ -7,7 +8,7 @@ import {
   TableBody,
 } from '@patternfly/react-table/deprecated';
 import { Modal, ModalVariant, Button } from '@patternfly/react-core';
-import { isEmpty } from 'lodash';
+import { isEmpty, noop } from 'lodash';
 import { STATUS } from 'foremanReact/constants';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { columns } from './RemediationTableConstants';
@@ -15,8 +16,48 @@ import { modifyRows } from './RemediationHelpers';
 import ModalFooter from './RemediationModalFooter';
 import TableEmptyState from '../../../common/table/EmptyState';
 import './RemediationModal.scss';
+import { useAdvisorEngineConfig } from '../../../common/Hooks/ConfigHooks';
+
+/* eslint-disable spellcheck/spell-checker */
+
+// Sample iopData:
+// const iopTestData = Immutable([
+//   {
+//     hostid: 'c7c6727e-2966-4f7c-87f1-20ef14db7a2d',
+//     host_name: 'advisor-test.local',
+//     rulename: 'hardening_cryptopol_krb5|NO_CPOL_KRB5',
+//     resolutions: [
+//       {
+//         description: 'Remove manual crypto-policies',
+//         id: 'fix',
+//         needs_reboot: true,
+//         resolution_risk: 1,
+//       },
+//     ],
+//     rebootable: true,
+//     description: 'Decreased security: krb5 crypto-policies overridden',
+//   },
+//   {
+//     hostid: 'c7c6727e-2966-4f7c-87f1-20ef14db7a2d',
+//     host_name: 'advisor-test.local',
+//     rulename: 'hardening_logging_auditd|HARDENING_LOGGING_5_AUDITD',
+//     resolutions: [
+//       {
+//         description: 'Install and enable auditd',
+//         id: 'fix',
+//         needs_reboot: false,
+//         resolution_risk: 1,
+//       },
+//     ],
+//     rebootable: false,
+//     description: 'Decreased security: auditd not running',
+//   },
+// ]);
+
+/* eslint-enable spellcheck/spell-checker */
 
 const RemediationModal = ({
+  iopData,
   selectedIds,
   fetchRemediations,
   remediations,
@@ -24,31 +65,49 @@ const RemediationModal = ({
   error,
   isAllSelected,
   query,
+  isDisabled,
 }) => {
-  const [rows, setRows] = React.useState([]);
+  const iopRows = Immutable(iopData ?? []).map(recommendation => ({
+    id: recommendation.rulename,
+    host_id: recommendation.hostid,
+    hostname: recommendation.host_name,
+    title: recommendation.description,
+    resolutions: recommendation.resolutions ?? [],
+    reboot: recommendation.rebootable,
+  }));
+
   const [open, setOpen] = React.useState(false);
   const [resolutions, setResolutions] = React.useState([]);
   const [hostsIds, setHostsIds] = React.useState([]);
+  const [rows, setRows] = React.useState([]);
   const toggleModal = () => setOpen(prevValue => !prevValue);
 
+  const isIop = useAdvisorEngineConfig();
   useEffect(() => {
-    if (open) fetchRemediations({ selectedIds, isAllSelected, query });
+    // only fetch for Hosted. IoP provides via props.
+    if (!isIop && open)
+      fetchRemediations({ selectedIds, isAllSelected, query });
   }, [open]);
 
   useEffect(() => {
-    const modifiedRows =
-      status === STATUS.PENDING
-        ? []
-        : modifyRows(remediations, setResolutions, setHostsIds);
+    let modifiedRows;
+    if (isIop) {
+      modifiedRows = modifyRows(iopRows, setResolutions, setHostsIds, true);
+    } else {
+      modifiedRows =
+        status === STATUS.PENDING
+          ? []
+          : modifyRows(remediations, setResolutions, setHostsIds, false);
+    }
     setRows(modifiedRows);
-  }, [remediations, status]);
+  }, [remediations, status, iopData, isIop]);
 
   return (
     <React.Fragment>
       <Button
         ouiaId="button-remediate"
         variant="primary"
-        isDisabled={isEmpty(selectedIds)}
+        isDisabled={isDisabled || isEmpty(selectedIds)}
         onClick={() => {
           toggleModal();
         }}
@@ -68,6 +127,7 @@ const RemediationModal = ({
             toggleModal={toggleModal}
             resolutions={resolutions}
             hostsIds={hostsIds}
+            isIop={isIop}
           />
         }
       >
@@ -92,22 +152,36 @@ const RemediationModal = ({
 };
 
 RemediationModal.propTypes = {
-  selectedIds: PropTypes.object,
-  fetchRemediations: PropTypes.func.isRequired,
+  iopData: PropTypes.arrayOf(
+    PropTypes.shape({
+      hostid: PropTypes.string,
+      host_name: PropTypes.string,
+      rulename: PropTypes.string,
+      resolutions: PropTypes.array,
+      rebootable: PropTypes.bool,
+      description: PropTypes.string,
+    })
+  ),
+  selectedIds: PropTypes.shape({}),
+  fetchRemediations: PropTypes.func,
   remediations: PropTypes.array,
   status: PropTypes.string,
   error: PropTypes.string,
   isAllSelected: PropTypes.bool,
   query: PropTypes.string,
+  isDisabled: PropTypes.bool,
 };
 
 RemediationModal.defaultProps = {
+  iopData: null,
   selectedIds: {},
+  fetchRemediations: noop,
   remediations: [],
   status: null,
   error: null,
   isAllSelected: false,
   query: null,
+  isDisabled: false,
 };
 
 export default RemediationModal;

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

@@ -2,18 +2,44 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Button } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
+import { useBulkSelect } from 'foremanReact/components/PF4/TableIndexPage/Table/TableHooks';
 import { JOB_INVOCATION_PATH } from './RemediationTableConstants';
 
-const ModalFooter = ({ toggleModal, resolutions, hostsIds }) => {
+const ModalFooter = ({ toggleModal, resolutions, hostsIds, isIop }) => {
   let token = document.querySelector('meta[name="csrf-token"]');
   token = token?.content || '';
+
+  const [jobInProgress, setJobInProgress] = React.useState(false);
+  const formRef = React.useRef(null);
+
+  const { fetchBulkParams } = useBulkSelect({
+    initialArry: hostsIds,
+    idColumn: 'insights_uuid',
+  });
+
+  const handleSubmit = e => {
+    e.preventDefault();
+    setJobInProgress(true);
+
+    setTimeout(() => {
+      // eslint-disable-next-line no-unused-expressions
+      formRef.current?.submit?.();
+    }, 100);
+  };
   return (
-    <form action={JOB_INVOCATION_PATH} method="post">
+    <form
+      action={JOB_INVOCATION_PATH}
+      method="post"
+      ref={formRef}
+      onSubmit={handleSubmit}
+    >
       <Button
         type="submit"
         ouiaId="button-confirm"
         key="confirm"
         variant="primary"
+        isDisabled={jobInProgress}
+        isLoading={jobInProgress}
       >
         {__('Remediate')}
       </Button>
@@ -32,9 +58,15 @@ const ModalFooter = ({ toggleModal, resolutions, hostsIds }) => {
         name="inputs[hit_remediation_pairs]"
         value={JSON.stringify(resolutions)}
       />
-      {hostsIds.map(id => (
-        <input type="hidden" name="host_ids[]" key={id} value={id} />
-      ))}
+      {!isIop &&
+        hostsIds.map(id => (
+          <input type="hidden" name="host_ids[]" key={id} value={id} />
+        ))}
+      {isIop && (
+        <>
+          <input type="hidden" name="search" value={fetchBulkParams()} />
+        </>
+      )}
     </form>
   );
 };
@@ -43,11 +75,13 @@ ModalFooter.propTypes = {
   toggleModal: PropTypes.func.isRequired,
   resolutions: PropTypes.array,
   hostsIds: PropTypes.array,
+  isIop: PropTypes.bool,
 };
 
 ModalFooter.defaultProps = {
   resolutions: [],
   hostsIds: [],
+  isIop: false,
 };
 
 export default ModalFooter;

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

@@ -2,12 +2,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Radio } from '@patternfly/react-core';
+import { getResolutionId } from './RemediationHelpers';
 
 const Resolutions = ({
   resolutions,
   setResolutions,
   selectedResolution,
   hit_id,
+  isIop,
 }) => {
   const [checkedID, setCheckedID] = React.useState(selectedResolution);
 
@@ -27,6 +29,15 @@ const Resolutions = ({
               stateRes.map(res => {
                 if (hit_id === res.hit_id) {
                   setCheckedID(resolution_id);
+                  if (isIop)
+                    return {
+                      ...res,
+                      resolution_id: getResolutionId(
+                        resolution_id,
+                        res.rule_id
+                      ),
+                      resolution_type: resolution_id,
+                    };
                   return { ...res, resolution_id };
                 }
                 return res;
@@ -45,12 +56,14 @@ Resolutions.propTypes = {
   resolutions: PropTypes.array,
   hit_id: PropTypes.number,
   selectedResolution: PropTypes.number,
+  isIop: PropTypes.bool,
 };
 
 Resolutions.defaultProps = {
   resolutions: [],
   hit_id: null,
   selectedResolution: null,
+  isIop: false,
 };
 
 export default Resolutions;

data/webpack/InsightsCloudSync/InsightsCloudSync.js

@@ -67,13 +67,15 @@ export const generateRuleUrl = ruleId =>
   foremanUrl(`/foreman_rh_cloud/recommendations/${ruleId}`);
 
 const IopRecommendationsPage = props => (
-  <ScalprumComponent
-    scope={scope}
-    module={module}
-    IopRemediationModal={RemediationModal}
-    generateRuleUrl={generateRuleUrl}
-    {...props}
-  />
+  <div className="advisor">
+    <ScalprumComponent
+      scope={scope}
+      module={module}
+      IopRemediationModal={RemediationModal}
+      generateRuleUrl={generateRuleUrl}
+      {...props}
+    />
+  </div>
 );
 
 const IopRecommendationsPageWrapped = props => (

data/webpack/InsightsHostDetailsTab/NewHostDetailsTab.js

@@ -110,17 +110,18 @@ NewHostDetailsTab.defaultProps = {
 
 // Local Insights advisor
 const scope = 'advisor';
-// eslint-disable-next-line spellcheck/spell-checker
-const module = './HostDetailsLightspeedTabWrapped';
+const module = './SystemDetailWrapped';
 
 const IopInsightsTab = props => (
-  <ScalprumComponent
-    scope={scope}
-    module={module}
-    IopRemediationModal={RemediationModal}
-    generateRuleUrl={generateRuleUrl}
-    {...props}
-  />
+  <div className="advisor">
+    <ScalprumComponent
+      scope={scope}
+      module={module}
+      IopRemediationModal={RemediationModal}
+      generateRuleUrl={generateRuleUrl}
+      {...props}
+    />
+  </div>
 );
 
 const IopInsightsTabWrapped = props => (
@@ -129,11 +130,11 @@ const IopInsightsTabWrapped = props => (
   </ScalprumProvider>
 );
 
-const LightspeedTab = props => {
+const InsightsTab = props => {
   const { response } = props;
   const isLocalAdvisorEngine =
     // eslint-disable-next-line camelcase
-    response?.insights_attributes?.use_local_advisor_engine;
+    response?.insights_attributes?.use_iop_mode;
 
   return isLocalAdvisorEngine ? (
     <IopInsightsTabWrapped {...props} />
@@ -142,16 +143,16 @@ const LightspeedTab = props => {
   );
 };
 
-LightspeedTab.propTypes = {
+InsightsTab.propTypes = {
   response: PropTypes.shape({
     insights_attributes: {
-      use_local_advisor_engine: PropTypes.bool,
+      use_iop_mode: PropTypes.bool,
     },
   }),
 };
 
-LightspeedTab.defaultProps = {
+InsightsTab.defaultProps = {
   response: {},
 };
 
-export default LightspeedTab;
+export default InsightsTab;

data/webpack/InsightsVulnerability/InsightsVulnerabilityListPage.js

@@ -6,7 +6,7 @@ const InsightsVulnerabilityListPage = () => {
   const scope = 'vulnerability';
   const module = './CveListPage';
   return (
-    <div className="rh-cloud-insights-vulnerability-page">
+    <div className="rh-cloud-insights-vulnerability-page vulnerability">
       <ScalprumComponent scope={scope} module={module} />
     </div>
   );

data/webpack/IopRecommendationDetails/IopRecommendationDetails.js

@@ -8,15 +8,12 @@ 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">
+    <div className="iop-recommendation-details-scalprum advisor">
       <ScalprumComponent
         scope={scope}
         module={module}
@@ -24,13 +21,6 @@ const IopRecommendationDetails = props => {
         ruleId={ruleId}
         {...props}
       />
-      <ScalprumComponent
-        scope={invScope}
-        module={invModule}
-        IopRemediationModal={RemediationModal}
-        ruleId={ruleId}
-        {...props}
-      />
     </div>
   );
 };

data/webpack/common/Hooks/ConfigHooks.js

@@ -14,6 +14,5 @@ export const useAdvisorEngineConfig = () => {
   );
 
   // eslint-disable-next-line camelcase
-  const isLocalAdvisorEngine = advisorEngineConfig?.use_local_advisor_engine;
-  return isLocalAdvisorEngine;
+  return advisorEngineConfig?.use_iop_mode;
 };

data/webpack/common/styles.scss

@@ -0,0 +1,7 @@
+// overwrite bootstrap style which added unintended bottom margins to chips
+// and dropdowns in Advisor and Vulnerability
+.vulnerability, .advisor {
+  ul, ol {
+    margin-bottom: 0px;
+  }
+}