foreman_rh_cloud 1.0.5 → 2.0.7

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__/Dashboard.test.js

@@ -1,6 +1,5 @@
 import React from 'react';
-import { shallow } from 'enzyme';
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { shallow, testComponentSnapshotsWithFixtures } from '@theforeman/test';
 import Dashboard from '../Dashboard';
 import { props } from '../Dashboard.fixtures';
 

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

@@ -1,4 +1,4 @@
-import { testActionSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testActionSnapshotWithFixtures } from '@theforeman/test';
 import API from 'foremanReact/API';
 import {
   startPolling,
@@ -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);
 };
 
@@ -36,4 +35,17 @@ const fixtures = {
     runWithGetState({ activeTab: 'reports' }, toggleFullScreen, accountID),
 };
 
-describe('Dashboard actions', () => testActionSnapshotWithFixtures(fixtures));
+describe('Dashboard actions', () => {
+  const { location } = window;
+
+  beforeAll(() => {
+    delete window.location;
+    window.location = { href: jest.fn() };
+  });
+
+  afterAll(() => {
+    window.location = location;
+  });
+
+  return testActionSnapshotWithFixtures(fixtures);
+});

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

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

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

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

@@ -1,4 +1,4 @@
-import { testSelectorsSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
 import {
   selectDashboard,
   selectPollingProcessID,
@@ -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/FileDownload/__tests__/FileDownload.test.js

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

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

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

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;
+  }
+};

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

@@ -0,0 +1,7 @@
+import { selectForemanInventoryUpload } from '../../../ForemanRhCloudSelectors';
+
+export const selectInventoryFilter = state =>
+  selectForemanInventoryUpload(state).inventoryFilter;
+
+export const selectFilterTerm = state =>
+  selectInventoryFilter(state).filterTerm;

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

@@ -0,0 +1,14 @@
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import { noop } from 'patternfly-react';
+
+import InventoryFilter from '../InventoryFilter';
+
+const fixtures = {
+  'render with props': { handleFilterChange: noop },
+  /** fixtures, props for the component */
+};
+
+describe('InventoryFilter', () => {
+  describe('rendering', () =>
+    testComponentSnapshotsWithFixtures(InventoryFilter, fixtures));
+});

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

@@ -0,0 +1,14 @@
+import { testActionSnapshotWithFixtures } from '@theforeman/test';
+import {
+  handleFilterChange,
+  handleFilterClear,
+} from '../InventoryFilterActions';
+import { filterTerm } from '../InventoryFilter.fixtures';
+
+const fixtures = {
+  'should handleFilterChange': () => handleFilterChange(filterTerm),
+  'should handleFilterClear': () => handleFilterClear(),
+};
+
+describe('InventoryFilter actions', () =>
+  testActionSnapshotWithFixtures(fixtures));

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

@@ -0,0 +1,35 @@
+import { testReducerSnapshotWithFixtures } from '@theforeman/test';
+import { LAYOUT_CHANGE_ORG } from 'foremanReact/components/Layout/LayoutConstants';
+import reducer from '../InventoryFilterReducer';
+import { filterTerm, org } from '../InventoryFilter.fixtures';
+import {
+  INVENTORY_FILTER_UPDATE,
+  INVENTORY_FILTER_CLEAR,
+} from '../InventoryFilterConstants';
+
+const fixtures = {
+  'should return the initial state': {},
+  'should handle INVENTORY_FILTER_UPDATE': {
+    action: {
+      type: INVENTORY_FILTER_UPDATE,
+      payload: {
+        filterTerm,
+      },
+    },
+  },
+  'should handle INVENTORY_FILTER_CLEAR': {
+    action: {
+      type: INVENTORY_FILTER_CLEAR,
+      payload: {},
+    },
+  },
+  'should handle LAYOUT_CHANGE_ORG': {
+    action: {
+      type: LAYOUT_CHANGE_ORG,
+      payload: { org },
+    },
+  },
+};
+
+describe('AccountList reducer', () =>
+  testReducerSnapshotWithFixtures(reducer, fixtures));

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/InventoryFilterSelectors.test.js

@@ -0,0 +1,21 @@
+import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
+import { filterTerm } from '../InventoryFilter.fixtures';
+import { inventoryStateWrapper } from '../../../../ForemanRhCloudTestHelpers';
+import {
+  selectInventoryFilter,
+  selectFilterTerm,
+} from '../InventoryFilterSelectors';
+
+const state = inventoryStateWrapper({
+  inventoryFilter: {
+    filterTerm,
+  },
+});
+
+const fixtures = {
+  'should return InventoryFilter': () => selectInventoryFilter(state),
+  'should return filterTerm': () => selectFilterTerm(state),
+};
+
+describe('InventoryFilter selectors', () =>
+  testSelectorsSnapshotWithFixtures(fixtures));

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

@@ -0,0 +1,25 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`InventoryFilter rendering render with props 1`] = `
+<form
+  id="inventory_filter_form"
+>
+  <FormGroup
+    bsClass="form-group"
+    controlId="inventory_filter_input"
+  >
+    <FormControl
+      bsClass="form-control"
+      bsSize="lg"
+      componentClass="input"
+      onChange={[Function]}
+      placeholder="Filter.."
+      type="text"
+      value=""
+    />
+    <ClearButton
+      onClear={[Function]}
+    />
+  </FormGroup>
+</form>
+`;

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/__snapshots__/InventoryFilterActions.test.js.snap

@@ -0,0 +1,17 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`InventoryFilter actions should handleFilterChange 1`] = `
+Object {
+  "payload": Object {
+    "filterTerm": "test_filter_term",
+  },
+  "type": "INVENTORY_FILTER_UPDATE",
+}
+`;
+
+exports[`InventoryFilter actions should handleFilterClear 1`] = `
+Object {
+  "payload": Object {},
+  "type": "INVENTORY_FILTER_CLEAR",
+}
+`;

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/__snapshots__/InventoryFilterReducer.test.js.snap

@@ -0,0 +1,25 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AccountList reducer should handle INVENTORY_FILTER_CLEAR 1`] = `
+Object {
+  "filterTerm": "",
+}
+`;
+
+exports[`AccountList reducer should handle INVENTORY_FILTER_UPDATE 1`] = `
+Object {
+  "filterTerm": "test_filter_term",
+}
+`;
+
+exports[`AccountList reducer should handle LAYOUT_CHANGE_ORG 1`] = `
+Object {
+  "filterTerm": "some_org",
+}
+`;
+
+exports[`AccountList reducer should return the initial state 1`] = `
+Object {
+  "filterTerm": "",
+}
+`;