KAA-487: Improve pagination functionality of Admin UI data grids.

kaaproject · Aug 26, 2015 · 25469aa · 25469aa
1 parent bea03a0
commit 25469aa
Show file tree

Hide file tree

Showing 40 changed files with 237 additions and 209 deletions.
diff --git a/...c/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/AbstractListActivity.java b/...c/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/AbstractListActivity.java
@@ -20,6 +20,7 @@
 import java.util.List;
 
 import org.kaaproject.avro.ui.gwt.client.util.BusyAsyncCallback;
+import org.kaaproject.avro.ui.gwt.client.widget.grid.AbstractGrid;
 import org.kaaproject.avro.ui.gwt.client.widget.grid.event.RowActionEvent;
 import org.kaaproject.avro.ui.gwt.client.widget.grid.event.RowActionEventHandler;
 import org.kaaproject.kaa.common.dto.HasId;
@@ -39,7 +40,6 @@
 import com.google.gwt.place.shared.Place;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.ui.AcceptsOneWidget;
-import com.google.gwt.view.client.MultiSelectionModel;
 
 public abstract class AbstractListActivity<T extends HasId, P extends TreePlace> extends AbstractActivity implements BaseListView.Presenter {
 
@@ -62,16 +62,15 @@ public AbstractListActivity(P place, Class<T> dataClass, ClientFactory clientFac
     @Override
     public void start(AcceptsOneWidget containerWidget, EventBus eventBus) {
         listView = getView();
-        this.dataProvider = getDataProvider(listView.getSelectionModel());
+        this.dataProvider = getDataProvider(listView.getListWidget());
         listView.setPresenter(this);
         bind(eventBus);
         containerWidget.setWidget(listView.asWidget());
-        dataProvider.addDataDisplay(listView.getDisplay());
     }
 
     protected abstract BaseListView<T> getView();
 
-    protected abstract AbstractDataProvider<T> getDataProvider(MultiSelectionModel<T> selectionModel);
+    protected abstract AbstractDataProvider<T> getDataProvider(AbstractGrid<T,?> dataGrid);
 
     protected abstract Place newEntityPlace();
 
@@ -138,7 +137,7 @@ public void onSuccessImpl(Void result) {}
             @Override
             public void onDataChanged(DataEvent event) {
                 if (event.checkClass(dataClass)) {
-                    dataProvider.reload(listView.getDisplay());
+                    dataProvider.reload();
                     onCustomDataChangedEvent(event);
                 }
             }

diff --git a/...min/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/AefMapActivity.java b/...min/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/AefMapActivity.java
@@ -51,8 +51,7 @@ public AefMapActivity(AefMapPlace place,
     public void start(AcceptsOneWidget containerWidget, EventBus eventBus) {
         super.start(containerWidget, eventBus);
         AbstractGrid<ApplicationEventMapDto, String> eventMapGrid = detailsView.getEventMapGrid();
-        eventMapDataProvider = new EventMapDataProvider(eventMapGrid.getSelectionModel(), detailsView);
+        eventMapDataProvider = new EventMapDataProvider(eventMapGrid, detailsView);
-        eventMapDataProvider.addDataDisplay(eventMapGrid.getDisplay());
     }
 
     protected void bind(final EventBus eventBus) {
@@ -63,7 +62,7 @@ protected void bind(final EventBus eventBus) {
                 public void onValueChange(ValueChangeEvent<EcfInfoDto> event) {
                     EcfInfoDto ecf = detailsView.getEcf().getValue();
                     eventMapDataProvider.setEcf(ecf);
-                    eventMapDataProvider.reload(detailsView.getEventMapGrid().getDisplay());
+                    eventMapDataProvider.reload();
                 }
             }));
         }
@@ -111,7 +110,7 @@ public void onSuccessImpl(List<EcfInfoDto> result) {
             detailsView.getEcfName().setValue(entity.getEcfName());
             detailsView.getEcfVersion().setValue(entity.getVersion()+"");
             eventMapDataProvider.setEventMaps(entity.getEventMaps());
-            eventMapDataProvider.reload(detailsView.getEventMapGrid().getDisplay());
+            eventMapDataProvider.reload();
         }
     }
 

