Skip to content
This repository has been archived by the owner on Dec 13, 2020. It is now read-only.

Commit

Permalink
Preparing for includedView + sidelist fix #2
Browse files Browse the repository at this point in the history
  • Loading branch information
damianprzygodzki committed Apr 14, 2017
1 parent 5c680ee commit 9c501d3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
3 changes: 1 addition & 2 deletions src/components/app/DocumentList.js
Original file line number Diff line number Diff line change
Expand Up @@ -363,8 +363,7 @@ class DocumentList extends Component {

const {
windowType, open, closeOverlays, selected, inBackground,
fetchQuickActionsOnInit, isModal, processStatus, readonly,
includedView, children
fetchQuickActionsOnInit, isModal, processStatus, readonly
} = this.props;

const selectionValid = this.doesSelectionExist(selected);
Expand Down
8 changes: 5 additions & 3 deletions src/containers/DocList.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,9 @@ DocList.propTypes = {
}

function mapStateToProps(state) {
const { windowHandler, menuHandler, listHandler, appHandler, routing } = state;
const {
windowHandler, menuHandler, listHandler, appHandler, routing
} = state;

const {
modal,
Expand All @@ -165,13 +167,13 @@ function mapStateToProps(state) {
latestNewDocument: null,
indicator: ''
}

const {
includedView
} = listHandler || {
includedView: {}
}

const {
processStatus
} = appHandler || {
Expand Down
4 changes: 2 additions & 2 deletions src/reducers/listHandler.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default function listHandler(state = initialState, action) {
windowType: action.windowType
})
});

case types.SET_LIST_FILTERS:
return Object.assign({}, state, {
filters: action.filter != null ? [action.filter] : [],
Expand All @@ -50,7 +50,7 @@ export default function listHandler(state = initialState, action) {
windowType: action.windowType
})
});

case types.SET_LIST_INCLUDED_VIEW:
return Object.assign({}, state, {
includedView: Object.assign({}, state.includedView, {
Expand Down

0 comments on commit 9c501d3

Please sign in to comment.