foreman_rh_cloud 3.0.16 → 3.0.17

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SettingsWarning/index.js

@@ -0,0 +1,25 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+import { SettingsWarning } from './SettingsWarning';
+import {
+  selectAutoUploadEnabled,
+  selectHostObfuscationEnabled,
+} from '../../../AccountList/AccountListSelectors';
+import { CONNECTOR_STATUS } from '../CloudConnectorButton/CloudConnectorConstants';
+import { selectStatus } from '../CloudConnectorButton/CloudConnectorSelectors';
+
+const ConnectedSettingsWarning = () => {
+  const autoUpload = useSelector(selectAutoUploadEnabled);
+  const hostObfuscation = useSelector(selectHostObfuscationEnabled);
+  const isCloudConnector =
+    useSelector(selectStatus) === CONNECTOR_STATUS.RESOLVED;
+  return (
+    <SettingsWarning
+      autoUpload={autoUpload}
+      hostObfuscation={hostObfuscation}
+      isCloudConnector={isCloudConnector}
+    />
+  );
+};
+
+export default ConnectedSettingsWarning;

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

@@ -43,13 +43,13 @@ class SyncButton extends React.Component {
 }
 
 SyncButton.propTypes = {
-  cloudToken: PropTypes.string,
+  cloudToken: PropTypes.bool,
   handleSync: PropTypes.func.isRequired,
   status: PropTypes.string,
 };
 
 SyncButton.defaultProps = {
-  cloudToken: null,
+  cloudToken: false,
   status: null,
 };
 

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

