foreman_rh_cloud 1.0.6 → 1.0.7

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 'react-redux-test-utils';
+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 'react-redux-test-utils';
+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 'react-redux-test-utils';
+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 'react-redux-test-utils';
+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": "",
+}
+`;

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

@@ -0,0 +1,9 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`InventoryFilter selectors should return InventoryFilter 1`] = `
+Object {
+  "filterTerm": "test_filter_term",
+}
+`;
+
+exports[`InventoryFilter selectors should return filterTerm 1`] = `"test_filter_term"`;

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

@@ -0,0 +1,31 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`InventoryFilter integration test should flow: filter have been updated 1`] = `
+Object {
+  "action": Array [
+    Array [
+      Object {
+        "payload": Object {
+          "filterTerm": "some_new_filter",
+        },
+        "type": "INVENTORY_FILTER_UPDATE",
+      },
+    ],
+  ],
+  "state": Object {
+    "ForemanRhCloud": Object {
+      "inventoryUpload": Object {
+        "accountsList": Object {
+          "accounts": Object {},
+          "error": null,
+          "pollingProcessID": 0,
+        },
+        "dashboard": Object {},
+        "inventoryFilter": Object {
+          "filterTerm": "some_new_filter",
+        },
+      },
+    },
+  },
+}
+`;

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

@@ -0,0 +1,18 @@
+import React from 'react';
+import { IntegrationTestHelper } from 'react-redux-test-utils';
+import InventoryFilter from '../index';
+import reducers from '../../../../ForemanRhCloudReducers';
+
+describe('InventoryFilter integration test', () => {
+  it('should flow', async () => {
+    const integrationTestHelper = new IntegrationTestHelper(reducers);
+    const wrapper = integrationTestHelper.mount(<InventoryFilter />);
+    const input = wrapper.find('#inventory_filter_input');
+    input.simulate('change', { target: { value: 'some_new_filter' } });
+    await IntegrationTestHelper.flushAllPromises();
+    wrapper.update();
+    integrationTestHelper.takeStoreAndLastActionSnapshot(
+      'filter have been updated'
+    );
+  });
+});

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

@@ -0,0 +1,17 @@
+import { bindActionCreators } from 'redux';
+import { connect } from 'react-redux';
+import reducer from './InventoryFilterReducer';
+import * as actions from './InventoryFilterActions';
+import InventoryFilter from './InventoryFilter';
+import { selectFilterTerm } from './InventoryFilterSelectors';
+
+export const reducers = { inventoryFilter: reducer };
+
+const mapStateToProps = state => ({
+  filterTerm: selectFilterTerm(state),
+});
+// map action dispatchers to props
+const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);
+
+// export connected component
+export default connect(mapStateToProps, mapDispatchToProps)(InventoryFilter);

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/inventoryFilter.scss

@@ -0,0 +1,28 @@
+#inventory_filter_form {
+  .form-group {
+    display: -ms-flexbox;
+    display: -webkit-flex;
+    display: flex;
+    -webkit-flex-direction: row;
+    -ms-flex-direction: row;
+    flex-direction: row;
+    -webkit-flex-wrap: nowrap;
+    -ms-flex-wrap: nowrap;
+    flex-wrap: nowrap;
+    -webkit-justify-content: flex-end;
+    -ms-flex-pack: end;
+    justify-content: flex-end;
+    -webkit-align-content: center;
+    -ms-flex-line-pack: center;
+    align-content: center;
+    -webkit-align-items: center;
+    -ms-flex-align: center;
+    align-items: center;
+    margin-bottom: 0;
+
+    .inventory-clear-button {
+      position: absolute;
+      right: 27px;
+    }
+  }
+}

data/webpack/ForemanInventoryUpload/Components/PageHeader/PageHeader.js

@@ -1,21 +1,30 @@
 import React from 'react';
 import { Grid } from 'patternfly-react';
-import { translate as __ } from 'foremanReact/common/I18n';
 import AutoUploadSwitcher from '../AutoUploadSwitcher';
+import InventoryFilter from '../InventoryFilter';
+import { INVENTORY_PAGE_TITLE } from '../../ForemanInventoryConstants';
+import './pageHeader.scss';
 
 const PageHeader = () => (
   <React.Fragment>
     <Grid.Row>
       <Grid.Col xs={12}>
-        <h1>{__('Red Hat Inventory Uploads')}</h1>
+        <h1 className="inventory_title">{INVENTORY_PAGE_TITLE}</h1>
       </Grid.Col>
     </Grid.Row>
     <Grid.Row>
-      <Grid.Col xs={4} xsOffset={8}>
+      <Grid.Col xs={3}>
+        <InventoryFilter />
+      </Grid.Col>
+      <Grid.Col xs={4} xsOffset={5}>
         <AutoUploadSwitcher />
       </Grid.Col>
     </Grid.Row>
   </React.Fragment>
 );
 
+PageHeader.propTypes = {};
+
+PageHeader.defaultProps = {};
+
 export default PageHeader;

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

@@ -11,7 +11,9 @@ exports[`PageHeader rendering render without Props 1`] = `
       componentClass="div"
       xs={12}
     >