diff --git a/...in/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/AefMapsActivity.java b/...in/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/AefMapsActivity.java
@@ -16,6 +16,7 @@
 
 package org.kaaproject.kaa.server.admin.client.mvp.activity;
 
+import org.kaaproject.avro.ui.gwt.client.widget.grid.AbstractGrid;
 import org.kaaproject.kaa.common.dto.event.ApplicationEventFamilyMapDto;
 import org.kaaproject.kaa.server.admin.client.mvp.ClientFactory;
 import org.kaaproject.kaa.server.admin.client.mvp.activity.grid.AbstractDataProvider;
@@ -26,7 +27,6 @@
 
 import com.google.gwt.place.shared.Place;
 import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.gwt.view.client.MultiSelectionModel;
 
 public class AefMapsActivity extends AbstractListActivity<ApplicationEventFamilyMapDto, AefMapsPlace> {
 
@@ -44,8 +44,8 @@ protected BaseListView<ApplicationEventFamilyMapDto> getView() {
 
     @Override
     protected AbstractDataProvider<ApplicationEventFamilyMapDto> getDataProvider(
-            MultiSelectionModel<ApplicationEventFamilyMapDto> selectionModel) {
+            AbstractGrid<ApplicationEventFamilyMapDto,?> dataGrid) {
-        return new AefMapsDataProvider(selectionModel, listView, applicationId);
+        return new AefMapsDataProvider(dataGrid, listView, applicationId);
     }
 
     @Override

diff --git a/...c/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/ApplicationsActivity.java b/...c/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/ApplicationsActivity.java
@@ -16,8 +16,8 @@
 
 package org.kaaproject.kaa.server.admin.client.mvp.activity;
 
+import org.kaaproject.avro.ui.gwt.client.widget.grid.AbstractGrid;
 import org.kaaproject.kaa.common.dto.ApplicationDto;
-import org.kaaproject.kaa.server.admin.client.KaaAdmin;
 import org.kaaproject.kaa.server.admin.client.mvp.ClientFactory;
 import org.kaaproject.kaa.server.admin.client.mvp.activity.grid.AbstractDataProvider;
 import org.kaaproject.kaa.server.admin.client.mvp.data.ApplicationsDataProvider;
@@ -27,7 +27,6 @@
 
 import com.google.gwt.place.shared.Place;
 import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.gwt.view.client.MultiSelectionModel;
 
 public class ApplicationsActivity extends AbstractListActivity<ApplicationDto, ApplicationsPlace> {
 
@@ -42,8 +41,8 @@ protected BaseListView<ApplicationDto> getView() {
 
     @Override
     protected AbstractDataProvider<ApplicationDto> getDataProvider(
-            MultiSelectionModel<ApplicationDto> selectionModel) {
+            AbstractGrid<ApplicationDto,?> dataGrid) {
-        return new ApplicationsDataProvider(selectionModel, listView);
+        return new ApplicationsDataProvider(dataGrid, listView);
     }
 
     @Override

diff --git a/...ava/org/kaaproject/kaa/server/admin/client/mvp/activity/ConfigurationSchemasActivity.java b/...ava/org/kaaproject/kaa/server/admin/client/mvp/activity/ConfigurationSchemasActivity.java
@@ -16,6 +16,7 @@
 
 package org.kaaproject.kaa.server.admin.client.mvp.activity;
 
+import org.kaaproject.avro.ui.gwt.client.widget.grid.AbstractGrid;
 import org.kaaproject.avro.ui.gwt.client.widget.grid.event.RowActionEvent;
 import org.kaaproject.kaa.common.dto.ConfigurationSchemaDto;
 import org.kaaproject.kaa.common.dto.admin.RecordKey.RecordFiles;
@@ -32,7 +33,6 @@
 
 import com.google.gwt.place.shared.Place;
 import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.gwt.view.client.MultiSelectionModel;
 
 public class ConfigurationSchemasActivity extends AbstractListActivity<ConfigurationSchemaDto, ConfigurationSchemasPlace> {
 
@@ -50,8 +50,8 @@ protected BaseListView<ConfigurationSchemaDto> getView() {
 
     @Override
     protected AbstractDataProvider<ConfigurationSchemaDto> getDataProvider(
-            MultiSelectionModel<ConfigurationSchemaDto> selectionModel) {
+            AbstractGrid<ConfigurationSchemaDto,?> dataGrid) {
-        return new ConfigurationSchemasDataProvider(selectionModel, listView, applicationId);
+        return new ConfigurationSchemasDataProvider(dataGrid, listView, applicationId);
     }
 
     @Override

diff --git a/.../admin/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/EcfActivity.java b/.../admin/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/EcfActivity.java
@@ -52,8 +52,7 @@ public void start(AcceptsOneWidget containerWidget, EventBus eventBus) {
         super.start(containerWidget, eventBus);
         if (!create) {
             AbstractGrid<EventSchemaVersionDto, Integer> ecfSchemasGrid = detailsView.getEcfSchemasGrid();
-            ecfSchemasDataProvider = new EcfSchemasDataProvider(ecfSchemasGrid.getSelectionModel(), detailsView);
+            ecfSchemasDataProvider = new EcfSchemasDataProvider(ecfSchemasGrid, detailsView);
-            ecfSchemasDataProvider.addDataDisplay(ecfSchemasGrid.getDisplay());
         }
     }
 
@@ -109,7 +108,7 @@ protected void onEntityRetrieved() {
         detailsView.getCreatedDateTime().setValue(Utils.millisecondsToDateTimeString(entity.getCreatedTime()));
         if (!create) {
             ecfSchemasDataProvider.setSchemas(entity.getSchemas());
-            ecfSchemasDataProvider.reload(detailsView.getEcfSchemasGrid().getDisplay());
+            ecfSchemasDataProvider.reload();
         }
     }
 

diff --git a/...admin/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/EcfsActivity.java b/...admin/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/EcfsActivity.java
@@ -16,6 +16,7 @@
 
 package org.kaaproject.kaa.server.admin.client.mvp.activity;
 
+import org.kaaproject.avro.ui.gwt.client.widget.grid.AbstractGrid;
 import org.kaaproject.kaa.common.dto.event.EventClassFamilyDto;
 import org.kaaproject.kaa.server.admin.client.mvp.ClientFactory;
 import org.kaaproject.kaa.server.admin.client.mvp.activity.grid.AbstractDataProvider;
@@ -26,7 +27,6 @@
 
 import com.google.gwt.place.shared.Place;
 import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.gwt.view.client.MultiSelectionModel;
 
 public class EcfsActivity extends AbstractListActivity<EventClassFamilyDto, EcfsPlace> {
 
@@ -41,8 +41,8 @@ protected BaseListView<EventClassFamilyDto> getView() {
 
     @Override
     protected AbstractDataProvider<EventClassFamilyDto> getDataProvider(
-            MultiSelectionModel<EventClassFamilyDto> selectionModel) {
+            AbstractGrid<EventClassFamilyDto,?> dataGrid) {
-        return new EcfsDataProvider(selectionModel, listView);
+        return new EcfsDataProvider(dataGrid, listView);
     }
 
     @Override

diff --git a/.../main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/EndpointGroupActivity.java b/.../main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/EndpointGroupActivity.java
@@ -69,23 +69,16 @@ public void start(AcceptsOneWidget containerWidget, EventBus eventBus) {
         super.start(containerWidget, eventBus);
         if (!create) {
             AbstractGrid<StructureRecordDto<ProfileFilterDto>, StructureRecordKey> profileFiltersGrid = detailsView.getProfileFiltersGrid();
-            profileFiltersDataProvider = new ProfileFiltersDataProvider(profileFiltersGrid.getSelectionModel(),
+            profileFiltersDataProvider = new ProfileFiltersDataProvider(profileFiltersGrid,
-                    detailsView, entityId);
+                    detailsView, entityId, place.isIncludeDeprecatedProfileFilters());
-            profileFiltersDataProvider.setIncludeDeprecated(place.isIncludeDeprecatedProfileFilters());
-
-            profileFiltersDataProvider.addDataDisplay(profileFiltersGrid.getDisplay());
 
             AbstractGrid<StructureRecordDto<ConfigurationDto>, StructureRecordKey> configurationsGrid = detailsView.getConfigurationsGrid();
-            configurationsDataProvider = new ConfigurationsDataProvider(configurationsGrid.getSelectionModel(),
+            configurationsDataProvider = new ConfigurationsDataProvider(configurationsGrid,
-                    detailsView, entityId);
+                    detailsView, entityId, place.isIncludeDeprecatedConfigurations());
-            configurationsDataProvider.setIncludeDeprecated(place.isIncludeDeprecatedConfigurations());
-
-            configurationsDataProvider.addDataDisplay(configurationsGrid.getDisplay());
 
             AbstractGrid<TopicDto, String> topicsGrid = detailsView.getTopicsGrid();
-            topicsDataProvider = new TopicsDataProvider(topicsGrid.getSelectionModel(),
+            topicsDataProvider = new TopicsDataProvider(topicsGrid,
                     detailsView, null, entityId);
-            topicsDataProvider.addDataDisplay(topicsGrid.getDisplay());
         }
     }
 
@@ -131,7 +124,7 @@ public void onSuccessImpl(Void result) {}
             public void onValueChange(ValueChangeEvent<Boolean> event) {
                 place.setIncludeDeprecatedProfileFilters(detailsView.getIncludeDeprecatedProfileFilters().getValue());
                 profileFiltersDataProvider.setIncludeDeprecated(detailsView.getIncludeDeprecatedProfileFilters().getValue());
-                profileFiltersDataProvider.reload(detailsView.getProfileFiltersGrid().getDisplay());
+                profileFiltersDataProvider.reload();
             }
         }));
 
@@ -174,7 +167,7 @@ public void onSuccessImpl(Void result) {}
              public void onValueChange(ValueChangeEvent<Boolean> event) {
                  place.setIncludeDeprecatedConfigurations(detailsView.getIncludeDeprecatedConfigurations().getValue());
                  configurationsDataProvider.setIncludeDeprecated(detailsView.getIncludeDeprecatedConfigurations().getValue());
-                 configurationsDataProvider.reload(detailsView.getConfigurationsGrid().getDisplay());
+                 configurationsDataProvider.reload();
              }
          }));
 
@@ -211,13 +204,13 @@ public void onSuccessImpl(Void result) {}
              public void onDataChanged(DataEvent event) {
                  if (detailsView != null) {
                      if (event.checkClass(ProfileFilterDto.class) && profileFiltersDataProvider != null) {
-                         profileFiltersDataProvider.reload(detailsView.getProfileFiltersGrid().getDisplay());
+                         profileFiltersDataProvider.reload();
                      }
                      else if (event.checkClass(ConfigurationDto.class) && configurationsDataProvider != null) {
-                         configurationsDataProvider.reload(detailsView.getConfigurationsGrid().getDisplay());
+                         configurationsDataProvider.reload();
                      }
                      else if (event.checkClass(TopicDto.class) && topicsDataProvider != null) {
-                         topicsDataProvider.reload(detailsView.getTopicsGrid().getDisplay());
+                         topicsDataProvider.reload();
                      }
                  }
              }

diff --git a/...main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/EndpointGroupsActivity.java b/...main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/EndpointGroupsActivity.java
@@ -16,6 +16,7 @@
 
 package org.kaaproject.kaa.server.admin.client.mvp.activity;
 
+import org.kaaproject.avro.ui.gwt.client.widget.grid.AbstractGrid;
 import org.kaaproject.kaa.common.dto.EndpointGroupDto;
 import org.kaaproject.kaa.server.admin.client.KaaAdmin;
 import org.kaaproject.kaa.server.admin.client.mvp.ClientFactory;
@@ -27,7 +28,6 @@
 
 import com.google.gwt.place.shared.Place;
 import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.gwt.view.client.MultiSelectionModel;
 
 public class EndpointGroupsActivity extends AbstractListActivity<EndpointGroupDto, EndpointGroupsPlace> {
 
@@ -45,8 +45,8 @@ protected BaseListView<EndpointGroupDto> getView() {
 
     @Override
     protected AbstractDataProvider<EndpointGroupDto> getDataProvider(
-            MultiSelectionModel<EndpointGroupDto> selectionModel) {
+            AbstractGrid<EndpointGroupDto, ?> dataGrid) {
-        return new EndpointGroupsDataProvider(selectionModel, listView, applicationId);
+        return new EndpointGroupsDataProvider(dataGrid, listView, applicationId);
     }
 
     @Override

diff --git a/...c/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/LogAppendersActivity.java b/...c/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/LogAppendersActivity.java
@@ -16,6 +16,7 @@
 
 package org.kaaproject.kaa.server.admin.client.mvp.activity;
 
+import org.kaaproject.avro.ui.gwt.client.widget.grid.AbstractGrid;
 import org.kaaproject.kaa.common.dto.logs.LogAppenderDto;
 import org.kaaproject.kaa.server.admin.client.KaaAdmin;
 import org.kaaproject.kaa.server.admin.client.mvp.ClientFactory;
@@ -27,7 +28,6 @@
 
 import com.google.gwt.place.shared.Place;
 import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.gwt.view.client.MultiSelectionModel;
 
 public class LogAppendersActivity extends AbstractListActivity<LogAppenderDto, LogAppendersPlace> {
 
@@ -44,8 +44,8 @@ protected BaseListView<LogAppenderDto> getView() {
     }
 
     @Override
-    protected AbstractDataProvider<LogAppenderDto> getDataProvider(MultiSelectionModel<LogAppenderDto> selectionModel) {
+    protected AbstractDataProvider<LogAppenderDto> getDataProvider(AbstractGrid<LogAppenderDto,?> dataGrid) {
-        return new AppendersDataProvider(selectionModel, listView, applicationId);
+        return new AppendersDataProvider(dataGrid, listView, applicationId);
     }
 
     @Override

diff --git a/...src/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/LogSchemasActivity.java b/...src/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/LogSchemasActivity.java
@@ -16,6 +16,7 @@
 
 package org.kaaproject.kaa.server.admin.client.mvp.activity;
 
+import org.kaaproject.avro.ui.gwt.client.widget.grid.AbstractGrid;
 import org.kaaproject.avro.ui.gwt.client.widget.grid.event.RowActionEvent;
 import org.kaaproject.kaa.common.dto.admin.RecordKey.RecordFiles;
 import org.kaaproject.kaa.common.dto.logs.LogSchemaDto;
@@ -32,7 +33,6 @@
 
 import com.google.gwt.place.shared.Place;
 import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.gwt.view.client.MultiSelectionModel;
 
 public class LogSchemasActivity extends AbstractListActivity<LogSchemaDto, LogSchemasPlace> {
 
@@ -50,8 +50,8 @@ protected BaseListView<LogSchemaDto> getView() {
 
     @Override
     protected AbstractDataProvider<LogSchemaDto> getDataProvider(
-            MultiSelectionModel<LogSchemaDto> selectionModel) {
+            AbstractGrid<LogSchemaDto,?> dataGrid) {
-        return new LogSchemasDataProvider(selectionModel, listView, applicationId);
+        return new LogSchemasDataProvider(dataGrid, listView, applicationId);
     }
 
     @Override

diff --git a/...java/org/kaaproject/kaa/server/admin/client/mvp/activity/NotificationSchemasActivity.java b/...java/org/kaaproject/kaa/server/admin/client/mvp/activity/NotificationSchemasActivity.java
@@ -16,6 +16,7 @@
 
 package org.kaaproject.kaa.server.admin.client.mvp.activity;
 
+import org.kaaproject.avro.ui.gwt.client.widget.grid.AbstractGrid;
 import org.kaaproject.avro.ui.gwt.client.widget.grid.event.RowActionEvent;
 import org.kaaproject.kaa.common.dto.NotificationSchemaDto;
 import org.kaaproject.kaa.common.dto.admin.RecordKey.RecordFiles;
@@ -31,7 +32,6 @@
 
 import com.google.gwt.place.shared.Place;
 import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.gwt.view.client.MultiSelectionModel;
 
 public class NotificationSchemasActivity extends AbstractListActivity<NotificationSchemaDto, NotificationSchemasPlace> {
 
@@ -49,8 +49,8 @@ protected BaseListView<NotificationSchemaDto> getView() {
 
     @Override
     protected AbstractDataProvider<NotificationSchemaDto> getDataProvider(
-            MultiSelectionModel<NotificationSchemaDto> selectionModel) {
+            AbstractGrid<NotificationSchemaDto, ?> dataGrid) {
-        return new NotificationSchemasDataProvider(selectionModel, listView, applicationId);
+        return new NotificationSchemasDataProvider(dataGrid, listView, applicationId);
     }
 
     @Override