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

Commit

Permalink
#732 IncludedView added to masterwindow
Browse files Browse the repository at this point in the history
  • Loading branch information
damianprzygodzki committed May 12, 2017
1 parent cebad79 commit 4b59c5d
Showing 1 changed file with 37 additions and 4 deletions.
41 changes: 37 additions & 4 deletions src/containers/MasterWindow.js
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@ class MasterWindow extends Component {

renderBody = () => {
const {
master, modal, rawModal, selected, indicator
master, modal, rawModal, selected, indicator, selectedWindowType,
includedView, processStatus
} = this.props;
const {newRow, modalTitle} = this.state;
const {type} = master.layout;
Expand Down Expand Up @@ -202,8 +203,23 @@ class MasterWindow extends Component {
windowType={rawModal.type}
defaultViewId={rawModal.viewId}
selected={selected}
selectedWindowType={selectedWindowType}
isModal={true}
setModalTitle={this.setModalTitle}
/>
processStatus={processStatus}
includedView={includedView}
inBackground={
includedView.windowType && includedView.viewId
}
>
<DocumentList
type="includedView"
selected={selected}
windowType={includedView.windowType}
defaultViewId={includedView.viewId}
isIncluded={true}
/>
</DocumentList>
</RawModal>
)
}
Expand Down Expand Up @@ -293,21 +309,35 @@ MasterWindow.propTypes = {
};

function mapStateToProps(state) {
const { windowHandler, menuHandler } = state;
const { windowHandler, menuHandler, listHandler, appHandler } = state;
const {
master,
modal,
rawModal,
selected,
selectedWindowType,
indicator
} = windowHandler || {
master: {},
modal: false,
rawModal: {},
selected: [],
selectedWindowType: null,
indicator: ''
}

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

const {
processStatus
} = appHandler || {
processStatus: ''
}

const {
breadcrumb
} = menuHandler || {
Expand All @@ -320,7 +350,10 @@ function mapStateToProps(state) {
modal,
selected,
rawModal,
indicator
indicator,
selectedWindowType,
includedView,
processStatus
}
}

Expand Down

0 comments on commit 4b59c5d

Please sign in to comment.