foreman_rh_cloud 4.0.25 → 4.0.25.1

data/webpack/InsightsCloudSync/InsightsCloudSync.scss

@@ -1,5 +1,85 @@
 .rh-cloud-insights {
-  .btn-toolbar {
-    display: inherit;
+  #main {
+    padding: 4px;
+
+    #breadcrumb .form-group {
+      margin-bottom: 0;
+
+      h1 {
+        font-family: 'RedHatDisplay';
+        font-weight: 400;
+        margin-bottom: 8px;
+      }
+    }
+
+    .title_filter {
+      width: 520px;
+    }
+
+    #title_action {
+      width: calc(100% - 520px);
+    }
+
+    @media (max-width: 1138px) {
+      #title_action {
+        width: 70%;
+      }
+    }
+
+    .search-bar {
+      // Giving pf3 search bar a pf4 look
+      width: 500px;
+      .search-bar {
+        display: block;
+      }
+      .input-group {
+        display: table;
+      }
+      .input-group-btn {
+        .btn-group {
+          z-index: unset; // so the bookmarks drop down will be above other search boxes
+        }
+        .autocomplete-search-btn {
+          display: none;
+        }
+        .dropdown-toggle {
+          font-size: 16px;
+          background-color: white;
+          background-image: none;
+          padding-bottom: 4px;
+          padding-top: 4px;
+        }
+        .scrollable-dropdown {
+          max-width: 250px;
+        }
+      }
+      li {
+        font-size: 16px;
+      }
+      input {
+        font-size: 16px;
+        height: 36px;
+      }
+      .foreman-autocomplete .autocomplete-focus-shortcut {
+        top: 8px;
+        font-size: 16px;
+      }
+      .foreman-autocomplete .autocomplete-aux {
+        top: 8px;
+        font-size: 16px;
+        .autocomplete-clear-button {
+          font-size: 16px;
+        }
+      }
+    }
+
+    .btn-toolbar {
+      display: inherit;
+      width: 100%;
+    }
+
+    .pf-c-pagination {
+      padding-right: 0;
+    }
   }
 }

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

@@ -28,13 +28,22 @@ exports[`InsightsCloudSync render 1`] = `
     searchable={true}
     toolbarButtons={
       <React.Fragment>
-        <UNDEFINED />
-        <Button
-          onClick={[Function]}
-          variant="secondary"
+        <span
+          className="insights-toolbar-buttons"
         >
-          Start recommendations sync
-        </Button>
+          <UNDEFINED />
+          <ToolbarDropdown
+            onRecommendationSync={[Function]}
+          />
+        </span>
+        <span
+          className="pull-right"
+        >
+          <Pagination
+            isCompact={true}
+            variant="top"
+          />
+        </span>
       </React.Fragment>
     }
   >

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__/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.25
+  version: 4.0.25.1
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-01 00:00:00.000000000 Z
+date: 2021-08-05 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
@@ -270,6 +260,7 @@ files:
 - 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 +409,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 +541,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 +559,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 +567,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
@@ -678,6 +666,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
@@ -701,6 +690,7 @@ test_files:
 - 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;