@@ -4,7 +4,7 @@ import { noop } from 'patternfly-react';
 import SyncButton from '../SyncButton';
 
 const fixtures = {
-  'render with Props': { cloudToken: '1234', handleSync: noop },
+  'render with Props': { cloudToken: true, handleSync: noop },
 };
 
 describe('SyncButton', () => {

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

@@ -5,7 +5,7 @@ import { Pagination, PaginationVariant } from '@patternfly/react-core';
 import { Table, TableHeader, TableBody } from '@patternfly/react-table';
 import { useForemanSettings } from 'foremanReact/Root/Context/ForemanContext';
 import SelectAllAlert from './SelectAllAlert';
-import { columns, actions } from './InsightsTableConstants';
+import { columns } from './InsightsTableConstants';
 import TableEmptyState from './components/EmptyState';
 import {
   modifySelectedRows,
@@ -37,16 +37,20 @@ const InsightsTable = ({
 }) => {
   const { perPage: appPerPage } = useForemanSettings();
   const perPage = urlPerPage || appPerPage;
+  const [rows, setRows] = React.useState([]);
 
   // acts as componentDidMount
   useEffect(() => {
     fetchInsights({ page, perPage, query, sortBy, sortOrder });
   }, []);
 
+  useEffect(() => {
+    setRows(modifySelectedRows(hits, selectedIds, showSelectAllAlert));
+  }, [hits, selectedIds]);
+
   return (
     <React.Fragment>
       <SelectAllAlert
-        itemCount={itemCount}
         selectedIds={selectedIds}
         showSelectAllAlert={showSelectAllAlert}
         selectAll={selectAll}
@@ -54,16 +58,16 @@ const InsightsTable = ({
         isAllSelected={isAllSelected}
       />
       <Table
+        className="recommendations-table"
         aria-label="Recommendations Table"
         onSelect={(_event, isSelected, rowId) =>
-          onTableSelect(_event, isSelected, rowId, hits, selectedIds)
+          onTableSelect(isSelected, rowId, rows, selectedIds)
         }
         canSelectAll
         sortBy={{ index: getSortColumnIndex(sortBy), direction: sortOrder }}
         onSort={onTableSort}
         cells={columns}
-        rows={modifySelectedRows(hits, selectedIds)}
-        actions={actions}
+        rows={rows}
       >
         <TableHeader />
         <TableBody />

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

@@ -1,10 +1,7 @@
 import URI from 'urijs';
 import { push } from 'connected-react-router';
 import { get } from 'foremanReact/redux/API';
-import {
-  selectIsAllSelected,
-  selectQueryParams,
-} from './InsightsTableSelectors';
+import { selectQueryParams } from './InsightsTableSelectors';
 import { INSIGHTS_PATH } from '../../InsightsCloudSyncConstants';
 import {
   columns,
@@ -17,7 +14,7 @@ import {
 
 export const fetchInsights = (queryParams = {}) => (dispatch, getState) => {
   const state = getState();
-  const { page, perPage, query, sortBy, sortOrder } = {
+  const { page, perPage, query, sortBy, sortOrder, isSelectAll } = {
     ...selectQueryParams(state),
     ...queryParams,
   };
@@ -32,6 +29,12 @@ export const fetchInsights = (queryParams = {}) => (dispatch, getState) => {
         search: query,
         order: `${sortBy} ${sortOrder}`,
       },
+      handleSuccess: response => {
+        if (isSelectAll) {
+          selectAllIds(dispatch, response.data.hits || []);
+          dispatch(selectAll());
+        }
+      },
     })
   );
 
@@ -42,6 +45,7 @@ export const fetchInsights = (queryParams = {}) => (dispatch, getState) => {
     search: query,
     sort_by: sortBy,
     sort_order: sortOrder,
+    select_all: isSelectAll,
   });
 
   dispatch(
@@ -51,15 +55,21 @@ export const fetchInsights = (queryParams = {}) => (dispatch, getState) => {
     })
   );
 
-  const isAllSelected = selectIsAllSelected(state);
-  if (isAllSelected) {
-    dispatch(clearAllSelection());
-  } else {
+  if (!isSelectAll) {
     dispatch(setSelectAllAlert(false));
-    dispatch(setSelectAll(false));
   }
 };
 
+const selectAllIds = (dispatch, results, prevSelectedIds = {}) => {
+  const selectedIds = { ...prevSelectedIds };
+  results.forEach(row => {
+    if (row.disableCheckbox) return;
+    selectedIds[row.id] = true;
+  });
+  dispatch(selectByIds(selectedIds));
+  dispatch(setSelectAllAlert(true));
+};
+
 export const setSelectAllAlert = showSelectAllAlert => ({
   type: INSIGHTS_SET_SELECT_ALL_ALERT,
   payload: { showSelectAllAlert },
@@ -70,10 +80,13 @@ export const selectByIds = selectedIds => ({
   payload: { selectedIds },
 });
 
-export const setSelectAll = isAllSelected => ({
-  type: INSIGHTS_SET_SELECT_ALL,
-  payload: { isAllSelected },
-});
+export const setSelectAll = isAllSelected => dispatch => {
+  dispatch(setSelectAllUrl(isAllSelected));
+  dispatch({
+    type: INSIGHTS_SET_SELECT_ALL,
+    payload: { isAllSelected },
+  });
+};
 
 export const selectAll = () => setSelectAll(true);
 
@@ -100,30 +113,42 @@ export const onTablePerPageSelect = (_event, perPageNumber) =>
   fetchInsights({ perPage: perPageNumber });
 
 export const onTableSelect = (
-  _event,
   isSelected,
   rowId,
-  results,
+  rows,
   prevSelectedIds
 ) => dispatch => {
-  const selectedIds = { ...prevSelectedIds };
-  let showSelectAllAlert = false;
-  // for select all
+  const handleRegularCheckbox = () => {
+    const selectedIds = { ...prevSelectedIds };
+    if (isSelected) {
+      selectedIds[rows[rowId].id] = true;
+    } else {
+      dispatch(setSelectAllAlert(false));
+      dispatch(setSelectAll(false));
+      delete selectedIds[rows[rowId].id];
+    }
+
+    dispatch(selectByIds(selectedIds));
+  };
+
   if (rowId === -1) {
     if (!isSelected) return dispatch(clearAllSelection());
-
-    results.forEach(row => {
-      selectedIds[row.id] = true;
-    });
-
-    showSelectAllAlert = true;
+    selectAllIds(dispatch, rows, prevSelectedIds);
   } else {
-    isSelected
-      ? (selectedIds[results[rowId].id] = true)
-      : delete selectedIds[results[rowId].id];
+    handleRegularCheckbox();
   }
 
-  dispatch(selectByIds(selectedIds));
-  dispatch(setSelectAllAlert(showSelectAllAlert));
   return null;
 };
+
+const setSelectAllUrl = selectAllValue => dispatch => {
+  const uri = new URI();
+  uri.setSearch({ select_all: selectAllValue });
+
+  dispatch(
+    push({
+      pathname: INSIGHTS_PATH,
+      search: uri.search(),
+    })
+  );
+};

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

@@ -5,6 +5,7 @@ import {
   Section,
 } from '@redhat-cloud-services/frontend-components';
 import { sortable, cellWidth } from '@patternfly/react-table';
+import { CheckCircleIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { foremanUrl } from '../../../ForemanRhCloudHelpers';
 
@@ -16,6 +17,10 @@ export const totalRiskFormatter = ({ title: totalRisk }) => ({
   ),
 });
 
+export const hasPlaybookFormatter = ({ title: hasPlaybook }) => ({
+  children: hasPlaybook ? <CheckCircleIcon color="green" /> : __('No'),
+});
+
 export const columns = [
   {
     sortKey: 'hostname',
@@ -25,22 +30,18 @@ export const columns = [
   {
     sortKey: 'title',
     title: __('Recommendation'),
-    transforms: [cellWidth(60), sortable],
+    transforms: [cellWidth(50), sortable],
   },
   {
     sortKey: 'total_risk',
     title: __('Total Risk'),
-    transforms: [cellWidth(20), sortable],
+    transforms: [cellWidth(15), sortable],
     cellTransforms: [totalRiskFormatter],
   },
-];
-
-export const actions = [
   {
-    title: __('Remediate'),
-    onClick: (event, rowId, rowData, extra) => {
-      alert('Remediate!');
-    },
+    title: __('Playbook'),
+    transforms: [cellWidth(15)],
+    cellTransforms: [hasPlaybookFormatter],
   },
 ];
 

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

@@ -1,14 +1,22 @@
 /* eslint-disable camelcase */
 import { columns } from './InsightsTableConstants';
 
-export const modifySelectedRows = (hits, selectedIds) => {
+export const modifySelectedRows = (hits, selectedIds, showSelectAllAlert) => {
   if (hits.length === 0) return [];
 
-  return hits.asMutable().map(({ id, hostname, title, total_risk }) => {
-    const row = [hostname, title, total_risk];
-    row.selected = selectedIds[id];
-    return row;
-  });
+  return hits
+    .asMutable()
+    .map(({ id, hostname, title, total_risk, has_playbook }) => {
+      const disableCheckbox = !has_playbook;
+      return {
+        cells: [hostname, title, total_risk, has_playbook],
+        disableCheckbox,
+        id,
+        /** The main table checkbox will be seen as selected only if all rows are selected,
+         * in this case we need to select also the disabled once and hide it with css */
+        selected: selectedIds[id] || (disableCheckbox && showSelectAllAlert),
+      };
+    });
 };
 
 export const getSortColumnIndex = sortBy => {

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

@@ -32,6 +32,7 @@ export const selectQueryParams = state => ({
   query: selectSearch(state),
   sortBy: selectSortBy(state),
   sortOrder: selectSortOrder(state),
+  isSelectAll: selectIsAllSelectedQuery(state),
 });
 
 export const selectStatus = state =>
@@ -64,6 +65,9 @@ export const selectSelectedIds = state =>
 export const selectIsAllSelected = state =>
   selectInsightsCloudTable(state).isAllSelected || false;
 
+export const selectIsAllSelectedQuery = state =>
+  selectQuery(state).select_all === 'true';
+
 export const selectShowSelectAllAlert = state =>
   selectInsightsCloudTable(state).showSelectAllAlert || false;
 

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

@@ -5,7 +5,6 @@ import { translate as __, sprintf } from 'foremanReact/common/I18n';
 
 const SelectAllAlert = ({
   selectedIds,
-  itemCount,
   showSelectAllAlert,
   selectAll,
   clearAllSelection,
@@ -14,18 +13,15 @@ const SelectAllAlert = ({
   if (!showSelectAllAlert) return null;
   const selectedCount = Object.keys(selectedIds).length;
   if (!selectedCount) return null;
-  if (!isAllSelected && selectedCount !== itemCount) {
+  if (!isAllSelected) {
     return (
       <Alert
         isInline
         variant="info"
-        title={sprintf(
-          'All %s recommendations on this page are selected.',
-          selectedCount
-        )}
+        title={sprintf('Recommendations selected: %s.', selectedCount)}
         actionLinks={
           <AlertActionLink onClick={selectAll}>
-            {sprintf('Select all %s recommendations', itemCount)}
+            {__('Select recommendations from all pages')}
           </AlertActionLink>
         }
       />
@@ -36,7 +32,7 @@ const SelectAllAlert = ({
     <Alert
       isInline
       variant="info"
-      title={sprintf('All %s recommendations are selected.', itemCount)}
+      title={__('All recommendations are now selected.')}
       actionLinks={
         <AlertActionLink onClick={clearAllSelection}>
           {__('Clear Selection')}
@@ -48,7 +44,6 @@ const SelectAllAlert = ({
 
 SelectAllAlert.propTypes = {
   selectedIds: PropTypes.object,
-  itemCount: PropTypes.number,
   showSelectAllAlert: PropTypes.bool,
   selectAll: PropTypes.func.isRequired,
   clearAllSelection: PropTypes.func.isRequired,
@@ -57,7 +52,6 @@ SelectAllAlert.propTypes = {
 
 SelectAllAlert.defaultProps = {
   selectedIds: {},
-  itemCount: 0,
   showSelectAllAlert: false,
   isAllSelected: false,
 };

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

@@ -0,0 +1,48 @@
+import { testActionSnapshotWithFixtures } from '@theforeman/test';
+import API from 'foremanReact/redux/API';
+import {
+  fetchInsights,
+  setSelectAllAlert,
+  selectByIds,
+  setSelectAll,
+  selectAll,
+  clearAllSelection,
+} from '../InsightsTableActions';
+import { hits } from './fixtures';
+
+jest.mock('foremanReact/redux/API', () => jest.fn());
+API.get = jest.fn(({ handleSuccess, ...action }) => {
+  handleSuccess({ data: { hits } });
+  return { type: 'get', ...action };
+});
+
+const runWithGetState = (state, action, params) => dispatch => {
+  const getState = () => ({
+    router: {
+      location: {
+        query: {
+          page: '1',
+          per_page: '7',
+          search: '',
+          sort_by: '',
+          sort_order: '',
+          select_all: 'true',
+        },
+      },
+    },
+  });
+  action(params)(dispatch, getState);
+};
+
+const fixtures = {
+  'should fetchInsights': () =>
+    runWithGetState({}, fetchInsights, { page: 2, perPage: 7 }),
+  'should setSelectAllAlert true': () => setSelectAllAlert(true),
+  'should selectByIds': () => selectByIds({ 1: true, 5: true }),
+  'should setSelectAll false': () => setSelectAll(false),
+  'should selectAll': () => selectAll(),
+  'should clearAllSelection': () => clearAllSelection(),
+};
+
+describe('insights table actions', () =>
+  testActionSnapshotWithFixtures(fixtures));

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

@@ -5,20 +5,11 @@ exports[`InsightsTable rendering render with Props 1`] = `
   <SelectAllAlert
     clearAllSelection={[Function]}
     isAllSelected={false}
-    itemCount={2}
     selectAll={[Function]}
     selectedIds={Object {}}
     showSelectAllAlert={false}
   />
   <Table
-    actions={
-      Array [
-        Object {
-          "onClick": [Function],
-          "title": "Remediate",
-        },
-      ]
-    }
     aria-label="Recommendations Table"
     borders={true}
     canSelectAll={true}
@@ -52,9 +43,18 @@ exports[`InsightsTable rendering render with Props 1`] = `
             [Function],
           ],
         },
+        Object {
+          "cellTransforms": Array [
+            [Function],
+          ],
+          "title": "Playbook",
+          "transforms": Array [
+            [Function],
+          ],
+        },
       ]
     }
-    className=""
+    className="recommendations-table"
     contentId="expanded-content"
     dropdownDirection="down"
     dropdownPosition="right"
@@ -66,20 +66,7 @@ exports[`InsightsTable rendering render with Props 1`] = `
     ouiaSafe={true}
     role="grid"
     rowLabeledBy="simple-node"
-    rows={
-      Array [
-        Array [
-          "foo.example.com",
-          "Decreased security: Yum GPG verification disabled",
-          1,
-        ],
-        Array [
-          "foo.example.com",
-          "Installation of packages across major releases is not supported",
-          2,
-        ],
-      ]
-    }
+    rows={Array []}
     selectVariant="checkbox"
     sortBy={
       Object {