Changed UI for configuration feature

kaaproject · Jun 21, 2016 · b68f45b · b68f45b
1 parent 2c801e9
commit b68f45b
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 82 deletions.
diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/ConfigurationSchemaDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/ConfigurationSchemaDto.java
@@ -16,7 +16,7 @@
 
 package org.kaaproject.kaa.common.dto;
 
-public class ConfigurationSchemaDto extends AbstractSchemaDto {
+public class ConfigurationSchemaDto extends BaseSchemaDto {
 
     private static final long serialVersionUID = 7053272285029134851L;
 
@@ -57,58 +57,6 @@ public void setStatus(UpdateStatus status) {
         this.status = status;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof ConfigurationSchemaDto)) {
-            return false;
-        }
-
-        ConfigurationSchemaDto that = (ConfigurationSchemaDto) o;
-
-        if (version != that.version) {
-            return false;
-        }
-        if (applicationId != null ? !applicationId.equals(that.applicationId) : that.applicationId != null) {
-            return false;
-        }
-        if (baseSchema != null ? !baseSchema.equals(that.baseSchema) : that.baseSchema != null) {
-            return false;
-        }
-        if (id != null ? !id.equals(that.id) : that.id != null) {
-            return false;
-        }
-        if (overrideSchema != null ? !overrideSchema.equals(that.overrideSchema) : that.overrideSchema != null) {
-            return false;
-        }
-        if (protocolSchema != null ? !protocolSchema.equals(that.protocolSchema) : that.protocolSchema != null) {
-            return false;
-        }
-        if (schema != null ? !schema.equals(that.schema) : that.schema != null) {
-            return false;
-        }
-        if (status != that.status) {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = id != null ? id.hashCode() : 0;
-        result = 31 * result + (applicationId != null ? applicationId.hashCode() : 0);
-        result = 31 * result + version;
-        result = 31 * result + (schema != null ? schema.hashCode() : 0);
-        result = 31 * result + (protocolSchema != null ? protocolSchema.hashCode() : 0);
-        result = 31 * result + (baseSchema != null ? baseSchema.hashCode() : 0);
-        result = 31 * result + (overrideSchema != null ? overrideSchema.hashCode() : 0);
-        result = 31 * result + (status != null ? status.hashCode() : 0);
-        return result;
-    }
-
     @Override
     public String toString() {
         return "ConfigurationSchemaDto{" +

diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/ClientFactory.java b/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/ClientFactory.java
@@ -101,8 +101,8 @@ public interface ClientFactory {
     BaseCtlSchemaView getCreateServerProfileSchemaView();
 
     BaseListView<ConfigurationSchemaDto> getConfigurationSchemasView();
-    BaseSchemaView getConfigurationSchemaView();
-    BaseSchemaView getCreateConfigurationSchemaView();
+    BaseCtlSchemaView getConfigurationSchemaView();
+    BaseCtlSchemaView getCreateConfigurationSchemaView();
 
     BaseListView<NotificationSchemaDto> getNotificationSchemasView();
     BaseSchemaView getNotificationSchemaView();

diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/ClientFactoryImpl.java b/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/ClientFactoryImpl.java
@@ -153,8 +153,8 @@ public class ClientFactoryImpl implements ClientFactory {
     private final BaseCtlSchemaView createServerProfileSchemaView = new ServerProfileSchemaViewImpl(true);
 
     private final BaseListView<ConfigurationSchemaDto> configurationSchemasView = new ConfigurationSchemasViewImpl();
-    private final BaseSchemaView configurationSchemaView = new ConfigurationSchemaViewImpl(false);
-    private final BaseSchemaView createConfigurationSchemaView = new ConfigurationSchemaViewImpl(true);
+    private final BaseCtlSchemaView configurationSchemaView = new ConfigurationSchemaViewImpl(false);
+    private final BaseCtlSchemaView createConfigurationSchemaView = new ConfigurationSchemaViewImpl(true);
 
     private final BaseListView<NotificationSchemaDto> notificationSchemasView = new NotificationSchemasViewImpl();
     private final BaseSchemaView notificationSchemaView = new NotificationSchemaViewImpl(false);
@@ -346,12 +346,12 @@ public BaseListView<ConfigurationSchemaDto> getConfigurationSchemasView() {
     }
 
     @Override
-    public BaseSchemaView getConfigurationSchemaView() {
+    public BaseCtlSchemaView getConfigurationSchemaView() {
         return configurationSchemaView;
     }
 
     @Override
-    public BaseSchemaView getCreateConfigurationSchemaView() {
+    public BaseCtlSchemaView getCreateConfigurationSchemaView() {
         return createConfigurationSchemaView;
     }
 

diff --git a/...java/org/kaaproject/kaa/server/admin/client/mvp/activity/ConfigurationSchemaActivity.java b/...java/org/kaaproject/kaa/server/admin/client/mvp/activity/ConfigurationSchemaActivity.java
@@ -21,26 +21,32 @@
 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.place.ConfigurationSchemaPlace;
+import org.kaaproject.kaa.server.admin.client.mvp.place.CtlSchemaPlace;
+import org.kaaproject.kaa.server.admin.client.mvp.view.BaseCtlSchemaView;
 import org.kaaproject.kaa.server.admin.client.mvp.view.BaseSchemaView;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
+import org.kaaproject.kaa.server.admin.shared.schema.ConfigurationSchemaViewDto;
+import org.kaaproject.kaa.server.admin.shared.schema.CtlSchemaFormDto;
+import org.kaaproject.kaa.server.admin.shared.schema.ProfileSchemaViewDto;
 
-public class ConfigurationSchemaActivity
-        extends
-        AbstractSchemaActivity<ConfigurationSchemaDto, BaseSchemaView, ConfigurationSchemaPlace> {
+public class ConfigurationSchemaActivity extends
+        AbstractBaseCtlSchemaActivity<ConfigurationSchemaDto, ConfigurationSchemaViewDto, BaseCtlSchemaView, ConfigurationSchemaPlace> {
 
     public ConfigurationSchemaActivity(ConfigurationSchemaPlace place,
             ClientFactory clientFactory) {
         super(place, clientFactory);
     }
 
+
     @Override
-    protected ConfigurationSchemaDto newSchema() {
-        return new ConfigurationSchemaDto();
+    protected ConfigurationSchemaViewDto newSchema() {
+        return new ConfigurationSchemaViewDto();
     }
 
+
     @Override
-    protected BaseSchemaView getView(boolean create) {
+    protected BaseCtlSchemaView getView(boolean create) {
         if (create) {
             return clientFactory.getCreateConfigurationSchemaView();
         } else {
@@ -49,22 +55,35 @@ protected BaseSchemaView getView(boolean create) {
     }
 
     @Override
-    protected void getEntity(String id,
-            AsyncCallback<ConfigurationSchemaDto> callback) {
-        KaaAdmin.getDataSource().getConfigurationSchemaForm(id, callback);
+    protected void getEntity(String id, AsyncCallback<ConfigurationSchemaViewDto> callback) {
+        KaaAdmin.getDataSource().getConfigurationSchemaForm(id, callback); // refactor on server
+    }
+
+
+    @Override
+    protected void editEntity(ConfigurationSchemaViewDto entity, AsyncCallback<ConfigurationSchemaViewDto> callback) {
+        KaaAdmin.getDataSource().editConfigurationSchemaForm(entity, callback); // refactor on server
     }
 
     @Override
-    protected void editEntity(ConfigurationSchemaDto entity,
-            AsyncCallback<ConfigurationSchemaDto> callback) {
-        KaaAdmin.getDataSource().editConfigurationSchemaForm(entity, callback);
+    protected ConfigurationSchemaPlace existingSchemaPlace(String applicationId, String schemaId) {
+        return new ConfigurationSchemaPlace(applicationId, schemaId);
     }
 
     @Override
-    protected void createEmptySchemaForm(AsyncCallback<RecordField> callback) {
-        KaaAdmin.getDataSource().createConfigurationEmptySchemaForm(callback);
+    protected void createEmptyCtlSchemaForm(AsyncCallback<CtlSchemaFormDto> callback) {
+        KaaAdmin.getDataSource().createNewCTLSchemaFormInstance(null,
+                null,
+                applicationId,
+                callback);
     }
 
+    @Override
+    protected CtlSchemaPlace.SchemaType getPlaceSchemaType() {
+        return CtlSchemaPlace.SchemaType.ENDPOINT_PROFILE;
+    }
+
+
     @Override
     public void loadFormData(String fileItemName,
             AsyncCallback<RecordField> callback) {

diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/data/DataSource.java b/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/data/DataSource.java
@@ -63,11 +63,7 @@
 import org.kaaproject.kaa.server.admin.shared.endpoint.EndpointProfileViewDto;
 import org.kaaproject.kaa.server.admin.shared.plugin.PluginInfoDto;
 import org.kaaproject.kaa.server.admin.shared.properties.PropertiesDto;
-import org.kaaproject.kaa.server.admin.shared.schema.CtlSchemaFormDto;
-import org.kaaproject.kaa.server.admin.shared.schema.CtlSchemaReferenceDto;
-import org.kaaproject.kaa.server.admin.shared.schema.ProfileSchemaViewDto;
-import org.kaaproject.kaa.server.admin.shared.schema.SchemaInfoDto;
-import org.kaaproject.kaa.server.admin.shared.schema.ServerProfileSchemaViewDto;
+import org.kaaproject.kaa.server.admin.shared.schema.*;
 import org.kaaproject.kaa.server.admin.shared.services.KaaAdminServiceAsync;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
@@ -666,8 +662,8 @@ protected void onResult(List<ConfigurationSchemaDto> result) {
     }
 
     public void editConfigurationSchemaForm(
-            ConfigurationSchemaDto configurationSchema,
-            final AsyncCallback<ConfigurationSchemaDto> callback) {
+            ConfigurationSchemaViewDto configurationSchema,
+            final AsyncCallback<ConfigurationSchemaViewDto> callback) {
         rpcService.editConfigurationSchemaForm(configurationSchema,
                 new DataCallback<ConfigurationSchemaDto>(callback) {
                     @Override
@@ -679,7 +675,7 @@ protected void onResult(ConfigurationSchemaDto result) {
     }
 
     public void getConfigurationSchemaForm(String configurationSchemaId,
-            final AsyncCallback<ConfigurationSchemaDto> callback) {
+            final AsyncCallback<ConfigurationSchemaViewDto> callback) {
         rpcService.getConfigurationSchemaForm(configurationSchemaId,
                 new DataCallback<ConfigurationSchemaDto>(callback) {
                     @Override

diff --git a/...a/org/kaaproject/kaa/server/admin/client/mvp/view/config/ConfigurationSchemaViewImpl.java b/...a/org/kaaproject/kaa/server/admin/client/mvp/view/config/ConfigurationSchemaViewImpl.java
@@ -16,10 +16,11 @@
 
 package org.kaaproject.kaa.server.admin.client.mvp.view.config;
 
+import org.kaaproject.kaa.server.admin.client.mvp.view.schema.BaseCtlSchemaViewImpl;
 import org.kaaproject.kaa.server.admin.client.mvp.view.schema.BaseSchemaViewImpl;
 import org.kaaproject.kaa.server.admin.client.util.Utils;
 
-public class ConfigurationSchemaViewImpl extends BaseSchemaViewImpl {
+public class ConfigurationSchemaViewImpl extends BaseCtlSchemaViewImpl {
 
     public ConfigurationSchemaViewImpl(boolean create) {
         super(create);

diff --git a/...c/main/java/org/kaaproject/kaa/server/admin/shared/schema/ConfigurationSchemaViewDto.java b/...c/main/java/org/kaaproject/kaa/server/admin/shared/schema/ConfigurationSchemaViewDto.java
@@ -0,0 +1,21 @@
+package org.kaaproject.kaa.server.admin.shared.schema;
+
+
+import org.kaaproject.kaa.common.dto.ConfigurationSchemaDto;
+import org.kaaproject.kaa.common.dto.EndpointProfileSchemaDto;
+
+public class ConfigurationSchemaViewDto extends BaseSchemaViewDto<ConfigurationSchemaDto> {
+
+    public ConfigurationSchemaViewDto() {
+        super();
+    }
+
+    public ConfigurationSchemaViewDto(ConfigurationSchemaDto schema, CtlSchemaFormDto ctlSchemaForm) {
+        super(schema, ctlSchemaForm);
+    }
+
+    @Override
+    protected ConfigurationSchemaDto createEmptySchema() {
+        return new ConfigurationSchemaDto();
+    }
+}