From eb12960ecc5870be13079dda4021491cd9b14305 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Tue, 20 Feb 2024 15:26:27 +0100 Subject: [PATCH 1/8] - Moved to maven parent 1.2.0 - Equipped with the new Catalogue Publishing Widget [#26825] --- .classpath | 27 ++-- .../com.gwtplugins.gdt.eclipse.core.prefs | 2 +- .settings/org.eclipse.wst.common.component | 115 +++++++----------- CHANGELOG.md | 15 ++- pom.xml | 23 +++- .../user/workspace/WorkspacePortlet.gwt.xml | 7 +- 6 files changed, 89 insertions(+), 100 deletions(-) diff --git a/.classpath b/.classpath index 6992f7d..318fdbd 100644 --- a/.classpath +++ b/.classpath @@ -1,7 +1,15 @@ - + + + + + + + + + @@ -11,29 +19,16 @@ - - - - - - + - - - - - - - - - + diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs index f534c2e..82d6b19 100644 --- a/.settings/com.gwtplugins.gdt.eclipse.core.prefs +++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs @@ -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 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index ceec618..38a96db 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,5 @@ - + @@ -58,8 +58,16 @@ - - + + + + + + + + + + @@ -119,7 +127,11 @@ - + + + + + @@ -179,7 +191,11 @@ - + + + + + @@ -239,7 +255,7 @@ - + @@ -264,77 +280,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + uses - - uses - - - uses - - + + + + + @@ -394,7 +353,11 @@ - + + + + + @@ -454,7 +417,11 @@ - + + + + + @@ -514,7 +481,11 @@ - + + + + + diff --git a/CHANGELOG.md b/CHANGELOG.md index 818edb5..ef31d2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ 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.29.1-SNAPSHOT] - 2024-02-20 + +- Moved to maven parent 1.2.0 +- Equipped with the new Catalogue Publishing Widget [#26825] + ## [v6.29.0] - 2023-04-04 - Just to release the patch #24929 in the 'storagehub-client-wrapper' @@ -79,31 +84,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 diff --git a/pom.xml b/pom.xml index 2b92a10..6f6ee4c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ maven-parent org.gcube.tools - 1.1.0 + 1.2.0 org.gcube.portlets.user workspace war - 6.29.0 + 6.29.1-SNAPSHOT gCube Workspace Portlet 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 @@ ${project.build.directory}/${project.build.finalName} -Xdoclint:none 2.8.11 + 3.8.0-SNAPSHOT + 2.7.0 UTF-8 UTF-8 @@ -46,7 +48,7 @@ org.gcube.distribution maven-portal-bom - 3.7.0 + ${gcube-portal-bom-version} pom import @@ -125,6 +127,20 @@ provided + + + org.gcube.data.analysis + data-miner-manager-cl + [1.0.0, 1.11.0-SNAPSHOT) + + + + org.projectlombok + lombok + 1.18.4 + provided + + com.sencha.gxt gxt2.2.5-gwt2.X @@ -138,6 +154,7 @@ ic-client provided + org.gcube.core common-scope-maps diff --git a/src/main/java/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml b/src/main/java/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml index ae84846..b871be1 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml +++ b/src/main/java/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml @@ -33,11 +33,12 @@ + + - - - + Date: Tue, 20 Feb 2024 17:50:17 +0100 Subject: [PATCH 2/8] added maven profiles --- pom.xml | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 6f6ee4c..1526e32 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ ${project.build.directory}/${project.build.finalName} -Xdoclint:none 2.8.11 - 3.8.0-SNAPSHOT + 3.7.0 2.7.0 UTF-8 @@ -55,6 +55,34 @@ + + + + workspace-release-profile + + + Release + + + + 3.7.0 + + + + + workspace-snapshot-profile + + + !Release + + + + 3.8.0-SNAPSHOT + + + + + @@ -127,13 +155,6 @@ provided - - - org.gcube.data.analysis - data-miner-manager-cl - [1.0.0, 1.11.0-SNAPSHOT) - - org.projectlombok lombok -- 2.17.1 From bd21f9460c38d37c582e2b7780d752a939016dc1 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Fri, 23 Feb 2024 17:29:14 +0100 Subject: [PATCH 3/8] commented profiles --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 1526e32..ab1e327 100644 --- a/pom.xml +++ b/pom.xml @@ -55,8 +55,8 @@ - - + + DEV profile workspace-snapshot-profile @@ -80,7 +80,7 @@ 3.8.0-SNAPSHOT - + --> -- 2.17.1 From 01075df11fdf4a8c1637c6427278b9b7dc5d39a1 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Mon, 26 Feb 2024 10:47:41 +0100 Subject: [PATCH 4/8] Added exclusion `org.codehaus.woodstox:stax2-api:jar` version stax2-api:jar:4.1, see #26825#note-6 --- .classpath | 5 ++ .settings/org.eclipse.wst.common.component | 60 ++++++++++++++++++---- pom.xml | 39 +++++--------- 3 files changed, 69 insertions(+), 35 deletions(-) diff --git a/.classpath b/.classpath index 318fdbd..0b739cc 100644 --- a/.classpath +++ b/.classpath @@ -30,5 +30,10 @@ + + + + + diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 38a96db..84b0439 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,9 @@ - + + + + + @@ -63,7 +67,11 @@ - + + + + + @@ -127,7 +135,11 @@ - + + + + + @@ -191,7 +203,11 @@ - + + + + + @@ -255,7 +271,11 @@ - + + + + + @@ -286,10 +306,20 @@ + + + uses - + + uses + + + + + + @@ -353,7 +383,11 @@ - + + + + + @@ -417,7 +451,11 @@ - + + + + + @@ -481,7 +519,11 @@ - + + + + + diff --git a/pom.xml b/pom.xml index ab1e327..eaa6eb1 100644 --- a/pom.xml +++ b/pom.xml @@ -55,32 +55,11 @@ - + @@ -152,6 +131,14 @@ org.gcube.contentmanagement storage-manager-wrapper + + + + org.codehaus.woodstox + stax2-api + + provided -- 2.17.1 From bd6705efcd108bae9c4f69f06e2ba43d89bc70b7 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Mon, 26 Feb 2024 11:39:48 +0100 Subject: [PATCH 5/8] Enabled maven profile --- pom.xml | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index eaa6eb1..d66baa5 100644 --- a/pom.xml +++ b/pom.xml @@ -55,11 +55,30 @@ - + + + workspace-release-profile + + + Release + + + + 3.7.0 + + + + workspace-snapshot-profile + + + !Release + + + + 3.8.0-SNAPSHOT + + + @@ -131,8 +150,8 @@ org.gcube.contentmanagement storage-manager-wrapper - + org.codehaus.woodstox -- 2.17.1 From 7367f5d1f8d0cb57f5521c1bf8b16da856377e2f Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 28 Feb 2024 11:06:29 +0100 Subject: [PATCH 6/8] commented profiles --- .settings/org.eclipse.wst.common.component | 33 +++++++++++-------- pom.xml | 38 ++++++++++++---------- 2 files changed, 40 insertions(+), 31 deletions(-) diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 84b0439..64e75b9 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,6 @@ - + + @@ -67,7 +68,8 @@ - + + @@ -135,7 +137,8 @@ - + + @@ -203,7 +206,8 @@ - + + @@ -271,7 +275,8 @@ - + + @@ -306,16 +311,15 @@ - + + - - uses - uses - + + @@ -383,7 +387,8 @@ - + + @@ -451,7 +456,8 @@ - + + @@ -519,7 +525,8 @@ - + + diff --git a/pom.xml b/pom.xml index d66baa5..5f03af8 100644 --- a/pom.xml +++ b/pom.xml @@ -56,27 +56,29 @@ + - workspace-release-profile - - - Release - - - - 3.7.0 - + + + + + + + + + + - workspace-snapshot-profile - - - !Release - - - - 3.8.0-SNAPSHOT - + + + + + + + + + -- 2.17.1 From 257a258ff240c70d44219ca3db57dab855a9f945 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 28 Feb 2024 11:10:21 +0100 Subject: [PATCH 7/8] commented profiles --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 5f03af8..f1c8f16 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ - + @@ -67,9 +67,9 @@ - + - + @@ -79,7 +79,7 @@ - + -- 2.17.1 From 1824c9a7fd1c117fdfa508b3f9e0d565a2d1042d Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Fri, 1 Mar 2024 12:05:43 +0100 Subject: [PATCH 8/8] Fixing Incident [#26678] --- .settings/org.eclipse.wst.common.component | 45 ++++++++++++++----- CHANGELOG.md | 3 +- pom.xml | 2 +- .../user/workspace/client/AppController.java | 3 ++ src/test/.gitignore | 1 + 5 files changed, 41 insertions(+), 13 deletions(-) create mode 100644 src/test/.gitignore diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 64e75b9..7e7e355 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,7 @@ - + + + @@ -68,7 +70,9 @@ - + + + @@ -137,7 +141,9 @@ - + + + @@ -206,7 +212,9 @@ - + + + @@ -275,7 +283,9 @@ - + + + @@ -311,14 +321,21 @@ - + + + - + uses - + + uses + + + + @@ -387,7 +404,9 @@ - + + + @@ -456,7 +475,9 @@ - + + + @@ -525,7 +546,9 @@ - + + + diff --git a/CHANGELOG.md b/CHANGELOG.md index ef31d2a..323b4ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,11 @@ 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.29.1-SNAPSHOT] - 2024-02-20 +## [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 diff --git a/pom.xml b/pom.xml index f1c8f16..b69bd6d 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.gcube.portlets.user workspace war - 6.29.1-SNAPSHOT + 6.30.0-SNAPSHOT gCube Workspace Portlet 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. diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java index 1108a50..95c23b3 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java @@ -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)); } diff --git a/src/test/.gitignore b/src/test/.gitignore new file mode 100644 index 0000000..cb6eb2c --- /dev/null +++ b/src/test/.gitignore @@ -0,0 +1 @@ +/resources/ -- 2.17.1