diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index d05e26d..9be15b3 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,7 @@ - + + + @@ -43,7 +45,9 @@ - + + + @@ -87,7 +91,9 @@ - + + + @@ -131,7 +137,9 @@ - + + + @@ -184,7 +192,9 @@ uses - + + + @@ -228,7 +238,9 @@ - + + + @@ -272,7 +284,9 @@ - + + + @@ -316,7 +330,9 @@ - + + + diff --git a/CHANGELOG.md b/CHANGELOG.md index b6e882a..61dea21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/pom.xml b/pom.xml index 2c125dc..37f7751 100644 --- a/pom.xml +++ b/pom.xml @@ -170,7 +170,7 @@ org.gcube.application geoportal-client - [1.0.0, 2.0.0-SNAPSHOT) + [1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT) compile diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java index caf6562..0ea7c28 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/form/GeonaDataEntryMainForm.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/form/GeonaDataEntryMainForm.java index 01a0c42..cfd0985 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/form/GeonaDataEntryMainForm.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/form/GeonaDataEntryMainForm.java @@ -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); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/tree/TreeItemPanel.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/tree/TreeItemPanel.java index 56ac3c6..20493f7 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/tree/TreeItemPanel.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/tree/TreeItemPanel.java @@ -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) { diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/FormDataObjectToJSON.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/FormDataObjectToJSON.java index ab8a7e7..6beb2a9 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/FormDataObjectToJSON.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/FormDataObjectToJSON.java @@ -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"; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java index 61defb5..4dc20ed 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java @@ -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 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(