From 99978322310f1022e76803c283ffed770d916a19 Mon Sep 17 00:00:00 2001
From: vimal1083 <vimal1083@gmail.com>
Date: Wed, 6 Jan 2021 13:54:20 +0530
Subject: [PATCH] Fix Width issue in Filters
---
hypha/static_src/src/app/src/SwitcherApp.js | 3 +--
.../app/src/common/components/FilterDropDown/index.js | 11 +++++------
.../app/src/containers/SubmissionFilters/styles.scss | 5 +----
.../src/app/src/redux/actions/submissions.js | 2 --
4 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/hypha/static_src/src/app/src/SwitcherApp.js b/hypha/static_src/src/app/src/SwitcherApp.js
index c28f41034..dbaa059d5 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 aaa2df1d3..91a868941 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 22229e4fa..e093b5844 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 cf9a44c7b..1951058f9 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) {
--
GitLab