gCubeSystem
/
geoportal-data-entry-app
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: gCubeSystem:master
Branches Tags
gCubeSystem:master
gCubeSystem:monitor_status
gCubeSystem:feature_27120
gCubeSystem:bug_25265
gCubeSystem:task_24166
gCubeSystem:task_24567
gCubeSystem:fixes_24532
gCubeSystem:with_final_variables
gCubeSystem:task_24282
gCubeSystem:backup_master_concessioni
gCubeSystem:tree_structure_new_layout
gCubeSystem:tree_structure
gCubeSystem:feature_22684
gCubeSystem:feature_23390
gCubeSystem:feature_22286
gCubeSystem:task_21856
gCubeSystem:Feature_20435
gCubeSystem:task_20357
gCubeSystem:task_20210
gCubeSystem:task_20063
gCubeSystem:r5.16.1
gCubeSystem:v3.2.2
gCubeSystem:r5.15.4
gCubeSystem:v3.2.1
gCubeSystem:r5.15.3
gCubeSystem:v3.2.0
gCubeSystem:r5.15.0
gCubeSystem:v3.1.0
gCubeSystem:r5.14.4
gCubeSystem:v3.0.2
gCubeSystem:r5.14.2
gCubeSystem:v3.0.1
gCubeSystem:r5.14.0
gCubeSystem:v3.0.0
gCubeSystem:r5.13.0
gCubeSystem:v2.2.1
gCubeSystem:r5.12.0
gCubeSystem:v2.2.0
gCubeSystem:r5.7.0
gCubeSystem:v2.1.0
gCubeSystem:r5.5.0
gCubeSystem:v2.0.0
gCubeSystem:r4.28.0
gCubeSystem:v1.2.0
gCubeSystem:r4.27.0
gCubeSystem:v1.1.0
gCubeSystem:r4.26.0
gCubeSystem:v1.0.1
..
compare: gCubeSystem:with_final_variables
Branches Tags
gCubeSystem:master
gCubeSystem:monitor_status
gCubeSystem:feature_27120
gCubeSystem:bug_25265
gCubeSystem:task_24166
gCubeSystem:task_24567
gCubeSystem:fixes_24532
gCubeSystem:with_final_variables
gCubeSystem:task_24282
gCubeSystem:backup_master_concessioni
gCubeSystem:tree_structure_new_layout
gCubeSystem:tree_structure
gCubeSystem:feature_22684
gCubeSystem:feature_23390
gCubeSystem:feature_22286
gCubeSystem:task_21856
gCubeSystem:Feature_20435
gCubeSystem:task_20357
gCubeSystem:task_20210
gCubeSystem:task_20063
gCubeSystem:r5.16.1
gCubeSystem:v3.2.2
gCubeSystem:r5.15.4
gCubeSystem:v3.2.1
gCubeSystem:r5.15.3
gCubeSystem:v3.2.0
gCubeSystem:r5.15.0
gCubeSystem:v3.1.0
gCubeSystem:r5.14.4
gCubeSystem:v3.0.2
gCubeSystem:r5.14.2
gCubeSystem:v3.0.1
gCubeSystem:r5.14.0
gCubeSystem:v3.0.0
gCubeSystem:r5.13.0
gCubeSystem:v2.2.1
gCubeSystem:r5.12.0
gCubeSystem:v2.2.0
gCubeSystem:r5.7.0
gCubeSystem:v2.1.0
gCubeSystem:r5.5.0
gCubeSystem:v2.0.0
gCubeSystem:r4.28.0
gCubeSystem:v1.2.0
gCubeSystem:r4.27.0
gCubeSystem:v1.1.0
gCubeSystem:r4.26.0
gCubeSystem:v1.0.1

1 Commits
master ... with_final

Author SHA1 Message Date
Francesco Mangiacrapa 5ca842bfb4 finalized the variables for RPC calls 2023-01-30 10:44:19 +01:00
61 changed files with 1367 additions and 5732 deletions
Show Stats Expand all files Collapse all files

4
.classpath
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry including="**/*.java" kind="src" output="target/geoportal-data-entry-app-3.3.0/WEB-INF/classes" path="src/main/java">
<classpathentry including="**/*.java" kind="src" output="target/geoportal-data-entry-app-3.0.1/WEB-INF/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
@ -31,5 +31,5 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/geoportal-data-entry-app-3.3.0/WEB-INF/classes"/>
<classpathentry kind="output" path="target/geoportal-data-entry-app-3.0.1/WEB-INF/classes"/>
</classpath>

2
.settings/com.gwtplugins.gdt.eclipse.core.prefs
View File

@ -1,5 +1,5 @@
eclipse.preferences.version=1
jarsExcludedFromWebInfLib=
lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-entry-app/target/geoportal-data-entry-app-3.3.0
lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-entry-app/target/geoportal-data-entry-app-3.0.1
warSrcDir=src/main/webapp
warSrcDirIsOutput=false

890
.settings/org.eclipse.wst.common.component
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
@ -81,200 +81,8 @@
<wb-module deploy-name="geoportal-data-entry-app-3.3.0">
<wb-module deploy-name="geoportal-data-entry-app-3.0.1">
@ -357,103 +165,7 @@
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
@ -536,103 +248,7 @@
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
@ -715,103 +331,7 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
@ -846,109 +366,7 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<dependent-module archiveName="geoportal-client-1.2.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/geoportal-client/geoportal-client">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="geoportal-common-1.1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/geoportal-common/geoportal-common">
<dependency-type>uses</dependency-type>
</dependent-module>
@ -1031,103 +449,7 @@
<property name="context-root" value="geoportal-data-entry-app"/>
@ -1210,103 +532,7 @@
<property name="java-output-path" value="/geoportal-data-entry-app/target/geoportal-data-entry-app-2.0.0-SNAPSHOT/WEB-INF/classes"/>
@ -1389,103 +615,7 @@
</wb-module>

42
CHANGELOG.md
View File

