Moved to geoportal-client (>= 1.1.0-SNAPSHOT). Tested loading of N-UCD
(with N=2)
This commit is contained in:
parent
e273a8bced
commit
5560a98407
|
|
@ -1,5 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -43,7 +45,9 @@
|
|||
|
||||
|
||||
<wb-module deploy-name="geoportal-data-entry-app-3.0.0-SNAPSHOT">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -87,7 +91,9 @@
|
|||
|
||||
|
||||
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -131,7 +137,9 @@
|
|||
|
||||
|
||||
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -184,7 +192,9 @@
|
|||
<dependent-module archiveName="geoportal-data-common-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/geoportal-data-common/geoportal-data-common">
|
||||
<dependency-type>uses</dependency-type>
|
||||
</dependent-module>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -228,7 +238,9 @@
|
|||
|
||||
|
||||
<property name="context-root" value="geoportal-data-entry-app"/>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -272,7 +284,9 @@
|
|||
|
||||
|
||||
<property name="java-output-path" value="/geoportal-data-entry-app/target/geoportal-data-entry-app-2.0.0-SNAPSHOT/WEB-INF/classes"/>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -316,7 +330,9 @@
|
|||
|
||||
|
||||
</wb-module>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
|
|||
- [#22684] Porting to Profiled Document
|
||||
- [#23587] GUI model viewer passed to tree data structure
|
||||
- Moved to maven-portal-bom v3.7.0[-SNAPSHOT]
|
||||
- [#22883] Integrated with (the new) geoportal-client (>= 1.1.0-SNAPSHOT)
|
||||
|
||||
## [v2.2.1] - 2022-06-29
|
||||
|
||||
|
|
|
|||
2
pom.xml
2
pom.xml
|
|
@ -170,7 +170,7 @@
|
|||
<dependency>
|
||||
<groupId>org.gcube.application</groupId>
|
||||
<artifactId>geoportal-client</artifactId>
|
||||
<version>[1.0.0, 2.0.0-SNAPSHOT)</version>
|
||||
<version>[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
|
||||
<scope>compile</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
|
|
|
|||
|
|
@ -52,7 +52,6 @@ import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.HTMLUtil;
|
|||
import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.HTMLUtil.HTML_TAG;
|
||||
import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.LoaderIcon;
|
||||
import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.NewBrowserWindow;
|
||||
import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.TreeVisitUtil;
|
||||
import org.gcube.portlets.user.geoportaldataentry.shared.CommitReport;
|
||||
import org.gcube.portlets.user.geoportaldataentry.shared.GNADataEntryExtConfigProfile;
|
||||
import org.gcube.portlets.user.geoportaldataentry.shared.GeoNaFormDataObject;
|
||||
|
|
|
|||
|
|
@ -160,6 +160,7 @@ public class GeonaDataEntryMainForm extends Composite {
|
|||
mapForms.clear();
|
||||
// mainTabPanel.clear();
|
||||
inputPanel.clear();
|
||||
treePanel.clear();
|
||||
// listTabs.clear();
|
||||
}
|
||||
|
||||
|
|
@ -187,10 +188,10 @@ public class GeonaDataEntryMainForm extends Composite {
|
|||
NodeItem node = (NodeItem) root.getWidget();
|
||||
GWT.log("validateFormsIntoTree called for: " + root.getText() + " node: " + node);
|
||||
|
||||
// //Is root
|
||||
// if (node == null) {
|
||||
// return;
|
||||
// }
|
||||
//Is root
|
||||
if (node.isRoot()) {
|
||||
return;
|
||||
}
|
||||
|
||||
boolean isValid = node.validateForm();
|
||||
GWT.log("validateFormsIntoTree called for: " + root.getText() + " is valid: " + isValid);
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ public class TreeItemPanel {
|
|||
|
||||
treeItemParents.put(JSON_ROOT_PATH, Arrays.asList(root));
|
||||
|
||||
/*
|
||||
for (GeoNaFormCardModel geoNaFormCardModel : gnaCardsModels) {
|
||||
|
||||
GcubeProfileDV profile = geoNaFormCardModel.getGcubeProfile();
|
||||
|
|
@ -76,7 +77,7 @@ public class TreeItemPanel {
|
|||
|
||||
GWT.log(" print tree parentName: " + parentName + " name: " + profile.getSectionName() + " title: "
|
||||
+ profile.getSectionTitle());
|
||||
}
|
||||
}*/
|
||||
|
||||
for (GeoNaFormCardModel geoNaFormCardModel : gnaCardsModels) {
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,8 @@ public class FormDataObjectToJSON {
|
|||
GcubeProfileDV profile = tree_Node.getData().getGcubeProfileDV();
|
||||
LOG.debug("The profile is: " + profile);
|
||||
|
||||
String jsonPathExp = String.format("%s%s", profile.getParentName(), profile.getSectionName());
|
||||
String parentPath = profile.getParentName().endsWith(".")?profile.getParentName():profile.getParentName()+".";
|
||||
String jsonPathExp = String.format("%s%s", parentPath, profile.getSectionName());
|
||||
LOG.debug("The json path to build: " + jsonPathExp);
|
||||
// jsonPathExp = "$.chidl1.child2.child3";
|
||||
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen
|
|||
try {
|
||||
|
||||
FormDataObjectToJSON metadataConverter = new FormDataObjectToJSON();
|
||||
JSONObject theDocument = metadataConverter.convert(tree_Node);
|
||||
JSONObject theDocument = metadataConverter.convert(tree_Node, null);
|
||||
theDocumentString = theDocument.toString();
|
||||
LOG.info("Got Document: " + theDocumentString);
|
||||
} catch (Exception e) {
|
||||
|
|
@ -142,9 +142,11 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen
|
|||
}
|
||||
|
||||
try {
|
||||
|
||||
|
||||
// Uploading files
|
||||
LOG.debug("Going to upload the files");
|
||||
for (GeoNaFormDataObject geoNaFormDataObject : listGeonaFormObjects) {
|
||||
for (Tree_Node geoNaFormDataObject : tree_Node.) {
|
||||
List<GenericDatasetBean> listGDB = geoNaFormDataObject.getListGDB();
|
||||
GcubeProfileDV profile = geoNaFormDataObject.getGcubeProfileDV();
|
||||
|
||||
|
|
@ -183,6 +185,8 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen
|
|||
LifecycleInformationDV liDV = ConvertToDataValueObjectModel.toLifecycleInformationDV(lifecycleInfo);
|
||||
return new CommitReport(theProject.getId(), liDV);
|
||||
|
||||
throw new Exception("Must be implemented!!!!");
|
||||
|
||||
} catch (Exception e) {
|
||||
LOG.error("Error on uploading files: ", e);
|
||||
throw new Exception(
|
||||
|
|
|
|||
Loading…
Reference in New Issue