foreman_rh_cloud 4.0.24.1 → 4.0.27

data/webpack/InsightsHostDetailsTab/InsightsTab.js

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { orderBy } from 'lodash';
 import { Grid, ListView } from 'patternfly-react';
 import { noop } from 'foremanReact/common/helpers';
+import { translate as __ } from 'foremanReact/common/I18n';
 import ListItem from './components/ListItem';
 import './InsightsTab.scss';
 
@@ -16,7 +17,7 @@ class InsightsHostDetailsTab extends React.Component {
     const { hits } = this.props;
 
     if (!hits.length) {
-      return <h2>No recommendations were found for this host!</h2>;
+      return <h2>{__('No recommendations were found for this host!')}</h2>;
     }
     const hitsSorted = orderBy(hits, ['total_risk'], ['desc']);
     const items = hitsSorted.map(
@@ -42,7 +43,7 @@ class InsightsHostDetailsTab extends React.Component {
       <div id="host_details_insights_tab">
         <Grid.Row>
           <Grid.Col xs={12}>
-            <h2>Recommendations</h2>
+            <h2>{__('Recommendations')}</h2>
             <ListView id="hits_list">{items}</ListView>
           </Grid.Col>
         </Grid.Row>

data/webpack/InsightsHostDetailsTab/InsightsTab.scss

@@ -48,19 +48,19 @@
           padding: 5px 8px;
           border-radius: 12px;
 
-          &.Low {
+          &.risk-1 {
             background-color: #e7f1fa;
           }
 
-          &.Moderate {
+          &.risk-2 {
             background-color: #fdf7e7;
           }
 
-          &.Important {
+          &.risk-3 {
             background-color: #f9dddd;
           }
 
-          &.Critical {
+          &.risk-4 {
             background-color: #ffecec;
           }
 

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

@@ -1,12 +1,13 @@
 import React, { Fragment } from 'react';
 import { ListView, Icon } from 'patternfly-react';
 import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
 
 const labelMapper = {
-  1: 'Low',
-  2: 'Moderate',
-  3: 'Important',
-  4: 'Critical',
+  1: __('Low'),
+  2: __('Moderate'),
+  3: __('Important'),
+  4: __('Critical'),
 };
 
 const ListItem = ({ title, totalRisk, resultsUrl, solutionUrl }) => {
@@ -18,7 +19,7 @@ const ListItem = ({ title, totalRisk, resultsUrl, solutionUrl }) => {
 
   const riskLabel = labelMapper[totalRisk];
   const additionalInfo = [
-    <span key={`risk-info-${title}`} className={`risk-label ${riskLabel}`}>
+    <span key={`risk-info-${title}`} className={`risk-label risk-${totalRisk}`}>
       <p>{riskLabel}</p>
     </span>,
   ];
@@ -26,7 +27,7 @@ const ListItem = ({ title, totalRisk, resultsUrl, solutionUrl }) => {
   const knowledgebaseLink = solutionUrl && (
     <p>
       <a href={solutionUrl} target="_blank" rel="noopener noreferrer">
-        Knowledgebase article <Icon name="external-link" />
+        {__('Knowledgebase article')} <Icon name="external-link" />
       </a>
     </p>
   );
@@ -34,7 +35,8 @@ const ListItem = ({ title, totalRisk, resultsUrl, solutionUrl }) => {
   const insightsCloudLink = resultsUrl && (
     <p>
       <a href={resultsUrl} target="_blank" rel="noopener noreferrer">
-        Read more about it in RH cloud insights <Icon name="external-link" />
+        {__('Read more about it in RH cloud insights')}{' '}
+        <Icon name="external-link" />
       </a>
     </p>
   );

data/webpack/common/Switcher/HelpLabel.js

@@ -11,7 +11,7 @@ export const HelpLabel = ({ text, id, className }) => {
         onClick={e => e.preventDefault()}
         className={`pf-c-form__group-label-help ${className}`}
       >
-        <HelpIcon noVerticalAlign />
+        <HelpIcon />
       </button>
     </Popover>
   );

data/webpack/common/Switcher/SwitcherPF4.js

@@ -6,7 +6,7 @@ import './SwitcherPF4.scss';
 
 const SwitcherPF4 = ({ id, label, tooltip, isChecked, onChange }) => (
   <Switch
-    className="foreman-switcher"
+    className="foreman-rh-cloud-switcher"
     id={`rh-cloud-switcher-${id}`}
     isChecked={isChecked}
     onChange={onChange}

data/webpack/common/Switcher/SwitcherPF4.scss

@@ -1,10 +1,9 @@
-.rh-cloud-inventory-page {
-  label.foreman-switcher {
-    font-weight: 400;
-    margin-bottom: 5px;
+label.foreman-rh-cloud-switcher {
+  display: block;
+  font-weight: 400;
+  margin-bottom: 5px;
 
-    .switcher-help-label {
-      padding-left: 5px;
-    }
+  .switcher-help-label {
+    padding-left: 5px;
   }
 }

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

@@ -12,7 +12,7 @@ exports[`InsightsCloudSync helpers should return insights cloud Url 1`] = `
   >
     <HelpIcon
       color="currentColor"
-      noVerticalAlign={true}
+      noVerticalAlign={false}
       size="sm"
     />
   </button>

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

@@ -3,7 +3,7 @@
 exports[`InsightsCloudSync helpers should return insights cloud Url 1`] = `
 <Switch
   aria-label=""
-  className="foreman-switcher"
+  className="foreman-rh-cloud-switcher"
   id="rh-cloud-switcher-some-id"
   isChecked={true}
   isDisabled={false}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 4.0.24.1
+  version: 4.0.27
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: redhat_access
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: foreman_ansible
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +138,7 @@ files:
 - app/controllers/concerns/inventory_upload/report_actions.rb
 - app/controllers/concerns/inventory_upload/task_actions.rb
 - app/controllers/foreman_inventory_upload/accounts_controller.rb
+- app/controllers/foreman_inventory_upload/cloud_status_controller.rb
 - app/controllers/foreman_inventory_upload/reports_controller.rb
 - app/controllers/foreman_inventory_upload/tasks_controller.rb
 - app/controllers/foreman_inventory_upload/uploads_controller.rb
@@ -176,6 +163,7 @@ files:
 - app/services/foreman_rh_cloud/branch_info.rb
 - app/services/foreman_rh_cloud/cloud_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_request.rb
 - app/services/foreman_rh_cloud/cloud_request_forwarder.rb
 - app/services/foreman_rh_cloud/insights_status_cleaner.rb
@@ -188,6 +176,7 @@ files:
 - config/database.yml.example
 - config/package-lock.json.gh_test
 - config/package-lock.json.plugin
+- config/rh_cert-api_chain.pem
 - config/routes.rb
 - db/migrate/20191215104806_create_insights_hits.foreman_inventory_upload.rb
 - db/migrate/20191216062008_create_insights_facets.foreman_inventory_upload.rb
@@ -247,6 +236,7 @@ files:
 - test/controllers/insights_cloud/api/machine_telemetries_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
 - test/controllers/reports_controller_test.rb
 - test/controllers/uploads_controller_test.rb
 - test/controllers/uploads_settings_controller_test.rb
@@ -265,11 +255,13 @@ files:
 - test/test_plugin_helper.rb
 - test/unit/archived_report_generator_test.rb
 - test/unit/fact_helpers_test.rb
+- test/unit/foreman_rh_cloud_self_host_test.rb
 - test/unit/insights_facet_test.rb
 - test/unit/metadata_generator_test.rb
 - test/unit/rh_cloud_http_proxy_test.rb
 - test/unit/services/foreman_rh_cloud/branch_info_test.rb
 - test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb
+- test/unit/services/foreman_rh_cloud/cloud_status_service_test.rb
 - test/unit/services/foreman_rh_cloud/insights_status_cleaner_test.rb
 - test/unit/services/foreman_rh_cloud/remediations_retriever_test.rb
 - test/unit/services/foreman_rh_cloud/template_renderer_helper_test.rb
@@ -418,6 +410,8 @@ files:
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudConnectorButton/__tests__/__snapshots__/CloudConnectorActions.test.js.snap
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudConnectorButton/__tests__/__snapshots__/CloudConnectorButton.test.js.snap
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudConnectorButton/index.js
+- webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudPingModal/index.js
+- webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudPingModal/index.scss
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/PageDescription.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/__tests__/PageDescription.test.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/__tests__/__snapshots__/PageDescription.test.js.snap
@@ -548,18 +542,13 @@ files:
 - webpack/InsightsCloudSync/Components/InsightsSettings/__tests__/__snapshots__/InsightsSettingsSelectors.test.js.snap
 - webpack/InsightsCloudSync/Components/InsightsSettings/index.js
 - webpack/InsightsCloudSync/Components/InsightsSettings/insightsSettings.scss
-- webpack/InsightsCloudSync/Components/InsightsSyncSwitcher/InsightsSyncSwitcher.fixtures.js
-- webpack/InsightsCloudSync/Components/InsightsSyncSwitcher/InsightsSyncSwitcher.js
-- webpack/InsightsCloudSync/Components/InsightsSyncSwitcher/__tests__/InsightsSyncSwitcher.test.js
-- webpack/InsightsCloudSync/Components/InsightsSyncSwitcher/__tests__/__snapshots__/InsightsSyncSwitcher.test.js.snap
-- webpack/InsightsCloudSync/Components/InsightsSyncSwitcher/index.js
-- webpack/InsightsCloudSync/Components/InsightsSyncSwitcher/insightsSyncSwitcher.scss
 - webpack/InsightsCloudSync/Components/InsightsTable/InsightsTable.js
 - webpack/InsightsCloudSync/Components/InsightsTable/InsightsTableActions.js
 - webpack/InsightsCloudSync/Components/InsightsTable/InsightsTableConstants.js
 - webpack/InsightsCloudSync/Components/InsightsTable/InsightsTableHelpers.js
 - webpack/InsightsCloudSync/Components/InsightsTable/InsightsTableReducer.js
 - webpack/InsightsCloudSync/Components/InsightsTable/InsightsTableSelectors.js
+- webpack/InsightsCloudSync/Components/InsightsTable/Pagination.js
 - webpack/InsightsCloudSync/Components/InsightsTable/SelectAllAlert.js
 - webpack/InsightsCloudSync/Components/InsightsTable/__tests__/InsightsTable.test.js
 - webpack/InsightsCloudSync/Components/InsightsTable/__tests__/InsightsTableActions.test.js
@@ -571,7 +560,6 @@ files:
 - webpack/InsightsCloudSync/Components/InsightsTable/index.js
 - webpack/InsightsCloudSync/Components/InsightsTable/table.scss
 - webpack/InsightsCloudSync/Components/NoTokenEmptyState.js
-- webpack/InsightsCloudSync/Components/RemediationModal/RemediateButton.js
 - webpack/InsightsCloudSync/Components/RemediationModal/RemediationActions.js
 - webpack/InsightsCloudSync/Components/RemediationModal/RemediationHelpers.js
 - webpack/InsightsCloudSync/Components/RemediationModal/RemediationModal.js
@@ -580,6 +568,7 @@ files:
 - webpack/InsightsCloudSync/Components/RemediationModal/RemediationTableConstants.js
 - webpack/InsightsCloudSync/Components/RemediationModal/Resolutions.js
 - webpack/InsightsCloudSync/Components/RemediationModal/index.js
+- webpack/InsightsCloudSync/Components/ToolbarDropdown.js
 - webpack/InsightsCloudSync/Components/__tests__/InsightsHeader.test.js
 - webpack/InsightsCloudSync/Components/__tests__/NoTokenEmptyState.test.js
 - webpack/InsightsCloudSync/Components/__tests__/__snapshots__/InsightsHeader.test.js.snap
@@ -669,7 +658,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Summary of ForemanRhCloud.
@@ -678,6 +667,7 @@ test_files:
 - test/controllers/insights_cloud/api/machine_telemetries_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
 - test/controllers/reports_controller_test.rb
 - test/controllers/uploads_controller_test.rb
 - test/controllers/uploads_settings_controller_test.rb
@@ -696,11 +686,13 @@ test_files:
 - test/test_plugin_helper.rb
 - test/unit/archived_report_generator_test.rb
 - test/unit/fact_helpers_test.rb
+- test/unit/foreman_rh_cloud_self_host_test.rb
 - test/unit/insights_facet_test.rb
 - test/unit/metadata_generator_test.rb
 - test/unit/rh_cloud_http_proxy_test.rb
 - test/unit/services/foreman_rh_cloud/branch_info_test.rb
 - test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb
+- test/unit/services/foreman_rh_cloud/cloud_status_service_test.rb
 - test/unit/services/foreman_rh_cloud/insights_status_cleaner_test.rb
 - test/unit/services/foreman_rh_cloud/remediations_retriever_test.rb
 - test/unit/services/foreman_rh_cloud/template_renderer_helper_test.rb

data/webpack/InsightsCloudSync/Components/InsightsSyncSwitcher/InsightsSyncSwitcher.fixtures.js

@@ -1 +0,0 @@
-export const handleToggleResponse = { data: { insightsSyncEnabled: true } };

data/webpack/InsightsCloudSync/Components/InsightsSyncSwitcher/InsightsSyncSwitcher.js

@@ -1,45 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { Switch, FieldLevelHelp } from 'patternfly-react';
-import { translate as __ } from 'foremanReact/common/I18n';
-import './insightsSyncSwitcher.scss';
-
-class InsightsSyncSwitcher extends Component {
-  handleToggle = () => {
-    const { insightsSyncEnabled, setInsightsSyncEnabled } = this.props;
-
-    const toggledInsightsSyncEnabled = !insightsSyncEnabled;
-    setInsightsSyncEnabled(toggledInsightsSyncEnabled);
-  };
-
-  render() {
-    const { insightsSyncEnabled } = this.props;
-
-    return (
-      <div className="insights_sync_switcher">
-        <span>Synchronize Automatically</span>
-        <FieldLevelHelp
-          content={__(
-            'Enable automatic synchronization of Insights recommendations from the Red Hat cloud'
-          )}
-        />
-        <Switch
-          size="mini"
-          value={insightsSyncEnabled}
-          onChange={this.handleToggle}
-        />
-      </div>
-    );
-  }
-}
-
-InsightsSyncSwitcher.propTypes = {
-  insightsSyncEnabled: PropTypes.bool,
-  setInsightsSyncEnabled: PropTypes.func.isRequired,
-};
-
-InsightsSyncSwitcher.defaultProps = {
-  insightsSyncEnabled: true,
-};
-
-export default InsightsSyncSwitcher;

data/webpack/InsightsCloudSync/Components/InsightsSyncSwitcher/__tests__/InsightsSyncSwitcher.test.js

@@ -1,17 +0,0 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-import { noop } from 'foremanReact/common/helpers';
-
-import InsightsSyncSwitcher from '../InsightsSyncSwitcher';
-
-const fixtures = {
-  'render with props': {
-    insightsSyncEnabled: true,
-    setInsightsSyncEnabled: noop,
-  },
-  /** fixtures, props for the component */
-};
-
-describe('InsightsSyncSwitcher', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(InsightsSyncSwitcher, fixtures));
-});

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

@@ -1,38 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`InsightsSyncSwitcher rendering render with props 1`] = `
-<div
-  className="insights_sync_switcher"
->
-  <span>
-    Synchronize Automatically
-  </span>
-  <FieldLevelHelp
-    buttonClass=""
-    content="Enable automatic synchronization of Insights recommendations from the Red Hat cloud"
-    placement="top"
-    rootClose={true}
-  />
-  <Switch
-    animate={true}
-    baseClass="bootstrap-switch"
-    bsSize={null}
-    defaultValue={true}
-    disabled={false}
-    handleWidth="auto"
-    inverse={false}
-    labelText=" "
-    labelWidth="auto"
-    offColor="default"
-    offText="OFF"
-    onChange={[Function]}
-    onColor="primary"
-    onText="ON"
-    readonly={false}
-    size="mini"
-    tristate={false}
-    value={true}
-    wrapperClass="wrapper"
-  />
-</div>
-`;

data/webpack/InsightsCloudSync/Components/InsightsSyncSwitcher/index.js

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

data/webpack/InsightsCloudSync/Components/InsightsSyncSwitcher/insightsSyncSwitcher.scss

@@ -1,3 +0,0 @@
-.insights_sync_switcher {
-  margin-bottom: 5px;
-}

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

@@ -1,59 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { isEmpty } from 'lodash';
-import { Button, Popover } from '@patternfly/react-core';
-import { translate as __ } from 'foremanReact/common/I18n';
-import { foremanUrl } from '../../../ForemanRhCloudHelpers';
-
-const RemediateButton = ({ isExperimentalMode, selectedIds, toggleModal }) => {
-  const [isVisible, setVisible] = React.useState(true);
-
-  const popoverContent = __(
-    `To use this feature, please enable <a href=${foremanUrl(
-      '/settings?search=name+%3D+lab_features'
-    )}>Show Experimental Labs</a> in settings.`
-  );
-
-  let button = (
-    <Button
-      variant="primary"
-      isDisabled={isEmpty(selectedIds)}
-      onClick={() => {
-        if (!isExperimentalMode) {
-          setVisible(value => !value);
-        } else {
-          toggleModal();
-        }
-      }}
-    >
-      {__('Remediate')}
-    </Button>
-  );
-
-  if (!isExperimentalMode) {
-    button = (
-      <Popover
-        isVisible={isVisible}
-        bodyContent={
-          <div dangerouslySetInnerHTML={{ __html: popoverContent }} />
-        }
-      >
-        {button}
-      </Popover>
-    );
-  }
-  return button;
-};
-
-RemediateButton.propTypes = {
-  selectedIds: PropTypes.object,
-  isExperimentalMode: PropTypes.bool,
-  toggleModal: PropTypes.func.isRequired,
-};
-
-RemediateButton.defaultProps = {
-  selectedIds: {},
-  isExperimentalMode: false,
-};
-
-export default RemediateButton;