@ -4,47 +4,6 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [v3.3.0] - 2024-10-15
- Implemented the init facility to resolve a public link on an item [#27120]
- Integrated new Uri-Resolver-Manager [#27160]
- Added Get Shareable Link facility [#27120]
- Added optional message when performing lifecycle step [#27192]
- Enforced deleteProject method/UX
- The save operation is now monitored asynchronously [#28268]
- Integrated in the report UI the link of project just saved
## [v3.2.2] - 2024-01-11
- Improved display of results on multiple fields (in the table) [#26372]
## [v3.2.1] - 2023-06-16
- Fixed issue in the Search facility [#25265]
## [v3.2.0] - 2023-05-12
- Implemented the Update facility [#24166]
- Integrated with the geoportal-data-mapper library [#24244]
- Integrated the Geoportal Data-Viewer Widget [#25015]
- Passed to Geoportal_Resolver service [#25031]
- Provided the "View Document" and "View As JSON" facilities
- DELETE relation operation allowed only in DRAFT phase [#25104]
## [v3.1.0] - 2023-03-06
#### Enhancements
- [#24569] The Edit operation is available only in the "DRAFT" phase
- [#24571] The "Create Relation" operation is available only in the "DRAFT" phase
## [v3.0.2] - 2023-02-02
#### Fixes
- [#24520] Added parameter "force=true" to Delete Project
- [#24475] Propagated the Access Policy in the fileset
## [v3.0.1] - 2023-01-19
#### Fixes
@ -69,7 +28,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- [#24136] Integrated the temporal dimension on the front-end side
- [#24458] Published projects cannot be edited/updated
## [v2.2.1] - 2022-06-29
#### Enhancements

42
README.md
View File

@ -1,6 +1,6 @@
# GeoPortal Data Entry App
Geoportal data-entry technology allows the actors who use it, the project management of spatio-temporal documents specified by meta-documents called "Use Case Descriptor" (UCD) which determine the document model, management, life cycle, etc. The system allows you to: (i) access and search for published projects by role for VRE, (ii) access the project publication report, view the publication status (SUCCESS, WARNING, ERROR), etc., (iii ) generate links for visualization on the map, (iv) update the contents of the registered projects through the workflow, (v) manage the relationships (quantity and quality temporal links) between the documents. In general, the technology allows the data entry of any document having spatio-temporal characteristics, whose metadata and payload are specified by one or more "gCube Profile" profiles which determine the structure of the resulting document (JSON).
The GeoPortal Data Entry App is an application to build the web forms for data entries needed to create projects/documents (based on UCD) in the D4Science Geoportal service
## Built With
@ -9,50 +9,14 @@ Geoportal data-entry technology allows the actors who use it, the project manage
**Uses**
* GWT v.2.10.0. [GWT](http://www.gwtproject.org) is licensed under [Apache License 2.0](http://www.gwtproject.org/terms.html)
* GWT v.2.9.0. [GWT](http://www.gwtproject.org) is licensed under [Apache License 2.0](http://www.gwtproject.org/terms.html)
* GWT-Bootstrap v.2.3.2.0. [GWT-Bootstrap](https://github.com/gwtbootstrap) is licensed under [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0)
* pretty-print-json v.1.1. [pretty-print-json](https://github.com/center-key/pretty-print-json) is licensed under [MIT](https://github.com/center-key/pretty-print-json/blob/main/LICENSE.txt)
* jsoneditor v.9.5.5. [jsoneditor](https://github.com/josdejong/jsoneditor) is licensed under [Apache License 2.0](https://github.com/josdejong/jsoneditor/blob/master/LICENSE)
## Architecture
<img src="https://gcube.wiki.gcube-system.org/images_gcube/8/8e/GeoPortalDataEntry_Architecture.png" style="max-width:800px;" alt="GeoPortal Data-Entry - Architecture" />
## Showcase
##### D4GNA instance of Geoportal D4Science
see at [Dataset per il Geoportale Nazionale per l’Archeologia (D4GNA)](https://gna.d4science.org/)
**New Project facility**
<img src="https://gcube.wiki.gcube-system.org/images_gcube/c/c0/D4GNA_New_Project.png" style="max-width:800px;" alt="Workspace Home" />
**List of Projects facility**
<img src="https://gcube.wiki.gcube-system.org/images_gcube/6/67/D4GNA_List_Of_Projects.png" style="max-width:800px;" alt="List of Projects" />
**UnPublish facility**
<img src="https://gcube.wiki.gcube-system.org/images_gcube/6/6a/D4GNA_Unpublish.png" style="max-width:800px;" alt="UnPublish" />
**View Relations facility**
<img src="https://gcube.wiki.gcube-system.org/images_gcube/7/76/D4GNA_ViewRelations.png" style="max-width:800px;" alt="View Relations" />
## Documentation
Geoportal Service Documentation is available at [gCube CMS Suite](https://geoportal.d4science.org/geoportal-service/docs/index.html)
User Guide (DRAFT ITA) is available at [Guida al Sistema D4GNA (DRAFT-ITA)](https://gcube.wiki.gcube-system.org/images_gcube/b/b7/D4science_Guida_al_Sistema_D4GNA_bozza.pdf)
D4GNA Use Case - 3 Phase Lifecycle
<img src="https://gcube.wiki.gcube-system.org/images_gcube/4/46/D4GNA_Workflow_Phases_and_Operations.png" style="max-width:800px;" alt="GeoPortal Data-Entry - Workflow & Phases & Operations" />
N/A
## Change log

80
pom.xml
View File

@ -7,14 +7,14 @@
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.gcube.tools</groupId>
<version>1.2.0</version>
<version>1.1.0</version>
<relativePath />
</parent>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>geoportal-data-entry-app</artifactId>
<packaging>war</packaging>
<version>3.3.0</version>
<version>3.0.1</version>
<name>GeoPortal Data Entry App</name>
<description>The GeoPortal Data Entry App is an application to build the web forms for data entries needed to create projects/documents (based on UCD) in the D4Science Geoportal service</description>
<scm>
@ -30,7 +30,6 @@
<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
@ -52,40 +51,13 @@
<dependency>
<groupId>org.gcube.distribution</groupId>
<artifactId>maven-portal-bom</artifactId>
<version>${gcube-portal-bom-version}</version>
<version>3.6.4</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<profiles>
<!-- PROD profile -->
<profile>
<id>geoportal-data-entry-app-release-profile</id>
<activation>
<property>
<name>Release</name>
</property>
</activation>
<properties>
<gcube-portal-bom-version>4.0.0</gcube-portal-bom-version>
</properties>
</profile>
<!-- DEV profile -->
<profile>
<id>geoportal-data-entry-app-snapshot-profile</id>
<activation>
<property>
<name>!Release</name>
</property>
</activation>
<properties>
<gcube-portal-bom-version>4.0.0-SNAPSHOT</gcube-portal-bom-version>
</properties>
</profile>
</profiles>
<dependencies>
<!-- needed to compile with gwt > 2.7 -->
@ -96,6 +68,22 @@
<scope>provided</scope>
</dependency>
<!-- needed to compile with gwt > 2.7 -->
<!-- <dependency> -->
<!-- <groupId>xml-apis</groupId> -->
<!-- <artifactId>xml-apis</artifactId> -->
<!-- <version>1.4.01</version> -->
<!-- <scope>provided</scope> -->
<!-- </dependency> -->
<!-- ASM required for GWT 2.9 -->
<!-- <dependency> -->
<!-- <groupId>org.ow2.asm</groupId> -->
<!-- <artifactId>asm</artifactId> -->
<!-- <scope>provided</scope> -->
<!-- <version>7.1</version> -->
<!-- </dependency> -->
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-servlet</artifactId>
@ -119,21 +107,6 @@
<artifactId>gwt-bootstrap</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.gcube.portlets.widgets</groupId>
<artifactId>geoportal-data-viewer-widget</artifactId>
<version>[1.0.1, 2.0.0-SNAPSHOT)</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.gcube.application</groupId>
<artifactId>geoportal-data-mapper</artifactId>
<version>[1.0.1, 2.0.0-SNAPSHOT)</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.gcube.portlets.widgets</groupId>
<artifactId>metadata-profile-form-builder-widget</artifactId>
@ -156,6 +129,12 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.gcube.portlets.widgets</groupId>
<artifactId>openlayer-basic-widgets</artifactId>
<version>[1.0.0, 2.0.0-SNAPSHOT)</version>
<scope>compile</scope>
</dependency>
<!-- FWS -->
<dependency>
<groupId>org.gcube.common</groupId>
@ -252,8 +231,6 @@
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
<!-- TESTS -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@ -266,13 +243,6 @@
<artifactId>guava</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.4</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>

12
src/main/java/org/gcube/portlets/user/geoportaldataentry/GeoPortalDataEntryApp.gwt.xml
View File

@ -12,19 +12,11 @@
<inherits name="com.google.gwt.json.JSON" />
<inherits
name='org.gcube.application.geoportalcommon.GeoportalDataCommon' />
<inherits
name='org.gcube.application.geoportaldatamapper.GeoportalDataMapper' />
<inherits
name='org.gcube.portlets.widgets.gdvw.geoportal_data_viewer_widget' />
<inherits
name='org.gcube.portlets.widgets.mpformbuilder.MetadataProfileFormBuilder' />
<inherits name='org.gcube.application.geoportalcommon.GeoportalDataCommon' />
<!-- <inherits name='com.google.gwt.user.theme.chrome.Chrome'/> -->
<!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/> -->

29
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ConstantsGeoPortalDataEntryApp.java
View File

@ -3,7 +3,6 @@ package org.gcube.portlets.user.geoportaldataentry.client;
import java.util.Arrays;
import java.util.List;
import org.gcube.application.geoportalcommon.shared.geoportal.WORKFLOW_PHASE;
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;
@ -25,12 +24,6 @@ public class ConstantsGeoPortalDataEntryApp {
public static final String DIV_PORTLET_ID = "geoportal-data-entry";
public static final String DIV_LOADERS_ID = "geoportal-loaders";
public static final String GET_PARAMETER_ITEM_TYPE = "git";
public static final String GET_PARAMETER_ITEM_ID = "gid";
public static final String GET_PARAMETER_ACTION = "act";
public static final String DATE_FORMAT = ConstantsMPFormBuilder.DATE_FORMAT;
@ -51,28 +44,10 @@ public class ConstantsGeoPortalDataEntryApp {
public static final RootPanel ROOT_PANEL_DIV_PORTLET = RootPanel.get(ConstantsGeoPortalDataEntryApp.DIV_PORTLET_ID);
public static final String CSS_CLASS_GEOPORTAL_LOADERS_CENTER = "geoportal-loaders-center";
public static final String WORKFLOW_ACTION_POST_CREATION_ACTION_ID = "post_creation_action";
public static final DateTimeFormat DATE_TIME_FORMAT = DateTimeFormat.getFormat("dd MMMM yyyy");
public static final String SHOW_ON_MAP_NOT_AVAILABLE_IN_DRAFT = "The 'Show on Map' facility is not available in DRAFT phase";
public static final String ALERT_MESSAGE_PROJECT_NOT_EDITABLE = "A Project can only be updated in "
+ WORKFLOW_PHASE.DRAFT.name()
+ " phase. You need to perform the step 'Reject' or 'UnPublish' to take back the project in "
+ WORKFLOW_PHASE.DRAFT.name() + " phase.";
public static final String ALERT_MESSAGE_CREATE_RELATION_FORBIDDEN = "The Create Relation operation can be performed only in "
+ WORKFLOW_PHASE.DRAFT.name()
+ " phase. You need to perform the step 'Reject' or 'UnPublish' to take back the project in "
+ WORKFLOW_PHASE.DRAFT.name() + " phase.";
public static final String ALERT_MESSAGE_DELETE_RELATION_FORBIDDEN = "The Delete Relation operation can be performed only in "
+ WORKFLOW_PHASE.DRAFT.name()
+ " phase. You need to perform the step 'Reject' or 'UnPublish' to take back the project in "
+ WORKFLOW_PHASE.DRAFT.name() + " phase.";
/**
* The Enum ACTION_PERFORMED_ON_ITEM.

2
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalClientCaches.java
View File

@ -28,6 +28,8 @@ public class GeoPortalClientCaches {
private TreeMap<String, List<GeoNaFormCardModel>> mapGcubeProfilePerItemType;
//private Map<String, List<HandlerDeclarationDV>> mapHandlersConfigurationsForProfileId;
private Map<String, UseCaseDescriptorDV> mapUseCaseDescriptor;
private Map<String, CacheSearchingFilterParametersFromConfig> mapSearchingFilterParametersForProfileId;

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

File diff suppressed because it is too large Load Diff

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

@ -3,26 +3,20 @@ package org.gcube.portlets.user.geoportaldataentry.client;
import java.util.List;
import org.gcube.application.geoportalcommon.shared.GeoportalItemReferences;
import org.gcube.application.geoportalcommon.shared.GeoportalItemReferences.SHARE_LINK_TO;
import org.gcube.application.geoportalcommon.shared.ResultSetPaginatedData;
import org.gcube.application.geoportalcommon.shared.SearchingFilter;
import org.gcube.application.geoportalcommon.shared.geoportal.ResultDocumentDV;
import org.gcube.application.geoportalcommon.shared.geoportal.config.ActionDefinitionDV;
import org.gcube.application.geoportalcommon.shared.geoportal.config.FilePathDV;
import org.gcube.application.geoportalcommon.shared.geoportal.project.LifecycleInformationDV;
import org.gcube.application.geoportalcommon.shared.geoportal.project.ProjectDV;
import org.gcube.application.geoportalcommon.shared.geoportal.project.TemporalReferenceDV;
import org.gcube.application.geoportalcommon.shared.geoportal.step.StepPerformedResultDV;
import org.gcube.application.geoportalcommon.shared.geoportal.ucd.RelationshipDefinitionDV;
import org.gcube.application.geoportalcommon.shared.geoportal.ucd.UseCaseDescriptorDV;
import org.gcube.application.geoportalcommon.shared.geoportal.view.ProjectView;
import org.gcube.application.geoportaldatamapper.shared.ProjectEdit;
import org.gcube.portlets.user.geoportaldataentry.shared.CommitReport;
import org.gcube.portlets.user.geoportaldataentry.shared.GNADataEntryExtendedConfigProfile;
import org.gcube.portlets.user.geoportaldataentry.shared.GeoNaFormDataObject;
import org.gcube.portlets.user.geoportaldataentry.shared.GeoportalISConfig;
import org.gcube.portlets.user.geoportaldataentry.shared.Tree_Node;
import org.gcube.portlets.user.geoportaldataentry.shared.monitoring.MonitoringActionsOnClient;
import com.google.gwt.user.client.rpc.RemoteService;
import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
@ -37,17 +31,7 @@ import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
@RemoteServiceRelativePath("geoportaldataentryservice")
public interface GeoportalDataEntryService extends RemoteService {
/**
* Save geona data forms.
*
* @param uuid the uuid
* @param profileID the profile ID
* @param tree_Node the tree node
* @param stepsOnPostCreation the steps on post creation
* @return the commit report
* @throws Exception the exception
*/
void saveGeonaDataForms(String uuid, String profileID, Tree_Node<GeoNaFormDataObject> tree_Node,
CommitReport saveGeonaDataForms(String profileID, Tree_Node<GeoNaFormDataObject> tree_Node,
List<String> stepsOnPostCreation) throws Exception;
/**
@ -60,13 +44,12 @@ public interface GeoportalDataEntryService extends RemoteService {
/**
* Gets the links for.
*
* @param itemId the item id is the mongoId
* @param itemId the item id
* @param profileID the profile ID
* @param shareLinkTo the share link to
* @return the links for
* @throws Exception the exception
*/
GeoportalItemReferences getLinksFor(String itemId, String profileID, SHARE_LINK_TO shareLinkTo) throws Exception;
GeoportalItemReferences getLinksFor(String itemId, String profileID) throws Exception;
/**
* Gets the list projects.
@ -109,7 +92,7 @@ public interface GeoportalDataEntryService extends RemoteService {
* @return the GNA data entry ext config profile
* @throws Exception the exception
*/
GNADataEntryExtendedConfigProfile readDataEntryPresentationConfig() throws Exception;
GNADataEntryExtendedConfigProfile readDataViewerConfig() throws Exception;
/**
* Gets the list use case descriptors.
@ -145,12 +128,11 @@ public interface GeoportalDataEntryService extends RemoteService {
*
* @param profileID the profile ID
* @param projectID the project ID
* @param optionalMessage the optional message
* @param action the action
* @param action the action
* @return the project DV
* @throws Exception the exception
*/
StepPerformedResultDV performActionSteps(String profileID, String projectID, String optionalMessage, ActionDefinitionDV action) throws Exception;
ProjectDV performActionSteps(String profileID, String projectID, ActionDefinitionDV action) throws Exception;
/**
* Gets the relationships definition.
@ -202,7 +184,7 @@ public interface GeoportalDataEntryService extends RemoteService {
* @param id the id
* @param toProfileID the to profile ID
* @param toProjectID the to project ID
* @return the result document DV
* @return
* @throws Exception the exception
*/
ResultDocumentDV deleteRelationship(String fromProfileID, String fromProjectID, String id, String toProfileID,
@ -217,50 +199,4 @@ public interface GeoportalDataEntryService extends RemoteService {
*/
TemporalReferenceDV temporalReferenceForProject(String profileID, String projectID);
/**
* Gets the project edit.
*
* @param profileID the profile ID
* @param projectID the project ID
* @return the project edit
* @throws Exception the exception
*/
ProjectEdit getProjectEdit(String profileID, String projectID) throws Exception;
/**
* Update geportal data form.
*
* @param profileID the profile ID
* @param projectID the project ID
* @param section the section
* @param sectionPath the section path
* @param listFilePaths the list file paths
* @return the commit report
* @throws Exception the exception
*/
CommitReport updateGeportalDataForm(String profileID, String projectID, GeoNaFormDataObject section,
String sectionPath, List<FilePathDV> listFilePaths) throws Exception;
/**
* Gets the project view.
*
* @param profileID the profile ID
* @param projectID the project ID
* @return the project view
* @throws Exception the exception
*/
ProjectView getProjectView(String profileID, String projectID) throws Exception;
/**
* Gets the saving project monitor status.
*
* @param monitorUUID the monitor UUID
* @param isMonitoringTerminatedClientConsumed the is monitoring terminated client consumed
* @return the saving project monitor status
* @throws Exception the exception
*/
MonitoringActionsOnClient getSavingProjectMonitorStatus(String monitorUUID,
boolean isMonitoringTerminatedClientConsumed) throws Exception;
}

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

@ -3,26 +3,20 @@ package org.gcube.portlets.user.geoportaldataentry.client;
import java.util.List;
import org.gcube.application.geoportalcommon.shared.GeoportalItemReferences;
import org.gcube.application.geoportalcommon.shared.GeoportalItemReferences.SHARE_LINK_TO;
import org.gcube.application.geoportalcommon.shared.ResultSetPaginatedData;
import org.gcube.application.geoportalcommon.shared.SearchingFilter;
import org.gcube.application.geoportalcommon.shared.geoportal.ResultDocumentDV;
import org.gcube.application.geoportalcommon.shared.geoportal.config.ActionDefinitionDV;
import org.gcube.application.geoportalcommon.shared.geoportal.config.FilePathDV;
import org.gcube.application.geoportalcommon.shared.geoportal.project.LifecycleInformationDV;
import org.gcube.application.geoportalcommon.shared.geoportal.project.ProjectDV;
import org.gcube.application.geoportalcommon.shared.geoportal.project.TemporalReferenceDV;
import org.gcube.application.geoportalcommon.shared.geoportal.step.StepPerformedResultDV;
import org.gcube.application.geoportalcommon.shared.geoportal.ucd.RelationshipDefinitionDV;
import org.gcube.application.geoportalcommon.shared.geoportal.ucd.UseCaseDescriptorDV;
import org.gcube.application.geoportalcommon.shared.geoportal.view.ProjectView;
import org.gcube.application.geoportaldatamapper.shared.ProjectEdit;
import org.gcube.portlets.user.geoportaldataentry.shared.CommitReport;
import org.gcube.portlets.user.geoportaldataentry.shared.GNADataEntryExtendedConfigProfile;
import org.gcube.portlets.user.geoportaldataentry.shared.GeoNaFormDataObject;
import org.gcube.portlets.user.geoportaldataentry.shared.GeoportalISConfig;
import org.gcube.portlets.user.geoportaldataentry.shared.Tree_Node;
import org.gcube.portlets.user.geoportaldataentry.shared.monitoring.MonitoringActionsOnClient;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.rpc.AsyncCallback;
@ -54,16 +48,12 @@ public interface GeoportalDataEntryServiceAsync {
}
}
void saveGeonaDataForms(String uuid, String profileID, Tree_Node<GeoNaFormDataObject> tree_Node,
List<String> stepsOnPostCreation, AsyncCallback<Void> callback);
void updateGeportalDataForm(String profileID, String projectID, GeoNaFormDataObject section,
String sectionPath, List<FilePathDV> listFilePaths, AsyncCallback<CommitReport> callback);
void saveGeonaDataForms(String profileID, Tree_Node<GeoNaFormDataObject> tree_Node,
List<String> stepsOnPostCreation, AsyncCallback<CommitReport> callback);
void getGeonaInitConfig(AsyncCallback<GeoportalISConfig> callback);
void getLinksFor(String itemId, String profileID, SHARE_LINK_TO shareLinkTo,
AsyncCallback<GeoportalItemReferences> callback);
void getLinksFor(String itemId, String profileID, AsyncCallback<GeoportalItemReferences> callback);
void getListProjects(String theProfileID, Integer start, Integer limit, SearchingFilter filter,
boolean reloadFromService, AsyncCallback<ResultSetPaginatedData> callback);
@ -74,15 +64,15 @@ public interface GeoportalDataEntryServiceAsync {
void updateRecord(String profileID, String projectID, String jsonUpdate, AsyncCallback<ProjectDV> callback);
void readDataEntryPresentationConfig(AsyncCallback<GNADataEntryExtendedConfigProfile> asyncCallback);
void readDataViewerConfig(AsyncCallback<GNADataEntryExtendedConfigProfile> asyncCallback);
void getListUseCaseDescriptors(List<String> handlersIds, AsyncCallback<List<UseCaseDescriptorDV>> callback);
void getLifecycleInfoForProjectId(String profileID, String projectID,
AsyncCallback<LifecycleInformationDV> callback);
void performActionSteps(String profileID, String projectID, String optionalMessage, ActionDefinitionDV action,
AsyncCallback<StepPerformedResultDV> callback);
void performActionSteps(String profileID, String projectID, ActionDefinitionDV action,
AsyncCallback<ProjectDV> callback);
void getRelationshipsDefinition(String profileID, AsyncCallback<List<RelationshipDefinitionDV>> callback);
@ -98,11 +88,4 @@ public interface GeoportalDataEntryServiceAsync {
void temporalReferenceForProject(String profileID, String projectID, AsyncCallback<TemporalReferenceDV> callback);
void getProjectEdit(String profileID, String projectID, AsyncCallback<ProjectEdit> callback);
void getProjectView(String profileID, String projectID, AsyncCallback<ProjectView> callback);
void getSavingProjectMonitorStatus(String monitorUUID, boolean isMonitoringTerminatedClientConsumed,
AsyncCallback<MonitoringActionsOnClient> callback);
}

43
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/InitExecutor.java
View File

@ -1,43 +0,0 @@
package org.gcube.portlets.user.geoportaldataentry.client;
import java.util.LinkedHashMap;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.Window;
public class InitExecutor {
private LinkedHashMap<Integer, Command> queueInitStage = new LinkedHashMap<>();
public InitExecutor() {
}
public synchronized void putCommand(Command command) throws InterruptedException {
queueInitStage.put(queueInitStage.size(), command);
}
private synchronized Command pollCommand() throws InterruptedException {
for (Integer key : queueInitStage.keySet()) {
Command command = queueInitStage.get(key);
if(command!=null) {
queueInitStage.put(key, null);
return command;
}
}
return null;
}
protected void execute() {
try {
Command command = pollCommand();
if (command != null)
command.execute();
} catch (InterruptedException e) {
Window.alert("An error occurred while initializing the application. Please contact the support. Error is: "
+ e.getMessage());
}
}
}

21
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/events/GetListOfRecordsEvent.java
View File

@ -15,7 +15,7 @@ public class GetListOfRecordsEvent extends GwtEvent<GetListOfRecordsEventHandler
/** The type. */
public static Type<GetListOfRecordsEventHandler> TYPE = new Type<GetListOfRecordsEventHandler>();
private SearchingFilter searchingFilter;
private SearchingFilter sortFilter;
private String profileID;
private String projectName;
private Boolean reloadFilteringParameters = false;
@ -26,13 +26,13 @@ public class GetListOfRecordsEvent extends GwtEvent<GetListOfRecordsEventHandler
*
* @param onApplicationInit the on application init
* @param profileID the profile ID
* @param searchingFilter the searching filter
* @param sortFilter the sort filter
* @param reloadFilteringParameters the reload filtering parameters
*/
public GetListOfRecordsEvent(boolean onApplicationInit, String profileID, SearchingFilter searchingFilter,
public GetListOfRecordsEvent(boolean onApplicationInit, String profileID, SearchingFilter sortFilter,
Boolean reloadFilteringParameters) {
this.onApplicationInit = onApplicationInit;
this.searchingFilter = searchingFilter;
this.sortFilter = sortFilter;
this.profileID = profileID;
this.reloadFilteringParameters = reloadFilteringParameters;
}
@ -75,7 +75,7 @@ public class GetListOfRecordsEvent extends GwtEvent<GetListOfRecordsEventHandler
* @return the searching filter
*/
public SearchingFilter getSearchingFilter() {
return searchingFilter;
return sortFilter;
}
/**
@ -105,19 +105,22 @@ public class GetListOfRecordsEvent extends GwtEvent<GetListOfRecordsEventHandler
return reloadFilteringParameters;
}
/**
* To string.
*
* @return the string
*/
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append("GetListOfRecordsEvent [searchingFilter=");
builder.append(searchingFilter);
builder.append("GetListOfRecordsEvent [sortFilter=");
builder.append(sortFilter);
builder.append(", profileID=");
builder.append(profileID);
builder.append(", projectName=");
builder.append(projectName);
builder.append(", reloadFilteringParameters=");
builder.append(reloadFilteringParameters);
builder.append(", onApplicationInit=");
builder.append(onApplicationInit);
builder.append("]");
return builder.toString();
}

5
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/events/OperationOnItemEvent.java
View File

@ -21,7 +21,6 @@ public class OperationOnItemEvent<T extends DocumentDV> extends GwtEvent<Operati
private List<T> selectItems;
private OPERATION_ON_ITEM action;
private Element sourceElement;
private String ucdName;
/**
* Instantiates a new action on item event.
@ -66,10 +65,6 @@ public class OperationOnItemEvent<T extends DocumentDV> extends GwtEvent<Operati
protected void dispatch(OperationOnItemEventHandler handler) {
handler.onDoActionFired(this);
}
public String getUcdName() {
return ucdName;
}
/**
* Gets the select items.

6
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/resource/Images.java
View File

@ -16,10 +16,4 @@ public interface Images extends ClientBundle {
@Source("one-finger-icon.png")
ImageResource oneFingerIcon();
@Source("information_icon.png")
ImageResource info();
@Source("warning_error.png")
ImageResource warningError();
}

BIN
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/resource/information_icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 22 KiB

BIN
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/resource/warning_error.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.7 KiB

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

@ -98,17 +98,8 @@ public class GeonaMainTabPanel extends Composite {
@UiField
Tab tabGetListOfProjects;
@UiField
NavLink navViewAsDocument;
@UiField
NavLink navViewAsJSON;
@UiField
NavLink navShowOnMap;
@UiField
NavLink navShareLink;
@UiField
NavLink navShowReport;
@ -252,51 +243,6 @@ public class GeonaMainTabPanel extends Composite {
}
});
navShareLink.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
List<DocumentDV> listDocuments = null;
if (grpw != null && grpw.getSelectItems() != null) {
listDocuments = grpw.getSelectItems();
}
appManagerBus
.fireEvent(new OperationOnItemEvent<DocumentDV>(listDocuments, OPERATION_ON_ITEM.GET_SHAREABLE_LINK));
}
});
navViewAsDocument.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
List<DocumentDV> listDocuments = null;
if (grpw != null && grpw.getSelectItems() != null) {
listDocuments = grpw.getSelectItems();
}
appManagerBus.fireEvent(new OperationOnItemEvent<DocumentDV>(listDocuments,
OPERATION_ON_ITEM.VIEW_PROJECT_AS_DOCUMENT));
}
});
navViewAsJSON.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
List<DocumentDV> listDocuments = null;
if (grpw != null && grpw.getSelectItems() != null) {
listDocuments = grpw.getSelectItems();
}
appManagerBus.fireEvent(
new OperationOnItemEvent<DocumentDV>(listDocuments, OPERATION_ON_ITEM.VIEW_PROJECT_AS_JSON));
}
});
navShowReport.addClickHandler(new ClickHandler() {
@ -450,7 +396,6 @@ public class GeonaMainTabPanel extends Composite {
tabPanel.selectTab(index);
}
/**
* Dirty solution. I created this one because I had problem on firing click
* event for Tab element
@ -466,7 +411,7 @@ public class GeonaMainTabPanel extends Composite {
*
* @param listUCDescriptors the list UC descriptors
*/
public void initMainAccordingToListUseCaseDescriptors(List<UseCaseDescriptorDV> listUCDescriptors) {
public void initMainAccordingToListUseCaseDescriptors(final List<UseCaseDescriptorDV> listUCDescriptors) {
GWT.log("initMainAccordingToListUseCaseDescriptors: " + listUCDescriptors);
// this.listUCDescriptors = listUCDescriptors;
ddCreateNewProject.clear();
@ -476,11 +421,11 @@ public class GeonaMainTabPanel extends Composite {
for (final UseCaseDescriptorDV ucd : listUCDescriptors) {
HandlerDeclarationDV dataEntryHandler = UCD_Util.getHandlerDeclarationFor(ucd,
final HandlerDeclarationDV dataEntryHandler = UCD_Util.getHandlerDeclarationFor(ucd,
GEOPORTAL_DATA_HANDLER.geoportal_data_entry);
if (dataEntryHandler != null) {
ConfigurationDV<?> config = dataEntryHandler.getConfiguration();
final ConfigurationDV<?> config = dataEntryHandler.getConfiguration();
List<GcubeProfileDV> listGcubeProfiles = toListGcubeProfiles(config);
final List<GcubeProfileDV> listProfiles = listGcubeProfiles;
@ -511,7 +456,21 @@ public class GeonaMainTabPanel extends Composite {
GEOPORTAL_DATA_HANDLER.geoportal_data_list);
if (dataListHandler != null) {
// NavLink link = new NavLink(ucd.getName());
// link.addClickHandler(new ClickHandler() {
//
// @Override
// public void onClick(ClickEvent event) {
//
// appManagerBus.fireEvent(new GetListOfRecordsEvent(false, ucd.getProfileID(),
// getCurrentProjectsSearchingFilter(), true));
// }
// });
ucdProjectTypesForListingDataView.add(ucd);
// listOfProjectTablePanel.addProjectType(link);
listOfProjectTablePanel.addProjectType(ucd);
}
@ -528,7 +487,7 @@ public class GeonaMainTabPanel extends Composite {
@Override
public void execute() {
GWT.log("One Config loaded. Firing CreateNewProjectEvent");
UseCaseDescriptorDV useCaseDescriptor = listUCDescriptors.get(0);
final UseCaseDescriptorDV useCaseDescriptor = listUCDescriptors.get(0);
HandlerDeclarationDV dataEntryHandler = UCD_Util.getHandlerDeclarationFor(useCaseDescriptor,
GEOPORTAL_DATA_HANDLER.geoportal_data_entry);
if (dataEntryHandler != null) {
@ -713,13 +672,5 @@ public class GeonaMainTabPanel extends Composite {
grpw.removeColumn(DEFAULT_DISPLAYING_COLUMN_NAME.RELATIONSHIPS);
}
}
public ListOfProjectTablePanel getListOfProjectTablePanel() {
return listOfProjectTablePanel;
}
public List<UseCaseDescriptorDV> getUcdProjectTypesForListingDataView() {
return ucdProjectTypesForListingDataView;
}
}

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

@ -74,8 +74,7 @@
<g:HTMLPanel ui:field="introGNA">
<b:Hero ui:field="introGNAHero">
<b:Heading size="2" ui:field="welcomeTitle">Welcome
to GeoPortal 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>
@ -100,20 +99,12 @@
<g:FlowPanel>
<g:FlowPanel addStyleNames="move-sticky">
<b:NavPills>
<b:NavLink ui:field="navViewAsDocument"
title="View Document" icon="FILE">View Document</b:NavLink>
<b:NavLink ui:field="navViewAsJSON"
title="View Document as JSON" icon="CODE">View as JSON</b:NavLink>
<b:Divider addStyleNames="{style.divider-border-right}" />
<b:NavLink ui:field="navShowOnMap" title="Show on Map"
icon="MAP_MARKER">Show on Map</b:NavLink>
<b:NavLink ui:field="navShareLink" title="Get Shareable Link"
icon="SHARE">Get Shareable link</b:NavLink>
<b:Divider addStyleNames="{style.divider-border-right}" />
<b:NavLink ui:field="navShowReport"
title="Show Publication Report" icon="FILE_TEXT_ALT">Publication Report</b:NavLink>
<b:NavLink ui:field="navEditMode" title="Edit"
icon="PENCIL">Update</b:NavLink>
icon="PENCIL">Edit</b:NavLink>
<b:NavLink ui:field="navDelete" title="Delete Project"
icon="TRASH">Delete Project</b:NavLink>
<b:Divider addStyleNames="{style.divider-border-right}" />

65
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaRecordsPaginatedView.java
View File

@ -50,6 +50,7 @@ public class GeonaRecordsPaginatedView {
private MyCustomDataProvider<DocumentDV> dataProvider = new MyCustomDataProvider<DocumentDV>();
protected Widget orginalLoadingIndicator = null;
private LoaderIcon loadingPanel = new LoaderIcon("Loading data...");
// private int serverStartIndex;
private HandlerManager eventBus;
private SearchingFilter currentSearchingFilter;
private String profileID;
@ -73,6 +74,7 @@ public class GeonaRecordsPaginatedView {
orginalLoadingIndicator = itemsTable.getCellTable().getLoadingIndicator();
initPagination(ITEMS_PER_PAGE);
// loadNewPage(ITEM_START_INDEX, ITEMS_PER_PAGE, false);
loadItemsForType(profileID);
}
@ -115,27 +117,31 @@ public class GeonaRecordsPaginatedView {
/**
* Load new page.
*
* @param profileID the profile ID
* @param startIdx the start idx
* @param limit the limit
* @param resetStore the reset store
* @param currentSearchFilter the current search filter
* @param invalidCache the invalid cache
* @param profileID the profile ID
* @param startIdx the start idx
* @param limit the limit
* @param resetStore the reset store
* @param currentSortFilter the current sort filter
* @param invalidCache the invalid cache
*/
private void loadNewPage(String profileID, final int startIdx, final int limit, final boolean resetStore,
final SearchingFilter currentSearchFilter, final boolean invalidCache) {
final SearchingFilter currentSortFilter, final boolean invalidCache) {
// initFirstRangeChanged = resetStore;
GWT.log("loadNewPage with parameters [startIdx: " + startIdx + ", limit: " + limit + ", resetStore:"
+ resetStore + "]");
// showLoading(true);
int newStartIndex = startIdx;
if (resetStore) {
GWT.log("Cleaning all data...");
newStartIndex = 0;
// serverStartIndex = 0;
GWT.log("Store reset performed start index is: " + newStartIndex);
getTableDataProvider().updateRowCount(ITEMS_PER_PAGE, false);
}
loadProjects(profileID, newStartIndex, limit, currentSearchFilter, invalidCache);
loadProjects(profileID, newStartIndex, limit, currentSortFilter, invalidCache);
}
/**
@ -188,16 +194,6 @@ public class GeonaRecordsPaginatedView {
}
// initFirstRangeChanged = false;
//printData((List<DocumentDV>) result.getData());
}
private void printData(List<DocumentDV> data) {
GWT.log("printData");
int i = 0;
for (DocumentDV documentDV : data) {
GWT.log(++i + ") json: " + documentDV.getDocumentAsJSON());
}
}
/**
@ -225,17 +221,17 @@ public class GeonaRecordsPaginatedView {
* @param theProfileID the the profile ID
* @param newStartIndex the new start index
* @param limit the limit
* @param searchFilter the search filter
* @param sortFilter the sort filter
* @param invalidCache the invalid cache
*/
private <T> void loadProjects(String theProfileID, int newStartIndex, int limit, SearchingFilter searchFilter,
private <T> void loadProjects(String theProfileID, int newStartIndex, int limit, SearchingFilter sortFilter,
boolean invalidCache) {
showLoading(true);
GWT.log("calling loadItemsForStatus with parameters [theProfileID: " + theProfileID + ", startIndex: "
+ newStartIndex + ", limit: " + limit + ", searchFilter: " + searchFilter + "]");
GeoPortalDataEntryApp.geoportalDataEntryService.getListProjects(theProfileID, newStartIndex, limit,
searchFilter, invalidCache, new AsyncCallback<ResultSetPaginatedData>() {
+ newStartIndex + ", limit: " + limit + ", sortFilter: " + sortFilter + "]");
GeoPortalDataEntryApp.geoportalDataEntryService.getListProjects(theProfileID, newStartIndex, limit, sortFilter,
invalidCache, new AsyncCallback<ResultSetPaginatedData>() {
@Override
public void onFailure(Throwable caught) {
@ -269,16 +265,11 @@ public class GeonaRecordsPaginatedView {
itemsTable.getSelectionModel().setSelected(item, select);
}
}
/**
* Removes the column.
*
* @param columnName the column name
*/
public void removeColumn(DEFAULT_DISPLAYING_COLUMN_NAME columnName) {
try {
itemsTable.removeColumn(columnName);
} catch (Exception e) {
}catch (Exception e) {
// TODO: handle exception
}
}
@ -292,6 +283,9 @@ public class GeonaRecordsPaginatedView {
return itemsTable.getSelectedItems();
}
// int latestRangeStart = -1;
// int latestRangeLenght = -1;
/**
* A custom {@link AsyncDataProvider}.
*
@ -316,6 +310,15 @@ public class GeonaRecordsPaginatedView {
int start = range.getStart();
int length = range.getLength();
// if(latestRangeStart!=start || latestRangeLenght!=length) {
// GWT.log("ranges really changed");
// latestRangeStart = start;
// latestRangeLenght = length;
// }else {
// GWT.log("ranges DO NOT changed");
// return;
// }
if (initClassFirstRangeChanged) {
GWT.log("initClassFirstRangeChanged is true.. returning");
initClassFirstRangeChanged = false;
@ -323,6 +326,8 @@ public class GeonaRecordsPaginatedView {
}
GWT.log("Range changed: " + start + " " + length + " visible count: " + display.getVisibleItemCount());
loadNewPage(profileID, start, length, false, currentSearchingFilter, false);
// eventBus.fireEvent(new TableRangeViewChangedEvent<T>(start, length));
}
}

18
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/ActionListPanel.java
View File

@ -33,6 +33,12 @@ public class ActionListPanel extends Composite {
interface ActionListPanelUiBinder extends UiBinder<Widget, ActionListPanel> {
}
@UiField
HTMLPanel actionListContainer;
@UiField
HTMLPanel actionListBasePanel;
private String projectName;
private String profileID;
private List<ActionDefinitionDV> listActionDefinition;
@ -50,15 +56,9 @@ public class ActionListPanel extends Composite {
actionListBasePanel.setVisible(false);
}
@UiField
HTMLPanel actionListContainer;
@UiField
HTMLPanel actionListBasePanel;
private Map<String, List<ActionDefButton>> mapPhaseListButtons;
private void initActions(List<ActionDefinitionDV> listActionDef) {
private void initActions(final List<ActionDefinitionDV> listActionDef) {
if (listActionDef.size() > 0) {
// actionListBasePanel.setVisible(true);
@ -68,7 +68,7 @@ public class ActionListPanel extends Composite {
mapPhaseListButtons = new LinkedHashMap<String, List<ActionDefButton>>();
for (ActionDefinitionDV actionDefinitionDV : listActionDef) {
for (final ActionDefinitionDV actionDefinitionDV : listActionDef) {
// skipping the special workflow action
if (actionDefinitionDV.getId()
@ -79,7 +79,7 @@ public class ActionListPanel extends Composite {
Button butt = new Button();
butt.setText(actionDefinitionDV.getTitle());
butt.setTitle(actionDefinitionDV.getDescription());
butt.setType(ButtonType.INFO);
butt.setType(ButtonType.LINK);
butt.addClickHandler(new ClickHandler() {
@Override

60
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/DeleteViewPanel.java
View File

@ -1,60 +0,0 @@
package org.gcube.portlets.user.geoportaldataentry.client.ui.action;
import org.gcube.application.geoportalcommon.shared.geoportal.ResultDocumentDV;
import org.gcube.portlets.user.geoportaldataentry.client.ui.report.ReportTemplateToHTML;
import com.github.gwtbootstrap.client.ui.AccordionGroup;
import com.google.gwt.core.client.GWT;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.Widget;
public class DeleteViewPanel extends Composite {
private static DeleteViewPanelUiBinder uiBinder = GWT.create(DeleteViewPanelUiBinder.class);
interface DeleteViewPanelUiBinder extends UiBinder<Widget, DeleteViewPanel> {
}
@UiField
FlowPanel principalPanel;
@UiField
AccordionGroup accordionProjectDetails;
@UiField
FlowPanel confirmProceedPanel;
private ResultDocumentDV resultDocumentDV;
public DeleteViewPanel(ResultDocumentDV resultDocumentDV) {
initWidget(uiBinder.createAndBindUi(this));
this.resultDocumentDV = resultDocumentDV;
builtUI();
}
private void builtUI() {
String htmlMsg = "<p style='font-size: 18px'>Going to permanently delete the:</p>";
// TODO Auto-generated method stub
principalPanel.add(new HTML(htmlMsg));
ReportTemplateToHTML rt = new ReportTemplateToHTML("Project", resultDocumentDV.getDocumentAsJSON(), false);
rt.showAsJSON(false);
principalPanel.add(rt);
String projectDetails = "<ul>";
projectDetails += "<li>id: " + resultDocumentDV.getId() + "</li>";
projectDetails += "<li>profile: " + resultDocumentDV.getProfileID() + "</li>";
projectDetails += "<li>" + resultDocumentDV.getFirstEntryOfMap().getKey() + ": "
+ resultDocumentDV.getFirstEntryOfMap().getValue() + "</li>";
projectDetails += "</ul>";
accordionProjectDetails.add(new HTML(projectDetails));
String confirmMessage = "<b>This operation cannot be undone. Would you like to proceed?</b>";
confirmProceedPanel.add(new HTML(confirmMessage));
}
}

33
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/DeleteViewPanel.ui.xml
View File

@ -1,33 +0,0 @@
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
xmlns:g="urn:import:com.google.gwt.user.client.ui"
xmlns:b="urn:import:com.github.gwtbootstrap.client.ui">
<ui:style>
.important {
font-weight: bold;
}
.accordion-no-border {
border: 0px !important;
}
.text-are-size {
width: 80%;
height: 50px;
}
</ui:style>
<g:HTMLPanel>
<g:FlowPanel ui:field="principalPanel">
</g:FlowPanel>
<g:HTMLPanel>
<b:Accordion>
<b:AccordionGroup icon="GEAR"
heading="Project details" ui:field="accordionProjectDetails"
addStyleNames="{style.accordion-no-border}">
</b:AccordionGroup>
</b:Accordion>
</g:HTMLPanel>
<g:FlowPanel ui:field="confirmProceedPanel">
</g:FlowPanel>
</g:HTMLPanel>
</ui:UiBinder>

72
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/StepViewPanel.java
View File

@ -1,72 +0,0 @@
package org.gcube.portlets.user.geoportaldataentry.client.ui.action;
import org.gcube.application.geoportalcommon.shared.geoportal.ResultDocumentDV;
import org.gcube.application.geoportalcommon.shared.geoportal.config.ActionDefinitionDV;
import org.gcube.portlets.user.geoportaldataentry.client.ui.report.ReportTemplateToHTML;
import com.github.gwtbootstrap.client.ui.AccordionGroup;
import com.github.gwtbootstrap.client.ui.TextArea;
import com.google.gwt.core.client.GWT;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.Widget;
public class StepViewPanel extends Composite {
private static StepViewPanelUiBinder uiBinder = GWT.create(StepViewPanelUiBinder.class);
interface StepViewPanelUiBinder extends UiBinder<Widget, StepViewPanel> {
}
@UiField
FlowPanel principalPanel;
@UiField
AccordionGroup accordionProjectDetails;
@UiField
FlowPanel confirmProceedPanel;
@UiField
TextArea txtOptionalMessage;
private ResultDocumentDV resultDocumentDV;
private ActionDefinitionDV actionDefinitionDV;
public StepViewPanel(ResultDocumentDV resultDocumentDV, ActionDefinitionDV actionDefinitionDV) {
initWidget(uiBinder.createAndBindUi(this));
this.resultDocumentDV = resultDocumentDV;
this.actionDefinitionDV = actionDefinitionDV;
builtUI();
}
private void builtUI() {
String htmlMsg = "<p style='font-size: 18px'>Going to perform the step/s <i><b>" + actionDefinitionDV.getCallSteps() + "</b></i> on the: </p>";
// TODO Auto-generated method stub
principalPanel.add(new HTML(htmlMsg));
ReportTemplateToHTML rt = new ReportTemplateToHTML("Project", resultDocumentDV.getDocumentAsJSON(), false);
rt.showAsJSON(false);
principalPanel.add(rt);
String projectDetails = "<ul>";
projectDetails += "<li>id: " + resultDocumentDV.getId() + "</li>";
projectDetails += "<li>profile: " + resultDocumentDV.getProfileID() + "</li>";
projectDetails += "<li>" + resultDocumentDV.getFirstEntryOfMap().getKey() + ": "
+ resultDocumentDV.getFirstEntryOfMap().getValue() + "</li>";
projectDetails += "</ul>";
accordionProjectDetails.add(new HTML(projectDetails));
String confirmMessage = "<b>Would you like to proceed?</b>";
confirmProceedPanel.add(new HTML(confirmMessage));
}
public String getOptionalMessage() {
return txtOptionalMessage.getText();
}
}

46
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/action/StepViewPanel.ui.xml
View File

@ -1,46 +0,0 @@
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
xmlns:g="urn:import:com.google.gwt.user.client.ui"
xmlns:b="urn:import:com.github.gwtbootstrap.client.ui">
<ui:style>
.important {
font-weight: bold;
}
.accordion-no-border {
border: 0px !important;
}
.text-are-size {
width: 80% !important;
height: 70px !important;
}
</ui:style>
<g:HTMLPanel>
<g:FlowPanel ui:field="principalPanel">
</g:FlowPanel>
<g:HTMLPanel>
<b:Accordion>
<b:AccordionGroup icon="GEAR"
heading="Project details" ui:field="accordionProjectDetails"
addStyleNames="{style.accordion-no-border}">
</b:AccordionGroup>
</b:Accordion>
</g:HTMLPanel>
<g:FlowPanel ui:field="confirmProceedPanel">
<b:Form type="HORIZONTAL">
<b:Fieldset>
<b:ControlGroup>
<b:ControlLabel>Message</b:ControlLabel>
<b:Controls>
<!-- If you add id attribute to element,You should use b:id attribute. -->
<b:TextArea addStyleNames="{style.text-are-size}"
ui:field="txtOptionalMessage"></b:TextArea>
<b:HelpBlock>You can optionally add a message...</b:HelpBlock>
</b:Controls>
</b:ControlGroup>
</b:Fieldset>
</b:Form>
</g:FlowPanel>
</g:HTMLPanel>
</ui:UiBinder>

12
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/card/GeoNaFormCardModel.java
View File

@ -5,9 +5,9 @@ import org.gcube.portlets.user.geoportaldataentry.client.ProjectFormCard;
import org.gcube.portlets.widgets.mpformbuilder.client.form.generic.CreateMetadataForm;
import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.MetaDataProfileBean;
public class GeoNaFormCardModel<T extends MetaDataProfileBean> {
public class GeoNaFormCardModel {
private T metadataProfileBean;
private MetaDataProfileBean metadataProfileBean;
private CreateMetadataForm metadataForm;
private ProjectFormCard formCard; // matching with metadata profile
private GcubeProfileDV gcubeProfile;
@ -16,8 +16,8 @@ public class GeoNaFormCardModel<T extends MetaDataProfileBean> {
}
public GeoNaFormCardModel(T metadataProfileBean, CreateMetadataForm metadataForm, ProjectFormCard formCard,
GcubeProfileDV gcubeProfile) {
public GeoNaFormCardModel(MetaDataProfileBean metadataProfileBean, CreateMetadataForm metadataForm,
ProjectFormCard formCard, GcubeProfileDV gcubeProfile) {
super();
this.metadataProfileBean = metadataProfileBean;
this.metadataForm = metadataForm;
@ -25,11 +25,11 @@ public class GeoNaFormCardModel<T extends MetaDataProfileBean> {
this.gcubeProfile = gcubeProfile;
}
public T getMetadataProfileBean() {
public MetaDataProfileBean getMetadataProfileBean() {
return metadataProfileBean;
}
public void setMetadataProfileBean(T metadataProfileBean) {
public void setMetadataProfileBean(MetaDataProfileBean metadataProfileBean) {
this.metadataProfileBean = metadataProfileBean;
}

30
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/edit/EditModeRecord.java
View File

@ -14,10 +14,8 @@ import org.gcube.portlets.user.geoportaldataentry.client.ui.edit.jseditor.JSONEd
import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.DialogInform;
import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.LoaderIcon;
import com.github.gwtbootstrap.client.ui.Alert;
import com.github.gwtbootstrap.client.ui.Button;
import com.github.gwtbootstrap.client.ui.Tab;
import com.github.gwtbootstrap.client.ui.constants.AlertType;
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
@ -29,11 +27,11 @@ import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.Random;
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.HTMLPanel;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Widget;
/**
@ -70,8 +68,6 @@ public class EditModeRecord extends Composite {
private final HandlerManager editorManagerBus = new HandlerManager(null);
private int modalHeight;
/**
* The Interface EditModeRecordUiBinder.
*
@ -82,14 +78,12 @@ public class EditModeRecord extends Composite {
interface EditModeRecordUiBinder extends UiBinder<Widget, EditModeRecord> {
}
public EditModeRecord(HandlerManager appManagerBus, ResultDocumentDV selectedProject, int modalHeight) {
public EditModeRecord(HandlerManager appManagerBus, ResultDocumentDV selectedProject) {
initWidget(uiBinder.createAndBindUi(this));
this.modalHeight = modalHeight;
this.selectedProject = selectedProject;
this.appManagerBus = appManagerBus;
this.filesUpdatePanel.setHeight((modalHeight - 50) + "px");
// filesUpdatePanel.getElement().modalHeight().setProperty("maxHeight",
// "550px");
this.filesUpdatePanel.setHeight("490px");
// filesUpdatePanel.getElement().getStyle().setProperty("maxHeight", "550px");
// TODO Must be instanceUpdateFilesetEditor
tabUploadFiles.asWidget().getElement().getStyle().setVisibility(Visibility.HIDDEN);
@ -127,14 +121,9 @@ public class EditModeRecord extends Composite {
private void instanceJSONEditor() {
rawUpdatePanel.clear();
final HorizontalPanel hpLoader = new HorizontalPanel();
final LoaderIcon lc = new LoaderIcon("Loading Project... please wait");
hpLoader.add(lc);
rawUpdatePanel.add(hpLoader);
final FlowPanel fp = new FlowPanel();
fp.getElement().setId("jsoneditor" + Random.nextInt());
fp.setHeight((modalHeight - 160) + "px");
fp.setHeight("410px");
rawUpdatePanel.add(fp);
Scheduler.get().scheduleDeferred(new ScheduledCommand() {
@ -145,7 +134,6 @@ public class EditModeRecord extends Composite {
@Override
public void onSuccess(String jsonData) {
hpLoader.clear();
GWT.log("Instance JSON Editor with: " + jsonData);
jsEditor = JSONEditorWrapper.init(fp.getElement().getId());
jsEditor.setName(selectedProject.getId());
@ -164,13 +152,7 @@ public class EditModeRecord extends Composite {
@Override
public void onFailure(Throwable caught) {
rawUpdatePanel.clear();
Alert alert = new Alert(
"Sorry, I cannot show the source Project with id '" + selectedProject.getId()
+ "' Refresh an try again. Error: " + caught.getMessage(),
AlertType.ERROR);
alert.setClose(false);
rawUpdatePanel.add(alert);
Window.alert(caught.getMessage());
}
});

10
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/edit/EditModeRecord.ui.xml
View File

@ -21,13 +21,13 @@
<g:HTMLPanel>
<b:TabPanel tabPosition="left" ui:field="tabPanel">
<b:Tab icon="CODE" active="true" heading="Project"
<b:Tab icon="PENCIL" active="true" heading="Edit the Project"
ui:field="tabRawUpdate">
<b:Heading size="3">Source Project as JSON</b:Heading>
<b:Label type="INFO" visible="false">You can update the project by editing
<b:Heading size="3">Source Project Editor</b:Heading>
<b:Label type="INFO">You can update the project by editing
the
model data displayed in the following editor.</b:Label>
<g:HTML visible="false" addStyleNames="{style.info-panel}">
<g:HTML addStyleNames="{style.info-panel}">
<p style='color: #585858'>
Be careful not to change the
keys (e.g. nome, introduzione,
@ -52,7 +52,7 @@
</g:FlowPanel>
<b:Button icon="SAVE" type="INFO"
addStyleNames="{style.button-save-style}"
ui:field="buttonJSONUpdate" visible="false">UPDATE</b:Button>
ui:field="buttonJSONUpdate">UPDATE</b:Button>
</b:Tab>
<b:Tab icon="UPLOAD_ALT" heading="Manage File/s"
ui:field="tabUploadFiles">

550
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/edit/UpdateFileset.java Normal file
View File

@ -0,0 +1,550 @@
//package org.gcube.portlets.user.geoportaldataentry.client.ui.edit;
//
//import java.util.ArrayList;
//import java.util.Collection;
//import java.util.HashMap;
//import java.util.List;
//import java.util.Map;
//
//import org.gcube.application.geoportalcommon.shared.products.BaseConcessioneDV;
//import org.gcube.application.geoportalcommon.shared.products.ConcessioneDV;
//import org.gcube.application.geoportalcommon.shared.products.content.WorkspaceContentDV;
//import org.gcube.application.geoportalcommon.shared.products.model.AbstractRelazioneScavoDV;
//import org.gcube.application.geoportalcommon.shared.products.model.LayerConcessioneDV;
//import org.gcube.application.geoportalcommon.shared.products.model.RelazioneScavoDV;
//import org.gcube.application.geoportalcommon.shared.products.model.UploadedImageDV;
//import org.gcube.portlets.user.geoportaldataentry.client.GeoportalDataEntryServiceAsync;
//import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.DialogInform;
//import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.ModalConfirm;
//import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.StringUtil;
//import org.gcube.portlets.widgets.mpformbuilder.client.form.MetaDataField;
//import org.gcube.portlets.widgets.mpformbuilder.client.form.generic.CreateMetadataForm.OPERATION;
//import org.gcube.portlets.widgets.mpformbuilder.client.ui.metadata.MetaDataFieldSkeleton;
//import org.gcube.portlets.widgets.mpformbuilder.client.ui.upload.DialogUpload;
//import org.gcube.portlets.widgets.mpformbuilder.shared.GenericDatasetBean;
//import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.DataTypeWrapper;
//import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.MetadataFieldWrapper;
//import org.gcube.portlets.widgets.mpformbuilder.shared.upload.FileUploaded;
//
//import com.github.gwtbootstrap.client.ui.Button;
//import com.github.gwtbootstrap.client.ui.ControlGroup;
//import com.github.gwtbootstrap.client.ui.Controls;
//import com.github.gwtbootstrap.client.ui.Label;
//import com.github.gwtbootstrap.client.ui.ListBox;
//import com.github.gwtbootstrap.client.ui.constants.IconType;
//import com.github.gwtbootstrap.client.ui.constants.LabelType;
//import com.google.gwt.core.client.GWT;
//import com.google.gwt.dom.client.Document;
//import com.google.gwt.dom.client.Style.Unit;
//import com.google.gwt.event.dom.client.ChangeEvent;
//import com.google.gwt.event.dom.client.ChangeHandler;
//import com.google.gwt.event.dom.client.ClickEvent;
//import com.google.gwt.event.dom.client.ClickHandler;
//import com.google.gwt.event.dom.client.DomEvent;
//import com.google.gwt.event.shared.HandlerManager;
//import com.google.gwt.uibinder.client.UiBinder;
//import com.google.gwt.uibinder.client.UiField;
//import com.google.gwt.user.client.Window;
//import com.google.gwt.user.client.rpc.AsyncCallback;
//import com.google.gwt.user.client.ui.Composite;
//import com.google.gwt.user.client.ui.FlexTable;
//import com.google.gwt.user.client.ui.HTML;
//import com.google.gwt.user.client.ui.HTMLPanel;
//import com.google.gwt.user.client.ui.Widget;
//
///**
// * The Class UpdateFileset.
// *
// * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
// *
// * Sep 27, 2021
// */
//public class UpdateFileset extends Composite {
//
// private static final String SECTION_PIANTE = "piante";
//
// private static final String SECTION_POSIZIONAMENTO_SCAVO = "posizionamentoScavo";
//
// private static final String SECTION_RELAZIONE = "relazione";
//
// private static final String SECTION_IMMAGINI = "immagini";
//
// private static final String SECTION_ABSTRACT_RELAZIONE = "abstract_relazione";
//
// private static final String _FORM_WIDTH_FIELDS_SIZE = "730px";
//
// private static UpdateFilesetUiBinder uiBinder = GWT.create(UpdateFilesetUiBinder.class);
//
// /**
// * The Interface UpdateFilesetUiBinder.
// *
// * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
// *
// * Sep 27, 2021
// */
// interface UpdateFilesetUiBinder extends UiBinder<Widget, UpdateFileset> {
// }
//
// @UiField
// ListBox listBoxPaths;
//
// @UiField
// ControlGroup cgSelectFile;
//
// @UiField
// Controls controlsContent;
//
// @UiField
// HTMLPanel uploadFileContainer;
//
// @UiField
// Button buttonUpdate;
//
// private List<String> listFileSetPaths;
//
// private boolean placeholderListBoxPaths = true;
//
// private BaseConcessioneDV selectedConcessione;
//
// private ConcessioneDV fullConcessione;
//
// private boolean placeholderListBoxIndex = true;
//
// private HandlerManager uiBus = new HandlerManager(null);
//
// private MetaDataField fieldUploadWidget;
//
// private Integer pathIndex = null;
//
// private Map<Integer, WorkspaceContentDV> mapForCCUploading = null;
//
// private Map<Integer, List<WorkspaceContentDV>> mapWSContentListBox = null;
//
// private HandlerManager editorManagerBus;
//
// private String profileID;
//
//
// /**
// * Instantiates a new update fileset.
// *
// * @param editorManagerBus the editor manager bus
// * @param selectedConcessione the selected concessione
// * @param recordType the record type
// * @param listFileSetPaths the list file set paths
// */
// public UpdateFileset(HandlerManager editorManagerBus, BaseConcessioneDV selectedConcessione, String profileID, List<String> listFileSetPaths) {
// initWidget(uiBinder.createAndBindUi(this));
// this.editorManagerBus = editorManagerBus;
// this.selectedConcessione = selectedConcessione;
// this.profileID = profileID;
// this.listFileSetPaths = listFileSetPaths;
// listBoxPaths.addItem("Select a section...");
// for (String path : listFileSetPaths) {
// listBoxPaths.addItem(path);
// }
// listBoxPaths.setWidth(_FORM_WIDTH_FIELDS_SIZE);
//
// // add handler on select
// listBoxPaths.addChangeHandler(new ChangeHandler() {
//
// @Override
// public void onChange(ChangeEvent event) {
// GWT.log("Profile type selection changed...");
// cgSelectFile.setVisible(false);
//
// if (placeholderListBoxPaths) {
// listBoxPaths.removeItem(0); // this is the placeholder, removing it once
// placeholderListBoxPaths = false;
// }
// showUploadFileGUI();
// }
//
// });
//
//
// Window.alert("This part must be revisited");
//
//// GeoPortalDataEntryApp.geoportalDataEntryService.getRecord(selectedConcessione.getItemId(), recordType,
//// new AsyncCallback<ConcessioneDV>() {
////
//// @Override
//// public void onSuccess(ConcessioneDV theRecord) {
//// fullConcessione = theRecord;
//// }
////
//// @Override
//// public void onFailure(Throwable caught) {
//// Window.alert(caught.getMessage());
//// }
//// });
//
// buttonUpdate.addClickHandler(new ClickHandler() {
//
// @Override
// public void onClick(ClickEvent event) {
//
// String errorMsg = checkValidUpload();
// if (errorMsg == null) {
// List<FileUploaded> listFilesUploaded = new ArrayList<FileUploaded>();
// List<MetaDataFieldSkeleton> listMetaDataFieldSkeleton = fieldUploadWidget.getListOfMetadataFields();
// for (MetaDataFieldSkeleton field : listMetaDataFieldSkeleton) {
// DialogUpload dUpload = (DialogUpload) field.getHolder();
// // adding it only if exists
// if (dUpload.getFileUploadingState() != null)
// listFilesUploaded.add(dUpload.getFileUploadingState().getFile());
// }
//
// GenericDatasetBean gdb = new GenericDatasetBean();
// gdb.setFilesUploaded(listFilesUploaded);
// // adding it only if exists
//
// GWT.log("Section selected: " + listBoxPaths.getSelectedItemText());
// GWT.log("Content index selected: " + pathIndex);
// GWT.log("FileUploaded selected: " + gdb.getFilesUploaded());
//
// List<WorkspaceContentDV> listCurrentContent = new ArrayList<WorkspaceContentDV>();
// if (mapForCCUploading != null) {
// Collection<WorkspaceContentDV> currentContent = mapForCCUploading.values();
// if (currentContent != null)
// listCurrentContent.addAll(currentContent);
// }
//
// String htmlMsg = "Going to update the section " + listBoxPaths.getSelectedItemText() + ":";
// htmlMsg += "<ul>";
// htmlMsg += "<li>keeping " + listCurrentContent.size() + " current file/s </li>";
// htmlMsg += "<li>uploading " + listFilesUploaded.size() + " new file/s </li>";
// htmlMsg += "</ul>";
// htmlMsg += "<br>";
// htmlMsg += "This operation cannot be undone. Would you like to proceed?";
//
// GWT.log(htmlMsg);
//
// final ModalConfirm dialogConfirm = new ModalConfirm(null, "Update Confirm?", htmlMsg);
// dialogConfirm.getElement().getStyle().setZIndex(100000);
// dialogConfirm.getYesButton().addClickHandler(new ClickHandler() {
//
// @Override
// public void onClick(ClickEvent event) {
// dialogConfirm.hide();
// buttonUpdate.setEnabled(false);
//
// final DialogInform dialogInf = new DialogInform(null, "Updating Project...", "");
// dialogInf.setZIndex(100000);
// dialogInf.showLoader("Updating file/s for project: "+fullConcessione.getNome());
// //dialogInf.setWidth("400px");
//
// GeoportalDataEntryServiceAsync.Util.getInstance().updateSectionForRecord(
// fullConcessione.getItemId(), fullConcessione.getRecordType(),
// listBoxPaths.getSelectedItemText(), pathIndex, listCurrentContent, gdb,
// new AsyncCallback<ConcessioneDV>() {
//
// @Override
// public void onFailure(Throwable caught) {
// dialogInf.hideLoader();
// dialogInf.setMsg(
// "Sorry error occurred during project update. Error reported: "
// + caught.getMessage());
// buttonUpdate.setEnabled(true);
// showUploadFileGUI();
//
// }
//
// @Override
// public void onSuccess(ConcessioneDV result) {
// dialogInf.hideLoader();
// dialogInf.setText("Project updated!");
// dialogInf.setMsg(result.getNome() + " updated correclty");
// dialogInf.center();
// fullConcessione = result;
// GWT.log("new concessione: "+fullConcessione);
// buttonUpdate.setEnabled(true);
// showUploadFileGUI();
//
// Window.alert("updateSectionForRecord must be revisited");
//
// /*
// editorManagerBus.fireEvent(
// new OperationPerformedOnItemEvent<ConcessioneDV>(Arrays.asList(fullConcessione), ACTION_PERFORMED_ON_ITEM.UPDATED_PROJECT));
//
// */
//
// }
// });
// dialogInf.center();
// }
// });
// dialogConfirm.show();
//
// } else {
// Window.alert(errorMsg);
// }
//
// }
// });
//
// }
//
// /**
// * Show upload file GUI.
// */
// private void showUploadFileGUI() {
// uploadFileContainer.setVisible(true);
// buttonUpdate.setVisible(false);
// uploadFileContainer.clear();
// controlsContent.clear();
// placeholderListBoxIndex = true;
// fieldUploadWidget = null;
// pathIndex = null;
// mapForCCUploading = null;
// mapWSContentListBox = null;
//
//// listBoxIndex.clear();
// cgSelectFile.setVisible(true);
//
// ListBox listBoxContentIndex = new ListBox();
// listBoxContentIndex.setWidth(_FORM_WIDTH_FIELDS_SIZE);
// listBoxContentIndex.addItem("Select a content...");
// String section = null;
// Integer posizIndex = 0;
// if (listBoxPaths.getSelectedItemText().contains(SECTION_ABSTRACT_RELAZIONE)) {
// section = SECTION_ABSTRACT_RELAZIONE;
// AbstractRelazioneScavoDV ar = fullConcessione.getAbstractRelazioneScavo();
//
// if (ar == null) {
// showMessage(SECTION_ABSTRACT_RELAZIONE + " NOT AVAILABLE", LabelType.WARNING);
//// pathIndex = 0;
//// showNewFileUpload();
// return;
// }
//
// fillListBoxToBeReplaced(listBoxContentIndex, section, posizIndex, ar.getTitolo(),
// ar.getListWsContent());
//
// } else if (listBoxPaths.getSelectedItemText().contains(SECTION_IMMAGINI)) {
// section = SECTION_IMMAGINI;
// List<UploadedImageDV> listImmagini = fullConcessione.getImmaginiRappresentative();
// if (listImmagini == null || listImmagini.isEmpty()) {
// showMessage(SECTION_IMMAGINI + " NOT AVAILABLE", LabelType.WARNING);
//// pathIndex = 0;
//// showNewFileUpload();
// return;
// }
//
// for (UploadedImageDV uploadedImageDV : listImmagini) {
// fillListBoxToBeReplaced(listBoxContentIndex, section, posizIndex, StringUtil.ellipsize(uploadedImageDV.getDidascalia(),30),
// uploadedImageDV.getListWsContent());
// posizIndex++;
// }
//
// } else if (listBoxPaths.getSelectedItemText().contains(SECTION_RELAZIONE)) {
// section = SECTION_RELAZIONE;
// RelazioneScavoDV relazioneScavo = fullConcessione.getRelazioneScavo();
// if (relazioneScavo == null) {
// showMessage(SECTION_RELAZIONE + " NOT AVAILABLE", LabelType.WARNING);
//// pathIndex = 0;
//// showNewFileUpload();
// return;
// }
//
// fillListBoxToBeReplaced(listBoxContentIndex, section, posizIndex, relazioneScavo.getTitolo(),
// relazioneScavo.getListWsContent());
//
// } else if (listBoxPaths.getSelectedItemText().contains(SECTION_POSIZIONAMENTO_SCAVO)) {
// section = SECTION_POSIZIONAMENTO_SCAVO;
// LayerConcessioneDV posiz = fullConcessione.getPosizionamentoScavo();
// if (posiz == null) {
// showMessage(SECTION_POSIZIONAMENTO_SCAVO + " NOT AVAILABLE", LabelType.WARNING);
//// pathIndex = 0;
//// showNewFileUpload();
// return;
// }
//
// fillListBoxToBeReplaced(listBoxContentIndex, section, posizIndex, posiz.getTitolo(),
// posiz.getListWsContent());
//
// } else if (listBoxPaths.getSelectedItemText().contains(SECTION_PIANTE)) {
// section = SECTION_PIANTE;
// List<LayerConcessioneDV> piante = fullConcessione.getPianteFineScavo();
// if (piante == null || piante.isEmpty()) {
// showMessage(SECTION_PIANTE + " NOT AVAILABLE", LabelType.WARNING);
//// pathIndex = 0;
//// showNewFileUpload();
// return;
// }
//
// for (LayerConcessioneDV lcDV : piante) {
// fillListBoxToBeReplaced(listBoxContentIndex, SECTION_PIANTE, posizIndex, lcDV.getTitolo(),
// lcDV.getListWsContent());
// posizIndex++;
// }
//
// }
//
// controlsContent.add(listBoxContentIndex);
//
// if (listBoxContentIndex.getItemCount() == 2) {
// // listBoxContentIndex.setSelectedIndex(1);
// listBoxContentIndex.setSelectedValue(listBoxContentIndex.getItemText(1));
//
// DomEvent.fireNativeEvent(Document.get().createChangeEvent(), listBoxContentIndex);
// }
//
// }
//
// private void fillListBoxToBeReplaced(ListBox listBoxContentIndex, String section, int posizIndex, String title,
// List<WorkspaceContentDV> listWSC) {
// GWT.log("fillListBoxToBeReplaced called, posizIndex: "+posizIndex+", listWSC: "+listWSC);
//
// if(mapWSContentListBox==null) {
// mapWSContentListBox = new HashMap<Integer, List<WorkspaceContentDV>>();
// }
//
// listBoxContentIndex.addItem(title, posizIndex + "");
// mapWSContentListBox.put(posizIndex, listWSC);
//
// // adding handler once
// if (posizIndex == 0) {
//
// listBoxContentIndex.addChangeHandler(new ChangeHandler() {
//
// @Override
// public void onChange(ChangeEvent event) {
// GWT.log("listBoxContentIndex changed, value: "+listBoxContentIndex.getSelectedValue());
//
// if (placeholderListBoxIndex) {
// listBoxContentIndex.removeItem(0); // this is the placeholder, removing it once
// placeholderListBoxIndex = false;
// }
// int selectedIndex = listBoxContentIndex.getSelectedIndex();
// GWT.log("selected index: "+selectedIndex);
// List<WorkspaceContentDV> theListWC = mapWSContentListBox.get(selectedIndex);
//
// if (theListWC == null || theListWC.isEmpty()) {
// uploadFileContainer.clear();
// showMessage(section + " does not contain file!", LabelType.WARNING);
// pathIndex = posizIndex;
// showNewFileUpload();
// return;
// }
//
// showFileBrowseInteraction(selectedIndex, mapWSContentListBox.get(selectedIndex));
// }
// });
// }
////
//
// }
//
// private void showFileBrowseInteraction(int pathContentIndex, List<WorkspaceContentDV> listWSC) {
// uploadFileContainer.clear();
// pathIndex = pathContentIndex;
// GWT.log("showing pathContentIndex: "+pathContentIndex);
// GWT.log("showing ws content: "+listWSC);
//
// // map for current content uploading
// mapForCCUploading = new HashMap<Integer, WorkspaceContentDV>(listWSC.size());
// int index = 0;
// for (WorkspaceContentDV workspaceContentDV : listWSC) {
// workspaceContentDV.setCliendId(index);
// mapForCCUploading.put(index, workspaceContentDV);
// index++;
// }
//
// if (listWSC.size() > 0) {
// FlexTable table = new FlexTable();
// table.addStyleName("table-current-content");
// table.setHTML(0, 0, "<span style='color:rgb(155, 80, 78); font-weight:bold;'>Current content:</span>");
// table.setHTML(1, 0, "<span style='color:rgb(155, 80, 78);'>Filename</span>");
// table.setHTML(1, 1, "<span style='color:rgb(155, 80, 78);'>MimeType<span>");
// table.setHTML(1, 2, "<span style='color:rgb(155, 80, 78);'>Link</span>");
//
// int i = 2;
// for (final WorkspaceContentDV wsContent : listWSC) {
// table.setHTML(i, 0, wsContent.getName());
// table.setHTML(i, 1, wsContent.getMimetype());
// String link = "<a target=\"_blank\" href=" + wsContent.getLink() + ">View</a>";
// table.setHTML(i, 2, link);
//
// final int rowIndexToRem = i;
// Button buttonRemoveFile = new Button();
// buttonRemoveFile.setIcon(IconType.TRASH);
// buttonRemoveFile.setTitle("Remove this file");
// buttonRemoveFile.addClickHandler(new ClickHandler() {
//
// @Override
// public void onClick(ClickEvent event) {
// mapForCCUploading.remove(wsContent.getCliendId());
// table.getRowFormatter().getElement(rowIndexToRem).setAttribute("hidden", "hidden");
// }
// });
// table.setWidget(i, 3, buttonRemoveFile);
// i++;
// }
//
// uploadFileContainer.add(table);
// }
//
// showNewFileUpload();
// }
//
//
// private void showNewFileUpload() {
//
// HTML label = new HTML();
// label.getElement().getStyle().setMarginTop(10, Unit.PX);
// label.getElement().getStyle().setMarginBottom(10, Unit.PX);
// label.setHTML("<b>Add new file/s:</b>");
// uploadFileContainer.add(label);
// // mDU = new MultipleDilaogUpload();
//
// MetadataFieldWrapper uploadField = new MetadataFieldWrapper();
// uploadField.setFieldName("File");
// uploadField.setMandatory(false);
// uploadField.setType(DataTypeWrapper.File);
// uploadField.setMaxOccurs(1000);
//
// try {
// fieldUploadWidget = new MetaDataField(uploadField, uiBus, OPERATION.NEW);
// uploadFileContainer.add(fieldUploadWidget);
//
// buttonUpdate.setVisible(true);
// } catch (Exception e) {
// e.printStackTrace();
// }
//
// }
//
// /**
// * Test if profile data are valid.
// *
// * @return the string
// */
// private String checkValidUpload() {
//
// if (fieldUploadWidget == null)
// return "No file uploaded";
//
// for (MetaDataFieldSkeleton field : fieldUploadWidget.getListOfMetadataFields()) {
//
// field.removeError();
//
// String error = field.isFieldValueValid();
// if (error != null) {
// field.showError();
// String errorMsg = field.getFieldNameOriginal() + " is not valid. Suggestion: " + error;
// return errorMsg;
// }
// }
//
// return null;
// }
//
// private void showMessage(String txt, LabelType type) {
// Label l = new Label();
// l.setType(type);
// l.setText(txt);
// uploadFileContainer.add(l);
// }
//
//}

50
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/edit/UpdateFileset.ui.xml Normal file
View File

@ -0,0 +1,50 @@
<!-- <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
xmlns:g="urn:import:com.google.gwt.user.client.ui"
xmlns:b="urn:import:com.github.gwtbootstrap.client.ui">
<ui:style>
.important {
font-weight: bold;
}
.button-save-style {
margin-top: 10px;
float: right;
}
.max-height-500 {
max-height: 450px;
}
</ui:style>
<g:HTMLPanel>
<g:ScrollPanel addStyleNames="{style.max-height-500}">
<b:Form type="INLINE">
<b:Fieldset addStyleNames="form-fieldset-edit">
<b:ControlGroup>
<b:ControlLabel>Section</b:ControlLabel>
<b:Controls>
<b:ListBox ui:field="listBoxPaths"></b:ListBox>
</b:Controls>
</b:ControlGroup>
<b:ControlGroup ui:field="cgSelectFile"
visible="false">
<b:ControlLabel>Manage the content of</b:ControlLabel>
<b:Controls ui:field="controlsContent">
<b:ListBox ui:field="listBoxIndex"
addStyleNames="{style.width-500}"></b:ListBox>
</b:Controls>
</b:ControlGroup>
<b:ControlGroup>
<g:ScrollPanel>
<g:HTMLPanel ui:field="uploadFileContainer"
addStyleNames="upload-file-container"></g:HTMLPanel>
</g:ScrollPanel>
</b:ControlGroup>
</b:Fieldset>
</b:Form>
</g:ScrollPanel>
<b:Button icon="SAVE" type="INFO"
addStyleNames="{style.button-save-style}" ui:field="buttonUpdate"
visible="false">UPDATE</b:Button>
</g:HTMLPanel>
</ui:UiBinder> -->

383
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/edit/UpdateRecord.java
View File

@ -1,383 +0,0 @@
package org.gcube.portlets.user.geoportaldataentry.client.ui.edit;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import org.gcube.application.geoportalcommon.shared.geoportal.DocumentDV;
import org.gcube.application.geoportalcommon.shared.geoportal.ResultDocumentDV;
import org.gcube.application.geoportalcommon.shared.geoportal.config.FilePathDV;
import org.gcube.application.geoportalcommon.shared.geoportal.config.GcubeProfileDV;
import org.gcube.application.geoportaldatamapper.shared.MetaDataProfileBeanExt;
import org.gcube.application.geoportaldatamapper.shared.ProjectEdit;
import org.gcube.portlets.user.geoportaldataentry.client.ConstantsGeoPortalDataEntryApp.ACTION_PERFORMED_ON_ITEM;
import org.gcube.portlets.user.geoportaldataentry.client.GeoPortalDataEntryApp;
import org.gcube.portlets.user.geoportaldataentry.client.GeoportalDataEntryServiceAsync;
import org.gcube.portlets.user.geoportaldataentry.client.events.OperationPerformedOnItemEvent;
import org.gcube.portlets.user.geoportaldataentry.client.ui.card.GeoNaFormCardModel;
import org.gcube.portlets.user.geoportaldataentry.client.ui.report.ReportTemplateToHTML;
import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.LoaderIcon;
import org.gcube.portlets.user.geoportaldataentry.shared.CommitReport;
import org.gcube.portlets.user.geoportaldataentry.shared.GeoNaFormDataObject;
import org.gcube.portlets.widgets.mpformbuilder.client.form.generic.CreateMetadataForm.OPERATION;
import org.gcube.portlets.widgets.mpformbuilder.client.form.generic.GenericFormEvents.GenericFormEventsListener;
import org.gcube.portlets.widgets.mpformbuilder.shared.GenericDatasetBean;
import com.github.gwtbootstrap.client.ui.Alert;
import com.github.gwtbootstrap.client.ui.Button;
import com.github.gwtbootstrap.client.ui.ControlGroup;
import com.github.gwtbootstrap.client.ui.ListBox;
import com.github.gwtbootstrap.client.ui.Modal;
import com.github.gwtbootstrap.client.ui.constants.AlertType;
import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.Element;
import com.google.gwt.dom.client.NodeList;
import com.google.gwt.event.dom.client.ChangeEvent;
import com.google.gwt.event.dom.client.ChangeHandler;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.shared.HandlerManager;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.HTMLPanel;
import com.google.gwt.user.client.ui.ScrollPanel;
import com.google.gwt.user.client.ui.Widget;
public class UpdateRecord extends Composite {
private static UpdateRecordUiBinder uiBinder = GWT.create(UpdateRecordUiBinder.class);
interface UpdateRecordUiBinder extends UiBinder<Widget, UpdateRecord> {
}
@UiField
ListBox listBoxSections;
@UiField
ScrollPanel scrollSectionContent;
@UiField
HTMLPanel htmlPanelContainer;
@UiField
HTMLPanel alertHTMLPanel;
@UiField
ControlGroup controlsControlGroup;
@UiField
Button buttonUpdate;
public static final String PLACEHOLDER_LIST_BOX = "Select section...";
private LoaderIcon loaderProjectSections = new LoaderIcon("Loading Project sections... please wait");
private GeoNaFormCardModel currentCardSelected;
private String profileID;
private String projectID;
private HashMap<String, List<FilePathDV>> sectionPathFilePaths = new HashMap<>();
private MetadataFormCardEventHandler formCardEventHandler = new MetadataFormCardEventHandler();
private ProjectEdit projectEditDTO;
private HandlerManager appManagerBus;
public UpdateRecord(HandlerManager appManagerBus, String profileID, String projectID, int modalWidth, int modalHeight) {
initWidget(uiBinder.createAndBindUi(this));
this.appManagerBus = appManagerBus;
this.profileID = profileID;
this.projectID = projectID;
setUpdateButtonEnabled(false);
htmlPanelContainer.setVisible(false);
alertHTMLPanel.add(loaderProjectSections);
scrollSectionContent.setHeight((modalHeight-350)+"px");
listBoxSections.setWidth((modalWidth-50)+"px");
GeoportalDataEntryServiceAsync.Util.getInstance().getProjectEdit(profileID, projectID,
new AsyncCallback<ProjectEdit>() {
@Override
public void onSuccess(ProjectEdit result) {
projectEditDTO = result;
htmlPanelContainer.setVisible(true);
try {
alertHTMLPanel.remove(loaderProjectSections);
} catch (Exception e) {
}
listBoxSections.addItem(PLACEHOLDER_LIST_BOX, PLACEHOLDER_LIST_BOX);
listBoxSections.getElement().getElementsByTagName("option").getItem(0).setAttribute("disabled",
"disabled");
listBoxSections.setSelectedValue(PLACEHOLDER_LIST_BOX);
int sectionArray = 0;
for (final MetaDataProfileBeanExt profileBean : result.getTheProfileBeans()) {
GcubeProfileDV profileDV = profileBean.getGcubeProfileDV();
String sectionPath = profileDV.getParentName() != null ? profileDV.getParentName() : "";
sectionPath += profileDV.getSectionName();
// increment section stored as array
if (profileDV.getMaxOccurs() == 0 || profileDV.getMaxOccurs() > 1) {
sectionPath += "[" + sectionArray + "]";
sectionArray++;
} else {
sectionArray = 0;
}
List<FilePathDV> filePaths = profileDV.getFilePaths();
if (filePaths != null)
sectionPathFilePaths.put(sectionPath, filePaths);
GWT.log("Adding type: " + profileBean.getType() + ", in the section path: " + sectionPath);
listBoxSections.addItem(profileBean.getType(), sectionPath);
}
listBoxSections.addChangeHandler(new ChangeHandler() {
@Override
public void onChange(ChangeEvent event) {
setUpdateButtonEnabled(false);
// -1 because the first element is the PLACEHOLDER "Select section..."
int selectedIndex = listBoxSections.getSelectedIndex() - 1;
MetaDataProfileBeanExt selectedBean = result.getTheProfileBeans()
.get(selectedIndex);
GWT.log("Change handler fired " + selectedBean);
controlsControlGroup.setVisible(true);
scrollSectionContent.clear();
GcubeProfileDV gcubeProfile = selectedBean.getGcubeProfileDV();
currentCardSelected = GeoPortalDataEntryApp.buildNewFormCardModelFromProfile(
gcubeProfile, 1, selectedBean, OPERATION.UPDATE, appManagerBus);
currentCardSelected.getMetadataForm().addListener(formCardEventHandler);
scrollSectionContent.add(currentCardSelected.getMetadataForm());
}
});
}
@Override
public void onFailure(Throwable caught) {
projectEditDTO = null;
htmlPanelContainer.setVisible(true);
alertHTMLPanel.remove(loaderProjectSections);
String errorMsg = caught.getMessage();
Alert alert = new Alert(errorMsg, AlertType.ERROR);
alert.setClose(false);
try {
alertHTMLPanel.remove(loaderProjectSections);
} catch (Exception e) {
}
alertHTMLPanel.add(alert);
Window.alert(errorMsg);
}
});
bindEvents();
}
private void setUpdateButtonEnabled(boolean bool) {
buttonUpdate.setEnabled(bool);
}
private void bindEvents() {
buttonUpdate.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
alertHTMLPanel.clear();
boolean isFormValid = currentCardSelected.getMetadataForm().isFormDataValid();
if (!isFormValid) {
Alert alert = new Alert("Error/s detected, please check your data entry...", AlertType.WARNING);
alert.setClose(true);
alertHTMLPanel.add(alert);
return;
}
GeoNaFormDataObject gfdo = new GeoNaFormDataObject(
Arrays.asList(currentCardSelected.getMetadataForm().getFormDataBean()),
currentCardSelected.getGcubeProfile());
String sectionPath = listBoxSections.getSelectedValue();
GWT.log("sectionPath is: " + sectionPath);
List<FilePathDV> listFilePaths = sectionPathFilePaths.get(sectionPath);
final Modal modal = new Modal(true, true);
DocumentDV theDocument = projectEditDTO.getTheProjectDV().getTheDocument();
modal.setTitle("Updating...");
final FlowPanel panelContainer = new FlowPanel();
LoaderIcon loader = new LoaderIcon("Operation in progress... please wait");
modal.add(loader);
String htmlMsg = "Updating the section <b>"+listBoxSections.getSelectedItemText()+"</b> of the project with:";
htmlMsg += "<ul>";
htmlMsg += "<li>id: " + projectID + "</li>";
htmlMsg += "<li>" + theDocument.getFirstEntryOfMap().getKey() + ": "
+ theDocument.getFirstEntryOfMap().getValue() + "</li>";
htmlMsg += "</ul>";
htmlMsg += "<br>";
panelContainer.add(new HTML(htmlMsg));
panelContainer.add(loader);
panelContainer.add(new HTML("<br><br>"));
modal.add(panelContainer);
// modal3.setWidth(950);
// modal3.setHeight("700px");
modal.setCloseVisible(false);
GeoportalDataEntryServiceAsync.Util.getInstance().updateGeportalDataForm(profileID, projectID, gfdo,
sectionPath, listFilePaths, new AsyncCallback<CommitReport>() {
@Override
public void onFailure(Throwable caught) {
modal.setCloseVisible(true);
modal.setTitle("Error :-(");
panelContainer.clear();
String errorMsg = "Sorry, an error occurred when updating the project with id: "+projectID+". Please, try again. If the problem persists, please contact the support";
Alert alert = new Alert(errorMsg, AlertType.ERROR);
alert.setClose(false);
modal.add(alert);
}
@Override
public void onSuccess(CommitReport result) {
modal.setCloseVisible(true);
modal.setTitle("Project updated!");
panelContainer.clear();
Alert alert = new Alert();
alert.setClose(false);
alert.setType(AlertType.SUCCESS);
String htmlMsg = "The project with:";
htmlMsg += "<ul>";
htmlMsg += "<li>id: " + projectID + "</li>";
htmlMsg += "<li>" + theDocument.getFirstEntryOfMap().getKey() + ": "
+ theDocument.getFirstEntryOfMap().getValue() + "</li>";
htmlMsg += "</ul>";
htmlMsg += "<br>";
htmlMsg += "has been updated successfully!";
alert.setHTML(htmlMsg);
ReportTemplateToHTML rtth2 = new ReportTemplateToHTML("Project", result.getProjectAsJSON(),
false, false);
rtth2.showAsJSON(false);
panelContainer.add(alert);
panelContainer.add(rtth2);
appManagerBus.fireEvent(new OperationPerformedOnItemEvent<ResultDocumentDV>(
profileID, null, ACTION_PERFORMED_ON_ITEM.UPDATED_PROJECT));
}
});
modal.show();
}
});
}
public void noUpdateMode() {
buttonUpdate.setVisible(false);
}
/**
* The Class MetadataFormCardEventHandler.
*
* @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
*
* Oct 12, 2020
*/
private class MetadataFormCardEventHandler implements GenericFormEventsListener {
/**
* On form data valid.
*
* @param genericDatasetBean the generic dataset bean
*/
@Override
public void onFormDataValid(GenericDatasetBean genericDatasetBean) {
setUpdateButtonEnabled(true);
//Disabling option not selected
int selectedIndex = listBoxSections.getSelectedIndex();
NodeList<Element> elementOption = listBoxSections.getElement().getElementsByTagName("option");
for (int i = 0; i < listBoxSections.getItemCount(); i++) {
if (i != selectedIndex) {
elementOption.getItem(i).setAttribute("disabled", "disabled");
}
}
}
/**
* On form data edit.
*/
@Override
public void onFormDataEdit() {
setUpdateButtonEnabled(false);
NodeList<Element> elementOption = listBoxSections.getElement().getElementsByTagName("option");
//i==0 is the PLACEHOLDER
for (int i = 1; i < listBoxSections.getItemCount(); i++) {
elementOption.getItem(i).removeAttribute("disabled");
}
}
/**
* On form aborted.
*/
@Override
public void onFormAborted() {
}
/**
* On validation error.
*
* @param throwable the throwable
* @param errorMsg the error msg
*/
@Override
public void onValidationError(Throwable throwable, String errorMsg) {
}
}
}

70
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/edit/UpdateRecord.ui.xml
View File

@ -1,70 +0,0 @@
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
xmlns:g="urn:import:com.google.gwt.user.client.ui"
xmlns:b="urn:import:com.github.gwtbootstrap.client.ui">
<ui:style>
.important {
font-weight: bold;
}
.button-save-style {
margin-top: 10px;
float: right;
}
.max-height-500 {
max-height: 450px;
}
.margin-top-10 {
margin-top: 10px;
}
.info-operation {
font-size: 12px;
color: gray;
}
</ui:style>
<g:HTMLPanel>
<g:HTMLPanel ui:field="alertHTMLPanel">
</g:HTMLPanel>
<g:HTMLPanel ui:field="htmlPanelContainer">
<b:Form type="INLINE">
<b:Fieldset addStyleNames="form-fieldset-edit">
<b:ControlGroup>
<b:Label type="INFO">Select the section of the document you want
to update...</b:Label>
<b:Controls>
<b:ListBox ui:field="listBoxSections"></b:ListBox>
</b:Controls>
</b:ControlGroup>
<b:ControlGroup ui:field="controlsControlGroup"
visible="false">
<b:Label type="INFO">Manage the content of</b:Label>
<b:Controls>
<g:ScrollPanel ui:field="scrollSectionContent"></g:ScrollPanel>
</b:Controls>
</b:ControlGroup>
<b:ControlGroup>
<g:ScrollPanel>
<g:HTMLPanel ui:field="uploadFileContainer"
addStyleNames="upload-file-container"></g:HTMLPanel>
</g:ScrollPanel>
</b:ControlGroup>
</b:Fieldset>
</b:Form>
</g:HTMLPanel>
<g:HTMLPanel>
<g:HTMLPanel addStyleNames="{style.info-operation}">
To update the document:
"Select the Section you wish to update, update the metadata and/or
the
file/s and then confirm by clicking on "Create".
Finally select
"Update".
</g:HTMLPanel>
<b:Button icon="SAVE" type="INFO"
addStyleNames="{style.button-save-style}" ui:field="buttonUpdate">UPDATE</b:Button>
</g:HTMLPanel>
</g:HTMLPanel>
</ui:UiBinder>

4
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/form/GeonaDataEntryMainForm.java
View File

@ -97,7 +97,7 @@ public class GeonaDataEntryMainForm extends Composite {
*
* @param appManagerBus the app manager bus
*/
public GeonaDataEntryMainForm(HandlerManager appManagerBus) {
public GeonaDataEntryMainForm(final HandlerManager appManagerBus) {
initWidget(uiBinder.createAndBindUi(this));
this.appManagerBus = appManagerBus;
@ -248,7 +248,7 @@ public class GeonaDataEntryMainForm extends Composite {
appManagerBus.fireEvent(new SaveGeonaDataFormsEvent(treeItemPanel.getProfileID(), treeNode));
TreeVisitUtil.preOrderVisit(treeNode);
//showAlertOnSaveAction("Andiamo a salvare", AlertType.INFO, true);
showAlertOnSaveAction("Andiamo a salvare", AlertType.INFO, true);
} else {
showAlertOnSaveAction("Detected errors, please fix it/them", AlertType.ERROR, true);

38
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/projects/ListOfProjectTablePanel.java
View File

@ -1,6 +1,5 @@
package org.gcube.portlets.user.geoportaldataentry.client.ui.projects;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@ -310,7 +309,7 @@ public class ListOfProjectTablePanel extends Composite {
* @param ucdProjectTypesForListingDataView the ucd project types for listing
* data view
*/
public void instanceAndShowListOfProjects(List<UseCaseDescriptorDV> ucdProjectTypesForListingDataView) {
public void instanceAndShowListOfProjects(final List<UseCaseDescriptorDV> ucdProjectTypesForListingDataView) {
GWT.log("ListOfProjectTablePanel instanceAndShowListOfProjects called");
this.ucdProjectTypesForListingDataView = ucdProjectTypesForListingDataView;
@ -324,25 +323,17 @@ public class ListOfProjectTablePanel extends Composite {
if (ucdProjectTypesForListingDataView.size() == 1) {
// noProjectSelectionMessage.setVisible(false);
UseCaseDescriptorDV singleUCD = ucdProjectTypesForListingDataView.get(0);
GetListOfRecordsEvent event = new GetListOfRecordsEvent(true, singleUCD.getProfileID(),
getCurrentSearchingFilter(), true);
setSearchTypeAndFire(singleUCD.getName(), event);
alertProjectType.setText(singleUCD.getName());
// setFilteringParameters(displayFields, sortByFields, searchForFields,
// currentSearchingFilter);
appManagerBus.fireEvent(new GetListOfRecordsEvent(true, singleUCD.getProfileID(),
getCurrentSearchingFilter(), true));
}
}
});
}
public void setSearchTypeAndFire(String ucdName, GetListOfRecordsEvent event) {
alertProjectType.setText(ucdName);
// if(event.getSearchingFilter().getProfileID()!=null && event.getSearchingFilter().getProjectID()) {
//
// }
//
appManagerBus.fireEvent(event);
}
/**
* Built searching filter.
@ -355,25 +346,21 @@ public class ListOfProjectTablePanel extends Composite {
if (searchText != null && !searchText.isEmpty()) {
Map<String, Object> searchInto = new HashMap<String, Object>();
List<String> listOfSeachingFields = new ArrayList<String>();
String searchForField = "";
for (ItemFieldDV recordField : cacheSearchingFilterParameters.getSearchByFields()) {
if (recordField.getDisplayName().equals(alertSearchFor.getText())) {
listOfSeachingFields = recordField.getJsonFields();
searchForField = recordField.getJsonFields().get(0);
continue;
}
}
for (String fieldname : listOfSeachingFields) {
searchInto.put(fieldname, searchText);
}
searchInto.put(searchForField, searchText);
WhereClause where = new WhereClause();
where.setSearchInto(searchInto);
where.setOperator(LOGICAL_OP.OR);
searchingFilter.setConditions(Arrays.asList(where));
}
return searchingFilter;
}
@ -479,10 +466,5 @@ public class ListOfProjectTablePanel extends Composite {
ddProjectType.add(link);
}
public String getSelectedProjectType() {
return alertProjectType.getText();
}
}

2
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/relation/CreateRelationProjectsPanel.java
View File

@ -89,7 +89,7 @@ public class CreateRelationProjectsPanel extends Composite {
private HandlerManager appManagerBus;
public CreateRelationProjectsPanel(HandlerManager appManagerBus, ResultDocumentDV project) {
public CreateRelationProjectsPanel(final HandlerManager appManagerBus, final ResultDocumentDV project) {
initWidget(uiBinder.createAndBindUi(this));
this.appManagerBus = appManagerBus;

49
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/relation/ViewRelationshipPanel.java
View File

@ -4,17 +4,12 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import org.gcube.application.geoportalcommon.shared.config.OPERATION_ON_ITEM;
import org.gcube.application.geoportalcommon.shared.geoportal.ResultDocumentDV;
import org.gcube.application.geoportalcommon.shared.geoportal.WORKFLOW_PHASE;
import org.gcube.application.geoportalcommon.shared.geoportal.project.RelationshipDV;
import org.gcube.application.geoportalcommon.shared.geoportal.project.TemporalReferenceDV;
import org.gcube.portlets.user.geoportaldataentry.client.ConstantsGeoPortalDataEntryApp;
import org.gcube.portlets.user.geoportaldataentry.client.GeoportalDataEntryServiceAsync;
import org.gcube.portlets.user.geoportaldataentry.client.events.CloseCreateRelationGUIEvent;
import org.gcube.portlets.user.geoportaldataentry.client.events.RelationActionHandlerEvent;
import org.gcube.portlets.user.geoportaldataentry.client.resource.Images;
import org.gcube.portlets.user.geoportaldataentry.client.ui.ModalWindow;
import org.gcube.portlets.user.geoportaldataentry.client.ui.report.ReportTemplateToHTML;
import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.HTMLUtil;
import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.LoaderIcon;
@ -22,7 +17,6 @@ import org.gcube.portlets.user.geoportaldataentry.client.ui.utils.LoaderIcon;
import com.github.gwtbootstrap.client.ui.Button;
import com.github.gwtbootstrap.client.ui.Label;
import com.github.gwtbootstrap.client.ui.Modal;
import com.github.gwtbootstrap.client.ui.constants.AlertType;
import com.github.gwtbootstrap.client.ui.constants.ButtonType;
import com.github.gwtbootstrap.client.ui.constants.IconSize;
import com.github.gwtbootstrap.client.ui.constants.IconType;
@ -41,7 +35,6 @@ import com.google.gwt.user.client.ui.FlexTable;
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.HTMLPanel;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.Widget;
public class ViewRelationshipPanel extends Composite {
@ -82,7 +75,7 @@ public class ViewRelationshipPanel extends Composite {
private ResultDocumentDV fromTheProject;
public ViewRelationshipPanel(HandlerManager appManagerBus, final ResultDocumentDV fromProject, boolean showExpand) {
public ViewRelationshipPanel(final HandlerManager appManagerBus, final ResultDocumentDV fromProject, final boolean showExpand) {
initWidget(uiBinder.createAndBindUi(this));
this.appManagerBus = appManagerBus;
this.fromTheProject = fromProject;
@ -142,12 +135,12 @@ public class ViewRelationshipPanel extends Composite {
showRelationsOf(fromProject);
}
public void showRelationsOf(ResultDocumentDV project) {
public void showRelationsOf(final ResultDocumentDV project) {
firstProjectPanelContainer.clear();
secondProjectPanelContainer.clear();
this.fromTheProject = project;
Entry<String, Object> firstEntrySet = project.getFirstEntryOfMap();
Entry<String, String> firstEntrySet = project.getFirstEntryOfMap();
String htmlMsg = firstEntrySet.getKey() + ": <b>" + firstEntrySet.getValue() + "</b> (id: " + project.getId()
+ ")";
@ -170,47 +163,25 @@ public class ViewRelationshipPanel extends Composite {
secondProjectPanelContainer.clear();
for (RelationshipDV relationDV : project.getListRelationshipDV()) {
for (final RelationshipDV relationDV : project.getListRelationshipDV()) {
final FlexTable flexTable = new FlexTable();
flexTable.getElement().addClassName("box-table-diplay-project");
Label label = new Label();
label.setType(LabelType.INFO);
label.setText(relationDV.getRelationshipName());
FlowPanel panelContainer = new FlowPanel();
Button deleteRelation = new Button("", IconType.TRASH);
deleteRelation.setTitle("Delete this relation");
deleteRelation.setTitle("Delete this releation");
deleteRelation.setType(ButtonType.LINK);
deleteRelation.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
// #24571
boolean isNotInDRAFT = false;
if (fromTheProject.getLifecycleInfo() != null) {
String phase = fromTheProject.getLifecycleInfo().getPhase();
// IF the project is not in DRAFT, showing an alert and the no Update Mode will
// be activated
if (phase != null && phase.compareToIgnoreCase(WORKFLOW_PHASE.DRAFT.getLabel()) != 0) {
String msg = ConstantsGeoPortalDataEntryApp.ALERT_MESSAGE_DELETE_RELATION_FORBIDDEN;
ModalWindow modalW = new ModalWindow(new Image(Images.ICONS.accessDenied()),
"Forbidden: " + OPERATION_ON_ITEM.DELETE_RELATION, msg, AlertType.WARNING);
modalW.show();
isNotInDRAFT = true;
}
}
//If the project is in DRAFT, going to delete the releation after confirm
if(!isNotInDRAFT) {
ResultDocumentDV toProject = mapOfTargetProjectForId.get(relationDV.getTargetUCD());
appManagerBus.fireEvent(
new RelationActionHandlerEvent(project, relationDV.getRelationshipName(), toProject));
}
ResultDocumentDV toProject = mapOfTargetProjectForId.get(relationDV.getTargetUCD());
appManagerBus.fireEvent(
new RelationActionHandlerEvent(project, relationDV.getRelationshipName(), toProject));
}
});
@ -232,7 +203,7 @@ public class ViewRelationshipPanel extends Composite {
@Override
public void onSuccess(ResultDocumentDV result) {
mapOfTargetProjectForId.put(relationDV.getTargetUCD(), result);
Entry<String, Object> firstEntrySet = result.getFirstEntryOfMap();
Entry<String, String> firstEntrySet = result.getFirstEntryOfMap();
String htmlMsg = firstEntrySet.getKey() + ": <b>" + firstEntrySet.getValue()
+ "</b> (id: " + result.getId() + ")";

2
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/report/LifecycleInformationPanel.java
View File

@ -78,7 +78,7 @@ public class LifecycleInformationPanel extends FlowPanel {
final LoaderIcon lc = new LoaderIcon("Get link...");
hpGetLink.add(lc);
add(hpGetLink);
GeoportalDataEntryServiceAsync.Util.getInstance().getLinksFor(projectID, profileID, GeoportalItemReferences.SHARE_LINK_TO.DATA_VIEWER,
GeoportalDataEntryServiceAsync.Util.getInstance().getLinksFor(projectID, profileID,
new AsyncCallback<GeoportalItemReferences>() {
@Override

1
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/report/ReportTemplateToHTML.java
View File

@ -76,7 +76,6 @@ public class ReportTemplateToHTML extends Composite {
boolean openJSONReport) {
initWidget(uiBinder.createAndBindUi(this));
vpContainer.setVisible(false);
vpContainer.setWidth("95%");
showReportAsJSON.setDefaultOpen(openJSONReport);
showReportAsTable.setDefaultOpen(openTableReport);

8
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/report/ReportTemplateToHTML.ui.xml
View File

@ -10,17 +10,13 @@
.margin-top-10 {
margin-top: 10px;
}
.table-style {
margin-top: 10px;
width: 95%;
}
</ui:style>
<g:HTMLPanel>
<g:VerticalPanel ui:field="vpContainer"
addStyleNames="{style.table-style}">
addStyleNames="{style.margin-top-10}">
<b:Label ui:field="labelToReport">Report: </b:Label>
<g:VerticalPanel ui:field="htmlContainer"
addStyleNames="{style.table-style}"></g:VerticalPanel>
addStyleNames="{style.margin-top-10}"></g:VerticalPanel>
<b:AccordionGroup heading="Show as Table"
ui:field="showReportAsTable">
<b:Paragraph ui:field="reportTable"></b:Paragraph>

190
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/table/ItemsTable.java
View File

@ -27,7 +27,6 @@ import com.google.gwt.core.shared.GWT;
import com.google.gwt.dom.client.Style.Unit;
import com.google.gwt.event.shared.HandlerManager;
import com.google.gwt.i18n.client.DateTimeFormat;
import com.google.gwt.safehtml.client.SafeHtmlTemplates;
import com.google.gwt.safehtml.shared.SafeHtml;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
import com.google.gwt.safehtml.shared.SafeHtmlUtils;
@ -103,127 +102,6 @@ public class ItemsTable<T extends DocumentDV> extends AbstractItemsCellTable<T>
super.addItems(items);
}
class CellRender {
String tooltip;
String value;
public CellRender() {
}
public String getTooltip() {
return tooltip;
}
public String getValue() {
return value;
}
public void setTooltip(String tooltip) {
this.tooltip = tooltip;
}
public void setValue(String value) {
this.value = value;
}
}
public CellRender toCellRender(ItemFieldDV itemField, DocumentDV documentDV) {
StringBuilder tooltipBuilder = new StringBuilder();
StringBuilder valueBuilder = new StringBuilder();
String newLine = "<br>";
String newLineTxt = "\n";
String bullet = "&#8226; "; // it is the dot. As <li> rendered in the <ul> tag
String newBullet = newLine + bullet;
List<String> listJsonFields = itemField.getJsonFields();
int numberOfFields = listJsonFields.size();
if (numberOfFields > 1) {
valueBuilder.append(bullet);
}
for (String jsonKey : listJsonFields) {
try {
String objectToRender = "";
// removing the '_theDocument.' prefix for searching in the Document Map
String key = jsonKey.replace(ConstantsGeoPortalDataEntryApp.DEFAULT_DOCUMENT_PROJECTION_NAME + ".", "");
Object value = documentDV.getDocumentAsMap().get(key);
// GWT.log("key: "+key+" is instance of: "+value.getClass());
if (value == null)
continue;
GWT.log("value instance: " + value.getClass());
if (value instanceof ArrayList) {
ArrayList<Object> arrayValues = (ArrayList<Object>) value;
String toReturn = "<ul>";
for (Object arrayValue : arrayValues) {
toReturn += "<li>" + arrayValue + "</li>";
}
toReturn += "</ul>";
GWT.log("Array returning: " + key + " is instance of: " + value.getClass() + " to return: "
+ toReturn);
objectToRender = StringUtil.ellipsize(toReturn, MAX_TEXT_DIMENSION);
} else {
objectToRender = StringUtil.ellipsize(value.toString(), MAX_TEXT_DIMENSION);
}
valueBuilder.append(objectToRender);
valueBuilder.append(newBullet);
if (numberOfFields > 1) {
tooltipBuilder.append("* " + key + newLineTxt);
}else {
tooltipBuilder.append(key);
}
} catch (Exception e) {
GWT.log("Error e: " + e);
}
}
CellRender cellRender = new CellRender();
String toRender = valueBuilder.toString();
cellRender.setValue(toRender.substring(0, toRender.length() - newBullet.length()));
String toTooltip = tooltipBuilder.toString();
toTooltip = numberOfFields > 1 ? toTooltip.substring(0, toTooltip.length() - newLineTxt.length())
: toTooltip;
cellRender.setTooltip(toTooltip);
return cellRender;
}
interface Templates extends SafeHtmlTemplates {
/**
* Start tool tip.
*
* @param toolTipText the tool tip text
* @return the safe html
*/
@Template("<span title=\"{0}\">")
SafeHtml startToolTip(String toolTipText);
/**
* End tool tip.
*
* @return the safe html
*/
@Template("</span>")
SafeHtml endToolTip();
}
/**
* Inits the table.
*
@ -243,7 +121,7 @@ public class ItemsTable<T extends DocumentDV> extends AbstractItemsCellTable<T>
int i = 1;
for (ItemFieldDV itemField : displayFields) {
for (final ItemFieldDV itemField : displayFields) {
if (i > ConstantsGeoPortalDataEntryApp.MAX_COLUMN_DISPLAYED_IN_THE_TABLE) {
break;
@ -252,10 +130,27 @@ public class ItemsTable<T extends DocumentDV> extends AbstractItemsCellTable<T>
String displayName = itemField.getDisplayName();
TextColumn<T> col = new TextColumn<T>() {
@Override
public String getValue(T object) {
if (object == null)
return "";
DocumentDV documentDV = (DocumentDV) object;
try {
// removing the '_theDocument.' prefix for searching in the Document Map
String key = itemField.getJsonFields().get(0)
.replace(ConstantsGeoPortalDataEntryApp.DEFAULT_DOCUMENT_PROJECTION_NAME + ".", "");
Object value = documentDV.getDocumentAsMap().get(key);
if(value==null)
return "";
return value.toString();
} catch (Exception e) {
GWT.log("Error e: " + e);
}
return "";
}
@ -263,12 +158,39 @@ public class ItemsTable<T extends DocumentDV> extends AbstractItemsCellTable<T>
public void render(com.google.gwt.cell.client.Cell.Context context, T object, SafeHtmlBuilder sb) {
if (object == null)
return;
Templates TEMPLATES = GWT.create(Templates.class);
CellRender cellRender = toCellRender(itemField, object);
sb.append(TEMPLATES.startToolTip(cellRender.getTooltip()));
sb.appendHtmlConstant(cellRender.getValue());
sb.append(TEMPLATES.endToolTip());
DocumentDV documentDV = (DocumentDV) object;
String objectToRender = "";
try {
// removing the '_theDocument.' prefix for searching in the Document Map
String key = itemField.getJsonFields().get(0)
.replace(ConstantsGeoPortalDataEntryApp.DEFAULT_DOCUMENT_PROJECTION_NAME + ".", "");
Object value = documentDV.getDocumentAsMap().get(key);
// GWT.log("key: "+key+" is instance of: "+value.getClass());
if(value==null)
return;
if (value instanceof ArrayList) {
ArrayList<Object> arrayValues = (ArrayList<Object>) value;
String toReturn = "<ul>";
for (Object arrayValue : arrayValues) {
toReturn += "<li>" + arrayValue + "</li>";
}
toReturn += "</ul>";
GWT.log("Array returning: " + key + " is instance of: " + value.getClass() + " to return: "
+ toReturn);
objectToRender = StringUtil.ellipsize(toReturn, MAX_TEXT_DIMENSION);
} else {
objectToRender = StringUtil.ellipsize(value.toString(), MAX_TEXT_DIMENSION);
}
} catch (Exception e) {
GWT.log("Error e: " + e);
}
sb.appendHtmlConstant(objectToRender);
// super.render(context, object, sb);
// sb.appendHtmlConstant("</span>");
};
@ -276,7 +198,7 @@ public class ItemsTable<T extends DocumentDV> extends AbstractItemsCellTable<T>
sortedCellTable.addColumn(col, displayName, true);
i++;
}
// COL RELATIONS
TextColumn<T> colRelationship = new TextColumn<T>() {
@Override
@ -309,7 +231,7 @@ public class ItemsTable<T extends DocumentDV> extends AbstractItemsCellTable<T>
};
};
colRelationship.setCellStyleNames(CSS_CLASS_BACK_SYSTEM_CELL_B);
sortedCellTable.addColumn(colRelationship, DEFAULT_DISPLAYING_COLUMN_NAME.RELATIONSHIPS.getTitle(), true);
mapColumns.put(DEFAULT_DISPLAYING_COLUMN_NAME.RELATIONSHIPS, colRelationship);
@ -336,7 +258,7 @@ public class ItemsTable<T extends DocumentDV> extends AbstractItemsCellTable<T>
}
};
colCreated.setCellStyleNames(CSS_CLASS_BACK_SYSTEM_CELL_O);
sortedCellTable.addColumn(colCreated, DEFAULT_DISPLAYING_COLUMN_NAME.CREATED.getTitle(), true);
sortedCellTable.setColumnWidth(colCreated, 130, Unit.PX);
@ -364,7 +286,7 @@ public class ItemsTable<T extends DocumentDV> extends AbstractItemsCellTable<T>
}
};
colPublisher.setCellStyleNames(CSS_CLASS_BACK_SYSTEM_CELL_O);
sortedCellTable.addColumn(colPublisher, DEFAULT_DISPLAYING_COLUMN_NAME.CREATED_BY.getTitle(), true);
mapColumns.put(DEFAULT_DISPLAYING_COLUMN_NAME.CREATED_BY, colPublisher);
@ -441,7 +363,7 @@ public class ItemsTable<T extends DocumentDV> extends AbstractItemsCellTable<T>
};
};
colOperationStatus.setCellStyleNames(CSS_CLASS_BACK_SYSTEM_CELL_Y);
sortedCellTable.addColumn(colOperationStatus, DEFAULT_DISPLAYING_COLUMN_NAME.STATUS.getTitle(), true);
sortedCellTable.setColumnWidth(colOperationStatus, 120, Unit.PX);

24
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/tree/TreeItemPanel.java
View File

@ -45,7 +45,7 @@ public class TreeItemPanel {
*/
// Create a tree
public TreeItemPanel(String profileID, String itemTypeTitle, Collection<GeoNaFormCardModel> gnaCardsModels,
HandlerManager appManagerBus) {
final HandlerManager appManagerBus) {
this.appManagerBus = appManagerBus;
this.itemTypeTitle = itemTypeTitle;
this.profileID = profileID;
@ -56,6 +56,28 @@ public class TreeItemPanel {
root = new TreeItem(rootNode);
treeItemParents.put(JSON_ROOT_PATH, Arrays.asList(root));
/*
for (GeoNaFormCardModel geoNaFormCardModel : gnaCardsModels) {
GcubeProfileDV profile = geoNaFormCardModel.getGcubeProfile();
String parentName = profile.getParentName();
if (profile.getSectionName().compareTo("relazioneScavo") == 0) {
profile.setParentName(JSON_ROOT_PATH + "abstractRelazione");
}
if (profile.getSectionName().compareTo("posizionamentoScavo") == 0) {
profile.setParentName(JSON_ROOT_PATH + "immaginiRappresentative");
}
if (profile.getSectionName().compareTo("pianteFineScavo") == 0) {
profile.setParentName(JSON_ROOT_PATH + "immaginiRappresentative.posizionamentoScavo");
}
GWT.log(" print tree parentName: " + parentName + " name: " + profile.getSectionName() + " title: "
+ profile.getSectionTitle());
}*/
for (GeoNaFormCardModel geoNaFormCardModel : gnaCardsModels) {

132
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/utils/ExtModal.java
View File

@ -1,132 +0,0 @@
package org.gcube.portlets.user.geoportaldataentry.client.ui.utils;
import com.github.gwtbootstrap.client.ui.Modal;
import com.github.gwtbootstrap.client.ui.event.HideEvent;
import com.github.gwtbootstrap.client.ui.event.HideHandler;
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
import com.google.gwt.dom.client.Element;
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.Event;
import com.google.gwt.user.client.EventListener;
import com.google.gwt.user.client.Random;
/**
* The Class ExtModal.
*
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
*
* Apr 29, 2021
*
* This Class extends the {{@link Modal} preventing the default close of
* the Modal Bootstrap when clicking outside of the modal Window
*/
public class ExtModal extends Modal {
private String elementId;
private String closeElementId;
private Boolean closeButtoClicked = false;
final private ExtModal INSTANCE = this;
/**
* Instantiates a new ext modal.
*/
public ExtModal() {
super();
setElementIds();
addDeferredCommandToPreventModalClose();
}
/**
* Creates an empty, hidden widget with specified show behavior.
*
* @param animated <code>true</code> if the widget should be animated.
*/
public ExtModal(boolean animated) {
super(animated, false);
setElementIds();
addDeferredCommandToPreventModalClose();
}
/**
* Creates an empty, hidden widget with specified show behavior.
*
* @param animated <code>true</code> if the widget should be animated.
* @param dynamicSafe <code>true</code> removes from RootPanel when hidden
*/
public ExtModal(boolean animated, boolean dynamicSafe) {
super(animated, dynamicSafe);
setElementIds();
addDeferredCommandToPreventModalClose();
}
private void addDeferredCommandToPreventModalClose() {
Scheduler.get().scheduleDeferred(new ScheduledCommand() {
@Override
public void execute() {
((Element) INSTANCE.getElement().getChildNodes().getItem(0)).getFirstChildElement()
.setId(closeElementId);
preventModalCloseWhenClickingOutside();
}
});
}
/**
* Sets the element id.
*/
private void setElementIds() {
this.elementId = "my-modal-publish-meta" + Random.nextInt();
this.getElement().setId(elementId);
this.closeElementId = "my-modal-close-button" + Random.nextInt();
}
/**
* Prevent modal close when clicking outside.
*/
private void preventModalCloseWhenClickingOutside() {
com.google.gwt.user.client.Element buttonCloseElement = DOM.getElementById(this.closeElementId);
if (buttonCloseElement != null) {
Event.sinkEvents(buttonCloseElement, Event.ONCLICK);
Event.setEventListener(buttonCloseElement, new EventListener() {
@Override
public void onBrowserEvent(Event event) {
if (Event.ONCLICK == event.getTypeInt()) {
GWT.log("close event clicked");
closeButtoClicked = true;
}
}
});
} else {
GWT.log("button close element not found");
closeButtoClicked = true;
}
// hide any popup panel opened
this.addHideHandler(new HideHandler() {
@Override
public void onHide(HideEvent hideEvent) {
GWT.log("HideEvent on modal fired");
GWT.log(hideEvent.toDebugString());
GWT.log("CloseButtonClicked is: " + closeButtoClicked);
if (!closeButtoClicked) {
hideEvent.preventDefault();
hideEvent.stopPropagation();
}
}
});
}
}

7
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/utils/ModalConfirm.java
View File

@ -29,7 +29,6 @@ import com.google.gwt.user.client.ui.Widget;
*/
public class ModalConfirm extends Modal implements ClickHandler {
private static final int modal_width = 800;
private DockPanel dock = new DockPanel();
private Button yesButton;
private VerticalPanel vpContainer;
@ -45,7 +44,7 @@ public class ModalConfirm extends Modal implements ClickHandler {
* @param text the text
*/
public ModalConfirm(Image img, String caption, String text) {
setWidth(modal_width);
setWidth(800);
setAnimation(true);
// getElement().setClassName("gwt-DialogBoxNew");
dock.setSpacing(4);
@ -66,9 +65,7 @@ public class ModalConfirm extends Modal implements ClickHandler {
vpContainer = new VerticalPanel();
vpContainer.getElement().getStyle().setMargin(20.0, Unit.PX);
vpContainer.setWidth((modal_width - 70) + "px");
if (text != null)
vpContainer.add(new HTML(text));
vpContainer.add(new HTML(text));
hpButtons = new HorizontalPanel();
hpButtons.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER);
// hpButtons.getElement().getStyle().setMarginTop(20.0, Unit.PX);

16
src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/utils/UUIDUtil.java
View File

@ -1,16 +0,0 @@
package org.gcube.portlets.user.geoportaldataentry.client.ui.utils;
public class UUIDUtil {
public static String generateUUID() {
return nativeGenerateUUID();
}
// Usa una funzione JavaScript per generare un UUID
private static native String nativeGenerateUUID() /*-{
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
return v.toString(16);
});
}-*/;
}

15
src/main/java/org/gcube/portlets/user/geoportaldataentry/server/FormDataObjectToJSON.java
View File

@ -47,7 +47,7 @@ public class FormDataObjectToJSON {
// the root, instancing new json document
if (tree_Node.isRoot()) {
theRootDocument = JSONObjectOrdered.instance();
theRootDocument = JSONObjecOrdered.instance();
}
Configuration configuration = Configuration.builder().jsonProvider(new JsonOrgJsonProvider()).build();
@ -55,7 +55,7 @@ public class FormDataObjectToJSON {
for (Tree_Node<GeoNaFormDataObject> treeNodeChild : tree_Node.getChildren()) {
GeoNaFormDataObject gnaFO = treeNodeChild.getData();
// Reading data and profile
List<GenericDatasetBean> listGDB = gnaFO.getListGDB();
GcubeProfileDV profile = gnaFO.getGcubeProfileDV();
@ -161,9 +161,9 @@ public class FormDataObjectToJSON {
* @return the JSON object
* @throws JSONException the JSON exception
*/
protected JSONObject genericDatasetBeanToJSON(GenericDatasetBean gdb) throws JSONException {
private JSONObject genericDatasetBeanToJSON(GenericDatasetBean gdb) throws JSONException {
JSONObject sectJSONObject = JSONObjectOrdered.instance();
JSONObject sectJSONObject = JSONObjecOrdered.instance();
LinkedHashMap<String, List<String>> mapFields = gdb.getFormDataEntryFields();
LOG.debug("Map ordered: " + mapFields);
@ -180,9 +180,7 @@ public class FormDataObjectToJSON {
// value is a list
JSONArray array = new JSONArray();
for (String value : listValues) {
if(value!=null && !value.isEmpty()) {
array.put(value);
}
array.put(value);
}
sectJSONObject.put(key, array);
@ -239,7 +237,6 @@ public class FormDataObjectToJSON {
}
return target;
}
/**
* The Class JSONObjecOrdered.
@ -248,7 +245,7 @@ public class FormDataObjectToJSON {
*
* Mar 10, 2022
*/
public static class JSONObjectOrdered {
public static class JSONObjecOrdered {
/**
* Instance.

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

File diff suppressed because it is too large Load Diff

99
src/main/java/org/gcube/portlets/user/geoportaldataentry/server/MongoServiceUtil.java
View File

@ -6,9 +6,7 @@ import static org.gcube.application.geoportal.client.plugins.GeoportalAbstractPl
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.rmi.RemoteException;
import java.util.ArrayList;
import java.util.List;
@ -17,7 +15,6 @@ import org.bson.Document;
import org.gcube.application.geoportal.client.utils.Serialization;
import org.gcube.application.geoportal.common.faults.InvalidRequestException;
import org.gcube.application.geoportal.common.model.document.Project;
import org.gcube.application.geoportal.common.model.document.access.Access;
import org.gcube.application.geoportal.common.model.rest.RegisterFileSetRequest;
import org.gcube.application.geoportal.common.model.rest.TempFile;
import org.gcube.application.geoportal.common.rest.MongoConcessioni;
@ -27,7 +24,6 @@ import org.gcube.application.geoportal.common.utils.FileSets;
import org.gcube.application.geoportal.common.utils.StorageUtils;
import org.gcube.contentmanagement.blobstorage.transport.backend.RemoteBackendException;
import org.gcube.portlets.widgets.mpformbuilder.shared.upload.FileUploaded;
import org.gcube.portlets.widgets.mpformbuilder.shared.upload.FileUploadedRemote;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -46,35 +42,16 @@ public class MongoServiceUtil {
UseCaseDescriptorsI client = null;
/**
* Use case descriptors client.
*
* @return the use case descriptors I
*/
public UseCaseDescriptorsI useCaseDescriptorsClient() {
LOG.debug("useCaseDescriptorsClient called");
return useCaseDescriptors().build();
}
/**
* Gets the projects client.
*
* @param profileID the profile ID
* @return the projects client
*/
public Projects<Project> getProjectsClient(String profileID) {
LOG.debug("getProjectsClient called for profileID: " + profileID);
return projects(profileID).build();
}
/**
* Creates the new.
*
* @param profileID the profile ID
* @param jsonDocument the json document
* @return the project
* @throws RemoteException the remote exception
*/
public Project createNew(String profileID, String jsonDocument) throws RemoteException {
LOG.debug("createNew called for profileID: " + profileID);
Document myDocument = Document.parse(jsonDocument);
@ -85,38 +62,17 @@ public class MongoServiceUtil {
return project;
}
/**
* Register file set.
*
* @param profileID the profile ID
* @param project the project
* @param parentPath the parent path
* @param fieldName the field name
* @param fieldDefinition the field definition
* @param access the access
* @param files the files
* @throws RemoteException the remote exception
* @throws FileNotFoundException the file not found exception
* @throws JsonProcessingException the json processing exception
* @throws InvalidRequestException the invalid request exception
*/
public void registerFileSet(String profileID, Project project, String parentPath, String fieldName,
String fieldDefinition, Access access, File... files)
String fieldDefinition, File... files)
throws RemoteException, FileNotFoundException, JsonProcessingException, InvalidRequestException {
LOG.info("registerFileSet called for profileID: " + profileID);
LOG.info("and for parentPath: " + parentPath);
LOG.info("and for fieldName: " + fieldName);
LOG.info("and for fieldDefinition: " + fieldDefinition);
LOG.info("and for access: " + access);
LOG.debug("registerFileSet called for profileID: " + profileID);
Projects<Project> client = getProjectsClient(profileID);
// Prepare request
RegisterFileSetRequest fsRequest = FileSets.prepareRequest(new StorageUtils(), parentPath, fieldName,
fieldDefinition, files);
fsRequest.setToSetAccess(access);
project = client.registerFileSet(project.getId(), fsRequest);
LOG.trace("Resulting Project : " + project);
LOG.debug("Resulting Project as JSON: " + Serialization.write(project));
}
@ -180,31 +136,32 @@ public class MongoServiceUtil {
return files;
}
/**
* To temp file from remote.
*
* @param file the file
* @return the temp file
*/
public TempFile toTempFileFromRemote(FileUploadedRemote file) {
LOG.debug("toTemFilesFromRemote called");
if (file == null)
return null;
// Building TempFile
TempFile storageTempFile = null;
try {
InputStream is = new URL(file.getUrl()).openStream();
// Creating TempFile
storageTempFile = createTempFileOnStorage(is, file.getFileName());
} catch (IOException e) {
LOG.error("Error on creating temp file from URL: " + file.getUrl(), e);
}
return storageTempFile;
}
// /**
// * To tem files from WSC.
// *
// * @param listFiles the list files
// * @return the list
// */
// public List<TempFile> toTemFilesFromWSC(List<WorkspaceContentDV> listFiles) {
// LOG.debug("toTemFilesFromWSC called");
// if (listFiles == null || listFiles.isEmpty())
// return null;
//
// // Building TempFile
// List<TempFile> files = new ArrayList<TempFile>(listFiles.size());
// for (WorkspaceContentDV fileUploaded : listFiles) {
// InputStream is;
// try {
// is = new URL(fileUploaded.getLink()).openStream();
// // Creating TempFile
// TempFile storageTempFile = createTempFileOnStorage(is, fileUploaded.getName());
// files.add(storageTempFile);
// } catch (IOException e) {
// LOG.error("Error on creating temp file from URL: " + fileUploaded.getLink(), e);
// }
// }
// return files;
// }
/**
* To JSON.

106
src/main/java/org/gcube/portlets/user/geoportaldataentry/server/MonitoringActionsOnServer.java
View File

@ -1,106 +0,0 @@
package org.gcube.portlets.user.geoportaldataentry.server;
import java.io.Serializable;
import java.util.LinkedHashMap;
import javax.servlet.http.HttpServletRequest;
import org.gcube.portlets.user.geoportaldataentry.shared.CommitReport;
import org.gcube.portlets.user.geoportaldataentry.shared.monitoring.MonitoringAction;
public class MonitoringActionsOnServer implements Serializable {
/**
*
*/
private static final long serialVersionUID = -2370892426311458184L;
private LinkedHashMap<Integer, MonitoringAction> monitor = new LinkedHashMap<Integer, MonitoringAction>();
private Exception exception;
private HttpServletRequest request;
private String monitorUUID;
private CommitReport commitReport;
private boolean monitoringTerminatedOnServer;
private boolean monitoringTerminatedClientConsumed;
public MonitoringActionsOnServer(HttpServletRequest httpServletRequest, String monitorUUID) {
this.request = httpServletRequest;
this.monitorUUID = monitorUUID;
}
/**
* Push action.
*
* @param action the action
* @return the action Id
*/
public synchronized MonitoringAction pushAction(MonitoringAction action) {
final int current = monitor.size();
int actionId = current + 1;
action.setActionId(actionId);
monitor.put(actionId, action);
updateMonitorInSession();
return action;
}
public synchronized void overrideAction(MonitoringAction action) {
monitor.put(action.getActionId(), action);
updateMonitorInSession();
}
public MonitoringAction getAction(Integer index) {
if (index == null || index < 0)
return null;
return monitor.get(index);
}
public LinkedHashMap<Integer, MonitoringAction> getMonitor() {
return monitor;
}
private void updateMonitorInSession() {
SessionUtil.setMonitorStatus(request, monitorUUID, this);
}
public void setMonitoringTerminated(boolean bool) {
this.monitoringTerminatedOnServer = bool;
updateMonitorInSession();
}
public boolean isMonitoringTerminatedOnServer() {
return monitoringTerminatedOnServer;
}
public void destroyMonitor() {
SessionUtil.removeMonitorStatus(request, monitorUUID);
}
public Exception getException() {
return exception;
}
public void setException(Exception exception) {
this.exception = exception;
}
public void setCommitReport(CommitReport commitReport) {
this.commitReport = commitReport;
}
public CommitReport getCommitReport() {
return commitReport;
}
public String getMonitorUUID() {
return monitorUUID;
}
}

78
src/main/java/org/gcube/portlets/user/geoportaldataentry/server/SessionUtil.java
View File

@ -12,7 +12,9 @@ import javax.servlet.http.HttpSession;
import org.gcube.application.geoportal.common.model.legacy.Concessione;
import org.gcube.application.geoportal.common.rest.MongoConcessioni;
import org.gcube.application.geoportalcommon.GeoportalCommon;
import org.gcube.application.geoportalcommon.shared.GNADataEntryConfigProfile;
import org.gcube.application.geoportalcommon.shared.GNADataViewerConfigProfile;
import org.gcube.application.geoportalcommon.shared.geoportal.project.ProjectDV;
import org.gcube.application.geoportalcommon.shared.geoportal.ucd.RelationshipDefinitionDV;
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
@ -41,8 +43,7 @@ public class SessionUtil {
private static final String GNA_DATAENTRY_CONFIG_PROFILE = "GNA_DATAENTRY_CONFIG_PROFILE";
private static final String LATEST_RESULT_SET_SORTED = "LATEST_RESULT_SET_SORTED";
// private static final String GEONA_DATAVIEWER_PROFILE =
// "GEONA_DATAVIEWER_PROFILE";
private static final String GEONA_DATAVIEWER_PROFILE = "GEONA_DATAVIEWER_PROFILE";
private static final String LIST_OF_CONCESSIONI = "LIST_OF_CONCESSIONI";
private static final String LIST_OF_RELATIONSHIP_DEFINITION = "LIST_OF_RELATIONSHIP_DEFINITION";
@ -231,28 +232,28 @@ public class SessionUtil {
return listOfConcessioni;
}
// /**
// * Gets the geportal viewer resource profile.
// *
// * @param httpServletRequest the http servlet request
// * @return the geportal viewer resource profile
// * @throws Exception the exception
// */
// public static GNADataViewerConfigProfile getGeportalViewerResourceProfile(HttpServletRequest httpServletRequest)
// throws Exception {
// HttpSession session = httpServletRequest.getSession();
// GNADataViewerConfigProfile geoNaDataViewerProfile = (GNADataViewerConfigProfile) session
// .getAttribute(GEONA_DATAVIEWER_PROFILE);
//
// if (geoNaDataViewerProfile == null) {
// GeoportalCommon gc = new GeoportalCommon();
// geoNaDataViewerProfile = gc.readGNADataViewerConfig(null);
// session.setAttribute(GEONA_DATAVIEWER_PROFILE, geoNaDataViewerProfile);
// }
//
// return geoNaDataViewerProfile;
//
// }
/**
* Gets the geportal viewer resource profile.
*
* @param httpServletRequest the http servlet request
* @return the geportal viewer resource profile
* @throws Exception the exception
*/
public static GNADataViewerConfigProfile getGeportalViewerResourceProfile(HttpServletRequest httpServletRequest)
throws Exception {
HttpSession session = httpServletRequest.getSession();
GNADataViewerConfigProfile geoNaDataViewerProfile = (GNADataViewerConfigProfile) session
.getAttribute(GEONA_DATAVIEWER_PROFILE);
if (geoNaDataViewerProfile == null) {
GeoportalCommon gc = new GeoportalCommon();
geoNaDataViewerProfile = gc.readGNADataViewerConfig(null);
session.setAttribute(GEONA_DATAVIEWER_PROFILE, geoNaDataViewerProfile);
}
return geoNaDataViewerProfile;
}
/**
* Gets the latest result set sorted.
@ -326,7 +327,7 @@ public class SessionUtil {
HttpSession session = threadLocalRequest.getSession();
session.setAttribute(LIST_OF_RELATIONSHIP_DEFINITION + profileID, listRelationshipNames);
}
/**
* Gets the JSON timeline template.
*
@ -352,32 +353,5 @@ public class SessionUtil {
session.setAttribute(TIMELINE_JSON_TEMPLATE + profileID, jsonTimelineTemplate);
}
public static void setMonitorStatus(HttpServletRequest httpServletRequest, String uuidAsString,
MonitoringActionsOnServer monitorActions) {
HttpSession session = httpServletRequest.getSession();
String monitorID = getUniqueMonitorID(uuidAsString);
session.setAttribute(monitorID, monitorActions);
}
public static void removeMonitorStatus(HttpServletRequest httpServletRequest, String uuidAsString) {
HttpSession session = httpServletRequest.getSession();
String monitorID = getUniqueMonitorID(uuidAsString);
session.removeAttribute(monitorID);
}
public static MonitoringActionsOnServer getMonitorStatus(HttpServletRequest httpServletRequest, String uuidAsString) {
HttpSession session = httpServletRequest.getSession();
String monitorID = getUniqueMonitorID(uuidAsString);
try {
return (MonitoringActionsOnServer) session.getAttribute(monitorID);
}catch (Exception e) {
LOG.warn("No monitor in session for id: "+monitorID);
return null;
}
}
public static final String getUniqueMonitorID(String uuid) {
return uuid + "_MONITOR";
}
}

328
src/main/java/org/gcube/portlets/user/geoportaldataentry/server/json/JsonMerge.java
View File

@ -1,328 +0,0 @@
package org.gcube.portlets.user.geoportaldataentry.server.json;
import java.io.IOException;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
/**
* This class provides methods to merge two json of any nested level into a
* single json.
*
* copied from: https://github.com/hemantsonu20/json-merge
*
* @maintainer updated by Francesco Mangiacrapa at ISTI-CNR
* francesco.mangiacrapa@isti.cnr.it
*
* Apr 21, 2023
*/
public class JsonMerge {
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
/**
* The Enum MERGE_OPTION.
*
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
*
* Apr 21, 2023
*/
public static enum MERGE_OPTION {
MERGE, REPLACE
}
/**
* Method to merge two json objects into single json object.
*
* <p>
* It merges two json of any nested level into a single json following below
* logic.
* </p>
* <ul>
* <li>When keys are different, both keys with there values will be copied at
* same level.</li>
* <li>
* <p>
* When keys are same at some level, following table denotes what value will be
* used.
* </p>
* <table border="1" summary="">
* <thead>
* <tr>
* <th align="left">Src / Target</th>
* <th align="left">JSON Value</th>
* <th align="left">JSON Array</th>
* <th align="left">JSON Object</th>
* </tr>
* </thead> <tbody>
* <tr>
* <td align="left">JSON Value<sup>1</sup></td>
* <td align="left">Src</td>
* <td align="left">Src</td>
* <td align="left">Src</td>
* </tr>
* <tr>
* <td align="left">JSON Array</td>
* <td align="left">Src<sup>2</sup></td>
* <td align="left">Merge</td>
* <td align="left">Src</td>
* </tr>
* <tr>
* <td align="left">JSON Object</td>
* <td align="left">Src</td>
* <td align="left">Src</td>
* <td align="left">Merge<sup>3</sup></td>
* </tr>
* </tbody>
* </table>
* <ul>
* <li><sup><strong>1</strong></sup> Json Value denotes boolean, number or
* string value in json.</li>
* <li><sup><strong>2</strong></sup> Src denotes <code>Src</code> value will be
* copied.</li>
* <li><sup><strong>3</strong></sup> Merge denotes both <code>Src</code> and
* <code>Target</code> values will be merged.</li>
* </ul>
* </li>
* </ul>
*
* <h2>Examples</h2>
* <h3>Example 1</h3>
* <p>
* <strong>Source Json</strong>
* </p>
*
* <pre>
* {@code
* {
* "name": "json-merge-src"
* }
* }
* </pre>
* <p>
* <strong>Target Json</strong>
* </p>
*
* <pre>
* {@code
* {
* "name": "json-merge-target"
* }
* }
* </pre>
* <p>
* <strong>Output</strong>
* </p>
*
* <pre>
* {@code
* {
* "name": "json-merge-src"
* }
* }
* </pre>
*
* <h3>Example 2</h3>
* <p>
* <strong>Source Json</strong>
* </p>
*
* <pre>
* {@code
* {
* "level1": {
* "key1": "SrcValue1"
* }
* }
* }
* </pre>
* <p>
* <strong>Target Json</strong>
* </p>
*
* <pre>
* {@code
* {
* "level1": {
* "key1": "targetValue1",
* "level2": {
* "key2": "value2"
* }
* }
* }
* }
* </pre>
* <p>
* <strong>Output</strong>
* </p>
*
* <pre>
* {@code
* {
* "level1": {
* "key1": "SrcValue1",
* "level2": {
* "key2": "value2"
* }
* }
* }
* }
* </pre>
*
* @param srcJsonStr source json string
* @param targetJsonStr target json string
* @param option the option
* @return merged json as a string
*/
public static String merge(String srcJsonStr, String targetJsonStr, MERGE_OPTION option) {
try {
if (option == null)
option = MERGE_OPTION.MERGE;
JsonNode srcNode = OBJECT_MAPPER.readTree(srcJsonStr);
JsonNode targetNode = OBJECT_MAPPER.readTree(targetJsonStr);
JsonNode result = merge(srcNode, targetNode, option);
return OBJECT_MAPPER.writeValueAsString(result);
} catch (IOException e) {
throw new JsonMergeException("Unable to merge json", e);
}
}
/**
* Merge.
*
* @param srcNode the src node
* @param targetNode the target node
* @param option the option
* @return the json node
*/
public static JsonNode merge(JsonNode srcNode, JsonNode targetNode, MERGE_OPTION option) {
if (option == null)
option = MERGE_OPTION.MERGE;
// if both nodes are object node, merged object node is returned
if (srcNode.isObject() && targetNode.isObject()) {
return merge((ObjectNode) srcNode, (ObjectNode) targetNode, option);
}
// if both nodes are array node, merged array node is returned
if (srcNode.isArray() && targetNode.isArray()) {
return mergeArray((ArrayNode) srcNode, (ArrayNode) targetNode, option);
}
// special case when src node is null
if (srcNode.isNull()) {
return targetNode;
}
return srcNode;
}
/**
* Merge.
*
* @param srcNode the src node
* @param targetNode the target node
* @param option the option
* @return the object node
*/
public static ObjectNode merge(ObjectNode srcNode, ObjectNode targetNode, MERGE_OPTION option) {
ObjectNode result = OBJECT_MAPPER.createObjectNode();
Iterator<Map.Entry<String, JsonNode>> srcItr = srcNode.fields();
while (srcItr.hasNext()) {
Map.Entry<String, JsonNode> entry = srcItr.next();
// check key in src json exists in target json or not at same level
if (targetNode.has(entry.getKey())) {
result.set(entry.getKey(), merge(entry.getValue(), targetNode.get(entry.getKey()), option));
} else {
// if key in src json doesn't exist in target json, just copy the same in result
result.set(entry.getKey(), entry.getValue());
}
}
// copy fields from target json into result which were missing in src json
Iterator<Map.Entry<String, JsonNode>> targetItr = targetNode.fields();
while (targetItr.hasNext()) {
Map.Entry<String, JsonNode> entry = targetItr.next();
if (!result.has(entry.getKey())) {
result.set(entry.getKey(), entry.getValue());
}
}
return result;
}
/**
* Merge.
*
* @param srcNode the src node
* @param targetNode the target node
* @param option the option
* @return the array node
*/
public static ArrayNode mergeArray(ArrayNode srcNode, ArrayNode targetNode, MERGE_OPTION option) {
ArrayNode result = OBJECT_MAPPER.createArrayNode();
switch (option) {
case REPLACE:
//Replacing source json value as result
return result.addAll(srcNode);
//return result.addAll(srcNode).addAll(targetNode);
default:
return mergeSet(srcNode, targetNode);
}
}
/**
* Added by Francesco Mangiacrapa Merge set.
*
* @param srcNode the src node
* @param targetNode the target node
* @return the array node
*/
public static ArrayNode mergeSet(ArrayNode srcNode, ArrayNode targetNode) {
ArrayNode result = OBJECT_MAPPER.createArrayNode();
HashSet<JsonNode> set = new HashSet<>();
set = toHashSet(set, srcNode);
set = toHashSet(set, targetNode);
Iterator<JsonNode> itr = set.iterator();
while (itr != null && itr.hasNext()) {
JsonNode arrayValue = itr.next();
result.add(arrayValue);
}
return result;
}
/**
* To hash set.
*
* @param set the set
* @param srcNode the src node
* @return the hash set
*/
public static HashSet<JsonNode> toHashSet(HashSet<JsonNode> set, ArrayNode srcNode) {
if (srcNode != null) {
Iterator<JsonNode> itr = srcNode.elements();
while (itr != null && itr.hasNext()) {
JsonNode arrayValue = itr.next();
set.add(arrayValue);
}
}
return set;
}
}

20
src/main/java/org/gcube/portlets/user/geoportaldataentry/server/json/JsonMergeException.java
View File

@ -1,20 +0,0 @@
package org.gcube.portlets.user.geoportaldataentry.server.json;
/**
* Exception to be thrown in case of any error occured while merging two json.
*
*/
public class JsonMergeException extends RuntimeException {
public JsonMergeException() {
super();
}
public JsonMergeException(String msg) {
super(msg);
}
public JsonMergeException(String msg, Throwable th) {
super(msg, th);
}
}

79
src/main/java/org/gcube/portlets/user/geoportaldataentry/server/test/MockData.java
View File

@ -1,79 +0,0 @@
package org.gcube.portlets.user.geoportaldataentry.server.test;
import javax.servlet.http.HttpServletRequest;
import org.gcube.portlets.user.geoportaldataentry.server.MonitoringActionsOnServer;
import org.gcube.portlets.user.geoportaldataentry.shared.CommitReport;
import org.gcube.portlets.user.geoportaldataentry.shared.monitoring.MonitoringAction;
import org.gcube.portlets.user.geoportaldataentry.shared.monitoring.MonitoringAction.STATUS;
/**
* The Class MockData.
*
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
*
* Oct 14, 2024
*/
public class MockData {
/**
* Mock monitor.
*
* @param uuidAsString the uuid as string
* @param request the request
* @throws InterruptedException the interrupted exception
*/
public static final void mockMonitor(String uuidAsString, HttpServletRequest request) throws InterruptedException {
final MonitoringActionsOnServer monitoringActionsOnServer = new MonitoringActionsOnServer(request,
uuidAsString);
// 1. Action to Monitoring
MonitoringAction action = new MonitoringAction(STATUS.IN_PROGESS,
"Converting prject metadata to Geoportal data model");
action = monitoringActionsOnServer.pushAction(action);
// 1. Action completed
action.setMsg("Converted prject metadata to Geoportal data model");
action.setStatus(STATUS.DONE);
monitoringActionsOnServer.overrideAction(action);
// 2. Action to Monitoring
MonitoringAction action2 = new MonitoringAction(STATUS.IN_PROGESS,
"Creating project on Geoportal Storage service");
action2 = monitoringActionsOnServer.pushAction(action2);
Thread.sleep(5000);
// 2. Action completed
action2.setMsg("Created project on Geoportal Storage service");
action2.setStatus(STATUS.DONE);
monitoringActionsOnServer.overrideAction(action2);
// 3. Action to Monitoring
MonitoringAction action3 = new MonitoringAction(STATUS.IN_PENDING, "Going to register the file/s...");
action3 = monitoringActionsOnServer.pushAction(action3);
for (int i = 0; i < 5; i++) {
String fileName = "File " + i;
// 1..N Monitoring Uploading Fileset
MonitoringAction actionI = new MonitoringAction(STATUS.IN_PROGESS, "Registering the fileset: " + fileName);
actionI = monitoringActionsOnServer.pushAction(actionI);
Thread.sleep(5000);
// 1..N Monitoring Fileset uploaded action completed
actionI.setMsg("Fileset " + fileName + " registered correclty");
actionI.setStatus(STATUS.DONE);
monitoringActionsOnServer.overrideAction(actionI);
}
monitoringActionsOnServer.setMonitoringTerminated(true);
Thread.sleep(5000);
CommitReport commitReport = new CommitReport("Mock projectId", "Mock profileId", null, null);
monitoringActionsOnServer.setCommitReport(commitReport);
}
}

21
src/main/java/org/gcube/portlets/user/geoportaldataentry/shared/ProjectNotFoundException.java
View File

@ -1,21 +0,0 @@
package org.gcube.portlets.user.geoportaldataentry.shared;
public class ProjectNotFoundException extends Exception {
/**
*
*/
private static final long serialVersionUID = 4918313646452701634L;
public ProjectNotFoundException() {
}
public ProjectNotFoundException(String error){
super(error);
}
public ProjectNotFoundException(Throwable error){
super(error);
}
}

89
src/main/java/org/gcube/portlets/user/geoportaldataentry/shared/monitoring/MonitoringAction.java
View File

@ -1,89 +0,0 @@
package org.gcube.portlets.user.geoportaldataentry.shared.monitoring;
import java.io.Serializable;
public class MonitoringAction implements Serializable {
/**
*
*/
private static final long serialVersionUID = 7129157692965636149L;
private Integer actionId;
private STATUS status;
private String msg;
public static enum STATUS {
IN_PENDING("Pending", "Operation in Pending"),
IN_PROGESS("Progress", "Operation in Progress"),
FAILED("Failed", "Operation Failed"),
DONE("Done", "Operation Done");
String id;
String label;
STATUS(String id, String label) {
this.id = id;
this.label = label;
}
public String getId() {
return id;
}
public String getLabel() {
return label;
}
}
public MonitoringAction() {
}
public MonitoringAction(STATUS status, String msg) {
this.status = status;
this.msg = msg;
}
public MonitoringAction(Integer actionId, STATUS status, String msg) {
this(status, msg);
this.actionId = actionId;
}
public STATUS getStatus() {
return status;
}
public String getMsg() {
return msg;
}
public void setStatus(STATUS status) {
this.status = status;
}
public void setMsg(String msg) {
this.msg = msg;
}
public Integer getActionId() {
return actionId;
}
public void setActionId(Integer actionId) {
this.actionId = actionId;
}
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append("MonitoringAction [actionId=");
builder.append(actionId);
builder.append(", status=");
builder.append(status);
builder.append(", msg=");
builder.append(msg);
builder.append("]");
return builder.toString();
}
}

87
src/main/java/org/gcube/portlets/user/geoportaldataentry/shared/monitoring/MonitoringActionsOnClient.java
View File

@ -1,87 +0,0 @@
package org.gcube.portlets.user.geoportaldataentry.shared.monitoring;
import java.io.Serializable;
import java.util.LinkedHashMap;
import org.gcube.portlets.user.geoportaldataentry.shared.CommitReport;
public class MonitoringActionsOnClient implements Serializable {
/**
*
*/
private static final long serialVersionUID = -8517260295153833253L;
private LinkedHashMap<Integer, MonitoringAction> monitor = new LinkedHashMap<Integer, MonitoringAction>();
private Exception exception;
private String monitorUUID;
private CommitReport commitReport;
private boolean monitoringTerminatedOnServer;
public MonitoringActionsOnClient() {
}
public LinkedHashMap<Integer, MonitoringAction> getMonitor() {
return monitor;
}
public Exception getException() {
return exception;
}
public String getMonitorUUID() {
return monitorUUID;
}
public CommitReport getCommitReport() {
return commitReport;
}
public boolean isMonitoringTerminatedOnServer() {
return monitoringTerminatedOnServer;
}
public void setMonitor(LinkedHashMap<Integer, MonitoringAction> monitor) {
this.monitor = monitor;
}
public void setException(Exception exception) {
this.exception = exception;
}
public void setMonitorUUID(String monitorUUID) {
this.monitorUUID = monitorUUID;
}
public void setCommitReport(CommitReport commitReport) {
this.commitReport = commitReport;
}
public void setMonitoringTerminatedOnServer(boolean monitoringTerminatedOnServer) {
this.monitoringTerminatedOnServer = monitoringTerminatedOnServer;
}
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append("MonitoringActionsOnClient [monitor=");
builder.append(monitor);
builder.append(", exception=");
builder.append(exception);
builder.append(", monitorUUID=");
builder.append(monitorUUID);
builder.append(", commitReport=");
builder.append(commitReport);
builder.append(", monitoringTerminatedOnServer=");
builder.append(monitoringTerminatedOnServer);
builder.append("]");
return builder.toString();
}
}

35
src/main/resources/org/gcube/portlets/user/geoportaldataentry/GeoPortalDataEntryApp.gwt.xml
View File

@ -12,31 +12,28 @@
<inherits name="com.google.gwt.json.JSON" />
<inherits
name='org.gcube.application.geoportalcommon.GeoportalDataCommon' />
<inherits
name='org.gcube.application.geoportaldatamapper.GeoportalDataMapper' />
<inherits
name='org.gcube.portlets.widgets.gdvw.geoportal_data_viewer_widget' />
<inherits
name='org.gcube.portlets.widgets.mpformbuilder.MetadataProfileFormBuilder' />
<inherits name='org.gcube.application.geoportalcommon.GeoportalDataCommon' />
<!-- <inherits name='com.google.gwt.user.theme.chrome.Chrome'/> -->
<!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/> -->
<!-- Inherit the default GWT style sheet. You can change -->
<!-- the theme of your GWT application by uncommenting -->
<!-- any one of the following lines. -->
<!--<inherits name='com.google.gwt.user.theme.standard.Standard' /> -->
<inherits name='org.gcube.portlets.widgets.mpformbuilder.MetadataProfileFormBuilder' />
<!-- Other module inherits -->
<!-- <inherits name='com.google.gwt.user.theme.chrome.Chrome'/> -->
<!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/> -->
<!-- Specify the app entry point class. -->
<entry-point
class='org.gcube.portlets.user.geoportaldataentry.client.GeoPortalDataEntryApp' />
<!-- Other module inherits -->
<!-- Specify the paths for translatable code -->
<source path='client' />
<source path='shared' />
<!-- Specify the app entry point class. -->
<entry-point class='org.gcube.portlets.user.geoportaldataentry.client.GeoPortalDataEntryApp' />
<!-- Specify the paths for translatable code -->
<source path='client' />
<source path='shared' />
</module>

54
src/main/webapp/GeoPortalDataEntryApp.css
View File

@ -49,7 +49,6 @@ h1 {
margin-left: 10px;
margin-bottom: 10px;
margin-right: 5px;
width: 100%;
}
.my-html-table td {
@ -101,9 +100,6 @@ h1 {
max-height: 700px !important;
}
.modal-body-edit {
max-height: none !important;
}
.disable-div {
pointer-events: none;
}
@ -114,16 +110,12 @@ h1 {
padding: 10px !important;
}
.form-fieldset-edit .control-group {
margin-bottom: 15px !important;
.gna-dataentry-form-fieldset fieldset {
margin: 10px !important;
border: 1px groove #ddd !important;
padding: 10px !important;
}
.form-fieldset-edit .control-group > span {
padding-top: 3px !important;
padding-bottom: 3px !important;
font-size: 14px;
margin-bottom: 10px;
}
.table-current-content {
width: 100%;
background-color: #efefef !important;
@ -297,40 +289,4 @@ h1 {
font-size: 12px !important;
}
/** END OVERRDING legend-style into 'metadata-profile-form-builder-widget' */
/** OVERRDING legend-style into 'metadata-profile-form-builder-widget' */
.legend-style {
width: auto !important;
padding-left: 10px !important;
padding-top: 0px !important;
padding-right: 10px !important;
margin-bottom: 0px !important;
border-bottom: 0px !important;
}
.legend-style small {
display: block;
font-size: 12px !important;
}
/** END OVERRDING legend-style into 'metadata-profile-form-builder-widget' */
.general_info {
text-align: center;
font-size: 20px;
}
.general_info div {
padding: 20px;
}
.general_info_facility {
font-style: italic;
font-weight: bold;
color: #3e6eac;
font-family: Helvetica, Arial;
}
/** END OVERRDING legend-style into 'metadata-profile-form-builder-widget' */

231
src/test/java/org/gcube/application/Service_Tests.java
View File

@ -1,231 +0,0 @@
package org.gcube.application;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import java.util.List;
import java.util.Properties;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
import org.gcube.application.geoportal.common.model.JSONPathWrapper;
import org.gcube.application.geoportal.common.model.document.Project;
import org.gcube.application.geoportal.common.model.document.access.Access;
import org.gcube.application.geoportal.common.model.document.access.AccessPolicy;
import org.gcube.application.geoportalcommon.geoportal.GeoportalClientCaller;
import org.gcube.application.geoportalcommon.geoportal.ProjectsCaller;
import org.gcube.application.geoportalcommon.geoportal.UseCaseDescriptorCaller;
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.portlets.user.geoportaldataentry.server.MongoServiceUtil;
import org.gcube.portlets.widgets.mpformbuilder.shared.upload.FileUploadedRemote;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.gwt.user.client.Random;
public class Service_Tests {
private static final String GCUBE_CONFIG_PROPERTIES_FILENAME = "gcube_config.properties";
// APP Working Directory + /src/test/resources must be the location of
// gcube_config.properties
private static String gcube_config_path = String.format("%s/%s",
System.getProperty("user.dir") + "/src/test/resources", GCUBE_CONFIG_PROPERTIES_FILENAME);
private static String CONTEXT;
private static String TOKEN;
private UseCaseDescriptorCaller clientUCD = null;
private ProjectsCaller clientPrj = null;
private static String PROFILE_ID = "profiledConcessioni";
private static String PROJECT_ID = "644a66e944aad51c80409a3b";
private static String MY_LOGIN = "francesco.mangiacrapa";
public static final String JSON_$_POINTER = "$";
private static final Logger LOG = LoggerFactory.getLogger(Service_Tests.class);
/**
* Read context settings.
*/
public static void readContextSettings() {
try (InputStream input = new FileInputStream(gcube_config_path)) {
Properties prop = new Properties();
// load a properties file
prop.load(input);
CONTEXT = prop.getProperty("CONTEXT");
TOKEN = prop.getProperty("TOKEN");
// get the property value and print it out
System.out.println("CONTEXT: " + CONTEXT);
System.out.println("TOKEN: " + TOKEN);
} catch (IOException ex) {
ex.printStackTrace();
}
}
//@Before
public void init() {
readContextSettings();
ScopeProvider.instance.set(CONTEXT);
SecurityTokenProvider.instance.set(TOKEN);
clientPrj = GeoportalClientCaller.projects();
clientUCD = GeoportalClientCaller.useCaseDescriptors();
}
//@Test
public void deleteFileSet_ServiceTest() throws Exception {
ScopeProvider.instance.set(CONTEXT);
SecurityTokenProvider.instance.set(TOKEN);
boolean ignore_errors = false;
String path = "$.abstractRelazione.filesetIta";
Project doc = clientPrj.getProjectByID(PROFILE_ID, PROJECT_ID);
// JSONPathWrapper wrapper = new JSONPathWrapper(doc.getTheDocument().toJson());
// List<String> matchingPaths = wrapper.getMatchingPaths(path);
//
// LOG.info("matchingPaths is: " + matchingPaths);
//
// String error = null;
// if (matchingPaths.isEmpty()) {
// error = "No Registered FileSet found at " + path;
// if (!ignore_errors) {
// throw new WebApplicationException(error, Response.Status.BAD_REQUEST);
// }
// }
// if (matchingPaths.size() > 1 && !ignore_errors) {
// error = "Multiple Fileset (" + matchingPaths.size() + ") matching " + path;
// if (!ignore_errors)
// throw new WebApplicationException(error, Response.Status.BAD_REQUEST);
// }
//
// if (error != null && ignore_errors) {
// LOG.info("Error detected {}. Ignoring it and returning input doc", error);
//
// }
//
// List<Object> listPath = wrapper.getByPath(path);
// LOG.info("List path: " + listPath);
// RegisteredFileSet fs = Serialization.convert(listPath.get(0), RegisteredFileSet.class);
// LOG.info("Going to delete {}", fs);
LOG.info("Going to delete {}", path);
Project newDoc = clientPrj.deleteFileset(PROFILE_ID, PROJECT_ID, path, true, true);
LOG.info("newDoc {}", newDoc);
}
//@Test
public void registerFileSet() throws Exception {
ScopeProvider.instance.set(CONTEXT);
SecurityTokenProvider.instance.set(TOKEN);
Project theProject = clientPrj.getProjectByID(PROFILE_ID, PROJECT_ID);
MongoServiceUtil mongoService = new MongoServiceUtil();
Access access = new Access();
access.setLicense("CC-BY");
access.setPolicy(AccessPolicy.OPEN);
String sectionJSONPath = "$.abstractRelazione";
String fieldName = "filesetIta";
String fieldDefinition = "$.abstractRelazione._children[?(@.filesetIta)]";
String theFileName = "Application_Profile_for_CSW_2.0-2.pdf";
String theFileURL = "https://data.dev.d4science.org/shub/E_bnN2aDJZZUMySy9peE9ScEVLNVFNWjBOZWx0cXQ2UUFkQ2E3Rjc1S29EelJIMEJGbDRoczBnbHVPWHczZTNQTw==";
FileUploadedRemote file = new FileUploadedRemote();
file.setUrl(theFileURL);
file.setFileName(theFileName);
File input = null;
File output = null;
try {
File tempDir = Files.createTempDirectory("GEOPORTAL_REPLACE_FILES_").toFile();
String tmpDirPath = tempDir.getAbsolutePath();
if (file instanceof FileUploadedRemote) {
FileUploadedRemote remote = (FileUploadedRemote) file;
LOG.info("Uploaded file is remote: " + remote.getUrl());
InputStream in = new URL(remote.getUrl()).openStream();
String fileName = (remote.getFileName() == null || remote.getFileName().isEmpty())
? "file_" + Random.nextInt()
: remote.getFileName();
LOG.info("the fileName is: " + fileName);
output = new File(tmpDirPath, fileName);
Path outputAbsolutePath = Paths.get(output.getAbsolutePath());
Files.copy(in, outputAbsolutePath, StandardCopyOption.REPLACE_EXISTING);
LOG.info("Remote file: " + remote.getUrl() + ", copied to new file: " + output.getName());
} else {
LOG.info("Uploaded file is local: " + file.getTempSystemPath());
input = new File(file.getTempSystemPath());
output = new File(tmpDirPath, file.getFileName());
copyContent(input, output);
LOG.info("Temp file: " + file.getTempSystemPath() + ", copied to new file: " + output.getName());
}
//tempDir.deleteOnExit();
} catch (Exception e) {
LOG.warn("Skipping file: " + file.getFileName() + ". Error: " + e.getMessage(), e);
}
File fileset = output;
LOG.info("final fileName is: " + fileset.getName());
mongoService.registerFileSet(theProject.getProfileID(), theProject, sectionJSONPath, fieldName, fieldDefinition, access, fileset);
LOG.info("registerFileSet: finished!");
}
/**
* Copy content.
*
* @param a the a
* @param b the b
* @throws Exception the exception
*/
public static void copyContent(File a, File b) throws Exception {
FileInputStream in = new FileInputStream(a);
FileOutputStream out = new FileOutputStream(b);
try {
int n;
// read() function to read the
// byte of data
while ((n = in.read()) != -1) {
// write() function to write
// the byte of data
out.write(n);
}
} finally {
if (in != null) {
// close() function to close the
// stream
in.close();
}
// close() function to close
// the stream
if (out != null) {
out.close();
}
}
LOG.debug("File Copied");
}
}

328
src/test/java/org/gcube/portlets/user/geoportaldataentry/Complex_Tests.java
View File

@ -1,34 +1,15 @@
package org.gcube.portlets.user.geoportaldataentry;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Properties;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
import org.bson.Document;
import org.gcube.application.geoportal.client.utils.Serialization;
import org.gcube.application.geoportal.common.model.JSONPathWrapper;
import org.gcube.application.geoportal.common.model.document.Project;
import org.gcube.application.geoportal.common.model.document.access.Access;
import org.gcube.application.geoportal.common.model.document.access.AccessPolicy;
import org.gcube.application.geoportal.common.model.document.filesets.RegisteredFileSet;
import org.gcube.application.geoportal.common.model.useCaseDescriptor.HandlerDeclaration;
import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor;
import org.gcube.application.geoportalcommon.ConvertToDataServiceModel;
import org.gcube.application.geoportalcommon.ConvertToDataValueObjectModel;
import org.gcube.application.geoportalcommon.ProjectDVBuilder;
import org.gcube.application.geoportalcommon.geoportal.GeoportalClientCaller;
@ -50,18 +31,10 @@ import org.gcube.application.geoportalcommon.shared.geoportal.view.SectionView;
import org.gcube.application.geoportalcommon.shared.geoportal.view.SubDocumentView;
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.portlets.user.geoportaldataentry.server.FileSetDataObject;
import org.gcube.portlets.user.geoportaldataentry.server.FormDataObjectToJSON;
import org.gcube.portlets.user.geoportaldataentry.server.FormDataObjectToJSON.JSONObjectOrdered;
import org.gcube.portlets.user.geoportaldataentry.server.MongoServiceUtil;
import org.gcube.portlets.user.geoportaldataentry.server.json.JsonMerge;
import org.gcube.portlets.user.geoportaldataentry.server.json.JsonMerge.MERGE_OPTION;
import org.gcube.portlets.widgets.mpformbuilder.server.MetadataProfileFormBuilderServiceImpl;
import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.MetaDataProfileBean;
import org.gcube.portlets.widgets.mpformbuilder.shared.metadata.MetadataFieldWrapper;
import org.gcube.portlets.widgets.mpformbuilder.shared.upload.FileUploadedRemote;
import org.json.JSONArray;
import org.json.JSONObject;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
@ -71,28 +44,18 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gwt.user.client.Random;
import com.jayway.jsonpath.Configuration;
import com.jayway.jsonpath.DocumentContext;
import com.jayway.jsonpath.JsonPath;
import com.jayway.jsonpath.spi.json.GsonJsonProvider;
import com.jayway.jsonpath.spi.json.JsonOrgJsonProvider;
public class Complex_Tests {
private static final String GCUBE_CONFIG_PROPERTIES_FILENAME = "gcube_config.properties";
// APP Working Directory + /src/test/resources must be the location of
// gcube_config.properties
private static String gcube_config_path = String.format("%s/%s",
System.getProperty("user.dir") + "/src/test/resources", GCUBE_CONFIG_PROPERTIES_FILENAME);
private static String CONTEXT;
private static String TOKEN;
private UseCaseDescriptorCaller clientUCD = null;
private ProjectsCaller clientPrj = null;
private static String CONTEXT = "/gcube/devsec/devVRE";
private static String TOKEN = ""; // devVRE
private static String PROFILE_ID = "profiledConcessioni";
private static String PROJECT_ID = "644a66e944aad51c80409a3b";
private static String PROJECT_ID = "632c633155e2947b0278c999";
private static String MY_LOGIN = "francesco.mangiacrapa";
@ -131,149 +94,15 @@ public class Complex_Tests {
}
/**
* Read context settings.
*/
public static void readContextSettings() {
try (InputStream input = new FileInputStream(gcube_config_path)) {
Properties prop = new Properties();
// load a properties file
prop.load(input);
CONTEXT = prop.getProperty("CONTEXT");
TOKEN = prop.getProperty("TOKEN");
// get the property value and print it out
System.out.println("CONTEXT: " + CONTEXT);
System.out.println("TOKEN: " + TOKEN);
} catch (IOException ex) {
ex.printStackTrace();
}
}
@Before
//@Before
public void init() {
readContextSettings();
ScopeProvider.instance.set(CONTEXT);
SecurityTokenProvider.instance.set(TOKEN);
clientPrj = GeoportalClientCaller.projects();
clientUCD = GeoportalClientCaller.useCaseDescriptors();
}
// @Test
public void testSectionPathInnerParse() throws Exception {
String sectionPath = "$.abstractRelazione";
String profileID = "profiledConcessioni";
String projectID = "6425598a8593b215a1281e1c";
Configuration configurationGSON = Configuration.builder().jsonProvider(new GsonJsonProvider()).build();
ProjectsCaller client = GeoportalClientCaller.projects();
Project proejct = client.getProjectByID(profileID, projectID);
String jsonSourceProject = proejct.getTheDocument().toJson();
// If the section path is the Root document, passed as "$.", fixing as "$"
if (sectionPath.compareTo(FormDataObjectToJSON.JSON_$_POINTER + ".") == 0)
sectionPath = FormDataObjectToJSON.JSON_$_POINTER;
LOG.info("theString: {}", jsonSourceProject);
com.google.gson.JsonObject currentSectionJObject = JsonPath.parse(jsonSourceProject, configurationGSON)
.read(sectionPath);
LOG.info("currentSectionJObject: {}", currentSectionJObject.toString());
LOG.info("sourceSectionObject: {}", currentSectionJObject.toString());
JSONObject targetSectionJObject = new JSONObjectOrdered().instance();
targetSectionJObject.put("abstractIta", "Prova REJECT 1");
targetSectionJObject.put("titolo", "Prova REJECT abstract relazione di scavo 1");
LOG.info("targetSectionJObject: {}", targetSectionJObject.toString());
String mergedDoc = JsonMerge.merge(targetSectionJObject.toString(), currentSectionJObject.toString(),
MERGE_OPTION.REPLACE);
LOG.info("output: {}", mergedDoc);
String newDocJson;
// Updating path is first level of the root
if (sectionPath.equals(FormDataObjectToJSON.JSON_$_POINTER)) {
// The merged DOC is the root Document
newDocJson = mergedDoc;
} else {
// The merged DOC is a child of the root Document
Gson gson = new Gson();
JsonObject gsonOject = gson.fromJson(mergedDoc, JsonObject.class);
// Putting the merged section into Document
DocumentContext newContextDocJson = JsonPath.parse(jsonSourceProject, configurationGSON).set(sectionPath,
gsonOject);
newDocJson = newContextDocJson.json().toString();
}
Document updatedDocument = Serialization.read(newDocJson.toString(), Document.class);
LOG.info("New document is: {}", updatedDocument.toJson());
}
// @Test
public void testSectionPathRootParse() throws Exception {
String sectionPath = "$.";
String profileID = "profiledConcessioni";
String projectID = "6425598a8593b215a1281e1c";
Configuration configurationGSON = Configuration.builder().jsonProvider(new GsonJsonProvider()).build();
ProjectsCaller client = GeoportalClientCaller.projects();
Project proejct = client.getProjectByID(profileID, projectID);
String jsonSourceProject = proejct.getTheDocument().toJson();
// If the section path is the Root document, passed as "$.", fixing as "$"
if (sectionPath.compareTo(FormDataObjectToJSON.JSON_$_POINTER + ".") == 0)
sectionPath = FormDataObjectToJSON.JSON_$_POINTER;
LOG.info("theString: {}", jsonSourceProject);
com.google.gson.JsonObject currentSectionJObject = JsonPath.parse(jsonSourceProject, configurationGSON)
.read(sectionPath);
LOG.info("currentSectionJObject: {}", currentSectionJObject.toString());
LOG.info("sourceSectionObject: {}", currentSectionJObject.toString());
JSONObject targetSectionJObject = new JSONObjectOrdered().instance();
targetSectionJObject.put("nome", proejct.getTheDocument().get("nome") + " 1");
targetSectionJObject.put("titolo", proejct.getTheDocument().get("introduzione") + " 1");
LOG.info("targetSectionJObject: {}", targetSectionJObject.toString());
// JSONObject mergedSection = FormDataObjectToJSON.deepMerge(sourceSectionObject,
// targetSectionJObject);
String output = JsonMerge.merge(targetSectionJObject.toString(), currentSectionJObject.toString(),
MERGE_OPTION.REPLACE);
LOG.info("output: {}", output);
Gson gson = new Gson();
JsonObject gsonOject = gson.fromJson(output, JsonObject.class);
// Putting the merged section into Document
DocumentContext newContextDocJson = JsonPath.parse(jsonSourceProject, configurationGSON).set(sectionPath,
gsonOject);
// DocumentContext newDocument = JsonPath.parse(jsonSourceProject,
// configurationGSON).set(sectionPath, new JSONObject(output));
// String newDocJson = JsonPath.parse(jsonSourceProject).set(sectionPath, new
// JSONObject(output)).jsonString();
String newDocJson = newContextDocJson.json().toString();
LOG.info("Going to call updateProject with document: {}", newDocJson);
Document updatedDocument = Serialization.read(newDocJson.toString(), Document.class);
LOG.info("New document is: {}", updatedDocument.toJson());
}
// @Before
//@Before
public void preloadgCubeProfilesForUCDs() {
LOG.debug("preloadgCubeProfilesForUCDs called");
try {
@ -335,145 +164,6 @@ public class Complex_Tests {
}
//@Test
public void deleteFileSet_ServiceTest() throws Exception {
ScopeProvider.instance.set(CONTEXT);
SecurityTokenProvider.instance.set(TOKEN);
boolean ignore_errors = false;
String path = "$.abstractRelazione.filesetIta";
Project doc = clientPrj.getProjectByID(PROFILE_ID, PROJECT_ID);
JSONPathWrapper wrapper = new JSONPathWrapper(doc.getTheDocument().toJson());
List<String> matchingPaths = wrapper.getMatchingPaths(path);
LOG.info("matchingPaths is: " + matchingPaths);
String error = null;
if (matchingPaths.isEmpty()) {
error = "No Registered FileSet found at " + path;
if (!ignore_errors) {
throw new WebApplicationException(error, Response.Status.BAD_REQUEST);
}
}
if (matchingPaths.size() > 1 && !ignore_errors) {
error = "Multiple Fileset (" + matchingPaths.size() + ") matching " + path;
if (!ignore_errors)
throw new WebApplicationException(error, Response.Status.BAD_REQUEST);
}
if (error != null && ignore_errors) {
LOG.info("Error detected {}. Ignoring it and returning input doc", error);
}
List<Object> listPath = wrapper.getByPath(path);
LOG.info("List path: "+listPath);
// RegisteredFileSet fs = Serialization.convert(listPath.get(0), RegisteredFileSet.class);
// LOG.info("Going to delete {}", fs);
}
//@Test
public void registerFileSet() throws Exception {
ScopeProvider.instance.set(CONTEXT);
SecurityTokenProvider.instance.set(TOKEN);
Project theProject = clientPrj.getProjectByID(PROFILE_ID, PROJECT_ID);
MongoServiceUtil mongoService = new MongoServiceUtil();
Access access = new Access();
access.setLicense("CC-BY");
access.setPolicy(AccessPolicy.OPEN);
String sectionJSONPath = "$.abstractRelazione";
String fieldName = "filesetIta";
String fieldDefinition = "$.abstractRelazione._children[?(@.filesetIta)]";
String theFileName = "Application_Profile_for_CSW_2.0-2.pdf";
String theFileURL = "https://data.dev.d4science.org/shub/E_bnN2aDJZZUMySy9peE9ScEVLNVFNWjBOZWx0cXQ2UUFkQ2E3Rjc1S29EelJIMEJGbDRoczBnbHVPWHczZTNQTw==";
FileUploadedRemote file = new FileUploadedRemote();
file.setUrl(theFileURL);
file.setFileName(theFileName);
File input = null;
File output = null;
try {
File tempDir = Files.createTempDirectory("GEOPORTAL_REPLACE_FILES_").toFile();
String tmpDirPath = tempDir.getAbsolutePath();
if (file instanceof FileUploadedRemote) {
FileUploadedRemote remote = (FileUploadedRemote) file;
LOG.info("Uploaded file is remote: " + remote.getUrl());
InputStream in = new URL(remote.getUrl()).openStream();
String fileName = (remote.getFileName() == null || remote.getFileName().isEmpty())
? "file_" + Random.nextInt()
: remote.getFileName();
LOG.info("the fileName is: " + fileName);
output = new File(tmpDirPath, fileName);
Path outputAbsolutePath = Paths.get(output.getAbsolutePath());
Files.copy(in, outputAbsolutePath, StandardCopyOption.REPLACE_EXISTING);
LOG.info("Remote file: " + remote.getUrl() + ", copied to new file: " + output.getName());
} else {
LOG.info("Uploaded file is local: " + file.getTempSystemPath());
input = new File(file.getTempSystemPath());
output = new File(tmpDirPath, file.getFileName());
copyContent(input, output);
LOG.info("Temp file: " + file.getTempSystemPath() + ", copied to new file: " + output.getName());
}
// tempDir.deleteOnExit();
} catch (Exception e) {
LOG.warn("Skipping file: " + file.getFileName() + ". Error: " + e.getMessage(), e);
}
File fileset = output;
LOG.info("the fileName is: " + fileset.getName());
mongoService.registerFileSet(theProject.getProfileID(), theProject, sectionJSONPath, fieldName, fieldDefinition,
access, fileset);
}
/**
* Copy content.
*
* @param a the a
* @param b the b
* @throws Exception the exception
*/
public static void copyContent(File a, File b) throws Exception {
FileInputStream in = new FileInputStream(a);
FileOutputStream out = new FileOutputStream(b);
try {
int n;
// read() function to read the
// byte of data
while ((n = in.read()) != -1) {
// write() function to write
// the byte of data
out.write(n);
}
} finally {
if (in != null) {
// close() function to close the
// stream
in.close();
}
// close() function to close
// the stream
if (out != null) {
out.close();
}
}
LOG.debug("File Copied");
}
// @Test
public void testReadProjectForUCDDataEntry() {
ScopeProvider.instance.set(CONTEXT);
SecurityTokenProvider.instance.set(TOKEN);
@ -605,7 +295,7 @@ public class Complex_Tests {
String filesetJSONPath = String.format("%s.%s", JSON_$_POINTER, filePath.getFieldName());
List<Payload> listPayloads = readPayloadsForFileset(filesetJSONPath, fromSectionDocJSON);
FilesetDV filesetDV = new FilesetDV();
filesetDV.setGcubeProfileFieldName(filePath.getGcubeProfileFieldName());
filesetDV.setName(filePath.getGcubeProfileFieldName());
for (Payload payload : listPayloads) {
PayloadDV payloadDV = ConvertToDataValueObjectModel.toPayloadDV(payload);
filesetDV.addPayloadDV(payloadDV);
@ -640,7 +330,7 @@ public class Complex_Tests {
System.out.println("***** Files");
if (subDocument.getListFiles() != null) {
for (FilesetDV filesetDV : subDocument.getListFiles()) {
System.out.println("******* File Fileset name: " + filesetDV.getGcubeProfileFieldName());
System.out.println("******* File Fileset name: " + filesetDV.getName());
for (PayloadDV payload : filesetDV.getListPayload()) {
System.out.println("********* Payload: " + payload);
}
@ -649,7 +339,7 @@ public class Complex_Tests {
System.out.println("***** Images");
if (subDocument.getListImages() != null) {
for (FilesetDV filesetDV : subDocument.getListImages()) {
System.out.println("******* Image Fileset name: " + filesetDV.getGcubeProfileFieldName());
System.out.println("******* Image Fileset name: " + filesetDV.getName());
for (PayloadDV payload : filesetDV.getListPayload()) {
System.out.println("********* Payload: " + payload);
}

1
src/test/resources/.gitignore vendored
View File

@ -13,4 +13,3 @@
/ISTI.gcubekey
/d4science.research-infrastructures.eu.gcubekey
/howto.txt
/gcube_config.properties