in set -> equals one of

Author: Sebastian Benjamin

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

@@ -110,7 +110,7 @@ const FilterForm = (props: FilterFormProps ) => {
                         updatedFilter.value = '';
                     }
 
-                    if (value === "in set" || filter.operator === "in set") {
+                    if (value === "equals one of" || filter.operator === "equals one of") {
                         updatedFilter.value = ''; 
                     }
                 }
@@ -268,7 +268,7 @@ const FilterForm = (props: FilterFormProps ) => {
                                     </Select>
                                 </FormControlMinWidth>
 
-                                {filter.operator === "in set" ? (
+                                {filter.operator === "equals one of" ? (
                                     <FormControlMinWidth sx={ highlightedInputs[index]?.value ? highlightedSx : null } >
                                         <InputLabel id="value-select-label">Value</InputLabel>
                                         <Select

jbrowse/src/client/JBrowse/utils.ts

@@ -330,7 +330,7 @@ export function serializeLocationToLuceneQuery(contig, start, end) {
 function generateLuceneString(field, operator, value) {
   let luceneQueryString = '';
 
-  if (field === 'variableSamples' && operator == "in set") {
+  if (field === 'variableSamples' && operator == "equals one of") {
     return `variableSamples:~${value}~`;
   }
   let intValue = parseInt(value);
@@ -656,7 +656,7 @@ export function searchStringToInitialFilters(knownFieldNames: string[]) : Filter
 
 export function getOperatorsForField(fieldObj: FieldModel): string[] {
     const stringOperators = ["equals", "does not equal", "contains", "does not contain", "starts with", "ends with", "is empty", "is not empty"];
-    const variableSamplesType = ["in set", "variable in", "not variable in", "variable in all of", "variable in any of", "not variable in any of", "not variable in one of", "is empty", "is not empty"];
+    const variableSamplesType = ["equals one of", "variable in", "not variable in", "variable in all of", "variable in any of", "not variable in any of", "not variable in one of", "is empty", "is not empty"];
     const numericOperators = ["=", "!=", ">", ">=", "<", "<="];
     const noneOperators = [];
 

jbrowse/test/src/org/labkey/test/tests/external/labModules/JBrowseTest.java

@@ -1616,7 +1616,7 @@ private void testLuceneSearchUI(String sessionId)
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "field-label")).click();
         waitForElement(Locator.tagWithText("li", "Samples With Variant")).click();
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "operator-label")).click();
-        waitForElement(Locator.tagWithText("li", "in set")).click();
+        waitForElement(Locator.tagWithText("li", "equals one of")).click();
         waitForElement(Locator.tagWithId("div", "value-select-0")).click();
         waitForElement(Locator.tagWithText("li", "!TestGroup!")).click();
         waitAndClick(Locator.tagWithClass("button", "filter-form-select-button"));