foreman_rh_cloud 3.0.17 → 3.0.18

data/webpack/ForemanInventoryUpload/Components/AccountList/AccountListSelectors.js

@@ -9,17 +9,3 @@ export const selectPollingProcessID = state =>
   selectAccountsList(state).pollingProcessID;
 
 export const selectError = state => selectAccountsList(state).error;
-
-export const selectAutoUploadEnabled = state =>
-  selectAccountsList(state).autoUploadEnabled;
-
-export const selectHostObfuscationEnabled = state =>
-  selectAccountsList(state).hostObfuscationEnabled;
-
-export const selectIpsObfuscationEnabled = state =>
-  selectAccountsList(state).ipsObfuscationEnabled;
-
-export const selectCloudToken = state => selectAccountsList(state).cloudToken;
-
-export const selectExcludePackages = state =>
-  selectAccountsList(state).excludePackages;

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/EmptyResults/emptyResults.scss

@@ -1,7 +1,9 @@
-.blank-slate-pf {
-  margin-top: 100px;
+.rh-cloud-inventory-page {
+  .blank-slate-pf {
+    margin-top: 100px;
 
-  .no_results_icon {
-    margin-right: 5px;
+    .no_results_icon {
+      margin-right: 5px;
+    }
   }
 }

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/EmptyState/emptyState.scss

@@ -1,7 +1,9 @@
-.blank-slate-pf {
-  margin-top: 100px;
+.rh-cloud-inventory-page {
+  .blank-slate-pf {
+    margin-top: 100px;
 
-  .spinner {
-    float: none;
+    .spinner {
+      float: none;
+    }
   }
 }

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/ErrorState/errorState.scss

@@ -1,18 +1,20 @@
 $error_color: #d10d0d;
 
-.error_state {
-  margin-top: 100px;
-  text-align: center;
-  font-weight: bold;
-  font-size: 16px;
+.rh-cloud-inventory-page {
+  .error_state {
+    margin-top: 100px;
+    text-align: center;
+    font-weight: bold;
+    font-size: 16px;
 
-  .error_icon {
-    color: $error_color;
-    margin-right: 15px;
-    margin-bottom: 10px;
-  }
+    .error_icon {
+      color: $error_color;
+      margin-right: 15px;
+      margin-bottom: 10px;
+    }
 
-  .error_description {
-    color: $error_color;
+    .error_description {
+      color: $error_color;
+    }
   }
 }

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/ListItem/ListItem.fixtures.js

@@ -1 +1,10 @@
-export const props = { accountID: '1' };
+export const props = {
+  label: 'test',
+  account: {
+    test: {
+      generate_report_status: 'unknown',
+      upload_report_status: 'unknown',
+      id: 1,
+    },
+  },
+};

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/ListItem/ListItem.js

@@ -10,7 +10,7 @@ import PropTypes from 'prop-types';
 import ListItemStatus from '../ListItemStatus';
 import Dashboard from '../../../Dashboard';
 
-const ListItem = ({ accountID, account }) => {
+const ListItem = ({ label, account }) => {
   const [isExpanded, setIsExpanded] = useState(false);
   return (
     <AccordionItem>
@@ -25,23 +25,23 @@ const ListItem = ({ accountID, account }) => {
             color="blue"
             icon={<UserIcon />}
           />
-          {account.label}
+          {label}
         </span>
-        <ListItemStatus key={`${accountID}_status`} account={account} />
+        <ListItemStatus key={`${label}_status`} account={account} />
       </AccordionToggle>
       <AccordionContent isHidden={!isExpanded}>
-        <Dashboard accountID={accountID} account={account} />
+        <Dashboard accountID={account.id} account={account} />
       </AccordionContent>
     </AccordionItem>
   );
 };
 
 ListItem.propTypes = {
-  accountID: PropTypes.string.isRequired,
+  label: PropTypes.string.isRequired,
   account: PropTypes.shape({
     generate_report_status: PropTypes.string,
     upload_report_status: PropTypes.string,
-    label: PropTypes.string,
+    id: PropTypes.number,
   }),
 };
 
@@ -49,7 +49,7 @@ ListItem.defaultProps = {
   account: {
     generate_report_status: 'unknown',
     upload_report_status: 'unknown',
-    label: 'default_org_name',
+    id: 0,
   },
 };
 

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

@@ -19,17 +19,19 @@ exports[`ListItem rendering render with Props 1`] = `
         }
         variant="outline"
       />
-      default_org_name
+      test
     </span>
     <ListItemStatus
       account={
         Object {
-          "generate_report_status": "unknown",
-          "label": "default_org_name",
-          "upload_report_status": "unknown",
+          "test": Object {
+            "generate_report_status": "unknown",
+            "id": 1,
+            "upload_report_status": "unknown",
+          },
         }
       }
-      key="1_status"
+      key="test_status"
     />
   </AccordionToggle>
   <AccordionContent
@@ -38,12 +40,13 @@ exports[`ListItem rendering render with Props 1`] = `
     <Connect(Dashboard)
       account={
         Object {
-          "generate_report_status": "unknown",
-          "label": "default_org_name",
-          "upload_report_status": "unknown",
+          "test": Object {
+            "generate_report_status": "unknown",
+            "id": 1,
+            "upload_report_status": "unknown",
+          },
         }
       }
-      accountID="1"
     />
   </AccordionContent>
 </AccordionItem>

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

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

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

@@ -13,14 +13,8 @@ import {
   pollingProcessID,
   accountID,
   processStatusName,
-  autoUploadEnabled,
-  hostObfuscationEnabled,
-  ipsObfuscationEnabled,
   pollingResponse,
 } from '../AccountList.fixtures';
-import { AUTO_UPLOAD_TOGGLE } from '../../AutoUploadSwitcher/AutoUploadSwitcherConstants';
-import { HOST_OBFUSCATION_TOGGLE } from '../../HostObfuscationSwitcher/HostObfuscationSwitcherConstants';
-import { IPS_OBFUSCATION_TOGGLE } from '../../IpsObfuscationSwitcher/IpsObfuscationSwitcherConstants';
 
 const fixtures = {
   'should return the initial state': {},
@@ -58,30 +52,6 @@ const fixtures = {
       },
     },
   },
-  'should handle AUTO_UPLOAD_TOGGLE': {
-    action: {
-      type: AUTO_UPLOAD_TOGGLE,
-      payload: {
-        autoUploadEnabled,
-      },
-    },
-  },
-  'should handle HOST_OBFUSCATION_TOGGLE': {
-    action: {
-      type: HOST_OBFUSCATION_TOGGLE,
-      payload: {
-        hostObfuscationEnabled,
-      },
-    },
-  },
-  'should handle IPS_OBFUSCATION_TOGGLE': {
-    action: {
-      type: IPS_OBFUSCATION_TOGGLE,
-      payload: {
-        ipsObfuscationEnabled,
-      },
-    },
-  },
 };
 
 describe('AccountList reducer', () =>

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

@@ -3,29 +3,14 @@ import {
   selectAccountsList,
   selectAccounts,
   selectPollingProcessID,
-  selectAutoUploadEnabled,
-  selectHostObfuscationEnabled,
-  selectCloudToken,
-  selectExcludePackages,
 } from '../AccountListSelectors';
-import {
-  pollingProcessID,
-  accounts,
-  autoUploadEnabled,
-  hostObfuscationEnabled,
-  cloudToken,
-  excludePackages,
-} from '../AccountList.fixtures';
+import { pollingProcessID, accounts } from '../AccountList.fixtures';
 import { rhCloudStateWrapper } from '../../../../ForemanRhCloudTestHelpers';
 
 const state = rhCloudStateWrapper({
   accountsList: {
     accounts,
     pollingProcessID,
-    autoUploadEnabled,
-    hostObfuscationEnabled,
-    cloudToken,
-    excludePackages,
   },
 });
 
@@ -34,13 +19,6 @@ const fixtures = {
   'should return AccountList accounts': () => selectAccounts(state),
   'should return AccountList pollingProcessID': () =>
     selectPollingProcessID(state),
-  'should return AccountList autoUploadEnabled': () =>
-    selectAutoUploadEnabled(state),
-  'should return AccountList hostObfuscationEnabled': () =>
-    selectHostObfuscationEnabled(state),
-  'should return AccountList cloudToken': () => selectCloudToken(state),
-  'should return AccountList excludePackages': () =>
-    selectExcludePackages(state),
 };
 
 describe('AccountList selectors', () =>

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",
-        "label": "test_org1",
+        "id": 1,
         "upload_report_status": "running",
       }
     }
-    accountID="Account1"
     key="0"
+    label="Account1"
   />
   <ListItem
     account={
       Object {
         "generate_report_status": "failure",
-        "label": "test_org2",
+        "id": 2,
         "upload_report_status": "unknown",
       }
     }
-    accountID="Account2"
     key="1"
+    label="Account2"
   />
   <ListItem
     account={
       Object {
         "generate_report_status": "running",
-        "label": "test_org3",
+        "id": 3,
         "upload_report_status": "success",
       }
     }
-    accountID="Account3"
     key="2"
+    label="Account3"
   />
 </Accordion>
 `;

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

@@ -14,25 +14,20 @@ Array [
         "accounts": Object {
           "Account1": Object {
             "generate_report_status": "running",
-            "label": "test_org1",
+            "id": 1,
             "upload_report_status": "running",
           },
           "Account2": Object {
             "generate_report_status": "failure",
-            "label": "test_org2",
+            "id": 2,
             "upload_report_status": "unknown",
           },
           "Account3": Object {
             "generate_report_status": "running",
-            "label": "test_org3",
+            "id": 3,
             "upload_report_status": "success",
           },
         },
-        "autoUploadEnabled": true,
-        "cloudToken": true,
-        "excludePackages": false,
-        "hostObfuscationEnabled": true,
-        "ipsObfuscationEnabled": true,
       },
       "type": "INVENTORY_ACCOUNT_STATUS_POLLING",
     },

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

@@ -1,23 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`AccountList reducer should handle AUTO_UPLOAD_TOGGLE 1`] = `
-Object {
-  "accounts": Object {},
-  "autoUploadEnabled": true,
-  "error": null,
-  "pollingProcessID": 0,
-}
-`;
-
-exports[`AccountList reducer should handle HOST_OBFUSCATION_TOGGLE 1`] = `
-Object {
-  "accounts": Object {},
-  "error": null,
-  "hostObfuscationEnabled": true,
-  "pollingProcessID": 0,
-}
-`;
-
 exports[`AccountList reducer should handle INVENTORY_ACCOUNT_STATUS_POLLING 1`] = `
 Object {
   "CloudConnectorStatus": Object {
@@ -29,26 +11,21 @@ Object {
   "accounts": Object {
     "Account1": Object {
       "generate_report_status": "running",
-      "label": "test_org1",
+      "id": 1,
       "upload_report_status": "running",
     },
     "Account2": Object {
       "generate_report_status": "failure",
-      "label": "test_org2",
+      "id": 2,
       "upload_report_status": "unknown",
     },
     "Account3": Object {
       "generate_report_status": "running",
-      "label": "test_org3",
+      "id": 3,
       "upload_report_status": "success",
     },
   },
-  "autoUploadEnabled": true,
-  "cloudToken": true,
   "error": null,
-  "excludePackages": false,
-  "hostObfuscationEnabled": true,
-  "ipsObfuscationEnabled": true,
   "pollingProcessID": 0,
 }
 `;
@@ -89,15 +66,6 @@ Object {
 }
 `;
 
-exports[`AccountList reducer should handle IPS_OBFUSCATION_TOGGLE 1`] = `
-Object {
-  "accounts": Object {},
-  "error": null,
-  "ipsObfuscationEnabled": true,
-  "pollingProcessID": 0,
-}
-`;
-
 exports[`AccountList reducer should return the initial state 1`] = `
 Object {
   "accounts": Object {},

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

@@ -4,30 +4,22 @@ exports[`AccountList selectors should return AccountList accounts 1`] = `
 Object {
   "Account1": Object {
     "generate_report_status": "running",
-    "label": "test_org1",
+    "id": 1,
     "upload_report_status": "running",
   },
   "Account2": Object {
     "generate_report_status": "failure",
-    "label": "test_org2",
+    "id": 2,
     "upload_report_status": "unknown",
   },
   "Account3": Object {
     "generate_report_status": "running",
-    "label": "test_org3",
+    "id": 3,
     "upload_report_status": "success",
   },
 }
 `;
 
-exports[`AccountList selectors should return AccountList autoUploadEnabled 1`] = `true`;
-
-exports[`AccountList selectors should return AccountList cloudToken 1`] = `true`;
-
-exports[`AccountList selectors should return AccountList excludePackages 1`] = `false`;
-
-exports[`AccountList selectors should return AccountList hostObfuscationEnabled 1`] = `true`;
-
 exports[`AccountList selectors should return AccountList pollingProcessID 1`] = `0`;
 
 exports[`AccountList selectors should return AccountsList 1`] = `
@@ -35,24 +27,20 @@ Object {
   "accounts": Object {
     "Account1": Object {
       "generate_report_status": "running",
-      "label": "test_org1",
+      "id": 1,
       "upload_report_status": "running",
     },
     "Account2": Object {
       "generate_report_status": "failure",
-      "label": "test_org2",
+      "id": 2,
       "upload_report_status": "unknown",
     },
     "Account3": Object {
       "generate_report_status": "running",
-      "label": "test_org3",
+      "id": 3,
       "upload_report_status": "success",
     },
   },
-  "autoUploadEnabled": true,
-  "cloudToken": true,
-  "excludePackages": false,
-  "hostObfuscationEnabled": true,
   "pollingProcessID": 0,
 }
 `;