foreman_rh_cloud 2.0.18.1 → 3.0.14

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

@@ -8,11 +8,9 @@ exports[`ListItem rendering render with Props 1`] = `
       <ListItemStatus
         account={
           Object {
-            "test": Object {
-              "generate_report_status": "unknown",
-              "id": 1,
-              "upload_report_status": "unknown",
-            },
+            "generate_report_status": "unknown",
+            "label": "default_org_name",
+            "upload_report_status": "unknown",
           }
         }
       />,
@@ -22,7 +20,7 @@ exports[`ListItem rendering render with Props 1`] = `
   compoundExpand={false}
   compoundExpanded={false}
   description={null}
-  heading="test"
+  heading="default_org_name"
   hideCloseIcon={true}
   initExpanded={false}
   leftContent={
@@ -41,13 +39,12 @@ exports[`ListItem rendering render with Props 1`] = `
   <Connect(Dashboard)
     account={
       Object {
-        "test": Object {
-          "generate_report_status": "unknown",
-          "id": 1,
-          "upload_report_status": "unknown",
-        },
+        "generate_report_status": "unknown",
+        "label": "default_org_name",
+        "upload_report_status": "unknown",
       }
     }
+    accountID="1"
   />
 </ListViewItem>
 `;

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

@@ -1,12 +1,12 @@
 import { filterAccounts } from '../AccountListHelper';
-import { accounts } from '../AccountList.fixtures';
+import { accounts, accountIDs } from '../AccountList.fixtures';
 
 describe('AccountList helpers', () => {
   it('account ids filter should return all accounts where label contains "test"', () => {
-    expect(filterAccounts(accounts, 'AcCoUnT')).toEqual(accounts);
+    expect(filterAccounts(accounts, accountIDs, 'test')).toEqual(accountIDs);
   });
 
   it('account ids filter should not match', () => {
-    expect(filterAccounts(accounts, 'no_match')).toEqual({});
+    expect(filterAccounts(accounts, accountIDs, 'no_match')).toEqual([]);
   });
 });

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

@@ -8,34 +8,34 @@ exports[`AccountList rendering render with props 1`] = `
     account={
       Object {
         "generate_report_status": "running",
-        "id": 1,
+        "label": "test_org1",
         "upload_report_status": "running",
       }
     }
+    accountID="Account1"
     key="0"
-    label="Account1"
   />
   <ListItem
     account={
       Object {
         "generate_report_status": "failure",
-        "id": 2,
+        "label": "test_org2",
         "upload_report_status": "unknown",
       }
     }
+    accountID="Account2"
     key="1"
-    label="Account2"
   />
   <ListItem
     account={
       Object {
         "generate_report_status": "running",
-        "id": 3,
+        "label": "test_org3",
         "upload_report_status": "success",
       }
     }
+    accountID="Account3"
     key="2"
-    label="Account3"
   />
 </ListView>
 `;

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

@@ -8,17 +8,17 @@ Array [
         "accounts": Object {
           "Account1": Object {
             "generate_report_status": "running",
-            "id": 1,
+            "label": "test_org1",
             "upload_report_status": "running",
           },
           "Account2": Object {
             "generate_report_status": "failure",
-            "id": 2,
+            "label": "test_org2",
             "upload_report_status": "unknown",
           },
           "Account3": Object {
             "generate_report_status": "running",
-            "id": 3,
+            "label": "test_org3",
             "upload_report_status": "success",
           },
         },

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

@@ -23,17 +23,17 @@ Object {
   "accounts": Object {
     "Account1": Object {
       "generate_report_status": "running",
-      "id": 1,
+      "label": "test_org1",
       "upload_report_status": "running",
     },
     "Account2": Object {
       "generate_report_status": "failure",
-      "id": 2,
+      "label": "test_org2",
       "upload_report_status": "unknown",
     },
     "Account3": Object {
       "generate_report_status": "running",
-      "id": 3,
+      "label": "test_org3",
       "upload_report_status": "success",
     },
   },

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

@@ -4,17 +4,17 @@ exports[`AccountList selectors should return AccountList accounts 1`] = `
 Object {
   "Account1": Object {
     "generate_report_status": "running",
-    "id": 1,
+    "label": "test_org1",
     "upload_report_status": "running",
   },
   "Account2": Object {
     "generate_report_status": "failure",
-    "id": 2,
+    "label": "test_org2",
     "upload_report_status": "unknown",
   },
   "Account3": Object {
     "generate_report_status": "running",
-    "id": 3,
+    "label": "test_org3",
     "upload_report_status": "success",
   },
 }
@@ -35,17 +35,17 @@ Object {
   "accounts": Object {
     "Account1": Object {
       "generate_report_status": "running",
-      "id": 1,
+      "label": "test_org1",
       "upload_report_status": "running",
     },
     "Account2": Object {
       "generate_report_status": "failure",
-      "id": 2,
+      "label": "test_org2",
       "upload_report_status": "unknown",
     },
     "Account3": Object {
       "generate_report_status": "running",
-      "id": 3,
+      "label": "test_org3",
       "upload_report_status": "success",
     },
   },

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

@@ -9,7 +9,7 @@ const AutoUploadSwitcher = ({ autoUploadEnabled, handleToggle }) => (
     <span>Auto upload</span>
     <FieldLevelHelp
       content={__(
-        'Enable automatic upload of your host inventory to the Red Hat cloud'
+        'Enable automatic upload of your hosts inventory to the Red Hat cloud'
       )}
     />
     <Switch

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

@@ -9,7 +9,7 @@ exports[`AutoUploadSwitcher rendering render with props 1`] = `
   </span>
   <FieldLevelHelp
     buttonClass=""
-    content="Enable automatic upload of your host inventory to the Red Hat cloud"
+    content="Enable automatic upload of your hosts inventory to the Red Hat cloud"
     placement="top"
     rootClose={true}
   />

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

@@ -67,7 +67,7 @@ export const setActiveTab = (accountID, tabName) => ({
 });
 
 export const downloadReports = accountID => {
-  window.open(inventoryUrl(`${accountID}/uploads/file`), '_blank');
+  window.location.href = inventoryUrl(`${accountID}/uploads/file`);
   return {
     type: INVENTORY_REPORTS_DOWNLOAD,
     payload: {

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

@@ -36,15 +36,15 @@ const fixtures = {
 };
 
 describe('Dashboard actions', () => {
-  const { open } = window;
+  const { location } = window;
 
   beforeAll(() => {
-    delete window.open;
-    window.open = jest.fn();
+    delete window.location;
+    window.location = { href: jest.fn() };
   });
 
   afterAll(() => {
-    window.open = open;
+    window.location = location;
   });
 
   return testActionSnapshotWithFixtures(fixtures);

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

@@ -0,0 +1,92 @@
+import React, { useEffect } from 'react';
+import PropTypes from 'prop-types';
+import { Text, TextVariants, Popover, Button } from '@patternfly/react-core';
+import { InfoAltIcon, CaretRightIcon } from '@patternfly/react-icons';
+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';
+
+const InventoryAutoUploadSwitcher = ({
+  autoUploadEnabled,
+  handleToggle,
+  fetchSettings,
+}) => {
+  useEffect(() => {
+    fetchSettings();
+  }, [fetchSettings]);
+
+  return (
+    <FormGroup>
+      <Grid>
+        <h3>{__('Red Hat Cloud Inventory')}</h3>
+        <hr />
+        <Grid.Row>
+          <Switcher
+            id="auto-upload"
+            label={__('Inventory Auto Upload')}
+            tooltip={__(
+              'Enable automatic upload of your hosts inventory to the Red Hat cloud'
+            )}
+            isChecked={autoUploadEnabled}
+            onChange={() => handleToggle(autoUploadEnabled)}
+            labelCol={5}
+          />
+
+          <Grid.Col sm={5}>
+            <Popover
+              headerContent={<strong>Advanced Inventory Settings</strong>}
+              bodyContent={
+                <AdvancedSettings
+                  autoUploadEnabled={autoUploadEnabled}
+                  handleToggle={handleToggle}
+                />
+              }
+              position="right"
+            >
+              <Button
+                variant="secondary"
+                style={{ fontSize: 'small', marginTop: '-4px' }}
+              >
+                {__('Show Advanced Settings')} <CaretRightIcon />
+              </Button>
+            </Popover>
+          </Grid.Col>
+        </Grid.Row>
+        <br />
+        <Grid.Row>
+          <Grid.Col sm={12}>
+            <Text component={TextVariants.p}>
+              <InfoAltIcon /> {__('More details can be found in')}{' '}
+              <Text
+                component={TextVariants.a}
+                href={foremanUrl('/foreman_rh_cloud/inventory_upload')}
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                <strong>
+                  {__('Configure')}
+                  {' > '}
+                  {__('Inventory Upload')}
+                </strong>
+              </Text>
+            </Text>
+          </Grid.Col>
+        </Grid.Row>
+      </Grid>
+    </FormGroup>
+  );
+};
+
+InventoryAutoUploadSwitcher.propTypes = {
+  autoUploadEnabled: PropTypes.bool,
+  handleToggle: PropTypes.func.isRequired,
+  fetchSettings: PropTypes.func.isRequired,
+};
+
+InventoryAutoUploadSwitcher.defaultProps = {
+  autoUploadEnabled: true,
+};
+
+export default InventoryAutoUploadSwitcher;

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

@@ -0,0 +1,17 @@
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import { noop } from 'patternfly-react';
+
+import InventoryAutoUpload from '../InventoryAutoUpload';
+
+const fixtures = {
+  'render with props': {
+    autoUploadEnabled: true,
+    handleToggle: noop,
+    fetchSettings: noop,
+  },
+};
+
+describe('InventoryAutoUpload', () => {
+  describe('rendering', () =>
+    testComponentSnapshotsWithFixtures(InventoryAutoUpload, fixtures));
+});

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

@@ -0,0 +1,106 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`InventoryAutoUpload rendering render with props 1`] = `
+<FormGroup
+  bsClass="form-group"
+>
+  <Grid
+    bsClass="container"
+    componentClass="div"
+    fluid={false}
+  >
+    <h3>
+      Red Hat Cloud Inventory
+    </h3>
+    <hr />
+    <Row
+      bsClass="row"
+      componentClass="div"
+    >
+      <Switcher
+        SwitchCol={2}
+        id="auto-upload"
+        isChecked={true}
+        label="Inventory Auto Upload"
+        labelCol={5}
+        onChange={[Function]}
+        tooltip="Enable automatic upload of your hosts inventory to the Red Hat cloud"
+      />
+      <Col
+        bsClass="col"
+        componentClass="div"
+        sm={5}
+      >
+        <Popover
+          bodyContent={
+            <UNDEFINED
+              autoUploadEnabled={true}
+              handleToggle={[Function]}
+            />
+          }
+          headerContent={
+            <strong>
+              Advanced Inventory Settings
+            </strong>
+          }
+          position="right"
+        >
+          <Button
+            style={
+              Object {
+                "fontSize": "small",
+                "marginTop": "-4px",
+              }
+            }
+            variant="secondary"
+          >
+            Show Advanced Settings
+             
+            <CaretRightIcon
+              color="currentColor"
+              noVerticalAlign={false}
+              size="sm"
+            />
+          </Button>
+        </Popover>
+      </Col>
+    </Row>
+    <br />
+    <Row
+      bsClass="row"
+      componentClass="div"
+    >
+      <Col
+        bsClass="col"
+        componentClass="div"
+        sm={12}
+      >
+        <Text
+          component="p"
+        >
+          <InfoAltIcon
+            color="currentColor"
+            noVerticalAlign={false}
+            size="sm"
+          />
+           
+          More details can be found in
+           
+          <Text
+            component="a"
+            href="/foreman_rh_cloud/inventory_upload"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            <strong>
+              Configure
+               &gt; 
+              Inventory Upload
+            </strong>
+          </Text>
+        </Text>
+      </Col>
+    </Row>
+  </Grid>
+</FormGroup>
+`;