Bugfix search loading indicator

Author: bbimber

jbrowse/api-src/org/labkey/api/jbrowse/JBrowseFieldDescriptor.java

@@ -25,6 +25,8 @@ public class JBrowseFieldDescriptor {
     private String _category = null;
     private String _url = null;
 
+    private Integer _flex = null;
+
     public JBrowseFieldDescriptor(String luceneFieldName, @Nullable String description, boolean isInDefaultColumns, boolean isIndexed, VCFHeaderLineType type, Integer orderKey) {
         _fieldName = luceneFieldName;
         _label = luceneFieldName;
@@ -162,6 +164,11 @@ public void setDescription(String description)
         _description = description;
     }
 
+    public void setFlex(Integer flex)
+    {
+        _flex = flex;
+    }
+
     public JSONObject toJSON() {
         JSONObject fieldDescriptorJSON = new JSONObject();
         fieldDescriptorJSON.put("name", _fieldName);
@@ -178,6 +185,7 @@ public JSONObject toJSON() {
         fieldDescriptorJSON.put("allowableValues", _allowableValues);
         fieldDescriptorJSON.put("category", _category);
         fieldDescriptorJSON.put("url", _url);
+        fieldDescriptorJSON.put("flex", _flex);
 
         return fieldDescriptorJSON;
     }

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

@@ -42,7 +42,7 @@ import '../../jbrowse.css';
 import LoadingIndicator from './LoadingIndicator';
 
 const VariantTableWidget = observer(props => {
-  const { assembly, assemblyName, trackId, locString, parsedLocString, sessionId, session, pluginManager } = props
+  const { assembly, trackId, parsedLocString, sessionId, session, pluginManager } = props
   const { assemblyNames, assemblyManager } = session
   const { view } = session
 
@@ -61,6 +61,7 @@ const VariantTableWidget = observer(props => {
 
   function handleSearch(data) {
     setFeatures(APIDataToRows(data.data, trackId))
+    setDataLoaded(true)
   }
 
   function handleModalClose(widget) {
@@ -74,7 +75,8 @@ const VariantTableWidget = observer(props => {
     window.history.pushState(null, "", currentUrl.toString());
 
     setFilters(passedFilters);
-    fetchLuceneQuery(passedFilters, sessionId, trackGUID, currentOffset, (json)=>{handleSearch(json)}, (error) => {setError(error)});
+    setDataLoaded(false)
+    fetchLuceneQuery(passedFilters, sessionId, trackGUID, currentOffset, (json)=>{handleSearch(json)}, (error) => {setDataLoaded(true);setError(error)});
   }
 
   const TableCellWithPopover = (props: { value: any }) => {