foreman_rh_cloud 1.0.18 → 2.0.4

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

@@ -1,26 +1,24 @@
 import { noop } from 'patternfly-react';
 
-export const accounts = {
+export const API_SUCCESS_RESPONSE = {
   Account1: {
-    id: 1,
+    label: 'test_org1',
     upload_report_status: 'running',
     generate_report_status: 'running',
   },
   Account2: {
-    id: 2,
+    label: 'test_org2',
     upload_report_status: 'unknown',
     generate_report_status: 'failure',
   },
   Account3: {
-    id: 3,
+    label: 'test_org3',
     upload_report_status: 'success',
     generate_report_status: 'running',
   },
 };
 
-export const accountIDs = Object.keys(accounts);
-
-export const API_SUCCESS_RESPONSE = accounts;
+export const accounts = API_SUCCESS_RESPONSE;
 
 export const pollingProcessID = 0;
 
@@ -30,18 +28,6 @@ export const accountID = 'user@redhat.com';
 
 export const processStatusName = 'upload_report_status';
 
-export const autoUploadEnabled = true;
-
-export const hostObfuscationEnabled = true;
-
-export const ipsObfuscationEnabled = true;
-
-export const filterTerm = 'some_filter';
-
-export const cloudToken = 'some-cloud-token';
-
-export const excludePackages = false;
-
 export const props = {
   accounts,
   fetchAccountsStatus: noop,
@@ -49,16 +35,3 @@ export const props = {
   stopAccountStatusPolling: noop,
   pollingProcessID,
 };
-
-export const pollingResponse = {
-  accounts,
-  autoUploadEnabled,
-  hostObfuscationEnabled,
-  ipsObfuscationEnabled,
-  cloudToken,
-  excludePackages,
-};
-
-export const fetchAccountsStatusResponse = {
-  data: pollingResponse,
-};

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

@@ -1,12 +1,9 @@
 import React, { Component } from 'react';
 import { ListView, noop } from 'patternfly-react';
-import { isEmpty } from 'lodash';
 import PropTypes from 'prop-types';
 import ListItem from './Components/ListItem';
 import EmptyState from './Components/EmptyState';
 import ErrorState from './Components/ErrorState';
-import EmptyResults from './Components/EmptyResults';
-import { filterAccounts } from './AccountListHelper';
 import './accountList.scss';
 
 class AccountList extends Component {
@@ -23,24 +20,26 @@ class AccountList extends Component {
   }
 
   render() {
-    const { accounts, error, filterTerm } = this.props;
-    const filteredAccount = filterAccounts(accounts, filterTerm);
+    const { accounts, error } = this.props;
+    const accountIds = Object.keys(accounts);
 
     if (error) {
       return <ErrorState error={error} />;
     }
 
-    if (isEmpty(accounts)) {
+    if (accountIds.length === 0) {
       return <EmptyState />;
     }
-
-    if (isEmpty(filteredAccount)) {
-      return <EmptyResults />;
-    }
-
-    const items = Object.keys(filteredAccount).map((label, index) => {
-      const account = accounts[label];
-      return <ListItem key={index} label={label} account={account} />;
+    const items = accountIds.map((accountID, index) => {
+      const account = accounts[accountID];
+      return (
+        <ListItem
+          key={index}
+          accountID={accountID}
+          account={account}
+          initExpanded={index === 0}
+        />
+      );
     });
     return <ListView className="account_list">{items}</ListView>;
   }
@@ -57,7 +56,6 @@ AccountList.propTypes = {
   }),
   accounts: PropTypes.object,
   error: PropTypes.string,
-  filterTerm: PropTypes.string,
 };
 
 AccountList.defaultProps = {
@@ -71,7 +69,6 @@ AccountList.defaultProps = {
   },
   accounts: {},
   error: '',
-  filterTerm: null,
 };
 
 export default AccountList;

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

@@ -1,18 +1,9 @@
 import React from 'react';
-import { storiesOf } from '@storybook/react';
-import { withKnobs } from '@storybook/addon-knobs';
-import { Provider } from 'react-redux';
-import configureStore from '../../../stories/configureStore';
 import AccountList from './AccountList';
 
-const store = configureStore();
+export default {
+  title: 'AccountList',
+  component: AccountList,
+};
 
-storiesOf('Account list', module)
-  .addDecorator(withKnobs)
-  .add('Account list', () => (
-    <div style={{ margin: '20px' }}>
-      <Provider store={store}>
-        <AccountList />
-      </Provider>
-    </div>
-  ));
+export const Basic = () => <AccountList />;

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

@@ -1,6 +1,4 @@
 import API from 'foremanReact/API';
-import { addToast } from 'foremanReact/redux/actions/toasts';
-import { inventoryUrl } from '../../ForemanInventoryHelpers';
 import {
   INVENTORY_ACCOUNT_STATUS_POLLING,
   INVENTORY_ACCOUNT_STATUS_POLLING_ERROR,
@@ -11,10 +9,14 @@ import {
 
 export const fetchAccountsStatus = () => async dispatch => {
   try {
-    const { data } = await API.get(inventoryUrl('accounts'));
+    const {
+      data: { accounts },
+    } = await API.get('accounts');
     dispatch({
       type: INVENTORY_ACCOUNT_STATUS_POLLING,
-      payload: data,
+      payload: {
+        accounts,
+      },
     });
   } catch (error) {
     dispatch({
@@ -40,7 +42,7 @@ export const stopAccountStatusPolling = pollingProcessID => dispatch => {
   });
 };
 
-export const restartProcess = (accountID, activeTab) => async dispatch => {
+export const restartProcess = (accountID, activeTab) => dispatch => {
   let processController = null;
   let processStatusName = null;
 
@@ -52,22 +54,12 @@ export const restartProcess = (accountID, activeTab) => async dispatch => {
     processStatusName = 'generate_report_status';
   }
 
-  try {
-    await API.post(inventoryUrl(`${accountID}/${processController}`));
-    dispatch({
-      type: INVENTORY_PROCESS_RESTART,
-      payload: {
-        accountID,
-        processStatusName,
-      },
-    });
-  } catch (error) {
-    dispatch(
-      addToast({
-        sticky: true,
-        type: 'error',
-        message: error.message,
-      })
-    );
-  }
+  API.post(`${accountID}/${processController}`);
+  dispatch({
+    type: INVENTORY_PROCESS_RESTART,
+    payload: {
+      accountID,
+      processStatusName,
+    },
+  });
 };

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

@@ -1,10 +0,0 @@
-import { pickBy } from 'lodash';
-
-export const filterAccounts = (accounts, filterTerm) => {
-  if (!filterTerm) return accounts;
-
-  const filterTermLowerCased = filterTerm.toLowerCase();
-  return pickBy(accounts, (value, key) =>
-    key.toLowerCase().includes(filterTermLowerCased)
-  );
-};

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

@@ -1,8 +1,4 @@
 import Immutable from 'seamless-immutable';
-import { AUTO_UPLOAD_TOGGLE } from '../AutoUploadSwitcher/AutoUploadSwitcherConstants';
-import { HOST_OBFUSCATION_TOGGLE } from '../HostObfuscationSwitcher/HostObfuscationSwitcherConstants';
-import { IPS_OBFUSCATION_TOGGLE } from '../IpsObfuscationSwitcher/IpsObfuscationSwitcherConstants';
-import { EXCLUDE_PACKAGES_TOGGLE } from '../ExcludePackagesSwitcher/ExcludePackagesSwitcherConstants';
 import {
   INVENTORY_ACCOUNT_STATUS_POLLING,
   INVENTORY_ACCOUNT_STATUS_POLLING_ERROR,
@@ -24,11 +20,6 @@ export default (state = initialState, action) => {
       accounts,
       accountID,
       processStatusName,
-      autoUploadEnabled,
-      hostObfuscationEnabled,
-      ipsObfuscationEnabled,
-      cloudToken,
-      excludePackages,
     } = {},
   } = action;
 
@@ -37,11 +28,6 @@ export default (state = initialState, action) => {
       return state.merge({
         ...state,
         accounts,
-        autoUploadEnabled,
-        hostObfuscationEnabled,
-        ipsObfuscationEnabled,
-        cloudToken,
-        excludePackages,
         error: null,
       });
     case INVENTORY_ACCOUNT_STATUS_POLLING_ERROR:
@@ -63,26 +49,6 @@ export default (state = initialState, action) => {
           [processStatusName]: 'Restarting...',
         },
       });
-    case AUTO_UPLOAD_TOGGLE:
-      return state.merge({
-        ...state,
-        autoUploadEnabled,
-      });
-    case HOST_OBFUSCATION_TOGGLE:
-      return state.merge({
-        ...state,
-        hostObfuscationEnabled,
-      });
-    case EXCLUDE_PACKAGES_TOGGLE:
-      return state.merge({
-        ...state,
-        excludePackages,
-      });
-    case IPS_OBFUSCATION_TOGGLE:
-      return state.merge({
-        ...state,
-        ipsObfuscationEnabled,
-      });
     default:
       return state;
   }

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

@@ -1,25 +1,8 @@
-import { selectForemanInventoryUpload } from '../../../ForemanRhCloudSelectors';
+import { selectForemanInventoryUpload } from '../../ForemanInventoryUploadSelectors';
 
 export const selectAccountsList = state =>
   selectForemanInventoryUpload(state).accountsList;
-
 export const selectAccounts = state => selectAccountsList(state).accounts;
-
 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/EmptyState/__tests__/EmptyState.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import EmptyState from '../EmptyState';
 

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import ErrorState from '../ErrorState';
 

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

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

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

@@ -4,35 +4,38 @@ import PropTypes from 'prop-types';
 import ListItemStatus from '../ListItemStatus';
 import Dashboard from '../../../Dashboard';
 
-const ListItem = ({ label, account }) => (
+const ListItem = ({ accountID, account, initExpanded }) => (
   <ListView.Item
     leftContent={<ListView.Icon name="user" />}
-    heading={label}
+    heading={account.label}
     additionalInfo={[
-      <ListItemStatus key={`${label}_status`} account={account} />,
+      <ListItemStatus key={`${accountID}_status`} account={account} />,
     ]}
     stacked
     hideCloseIcon
+    initExpanded={initExpanded}
   >
-    <Dashboard accountID={account.id} account={account} />
+    <Dashboard accountID={accountID} account={account} />
   </ListView.Item>
 );
 
 ListItem.propTypes = {
-  label: PropTypes.string.isRequired,
+  accountID: PropTypes.string.isRequired,
   account: PropTypes.shape({
     generate_report_status: PropTypes.string,
     upload_report_status: PropTypes.string,
-    id: PropTypes.number,
+    label: PropTypes.string,
   }),
+  initExpanded: PropTypes.bool,
 };
 
 ListItem.defaultProps = {
   account: {
     generate_report_status: 'unknown',
     upload_report_status: 'unknown',
-    id: 0,
+    label: 'default_org_name',
   },
+  initExpanded: false,
 };
 
 export default ListItem;

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import ListItem from '../ListItem';
 import { props } from '../ListItem.fixtures';

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/Components/ListItemStatus/__tests__/ListItemStatus.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import ListItemStatus from '../ListItemStatus';
 import { props } from '../ListItemStatus.fixtures';