Merge pull request #40 from mkozhukharenko/ormus

Issue #28: Specoffer list - removed query params

src/modules/navbar/NavBar.jsx

@@ -29,7 +29,7 @@ export default class NavBar extends Component {
             <NavItem>Статистика</NavItem>
           </LinkContainer>
 
-          <LinkContainer to={{ pathname: '/specoffers/list', query: this.props.specoffersQueryParams}}>
+          <LinkContainer to={{ pathname: '/specoffers/list'}}>
             <NavItem>Пропозиції</NavItem>
           </LinkContainer>
 
@@ -95,10 +95,6 @@ function select(state) {
     ratingQueryParams: {
       departmentId: state.rating.specofferChooser.departmentId,
       specofferId: state.rating.specofferChooser.specofferId
-    },
-    specoffersQueryParams: {
-      timePeriodId: state.specoffers.list.timePeriodId,
-      limit: state.specoffers.list.limit
     }
   };
 }

src/modules/settings/containers/timePeriodId.js

@@ -3,6 +3,8 @@
 import React, {Component, PropTypes} from 'react';
 import {connect} from 'react-redux';
 import FormControl from 'react-bootstrap/lib/FormControl';
+import FormGroup from 'react-bootstrap/lib/FormGroup';
+import ControlLabel from 'react-bootstrap/lib/ControlLabel';
 import { createSelector } from 'reselect';
 import {TIMEPERIODS} from './../../dictionaries/constants';
 import {isDictLoaded} from './../../dictionaries/helpers';
@@ -28,17 +30,22 @@ class TimePeriodId extends Component {
 
     let { isDictLoadedProp, timeperiods, timePeriodId } = this.props;
 
+    if (!isDictLoadedProp) {
+      return <Loader className="body" isLoading />
+    }
+
     const optionList = timeperiods.map((item, i) => {
       return <option value={i} key={i}>{item}</option>;
     });
 
     return (
-        <Loader className="body" isLoading={!isDictLoadedProp}>
-          <FormControl componentClass="select" placeholder="Оберіть вступну кампанію"
-                 value={timePeriodId} onChange={this.handleOptionChange}>
-            { optionList }
-          </FormControl>
-        </Loader>
+      <FormGroup controlId="formControlsSelect">
+        <ControlLabel>Оберіть вступну кампанію</ControlLabel>
+        <FormControl componentClass="select" placeholder="Оберіть вступну кампанію"
+            value={timePeriodId} onChange={this.handleOptionChange}>
+          { optionList }
+        </FormControl>
+      </FormGroup>
     );
   }
 }

src/modules/specoffers/actions.js

@@ -2,7 +2,7 @@ import {REQUEST_API} from '../../system/constants';
 import * as types from './constants';
 import {getSpecofferEnrolmentsBySpecofferId, getSpecofferInfoMain} from './reducers/view.js'
 
