foreman_rh_cloud 3.0.21 → 3.0.24

data/webpack/InsightsCloudSync/InsightsCloudSync.js

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

data/webpack/InsightsCloudSync/InsightsCloudSyncActions.js

@@ -1,25 +1,49 @@
-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 } from './InsightsCloudSyncConstants';
-import { foremanUrl } from '../ForemanRhCloudHelpers';
+import {
+  INSIGHTS_CLOUD_SYNC,
+  INSIGHTS_CLOUD_SYNC_TASK,
+} from './InsightsCloudSyncConstants';
+import { setupTaskPolling, taskRelatedToast } from '../common/ForemanTasks';
 
-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}`,
+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,
   });

data/webpack/InsightsCloudSync/InsightsCloudSyncConstants.js

@@ -4,6 +4,8 @@ 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 />
-        <Button
+        <ForwardRef
           onClick={[Function]}
           variant="secondary"
         >
           Start recommendations sync
-        </Button>
+        </ForwardRef>
       </React.Fragment>
     }
   >

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

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

data/webpack/common/ForemanTasks/ForemanTasksActions.js

@@ -0,0 +1,64 @@
+import React from 'react';
+import { get } from 'foremanReact/redux/API';
+import { withInterval } from 'foremanReact/redux/middlewares/IntervalMiddleware';
+import { addToast } from 'foremanReact/redux/actions/toasts';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { foremanTaskDetailsUrl } from './ForemanTasksHelpers';
+import { foremanUrl } from '../../ForemanRhCloudHelpers';
+
+export const setupTaskPolling = ({
+  taskId,
+  key,
+  onTaskSuccess,
+  onTaskError,
+  taskErrorMessage,
+  dispatch,
+}) =>
+  withInterval(
+    get({
+      key,
+      url: foremanTaskDetailsUrl(taskId),
+      handleSuccess: ({ data }, stopTaskInterval) => {
+        if (data.result === 'success') {
+          stopTaskInterval();
+          onTaskSuccess(data, dispatch);
+        }
+        if (data.result === 'error') {
+          stopTaskInterval();
+          if (taskErrorMessage === undefined) {
+            taskErrorMessage = errorData =>
+              `${__('The task failed with the following error:')} ${
+                errorData.humanized.errors
+              }`;
+          }
+          if (onTaskError === undefined) {
+            onTaskError = errorData =>
+              dispatch(defaultTaskErrorHandler(errorData, taskErrorMessage));
+          }
+          onTaskError(data, dispatch);
+        }
+      },
+      errorToast: error => `Could not get task details: ${error}`,
+    })
+  );
+
+export const taskRelatedToast = (taskID, type, message) =>
+  addToast({
+    type,
+    message: (
+      <span>
+        {message}
+        <br />
+        <a
+          target="_blank"
+          rel="noopener noreferrer"
+          href={foremanUrl(`/foreman_tasks/tasks/${taskID}`)}
+        >
+          {__('view the task page for more details')}
+        </a>
+      </span>
+    ),
+  });
+
+const defaultTaskErrorHandler = (data, taskErrorMessage) =>
+  taskRelatedToast(data.id, 'error', taskErrorMessage(data));

data/webpack/common/ForemanTasks/ForemanTasksHelpers.js

@@ -0,0 +1,7 @@
+import { foremanUrl } from '../../ForemanRhCloudHelpers';
+
+export const foremanTasksApiPath = path =>
+  foremanUrl(`/foreman_tasks/api/tasks/${path}`);
+
+export const foremanTaskDetailsUrl = id =>
+  foremanTasksApiPath(`${id}/details?include_permissions`);

data/webpack/common/ForemanTasks/index.js

@@ -0,0 +1 @@
+export { setupTaskPolling, taskRelatedToast } from './ForemanTasksActions';

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 3.0.21
+  version: 3.0.24
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-20 00:00:00.000000000 Z
+date: 2021-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -146,8 +146,11 @@ 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
@@ -157,6 +160,8 @@ 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
@@ -169,9 +174,11 @@ 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/remediations_retriever.rb
 - app/services/foreman_rh_cloud/template_renderer_helper.rb
@@ -182,6 +189,7 @@ files:
 - 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
@@ -215,6 +223,7 @@ 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
@@ -225,6 +234,7 @@ 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
@@ -237,15 +247,20 @@ 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
@@ -620,6 +635,9 @@ 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
@@ -659,15 +677,20 @@ 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