From a0d1b5649c3b528d9ec07f61659d635d3c7d4979 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 21 Dec 2022 14:04:07 +0100 Subject: [PATCH] Fixed column model in resource detail --- .../types/datamodel/ResourceDetailModel.java | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 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 814fa04..8e72c3d 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 @@ -442,17 +442,18 @@ public class ResourceDetailModel { ********************************************/ // The column model for grid representation modelColumns = new ArrayList(); - modelColumns.add(new ColumnConfig("Name", "Name", 260)); - modelColumns.add(new ColumnConfig("Description", "Description", 200)); - // modelColumns.add(new ColumnConfig("Version", "Version", 100)); + modelColumns.add(new ColumnConfig("Name", "Name", 200)); + modelColumns.add(new ColumnConfig("Description", "Description", 400)); + modelColumns.add(new ColumnConfig("Scopes", "Scopes", 300)); + // Optional modelColumns.add(new ColumnConfig("ID", "ID", 220)); + modelColumns.add(new ColumnConfig("SubType", "Secondary Type", 170)); modelColumns.add(new ColumnConfig("SubType", "SubType", 200)); - modelColumns.add(new ColumnConfig("Scopes", "Scopes", 300)); // create the column model cm = new ColumnModel(modelColumns); - for (int i = 5; i < modelColumns.size(); i++) { + for (int i = 3; i < modelColumns.size(); i++) { cm.setHidden(i, true); } RECORD_DEFINITION.put(ResourceTypeDecorator.ConfigurationTemplate.name(), cm); @@ -464,19 +465,14 @@ public class ResourceDetailModel { type.addField("ID"); type.addField("Name"); type.addField("Description"); - // type.addField("Version"); - // a) This is the GHNID type.addField("GHN", "/Profile/GHN/@UniqueID"); - // b) While this is its name type.addField("Scopes"); - - // These fields are internally used and not showable type.addField("SubType"); type.addField("Type"); XML_MAPPING.put(ResourceTypeDecorator.ConfigurationTemplate.name(), type); - + /********************************************* - * Configuration + * GenericResource / Configuration ********************************************/ // The column model for grid representation modelColumns = new ArrayList(); @@ -1238,7 +1234,7 @@ public class ResourceDetailModel { new String[] { "ServiceClass", "ServiceName", "ID", "SubType", "Scopes" }); REQUIRED_FIELDS.put(ResourceTypeDecorator.ConfigurationTemplate.name(), - new String[] { "ServiceClass", "ServiceName", "ID", "SubType", "Scopes" }); + new String[] { "Name", "SubType", "ID", "Scopes" }); REQUIRED_FIELDS.put(ResourceTypeDecorator.GenericResource.name(), new String[] { "Name", "SubType", "ID", "Scopes" });