-export function loadSpecoffersList(params) {
+export function loadSpecoffersList() {
   return {
     type: REQUEST_API,
     request: {
@@ -12,8 +12,12 @@ export function loadSpecoffersList(params) {
         success: {type: types.LOAD_ALL_SPECOFFERS_SUCCESS},
         fail: {type: types.LOAD_ALL_SPECOFFERS_FAIL}
       },
-      params,
-      cache: true
+      params: (store) => {
+        return {
+          limit: store.getState().specoffers.list.limit,
+          timePeriodId: store.getState().settings.timePeriodId
+        }
+      }
     },
     interrupt: (store) => !!store.getState().specoffers.list.resources.length
   };

src/modules/specoffers/containers/SpecoffersListPage.jsx

@@ -32,11 +32,10 @@ let buildCells = (decodedSpecoffers, specoffersFieldNames) => {
 };
 
 class SpecoffersListPage extends Component {
-  
+
   componentDidMount() {
-    const {timePeriodId, limit} = this.props;
     this.props.loadDictionaries([dictConst.DEPARTMENTS, dictConst.SPECOFFERS_TYPES, dictConst.EDUCATION_FORM_TYPES]);
-    this.props.loadSpecoffersList({timePeriodId, limit});
+    this.props.loadSpecoffersList();
   }
 
   _onColumnResizeEndCallback = (newColumnWidth, columnKey) => {
@@ -84,28 +83,23 @@ class SpecoffersListPage extends Component {
 
 SpecoffersListPage.propTypes = {
   dispatch: PropTypes.func.isRequired,
-  decodedSpecoffers: PropTypes.array.isRequired,
-  timePeriodId: PropTypes.string.isRequired,
-  limit: PropTypes.string.isRequired
+  decodedSpecoffers: PropTypes.array.isRequired
 };
 
 const mapStateToSpecoffers = createSelector(
   (state) => state.specoffers.list,
   (state) => state.dictionaries,
-  (state, ownProps) => ownProps.location.query,
   (state) => state.specoffers.list.specoffersFieldNames,
   (state) => state.specoffers.list.filterByName,
-  (list, listOfDict, query, specoffersFieldNames, filterByName) => ({
+  (list, listOfDict, specoffersFieldNames, filterByName) => ({
     decodedSpecoffers: decodeSpecoffers(filteredByName(list, filterByName), listOfDict),
-    timePeriodId: query.timePeriodId,
-    limit: query.limit,
     specoffersFieldNames: specoffersFieldNames,
     filterByName: filterByName
   })
 );
 
 const mapDispatchToSpecoffers = (dispatch) => (
-  { loadSpecoffersList: (params) => dispatch(loadSpecoffersList(params)),
+  { loadSpecoffersList: () => dispatch(loadSpecoffersList()),
     loadDictionaries: (dicArray) => dispatch(loadDictionaries(dicArray)),
     setSpecofferFieldWidth: (newColumnWidth, columnKey) => dispatch(setSpecofferFieldWidth(newColumnWidth, columnKey)),
     goToDetailed: (id) => dispatch(push(`/specoffers/${id}/enrolments`)),

src/modules/specoffers/reducers/index.js

@@ -8,7 +8,6 @@ import {LOCATION_CHANGE} from 'react-router-redux';
  * export combined reducers (SPECOFFER REDUCER)
  */
 export default combineReducers({
-  list: ignoreActions(list,
-    (action) => action.type === LOCATION_CHANGE && action.payload.pathname !== '/specoffers/list'),
+  list,
   view
 });

src/modules/specoffers/reducers/list.js

@@ -1,6 +1,5 @@
 import * as types from '../constants';
 import {SPECOFFERS_FIELD_NAMES} from '../constants';
-import {LOCATION_CHANGE} from 'react-router-redux';
 
 import lcache from '../../../system/lcache';
 import { TIMEPERIODID_CHANGED } from '../../settings/duck';
@@ -9,7 +8,6 @@ const defaultState = {
   isLoading: false,
   resources: [],
   specoffersFieldNames: SPECOFFERS_FIELD_NAMES,
-  timePeriodId: lcache.get('timePeriodId') || 8,
   filterByName: '',
   limit: 300,
   error: null
@@ -41,13 +39,6 @@ export default function list(state = defaultState, action = {}) {
         }
       );
 
-    case LOCATION_CHANGE: // listen to query parameters changes
-      //if (action.payload.pathname !== '/specoffers') return state;
-      let {
-        timePeriodId = state.timePeriodId,
-        limit = state.limit } = action.payload.query;
-      return Object.assign({}, state, {timePeriodId, limit});
-
     case types.SPECOFFERS_LIST_WIDTH_CHANGED:
       let changedName = {
         'name': state.specoffersFieldNames[action.payload.columnKey].name,

src/modules/specoffers/reducers/view.js

@@ -1,7 +1,6 @@
 import * as types from '../constants';
 import {ENROLMENTS_FIELD_NAMES} from '../../enrolments/constants';
 import {combineReducers} from 'redux';
-import {LOCATION_CHANGE} from 'react-router-redux';
 
 export let getSpecofferEnrolmentsBySpecofferId = (state, specofferId) => {
   return state.specoffers.view.specofferEnrolments.data[specofferId]

src/system/middleware/request.js

@@ -37,7 +37,8 @@ export default store => next => action => {
   }
 
   const {backendHost, token}= store.getState().config;
-  const {url, headers={}, method='get', params} = request;
+  const {url, headers={}, method='get'} = request;
+  let {params} = request;
   const {start, success, fail} = request.actions;
   const sendType = method === 'get' ? 'query' : 'send';
   dispatchAction(store.dispatch, start, {payload: payload});
@@ -50,6 +51,10 @@ export default store => next => action => {
     .keys(headers)
     .forEach(key=>currentRequest.set(key, headers[key]));
 
+  if (isFunction(params)) {
+    params = params(store)
+  }
+
   currentRequest[sendType](params)
     .end((error, response) => {
       if (error) {