diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 219ed09..da9dc51 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,10 +1,19 @@
-
+
+
+
-
-
+
+
+
+
+
-
+
+
+
-
+
+
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..4843c8f
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,46 @@
+# Changelog for Notifications portlet
+
+This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [v2.6.0-SNAPSHOT] - 2022-05-05
+
+ - Added support for Catalogue notifications
+ - Removed support for Tabular Data and Calendar Notifications
+
+## [v2.5.0] - 2018-01-12
+
+ - Minor update to the font style
+ - Updated style and icons
+
+## [v2.1.0] - 2017-02-22
+
+ - Added notification settings support for process executions
+
+
+## [v2.0.0] - 2016-06-23
+
+ - Ported to Liferay 6.2
+ - Responsive Design
+
+## [v1.4.0] - 2015-07-03
+
+ - Ported to GWT 270
+ - Refactored with GWT Bootstrap
+
+## [v1.2.0] - 2014-4-03
+
+ - Implemented automatic notifications scroll back in time
+ - Updated description for post alerts
+ - Made Notification Settings more evident
+
+## [v1.1.0] - 2013-10-21
+
+ - Ported to GWT 251
+ - Removed GCF Dependency
+ - Logging with sl4j Enabled
+
+## [v1.0.0] - 2013-01-13
+
+First release
+
+
diff --git a/FUNDING.md b/FUNDING.md
new file mode 100644
index 0000000..6fa9eac
--- /dev/null
+++ b/FUNDING.md
@@ -0,0 +1,26 @@
+# Acknowledgments
+
+The projects leading to this software have received funding from a series of European Union programmes including:
+
+- the Sixth Framework Programme for Research and Technological Development
+ - [DILIGENT](https://cordis.europa.eu/project/id/004260) (grant no. 004260).
+- the Seventh Framework Programme for research, technological development and demonstration
+ - [D4Science](https://cordis.europa.eu/project/id/212488) (grant no. 212488);
+ - [D4Science-II](https://cordis.europa.eu/project/id/239019) (grant no.239019);
+ - [ENVRI](https://cordis.europa.eu/project/id/283465) (grant no. 283465);
+ - [iMarine](https://cordis.europa.eu/project/id/283644) (grant no. 283644);
+ - [EUBrazilOpenBio](https://cordis.europa.eu/project/id/288754) (grant no. 288754).
+- the H2020 research and innovation programme
+ - [SoBigData](https://cordis.europa.eu/project/id/654024) (grant no. 654024);
+ - [PARTHENOS](https://cordis.europa.eu/project/id/654119) (grant no. 654119);
+ - [EGI-Engage](https://cordis.europa.eu/project/id/654142) (grant no. 654142);
+ - [ENVRI PLUS](https://cordis.europa.eu/project/id/654182) (grant no. 654182);
+ - [BlueBRIDGE](https://cordis.europa.eu/project/id/675680) (grant no. 675680);
+ - [PerformFISH](https://cordis.europa.eu/project/id/727610) (grant no. 727610);
+ - [AGINFRA PLUS](https://cordis.europa.eu/project/id/731001) (grant no. 731001);
+ - [DESIRA](https://cordis.europa.eu/project/id/818194) (grant no. 818194);
+ - [ARIADNEplus](https://cordis.europa.eu/project/id/823914) (grant no. 823914);
+ - [RISIS 2](https://cordis.europa.eu/project/id/824091) (grant no. 824091);
+ - [EOSC-Pillar](https://cordis.europa.eu/project/id/857650) (grant no. 857650);
+ - [Blue Cloud](https://cordis.europa.eu/project/id/862409) (grant no. 862409);
+ - [SoBigData-PlusPlus](https://cordis.europa.eu/project/id/871042) (grant no. 871042);
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index de49274..db1c788 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
org.gcube.portlets.user
notifications
war
- 2.5.1
+ 2.6.0-SNAPSHOT
gCube Notifications Portlet
scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git
diff --git a/src/main/java/org/gcube/portlets/user/notifications/client/view/NotificationsPanel.java b/src/main/java/org/gcube/portlets/user/notifications/client/view/NotificationsPanel.java
index efb62dd..b11fa61 100644
--- a/src/main/java/org/gcube/portlets/user/notifications/client/view/NotificationsPanel.java
+++ b/src/main/java/org/gcube/portlets/user/notifications/client/view/NotificationsPanel.java
@@ -84,7 +84,8 @@ public class NotificationsPanel extends Composite {
notificationService.getUserInfo(new AsyncCallback() {
- public void onFailure(Throwable caught) {
+ public void onFailure(Throwable caught) {
+ Window.alert("Could not get notifications: " + caught.getMessage());
}
public void onSuccess(UserInfo result) {
if (result.getUsername().equals("test.user")) {
diff --git a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java
index 972e641..62ae6cf 100644
--- a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java
+++ b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java
@@ -100,6 +100,13 @@ public class SingleNotificationView extends Composite {
case WP_ADMIN_DOWNGRADE:
goApp.setHTML(" Go to Folder.");
break;
+ case CAT_ITEM_DELETE:
+ case CAT_ITEM_PUBLISHED:
+ case CAT_ITEM_REJECTED:
+ case CAT_ITEM_SUBMITTED:
+ case CAT_ITEM_UPDATED:
+ goApp.setHTML(" Go to Catalogue.");
+ break;
case CALENDAR_ADDED_EVENT:
case CALENDAR_UPDATED_EVENT:
case CALENDAR_DELETED_EVENT:
@@ -133,12 +140,20 @@ public class SingleNotificationView extends Composite {
return "fa fa-folder-open-o";
case WP_ITEM_NEW:
return "fa-file-text-o";
+ case WP_ITEM_RENAMED:
+ case WP_FOLDER_RENAMED:
+ return "fa-ellipsis-h";
case WP_ITEM_DELETE:
+ case CAT_ITEM_DELETE:
return "fa fa-trash-o";
case WP_ITEM_UPDATED:
+ case CAT_ITEM_UPDATED:
return "fa fa-files-o";
case WP_FOLDER_UNSHARE:
return "fa-times";
+ case WP_ADMIN_UPGRADE:
+ case WP_ADMIN_DOWNGRADE:
+ return "fa-shield";
case OWN_COMMENT:
return "fa-comment-o";
case REQUEST_CONNECTION:
@@ -159,6 +174,13 @@ public class SingleNotificationView extends Composite {
case TDM_RULE_SHARE:
case TDM_TEMPLATE_SHARE:
return "fa fa-table";
+ case CAT_ITEM_PUBLISHED:
+ return "fa fa-check-circle-o";
+ case CAT_ITEM_REJECTED:
+ return "fa fa-gavel";
+ case CAT_ITEM_SUBMITTED:
+ return "fa-hand-peace-o";
+
default:
return "fa fa-share-alt-square";
}
diff --git a/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java b/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java
index 12b36a8..7c717db 100644
--- a/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java
@@ -91,7 +91,7 @@ public class NotificationsServiceImpl extends RemoteServiceServlet implements No
} else {
toReturn.get(dateWithoutTime).add(notification);
}
- //System.out.println(notification.getDescription());
+ NotificationType type = NotificationType.CAT_ITEM_PUBLISHED;
}
} catch (Exception e) {
_log.error("While trying to get User notifications");
diff --git a/src/main/webapp/conf/categorybytype.properties b/src/main/webapp/conf/categorybytype.properties
index ce06fc3..244928e 100644
--- a/src/main/webapp/conf/categorybytype.properties
+++ b/src/main/webapp/conf/categorybytype.properties
@@ -1,25 +1,24 @@
-JOB_COMPLETED_OK=Process Executions
-JOB_COMPLETED_NOK=Process Executions
-TDM_TAB_RESOURCE_SHARE=Application: Tabular Data Manager
-TDM_RULE_SHARE=Application: Tabular Data Manager
-TDM_TEMPLATE_SHARE=Application: Tabular Data Manager
-WP_FOLDER_SHARE=Workspace Sharing
-WP_FOLDER_UNSHARE=Workspace Sharing
-WP_ADMIN_UPGRADE=Workspace Sharing
-WP_ADMIN_DOWNGRADE=Workspace Sharing
-WP_FOLDER_ADDEDUSER=Workspace Sharing
-WP_FOLDER_REMOVEDUSER=Workspace Sharing
-WP_FOLDER_RENAMED=Workspace Sharing
-WP_ITEM_DELETE=Workspace Sharing
-WP_ITEM_UPDATED=Workspace Sharing
-WP_ITEM_RENAMED=Workspace Sharing
-WP_ITEM_NEW=Workspace Sharing
+WP_FOLDER_SHARE=Workspace
+WP_FOLDER_UNSHARE=Workspace
+WP_ADMIN_UPGRADE=Workspace
+WP_ADMIN_DOWNGRADE=Workspace
+WP_FOLDER_ADDEDUSER=Workspace
+WP_FOLDER_REMOVEDUSER=Workspace
+WP_FOLDER_RENAMED=Workspace
+WP_ITEM_DELETE=Workspace
+WP_ITEM_UPDATED=Workspace
+WP_ITEM_RENAMED=Workspace
+WP_ITEM_NEW=Workspace
OWN_COMMENT=Social Networking
COMMENT=Social Networking
MENTION=Social Networking
LIKE=Social Networking
MESSAGE=Social Networking
POST_ALERT=Social Networking
-CALENDAR_ADDED_EVENT=Shared Calendars
-CALENDAR_UPDATED_EVENT=Shared Calendars
-CALENDAR_DELETED_EVENT=Shared Calendars
+CAT_ITEM_DELETE=Catalogue
+CAT_ITEM_PUBLISHED=Catalogue
+CAT_ITEM_REJECTED=Catalogue
+CAT_ITEM_SUBMITTED=Catalogue
+CAT_ITEM_UPDATED=Catalogue
+JOB_COMPLETED_OK=Process-related Event
+JOB_COMPLETED_NOK=Process-related Event
\ No newline at end of file
diff --git a/src/main/webapp/conf/descbytype.properties b/src/main/webapp/conf/descbytype.properties
index 7117090..b580ee2 100644
--- a/src/main/webapp/conf/descbytype.properties
+++ b/src/main/webapp/conf/descbytype.properties
@@ -15,11 +15,10 @@ MENTION=Someone mentioned you in a post
LIKE=Someone liked your post
MESSAGE=Someone sent you a message
POST_ALERT=Someone shared a post enabling the email notification
-CALENDAR_ADDED_EVENT=Someone added a new event in one of your shared calendars
-CALENDAR_UPDATED_EVENT=Someone edited an event in one of your shared calendars
-CALENDAR_DELETED_EVENT=Someone deleted an event in one of your shared calendars
-TDM_TAB_RESOURCE_SHARE=Sharing of Tabular Resources with you
-TDM_RULE_SHARE=Sharing of Tabular Data Manager Rules with you
-TDM_TEMPLATE_SHARE=Sharing of Tabular Data Manager Templates with you
+CAT_ITEM_DELETE=Someone removes an item
+CAT_ITEM_PUBLISHED=Someone publishes a new item
+CAT_ITEM_REJECTED=Someone rejects a submitted item (only for item creators and catalogue moderators)
+CAT_ITEM_SUBMITTED=Someone submits an item for consideration (only for catalogue moderators)
+CAT_ITEM_UPDATED=Someone updates an item
JOB_COMPLETED_OK=The result of any Job you launched completed successfully
JOB_COMPLETED_NOK=The result of any Job you launched reported errors
\ No newline at end of file
diff --git a/src/main/webapp/conf/labelbytype.properties b/src/main/webapp/conf/labelbytype.properties
index e8c6f12..69d8430 100644
--- a/src/main/webapp/conf/labelbytype.properties
+++ b/src/main/webapp/conf/labelbytype.properties
@@ -15,11 +15,10 @@ MENTION=Mentions
LIKE=Likes
MESSAGE=Messages
POST_ALERT=Post Alerts
-CALENDAR_ADDED_EVENT=Added events
-CALENDAR_UPDATED_EVENT=Edited events
-CALENDAR_DELETED_EVENT=Deleted events
-TDM_TAB_RESOURCE_SHARE=Shared Tabular Resource
-TDM_RULE_SHARE=Shared Tabular Data Manager Rule
-TDM_TEMPLATE_SHARE=Shared Tabular Data Manager Template
JOB_COMPLETED_OK=Job completed successfully
-JOB_COMPLETED_NOK=Job completed with failures
\ No newline at end of file
+JOB_COMPLETED_NOK=Job completed with failures
+CAT_ITEM_DELETE=Item Removed
+CAT_ITEM_PUBLISHED=Item Published
+CAT_ITEM_REJECTED=Item Rejected
+CAT_ITEM_SUBMITTED=Item Submitted
+CAT_ITEM_UPDATED=Item Updated
\ No newline at end of file