From aec4b7a5b73d771374474b2613bd1a27b925a34f Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Fri, 11 Jun 2021 17:58:10 +0200
Subject: [PATCH] bug fixed #21575

---
 CHANGELOG.md                                   |  6 ++++++
 pom.xml                                        |  4 ++--
 .../user/workspace/client/model/FileModel.java | 18 +++++++++---------
 3 files changed, 17 insertions(+), 11 deletions(-)

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 @@
 
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>workspace-tree-widget</artifactId>
-	<version>6.33.0</version>
+	<version>6.33.1-SNAPSHOT</version>
 	<name>gCube Workspace Tree Widget</name>
 	<description>
 		gCube Workspace Tree Widget is a widget to navigate and interact with gCube Workspace 
@@ -46,7 +46,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>3.6.2</version>
+				<version>3.6.2-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
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();
+					}
 				}
 			}
 		}