foreman_rh_cloud 4.0.21.1 → 4.0.24.1

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/PageDescription.js

@@ -31,6 +31,17 @@ export const PageDescription = () => (
         About subscription watch
       </a>
     </p>
+    <p>
+      {__('For more information about Insights and Cloud Connector read')}
+      &nbsp;
+      <a
+        href="https://console.redhat.com/security/insights/"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        Red Hat Insights Data and Application Security
+      </a>
+    </p>
   </div>
 );
 

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

@@ -24,5 +24,16 @@ 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,6 +1,5 @@
 import React from 'react';
-import { get, post } from 'foremanReact/redux/API';
-import { withInterval } from 'foremanReact/redux/middlewares/IntervalMiddleware';
+import { post } from 'foremanReact/redux/API';
 import { addToast } from 'foremanReact/redux/actions/toasts';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { inventoryUrl } from '../../../../ForemanInventoryHelpers';
@@ -9,7 +8,10 @@ import {
   INVENTORY_SYNC,
   INVENTORY_SYNC_TASK_UPDATE,
 } from './SyncButtonConstants';
-import { foremanUrl } from '../../../../../ForemanRhCloudHelpers';
+import {
+  setupTaskPolling,
+  taskRelatedToast,
+} from '../../../../../common/ForemanTasks';
 
 export const handleSync = () => dispatch => {
   dispatch(
@@ -21,9 +23,9 @@ export const handleSync = () => dispatch => {
           task: { id },
         },
       }) => {
-        dispatch(getSyncTaskInterval(id));
+        dispatch(setupInventorySyncTaskPolling(id, dispatch));
         return dispatch(
-          taskPageRefererToast(id, 'info', __('Inventory sync has started:'))
+          taskRelatedToast(id, 'info', __('Inventory sync has started:'))
         );
       },
       errorToast: inventorySyncErrorToast,
@@ -31,62 +33,25 @@ export const handleSync = () => 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, 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>
-    ),
+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,
   });
+
+const inventorySyncErrorToast = message =>
+  `${__('Inventory sync has failed: ')} ${message.response?.data?.message ||
+    message}`;

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_inventory_upload/tasks/1",
+      "url": "/foreman_tasks/api/tasks/1/details?include_permissions",
     },
   ],
   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,7 +40,6 @@ Array [
               view the task page for more details
             </a>
           </span>,
-          "sticky": false,
           "type": "info",
         },
       },

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

@@ -19,25 +19,6 @@ 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,
@@ -58,6 +39,25 @@ 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__/InsightsTable.test.js.snap

@@ -61,7 +61,6 @@ exports[`InsightsTable rendering render with Props 1`] = `
     expandId="expandable-toggle"
     gridBreakPoint="grid-md"
     isStickyHeader={false}
-    isTreeTable={false}
     onSelect={[Function]}
     onSort={[Function]}
     ouiaSafe={true}
@@ -138,7 +137,6 @@ exports[`InsightsTable rendering render with Props 1`] = `
         "currPage": "Current page",
         "items": "",
         "itemsPerPage": "Items per page",
-        "ofWord": "of",
         "optionsToggle": "Items per page",
         "page": "",
         "paginationTitle": "Pagination",

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

@@ -26,6 +26,20 @@ 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 {
@@ -61,20 +75,6 @@ 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/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/__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));