-      <h1>
+      <h1
+        className="inventory_title"
+      >
         Red Hat Inventory Uploads
       </h1>
     </Col>
@@ -20,11 +22,18 @@ exports[`PageHeader rendering render without Props 1`] = `
     bsClass="row"
     componentClass="div"
   >
+    <Col
+      bsClass="col"
+      componentClass="div"
+      xs={3}
+    >
+      <Connect(InventoryFilter) />
+    </Col>
     <Col
       bsClass="col"
       componentClass="div"
       xs={4}
-      xsOffset={8}
+      xsOffset={5}
     >
       <Connect(AutoUploadSwitcher) />
     </Col>

data/webpack/ForemanInventoryUpload/Components/PageHeader/pageHeader.scss

@@ -0,0 +1,3 @@
+.inventory_title {
+  margin-bottom: 30px;
+}

data/webpack/ForemanInventoryUpload/ForemanInventoryConstants.js

@@ -0,0 +1,3 @@
+import { translate as __ } from 'foremanReact/common/I18n';
+
+export const INVENTORY_PAGE_TITLE = __('Red Hat Inventory Uploads');

data/webpack/ForemanInventoryUpload/ForemanInventoryHelpers.js

@@ -0,0 +1,4 @@
+import { foremanUrl } from '../ForemanRhCloudHelpers';
+
+export const inventoryUrl = path =>
+  foremanUrl(`/foreman_inventory_upload/${path}`);

data/webpack/ForemanInventoryUpload/ForemanInventoryUpload.js

@@ -3,14 +3,22 @@ import { IntlProvider } from 'react-intl';
 import { Grid } from 'patternfly-react';
 import AccountList from './Components/AccountList';
 import PageHeader from './Components/PageHeader';
+import { INVENTORY_PAGE_TITLE } from './ForemanInventoryConstants';
 
-const ForemanInventoryUpload = () => (
-  <IntlProvider locale={navigator.language}>
-    <Grid fluid className="inventory-upload">
-      <PageHeader />
-      <AccountList />
-    </Grid>
-  </IntlProvider>
-);
+const ForemanInventoryUpload = () => {
+  document.title = INVENTORY_PAGE_TITLE;
+  return (
+    <IntlProvider locale={navigator.language}>
+      <Grid fluid className="inventory-upload">
+        <PageHeader />
+        <AccountList />
+      </Grid>
+    </IntlProvider>
+  );
+};
+
+ForemanInventoryUpload.propTypes = {};
+
+ForemanInventoryUpload.defaultProps = {};
 
 export default ForemanInventoryUpload;

data/webpack/ForemanInventoryUpload/ForemanInventoryUploadReducers.js

@@ -1,12 +1,12 @@
 import { combineReducers } from 'redux';
 import { reducers as accountListReducers } from './Components/AccountList';
 import { reducers as dashboardReducers } from './Components/Dashboard';
+import { reducers as filterReducers } from './Components/InventoryFilter';
 
-const reducers = {
-  ForemanInventoryUpload: combineReducers({
+export default {
+  inventoryUpload: combineReducers({
     ...accountListReducers,
     ...dashboardReducers,
+    ...filterReducers,
   }),
 };
-
-export default reducers;

data/webpack/ForemanInventoryUpload/__tests__/ForemanInventoryHelpers.test.js

@@ -0,0 +1,11 @@
+import { testSelectorsSnapshotWithFixtures } from 'react-redux-test-utils';
+import { inventoryUrl } from '../ForemanInventoryHelpers';
+
+global.URL_PREFIX = '';
+
+const fixtures = {
+  'should return inventory Url': () => inventoryUrl('test_path'),
+};
+
+describe('ForemanInventoryUpload helpers', () =>
+  testSelectorsSnapshotWithFixtures(fixtures));

data/webpack/ForemanInventoryUpload/{ForemanInventoryUpload.test.js → __tests__/ForemanInventoryUpload.test.js}

@@ -1,6 +1,6 @@
 import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
 
-import ForemanInventoryUpload from './ForemanInventoryUpload';
+import ForemanInventoryUpload from '../../ForemanInventoryUpload';
 
 const fixtures = {
   'render without Props': {},

data/webpack/ForemanInventoryUpload/__tests__/__snapshots__/ForemanInventoryHelpers.test.js.snap

@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ForemanInventoryUpload helpers should return inventory Url 1`] = `"/foreman_inventory_upload/test_path"`;

data/webpack/ForemanRhCloudHelpers.js

@@ -0,0 +1,6 @@
+/**
+ * copied from core, since it's not in the ReactApp folder,
+ * it's complicated to import it and mock it in tests.
+ * should be imported once core moves it to the ReactApp folder.
+ */
+export const foremanUrl = path => `${window.URL_PREFIX}${path}`;