foreman_rh_cloud 0.9.14 → 1.0.4

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

@@ -1,6 +1,6 @@
 import { noop } from 'patternfly-react';
 
-export const accounts = {
+export const API_SUCCESS_RESPONSE = {
   Account1: {
     label: 'test_org1',
     upload_report_status: 'running',
@@ -18,9 +18,7 @@ export const accounts = {
   },
 };
 
-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

@@ -4,8 +4,6 @@ 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 {
@@ -22,9 +20,8 @@ class AccountList extends Component {
   }
 
   render() {
-    const { accounts, error, filterTerm } = this.props;
+    const { accounts, error } = this.props;
     const accountIds = Object.keys(accounts);
-    const filteredAccountIds = filterAccounts(accounts, accountIds, filterTerm);
 
     if (error) {
       return <ErrorState error={error} />;
@@ -33,14 +30,16 @@ class AccountList extends Component {
     if (accountIds.length === 0) {
       return <EmptyState />;
     }
-
-    if (filteredAccountIds.length === 0) {
-      return <EmptyResults />;
-    }
-
-    const items = filteredAccountIds.map((accountID, index) => {
+    const items = accountIds.map((accountID, index) => {
       const account = accounts[accountID];
-      return <ListItem key={index} accountID={accountID} account={account} />;
+      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/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 @@
-export const filterAccounts = (accounts, accountIds, filterTerm) => {
-  if (!filterTerm || !accountIds.length) {
-    return accountIds;
-  }
-
-  const filterTermLowerCased = filterTerm.toLowerCase();
-  return accountIds.filter(id =>
-    accounts[id].label.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/ListItem/ListItem.js

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import ListItemStatus from '../ListItemStatus';
 import Dashboard from '../../../Dashboard';
 
-const ListItem = ({ accountID, account }) => (
+const ListItem = ({ accountID, account, initExpanded }) => (
   <ListView.Item
     leftContent={<ListView.Icon name="user" />}
     heading={account.label}
@@ -13,6 +13,7 @@ const ListItem = ({ accountID, account }) => (
     ]}
     stacked
     hideCloseIcon
+    initExpanded={initExpanded}
   >
     <Dashboard accountID={accountID} account={account} />
   </ListView.Item>
@@ -25,6 +26,7 @@ ListItem.propTypes = {
     upload_report_status: PropTypes.string,
     label: PropTypes.string,
   }),
+  initExpanded: PropTypes.bool,
 };
 
 ListItem.defaultProps = {
@@ -33,6 +35,7 @@ ListItem.defaultProps = {
     upload_report_status: 'unknown',
     label: 'default_org_name',
   },
+  initExpanded: false,
 };
 
 export default ListItem;

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

@@ -5,7 +5,6 @@ import { props } from '../AccountList.fixtures';
 
 const fixtures = {
   'render with props': props,
-  'show empty results': { ...props, filterTerm: 'not_matching_term' },
 };
 
 describe('AccountList', () => {

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

@@ -1,20 +1,13 @@
 import { testActionSnapshotWithFixtures } from 'react-redux-test-utils';
-import API from 'foremanReact/API';
 import {
   fetchAccountsStatus,
   startAccountStatusPolling,
   stopAccountStatusPolling,
   restartProcess,
 } from '../AccountListActions';
-import {
-  pollingProcessID,
-  fetchAccountsStatusResponse,
-} from '../AccountList.fixtures';
+import { pollingProcessID } from '../AccountList.fixtures';
 import { accountID, activeTab } from '../../Dashboard/Dashboard.fixtures';
 
-jest.mock('foremanReact/API');
-API.get.mockImplementation(async () => fetchAccountsStatusResponse);
-
 const fixtures = {
   'should fetchAccountsStatus': () => fetchAccountsStatus(),
   'should startAccountStatusPolling': () =>
@@ -22,13 +15,6 @@ const fixtures = {
   'should stopAccountStatusPolling': () =>
     stopAccountStatusPolling(pollingProcessID),
   'should restartProcess': () => restartProcess(accountID, activeTab),
-  'should invoke toast notification upon failure': () => {
-    API.post.mockImplementationOnce(() =>
-      Promise.reject(new Error('test error'))
-    );
-
-    return restartProcess(accountID, activeTab);
-  },
 };
 
 describe('AccountList actions', () => testActionSnapshotWithFixtures(fixtures));

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

@@ -2,7 +2,7 @@ import React from 'react';
 import { IntegrationTestHelper } from 'react-redux-test-utils';
 
 import AccountList from '../index';
-import reducers from '../../../../ForemanRhCloudReducers';
+import reducers from '../../../ForemanInventoryUploadReducers';
 
 describe('AccountList integration test', () => {
   it('should flow', async () => {

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

@@ -9,25 +9,21 @@ import {
 } from '../AccountListConstants';
 import reducer from '../AccountListReducer';
 import {
+  accounts,
   error,
   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': {},
   'should handle INVENTORY_ACCOUNT_STATUS_POLLING': {
     action: {
       type: INVENTORY_ACCOUNT_STATUS_POLLING,
-      payload: pollingResponse,
+      payload: {
+        accounts,
+      },
     },
   },
   'should handle INVENTORY_ACCOUNT_STATUS_POLLING_ERROR': {
@@ -58,30 +54,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,44 +3,23 @@ import {
   selectAccountsList,
   selectAccounts,
   selectPollingProcessID,
-  selectAutoUploadEnabled,
-  selectHostObfuscationEnabled,
-  selectCloudToken,
-  selectExcludePackages,
 } from '../AccountListSelectors';
-import {
-  pollingProcessID,
-  accounts,
-  autoUploadEnabled,
-  hostObfuscationEnabled,
-  cloudToken,
-  excludePackages,
-} from '../AccountList.fixtures';
-import { rhCloudStateWrapper } from '../../../../ForemanRhCloudTestHelpers';
+import { pollingProcessID, accounts } from '../AccountList.fixtures';
 
-const state = rhCloudStateWrapper({
-  accountsList: {
-    accounts,
-    pollingProcessID,
-    autoUploadEnabled,
-    hostObfuscationEnabled,
-    cloudToken,
-    excludePackages,
+const state = {
+  ForemanInventoryUpload: {
+    accountsList: {
+      accounts,
+      pollingProcessID,
+    },
   },
-});
+};
 
 const fixtures = {
   'should return AccountsList': () => selectAccountsList(state),
   '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', () =>