foreman_rh_cloud 11.4.0 → 12.1.0

data/webpack/ForemanInventoryUpload/Components/ReportGenerate/ReportGenerate.fixtures.js

@@ -4,6 +4,7 @@ export const exitCode = 'exit 0';
 export const logs = ['No running process'];
 export const completed = 0;
 export const restartProcess = noop;
+export const downloadReports = noop;
 export const error = null;
 export const scheduled = '2019-08-21T16:14:16.520+03:00';
 export const props = {
@@ -11,6 +12,7 @@ export const props = {
   logs,
   completed,
   restartProcess,
+  downloadReports,
   error,
   scheduled,
 };

data/webpack/ForemanInventoryUpload/Components/ReportGenerate/ReportGenerate.js

@@ -12,6 +12,8 @@ const ReportGenerate = ({
   completed,
   error,
   restartProcess,
+  downloadReports,
+  downloadButtonDisabled,
   toggleFullScreen,
   scheduled,
 }) => (
@@ -19,6 +21,8 @@ const ReportGenerate = ({
     <TabHeader
       exitCode={exitCode}
       onRestart={restartProcess}
+      onDownload={downloadReports}
+      downloadButtonDisabled={downloadButtonDisabled}
       toggleFullScreen={toggleFullScreen}
     />
     <TabBody
@@ -40,6 +44,8 @@ ReportGenerate.propTypes = {
   completed: PropTypes.number,
   error: PropTypes.string,
   restartProcess: PropTypes.func,
+  downloadReports: PropTypes.func,
+  downloadButtonDisabled: PropTypes.func,
   toggleFullScreen: PropTypes.func,
   scheduled: PropTypes.string,
 };
@@ -50,6 +56,8 @@ ReportGenerate.defaultProps = {
   completed: 0,
   error: null,
   restartProcess: noop,
+  downloadReports: noop,
+  downloadButtonDisabled: noop,
   toggleFullScreen: noop,
   scheduled: null,
 };

data/webpack/ForemanInventoryUpload/Components/ReportGenerate/__tests__/__snapshots__/ReportGenerate.test.js.snap

@@ -5,8 +5,9 @@ exports[`ReportGenerate rendering render with Props 1`] = `
   className="report-generate"
 >
   <TabHeader
+    downloadButtonDisabled={[Function]}
     exitCode="exit 0"
-    onDownload={null}
+    onDownload={[Function]}
     onRestart={[Function]}
     toggleFullScreen={[Function]}
   />
@@ -29,8 +30,9 @@ exports[`ReportGenerate rendering render without Props 1`] = `
   className="report-generate"
 >
   <TabHeader
+    downloadButtonDisabled={[Function]}
     exitCode=""
-    onDownload={null}
+    onDownload={[Function]}
     onRestart={[Function]}
     toggleFullScreen={[Function]}
   />

data/webpack/ForemanInventoryUpload/Components/ReportUpload/ReportUpload.js

@@ -10,16 +10,11 @@ const ReportUpload = ({
   exitCode,
   logs,
   completed,
-  downloadReports,
   error,
   toggleFullScreen,
 }) => (
   <TabContainer className="report-upload">
-    <TabHeader
-      exitCode={exitCode}
-      onDownload={downloadReports}
-      toggleFullScreen={toggleFullScreen}
-    />
+    <TabHeader exitCode={exitCode} toggleFullScreen={toggleFullScreen} />
     <TabBody
       exitCode={exitCode}
       logs={logs}
@@ -36,7 +31,6 @@ ReportUpload.propTypes = {
     PropTypes.string,
   ]),
   completed: PropTypes.number,
-  downloadReports: PropTypes.func,
   error: PropTypes.string,
   toggleFullScreen: PropTypes.func,
 };
@@ -45,7 +39,6 @@ ReportUpload.defaultProps = {
   exitCode: '',
   logs: null,
   completed: 0,
-  downloadReports: noop,
   error: null,
   toggleFullScreen: noop,
 };

data/webpack/ForemanInventoryUpload/Components/ReportUpload/__tests__/__snapshots__/ReportUpload.test.js.snap

@@ -5,8 +5,9 @@ exports[`ReportUpload rendering render with Props 1`] = `
   className="report-upload"
 >
   <TabHeader
+    downloadButtonDisabled={[Function]}
     exitCode="exit 0"
-    onDownload={[Function]}
+    onDownload={null}
     onRestart={null}
     toggleFullScreen={[Function]}
   />
@@ -29,8 +30,9 @@ exports[`ReportUpload rendering render without Props 1`] = `
   className="report-upload"
 >
   <TabHeader
+    downloadButtonDisabled={[Function]}
     exitCode=""
-    onDownload={[Function]}
+    onDownload={null}
     onRestart={null}
     toggleFullScreen={[Function]}
   />

data/webpack/ForemanInventoryUpload/Components/TabHeader/TabHeader.js

@@ -1,45 +1,63 @@
 import React from 'react';
+import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 import { Grid, Button, Icon } from 'patternfly-react';
 import { noop } from 'foremanReact/common/helpers';
 import { sprintf, translate as __ } from 'foremanReact/common/I18n';
+import { selectSubscriptionConnectionEnabled } from '../InventorySettings/InventorySettingsSelectors';
 import { isExitCodeLoading } from '../../ForemanInventoryHelpers';
 import './tabHeader.scss';
 
-const TabHeader = ({ exitCode, onRestart, onDownload, toggleFullScreen }) => (
-  <Grid.Row className="tab-header">
-    <Grid.Col sm={6}>
-      <p>{sprintf(__('Exit Code: %s'), exitCode)}</p>
-    </Grid.Col>
-    <Grid.Col sm={6}>
-      <div className="tab-action-buttons">
-        {onRestart ? (
-          <Button
-            bsStyle="primary"
-            onClick={onRestart}
-            disabled={isExitCodeLoading(exitCode)}
-          >
-            {__('Generate and upload report')}
-          </Button>
-        ) : null}
-        {onDownload ? (
-          <Button onClick={onDownload}>
-            {__('Download Report')} <Icon name="download" />
+const TabHeader = ({
+  exitCode,
+  onRestart,
+  onDownload,
+  downloadButtonDisabled,
+  toggleFullScreen,
+}) => {
+  const subscriptionConnectionEnabled = useSelector(
+    selectSubscriptionConnectionEnabled
+  );
+  const buttonGenerateLabel = subscriptionConnectionEnabled
+    ? __('Generate and upload report')
+    : __('Generate report');
+
+  return (
+    <Grid.Row className="tab-header">
+      <Grid.Col sm={6}>
+        <p>{sprintf(__('Exit Code: %s'), exitCode)}</p>
+      </Grid.Col>
+      <Grid.Col sm={6}>
+        <div className="tab-action-buttons">
+          {onRestart ? (
+            <Button
+              bsStyle="primary"
+              onClick={onRestart}
+              disabled={isExitCodeLoading(exitCode)}
+            >
+              {buttonGenerateLabel}
+            </Button>
+          ) : null}
+          {onDownload ? (
+            <Button onClick={onDownload} disabled={downloadButtonDisabled()}>
+              {__('Download Report')} <Icon name="download" />
+            </Button>
+          ) : null}
+          <Button onClick={toggleFullScreen}>
+            {__('Full Screen')}
+            <Icon name="arrows-alt" />
           </Button>
-        ) : null}
-        <Button onClick={toggleFullScreen}>
-          {__('Full Screen')}
-          <Icon name="arrows-alt" />
-        </Button>
-      </div>
-    </Grid.Col>
-  </Grid.Row>
-);
+        </div>
+      </Grid.Col>
+    </Grid.Row>
+  );
+};
 
 TabHeader.propTypes = {
   onRestart: PropTypes.func,
   onDownload: PropTypes.func,
   exitCode: PropTypes.string,
+  downloadButtonDisabled: PropTypes.func,
   toggleFullScreen: PropTypes.func,
 };
 
@@ -47,6 +65,7 @@ TabHeader.defaultProps = {
   onRestart: null,
   exitCode: '',
   onDownload: null,
+  downloadButtonDisabled: noop,
   toggleFullScreen: noop,
 };
 

data/webpack/ForemanInventoryUpload/Components/TabHeader/__tests__/TabHeader.test.js

@@ -1,13 +1,51 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
+import React from 'react';
+import { Provider } from 'react-redux';
+import configureMockStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import { screen, render } from '@testing-library/react';
+import { noop } from 'foremanReact/common/helpers';
 import TabHeader from '../TabHeader';
 
-const fixtures = {
-  'render without Props': {},
-  /** fixtures, props for the component */
-};
+const middlewares = [thunk];
+const mockStore = configureMockStore(middlewares);
 
 describe('TabHeader', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(TabHeader, fixtures));
+  test('when subscription connection is enabled', () => {
+    const renderOptions = {
+      API: {
+        INVENTORY_SETTINGS: {
+          response: { subscriptionConnectionEnabled: true },
+        },
+      },
+    };
+    const store = mockStore(renderOptions);
+
+    render(
+      <Provider store={store}>
+        <TabHeader exitCode="exit 0" onRestart={noop} toggleFullScreen={noop} />
+      </Provider>
+    );
+    expect(screen.queryAllByText('Generate and upload report')).toHaveLength(1);
+    expect(screen.queryAllByText('Full Screen')).toHaveLength(1);
+  });
+
+  test('when subscription connection is not enabled', () => {
+    const renderOptions = {
+      API: {
+        INVENTORY_SETTINGS: {
+          response: { subscriptionConnectionEnabled: false },
+        },
+      },
+    };
+    const store = mockStore(renderOptions);
+
+    render(
+      <Provider store={store}>
+        <TabHeader exitCode="exit 0" onRestart={noop} toggleFullScreen={noop} />
+      </Provider>
+    );
+
+    expect(screen.queryAllByText('Generate report')).toHaveLength(1);
+    expect(screen.queryAllByText('Full Screen')).toHaveLength(1);
+  });
 });

data/webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/InventoryAutoUpload.js

@@ -6,8 +6,8 @@ import { FormGroup, Grid } from 'patternfly-react';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { foremanUrl } from '../../../ForemanRhCloudHelpers';
 import Switcher from '../../../common/Switcher';
-import AdvancedSettings from './components/AdvancedSettings';
 import { settingsDict } from '../../Components/InventorySettings/AdvancedSetting/AdvancedSettingsConstants';
+import InventorySettings from '../../Components/InventorySettings/InventorySettings';
 
 const InventoryAutoUploadSwitcher = ({
   autoUploadEnabled,
@@ -44,12 +44,7 @@ const InventoryAutoUploadSwitcher = ({
               headerContent={
                 <strong>{__('Advanced Inventory Settings')}</strong>
               }
-              bodyContent={
-                <AdvancedSettings
-                  autoUploadEnabled={autoUploadEnabled}
-                  handleToggle={handleToggle}
-                />
-              }
+              bodyContent={<InventorySettings />}
               position="right"
             >
               <Button

data/webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/__tests__/__snapshots__/InventoryAutoUpload.test.js.snap

@@ -32,12 +32,7 @@ exports[`InventoryAutoUpload rendering render with props 1`] = `
         sm={5}
       >
         <Popover
-          bodyContent={
-            <Memo(Connect(AdvancedSettings))
-              autoUploadEnabled={true}
-              handleToggle={[Function]}
-            />
-          }
+          bodyContent={<InventorySettings />}
           headerContent={
             <strong>
               Advanced Inventory Settings
@@ -56,11 +51,7 @@ exports[`InventoryAutoUpload rendering render with props 1`] = `
           >
             Show Advanced Settings
              
-            <CaretRightIcon
-              color="currentColor"
-              noVerticalAlign={false}
-              size="sm"
-            />
+            <CaretRightIcon />
           </Button>
         </Popover>
       </Col>
@@ -78,11 +69,7 @@ exports[`InventoryAutoUpload rendering render with props 1`] = `
         <Text
           component="p"
         >
-          <InfoAltIcon
-            color="currentColor"
-            noVerticalAlign={false}
-            size="sm"
-          />
+          <InfoAltIcon />
            
           More details can be found in
            

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

@@ -1,7 +1,11 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { Table, TableHeader, TableBody } from '@patternfly/react-table';
+import {
+  Table,
+  TableHeader,
+  TableBody,
+} from '@patternfly/react-table/deprecated';
 import { useForemanSettings } from 'foremanReact/Root/Context/ForemanContext';
 import SelectAllAlert from './SelectAllAlert';
 import {

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

@@ -4,7 +4,7 @@ import {
   InsightsLabel,
   Section,
 } from '@redhat-cloud-services/frontend-components';
-import { DropdownItem } from '@patternfly/react-core';
+import { DropdownItem } from '@patternfly/react-core/deprecated';
 import { sortable, cellWidth } from '@patternfly/react-table';
 import { AnsibeTowerIcon, ExternalLinkAltIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';

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

@@ -20,13 +20,13 @@ const paginationTitles = {
   page: '', // doesn't work well with translations as it adds 's' for plural, see: https://github.com/patternfly/patternfly-react/issues/6707
   itemsPerPage: __('Items per page'),
   perPageSuffix: __('per page'),
-  toFirstPage: __('Go to first page'),
-  toPreviousPage: __('Go to previous page'),
-  toLastPage: __('Go to last page'),
-  toNextPage: __('Go to next page'),
-  optionsToggle: __('Items per page'),
-  currPage: __('Current page'),
-  paginationTitle: __('Pagination'),
+  toFirstPageAriaLabel: __('Go to first page'),
+  toPreviousPageAriaLabel: __('Go to previous page'),
+  toLastPageAriaLabel: __('Go to last page'),
+  toNextPageAriaLabel: __('Go to next page'),
+  optionsToggleAriaLabel: __('Items per page'),
+  currPageAriaLabel: __('Current page'),
+  paginationAriaLabel: __('Pagination'),
 };
 
 const Pagination = ({ variant, ...props }) => {

data/webpack/InsightsCloudSync/Components/InsightsTable/table.scss

@@ -1,5 +1,5 @@
 .rh-cloud-recommendations-table {
-  .pf-c-table__check {
+  .pf-v5-c-table__check {
     input:disabled {
       display: none;
     }

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

@@ -1,7 +1,11 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { Table, TableHeader, TableBody } from '@patternfly/react-table';
+import {
+  Table,
+  TableHeader,
+  TableBody,
+} from '@patternfly/react-table/deprecated';
 import { Modal, ModalVariant, Button } from '@patternfly/react-core';
 import { isEmpty } from 'lodash';
 import { STATUS } from 'foremanReact/constants';

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

@@ -1,11 +1,18 @@
 import React from 'react';
 import { cellWidth } from '@patternfly/react-table';
+import { Icon } from '@patternfly/react-core';
 import { CheckCircleIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { foremanUrl } from '../../../ForemanRhCloudHelpers';
 
 export const rebootFormatter = ({ title: reboot }) => ({
-  children: reboot ? <CheckCircleIcon color="green" /> : __('No'),
+  children: reboot ? (
+    <Icon color="green">
+      <CheckCircleIcon />
+    </Icon>
+  ) : (
+    __('No')
+  ),
 });
 
 export const columns = [

data/webpack/InsightsCloudSync/Components/ToolbarDropdown.js

@@ -1,7 +1,11 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { Dropdown, DropdownItem, KebabToggle } from '@patternfly/react-core';
+import {
+  Dropdown,
+  DropdownItem,
+  KebabToggle,
+} from '@patternfly/react-core/deprecated';
 import { ExternalLinkAltIcon } from '@patternfly/react-icons';
 import { redHatAdvisorSystems } from '../InsightsCloudSyncHelpers';
 import { useAdvisorEngineConfig } from '../../common/Hooks/ConfigHooks';
@@ -35,7 +39,9 @@ const ToolbarDropdown = ({ onRecommendationSync }) => {
     <Dropdown
       className="title-dropdown"
       onSelect={() => setIsDropdownOpen(false)}
-      toggle={<KebabToggle onToggle={isOpen => setIsDropdownOpen(isOpen)} />}
+      toggle={
+        <KebabToggle onToggle={(_event, isOpen) => setIsDropdownOpen(isOpen)} />
+      }
       isOpen={isDropdownOpen}
       isPlain
       dropdownItems={dropdownItems}

data/webpack/InsightsCloudSync/InsightsCloudSync.scss

@@ -78,7 +78,7 @@
       width: 100%;
     }
 
-    .pf-c-pagination {
+    .pf-v5-c-pagination {
       padding-right: 0;
     }
   }

data/webpack/InsightsHostDetailsTab/InsightsTotalRiskChart.js

@@ -3,8 +3,14 @@ import PropTypes from 'prop-types';
 import { useDispatch } from 'react-redux';
 import { push } from 'connected-react-router';
 import { useHistory } from 'react-router-dom';
-import { DropdownItem, Bullseye, Title } from '@patternfly/react-core';
-import { ChartDonut, ChartLegend, ChartLabel } from '@patternfly/react-charts';
+import { Bullseye, Title } from '@patternfly/react-core';
+import { DropdownItem } from '@patternfly/react-core/deprecated';
+import {
+  ChartDonut,
+  ChartLegend,
+  ChartLabel,
+  ChartTooltip,
+} from '@patternfly/react-charts';
 import { STATUS } from 'foremanReact/constants';
 import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
 import CardTemplate from 'foremanReact/components/HostDetails/Templates/CardItem/CardTemplate';
@@ -90,6 +96,9 @@ const InsightsTotalRiskCard = ({ hostDetails: { id } }) => {
         { x: critical.title, y: critical.value },
       ]}
       labels={({ datum: { x, y } }) => `${x}: ${y}`}
+      labelComponent={
+        <ChartTooltip constrainToVisibleArea renderInPortal={false} />
+      }
       legendComponent={legend}
       legendPosition="right"
       subTitle="Recommendations"

data/webpack/InsightsHostDetailsTab/NewHostDetailsTab.js

@@ -3,13 +3,12 @@ import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
 import SearchBar from 'foremanReact/components/SearchBar';
 import { translate as __ } from 'foremanReact/common/I18n';
+import { Grid, GridItem } from '@patternfly/react-core';
 import {
-  Grid,
-  GridItem,
   Dropdown,
   DropdownItem,
   KebabToggle,
-} from '@patternfly/react-core';
+} from '@patternfly/react-core/deprecated';
 import { ExternalLinkAltIcon } from '@patternfly/react-icons';
 import InsightsTable from '../InsightsCloudSync/Components/InsightsTable';
 import RemediationModal from '../InsightsCloudSync/Components/RemediationModal';
@@ -76,7 +75,9 @@ const NewHostDetailsTab = ({ hostName, router }) => {
           ouiaId="insights-dropdown"
           onSelect={() => setIsDropdownOpen(false)}
           toggle={
-            <KebabToggle onToggle={isOpen => setIsDropdownOpen(isOpen)} />
+            <KebabToggle
+              onToggle={(_event, isOpen) => setIsDropdownOpen(isOpen)}
+            />
           }
           isOpen={isDropdownOpen}
           isPlain

data/webpack/common/DropdownToggle.js

@@ -1,13 +1,13 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import { Dropdown, KebabToggle } from '@patternfly/react-core';
+import { Dropdown, KebabToggle } from '@patternfly/react-core/deprecated';
 
 const DropdownToggle = ({ items, ...props }) => {
   const [isOpen, setOpen] = useState(false);
   return (
     <Dropdown
       onSelect={() => setOpen(false)}
-      toggle={<KebabToggle onToggle={value => setOpen(value)} />}
+      toggle={<KebabToggle onToggle={(_event, value) => setOpen(value)} />}
       isOpen={isOpen}
       isPlain
       dropdownItems={items}

data/webpack/common/Switcher/HelpLabel.js

@@ -9,7 +9,7 @@ export const HelpLabel = ({ text, id, className }) => {
     <Popover id={`${id}-help`} bodyContent={text} aria-label="help-text">
       <button
         onClick={e => e.preventDefault()}
-        className={`pf-c-form__group-label-help ${className}`}
+        className={`pf-v5-c-form__group-label-help ${className}`}
       >
         <HelpIcon />
       </button>

data/webpack/common/Switcher/SwitcherPF4.js

@@ -4,11 +4,19 @@ import { Switch } from '@patternfly/react-core';
 import { HelpLabel } from './HelpLabel';
 import './SwitcherPF4.scss';
 
-const SwitcherPF4 = ({ id, label, tooltip, isChecked, onChange }) => (
+const SwitcherPF4 = ({
+  id,
+  label,
+  tooltip,
+  isChecked,
+  onChange,
+  isDisabled,
+}) => (
   <Switch
     className="foreman-rh-cloud-switcher"
     id={`rh-cloud-switcher-${id}`}
     isChecked={isChecked}
+    isDisabled={isDisabled}
     onChange={onChange}
     label={
       <div>
@@ -24,6 +32,7 @@ SwitcherPF4.propTypes = {
   label: PropTypes.string,
   tooltip: PropTypes.string,
   isChecked: PropTypes.bool,
+  isDisabled: PropTypes.bool,
   onChange: PropTypes.func.isRequired,
 };
 
@@ -31,6 +40,7 @@ SwitcherPF4.defaultProps = {
   label: null,
   tooltip: null,
   isChecked: true,
+  isDisabled: false,
 };
 
 export default SwitcherPF4;

data/webpack/common/Switcher/SwitcherPF4.scss

@@ -7,7 +7,7 @@ label.foreman-rh-cloud-switcher {
     padding-left: 5px;
   }
 
-  .pf-c-switch__toggle {
+  .pf-v5-c-switch__toggle {
     margin-right: 5px;
   }
 }

data/webpack/common/Switcher/__tests__/__snapshots__/HelpLabel.test.js.snap

@@ -7,14 +7,10 @@ exports[`InsightsCloudSync helpers should return insights cloud Url 1`] = `
   id="some-id-help"
 >
   <button
-    className="pf-c-form__group-label-help some-class"
+    className="pf-v5-c-form__group-label-help some-class"
     onClick={[Function]}
   >
-    <HelpIcon
-      color="currentColor"
-      noVerticalAlign={false}
-      size="sm"
-    />
+    <HelpIcon />
   </button>
 </Popover>
 `;