Compare commits
58 Commits
24
.classpath
24
.classpath
|
@ -1,7 +1,15 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry excluding="**" kind="src" output="target/workspace-6.27.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
|
<classpathentry kind="src" output="target/workspace-6.30.2-SNAPSHOT/WEB-INF/classes" path="src/main/java">
|
||||||
<attributes>
|
<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"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
|
@ -11,29 +19,21 @@
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</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">
|
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
|
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="src" output="target/workspace-6.27.0-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>
|
<attributes>
|
||||||
<attribute name="optional" value="true"/>
|
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
|
<classpathentry excluding="**" kind="src" output="target/workspace-6.30.2-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="optional" value="true"/>
|
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
<attribute name="test" value="true"/>
|
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="output" path="target/workspace-6.27.0-SNAPSHOT/WEB-INF/classes"/>
|
<classpathentry kind="output" path="target/workspace-6.30.2-SNAPSHOT/WEB-INF/classes"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
eclipse.preferences.version=1
|
eclipse.preferences.version=1
|
||||||
lastWarOutDir=/home/francescomangiacrapa/git/workspace/target/workspace-6.27.0-SNAPSHOT
|
lastWarOutDir=/home/francescomangiacrapa/git/workspace/target/workspace-6.30.2-SNAPSHOT
|
||||||
warSrcDir=src/main/webapp
|
warSrcDir=src/main/webapp
|
||||||
warSrcDirIsOutput=false
|
warSrcDirIsOutput=false
|
||||||
|
|
|
@ -6,7 +6,179 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<wb-module deploy-name="workspace-6.27.0-SNAPSHOT">
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<wb-module deploy-name="workspace-6.30.2-SNAPSHOT">
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -22,6 +194,92 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
|
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
|
||||||
|
|
||||||
|
|
||||||
|
@ -30,6 +288,92 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
|
<wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
|
||||||
|
|
||||||
|
|
||||||
|
@ -37,7 +381,54 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -52,6 +443,121 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
|
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
|
||||||
|
|
||||||
|
|
||||||
|
@ -60,6 +566,92 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<property name="context-root" value="workspace"/>
|
<property name="context-root" value="workspace"/>
|
||||||
|
|
||||||
|
|
||||||
|
@ -68,6 +660,92 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</wb-module>
|
</wb-module>
|
||||||
|
|
||||||
|
|
||||||
|
@ -76,4 +754,90 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</project-modules>
|
</project-modules>
|
||||||
|
|
66
CHANGELOG.md
66
CHANGELOG.md
|
@ -4,6 +4,62 @@
|
||||||
All notable changes to this project will be documented in this file.
|
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).
|
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
|
## [v6.30.2-SNAPSHOT] - 2024-07-29
|
||||||
|
|
||||||
|
- Included upload of files/archives with `fileSize` parameter [#27898]
|
||||||
|
- Moved to `maven-portal-bom` 4.0.0{-SNAPSHOT} [#28026]
|
||||||
|
|
||||||
|
## [v6.30.1] - 2024-06-28
|
||||||
|
|
||||||
|
- Includes the `metadata-profile-form-builder-widget` enhancement [#27488]
|
||||||
|
- Updated `workspace-tree-widget` dependency lower range [#27747#note-20]
|
||||||
|
|
||||||
|
## [v6.30.0] - 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'
|
||||||
|
|
||||||
|
## [v6.28.6] - 2022-09-05
|
||||||
|
|
||||||
|
- Just to release the fixes #23676, #23789 implemented in the ws-tree
|
||||||
|
|
||||||
|
## [v6.28.5] - 2022-06-27
|
||||||
|
|
||||||
|
- [#23523] Updated to maven-portal-bom 3.6.4
|
||||||
|
- [#23491] Just to release the Publishing Widget enhancement #23491
|
||||||
|
|
||||||
|
## [v6.28.3] - 2022-05-02
|
||||||
|
|
||||||
|
- [#23225] Just including the enhancement #23225
|
||||||
|
|
||||||
|
## [v6.28.2] - 2022-03-24
|
||||||
|
|
||||||
|
#### Enhancements
|
||||||
|
|
||||||
|
- [#23020] Just including the enhancement #23020
|
||||||
|
|
||||||
|
## [v6.28.1] - 2021-12-20
|
||||||
|
|
||||||
|
#### Fixes
|
||||||
|
|
||||||
|
- [#22578] Including workspace-tree-widget bug fixing
|
||||||
|
|
||||||
|
## [v6.28.0] - 2021-11-05
|
||||||
|
|
||||||
|
#### Enhancements
|
||||||
|
|
||||||
|
- [#22251] Make workspace file size field smart
|
||||||
|
|
||||||
|
## [v6.27.1] - 2021-06-22
|
||||||
|
|
||||||
|
[#21575] Including workspace-tree-widget bug fixing
|
||||||
|
Moved to maven-portal-bom 3.6.3
|
||||||
|
|
||||||
## [v6.27.0] - 2021-05-10
|
## [v6.27.0] - 2021-05-10
|
||||||
|
|
||||||
[#21387] Harmonized version of jackson libs to 2.8.11 to resolve conflict
|
[#21387] Harmonized version of jackson libs to 2.8.11 to resolve conflict
|
||||||
|
@ -39,31 +95,31 @@ Just to include new SHUB model
|
||||||
|
|
||||||
[#19952] Fixed incident
|
[#19952] Fixed incident
|
||||||
|
|
||||||
## [v6.25.0] [r4.25.0] - 2020-08-25
|
## [v6.25.0] - 2020-08-25
|
||||||
|
|
||||||
#### Enhancements
|
#### Enhancements
|
||||||
|
|
||||||
[#19600] revisit the "Get Info" Dialog in a modern view
|
[#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
|
[#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**
|
**New Features**
|
||||||
|
|
||||||
[#19058] Restore operation: the user has to select the destination folder
|
[#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
|
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
|
Ported to git/jenkins
|
||||||
|
|
||||||
|
|
40
README.md
40
README.md
|
@ -1,6 +1,6 @@
|
||||||
# gCube Workspace Portlet
|
# gCube Workspace
|
||||||
|
|
||||||
The 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.
|
The gCube Workspace is a web-system (made from many components) that built a web-gui to manage the Workspace in the D4Science infrastructure. The Workspace is a collaborative area where users can exchange and organize information objects (workspace items) according to their specific needs.
|
||||||
Every user of any Virtual Research Environment is provided with this area for the exchange of workspace objects (share) with other users. Such an area is further organized in workspaces as to resemble a classic folder-based file system.
|
Every user of any Virtual Research Environment is provided with this area for the exchange of workspace objects (share) with other users. Such an area is further organized in workspaces as to resemble a classic folder-based file system.
|
||||||
|
|
||||||
## Built With
|
## Built With
|
||||||
|
@ -8,6 +8,42 @@ Every user of any Virtual Research Environment is provided with this area for th
|
||||||
* [OpenJDK](https://openjdk.java.net/) - The JDK used
|
* [OpenJDK](https://openjdk.java.net/) - The JDK used
|
||||||
* [Maven](https://maven.apache.org/) - Dependency Management
|
* [Maven](https://maven.apache.org/) - Dependency Management
|
||||||
|
|
||||||
|
**Uses**
|
||||||
|
|
||||||
|
* GWT v.2.7.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)
|
||||||
|
* GXT v2.2.5 is licensed under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.html)
|
||||||
|
|
||||||
|
**Related Components**
|
||||||
|
|
||||||
|
* [Workpsace Tree Widget](https://code-repo.d4science.org/gCubeSystem/workspace-tree-widget)
|
||||||
|
* [Workpsace Sharing Widget](https://code-repo.d4science.org/gCubeSystem/workspace-sharing-widget)
|
||||||
|
* [Task Executor Widget](https://code-repo.d4science.org/gCubeSystem/ws-task-executor-widget)
|
||||||
|
* [Catalogue Metadata Publisher Widget](https://code-repo.d4science.org/gCubeSystem/ckan-metadata-publisher-widget)
|
||||||
|
* [StorageHub Client Wrapper](https://code-repo.d4science.org/gCubeSystem/storagehub-client-wrapper)
|
||||||
|
|
||||||
|
and others. You can discovery all dependencies via dependency hierarchy (e.g. use [dependency:tree](https://maven.apache.org/plugins/maven-dependency-plugin/tree-mojo.html))
|
||||||
|
|
||||||
|
## Showcase
|
||||||
|
|
||||||
|
**Workspace Home**
|
||||||
|
|
||||||
|
<img src="https://gcube.wiki.gcube-system.org/images_gcube/c/cf/Showcase_Workspace.png" style="max-width:800px;" alt="Workspace Home" />
|
||||||
|
|
||||||
|
**Workspace 'Context Menu' facility**
|
||||||
|
|
||||||
|
<img src="https://gcube.wiki.gcube-system.org/images_gcube/2/2d/Workspace_Context_Menu.png" style="max-width:800px;" alt="Workspace Context Menu" />
|
||||||
|
|
||||||
|
**Workspace 'Get Info' facility**
|
||||||
|
|
||||||
|
<img src="https://gcube.wiki.gcube-system.org/images_gcube/2/27/Showcase_Workspace_Get_Info.png" style="max-width:800px;" alt="Workspace Get Info" />
|
||||||
|
<br />
|
||||||
|
<img src="https://gcube.wiki.gcube-system.org/images_gcube/8/83/Showcase_Workspace_GetInfo3.png" style="max-width:800px;" alt="Workspace Get Info 3" />
|
||||||
|
|
||||||
|
**Workspace 'Get Shareable Link' facility**
|
||||||
|
|
||||||
|
<img src="https://gcube.wiki.gcube-system.org/images_gcube/7/72/Showcase_Workspace_GetShareableLink.png" style="max-width:800px;" alt="Workspace Get Shareable Link" />
|
||||||
|
|
||||||
## Documentation
|
## Documentation
|
||||||
|
|
||||||
You can find the Workspace documentation at [Wiki gCube Workpsace](https://wiki.gcube-system.org/workspace)
|
You can find the Workspace documentation at [Wiki gCube Workpsace](https://wiki.gcube-system.org/workspace)
|
||||||
|
|
97
pom.xml
97
pom.xml
|
@ -6,14 +6,14 @@
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>maven-parent</artifactId>
|
<artifactId>maven-parent</artifactId>
|
||||||
<groupId>org.gcube.tools</groupId>
|
<groupId>org.gcube.tools</groupId>
|
||||||
<version>1.1.0</version>
|
<version>1.2.0</version>
|
||||||
<relativePath />
|
<relativePath />
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>org.gcube.portlets.user</groupId>
|
<groupId>org.gcube.portlets.user</groupId>
|
||||||
<artifactId>workspace</artifactId>
|
<artifactId>workspace</artifactId>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
<version>6.27.0</version>
|
<version>6.30.2-SNAPSHOT</version>
|
||||||
<name>gCube Workspace Portlet</name>
|
<name>gCube Workspace Portlet</name>
|
||||||
<description>
|
<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.
|
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>
|
<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
|
||||||
<additionalparam>-Xdoclint:none</additionalparam>
|
<additionalparam>-Xdoclint:none</additionalparam>
|
||||||
<jackson.version>2.8.11</jackson.version>
|
<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.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||||
|
@ -46,25 +48,43 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.distribution</groupId>
|
<groupId>org.gcube.distribution</groupId>
|
||||||
<artifactId>maven-portal-bom</artifactId>
|
<artifactId>maven-portal-bom</artifactId>
|
||||||
<version>3.6.2</version>
|
<version>${gcube-portal-bom-version}</version>
|
||||||
<type>pom</type>
|
<type>pom</type>
|
||||||
<scope>import</scope>
|
<scope>import</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</dependencyManagement>
|
</dependencyManagement>
|
||||||
|
|
||||||
|
<profiles>
|
||||||
|
<!-- PROD profile -->
|
||||||
|
<profile>
|
||||||
|
<id>workspace-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>workspace-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>
|
<dependencies>
|
||||||
|
|
||||||
<!-- UNCOMMENT THIS TO RUN IN DEVO MODE -->
|
|
||||||
<!-- <dependency> -->
|
|
||||||
<!-- <groupId>xerces</groupId> -->
|
|
||||||
<!-- <artifactId>xerces</artifactId> -->
|
|
||||||
<!-- <version>2.4.0</version> -->
|
|
||||||
<!-- </dependency> -->
|
|
||||||
|
|
||||||
<!-- This dependency is needed and is need on TOP to use GWT UI BInder
|
|
||||||
without old Xerces version of gCore complaining -->
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.gwt</groupId>
|
<groupId>com.google.gwt</groupId>
|
||||||
<artifactId>gwt-user</artifactId>
|
<artifactId>gwt-user</artifactId>
|
||||||
|
@ -91,6 +111,7 @@
|
||||||
<version>2.9.1</version>
|
<version>2.9.1</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.common</groupId>
|
<groupId>org.gcube.common</groupId>
|
||||||
<artifactId>authorization-client</artifactId>
|
<artifactId>authorization-client</artifactId>
|
||||||
|
@ -131,6 +152,21 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.contentmanagement</groupId>
|
<groupId>org.gcube.contentmanagement</groupId>
|
||||||
<artifactId>storage-manager-wrapper</artifactId>
|
<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>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
@ -147,6 +183,7 @@
|
||||||
<artifactId>ic-client</artifactId>
|
<artifactId>ic-client</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.core</groupId>
|
<groupId>org.gcube.core</groupId>
|
||||||
<artifactId>common-scope-maps</artifactId>
|
<artifactId>common-scope-maps</artifactId>
|
||||||
|
@ -189,9 +226,26 @@
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.portal</groupId>
|
<groupId>org.gcube.portal</groupId>
|
||||||
<artifactId>social-networking-library</artifactId>
|
<artifactId>social-library-stubs</artifactId>
|
||||||
|
<version>[1.0.0-SNAPSHOT, 2.0.0)</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.gcube.social-networking</groupId>
|
||||||
|
<artifactId>social-service-client</artifactId>
|
||||||
|
<version>[2.0.0-SNAPSHOT, 3.0.0)</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
<exclusions>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>org.gcube.portal</groupId>
|
||||||
|
<artifactId>social-networking-library</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>javax.ws.rs</groupId>
|
||||||
|
<artifactId>javax.ws.rs-api</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
</exclusions>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.applicationsupportlayer</groupId>
|
<groupId>org.gcube.applicationsupportlayer</groupId>
|
||||||
|
@ -202,8 +256,14 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.portlets.user</groupId>
|
<groupId>org.gcube.portlets.user</groupId>
|
||||||
<artifactId>workspace-tree-widget</artifactId>
|
<artifactId>workspace-tree-widget</artifactId>
|
||||||
<version>[6.31.3-SNAPSHOT, 7.0.0-SNAPSHOT)</version>
|
<version>[6.35.4-SNAPSHOT, 7.0.0-SNAPSHOT)</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
|
<exclusions>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>javax.ws.rs</groupId>
|
||||||
|
<artifactId>javax.ws.rs-api</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- User Management Core -->
|
<!-- User Management Core -->
|
||||||
|
@ -213,13 +273,6 @@
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.gcube.portlets.widgets</groupId>
|
|
||||||
<artifactId>ws-task-executor-widget</artifactId>
|
|
||||||
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>javax.portlet</groupId>
|
<groupId>javax.portlet</groupId>
|
||||||
<artifactId>portlet-api</artifactId>
|
<artifactId>portlet-api</artifactId>
|
||||||
|
|
|
@ -33,12 +33,13 @@
|
||||||
<inherits
|
<inherits
|
||||||
name='org.gcube.portlets.widgets.openlayerbasicwidgets.olbasicwidgets' />
|
name='org.gcube.portlets.widgets.openlayerbasicwidgets.olbasicwidgets' />
|
||||||
|
|
||||||
|
<inherits
|
||||||
|
name='org.gcube.portlets.widgets.mpformbuilder.MetadataProfileFormBuilder' />
|
||||||
|
|
||||||
<inherits
|
<inherits
|
||||||
name='org.gcube.portlets.widgets.ckandatapublisherwidget.CKanMetadataPublisher' />
|
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. -->
|
<!-- Specify the app entry point class. -->
|
||||||
<entry-point
|
<entry-point
|
||||||
class='org.gcube.portlets.user.workspace.client.WorkspacePortlet' />
|
class='org.gcube.portlets.user.workspace.client.WorkspacePortlet' />
|
||||||
|
|
|
@ -588,6 +588,9 @@ public class AppController implements SubscriberInterface {
|
||||||
new MessageBoxAlert("Error", caught.getMessage(), null);
|
new MessageBoxAlert("Error", caught.getMessage(), null);
|
||||||
wsPortlet.getGridGroupContainer().unmask();
|
wsPortlet.getGridGroupContainer().unmask();
|
||||||
|
|
||||||
|
//Reload the tree and select the root. Fixing Incident [#26678]
|
||||||
|
AppControllerExplorer.getEventBus().fireEvent(new LoadTreeEvent(true));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -0,0 +1,42 @@
|
||||||
|
package org.gcube.portlets.user.workspace.client.view;
|
||||||
|
|
||||||
|
import com.google.gwt.core.client.GWT;
|
||||||
|
import com.google.gwt.i18n.client.NumberFormat;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The Class SizeUtil.
|
||||||
|
*
|
||||||
|
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
|
||||||
|
*
|
||||||
|
* Nov 5, 2021
|
||||||
|
*/
|
||||||
|
public class SizeUtil {
|
||||||
|
|
||||||
|
public static final NumberFormat numberFormat = NumberFormat.getFormat("#,##0.#");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Readable file size.
|
||||||
|
*
|
||||||
|
* @param size the size
|
||||||
|
* @return the string
|
||||||
|
*/
|
||||||
|
public static String readableFileSize(long size) {
|
||||||
|
GWT.log("Converting size: "+size);
|
||||||
|
// -1 should be the size of a folder
|
||||||
|
if (size == -1)
|
||||||
|
return "";
|
||||||
|
// in some cases the size returned by SHUB is negative,
|
||||||
|
// so reporting as 1B to user
|
||||||
|
if (size < 0)
|
||||||
|
return "1 byte";
|
||||||
|
|
||||||
|
if (size == 0)
|
||||||
|
return "0 byte";
|
||||||
|
|
||||||
|
final String[] units = new String[] { "bytes", "kB", "MB", "GB", "TB" };
|
||||||
|
int digitGroups = (int) (Math.log10(size) / Math.log10(1024));
|
||||||
|
|
||||||
|
return numberFormat.format(size / Math.pow(1024, digitGroups)) +" " +units[digitGroups];
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
|
@ -5,7 +5,6 @@ import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.gcube.portlets.user.workspace.client.AppController;
|
import org.gcube.portlets.user.workspace.client.AppController;
|
||||||
import org.gcube.portlets.user.workspace.client.ConstantsExplorer;
|
|
||||||
import org.gcube.portlets.user.workspace.client.event.FileDownloadEvent;
|
import org.gcube.portlets.user.workspace.client.event.FileDownloadEvent;
|
||||||
import org.gcube.portlets.user.workspace.client.event.FileDownloadEvent.DownloadType;
|
import org.gcube.portlets.user.workspace.client.event.FileDownloadEvent.DownloadType;
|
||||||
import org.gcube.portlets.user.workspace.client.event.ImagePreviewEvent;
|
import org.gcube.portlets.user.workspace.client.event.ImagePreviewEvent;
|
||||||
|
@ -18,6 +17,7 @@ import org.gcube.portlets.user.workspace.client.gridevent.StoreGridChangedEvent;
|
||||||
import org.gcube.portlets.user.workspace.client.model.FileGridModel;
|
import org.gcube.portlets.user.workspace.client.model.FileGridModel;
|
||||||
import org.gcube.portlets.user.workspace.client.model.FileModel;
|
import org.gcube.portlets.user.workspace.client.model.FileModel;
|
||||||
import org.gcube.portlets.user.workspace.client.model.GroupingStoreModel;
|
import org.gcube.portlets.user.workspace.client.model.GroupingStoreModel;
|
||||||
|
import org.gcube.portlets.user.workspace.client.view.SizeUtil;
|
||||||
|
|
||||||
import com.extjs.gxt.ui.client.Style.SelectionMode;
|
import com.extjs.gxt.ui.client.Style.SelectionMode;
|
||||||
import com.extjs.gxt.ui.client.data.ModelData;
|
import com.extjs.gxt.ui.client.data.ModelData;
|
||||||
|
@ -50,10 +50,8 @@ import com.extjs.gxt.ui.client.widget.grid.filters.StringFilter;
|
||||||
import com.extjs.gxt.ui.client.widget.layout.FitLayout;
|
import com.extjs.gxt.ui.client.widget.layout.FitLayout;
|
||||||
import com.google.gwt.core.shared.GWT;
|
import com.google.gwt.core.shared.GWT;
|
||||||
import com.google.gwt.i18n.client.DateTimeFormat;
|
import com.google.gwt.i18n.client.DateTimeFormat;
|
||||||
import com.google.gwt.i18n.client.NumberFormat;
|
|
||||||
import com.google.gwt.user.client.Random;
|
import com.google.gwt.user.client.Random;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The Class GxtGridFilterGroupPanel.
|
* The Class GxtGridFilterGroupPanel.
|
||||||
*
|
*
|
||||||
|
@ -63,13 +61,11 @@ import com.google.gwt.user.client.Random;
|
||||||
public class GxtGridFilterGroupPanel extends LayoutContainer {
|
public class GxtGridFilterGroupPanel extends LayoutContainer {
|
||||||
|
|
||||||
private ContentPanel cp = new ContentPanel();
|
private ContentPanel cp = new ContentPanel();
|
||||||
// private ListStore<FileModel> store = ListStoreModel.getInstance().getStore();
|
|
||||||
private GroupingStore<FileGridModel> store = GroupingStoreModel.getInstance().getStore();
|
private GroupingStore<FileGridModel> store = GroupingStoreModel.getInstance().getStore();
|
||||||
private FileGridModel currentItemSelected = null;
|
private FileGridModel currentItemSelected = null;
|
||||||
private FileModel currentFolderView = null;
|
private FileModel currentFolderView = null;
|
||||||
private GroupingView view = new GroupingView();
|
private GroupingView view = new GroupingView();
|
||||||
private boolean groupingEnabled = false;
|
private boolean groupingEnabled = false;
|
||||||
private NumberFormat number = ConstantsExplorer.numberFormatterKB;
|
|
||||||
private final Grid<FileGridModel> grid;
|
private final Grid<FileGridModel> grid;
|
||||||
private ColumnModel cm = null;
|
private ColumnModel cm = null;
|
||||||
|
|
||||||
|
@ -87,15 +83,13 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
|
||||||
ColumnConfig type = new ColumnConfig(FileGridModel.TYPE, FileGridModel.TYPE, 60);
|
ColumnConfig type = new ColumnConfig(FileGridModel.TYPE, FileGridModel.TYPE, 60);
|
||||||
ColumnConfig lastUpdate = new ColumnConfig(FileGridModel.LASTMODIFIED, "Last Update", 90);
|
ColumnConfig lastUpdate = new ColumnConfig(FileGridModel.LASTMODIFIED, "Last Update", 90);
|
||||||
lastUpdate.setDateTimeFormat(DateTimeFormat.getFormat("dd MMM hh:mm aaa yyyy"));
|
lastUpdate.setDateTimeFormat(DateTimeFormat.getFormat("dd MMM hh:mm aaa yyyy"));
|
||||||
ColumnConfig category = new ColumnConfig(FileModel.HUMAN_REDABLE_CATEGORY, FileModel.HUMAN_REDABLE_CATEGORY, 100);
|
ColumnConfig category = new ColumnConfig(FileModel.HUMAN_REDABLE_CATEGORY, FileModel.HUMAN_REDABLE_CATEGORY,
|
||||||
|
100);
|
||||||
ColumnConfig size = new ColumnConfig(FileGridModel.SIZE, FileGridModel.SIZE, 45);
|
ColumnConfig size = new ColumnConfig(FileGridModel.SIZE, FileGridModel.SIZE, 45);
|
||||||
ColumnConfig ownerFullName = new ColumnConfig(FileGridModel.OWNERFULLNAME, FileGridModel.OWNER, 90);
|
ColumnConfig ownerFullName = new ColumnConfig(FileGridModel.OWNERFULLNAME, FileGridModel.OWNER, 90);
|
||||||
|
|
||||||
|
|
||||||
size.setEditor(new CellEditor(new NumberField()));
|
size.setEditor(new CellEditor(new NumberField()));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (group)
|
if (group)
|
||||||
cm = new ColumnModel(Arrays.asList(icon, name, ownerFullName, type, lastUpdate, size, category));
|
cm = new ColumnModel(Arrays.asList(icon, name, ownerFullName, type, lastUpdate, size, category));
|
||||||
else
|
else
|
||||||
|
@ -122,30 +116,28 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
|
||||||
|
|
||||||
GridCellRenderer<FileGridModel> folderRender = new GridCellRenderer<FileGridModel>() {
|
GridCellRenderer<FileGridModel> folderRender = new GridCellRenderer<FileGridModel>() {
|
||||||
@Override
|
@Override
|
||||||
public String render(FileGridModel model, String property, ColumnData config, int rowIndex, int colIndex, ListStore<FileGridModel> store, Grid<FileGridModel> grid) {
|
public String render(FileGridModel model, String property, ColumnData config, int rowIndex, int colIndex,
|
||||||
|
ListStore<FileGridModel> store, Grid<FileGridModel> grid) {
|
||||||
String val = model.get(property);
|
String val = model.get(property);
|
||||||
if (val == null || val.isEmpty())
|
if (val == null || val.isEmpty())
|
||||||
return "";
|
return "";
|
||||||
|
|
||||||
return "<span qtitle='" + columnModel.getColumnById(property).getHeader() + "' qtip='" + val + "' >" + val + "</span>";
|
return "<span qtitle='" + columnModel.getColumnById(property).getHeader() + "' qtip='" + val + "' >"
|
||||||
|
+ val + "</span>";
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
GridCellRenderer<FileGridModel> kbRender = new GridCellRenderer<FileGridModel>() {
|
GridCellRenderer<FileGridModel> kbRender = new GridCellRenderer<FileGridModel>() {
|
||||||
@Override
|
@Override
|
||||||
public String render(FileGridModel model, String property, ColumnData config,
|
public String render(FileGridModel model, String property, ColumnData config, int rowIndex, int colIndex,
|
||||||
int rowIndex, int colIndex, ListStore<FileGridModel> store, Grid<FileGridModel> grid) {
|
ListStore<FileGridModel> store, Grid<FileGridModel> grid) {
|
||||||
|
|
||||||
long value = (Long) model.get(property);
|
long value = (Long) model.get(property);
|
||||||
|
//
|
||||||
if (value != -1) {
|
if (value != -1) {
|
||||||
double kb = value/1024;
|
String theSize = SizeUtil.readableFileSize(value);
|
||||||
if(kb<1)
|
return "<span>" + theSize + "</span>";
|
||||||
kb=1;
|
|
||||||
return "<span>" + number.format(kb) + "</span>";
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -153,8 +145,6 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
|
||||||
size.setRenderer(kbRender);
|
size.setRenderer(kbRender);
|
||||||
type.setRenderer(folderRender);
|
type.setRenderer(folderRender);
|
||||||
|
|
||||||
//setAlphanumericStoreSorter(grid);
|
|
||||||
|
|
||||||
GridFilters filters = new GridFilters();
|
GridFilters filters = new GridFilters();
|
||||||
filters.setLocal(true);
|
filters.setLocal(true);
|
||||||
|
|
||||||
|
@ -195,8 +185,7 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
|
||||||
isMultiselection = true;
|
isMultiselection = true;
|
||||||
|
|
||||||
AppController.getEventBus().fireEvent(new GridElementSelectedEvent(target, isMultiselection));
|
AppController.getEventBus().fireEvent(new GridElementSelectedEvent(target, isMultiselection));
|
||||||
}
|
} else {
|
||||||
else{
|
|
||||||
currentItemSelected = null;
|
currentItemSelected = null;
|
||||||
AppController.getEventBus().fireEvent(new GridElementUnSelectedEvent());
|
AppController.getEventBus().fireEvent(new GridElementUnSelectedEvent());
|
||||||
}
|
}
|
||||||
|
@ -204,7 +193,6 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
grid.addListener(Events.RowDoubleClick, new Listener<BaseEvent>() {
|
grid.addListener(Events.RowDoubleClick, new Listener<BaseEvent>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -215,18 +203,17 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
|
||||||
if (fileModel != null)
|
if (fileModel != null)
|
||||||
fireEventByFileModelType(fileModel);
|
fireEventByFileModelType(fileModel);
|
||||||
// if(fileModel.isDirectory())
|
// if(fileModel.isDirectory())
|
||||||
// AppController.getEventBus().fireEvent(new DoubleClickElementSelectedEvent(fileModel));
|
// AppController.getEventBus().fireEvent(new
|
||||||
|
// DoubleClickElementSelectedEvent(fileModel));
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
grid.setContextMenu(null); // add context menu null - ignore browse event right click
|
grid.setContextMenu(null); // add context menu null - ignore browse event right click
|
||||||
|
|
||||||
grid.addListener(Events.OnContextMenu, new Listener<GridEvent<FileGridModel>>() {
|
grid.addListener(Events.OnContextMenu, new Listener<GridEvent<FileGridModel>>() {
|
||||||
@Override
|
@Override
|
||||||
public void handleEvent(GridEvent<FileGridModel> be)
|
public void handleEvent(GridEvent<FileGridModel> be) {
|
||||||
{
|
|
||||||
|
|
||||||
if (be.isRightClick()) {
|
if (be.isRightClick()) {
|
||||||
|
|
||||||
|
@ -241,8 +228,10 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
|
||||||
for (FileGridModel fileGridModel : selection) {
|
for (FileGridModel fileGridModel : selection) {
|
||||||
selected.add(fileGridModel);
|
selected.add(fileGridModel);
|
||||||
}
|
}
|
||||||
//List<FileGridModel> selectedItems = grid.getSelectionModel().getSelectedItems();
|
// List<FileGridModel> selectedItems =
|
||||||
AppController.getEventBus().fireEvent(new OpenContextMenuTreeEvent(selected, be.getClientX(), be.getClientY()));
|
// grid.getSelectionModel().getSelectedItems();
|
||||||
|
AppController.getEventBus()
|
||||||
|
.fireEvent(new OpenContextMenuTreeEvent(selected, be.getClientX(), be.getClientY()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -297,7 +286,6 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
switch (target.getGXTFolderItemType()) {
|
switch (target.getGXTFolderItemType()) {
|
||||||
|
|
||||||
case EXTERNAL_IMAGE:
|
case EXTERNAL_IMAGE:
|
||||||
|
@ -311,7 +299,8 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
|
||||||
case URL_DOCUMENT:
|
case URL_DOCUMENT:
|
||||||
case EXTERNAL_RESOURCE_LINK:
|
case EXTERNAL_RESOURCE_LINK:
|
||||||
|
|
||||||
AppController.getEventBus().fireEvent(new FileDownloadEvent(target.getIdentifier(), target.getName(), DownloadType.SHOW, target.isDirectory() || target.isVreFolder(), null));
|
AppController.getEventBus().fireEvent(new FileDownloadEvent(target.getIdentifier(), target.getName(),
|
||||||
|
DownloadType.SHOW, target.isDirectory() || target.isVreFolder(), null));
|
||||||
break;
|
break;
|
||||||
case EXTERNAL_URL:
|
case EXTERNAL_URL:
|
||||||
AppController.getEventBus().fireEvent(new ShowUrlEvent(target));
|
AppController.getEventBus().fireEvent(new ShowUrlEvent(target));
|
||||||
|
@ -327,7 +316,6 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reset store.
|
* Reset store.
|
||||||
*/
|
*/
|
||||||
|
@ -335,7 +323,6 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
|
||||||
store.removeAll();
|
store.removeAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Update store.
|
* Update store.
|
||||||
*
|
*
|
||||||
|
@ -347,7 +334,8 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
|
||||||
resetStore();
|
resetStore();
|
||||||
if (result != null && result.size() > 0) {
|
if (result != null && result.size() > 0) {
|
||||||
for (FileGridModel file : result) {
|
for (FileGridModel file : result) {
|
||||||
//GWT.log("File: "+file.getName() + " has sync: "+file.getSynchedThreddsStatus());
|
// GWT.log("File: "+file.getName() + " has sync:
|
||||||
|
// "+file.getSynchedThreddsStatus());
|
||||||
file.setIcon();
|
file.setIcon();
|
||||||
}
|
}
|
||||||
store.add(result);
|
store.add(result);
|
||||||
|
@ -356,7 +344,6 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds the to store.
|
* Adds the to store.
|
||||||
*
|
*
|
||||||
|
@ -427,16 +414,12 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
|
||||||
Record record = store.getRecord(fileTarget);
|
Record record = store.getRecord(fileTarget);
|
||||||
store.remove((FileGridModel) record.getModel());
|
store.remove((FileGridModel) record.getModel());
|
||||||
return true;
|
return true;
|
||||||
}
|
} else
|
||||||
else
|
|
||||||
System.out.println("Delete Error: file target with " + identifier + " identifier not exist in store");
|
System.out.println("Delete Error: file target with " + identifier + " identifier not exist in store");
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the current folder view.
|
* Gets the current folder view.
|
||||||
*
|
*
|
||||||
|
@ -446,7 +429,6 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
|
||||||
return currentFolderView;
|
return currentFolderView;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the current folder view.
|
* Sets the current folder view.
|
||||||
*
|
*
|
||||||
|
@ -456,7 +438,6 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
|
||||||
this.currentFolderView = currentFolderView;
|
this.currentFolderView = currentFolderView;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Rename item.//
|
* Rename item.//
|
||||||
*
|
*
|
||||||
|
@ -479,11 +460,9 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
} else
|
||||||
else
|
|
||||||
System.out.println("Record Error: file target not exist in store");
|
System.out.println("Record Error: file target not exist in store");
|
||||||
}
|
} else
|
||||||
else
|
|
||||||
System.out.println("Rename Error: file target is null");
|
System.out.println("Rename Error: file target is null");
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -521,7 +500,6 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the store.
|
* Gets the store.
|
||||||
*
|
*
|
||||||
|
@ -532,8 +510,8 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the border as on search.
|
* Sets the border as on search. percentulae in java
|
||||||
*percentulae in java
|
*
|
||||||
* @param bool the new border as on search
|
* @param bool the new border as on search
|
||||||
*/
|
*/
|
||||||
public void setBorderAsOnSearch(boolean bool) {
|
public void setBorderAsOnSearch(boolean bool) {
|
||||||
|
@ -542,8 +520,7 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
|
||||||
|
|
||||||
if (bool) {
|
if (bool) {
|
||||||
this.cp.getElement("body").getStyle().setBorderColor("#32CD32");
|
this.cp.getElement("body").getStyle().setBorderColor("#32CD32");
|
||||||
}
|
} else
|
||||||
else
|
|
||||||
this.cp.getElement("body").getStyle().setBorderColor("#99BBE8");
|
this.cp.getElement("body").getStyle().setBorderColor("#99BBE8");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -605,10 +582,6 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
|
||||||
*/
|
*/
|
||||||
public void refreshSize(String width, String height) {
|
public void refreshSize(String width, String height) {
|
||||||
|
|
||||||
// if(this.isRendered()){
|
|
||||||
// GWT.log("refresh size grid "+height);
|
|
||||||
// this.setHeight(height);
|
|
||||||
// }
|
|
||||||
GWT.log("refresh size grid " + width + "; heigth: " + height);
|
GWT.log("refresh size grid " + width + "; heigth: " + height);
|
||||||
this.setSize(width, height);
|
this.setSize(width, height);
|
||||||
cp.setSize(width, height);
|
cp.setSize(width, height);
|
||||||
|
@ -632,8 +605,6 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
|
||||||
col.setWidth(percent);
|
col.setWidth(percent);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//cp.layout(true);
|
|
||||||
//this.layout(true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
|
@ -0,0 +1 @@
|
||||||
|
/resources/
|
|
@ -5,3 +5,14 @@
|
||||||
/pred4s.gcubekey
|
/pred4s.gcubekey
|
||||||
/preprod.gcubekey
|
/preprod.gcubekey
|
||||||
/devVRE.gcubekey
|
/devVRE.gcubekey
|
||||||
|
/CNR.it.gcubekey
|
||||||
|
/D4OS.gcubekey
|
||||||
|
/D4Research.gcubekey
|
||||||
|
/FARM.gcubekey
|
||||||
|
/ISTI.gcubekey
|
||||||
|
/OpenAIRE.gcubekey
|
||||||
|
/ParthenosVO.gcubekey
|
||||||
|
/SmartArea.gcubekey
|
||||||
|
/SoBigData.gcubekey
|
||||||
|
/d4science.research-infrastructures.eu.gcubekey
|
||||||
|
/gCubeApps.gcubekey
|
||||||
|
|
Loading…
Reference in New Issue