From c8bd450afc2233897c81218e2c65973b06072cb2 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 21 Dec 2022 14:56:25 +0100 Subject: [PATCH] Updated columns order in EService --- .../support/shared/types/datamodel/ResourceDetailModel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gcube/resourcemanagement/support/shared/types/datamodel/ResourceDetailModel.java b/src/main/java/org/gcube/resourcemanagement/support/shared/types/datamodel/ResourceDetailModel.java index 8e72c3d..2df5512 100644 --- a/src/main/java/org/gcube/resourcemanagement/support/shared/types/datamodel/ResourceDetailModel.java +++ b/src/main/java/org/gcube/resourcemanagement/support/shared/types/datamodel/ResourceDetailModel.java @@ -666,8 +666,8 @@ public class ResourceDetailModel { ********************************************/ // The column model for grid representation modelColumns = new ArrayList(); - modelColumns.add(new ColumnConfig("ServiceClass", "Service Class", 200)); modelColumns.add(new ColumnConfig("ServiceName", "Service Name", 260)); + modelColumns.add(new ColumnConfig("ServiceClass", "Service Class", 200)); modelColumns.add(new ColumnConfig("Version", "Version", 100)); modelColumns.add(new ColumnConfig("Status", "Status", 65)); modelColumns.add(new ColumnConfig("GHN", "GHN", 300)); @@ -688,8 +688,8 @@ public class ResourceDetailModel { type.setRoot("Resources"); type.setRecordName("Resource"); type.addField("ID"); - type.addField("ServiceClass"); type.addField("ServiceName"); + type.addField("ServiceClass"); type.addField("Version"); type.addField("Status"); // a) This is the GHNID type.addField("GHN", "/Profile/GHN/@UniqueID"); @@ -1251,7 +1251,7 @@ public class ResourceDetailModel { REQUIRED_FIELDS.put(ResourceTypeDecorator.RunningInstance.name(), new String[] { "ServiceClass", "ServiceName", "ID", "SubType", "Scopes", "GHN" }); REQUIRED_FIELDS.put(ResourceTypeDecorator.EService.name(), - new String[] { "ServiceClass", "ServiceName", "ID", "SubType", "Scopes", "GHN" }); + new String[] { "ServiceName", "ServiceClass", "ID", "SubType", "Scopes", "GHN" }); REQUIRED_FIELDS.put(ResourceTypeDecorator.RunningPlugin.name(), new String[] { "ServiceClass", "ServiceName", "ID", "SubType", "Scopes" }); REQUIRED_FIELDS.put(ResourceTypeDecorator.GHN.name(), new String[] { "Name", "SubType", "ID", "Scopes" });