foreman_rh_cloud 3.0.33 → 4.0.21.1

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

@@ -24,16 +24,5 @@ exports[`PageDescription rendering render without Props 1`] = `
       About subscription watch
     </a>
   </p>
-  <p>
-    For more information about Insights and Cloud Connector read
-     
-    <a
-      href="https://console.redhat.com/security/insights/"
-      rel="noopener noreferrer"
-      target="_blank"
-    >
-      Red Hat Insights Data and Application Security
-    </a>
-  </p>
 </div>
 `;

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/SyncButtonActions.js

@@ -1,5 +1,6 @@
 import React from 'react';
-import { post } from 'foremanReact/redux/API';
+import { get, post } 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 { inventoryUrl } from '../../../../ForemanInventoryHelpers';
@@ -8,10 +9,7 @@ import {
   INVENTORY_SYNC,
   INVENTORY_SYNC_TASK_UPDATE,
 } from './SyncButtonConstants';
-import {
-  setupTaskPolling,
-  taskRelatedToast,
-} from '../../../../../common/ForemanTasks';
+import { foremanUrl } from '../../../../../ForemanRhCloudHelpers';
 
 export const handleSync = () => dispatch => {
   dispatch(
@@ -23,9 +21,9 @@ export const handleSync = () => dispatch => {
           task: { id },
         },
       }) => {
-        dispatch(setupInventorySyncTaskPolling(id, dispatch));
+        dispatch(getSyncTaskInterval(id));
         return dispatch(
-          taskRelatedToast(id, 'info', __('Inventory sync has started:'))
+          taskPageRefererToast(id, 'info', __('Inventory sync has started:'))
         );
       },
       errorToast: inventorySyncErrorToast,
@@ -33,25 +31,62 @@ export const handleSync = () => dispatch => {
   );
 };
 
-export const setupInventorySyncTaskPolling = (id, dispatch) =>
-  setupTaskPolling({
-    taskId: id,
-    key: INVENTORY_SYNC_TASK_UPDATE,
-    onTaskSuccess: ({
-      output: {
-        host_statuses: { sync, disconnect },
-      },
-    }) =>
-      dispatch(
-        addToast({
-          sticky: true,
-          type: 'success',
-          message: <Toast syncHosts={sync} disconnectHosts={disconnect} />,
-        })
-      ),
-    dispatch,
-  });
+export const getSyncTaskInterval = id => dispatch => {
+  dispatch(
+    withInterval(
+      get({
+        key: INVENTORY_SYNC_TASK_UPDATE,
+        url: inventoryUrl(`tasks/${id}`),
+        handleSuccess: ({ data: { result, output } }, stopTaskInterval) => {
+          if (result === 'success') {
+            const {
+              host_statuses: { sync, disconnect },
+            } = output;
+            dispatch(
+              addToast({
+                sticky: true,
+                type: 'success',
+                message: (
+                  <Toast syncHosts={sync} disconnectHosts={disconnect} />
+                ),
+              })
+            );
+          }
+          if (result === 'error') {
+            dispatch(
+              taskPageRefererToast(
+                id,
+                'error',
+                __('Inventory sync has failed:'),
+                true
+              )
+            );
+          }
+          stopTaskInterval();
+        },
+        errorToast: inventorySyncErrorToast,
+      })
+    )
+  );
+};
 
-const inventorySyncErrorToast = message =>
-  `${__('Inventory sync has failed: ')} ${message.response?.data?.message ||
-    message}`;
+const inventorySyncErrorToast = ({ message, response }) =>
+  `${__('Inventory sync has failed: ')} ${response.data?.message || message}`;
+
+const taskPageRefererToast = (taskID, toastType, prefix, sticky = false) =>
+  addToast({
+    sticky,
+    type: toastType,
+    message: (
+      <span>
+        {prefix}{' '}
+        <a
+          target="_blank"
+          rel="noopener noreferrer"
+          href={foremanUrl(`/foreman_tasks/tasks/${taskID}`)}
+        >
+          {__('view the task page for more details')}
+        </a>
+      </span>
+    ),
+  });

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/__snapshots__/integrations.test.js.snap

