foreman_rh_cloud 3.0.26 → 4.0.21.1

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

@@ -190,28 +190,21 @@ exports[`NoTokenEmptyState render 1`] = `
             onClick={[Function]}
             variant="primary"
           >
-            <ButtonBase
-              innerRef={null}
-              isDisabled={true}
+            <button
+              aria-disabled={true}
+              aria-label={null}
+              className="pf-c-button pf-m-primary pf-m-disabled"
+              data-ouia-component-id="OUIA-Generated-Button-primary-1"
+              data-ouia-component-type="PF4/Button"
+              data-ouia-safe={true}
+              disabled={true}
               onClick={[Function]}
-              variant="primary"
+              role={null}
+              tabIndex={null}
+              type="button"
             >
-              <button
-                aria-disabled={true}
-                aria-label={null}
-                className="pf-c-button pf-m-primary pf-m-disabled"
-                data-ouia-component-id="OUIA-Generated-Button-primary-1"
-                data-ouia-component-type="PF4/Button"
-                data-ouia-safe={true}
-                disabled={true}
-                onClick={[Function]}
-                role={null}
-                tabIndex={null}
-                type="button"
-              >
-                Save setting and sync recommendations
-              </button>
-            </ButtonBase>
+              Save setting and sync recommendations
+            </button>
           </Button>
         </div>
       </div>

data/webpack/InsightsCloudSync/InsightsCloudSync.js

@@ -36,10 +36,7 @@ const InsightsCloudSync = ({
         toolbarButtons={
           <>
             <RemediationModal />
-            <Button
-              variant="secondary"
-              onClick={() => syncInsights(fetchInsights, query)}
-            >
+            <Button variant="secondary" onClick={syncInsights}>
               {__('Start recommendations sync')}
             </Button>
           </>

data/webpack/InsightsCloudSync/InsightsCloudSyncActions.js

@@ -1,49 +1,25 @@
+import React from 'react';
 import { post } from 'foremanReact/redux/API';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { insightsCloudUrl } from './InsightsCloudSyncHelpers';
-import {
-  INSIGHTS_CLOUD_SYNC,
-  INSIGHTS_CLOUD_SYNC_TASK,
-} from './InsightsCloudSyncConstants';
-import { setupTaskPolling, taskRelatedToast } from '../common/ForemanTasks';
+import { INSIGHTS_CLOUD_SYNC } from './InsightsCloudSyncConstants';
+import { foremanUrl } from '../ForemanRhCloudHelpers';
 
-export const syncInsights = (fetchInsights, query) => dispatch =>
-  dispatch(
-    post({
-      key: INSIGHTS_CLOUD_SYNC,
-      url: insightsCloudUrl('tasks'),
-      handleSuccess: ({
-        data: {
-          task: { id },
-        },
-      }) => {
-        dispatch(syncInsightsStartedToast(id));
-        dispatch(setupInsightsTaskPolling(id, fetchInsights, query, dispatch));
-      },
-      errorToast: error => syncInsightsError(error),
-    })
-  );
-
-const syncInsightsError = error =>
-  `${__('Recommendation sync has failed: ')} ${error}`;
-
-const syncInsightsStartedToast = taskId =>
-  taskRelatedToast(taskId, 'info', __('Recommendation sync has started: '));
-
-const setupInsightsTaskPolling = (taskId, fetchInsights, query, dispatch) =>
-  setupTaskPolling({
-    taskId,
-    key: INSIGHTS_CLOUD_SYNC_TASK,
-    onTaskSuccess: () => {
-      fetchInsights({ query, page: 1 });
-      dispatch(
-        taskRelatedToast(
-          taskId,
-          'success',
-          __('Recommendations synced successfully')
-        )
-      );
-    },
-    taskErrorMessage: data => syncInsightsError(data.humanized.errors),
-    dispatch,
+export const syncInsights = () =>
+  post({
+    key: INSIGHTS_CLOUD_SYNC,
+    url: insightsCloudUrl('tasks'),
+    successToast: response => (
+      <span>
+        {__('Recommendation sync has started: ')}
+        <a
+          target="_blank"
+          rel="noopener noreferrer"
+          href={foremanUrl(`/foreman_tasks/tasks/${response.data?.task?.id}`)}
+        >
+          {__('view the task in progress')}
+        </a>
+      </span>
+    ),
+    errorToast: error => `${__('Recommendation sync has failed: ')} ${error}`,
   });

data/webpack/InsightsCloudSync/InsightsCloudSyncConstants.js

@@ -4,8 +4,6 @@ import { foremanUrl } from '../ForemanRhCloudHelpers';
 
 export const INSIGHTS_CLOUD_SYNC = 'INSIGHTS_CLOUD_SYNC';
 
-export const INSIGHTS_CLOUD_SYNC_TASK = 'INSIGHTS_CLOUD_SYNC_TASK';
-
 export const INSIGHTS_SYNC_PAGE_TITLE = __('Red Hat Insights');
 
 export const INSIGHTS_PATH = foremanUrl('/foreman_rh_cloud/insights_cloud');

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

@@ -29,12 +29,12 @@ exports[`InsightsCloudSync render 1`] = `
     toolbarButtons={
       <React.Fragment>
         <UNDEFINED />
-        <ForwardRef
+        <Button
           onClick={[Function]}
           variant="secondary"
         >
           Start recommendations sync
-        </ForwardRef>
+        </Button>
       </React.Fragment>
     }
   >

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

