foreman_rh_cloud 3.0.14 → 3.0.15

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountListActions.test.js

@@ -1,5 +1,5 @@
 import { testActionSnapshotWithFixtures } from '@theforeman/test';
-import API from 'foremanReact/API';
+import { API } from 'foremanReact/redux/API';
 import {
   fetchAccountsStatus,
   startAccountStatusPolling,
@@ -12,7 +12,7 @@ import {
 } from '../AccountList.fixtures';
 import { accountID, activeTab } from '../../Dashboard/Dashboard.fixtures';
 
-jest.mock('foremanReact/API');
+jest.mock('foremanReact/redux/API');
 API.get.mockImplementation(async () => fetchAccountsStatusResponse);
 
 const fixtures = {

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

@@ -1,8 +1,8 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`AccountList rendering render with props 1`] = `
-<ListView
-  className="account_list"
+<Accordion
+  className="account-list"
 >
   <ListItem
     account={
@@ -37,7 +37,7 @@ exports[`AccountList rendering render with props 1`] = `
     accountID="Account3"
     key="2"
   />
-</ListView>
+</Accordion>
 `;
 
 exports[`AccountList rendering show empty results 1`] = `<inventoryEmptyResults />`;

data/webpack/ForemanInventoryUpload/Components/AccountList/accountList.scss

@@ -1,9 +1,32 @@
-.account_list {
-  .list-view-pf-expand {
-    margin-top: 25px;
+.account-list {
+  .pf-c-accordion__toggle {
+    margin-top: 10px;
   }
 
-  .list-group-item-container {
-    min-height: 435px;
+  .pf-c-accordion__toggle-text {
+    font-size: 16px;
+    display: flex;
+    justify-content: space-between;
+    width: 100%;
+
+    .account-icon {
+      margin-right: 5px;
+
+      .pf-c-label__icon {
+        margin: 0;
+      }
+    }
+
+    span {
+      align-self: center;
+    }
+
+    .status {
+      margin: 0;
+    }
+  }
+
+  .list-item-status > span {
+    margin-left: 7px;
   }
 }

data/webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/AutoUploadSwitcher.js

@@ -1,20 +1,17 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Switch, FieldLevelHelp } from 'patternfly-react';
 import { translate as __ } from 'foremanReact/common/I18n';
-import './autoUploadSwitcher.scss';
+import SwitcherPF4 from '../../../common/Switcher/SwitcherPF4';
 
 const AutoUploadSwitcher = ({ autoUploadEnabled, handleToggle }) => (
   <div className="auto_upload_switcher">
-    <span>Auto upload</span>
-    <FieldLevelHelp
-      content={__(
+    <SwitcherPF4
+      id="auto-upload-setting-switcher"
+      label={__('Auto upload')}
+      tooltip={__(
         'Enable automatic upload of your hosts inventory to the Red Hat cloud'
       )}
-    />
-    <Switch
-      size="mini"
-      value={autoUploadEnabled}
+      isChecked={autoUploadEnabled}
       onChange={() => handleToggle(autoUploadEnabled)}
     />
   </div>

data/webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/AutoUploadSwitcherActions.js

@@ -1,4 +1,4 @@
-import API from 'foremanReact/API';
+import { API } from 'foremanReact/redux/API';
 import { addToast } from 'foremanReact/redux/actions/toasts';
 import { inventoryUrl } from '../../ForemanInventoryHelpers';
 import { AUTO_UPLOAD_TOGGLE } from './AutoUploadSwitcherConstants';

data/webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/__tests__/AutoUploadSwitcherActions.test.js

@@ -1,12 +1,12 @@
 import { testActionSnapshotWithFixtures } from '@theforeman/test';
-import API from 'foremanReact/API';
+import { API } from 'foremanReact/redux/API';
 import { handleToggle } from '../AutoUploadSwitcherActions';
 import {
   handleToggleResponse,
   currentAutoUploadEnabled,
 } from '../AutoUploadSwitcher.fixtures';
 
-jest.mock('foremanReact/API');
+jest.mock('foremanReact/redux/API');
 API.post.mockImplementation(async () => handleToggleResponse);
 
 const fixtures = {

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

@@ -4,35 +4,12 @@ exports[`AutoUploadSwitcher rendering render with props 1`] = `
 <div
   className="auto_upload_switcher"
 >
-  <span>
-    Auto upload
-  </span>
-  <FieldLevelHelp
-    buttonClass=""
-    content="Enable automatic upload of your hosts inventory to the Red Hat cloud"
-    placement="top"
-    rootClose={true}
-  />
-  <Switch
-    animate={true}
-    baseClass="bootstrap-switch"
-    bsSize={null}
-    defaultValue={true}
-    disabled={false}
-    handleWidth="auto"
-    inverse={false}
-    labelText=" "
-    labelWidth="auto"
-    offColor="default"
-    offText="OFF"
+  <SwitcherPF4
+    id="auto-upload-setting-switcher"
+    isChecked={true}
+    label="Auto upload"
     onChange={[Function]}
-    onColor="primary"
-    onText="ON"
-    readonly={false}
-    size="mini"
-    tristate={false}
-    value={true}
-    wrapperClass="wrapper"
+    tooltip="Enable automatic upload of your hosts inventory to the Red Hat cloud"
   />
 </div>
 `;

data/webpack/ForemanInventoryUpload/Components/Dashboard/DashboardActions.js

@@ -1,4 +1,4 @@
-import API from 'foremanReact/API';
+import { API } from 'foremanReact/redux/API';
 import { selectActiveTab } from './DashboardSelectors';
 import { inventoryUrl } from '../../ForemanInventoryHelpers';
 import {

data/webpack/ForemanInventoryUpload/Components/Dashboard/__tests__/DashboardActions.test.js

@@ -1,5 +1,5 @@
 import { testActionSnapshotWithFixtures } from '@theforeman/test';
-import API from 'foremanReact/API';
+import { API } from 'foremanReact/redux/API';
 import {
   startPolling,
   stopPolling,
@@ -16,7 +16,7 @@ import {
 } from '../Dashboard.fixtures';
 import { rhCloudStateWrapper } from '../../../../ForemanRhCloudTestHelpers';
 
-jest.mock('foremanReact/API');
+jest.mock('foremanReact/redux/API');
 API.get.mockImplementation(() => serverMock);
 
 const runWithGetState = (state, action, params) => dispatch => {

data/webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/ExcludePackagesSwitcher.js

@@ -1,18 +1,15 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Switch, FieldLevelHelp } from 'patternfly-react';
 import { translate as __ } from 'foremanReact/common/I18n';
-import './excludePackagesSwitcher.scss';
+import SwitcherPF4 from '../../../common/Switcher/SwitcherPF4';
 
 const ExcludePackagesSwitcher = ({ excludePackages, handleToggle }) => (
   <div className="exclude_packages_switcher">
-    <span>Exclude Packages</span>
-    <FieldLevelHelp
-      content={__('Exclude packages from being uploaded to the Red Hat cloud')}
-    />
-    <Switch
-      size="mini"
-      value={excludePackages}
+    <SwitcherPF4
+      id="exclude-packages-setting-switcher"
+      label={__('Exclude Packages')}
+      tooltip={__('Exclude packages from being uploaded to the Red Hat cloud')}
+      isChecked={excludePackages}
       onChange={() => handleToggle(excludePackages)}
     />
   </div>

data/webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/ExcludePackagesSwitcherActions.js

@@ -1,4 +1,4 @@
-import API from 'foremanReact/API';
+import { API } from 'foremanReact/redux/API';
 import { addToast } from 'foremanReact/redux/actions/toasts';
 import { inventoryUrl } from '../../ForemanInventoryHelpers';
 import { EXCLUDE_PACKAGES_TOGGLE } from './ExcludePackagesSwitcherConstants';

data/webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/__tests__/ExcludePackagesSwitcherActions.test.js

@@ -1,9 +1,9 @@
 import { testActionSnapshotWithFixtures } from '@theforeman/test';
-import API from 'foremanReact/API';
+import { API } from 'foremanReact/redux/API';
 import { handleToggle } from '../ExcludePackagesSwitcherActions';
 import { handleToggleResponse } from '../ExcludePackagesSwitcher.fixtures';
 
-jest.mock('foremanReact/API');
+jest.mock('foremanReact/redux/API');
 API.post.mockImplementation(async () => handleToggleResponse);
 
 const fixtures = {

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

@@ -4,35 +4,12 @@ exports[`ExcludePackagesSwitcher rendering render with props 1`] = `
 <div
   className="exclude_packages_switcher"
 >
-  <span>
-    Exclude Packages
-  </span>
-  <FieldLevelHelp
-    buttonClass=""
-    content="Exclude packages from being uploaded to the Red Hat cloud"
-    placement="top"
-    rootClose={true}
-  />
-  <Switch
-    animate={true}
-    baseClass="bootstrap-switch"
-    bsSize={null}
-    defaultValue={true}
-    disabled={false}
-    handleWidth="auto"
-    inverse={false}
-    labelText=" "
-    labelWidth="auto"
-    offColor="default"
-    offText="OFF"
+  <SwitcherPF4
+    id="exclude-packages-setting-switcher"
+    isChecked={true}
+    label="Exclude Packages"
     onChange={[Function]}
-    onColor="primary"
-    onText="ON"
-    readonly={false}
-    size="mini"
-    tristate={false}
-    value={true}
-    wrapperClass="wrapper"
+    tooltip="Exclude packages from being uploaded to the Red Hat cloud"
   />
 </div>
 `;

data/webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/__tests__/__snapshots__/integration.test.js.snap

@@ -18,6 +18,11 @@ Object {
         "settings": Object {
           "insightsSyncEnabled": false,
         },
+        "table": Object {
+          "isAllSelected": false,
+          "selectedIds": Object {},
+          "showSelectAllAlert": false,
+        },
       },
       "hostInsights": Object {
         "hits": Array [],

data/webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/__tests__/integration.test.js

@@ -1,10 +1,10 @@
 import React from 'react';
 import { IntegrationTestHelper } from '@theforeman/test';
-import API from 'foremanReact/API';
+import { API } from 'foremanReact/redux/API';
 import ExcludePackagesSwitcher from '../index';
 import reducers from '../../../../ForemanRhCloudReducers';
 
-jest.mock('foremanReact/API');
+jest.mock('foremanReact/redux/API');
 API.post.mockImplementation(async () => ({
   data: {
     excludePackages: false,

data/webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/HostObfuscationSwitcher.js

@@ -1,18 +1,15 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Switch, FieldLevelHelp } from 'patternfly-react';
 import { translate as __ } from 'foremanReact/common/I18n';
-import './HostObfuscationSwitcher.scss';
+import SwitcherPF4 from '../../../common/Switcher/SwitcherPF4';
 
 const HostObfuscationSwitcher = ({ hostObfuscationEnabled, handleToggle }) => (
   <div className="host_obfuscation_switcher">
-    <span>Obfuscate host names</span>
-    <FieldLevelHelp
-      content={__('Obfuscate host names sent to the Red Hat cloud')}
-    />
-    <Switch
-      size="mini"
-      value={hostObfuscationEnabled}
+    <SwitcherPF4
+      id="host-obfuscation-setting-switcher"
+      label={__('Obfuscate host names')}
+      tooltip={__('Obfuscate host names sent to the Red Hat cloud')}
+      isChecked={hostObfuscationEnabled}
       onChange={() => handleToggle(hostObfuscationEnabled)}
     />
   </div>

data/webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/HostObfuscationSwitcherActions.js

@@ -1,4 +1,4 @@
-import API from 'foremanReact/API';
+import { API } from 'foremanReact/redux/API';
 import { addToast } from 'foremanReact/redux/actions/toasts';
 import { inventoryUrl } from '../../ForemanInventoryHelpers';
 import { HOST_OBFUSCATION_TOGGLE } from './HostObfuscationSwitcherConstants';

data/webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/__tests__/HostObfuscationSwitcherActions.test.js

@@ -1,12 +1,12 @@
 import { testActionSnapshotWithFixtures } from '@theforeman/test';
-import API from 'foremanReact/API';
+import { API } from 'foremanReact/redux/API';
 import { handleToggle } from '../HostObfuscationSwitcherActions';
 import {
   handleToggleResponse,
   currentHostObfuscationEnabled,
 } from '../HostObfuscationSwitcher.fixtures';
 
-jest.mock('foremanReact/API');
+jest.mock('foremanReact/redux/API');
 API.post.mockImplementation(async () => handleToggleResponse);
 
 const fixtures = {

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

@@ -4,35 +4,12 @@ exports[`HostObfuscationSwitcher rendering render with props 1`] = `
 <div
   className="host_obfuscation_switcher"
 >
-  <span>
-    Obfuscate host names
-  </span>
-  <FieldLevelHelp
-    buttonClass=""
-    content="Obfuscate host names sent to the Red Hat cloud"
-    placement="top"
-    rootClose={true}
-  />
-  <Switch
-    animate={true}
-    baseClass="bootstrap-switch"
-    bsSize={null}
-    defaultValue={true}
-    disabled={false}
-    handleWidth="auto"
-    inverse={false}
-    labelText=" "
-    labelWidth="auto"
-    offColor="default"
-    offText="OFF"
+  <SwitcherPF4
+    id="host-obfuscation-setting-switcher"
+    isChecked={true}
+    label="Obfuscate host names"
     onChange={[Function]}
-    onColor="primary"
-    onText="ON"
-    readonly={false}
-    size="mini"
-    tristate={false}
-    value={true}
-    wrapperClass="wrapper"
+    tooltip="Obfuscate host names sent to the Red Hat cloud"
   />
 </div>
 `;

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/InventoryFilterReducer.js

@@ -3,6 +3,7 @@ import {
   LAYOUT_CHANGE_ORG,
   LAYOUT_INITIALIZE,
 } from 'foremanReact/components/Layout/LayoutConstants';
+import { translate as __ } from 'foremanReact/common/I18n';
 import {
   INVENTORY_FILTER_UPDATE,
   INVENTORY_FILTER_CLEAR,
@@ -28,15 +29,17 @@ export default (
       });
     case LAYOUT_CHANGE_ORG: {
       const { title } = org;
-      const term = title === ANY_ORGANIZATION ? '' : title;
+      // Any org is used only in it's translated form in the redux
+      const term = title === __(ANY_ORGANIZATION) ? '' : title;
       return state.merge({
         filterTerm: term,
       });
     }
     case LAYOUT_INITIALIZE: {
       // Layout action changed in Jul 20 2020 - https://github.com/theforeman/foreman/commit/e4c39a7d8f8b50ba45ef63e46f6f6914b69f247a
-      const { title } = organization; // org was renamed
-      const term = title === ANY_ORGANIZATION ? '' : title;
+      const { title } = organization || {}; // org was renamed
+      // Any org is used only in it's translated form in the redux
+      const term = title === __(ANY_ORGANIZATION) ? '' : title;
       return state.merge({
         filterTerm: term,
       });

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/__snapshots__/integration.test.js.snap

@@ -18,6 +18,11 @@ Object {
         "settings": Object {
           "insightsSyncEnabled": false,
         },
+        "table": Object {
+          "isAllSelected": false,
+          "selectedIds": Object {},
+          "showSelectAllAlert": false,
+        },
       },
       "hostInsights": Object {
         "hits": Array [],

data/webpack/ForemanInventoryUpload/Components/InventorySettings/InventorySettings.js

@@ -4,10 +4,10 @@ import AutoUploadSwitcher from '../AutoUploadSwitcher';
 import HostObfuscationSwitcher from '../HostObfuscationSwitcher';
 import ExcludePackagesSwitcher from '../ExcludePackagesSwitcher';
 import IpsObfuscationSwitcher from '../IpsObfuscationSwitcher';
-import './inventorySettings.scss';
+import './InventorySettings.scss';
 
 const InventorySettings = () => (
-  <div className="inventory_settings">
+  <div className="inventory-settings">
     <h3>{__('Settings')}</h3>
     <AutoUploadSwitcher />
     <ExcludePackagesSwitcher />