[UI] Bug fix to make table next/last buttons work the first time

Author: alexrobin

sensorhub-webui-core/src/main/java/org/sensorhub/ui/DatabaseStreamPanel.java

@@ -490,7 +490,7 @@ int getBinSize(long duration)
     protected void updateTable()
     {
         obsDataContainer.updateTimeRange(zoomTimeRange);
-        table.setContainerDataSource(obsDataContainer);
+        //table.setContainerDataSource(obsDataContainer);
         table.setCurrentPage(1);
 
         var cols = new ArrayList<Object>(table.getContainerPropertyIds());
@@ -506,9 +506,10 @@ protected Component buildTable()
         tableLayout.setMargin(false);
         tableLayout.setSpacing(true);
 
+        var pageSize = 10;
         table = new PagedTable();
         table.setWidth(100, Unit.PERCENTAGE);
-        table.setPageLength(10);
+        table.setPageLength(pageSize);
         table.addStyleName(UIConstants.STYLE_SMALL);
         tableLayout.addComponent(table);
 
@@ -524,7 +525,7 @@ protected Component buildTable()
         // add custom container for lazy loading from DB
         List<ScalarIndexer> indexers = new ArrayList<>();
         var foiIdEncoder = ((AdminUI)UI.getCurrent()).getParentHub().getIdEncoders().getFoiIdEncoder();
-        obsDataContainer = new LazyLoadingObsContainer(db, foiIdEncoder, dataStreamID, foiIDs, indexers);
+        obsDataContainer = new LazyLoadingObsContainer(db, foiIdEncoder, dataStreamID, foiIDs, indexers, pageSize);
         obsDataContainer.updateTimeRange(zoomTimeRange);
         table.setContainerDataSource(obsDataContainer);
         table.addListener(new PageChangeListener() {

sensorhub-webui-core/src/main/java/org/sensorhub/ui/table/LazyLoadingObsContainer.java

@@ -34,18 +34,20 @@ public class LazyLoadingObsContainer extends IndexedContainer
     final BigId dataStreamID;
     final Set<BigId> foiIDs;
     final List<ScalarIndexer> indexers;
+    final int pageSize;
     int startIndexCache = -1;
     int size = -1;
     TimeExtent timeRange;
+        
 
-    
-    public LazyLoadingObsContainer(IObsSystemDatabase db, IdEncoder foiIdEncoder, BigId dataStreamID, Set<BigId> foiIDs, List<ScalarIndexer> indexers)
+    public LazyLoadingObsContainer(IObsSystemDatabase db, IdEncoder foiIdEncoder, BigId dataStreamID, Set<BigId> foiIDs, List<ScalarIndexer> indexers, int pageSize)
     {
         this.db = db;
         this.foiIdEncoder = foiIdEncoder;
         this.dataStreamID = dataStreamID;
         this.foiIDs = foiIDs;
         this.indexers = indexers;
+        this.pageSize = pageSize;
     }
 
 
@@ -60,7 +62,6 @@ public void updateTimeRange(TimeExtent timeRange)
     public void onPageChanged()
     {
         this.startIndexCache = -1;
-        removeAllItems();
     }
 
 
@@ -79,10 +80,13 @@ public List<Object> getItemIds(int startIndex, int numberOfIds)
                 filter.withFois(foiIDs);
 
             // prefetch range from DB
+            removeAllItems();
             AtomicInteger count = new AtomicInteger(startIndex);
             db.getObservationStore().select(filter.build())
                 .skip(startIndex)
+                .limit(10)
                 .forEach(obs -> {
+                    //System.out.println(obs.getResultTime());
                     var dataBlk = obs.getResult();
                     Item item = addItem(count.getAndIncrement());
                     if (item != null)

sensorhub-webui-core/src/main/java/org/sensorhub/ui/table/PagedTable.java

@@ -115,7 +115,7 @@ public Container getContainer() {
                     setColumnWidth(columnId, -1);
                 }
             }
-            firePagedChangedEvent();
+            //firePagedChangedEvent(); // already called in containerItemSetChange
         }
     }