foreman_rh_cloud 2.0.4 → 2.0.9

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

@@ -1,6 +1,6 @@
 import { noop } from 'patternfly-react';
 
-export const API_SUCCESS_RESPONSE = {
+export const accounts = {
   Account1: {
     label: 'test_org1',
     upload_report_status: 'running',
@@ -18,7 +18,9 @@ export const API_SUCCESS_RESPONSE = {
   },
 };
 
-export const accounts = API_SUCCESS_RESPONSE;
+export const accountIDs = Object.keys(accounts);
+
+export const API_SUCCESS_RESPONSE = accounts;
 
 export const pollingProcessID = 0;
 
@@ -28,6 +30,12 @@ export const accountID = 'user@redhat.com';
 
 export const processStatusName = 'upload_report_status';
 
+export const autoUploadEnabled = true;
+
+export const hostObfuscationEnabled = true;
+
+export const filterTerm = 'some_filter';
+
 export const props = {
   accounts,
   fetchAccountsStatus: noop,
@@ -35,3 +43,7 @@ export const props = {
   stopAccountStatusPolling: noop,
   pollingProcessID,
 };
+
+export const fetchAccountsStatusResponse = {
+  data: { accounts, autoUploadEnabled, hostObfuscationEnabled },
+};

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

@@ -4,6 +4,8 @@ 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 {
@@ -20,8 +22,9 @@ class AccountList extends Component {
   }
 
   render() {
-    const { accounts, error } = this.props;
+    const { accounts, error, filterTerm } = this.props;
     const accountIds = Object.keys(accounts);
+    const filteredAccountIds = filterAccounts(accounts, accountIds, filterTerm);
 
     if (error) {
       return <ErrorState error={error} />;
@@ -30,16 +33,14 @@ class AccountList extends Component {
     if (accountIds.length === 0) {
       return <EmptyState />;
     }
-    const items = accountIds.map((accountID, index) => {
+
+    if (filteredAccountIds.length === 0) {
+      return <EmptyResults />;
+    }
+
+    const items = filteredAccountIds.map((accountID, index) => {
       const account = accounts[accountID];
-      return (
-        <ListItem
-          key={index}
-          accountID={accountID}
-          account={account}
-          initExpanded={index === 0}
-        />
-      );
+      return <ListItem key={index} accountID={accountID} account={account} />;
     });
     return <ListView className="account_list">{items}</ListView>;
   }
@@ -56,6 +57,7 @@ AccountList.propTypes = {
   }),
   accounts: PropTypes.object,
   error: PropTypes.string,
+  filterTerm: PropTypes.string,
 };
 
 AccountList.defaultProps = {
@@ -69,6 +71,7 @@ AccountList.defaultProps = {
   },
   accounts: {},
   error: '',
+  filterTerm: null,
 };
 
 export default AccountList;

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

@@ -1,4 +1,5 @@
 import API from 'foremanReact/API';
+import { inventoryUrl } from '../../ForemanInventoryHelpers';
 import {
   INVENTORY_ACCOUNT_STATUS_POLLING,
   INVENTORY_ACCOUNT_STATUS_POLLING_ERROR,
@@ -10,12 +11,14 @@ import {
 export const fetchAccountsStatus = () => async dispatch => {
   try {
     const {
-      data: { accounts },
-    } = await API.get('accounts');
+      data: { accounts, autoUploadEnabled, hostObfuscationEnabled },
+    } = await API.get(inventoryUrl('accounts'));
     dispatch({
       type: INVENTORY_ACCOUNT_STATUS_POLLING,
       payload: {
         accounts,
+        autoUploadEnabled,
+        hostObfuscationEnabled,
       },
     });
   } catch (error) {
@@ -54,7 +57,7 @@ export const restartProcess = (accountID, activeTab) => dispatch => {
     processStatusName = 'generate_report_status';
   }
 
-  API.post(`${accountID}/${processController}`);
+  API.post(inventoryUrl(`${accountID}/${processController}`));
   dispatch({
     type: INVENTORY_PROCESS_RESTART,
     payload: {

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

@@ -0,0 +1,10 @@
+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,4 +1,6 @@
 import Immutable from 'seamless-immutable';
+import { AUTO_UPLOAD_TOGGLE } from '../AutoUploadSwitcher/AutoUploadSwitcherConstants';
+import { HOST_OBFUSCATION_TOGGLE } from '../HostObfuscationSwitcher/HostObfuscationSwitcherConstants';
 import {
   INVENTORY_ACCOUNT_STATUS_POLLING,
   INVENTORY_ACCOUNT_STATUS_POLLING_ERROR,
@@ -20,6 +22,8 @@ export default (state = initialState, action) => {
       accounts,
       accountID,
       processStatusName,
+      autoUploadEnabled,
+      hostObfuscationEnabled,
     } = {},
   } = action;
 
@@ -28,6 +32,8 @@ export default (state = initialState, action) => {
       return state.merge({
         ...state,
         accounts,
+        autoUploadEnabled,
+        hostObfuscationEnabled,
         error: null,
       });
     case INVENTORY_ACCOUNT_STATUS_POLLING_ERROR:
@@ -49,6 +55,16 @@ 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,
+      });
     default:
       return state;
   }

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

@@ -1,8 +1,17 @@
-import { selectForemanInventoryUpload } from '../../ForemanInventoryUploadSelectors';
+import { selectForemanInventoryUpload } from '../../../ForemanRhCloudSelectors';
 
 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;

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

@@ -0,0 +1,15 @@
+import React from 'react';
+import { EmptyState, Icon } from 'patternfly-react';
+import { translate as __ } from 'foremanReact/common/I18n';
+import './emptyResults.scss';
+
+const inventoryEmptyResults = () => (
+  <EmptyState>
+    <EmptyState.Title>
+      <Icon className="no_results_icon" name="meh-o" />
+      {__("Oops! Couldn't find organization that matches your query")}
+    </EmptyState.Title>
+  </EmptyState>
+);
+
+export default inventoryEmptyResults;

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

@@ -0,0 +1,13 @@
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+
+import EmptyResults from '../EmptyResults';
+
+const fixtures = {
+  'render without Props': {},
+  /** fixtures, props for the component */
+};
+
+describe('EmptyResults', () => {
+  describe('rendering', () =>
+    testComponentSnapshotsWithFixtures(EmptyResults, fixtures));
+});

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

@@ -0,0 +1,18 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`EmptyResults rendering render without Props 1`] = `
+<EmptyState
+  className=""
+>
+  <EmptyStateTitle
+    className=""
+  >
+    <Icon
+      className="no_results_icon"
+      name="meh-o"
+      type="fa"
+    />
+    Oops! Couldn't find organization that matches your query
+  </EmptyStateTitle>
+</EmptyState>
+`;

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

@@ -0,0 +1,7 @@
+.blank-slate-pf {
+  margin-top: 100px;
+
+  .no_results_icon {
+    margin-right: 5px;
+  }
+}

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

@@ -0,0 +1 @@
+export { default } from './EmptyResults';

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, initExpanded }) => (
+const ListItem = ({ accountID, account }) => (
   <ListView.Item
     leftContent={<ListView.Icon name="user" />}
     heading={account.label}
@@ -13,7 +13,6 @@ const ListItem = ({ accountID, account, initExpanded }) => (
     ]}
     stacked
     hideCloseIcon
-    initExpanded={initExpanded}
   >
     <Dashboard accountID={accountID} account={account} />
   </ListView.Item>
@@ -26,7 +25,6 @@ ListItem.propTypes = {
     upload_report_status: PropTypes.string,
     label: PropTypes.string,
   }),
-  initExpanded: PropTypes.bool,
 };
 
 ListItem.defaultProps = {
@@ -35,7 +33,6 @@ 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,6 +5,7 @@ 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,13 +1,20 @@
 import { testActionSnapshotWithFixtures } from '@theforeman/test';
+import API from 'foremanReact/API';
 import {
   fetchAccountsStatus,
   startAccountStatusPolling,
   stopAccountStatusPolling,
   restartProcess,
 } from '../AccountListActions';
-import { pollingProcessID } from '../AccountList.fixtures';
+import {
+  pollingProcessID,
+  fetchAccountsStatusResponse,
+} 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': () =>

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

@@ -0,0 +1,12 @@
+import { filterAccounts } from '../AccountListHelper';
+import { accounts, accountIDs } 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);
+  });
+
+  it('account ids filter should not match', () => {
+    expect(filterAccounts(accounts, accountIDs, 'no_match')).toEqual([]);
+  });
+});

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

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

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

@@ -14,7 +14,11 @@ import {
   pollingProcessID,
   accountID,
   processStatusName,
+  autoUploadEnabled,
+  hostObfuscationEnabled,
 } from '../AccountList.fixtures';
+import { AUTO_UPLOAD_TOGGLE } from '../../AutoUploadSwitcher/AutoUploadSwitcherConstants';
+import { HOST_OBFUSCATION_TOGGLE } from '../../HostObfuscationSwitcher/HostObfuscationSwitcherConstants';
 
 const fixtures = {
   'should return the initial state': {},
@@ -23,6 +27,8 @@ const fixtures = {
       type: INVENTORY_ACCOUNT_STATUS_POLLING,
       payload: {
         accounts,
+        autoUploadEnabled,
+        hostObfuscationEnabled,
       },
     },
   },
@@ -54,6 +60,22 @@ 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,
+      },
+    },
+  },
 };
 
 describe('AccountList reducer', () =>

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

@@ -3,23 +3,35 @@ import {
   selectAccountsList,
   selectAccounts,
   selectPollingProcessID,
+  selectAutoUploadEnabled,
+  selectHostObfuscationEnabled,
 } from '../AccountListSelectors';
-import { pollingProcessID, accounts } from '../AccountList.fixtures';
+import {
+  pollingProcessID,
+  accounts,
+  autoUploadEnabled,
+  hostObfuscationEnabled,
+} from '../AccountList.fixtures';
+import { rhCloudStateWrapper } from '../../../../ForemanRhCloudTestHelpers';
 
-const state = {
-  ForemanInventoryUpload: {
-    accountsList: {
-      accounts,
-      pollingProcessID,
-    },
+const state = rhCloudStateWrapper({
+  accountsList: {
+    accounts,
+    pollingProcessID,
+    autoUploadEnabled,
+    hostObfuscationEnabled,
   },
-};
+});
 
 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),
 };
 
 describe('AccountList selectors', () =>

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

@@ -13,7 +13,6 @@ exports[`AccountList rendering render with props 1`] = `
       }
     }
     accountID="Account1"
-    initExpanded={true}
     key="0"
   />
   <ListItem
@@ -25,7 +24,6 @@ exports[`AccountList rendering render with props 1`] = `
       }
     }
     accountID="Account2"
-    initExpanded={false}
     key="1"
   />
   <ListItem
@@ -37,8 +35,9 @@ exports[`AccountList rendering render with props 1`] = `
       }
     }
     accountID="Account3"
-    initExpanded={false}
     key="2"
   />
 </ListView>
 `;
+
+exports[`AccountList rendering show empty results 1`] = `<inventoryEmptyResults />`;