Misc small fixes to variant table (#150)

Author: bbimber

jbrowse/src/client/JBrowse/Search/StandaloneSearch.tsx

@@ -17,7 +17,7 @@ const nativePlugins = [ExtendedVariantPlugin, LogSession]
 
 const StandaloneSearch = observer(({ sessionId, tableUrl, trackId, selectedRegion }: { sessionId: any, tableUrl: boolean, trackId?: string, selectedRegion?: string}) => {
     if (!sessionId){
-        return(<p>No session Id provided. Please have you admin use the customize icon to set the session ID for this webpart.</p>)
+        return(<p>No session Id provided. Please have your site admin use the customize icon to set the session ID for this webpart.</p>)
     }
 
     const queryParam = new URLSearchParams(window.location.search)

jbrowse/src/client/JBrowse/VariantTable/VariantTable.tsx

@@ -22,7 +22,7 @@ function VariantTable() {
     const refTheme = createTheme()
 
     if (!sessionId){
-        return(<p>No session Id provided. Please have you admin use the customize icon to set the session ID for this webpart.</p>)
+        return(<p>No session Id provided.</p>)
     }
 
     const trackId = queryParam.get('trackId')

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

@@ -28,6 +28,10 @@ const VariantTableWidget = observer(props => {
       t => t.configuration.trackId === trackId,
   )
 
+  if (!track) {
+    return (<p>Unknown track: {trackId}</p>)
+  }
+
   // Render function for the custom components that make up the header cells of the table
   function FilterRenderer<R, SR, T extends HTMLOrSVGElement>({
     isCellSelected,

jbrowse/src/client/JBrowse/utils.ts

@@ -68,6 +68,10 @@ function isVariant(gt) {
 
 
 export async function fetchSession(queryParam, sessionId, nativePlugins, refTheme, setState, isTable: boolean, activeTracks?:any, setBgColor?: any, successCallback?: any, trackId?: any) {
+    if (!sessionId) {
+        return null
+    }
+
     return Ajax.request({
         url: ActionURL.buildURL('jbrowse', 'getSession.api'),
         method: 'GET',

jbrowse/src/org/labkey/jbrowse/JBrowse2Processor.java

@@ -354,12 +354,8 @@ private void testSampleFiltersFromUrl()
 
     private void testNoSession()
     {
-        try
-        {
-            beginAt("/home/jbrowse-jbrowse.view?");
-        } catch (Exception e) {
-            waitForElement(Locator.tagWithText("p", "Error - no session provided."));
-        }
+        beginAt("/home/jbrowse-jbrowse.view?");
+        waitForElement(Locator.tagWithText("p", "Error - no session provided."));
     }
 
     private Locator.XPathLocator getTrackLocator(String trackId, boolean waitFor)
@@ -657,7 +653,7 @@ private void testSearch(String sessionId) throws Exception
         PortalHelper portalHelper = new PortalHelper(this);
         portalHelper.addSideWebPart("JBrowse Search");
 
-        waitForElement(Locator.tagWithText("p", "No session Id provided. Please have you admin use the customize icon to set the session ID for this webpart."));
+        waitForElement(Locator.tagWithText("p", "No session Id provided. Please have your site admin use the customize icon to set the session ID for this webpart."));
         portalHelper.clickWebpartMenuItem("JBrowse Search", false, "Customize");
         Window window = new Window.WindowFinder(getDriver()).withTitle("Customize Webpart").waitFor();
         Ext4FieldRef.waitForField(this, "Target JBrowse DB");