diff --git a/hypha/static_src/src/app/src/SwitcherApp.js b/hypha/static_src/src/app/src/SwitcherApp.js index c28f410349156cef78a59d2ba41277331cc0b824..dbaa059d50ff899d5187ca03557ecc776a526636 100644 --- a/hypha/static_src/src/app/src/SwitcherApp.js +++ b/hypha/static_src/src/app/src/SwitcherApp.js @@ -50,9 +50,8 @@ class SwitcherApp extends React.Component { componentDidUpdate(prevProps) { - if (prevProps.searchParam !== this.props.searchParam) { + if (prevProps.searchParam !== this.props.searchParam && !document.body.classList.contains('app-open')){ const success = this.props.processParams(this.props.searchParam) - if (!success) { this.closeDetail() } else { diff --git a/hypha/static_src/src/app/src/common/components/FilterDropDown/index.js b/hypha/static_src/src/app/src/common/components/FilterDropDown/index.js index aaa2df1d33bc1f6ea7ae6e7e2a43931611291ff9..91a868941ef6a1bf715e98889370683952fd0b81 100644 --- a/hypha/static_src/src/app/src/common/components/FilterDropDown/index.js +++ b/hypha/static_src/src/app/src/common/components/FilterDropDown/index.js @@ -11,13 +11,12 @@ import ListItemText from '@material-ui/core/ListItemText'; import Input from '@material-ui/core/Input'; const styles = { - formControl:{ - minWidth: 200 , - maxWidth: 200, + formControl: { + width: '100%', marginRight: 10, - height: 40 - }, -}; + height: 40, + } +} class FilterDropDown extends React.PureComponent { diff --git a/hypha/static_src/src/app/src/containers/SubmissionFilters/styles.scss b/hypha/static_src/src/app/src/containers/SubmissionFilters/styles.scss index 22229e4fa87292740b09b28977844e0958e84677..e093b58445d5272eb9b27364f0cf4cabcb946f7c 100644 --- a/hypha/static_src/src/app/src/containers/SubmissionFilters/styles.scss +++ b/hypha/static_src/src/app/src/containers/SubmissionFilters/styles.scss @@ -1,10 +1,7 @@ .filter-container { - margin: 0 auto ; padding: 15px; display: flex; - justify-content: space-evenly; - align-content: center; - align-items: center; + justify-content: space-between; } .delete-button { diff --git a/hypha/static_src/src/app/src/redux/actions/submissions.js b/hypha/static_src/src/app/src/redux/actions/submissions.js index cf9a44c7b6cf5692630829f9524ac411132b4549..1951058f94a743e2cc3f40b6a5a113c4833cff4f 100644 --- a/hypha/static_src/src/app/src/redux/actions/submissions.js +++ b/hypha/static_src/src/app/src/redux/actions/submissions.js @@ -160,7 +160,6 @@ export const loadSubmissionFromURL = (params) => (dispatch, getState) => { if (urlParams.has('submission')) { const activeId = Number(urlParams.get('submission')); const submissionID = getCurrentSubmissionID(getState()); - if (activeId !== null && submissionID !== activeId) { dispatch(setCurrentSubmission(activeId)); } @@ -188,7 +187,6 @@ const setSubmissionParam = (id) => (dispatch, getState) => { const shouldSet = !urlID && !!id; const shouldUpdate = id !== null && submissionID !== id && urlID !== id; - if (shouldSet || shouldUpdate) { dispatch(push({search: `?submission=${id}`})); } else if (id === null) {