Retain focus in search field for custom search

OpenConext · Nov 19, 2024 · 3cc62cc · 3cc62cc
1 parent fda3b26
commit 3cc62cc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/client/src/components/Entities.jsx b/client/src/components/Entities.jsx
@@ -51,10 +51,10 @@ export const Entities = ({
     const navigate = useNavigate();
 
     useEffect(() => {
-        if (displaySearch && searchRef && searchRef.current) {
+        if ((displaySearch || searchAutoFocus) && searchRef && searchRef.current) {
             searchRef.current.focus();
         }
-    }, [displaySearch])
+    }, [displaySearch, searchAutoFocus])
 
     const newEntity = () => {
         if (newEntityFunc) {

diff --git a/client/src/tabs/Users.js b/client/src/tabs/Users.js
@@ -221,6 +221,7 @@ export const Users = () => {
                   inputFocus={true}
                   customSearch={search}
                   rowLinkMapper={openUser}
+                  searchAutoFocus={!searching}
                   busy={searching}>
             {initial && <div className={"image-container"}>
                 <img src={SearchSvg} alt="search"/>

diff --git a/server/src/test/java/access/api/FullSearchQueryParserTest.java b/server/src/test/java/access/api/FullSearchQueryParserTest.java
@@ -11,6 +11,9 @@ class FullSearchQueryParserTest {
     void parse() {
         String parsed = FullSearchQueryParser.parse("This *is+  +a ** test for + the [email protected] *query*");
         assertEquals("+test +john +doe +example +query*", parsed);
+
+        String emailParsed = FullSearchQueryParser.parse("[email protected]");
+        assertEquals("+brand +ms +play*", emailParsed);
     }
 
     @Test