gCubeSystem
/
workspace
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'edit_facility_26115' (!3) from edit_facility_26115 into master 

Reviewed-on: #3
This commit is contained in:
Francesco Mangiacrapa 2024-03-19 10:38:23 +01:00
parent 291eb8a0db 1824c9a7fd
commit 2c59016219
8 changed files with 187 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.classpath
View File

@ -1,7 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="**" kind="src" output="target/workspace-6.28.7-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<classpathentry kind="src" output="target/workspace-6.29.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
@ -11,29 +19,21 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/workspace-6.28.7-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<classpathentry excluding="**" kind="src" output="target/workspace-6.29.1-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/workspace-6.28.7-SNAPSHOT/WEB-INF/classes"/>
<classpathentry kind="output" path="target/workspace-6.29.1-SNAPSHOT/WEB-INF/classes"/>
</classpath>

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

@ -1,4 +1,4 @@
eclipse.preferences.version=1
lastWarOutDir=/home/francescomangiacrapa/git/workspace/target/workspace-6.28.7-SNAPSHOT
lastWarOutDir=/home/francescomangiacrapa/git/workspace/target/workspace-6.29.1-SNAPSHOT
warSrcDir=src/main/webapp
warSrcDirIsOutput=false

169
.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">
@ -58,8 +58,30 @@
<wb-module deploy-name="workspace-6.28.7-SNAPSHOT">
<wb-module deploy-name="workspace-6.29.1-SNAPSHOT">
@ -119,7 +141,18 @@
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
@ -179,7 +212,18 @@
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
@ -239,7 +283,7 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
@ -271,70 +315,36 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<dependent-module archiveName="storagehub-client-wrapper-1.2.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/storagehub-client-wrapper/storagehub-client-wrapper">
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<dependent-module archiveName="workspace-tree-widget-6.35.3-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/WorkspaceTree/WorkspaceTree">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="ckan-metadata-publisher-widget-2.1.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ckan-metadata-publisher-widget/ckan-metadata-publisher-widget">
<dependent-module archiveName="metadata-profile-form-builder-widget-2.1.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/metadata-profile-form-builder-widget/metadata-profile-form-builder-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="catalogue-util-library-1.3.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/catalogue-util-library/catalogue-util-library">
<dependency-type>uses</dependency-type>
</dependent-module>
@ -394,7 +404,18 @@
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
@ -454,7 +475,18 @@
<property name="context-root" value="workspace"/>
@ -514,7 +546,18 @@
</wb-module>

16
CHANGELOG.md
View File

@ -4,6 +4,12 @@
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).
## [v6.30.0-SNAPSHOT] - 2024-02-20
- Moved to maven parent 1.2.0
- Equipped with the new Catalogue Publishing Widget [#26825]
- Fixed Incident [#26678]
## [v6.29.0] - 2023-04-04
- Just to release the patch #24929 in the 'storagehub-client-wrapper'
@ -79,31 +85,31 @@ Just to include new SHUB model
[#19952] Fixed incident
## [v6.25.0] [r4.25.0] - 2020-08-25
## [v6.25.0] - 2020-08-25
#### Enhancements
[#19600] revisit the "Get Info" Dialog in a modern view
## [v6.24.1] [r4.24.0] - 2020-06-22
## [v6.24.1] - 2020-06-22
[#19493] Just to include the ckan-util-library patched
## [v6.24.0] [r4.23.0] - 2020-05-18
## [v6.24.0] - 2020-05-18
**New Features**
[#19058] Restore operation: the user has to select the destination folder
## [v6.23.2] [r4.22.0] - 2020-04-21
## [v6.23.2] - 2020-04-21
Just to include the new shub-client released
## [v6.23.1] [r4.21.0] - 2020-03-27
## [v6.23.1] - 2020-03-27
Ported to git/jenkins

52
pom.xml
View File

@ -6,14 +6,14 @@
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.gcube.tools</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
<relativePath />
</parent>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>workspace</artifactId>
<packaging>war</packaging>
<version>6.29.0</version>
<version>6.30.0-SNAPSHOT</version>
<name>gCube Workspace Portlet</name>
<description>
gCube Workspace Portlet is a web-gui to manage the gCube workspace, a collaborative area where users can exchange and organize information objects (workspace items) according to their specific needs.
@ -30,6 +30,8 @@
<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
<additionalparam>-Xdoclint:none</additionalparam>
<jackson.version>2.8.11</jackson.version>
<gcube-portal-bom-version>3.7.0</gcube-portal-bom-version>
<gxt2.2.5-gwt2.X-version>2.7.0</gxt2.2.5-gwt2.X-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@ -46,13 +48,41 @@
<dependency>
<groupId>org.gcube.distribution</groupId>
<artifactId>maven-portal-bom</artifactId>
<version>3.7.0</version>
<version>${gcube-portal-bom-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<profiles>
<!-- PROD profile -->
<!-- <profile> -->
<!-- <id>workspace-release-profile</id> -->
<!-- <activation> -->
<!-- <property> -->
<!-- <name>Release</name> -->
<!-- </property> -->
<!-- </activation> -->
<!-- <properties> -->
<!-- <gcube-portal-bom-version>3.7.0</gcube-portal-bom-version> -->
<!-- </properties> -->
<!-- </profile> -->
<!-- DEV profile -->
<!-- <profile> -->
<!-- <id>workspace-snapshot-profile</id> -->
<!-- <activation> -->
<!-- <property> -->
<!-- <name>!Release</name> -->
<!-- </property> -->
<!-- </activation> -->
<!-- <properties> -->
<!-- <gcube-portal-bom-version>3.8.0-SNAPSHOT</gcube-portal-bom-version> -->
<!-- </properties> -->
<!-- </profile> -->
</profiles>
<dependencies>
<dependency>
@ -122,6 +152,21 @@
<dependency>
<groupId>org.gcube.contentmanagement</groupId>
<artifactId>storage-manager-wrapper</artifactId>
<!-- Resolving conflict (NoSuchMethodError stax2/ri/EmptyIterator) with
version stax2-api:jar:4.1 see https://support.d4science.org/issues/26825#note-5 -->
<exclusions>
<exclusion>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
</exclusion>
</exclusions>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.4</version>
<scope>provided</scope>
</dependency>
@ -138,6 +183,7 @@
<artifactId>ic-client</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.core</groupId>
<artifactId>common-scope-maps</artifactId>

7
src/main/java/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
View File

@ -33,11 +33,12 @@
<inherits
name='org.gcube.portlets.widgets.openlayerbasicwidgets.olbasicwidgets' />
<inherits
name='org.gcube.portlets.widgets.mpformbuilder.MetadataProfileFormBuilder' />
<inherits
name='org.gcube.portlets.widgets.ckandatapublisherwidget.CKanMetadataPublisher' />
<!--<inherits name="org.realityforge.gwt.websockets.WebSockets" />-->
<!--<inherits name="org.realityforge.gwt.websockets.WebSockets" /> -->
<!-- Specify the app entry point class. -->
<entry-point

3
src/main/java/org/gcube/portlets/user/workspace/client/AppController.java
View File

@ -587,6 +587,9 @@ public class AppController implements SubscriberInterface {
new MessageBoxAlert("Error", caught.getMessage(), null);
wsPortlet.getGridGroupContainer().unmask();
//Reload the tree and select the root. Fixing Incident [#26678]
AppControllerExplorer.getEventBus().fireEvent(new LoadTreeEvent(true));
}

1
src/test/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/resources/