diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d2b2c8..a94d0a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,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.33.1-SNAPSHOT] - 2021-06-11
+
+#### Fixes
+
+[#21575] Fixed icon associated with simple folders in the grid view
+
## [v6.33.0] - 2021-05-11
#### Enhancements
diff --git a/pom.xml b/pom.xml
index 9fe47c8..1e27004 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
org.gcube.portlets.user
workspace-tree-widget
- 6.33.0
+ 6.33.1-SNAPSHOT
gCube Workspace Tree Widget
gCube Workspace Tree Widget is a widget to navigate and interact with gCube Workspace
@@ -46,7 +46,7 @@
org.gcube.distribution
maven-portal-bom
- 3.6.2
+ 3.6.2-SNAPSHOT
pom
import
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/model/FileModel.java b/src/main/java/org/gcube/portlets/user/workspace/client/model/FileModel.java
index 8f9f929..dcd455a 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/model/FileModel.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/model/FileModel.java
@@ -330,18 +330,18 @@ public class FileModel extends BaseModelData implements Serializable, IsSerializ
} else {
// SPECIAL FOLDER?
- if (this.isSpecialFolder())
+ if (this.isSpecialFolder()) {
absImgPr = Resources.getIconSpecialFolder();
- else { // SIMPLE FOLDER
- if (this.isPublic()) // IS PLUBIC
+ } else { // SIMPLE FOLDER
+ if (this.isPublic()) { // IS PLUBIC
absImgPr = Resources.getIconFolderPublic();
- else {
- if (this.getSynchedWithWsThredds() != null) {
- if(this.getSynchedWithWsThredds()) {
- absImgPr = Resources.getIconSynchedFolder();
- }
- } else
+ } else {
+ Boolean isSynched = this.getSynchedWithWsThredds();
+ if (isSynched != null && isSynched) {
+ absImgPr = Resources.getIconSynchedFolder();
+ } else {
absImgPr = Resources.getIconFolder();
+ }
}
}
}