foreman_rh_cloud 0.9.6 → 1.0.7

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 'react-redux-test-utils';
+
+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__/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 'react-redux-test-utils';
 
 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__/AccountListSelectors.test.js

@@ -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/Dashboard/DashboardActions.js

@@ -1,4 +1,6 @@
 import API from 'foremanReact/API';
+import { selectActiveTab } from './DashboardSelectors';
+import { inventoryUrl } from '../../ForemanInventoryHelpers';
 import {
   INVENTORY_POLLING_START,
   INVENTORY_POLLING_STOP,
@@ -8,7 +10,6 @@ import {
   INVENTORY_REPORTS_DOWNLOAD,
   INVENTORY_TOGGLE_TERMINAL_FULL_SCREEN,
 } from './DashboardConstants';
-import { selectActiveTab } from './DashboardSelectors';
 
 export const startPolling = (accountID, pollingProcessID) => ({
   type: INVENTORY_POLLING_START,
@@ -34,7 +35,7 @@ export const fetchLogs = accountID => async (dispatch, getState) => {
     const processController = activeTab === 'uploading' ? 'uploads' : 'reports';
     const {
       data: { output, scheduled },
-    } = await API.get(`${accountID}/${processController}/last`);
+    } = await API.get(inventoryUrl(`${accountID}/${processController}/last`));
     const outputArray = output.split('\n');
     dispatch({
       type: INVENTORY_POLLING,
@@ -66,7 +67,7 @@ export const setActiveTab = (accountID, tabName) => ({
 });
 
 export const downloadReports = accountID => {
-  window.location.href = `/foreman_inventory_upload/${accountID}/uploads/file`;
+  window.location.href = inventoryUrl(`${accountID}/uploads/file`);
   return {
     type: INVENTORY_REPORTS_DOWNLOAD,
     payload: {

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

@@ -1,4 +1,4 @@
-import { selectForemanInventoryUpload } from '../../ForemanInventoryUploadSelectors';
+import { selectForemanInventoryUpload } from '../../../ForemanRhCloudSelectors';
 
 export const selectDashboard = (state, accountID) =>
   selectForemanInventoryUpload(state).dashboard[accountID] || {};

data/webpack/ForemanInventoryUpload/Components/Dashboard/__tests__/DashboardActions.test.js

@@ -14,14 +14,13 @@ import {
   activeTab,
   accountID,
 } from '../Dashboard.fixtures';
+import { inventoryStateWrapper } from '../../../../ForemanRhCloudTestHelpers';
 
 jest.mock('foremanReact/API');
 API.get.mockImplementation(() => serverMock);
 
 const runWithGetState = (state, action, params) => dispatch => {
-  const getState = () => ({
-    dashboard: state,
-  });
+  const getState = () => inventoryStateWrapper({ dashboard: state });
   action(params)(dispatch, getState);
 };
 

data/webpack/ForemanInventoryUpload/Components/Dashboard/__tests__/DashboardIntegration.test.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { IntegrationTestHelper } from 'react-redux-test-utils';
 
 import Dashboard from '../Dashboard';
-import reducers from '../../../ForemanInventoryUploadReducers';
+import reducers from '../../../../ForemanRhCloudReducers';
 import { accountID } from '../Dashboard.fixtures';
 
 describe('Dashboard integration test', () => {

data/webpack/ForemanInventoryUpload/Components/Dashboard/__tests__/DashboardSelectors.test.js

@@ -13,8 +13,9 @@ import {
   activeTab,
   accountID,
 } from '../Dashboard.fixtures';
+import { inventoryStateWrapper } from '../../../../ForemanRhCloudTestHelpers';
 
-const state = {
+const state = inventoryStateWrapper({
   dashboard: {
     [accountID]: {
       generating: {
@@ -29,7 +30,7 @@ const state = {
       pollingProcessID,
     },
   },
-};
+});
 
 const fixtures = {
   'should return Dashboard': () => selectDashboard(state, accountID),

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/Components/ClearButton/ClearButton.js

@@ -0,0 +1,26 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Icon, OverlayTrigger, Tooltip, noop } from 'patternfly-react';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+const ClearButton = ({ onClear }) => (
+  <OverlayTrigger
+    overlay={
+      <Tooltip id="inventory_filter_clear_overlay">{__('Clear')}</Tooltip>
+    }
+    placement="top"
+    trigger={['hover', 'focus']}
+  >
+    <Icon name="close" className="inventory-clear-button" onClick={onClear} />
+  </OverlayTrigger>
+);
+
+ClearButton.propTypes = {
+  onClear: PropTypes.func,
+};
+
+ClearButton.defaultProps = {
+  onClear: noop,
+};
+
+export default ClearButton;

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/Components/ClearButton/index.js

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

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

@@ -0,0 +1,2 @@
+export const filterTerm = 'test_filter_term';
+export const org = { title: 'some_org', id: 1 };

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/InventoryFilter.js

@@ -0,0 +1,39 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { FormGroup, FormControl, noop } from 'patternfly-react';
+import { translate as __ } from 'foremanReact/common/I18n';
+import ClearButton from './Components/ClearButton';
+import './inventoryFilter.scss';
+
+const InventoryFilter = ({
+  handleFilterChange,
+  handleFilterClear,
+  filterTerm,
+}) => (
+  <form id="inventory_filter_form">
+    <FormGroup controlId="inventory_filter_input">
+      <FormControl
+        value={filterTerm}
+        type="text"
+        placeholder={__('Filter..')}
+        bsSize="lg"
+        onChange={e => handleFilterChange(e.target.value)}
+      />
+      <ClearButton onClear={handleFilterClear} />
+    </FormGroup>
+  </form>
+);
+
+InventoryFilter.propTypes = {
+  handleFilterChange: PropTypes.func,
+  handleFilterClear: PropTypes.func,
+  filterTerm: PropTypes.string,
+};
+
+InventoryFilter.defaultProps = {
+  handleFilterChange: noop,
+  handleFilterClear: noop,
+  filterTerm: '',
+};
+
+export default InventoryFilter;

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/InventoryFilterActions.js

@@ -0,0 +1,16 @@
+import {
+  INVENTORY_FILTER_UPDATE,
+  INVENTORY_FILTER_CLEAR,
+} from './InventoryFilterConstants';
+
+export const handleFilterChange = filterTerm => ({
+  type: INVENTORY_FILTER_UPDATE,
+  payload: {
+    filterTerm,
+  },
+});
+
+export const handleFilterClear = () => ({
+  type: INVENTORY_FILTER_CLEAR,
+  payload: {},
+});

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/InventoryFilterConstants.js

@@ -0,0 +1,3 @@
+export const INVENTORY_FILTER_UPDATE = 'INVENTORY_FILTER_UPDATE';
+export const INVENTORY_FILTER_CLEAR = 'INVENTORY_FILTER_CLEAR';
+export const ANY_ORGANIZATION = 'Any Organization';

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/InventoryFilterReducer.js

@@ -0,0 +1,36 @@
+import Immutable from 'seamless-immutable';
+import { LAYOUT_CHANGE_ORG } from 'foremanReact/components/Layout/LayoutConstants';
+import {
+  INVENTORY_FILTER_UPDATE,
+  INVENTORY_FILTER_CLEAR,
+  ANY_ORGANIZATION,
+} from './InventoryFilterConstants';
+
+const initialState = Immutable({
+  filterTerm: '',
+});
+
+export default (
+  state = initialState,
+  { type, payload: { filterTerm, org } = {} }
+) => {
+  switch (type) {
+    case INVENTORY_FILTER_UPDATE:
+      return state.merge({
+        filterTerm,
+      });
+    case INVENTORY_FILTER_CLEAR:
+      return state.merge({
+        filterTerm: '',
+      });
+    case LAYOUT_CHANGE_ORG: {
+      const { title } = org;
+      const term = title === ANY_ORGANIZATION ? '' : title;
+      return state.merge({
+        filterTerm: term,
+      });
+    }
+    default:
+      return state;
+  }
+};