Refactor field regex (#253)

* Add extractFieldName instead of regex
* Add API unit and selenium tests

---------

Co-authored-by: Sebastian Benjamin <sebastiancbenjamin@gmail.com>
Co-authored-by: bbimber <bbimber@gmail.com>

Author: 3 people

jbrowse/src/client/JBrowse/VariantSearch/components/FilterForm.tsx

@@ -265,6 +265,7 @@ const FilterForm = (props: FilterFormProps ) => {
                                         <InputLabel id="value-select-label">Value</InputLabel>
                                         <Select
                                             labelId="value-select-label"
+                                            id={`value-select-${index}`}
                                             value={filter.value}
                                             onChange={(event) =>
                                                 handleFilterChange(index, "value", event.target.value)
@@ -305,6 +306,7 @@ const FilterForm = (props: FilterFormProps ) => {
                                         <InputLabel id="value-select-label">Value</InputLabel>
                                         <Select
                                             labelId="value-select-label"
+                                            id={`value-select-${index}`}
                                             value={filter.value}
                                             disabled={filter.operator === "is empty" || filter.operator === "is not empty"}
                                             onChange={(event) =>
@@ -321,6 +323,7 @@ const FilterForm = (props: FilterFormProps ) => {
                                 ) : (
                                     <TextFieldMinWidth
                                         label="Value"
+                                        id={`value-select-${index}`}
                                         sx={ highlightedInputs[index]?.value ? highlightedSx : null }
                                         value={filter.value}
                                         disabled={filter.operator === "is empty" || filter.operator === "is not empty"}

jbrowse/src/org/labkey/jbrowse/JBrowseLuceneSearch.java

@@ -60,6 +60,7 @@ public class JBrowseLuceneSearch
     private final JBrowseSession _session;
     private final JsonFile _jsonFile;
     private final User _user;
+    private final String[] specialStartPatterns = {"*:* -", "+", "-"};
 
     private JBrowseLuceneSearch(final JBrowseSession session, final JsonFile jsonFile, User u)
     {
@@ -115,6 +116,19 @@ private String tryUrlDecode(String input) {
         }
     }
 
+    public String extractFieldName(String queryString) {
+        // Check if the query starts with any of the start patterns
+        for (String pattern : specialStartPatterns) {
+            if (queryString.startsWith(pattern)) {
+                queryString = queryString.substring(pattern.length()).trim();
+                break;
+            }
+        }
+
+        // Split the remaining string by ':' and return the first part (field name)
+        String[] parts = queryString.split(":", 2);
+        return parts.length > 0 ? parts[0].trim() : null;
+    }
 
     public JSONObject doSearch(User u, String searchString, final int pageSize, final int offset) throws IOException, ParseException
     {
@@ -180,18 +194,7 @@ public JSONObject doSearch(User u, String searchString, final int pageSize, fina
                 String queryString = tokenizer.nextToken();
                 Query query = null;
 
-                // Type is defined by the first field in the lucene query
-                // "First" field is defined by getting the first consecutive string of ASCII characters or underscores terminated by a colon
-                // we might just want to return the field(s) in the form instead
-                Pattern pattern = Pattern.compile("[\\p{ASCII}&&[^\\s:*+-]][\\p{ASCII}&&[^:\\p{Punct}*]]*:");
-
-                Matcher matcher = pattern.matcher(queryString);
-
-                String fieldName = null;
-                if (matcher.find())
-                {
-                    fieldName = matcher.group().substring(0, matcher.group().length() - 1);
-                }
+                String fieldName = extractFieldName(queryString);
 
                 if (VARIABLE_SAMPLES.equals(fieldName))
                 {