From 1436c019cb05856ec22040296862eec6e1efcd1b Mon Sep 17 00:00:00 2001
From: Matej Vavrek <matej.vavrek@m2ms.sk>
Date: Fri, 13 Mar 2020 13:30:06 +0100
Subject: [PATCH] #186 disable predefined filter when filter window is open

---
 js/components/preview/molecule/moleculeList.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/components/preview/molecule/moleculeList.js b/js/components/preview/molecule/moleculeList.js
index a30f1ac7b..13b90afb9 100644
--- a/js/components/preview/molecule/moleculeList.js
+++ b/js/components/preview/molecule/moleculeList.js
@@ -161,7 +161,7 @@ const MoleculeList = memo(
     const imgWidth = 150;
 
     const [filteredCount, setFilteredCount] = useState(0);
-    const [predefinedFilter, setPredefinedFilter] = useState(DEFAULT_FILTER);
+    const [predefinedFilter, setPredefinedFilter] = useState(filter !== undefined ? filter.predefined : DEFAULT_FILTER);
 
     const isActiveFilter = !!(filterSettings || {}).active;
 
@@ -266,7 +266,7 @@ const MoleculeList = memo(
           hasHeader
           title="Hit navigator"
           headerActions={[
-            <FormControl className={classes.formControl} disabled={!(object_selection || []).length}>
+            <FormControl className={classes.formControl} disabled={!(object_selection || []).length || sortDialogOpen}>
               <Select
                 className={classes.select}
                 value={predefinedFilter}