LMS-1432 avoid loading datasets when loading properties is quick

SVN: 15158

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/AbstractExternalDataGrid.java

@@ -30,6 +30,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAs
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.ServerRequestQueue;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DisplayTypeIDGenerator;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.BaseEntityModel;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.EntityGridModelFactory;
@@ -83,9 +84,11 @@ public abstract class AbstractExternalDataGrid
     private final ICriteriaProvider<PropertyTypesCriteria> criteriaProvider;
 
     protected AbstractExternalDataGrid(final IViewContext<ICommonClientServiceAsync> viewContext,
-            String browserId, String gridId, DisplayTypeIDGenerator displayTypeIDGenerator)
+            String browserId, String gridId, DisplayTypeIDGenerator displayTypeIDGenerator,
+            ServerRequestQueue requestQueueOrNull)
     {
         super(viewContext, gridId, false, displayTypeIDGenerator);
+        super.setServerRequestQueue(requestQueueOrNull);
         this.criteriaProvider = createCriteriaProvider();
         setId(browserId);
         updateCriteriaProviderAndRefresh();

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetSearchHitGrid.java

@@ -91,7 +91,8 @@ public class DataSetSearchHitGrid extends AbstractExternalDataGrid implements
 
     private DataSetSearchHitGrid(final IViewContext<ICommonClientServiceAsync> viewContext)
     {
-        super(viewContext, BROWSER_ID, GRID_ID, DisplayTypeIDGenerator.DATA_SET_SEARCH_RESULT_GRID);
+        super(viewContext, BROWSER_ID, GRID_ID, DisplayTypeIDGenerator.DATA_SET_SEARCH_RESULT_GRID,
+                null);
     }
 
     @Override

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/RelatedDataSetGrid.java

@@ -59,7 +59,7 @@ public class RelatedDataSetGrid extends AbstractExternalDataGrid
     private RelatedDataSetGrid(final IViewContext<ICommonClientServiceAsync> viewContext,
             final RelatedDataSetCriteria relatedCriteria)
     {
-        super(viewContext, BROWSER_ID, GRID_ID, DisplayTypeIDGenerator.RELATED_DATA_SET_GRID);
+        super(viewContext, BROWSER_ID, GRID_ID, DisplayTypeIDGenerator.RELATED_DATA_SET_GRID, null);
         this.relatedCriteria = relatedCriteria;
     }
 

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetRelationshipBrowser.java

@@ -50,7 +50,8 @@ public class DataSetRelationshipBrowser extends AbstractExternalDataGrid
         IViewContext<ICommonClientServiceAsync> commonViewContext =
                 viewContext.getCommonViewContext();
         DataSetRelationshipBrowser browser =
-                new DataSetRelationshipBrowser(commonViewContext, datasetId, role)
+                new DataSetRelationshipBrowser(commonViewContext, datasetId, role,
+                        requestQueueOrNull)
                     {
                         @Override
                         public String getGridDisplayTypeID()
@@ -60,7 +61,6 @@ public class DataSetRelationshipBrowser extends AbstractExternalDataGrid
                         }
 
                     };
-        browser.setServerRequestQueue(requestQueueOrNull);
         return browser.asDisposableWithoutToolbar();
     }
 
@@ -69,10 +69,10 @@ public class DataSetRelationshipBrowser extends AbstractExternalDataGrid
     private final DataSetRelationshipRole role;
 
     private DataSetRelationshipBrowser(IViewContext<ICommonClientServiceAsync> viewContext,
-            TechId datasetId, DataSetRelationshipRole role)
+            TechId datasetId, DataSetRelationshipRole role, ServerRequestQueue requestQueueOrNull)
     {
         super(viewContext, createBrowserId(datasetId, role), createGridId(datasetId, role),
-                DisplayTypeIDGenerator.DATA_SET_DETAILS_GRID);
+                DisplayTypeIDGenerator.DATA_SET_DETAILS_GRID, requestQueueOrNull);
         this.datasetId = datasetId;
         this.role = role;
     }

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentDataSetBrowser.java

@@ -45,7 +45,7 @@ public class ExperimentDataSetBrowser extends AbstractExternalDataGrid
         IViewContext<ICommonClientServiceAsync> commonViewContext =
                 viewContext.getCommonViewContext();
         ExperimentDataSetBrowser browser =
-                new ExperimentDataSetBrowser(commonViewContext, experimentId)
+                new ExperimentDataSetBrowser(commonViewContext, experimentId, requestQueueOrNull)
                     {
                         @Override
                         public String getGridDisplayTypeID()
@@ -53,17 +53,16 @@ public class ExperimentDataSetBrowser extends AbstractExternalDataGrid
                             return super.getGridDisplayTypeID() + "-" + experimentType.getCode();
                         }
                     };
-        browser.setServerRequestQueue(requestQueueOrNull);
         return browser.asDisposableWithoutToolbar();
     }
 
     private final TechId experimentId;
 
     private ExperimentDataSetBrowser(IViewContext<ICommonClientServiceAsync> viewContext,
-            TechId experimentId)
+            TechId experimentId, ServerRequestQueue requestQueueOrNull)
     {
         super(viewContext, createBrowserId(experimentId), createGridId(experimentId),
-                DisplayTypeIDGenerator.EXPERIMENT_DETAILS_GRID);
+                DisplayTypeIDGenerator.EXPERIMENT_DETAILS_GRID, requestQueueOrNull);
         this.experimentId = experimentId;
     }
 

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SampleDataSetBrowser.java

@@ -52,7 +52,8 @@ class SampleDataSetBrowser extends AbstractExternalDataGrid
                 viewContext.getCommonViewContext();
 
         SampleDataSetBrowser browser =
-                new SampleDataSetBrowser(commonViewContext, sampleId, connectionTypeProvider)
+                new SampleDataSetBrowser(commonViewContext, sampleId, connectionTypeProvider,
+                        requestQueueOrNull)
                     {
                         @Override
                         public String getGridDisplayTypeID()
@@ -61,17 +62,17 @@ class SampleDataSetBrowser extends AbstractExternalDataGrid
                         }
 
                     };
-        browser.setServerRequestQueue(requestQueueOrNull);
         return browser.asDisposableWithoutToolbar();
     }
 
     private final TechId sampleId;
 
     private SampleDataSetBrowser(IViewContext<ICommonClientServiceAsync> viewContext,
-            TechId sampleId, DataSetConnectionTypeProvider connectionTypeProvider)
+            TechId sampleId, DataSetConnectionTypeProvider connectionTypeProvider,
+            ServerRequestQueue requestQueueOrNull)
     {
         super(viewContext, createBrowserId(sampleId), createGridId(sampleId),
-                DisplayTypeIDGenerator.SAMPLE_DETAILS_GRID);
+                DisplayTypeIDGenerator.SAMPLE_DETAILS_GRID, requestQueueOrNull);
         this.sampleId = sampleId;
         this.connectionTypeProvider = connectionTypeProvider;
         // refresh data when connection type provider value changes