#23913 Integrated with GUI presentation configurations read from IS

CHANGELOG.md

@@ -16,6 +16,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - [#23784] Migrated list and reload, searching and ordering functionalities
 - [#23785] Migrated the GNA functionalities
 - [#23834] Create Relation facility
+- [#23913] Integrated with GUI presentation configurations read from IS
 - Moved to maven-portal-bom v3.7.0[-SNAPSHOT]
 
 ## [v2.2.1] - 2022-06-29

pom.xml

@@ -183,6 +183,10 @@
 					<groupId>javax.servlet</groupId>
 					<artifactId>servlet-api</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.projectlombok</groupId>
+					<artifactId>lombok</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>

src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java

@@ -63,9 +63,9 @@ import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.LoaderIcon;
 import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.ModalConfirm;
 import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.NewBrowserWindow;
 import org.gcube.portlets.user.geoportaldataentry.shared.CommitReport;
-import org.gcube.portlets.user.geoportaldataentry.shared.GNADataEntryExtConfigProfile;
+import org.gcube.portlets.user.geoportaldataentry.shared.GNADataEntryExtendedConfigProfile;
 import org.gcube.portlets.user.geoportaldataentry.shared.GeoNaFormDataObject;
-import org.gcube.portlets.user.geoportaldataentry.shared.GeonaISConfig;
+import org.gcube.portlets.user.geoportaldataentry.shared.GeoportalISConfig;
 import org.gcube.portlets.user.geoportaldataentry.shared.Tree_Node;
 import org.gcube.portlets.user.geoportaldataentry.shared.UserRights;
 import org.gcube.portlets.widgets.mpformbuilder.client.MetadataProfileFormBuilderServiceAsync;
@@ -123,7 +123,7 @@ public class GeoPortalDataEntryApp implements EntryPoint {
 
 	private LoaderIcon loaderConfigurations = new LoaderIcon("Step 2 of 2. Loading Configurations, please wait");
 
-	private GeonaISConfig geonaISConfig;
+	private GeoportalISConfig geoportalISConfigs;
 
 	private int numberOfCards = 0;
 
@@ -185,7 +185,7 @@ public class GeoPortalDataEntryApp implements EntryPoint {
 		ConstantsGeoPortalDataEntryApp.ROOT_PANEL_DIV_PORTLET.getElement()
 				.addClassName(ConstantsGeoPortalDataEntryApp.CSS_CLASS_ANIMATE_FADE_IN_OUT);
 
-		GeoportalDataEntryServiceAsync.Util.getInstance().getGeonaInitConfig(new AsyncCallback<GeonaISConfig>() {
+		GeoportalDataEntryServiceAsync.Util.getInstance().getGeonaInitConfig(new AsyncCallback<GeoportalISConfig>() {
 
 			@Override
 			public void onFailure(Throwable caught) {
@@ -202,20 +202,21 @@ public class GeoPortalDataEntryApp implements EntryPoint {
 			}
 
 			@Override
-			public void onSuccess(GeonaISConfig result) {
+			public void onSuccess(GeoportalISConfig geoportalISConfig) {
-				geonaISConfig = result;
+				geoportalISConfigs = geoportalISConfig;
 
-				if (result != null && result.getScope() != null) {
+				if (geoportalISConfig != null && geoportalISConfig.getScope() != null) {
 
-					loadGeoportalConfigs(result.getScope());
+					loadGeoportalConfigs(geoportalISConfig.getScope());
 				} else
 					Window.alert("Sorry, no scope found in the session. Re-login and try again");
 
 			}
 		});
 
+		//Loading Geoportal Configurations from IS
 		GeoportalDataEntryServiceAsync.Util.getInstance()
-				.readDataViewerConfig(new AsyncCallback<GNADataEntryExtConfigProfile>() {
+				.readDataViewerConfig(new AsyncCallback<GNADataEntryExtendedConfigProfile>() {
 
 					@Override
 					public void onFailure(Throwable caught) {
@@ -235,8 +236,8 @@ public class GeoPortalDataEntryApp implements EntryPoint {
 					}
 
 					@Override
-					public void onSuccess(GNADataEntryExtConfigProfile gNADataEntryConfig) {
+					public void onSuccess(GNADataEntryExtendedConfigProfile gNADataEntryConfig) {
-						GWT.log(GNADataEntryExtConfigProfile.class.getSimpleName() + " loaded: " + gNADataEntryConfig);
+						GWT.log(GNADataEntryExtendedConfigProfile.class.getSimpleName() + " loaded: " + gNADataEntryConfig);
 
 						try {
 							ConstantsGeoPortalDataEntryApp.ROOT_PANEL_DIV_LOADERS.remove(loaderApplication);
@@ -249,6 +250,8 @@ public class GeoPortalDataEntryApp implements EntryPoint {
 						initGUI();
 						GcubeUserRole userRole = myRights.getRoleRights().getUserRole();
 						mainTabPanel.setRole(userRole);
+						//GUI Presentation
+						mainTabPanel.setGUIPresentation(gNADataEntryConfig.getDataEntryGUIPresentation());
 
 						RoleRights roleRights = myRights.getRoleRights();
 						boolean canCreateNewItem = roleRights.getListPermessions().keySet()
@@ -416,7 +419,7 @@ public class GeoPortalDataEntryApp implements EntryPoint {
 			GWT.log("calling getProfilesInTheScope for secondaryType: " + gcubeProfile.getGcubeSecondaryType()
 					+ ", name: " + gcubeProfile.getGcubeName());
 			MetadataProfileFormBuilderServiceAsync.Util.getInstance().getProfilesInTheScopeForName(
-					geonaISConfig.getScope(), gcubeProfile.getGcubeSecondaryType(), gcubeProfile.getGcubeName(),
+					geoportalISConfigs.getScope(), gcubeProfile.getGcubeSecondaryType(), gcubeProfile.getGcubeName(),
 					new AsyncCallback<List<MetaDataProfileBean>>() {
 
 						@Override

src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryService.java

@@ -15,9 +15,9 @@ import org.gcube.application.geoportalcommon.shared.products.ConcessioneDV;
 import org.gcube.application.geoportalcommon.shared.products.content.WorkspaceContentDV;
 import org.gcube.application.geoportalcommon.shared.products.paths.FileSetPathsDV;
 import org.gcube.portlets.user.geoportaldataentry.shared.CommitReport;
-import org.gcube.portlets.user.geoportaldataentry.shared.GNADataEntryExtConfigProfile;
+import org.gcube.portlets.user.geoportaldataentry.shared.GNADataEntryExtendedConfigProfile;
 import org.gcube.portlets.user.geoportaldataentry.shared.GeoNaFormDataObject;
-import org.gcube.portlets.user.geoportaldataentry.shared.GeonaISConfig;
+import org.gcube.portlets.user.geoportaldataentry.shared.GeoportalISConfig;
 import org.gcube.portlets.user.geoportaldataentry.shared.Tree_Node;
 import org.gcube.portlets.widgets.mpformbuilder.shared.GenericDatasetBean;
 
@@ -49,7 +49,7 @@ public interface GeoportalDataEntryService extends RemoteService {
 	 *
 	 * @return the geona init config
 	 */
-	GeonaISConfig getGeonaInitConfig();
+	GeoportalISConfig getGeonaInitConfig();
 
 	/**
 	 * Gets the links for.
@@ -125,7 +125,7 @@ public interface GeoportalDataEntryService extends RemoteService {
 	 * @return the GNA data entry ext config profile
 	 * @throws Exception the exception
 	 */
-	GNADataEntryExtConfigProfile readDataViewerConfig() throws Exception;
+	GNADataEntryExtendedConfigProfile readDataViewerConfig() throws Exception;
 
 	/**
 	 * Gets the list use case descriptors.

src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoportalDataEntryServiceAsync.java

@@ -15,9 +15,9 @@ import org.gcube.application.geoportalcommon.shared.products.ConcessioneDV;
 import org.gcube.application.geoportalcommon.shared.products.content.WorkspaceContentDV;
 import org.gcube.application.geoportalcommon.shared.products.paths.FileSetPathsDV;
 import org.gcube.portlets.user.geoportaldataentry.shared.CommitReport;
-import org.gcube.portlets.user.geoportaldataentry.shared.GNADataEntryExtConfigProfile;
+import org.gcube.portlets.user.geoportaldataentry.shared.GNADataEntryExtendedConfigProfile;
 import org.gcube.portlets.user.geoportaldataentry.shared.GeoNaFormDataObject;
-import org.gcube.portlets.user.geoportaldataentry.shared.GeonaISConfig;
+import org.gcube.portlets.user.geoportaldataentry.shared.GeoportalISConfig;
 import org.gcube.portlets.user.geoportaldataentry.shared.Tree_Node;
 import org.gcube.portlets.widgets.mpformbuilder.shared.GenericDatasetBean;
 
@@ -54,7 +54,7 @@ public interface GeoportalDataEntryServiceAsync {
 	void saveGeonaDataForms(String profileID, Tree_Node<GeoNaFormDataObject> tree_Node,
 			AsyncCallback<CommitReport> callback);
 
-	void getGeonaInitConfig(AsyncCallback<GeonaISConfig> callback);
+	void getGeonaInitConfig(AsyncCallback<GeoportalISConfig> callback);
 
 	void getLinksFor(String itemId, String profileID, AsyncCallback<GeoNaItemRef> callback);
 
@@ -73,7 +73,7 @@ public interface GeoportalDataEntryServiceAsync {
 			List<WorkspaceContentDV> keepCurrentContent, GenericDatasetBean gDBean,
 			AsyncCallback<ConcessioneDV> callback);
 
-	void readDataViewerConfig(AsyncCallback<GNADataEntryExtConfigProfile> asyncCallback);
+	void readDataViewerConfig(AsyncCallback<GNADataEntryExtendedConfigProfile> asyncCallback);
 
 	void getListUseCaseDescriptors(List<String> handlersIds, AsyncCallback<List<UseCaseDescriptorDV>> callback);
 

src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.java

@@ -13,6 +13,9 @@ import org.gcube.application.geoportalcommon.shared.geoportal.config.GcubeProfil
 import org.gcube.application.geoportalcommon.shared.geoportal.ucd.GEOPORTAL_DATA_HANDLER;
 import org.gcube.application.geoportalcommon.shared.geoportal.ucd.HandlerDeclarationDV;
 import org.gcube.application.geoportalcommon.shared.geoportal.ucd.UseCaseDescriptorDV;
+import org.gcube.application.geoportalcommon.shared.guipresentation.BodyWelcome;
+import org.gcube.application.geoportalcommon.shared.guipresentation.DataEntryGUIPresentationConfig;
+import org.gcube.application.geoportalcommon.shared.guipresentation.Header;
 import org.gcube.portlets.user.geoportaldataentry.client.GeoPortalClientCaches.CacheSearchingFilterParametersFromConfig;
 import org.gcube.portlets.user.geoportaldataentry.client.events.CreateNewProjectEvent;
 import org.gcube.portlets.user.geoportaldataentry.client.events.GetListOfRecordsEvent;
@@ -28,9 +31,11 @@ import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.LoaderIcon;
 import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.UCD_Util;
 
 import com.github.gwtbootstrap.client.ui.Dropdown;
+import com.github.gwtbootstrap.client.ui.Heading;
 import com.github.gwtbootstrap.client.ui.Hero;
 import com.github.gwtbootstrap.client.ui.NavLink;
 import com.github.gwtbootstrap.client.ui.PageHeader;
+import com.github.gwtbootstrap.client.ui.Paragraph;
 import com.github.gwtbootstrap.client.ui.Tab;
 import com.github.gwtbootstrap.client.ui.TabPanel;
 import com.google.gwt.core.client.GWT;
@@ -123,6 +128,15 @@ public class GeonaMainTabPanel extends Composite {
 	@UiField
 	DockLayoutPanel theDockLayoutPanel;
 
+	@UiField
+	PageHeader pageHeader;
+
+	@UiField
+	Heading welcomeTitle;
+
+	@UiField
+	Paragraph welcomeDescription;
+
 	private HandlerManager appManagerBus;
 
 	private GeonaRecordsPaginatedView grpw = null;
@@ -143,6 +157,8 @@ public class GeonaMainTabPanel extends Composite {
 
 	private ListOfProjectWorkflowActionsPanel listOfProjectWorkflowActionsPanel;
 
+	private DataEntryGUIPresentationConfig dataGUIPresentation;
+
 	/**
 	 * Instantiates a new geona main tab panel.
 	 *
@@ -481,6 +497,32 @@ public class GeonaMainTabPanel extends Composite {
 		}
 	}
 
+	public void setGUIPresentation(DataEntryGUIPresentationConfig dataEntryGUIPresentation) {
+		this.dataGUIPresentation = dataEntryGUIPresentation;
+		GWT.log("Setting: "+dataEntryGUIPresentation);
+
+		Header header = dataGUIPresentation.getHeader();
+		if (header != null) {
+			if (header.getTitle() != null) {
+				pageHeader.setText(header.getTitle());
+			}
+			if (header.getSubtitle() != null) {
+				pageHeader.setSubtext(header.getSubtitle());
+			}
+		}
+
+		BodyWelcome bodyWelcome = dataGUIPresentation.getBodyWelcome();
+		if (bodyWelcome != null) {
+			if (bodyWelcome.getTitle() != null) {
+				welcomeTitle.setText(bodyWelcome.getTitle());
+			}
+			if (bodyWelcome.getDescription() != null) {
+				welcomeDescription.setText(bodyWelcome.getDescription());
+			}
+		}
+
+	}
+
 	/**
 	 * Inits the action list panel.
 	 *
@@ -579,10 +621,9 @@ public class GeonaMainTabPanel extends Composite {
 		detailsPanel.add(viewRelationshipPanel);
 	}
 
-	
 	public void enableRelatioshipFacilities(boolean bool) {
 		navCreateRelation.setVisible(bool);
-		if(!bool) {
+		if (!bool) {
 			grpw.removeColumn(DEFAULT_DISPLAYING_COLUMN_NAME.RELATIONSHIPS);
 		}
 	}

src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.ui.xml

@@ -50,7 +50,7 @@
 	</ui:style>
 	<g:HTMLPanel>
 		<b:PageHeader subtext="data entry facility"
-			styleName="{style.custom-page-header}">GeoPortal</b:PageHeader>
+			styleName="{style.custom-page-header}" ui:field="pageHeader">GeoPortal</b:PageHeader>
 		<g:Label ui:field="roleLabel"
 			addStyleNames="{style.display-right}"></g:Label>
 		<b:TabPanel tabPosition="above" ui:field="tabPanel">
@@ -73,8 +73,9 @@
 
 						<g:HTMLPanel ui:field="introGNA">
 							<b:Hero ui:field="introGNAHero">
-								<b:Heading size="2">Welcome
+								<b:Heading size="2" ui:field="welcomeTitle">Welcome
-									to GNA Data Entry</b:Heading>
+									to GeoPortal Data Entry</b:Heading>
+								<b:Paragraph ui:field="welcomeDescription"></b:Paragraph>
 								<b:Paragraph>select "Create New Project"</b:Paragraph>
 							</b:Hero>
 							<b:PageHeader subtext=" "

src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java

@@ -48,9 +48,9 @@ import org.gcube.common.portal.PortalContext;
 import org.gcube.portlets.user.geoportaldataentry.client.GeoportalDataEntryService;
 import org.gcube.portlets.user.geoportaldataentry.client.ProjectFormCard;
 import org.gcube.portlets.user.geoportaldataentry.shared.CommitReport;
-import org.gcube.portlets.user.geoportaldataentry.shared.GNADataEntryExtConfigProfile;
+import org.gcube.portlets.user.geoportaldataentry.shared.GNADataEntryExtendedConfigProfile;
 import org.gcube.portlets.user.geoportaldataentry.shared.GeoNaFormDataObject;
-import org.gcube.portlets.user.geoportaldataentry.shared.GeonaISConfig;
+import org.gcube.portlets.user.geoportaldataentry.shared.GeoportalISConfig;
 import org.gcube.portlets.user.geoportaldataentry.shared.Tree_Node;
 import org.gcube.portlets.user.geoportaldataentry.shared.UserRights;
 import org.gcube.portlets.widgets.mpformbuilder.shared.GenericDatasetBean;
@@ -320,7 +320,7 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen
 	 * @return the geona init config
 	 */
 	@Override
-	public GeonaISConfig getGeonaInitConfig() {
+	public GeoportalISConfig getGeonaInitConfig() {
 		LOG.info("getConfig called");
 
 		String scope = SessionUtil.getCurrentContext(this.getThreadLocalRequest(), false);
@@ -336,7 +336,7 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen
 //		LOG.warn("\n\n\nHARD-CABLING THE SCOPE, PLEASE REMOTE IT!!!!\n\n\n");
 //		scope = "/gcube/devsec/devVRE";
 
-		GeonaISConfig configs = new GeonaISConfig(theSecondaryType, scope);
+		GeoportalISConfig configs = new GeoportalISConfig(theSecondaryType, scope);
 		LOG.info("returning config: " + configs);
 		return configs;
 	}
@@ -692,11 +692,11 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen
 	 * @throws Exception the exception
 	 */
 	@Override
-	public GNADataEntryExtConfigProfile readDataViewerConfig() throws Exception {
+	public GNADataEntryExtendedConfigProfile readDataViewerConfig() throws Exception {
 		LOG.info("readDataViewerConfig called");
 
 		GCubeUser user = null;
-		GNADataEntryExtConfigProfile gnaDEExtConfig = new GNADataEntryExtConfigProfile();
+		GNADataEntryExtendedConfigProfile gnaDEExtConfig = new GNADataEntryExtendedConfigProfile();
 		try {
 			PortalContext pContext = PortalContext.getConfiguration();
 			user = pContext.getCurrentUser(this.getThreadLocalRequest());
@@ -704,8 +704,8 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen
 
 			GNADataEntryConfigProfile config = getGNADataEntryConfigProfile();
 			List<RoleRights> listUserRightsForRole = config.getPermissionsForRole();
-			gnaDEExtConfig.setListItemFields(config.getListItemFields());
 			gnaDEExtConfig.setPermissionsForRole(listUserRightsForRole);
+			gnaDEExtConfig.setDataEntryGUIPresentation(config.getDataEntryGUIPresentation());
 
 			// DEV MODE
 			if (!SessionUtil.isIntoPortal()) {

src/main/java/org/gcube/portlets/user/geoportaldataentry/shared/GNADataEntryExtendedConfigProfile.java

@@ -4,14 +4,15 @@ import java.io.Serializable;
 
 import org.gcube.application.geoportalcommon.shared.GNADataEntryConfigProfile;
 
+
 /**
- * The Class GNADataEntryExtConfigProfile.
+ * The Class GNADataEntryExtendedConfigProfile.
  *
  * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
  * 
- *         Dec 21, 2021
+ * Sep 26, 2022
  */
-public class GNADataEntryExtConfigProfile extends GNADataEntryConfigProfile implements Serializable {
+public class GNADataEntryExtendedConfigProfile extends GNADataEntryConfigProfile implements Serializable {
 
 	/**
 	 * 
@@ -22,22 +23,37 @@ public class GNADataEntryExtConfigProfile extends GNADataEntryConfigProfile impl
 	/**
 	 * Instantiates a new GNA data entry config profile.
 	 */
-	public GNADataEntryExtConfigProfile() {
+	public GNADataEntryExtendedConfigProfile() {
 
 	}
 
+	/**
+	 * Gets the user rights.
+	 *
+	 * @return the user rights
+	 */
 	public UserRights getUserRights() {
 		return userRights;
 	}
 
+	/**
+	 * Sets the user rights.
+	 *
+	 * @param userRights the new user rights
+	 */
 	public void setUserRights(UserRights userRights) {
 		this.userRights = userRights;
 	}
 
+	/**
+	 * To string.
+	 *
+	 * @return the string
+	 */
 	@Override
 	public String toString() {
 		StringBuilder builder = new StringBuilder();
-		builder.append("GNADataEntryExtConfigProfile [userRights=");
+		builder.append("GNADataEntryExtendedConfigProfile [userRights=");
 		builder.append(userRights);
 		builder.append("]");
 		return builder.toString();

src/main/java/org/gcube/portlets/user/geoportaldataentry/shared/GeoportalISConfig.java

@@ -3,14 +3,13 @@ package org.gcube.portlets.user.geoportaldataentry.shared;
 import java.io.Serializable;
 
 /**
- * The Class GeonaISConfig.
+ * The Class GeoportalISConfig.
  *
  * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
  * 
- *         Dec 22, 2021
+ *         Sep 26, 2022
  */
-public class GeonaISConfig implements Serializable {
+public class GeoportalISConfig implements Serializable {
-
 
 	/**
 	 * 
@@ -22,7 +21,7 @@ public class GeonaISConfig implements Serializable {
 	/**
 	 * Instantiates a new geona IS config.
 	 */
-	public GeonaISConfig() {
+	public GeoportalISConfig() {
 	}
 
 	/**
@@ -31,7 +30,7 @@ public class GeonaISConfig implements Serializable {
 	 * @param gRSecondaryType the g R secondary type
 	 * @param scope           the scope
 	 */
-	public GeonaISConfig(String gRSecondaryType, String scope) {
+	public GeoportalISConfig(String gRSecondaryType, String scope) {
 		super();
 		this.genericResSecondaryType = gRSecondaryType;
 		this.scope = scope;
@@ -73,10 +72,15 @@ public class GeonaISConfig implements Serializable {
 		this.scope = scope;
 	}
 
+	/**
+	 * To string.
+	 *
+	 * @return the string
+	 */
 	@Override
 	public String toString() {
 		StringBuilder builder = new StringBuilder();
-		builder.append("GeonaISConfig [genericResSecondaryType=");
+		builder.append("GeoportalISConfig [genericResSecondaryType=");
 		builder.append(genericResSecondaryType);
 		builder.append(", scope=");
 		builder.append(scope);