@@ -1,15 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Insights cloud sync actions should syncInsights 1`] = `
-Array [
-  Array [
-    Object {
-      "errorToast": [Function],
-      "handleSuccess": [Function],
-      "key": "INSIGHTS_CLOUD_SYNC",
-      "type": "post-some-type",
-      "url": "/insights_cloud/tasks",
-    },
-  ],
-]
+Object {
+  "errorToast": [Function],
+  "key": "INSIGHTS_CLOUD_SYNC",
+  "successToast": [Function],
+  "type": "post-some-type",
+  "url": "/insights_cloud/tasks",
+}
 `;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 3.0.26
+  version: 4.0.21.1
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2021-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -146,11 +146,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/controllers/api/v2/rh_cloud/inventory_controller.rb
 - app/controllers/concerns/insights_cloud/candlepin_cache.rb
 - app/controllers/concerns/insights_cloud/client_authentication.rb
-- 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/reports_controller.rb
 - app/controllers/foreman_inventory_upload/tasks_controller.rb
@@ -160,8 +157,6 @@ files:
 - app/controllers/insights_cloud/hits_controller.rb
 - app/controllers/insights_cloud/settings_controller.rb
 - app/controllers/insights_cloud/tasks_controller.rb
-- app/helpers/foreman_insights_deprecations_helper.rb
-- app/helpers/foreman_insights_host_helper.rb
 - app/helpers/foreman_inventory_upload_helper.rb
 - app/helpers/foreman_inventory_upload_host_helper.rb
 - app/models/concerns/rh_cloud_host.rb
@@ -174,22 +169,19 @@ files:
 - app/models/setting/rh_cloud.rb
 - app/overrides/hosts_list.rb
 - app/overrides/layouts/base/styles.html.erb.deface
-- app/overrides/old_plugin_deprecation.rb
 - 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_request.rb
 - app/services/foreman_rh_cloud/cloud_request_forwarder.rb
-- app/services/foreman_rh_cloud/insights_status_cleaner.rb
 - app/services/foreman_rh_cloud/remediations_retriever.rb
 - app/services/foreman_rh_cloud/template_renderer_helper.rb
+- app/subscribers/foreman_rh_cloud/insights_subscriber.rb
 - app/views/hosts/_insights_tab.html.erb
 - app/views/job_templates/rh_cloud_remediations.erb
 - app/views/layouts/foreman_rh_cloud/application.html.erb
 - config/Gemfile.lock.gh_test
 - config/database.yml.example
 - config/package-lock.json.gh_test
-- config/package-lock.json.plugin
 - config/routes.rb
 - db/migrate/20191215104806_create_insights_hits.foreman_inventory_upload.rb
 - db/migrate/20191216062008_create_insights_facets.foreman_inventory_upload.rb
@@ -200,7 +192,6 @@ files:
 - db/migrate/20210214000002_add_rule_id_to_hits.foreman_rh_cloud.rb
 - db/migrate/20210307000001_add_unique_to_insights_facet.foreman_rh_cloud.rb
 - db/migrate/20210404000001_change_resolutions.foreman_rh_cloud.rb
-- db/migrate/20210720000001_remove_old_insights_statuses.foreman_rh_cloud.rb
 - db/seeds.d/179_ui_notifications.rb
 - db/seeds.d/50_job_templates.rb
 - lib/foreman_inventory_upload.rb
@@ -224,7 +215,6 @@ files:
 - lib/foreman_rh_cloud/engine.rb
 - lib/foreman_rh_cloud/version.rb
 - lib/insights_cloud.rb
-- lib/insights_cloud/async/insights_client_status_aging.rb
 - lib/insights_cloud/async/insights_full_sync.rb
 - lib/insights_cloud/async/insights_generate_notifications.rb
 - lib/insights_cloud/async/insights_resolutions_sync.rb
@@ -235,7 +225,6 @@ files:
 - lib/inventory_sync/async/inventory_full_sync.rb
 - lib/inventory_sync/async/inventory_hosts_sync.rb
 - lib/inventory_sync/async/inventory_scheduled_sync.rb
-- lib/inventory_sync/async/inventory_self_host_sync.rb
 - lib/inventory_sync/async/query_inventory_job.rb
 - lib/tasks/foreman_rh_cloud_tasks.rake
 - lib/tasks/insights.rake
@@ -248,20 +237,15 @@ files:
 - test/controllers/accounts_controller_test.rb
 - 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/reports_controller_test.rb
 - test/controllers/uploads_controller_test.rb
 - test/controllers/uploads_settings_controller_test.rb
 - test/factories/insights_factories.rb
 - test/factories/inventory_upload_factories.rb
-- test/jobs/insights_client_status_aging_test.rb
 - test/jobs/insights_full_sync_test.rb
 - test/jobs/insights_resolutions_sync_test.rb
 - test/jobs/insights_rules_sync_test.rb
 - test/jobs/inventory_full_sync_test.rb
-- test/jobs/inventory_hosts_sync_test.rb
-- test/jobs/inventory_scheduled_sync_test.rb
-- test/jobs/inventory_self_host_sync_test.rb
 - test/jobs/upload_report_job_test.rb
 - test/models/insights_client_report_status_test.rb
 - test/test_plugin_helper.rb
@@ -272,7 +256,6 @@ 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/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
 - test/unit/shell_process_job_test.rb
@@ -637,9 +620,6 @@ files:
 - webpack/__tests__/__snapshots__/ForemanRhCloudHelpers.test.js.snap
 - webpack/__tests__/__snapshots__/ForemanRhCloudSelectors.test.js.snap
 - webpack/__tests__/__snapshots__/ForemanRhCloudTestHelpers.test.js.snap
-- webpack/common/ForemanTasks/ForemanTasksActions.js
-- webpack/common/ForemanTasks/ForemanTasksHelpers.js
-- webpack/common/ForemanTasks/index.js
 - webpack/common/Switcher/HelpLabel.js
 - webpack/common/Switcher/SwitcherPF4.js
 - webpack/common/Switcher/SwitcherPF4.scss
@@ -671,7 +651,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Summary of ForemanRhCloud.
@@ -679,20 +659,15 @@ test_files:
 - test/controllers/accounts_controller_test.rb
 - 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/reports_controller_test.rb
 - test/controllers/uploads_controller_test.rb
 - test/controllers/uploads_settings_controller_test.rb
 - test/factories/insights_factories.rb
 - test/factories/inventory_upload_factories.rb
-- test/jobs/insights_client_status_aging_test.rb
 - test/jobs/insights_full_sync_test.rb
 - test/jobs/insights_resolutions_sync_test.rb
 - test/jobs/insights_rules_sync_test.rb
 - test/jobs/inventory_full_sync_test.rb
-- test/jobs/inventory_hosts_sync_test.rb
-- test/jobs/inventory_scheduled_sync_test.rb
-- test/jobs/inventory_self_host_sync_test.rb
 - test/jobs/upload_report_job_test.rb
 - test/models/insights_client_report_status_test.rb
 - test/test_plugin_helper.rb
@@ -703,7 +678,6 @@ 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/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
 - test/unit/shell_process_job_test.rb

data/app/controllers/api/v2/rh_cloud/inventory_controller.rb

@@ -1,50 +0,0 @@
-module Api
-  module V2
-    module RhCloud
-      class InventoryController < ::Api::V2::BaseController
-        include ::Api::Version2
-        include InventoryUpload::ReportActions
-        include InventoryUpload::TaskActions
-
-        api :GET, "/organizations/:organization_id/rh_cloud/report", N_("Download latest report")
-        def download_file
-          filename, file = report_file(params[:organization_id])
-
-          send_file file, disposition: 'attachment', filename: filename
-        rescue InventoryUpload::ReportActions::ReportMissingError => error
-          render json: { message: error.message }, status: :not_found
-        end
-
-        api :POST, "/organizations/:organization_id/rh_cloud/report", N_("Start report generation")
-        def generate_report
-          organization_id = params[:organization_id]
-
-          start_report_generation(organization_id)
-
-          render json: {
-            action_status: 'success',
-          }, status: :ok
-        end
-
-        api :POST, "/organizations/:organization_id/rh_cloud/inventory_sync", N_("Start inventory synchronization")
-        def sync_inventory_status
-          selected_org = Organization.find(params[:organization_id])
-
-          task = start_inventory_sync(selected_org)
-
-          render json: {
-            task: task,
-          }, status: :ok
-        rescue InventoryUpload::TaskActions::NothingToSyncError => error
-          render json: { message: error.message }, status: :bad_request
-        end
-
-        api :POST, "rh_cloud/enable_connector", N_("Enable cloud connector")
-        def enable_cloud_connector
-          cloud_connector = ForemanRhCloud::CloudConnector.new
-          render json: cloud_connector.install.to_json
-        end
-      end
-    end
-  end
-end

data/app/controllers/concerns/inventory_upload/report_actions.rb

@@ -1,26 +0,0 @@
-module InventoryUpload
-  module ReportActions
-    extend ActiveSupport::Concern
-
-    class ReportMissingError < Foreman::Exception
-      MESSAGE = N_("The report file %{filename} doesn't exist")
-
-      def initialize(**params)
-        super(self.class::MESSAGE % params, params)
-      end
-    end
-
-    def start_report_generation(organization_id)
-      ForemanInventoryUpload::Async::GenerateReportJob.perform_later(ForemanInventoryUpload.generated_reports_folder, organization_id)
-    end
-
-    def report_file(organization_id)
-      filename = ForemanInventoryUpload.facts_archive_name(organization_id)
-      files = Dir["{#{ForemanInventoryUpload.uploads_file_path(filename)},#{ForemanInventoryUpload.done_file_path(filename)}}"]
-
-      raise ReportMissingError.new(filename: filename) if files.empty?
-
-      [filename, files.first]
-    end
-  end
-end

data/app/controllers/concerns/inventory_upload/task_actions.rb

@@ -1,25 +0,0 @@
-module InventoryUpload
-  module TaskActions
-    extend ActiveSupport::Concern
-
-    class NothingToSyncError < Foreman::Exception
-      MESSAGE = N_('Nothing to sync, there are no hosts with subscription for this organization.')
-
-      def initialize(**params)
-        super(self.class::MESSAGE, params)
-      end
-    end
-
-    def start_inventory_sync(selected_org)
-      subscribed_hosts = ForemanInventoryUpload::Generators::Queries.for_slice(
-        Host.unscoped.where(organization: selected_org)
-      )
-
-      if subscribed_hosts.empty?
-        raise NothingToSyncError
-      end
-
-      ForemanTasks.async_task(InventorySync::Async::InventoryFullSync, selected_org)
-    end
-  end
-end

data/app/helpers/foreman_insights_deprecations_helper.rb

@@ -1,9 +0,0 @@
-module ForemanInsightsDeprecationsHelper
-  def old_plugin_deprecation_warning
-    alert(
-      class: 'alert-warning',
-      close: false,
-      text: _('redhat_access plugin is deprecated and will be removed in Satellite 6.10. You can find recommendations for your hosts on hosts index and details pages.')
-    )
-  end
-end

data/app/helpers/foreman_insights_host_helper.rb

@@ -1,19 +0,0 @@
-module ForemanInsightsHostHelper
-  def insights_host_overview_buttons(host)
-    search_condition = "hostname=#{host.fqdn}"
-    [
-      {
-        button: link_to_if_authorized(
-          _("Recommendations"),
-          hash_for_foreman_rh_cloud_insights_cloud_path(
-            search: search_condition,
-            select_all: true
-          ),
-          title: _("Host Insights recommendations"),
-          class: 'btn btn-default'
-        ),
-        priority: 1000,
-      },
-    ]
-  end
-end

data/app/overrides/old_plugin_deprecation.rb

@@ -1,20 +0,0 @@
-Deface::Override.new(
-  virtual_path: 'redhat_access/analytics_dashboard/welcome',
-  name: 'deprecation_warning',
-  insert_before: 'div#welcome',
-  text: '<%= old_plugin_deprecation_warning %>'
-)
-
-Deface::Override.new(
-  virtual_path: 'redhat_access/analytics_dashboard/index',
-  name: 'deprecation_warning_index_not_met',
-  insert_before: 'article#content',
-  text: '<%= old_plugin_deprecation_warning %>'
-)
-
-Deface::Override.new(
-  virtual_path: 'redhat_access/analytics_dashboard/index',
-  name: 'deprecation_warning_index_met',
-  insert_before: 'div.main-content',
-  text: '<%= old_plugin_deprecation_warning %>'
-)

data/app/services/foreman_rh_cloud/cloud_request.rb

@@ -1,14 +0,0 @@
-module ForemanRhCloud
-  module CloudRequest
-    extend ActiveSupport::Concern
-
-    def execute_cloud_request(params)
-      final_params = {
-        verify_ssl: ForemanRhCloud.verify_ssl_method,
-        proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
-      }.deep_merge(params)
-
-      RestClient::Request.execute(final_params)
-    end
-  end
-end

data/app/services/foreman_rh_cloud/insights_status_cleaner.rb

@@ -1,17 +0,0 @@
-module ForemanRhCloud
-  class InsightsStatusCleaner
-    def clean(host_search)
-      host_ids = Host.search_for(host_search).pluck(:id)
-
-      # delete all insights status records for the hosts
-      deleted_count = InsightsClientReportStatus.where(host_id: host_ids).delete_all
-
-      # refresh global status
-      Host.where(id: host_ids).preload(:host_statuses).find_in_batches do |hosts|
-        hosts.each { |host| host.refresh_global_status! }
-      end
-
-      deleted_count
-    end
-  end
-end