foreman_rh_cloud 1.0.5 → 2.0.7

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/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,4 +1,5 @@
 import API from 'foremanReact/API';
+import { inventoryUrl } from '../../ForemanInventoryHelpers';
 import {
   INVENTORY_ACCOUNT_STATUS_POLLING,
   INVENTORY_ACCOUNT_STATUS_POLLING_ERROR,
@@ -11,7 +12,7 @@ export const fetchAccountsStatus = () => async dispatch => {
   try {
     const {
       data: { accounts, autoUploadEnabled },
-    } = await API.get('accounts');
+    } = await API.get(inventoryUrl('accounts'));
     dispatch({
       type: INVENTORY_ACCOUNT_STATUS_POLLING,
       payload: {
@@ -55,7 +56,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/AccountListSelectors.js

@@ -1,4 +1,4 @@
-import { selectForemanInventoryUpload } from '../../ForemanInventoryUploadSelectors';
+import { selectForemanInventoryUpload } from '../../../ForemanRhCloudSelectors';
 
 export const selectAccountsList = state =>
   selectForemanInventoryUpload(state).accountsList;

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/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.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/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/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';

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

@@ -1,10 +1,11 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import AccountList from '../AccountList';
 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,4 +1,4 @@
-import { testActionSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testActionSnapshotWithFixtures } from '@theforeman/test';
 import {
   fetchAccountsStatus,
   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

@@ -1,8 +1,8 @@
 import React from 'react';
-import { IntegrationTestHelper } from 'react-redux-test-utils';
+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

@@ -1,4 +1,4 @@
-import { testReducerSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testReducerSnapshotWithFixtures } from '@theforeman/test';
 
 import {
   INVENTORY_ACCOUNT_STATUS_POLLING,

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

@@ -1,4 +1,4 @@
-import { testSelectorsSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
 import {
   selectAccountsList,
   selectAccounts,
@@ -10,16 +10,15 @@ import {
   accounts,
   autoUploadEnabled,
 } from '../AccountList.fixtures';
+import { inventoryStateWrapper } from '../../../../ForemanRhCloudTestHelpers';
 
-const state = {
-  ForemanInventoryUpload: {
-    accountsList: {
-      accounts,
-      pollingProcessID,
-      autoUploadEnabled,
-    },
+const state = inventoryStateWrapper({
+  accountsList: {
+    accounts,
+    pollingProcessID,
+    autoUploadEnabled,
   },
-};
+});
 
 const fixtures = {
   'should return AccountsList': () => selectAccountsList(state),

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 />`;

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

@@ -9,12 +9,14 @@ import {
   selectPollingProcessID,
   selectError,
 } from './AccountListSelectors';
+import { selectFilterTerm } from '../InventoryFilter/InventoryFilterSelectors';
 
 // map state to props
 const mapStateToProps = state => ({
   accounts: selectAccounts(state),
   pollingProcessID: selectPollingProcessID(state),
   error: selectError(state),
+  filterTerm: selectFilterTerm(state),
 });
 
 // map action dispatchers to props

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

@@ -1,4 +1,5 @@
 import API from 'foremanReact/API';
+import { inventoryUrl } from '../../ForemanInventoryHelpers';
 import {
   AUTO_UPLOAD_TOGGLE,
   AUTO_UPLOAD_TOGGLE_ERROR,
@@ -9,7 +10,9 @@ export const handleToggle = currentAutoUploadEnabled => async dispatch => {
   try {
     const {
       data: { autoUploadEnabled },
-    } = await API.post('auto_upload', { value: toggledAutoUploadEnabled });
+    } = await API.post(inventoryUrl('auto_upload'), {
+      value: toggledAutoUploadEnabled,
+    });
     dispatch({
       type: AUTO_UPLOAD_TOGGLE,
       payload: {

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

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

data/webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/__tests__/AutoUploadSwitcherActions.test.js

@@ -1,4 +1,4 @@
-import { testActionSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testActionSnapshotWithFixtures } from '@theforeman/test';
 import API from 'foremanReact/API';
 import { handleToggle } from '../AutoUploadSwitcherActions';
 import { handleToggleResponse } from '../AutoUploadSwitcher.fixtures';

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

@@ -8,16 +8,20 @@ export const completed = 25;
 
 export const error = 'some-error';
 
+export const generating = {
+  logs,
+  completed,
+};
+
+export const uploading = {
+  logs,
+  completed,
+  files,
+};
+
 export const inventory = {
-  generating: {
-    logs,
-    completed,
-  },
-  uploading: {
-    logs,
-    completed,
-    files,
-  },
+  generating,
+  uploading,
 };
 
 export const accountID = 'some-account-ID';

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

@@ -1,19 +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 Dashboard from './index';
-import { generating, uploading } from './Dashboard.fixtures';
 
-const store = configureStore();
+export default {
+  title: 'Dashboard',
+  component: Dashboard,
+};
 
-storiesOf('Dashboard', module)
-  .addDecorator(withKnobs)
-  .add('Dashboard', () => (
-    <div style={{ margin: '20px' }}>
-      <Provider store={store}>
-        <Dashboard generating={generating} uploading={uploading} />
-      </Provider>
-    </div>
-  ));
+export const Basic = () => <Dashboard />;