@@ -22,7 +22,7 @@ Array [
       "errorToast": [Function],
       "interval": 3000,
       "type": "API_GET",
-      "url": "/foreman_tasks/api/tasks/1/details?include_permissions",
+      "url": "/foreman_inventory_upload/tasks/1",
     },
   ],
   Array [
@@ -31,7 +31,7 @@ Array [
         "message": Object {
           "message": <span>
             Inventory sync has started:
-            <br />
+             
             <a
               href="/foreman_tasks/tasks/1"
               rel="noopener noreferrer"
@@ -40,6 +40,7 @@ Array [
               view the task page for more details
             </a>
           </span>,
+          "sticky": false,
           "type": "info",
         },
       },

data/webpack/InsightsCloudSync/Components/InsightsTable/InsightsTableActions.js

@@ -19,6 +19,25 @@ export const fetchInsights = (queryParams = {}) => (dispatch, getState) => {
     ...queryParams,
   };
 
+  dispatch(
+    get({
+      key: INSIGHTS_HITS_API_KEY,
+      url: INSIGHTS_HITS_PATH,
+      params: {
+        page,
+        per_page: perPage,
+        search: query,
+        order: `${sortBy} ${sortOrder}`,
+      },
+      handleSuccess: response => {
+        if (isSelectAll) {
+          selectAllIds(dispatch, response.data.hits || []);
+          dispatch(selectAll());
+        }
+      },
+    })
+  );
+
   const uri = new URI();
   uri.search({
     page,
@@ -39,25 +58,6 @@ export const fetchInsights = (queryParams = {}) => (dispatch, getState) => {
   if (!isSelectAll) {
     dispatch(setSelectAllAlert(false));
   }
-
-  return dispatch(
-    get({
-      key: INSIGHTS_HITS_API_KEY,
-      url: INSIGHTS_HITS_PATH,
-      params: {
-        page,
-        per_page: perPage,
-        search: query,
-        order: `${sortBy} ${sortOrder}`,
-      },
-      handleSuccess: response => {
-        if (isSelectAll) {
-          selectAllIds(dispatch, response.data.hits || []);
-          dispatch(selectAll());
-        }
-      },
-    })
-  );
 };
 
 const selectAllIds = (dispatch, results, prevSelectedIds = {}) => {

data/webpack/InsightsCloudSync/Components/InsightsTable/__tests__/__snapshots__/InsightsTableActions.test.js.snap

@@ -26,20 +26,6 @@ Array [
 
 exports[`insights table actions should fetchInsights 1`] = `
 Array [
-  Array [
-    Object {
-      "payload": Object {
-        "args": Array [
-          Object {
-            "pathname": "/foreman_rh_cloud/insights_cloud",
-            "search": "?page=2&per_page=7&search=&sort_by=&sort_order=&select_all=true",
-          },
-        ],
-        "method": "push",
-      },
-      "type": "@@router/CALL_HISTORY_METHOD",
-    },
-  ],
   Array [
     Object {
       "payload": Object {
@@ -75,6 +61,20 @@ Array [
       "url": "/insights_cloud/hits",
     },
   ],
+  Array [
+    Object {
+      "payload": Object {
+        "args": Array [
+          Object {
+            "pathname": "/foreman_rh_cloud/insights_cloud",
+            "search": "?page=2&per_page=7&search=&sort_by=&sort_order=&select_all=true",
+          },
+        ],
+        "method": "push",
+      },
+      "type": "@@router/CALL_HISTORY_METHOD",
+    },
+  ],
 ]
 `;
 

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

@@ -34,7 +34,6 @@ const RemediateButton = ({ isExperimentalMode, selectedIds, toggleModal }) => {
     button = (
       <Popover
         isVisible={isVisible}
-        aria-label={__('Please enable lab features to use this button')}
         bodyContent={
           <div dangerouslySetInnerHTML={{ __html: popoverContent }} />
         }

data/webpack/InsightsCloudSync/Components/RemediationModal/RemediationModal.scss

@@ -6,18 +6,4 @@
       margin-top: 5px;
     }
   }
-
-  // applies to the backdrop parent of the modal
-  @at-root .pf-c-backdrop {
-    width: calc(100% - 200px) !important;
-    left: 200px !important;
-  }
-
-  // where the vertical nav breaks: https://github.com/theforeman/foreman/blob/3347fa49d500964f0209122d8d36c920d1feafcc/webpack/assets/javascripts/react_app/components/Layout/components/Toolbar/HeaderToolbar.scss#L26
-  @media (max-width: 768px) {
-    @at-root .pf-c-backdrop {
-      width: 100% !important;
-      left: 0 !important;
-    }
-  }
 }

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.33
+  version: 4.0.21.1
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-08 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,32 +237,25 @@ 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
 - 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/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
@@ -638,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
@@ -672,7 +651,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Summary of ForemanRhCloud.
@@ -680,32 +659,25 @@ 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
 - 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/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