DYN-5190 mark all as read (#13260)

filipeotero · web-flow · commit 11f50cc9df7e · 2022-08-30T11:29:47.000-04:00
* mark all as read function

* mark all as read functionallity

* remove local settings

* Addressing comments

* updating the pointer position and add a margin to the notifcations button

* Limit of months to filter the notifications
diff --git a/src/DynamoCore/Configuration/PreferenceSettings.cs b/src/DynamoCore/Configuration/PreferenceSettings.cs
@@ -596,6 +596,11 @@ public string IronPythonResolveTargetVersion
             get { return IronPythonResolveVersion.ToString(); }
             set { IronPythonResolveVersion = Version.TryParse(value, out Version newVal) ? newVal : IronPythonResolveVersion; }
         }
+
+        /// <summary>
+        /// Stores the notification ids that was read by the user
+        /// </summary>
+        public List<string> ReadNotificationIds { get; set; }
         #endregion
 
         /// <summary>
@@ -636,7 +641,7 @@ public PreferenceSettings()
             BackupInterval = 60000; // 1 minute
             BackupFilesCount = 1;
             BackupFiles = new List<string>();
-
+                        
             CustomPackageFolders = new List<string>();
 
             PythonTemplateFilePath = "";
@@ -647,6 +652,7 @@ public PreferenceSettings()
             DefaultPythonEngine = string.Empty;
             ViewExtensionSettings = new List<ViewExtensionSettings>();
             GroupStyleItemsList = new List<GroupStyleItem>();
+            ReadNotificationIds = new List<string>();
         }
 
         /// <summary>
diff --git a/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml b/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml
@@ -139,11 +139,12 @@
 
                 <Menu HorizontalAlignment="Right"
                       Style="{StaticResource MainMenu}"
+                      Margin="0,0,10,0"
                       IsMainMenu="True">
                     <MenuItem Name="exportMenu"
                               Cursor="Hand"
                               Focusable="False"
-                              Margin="0,-3,0,0"
+                              Margin="0,-3,-10,0"
                               MouseEnter="exportMenu_MouseEnter"
                               MouseLeave="exportMenu_MouseLeave">
                         <MenuItem.Header>
@@ -203,6 +204,7 @@
                                     <Border DockPanel.Dock="Bottom" 
                                             Background="{StaticResource Blue400Brush}" 
                                             CornerRadius="2"
+                                            Visibility="{Binding IsNotificationsCounterVisible, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" 
                                             Padding="2"
                                             Height="14"
                                             Width="14"
diff --git a/src/DynamoCoreWpf/ViewModels/Core/ShortcutToolbarViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/ShortcutToolbarViewModel.cs
@@ -1,4 +1,5 @@
 ﻿using Dynamo.ViewModels;
+using System.Windows;
 
 namespace Dynamo.Wpf.ViewModels.Core
 {
@@ -9,9 +10,31 @@ public ShortcutToolbarViewModel()
             NotificationsNumber = 0;
         }
 
+        private int notificationsNumber;
+
         /// <summary>
         /// This property represents the number of new notifications 
         /// </summary>
-        public int NotificationsNumber { get; set; }
+        public int NotificationsNumber { 
+            get {
+                return notificationsNumber;
+            } 
+            set {
+                notificationsNumber = value;
+                RaisePropertyChanged(nameof(IsNotificationsCounterVisible));
+            }
+        }
+
+        public bool IsNotificationsCounterVisible
+        { 
+            get 
+            {
+                if (NotificationsNumber == 0)
+                {
+                    return false;
+                }
+                return true;
+            }
+        }
     }
 }
diff --git a/src/Notifications/NotificationCenterController.cs b/src/Notifications/NotificationCenterController.cs
@@ -1,14 +1,17 @@
 ﻿using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Collections.Generic;
 using System.Configuration;
 using System.IO;
 using System.Linq;
 using System.Net;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
+using Dynamo.Configuration;
 using Dynamo.Controls;
 using Dynamo.Logging;
 using Dynamo.Notifications.View;
@@ -18,23 +21,39 @@
 
 namespace Dynamo.Notifications
 {
+    [ClassInterface(ClassInterfaceType.AutoDual)]
+    [ComVisible(true)]
+    public class scriptObject
+    {
+        Action<object[]> onMarkAllAsRead;
+
+        internal scriptObject(Action<object []> onMarkAllAsRead)
+        {
+            this.onMarkAllAsRead = onMarkAllAsRead;
+        }
+
+        public void SetNoficationsAsRead(object[] ids)
+        {
+            onMarkAllAsRead(ids);
+        }
+    }
+
     public class NotificationCenterController
     {
         private readonly NotificationUI notificationUIPopup;
         private readonly DynamoView dynamoView;
         private readonly DynamoViewModel dynamoViewModel;
         private readonly Button notificationsButton;
 
-        private static readonly int notificationPopupHorizontalOffset = -285;
+        private static readonly int notificationPopupHorizontalOffset = -295;
         private static readonly int notificationPopupVerticalOffset = 10;
+        private static readonly int limitOfMonthsFilterNotifications = 6;
 
         private static readonly string htmlEmbeddedFile = "Dynamo.Notifications.node_modules._dynamods.notifications_center.build.index.html";
         private static readonly string jsEmbeddedFile = "Dynamo.Notifications.node_modules._dynamods.notifications_center.build.index.bundle.js";
         private static readonly string NotificationCenterButtonName = "notificationsButton";
 
         private DynamoLogger logger;
-        private static readonly DateTime notificationsCenterCreatedTime = DateTime.UtcNow;
-        private static System.Timers.Timer timer;
         private string jsonStringFile;
         private NotificationsModel notificationsModel;
 
@@ -46,7 +65,7 @@ internal NotificationCenterController(DynamoView view, DynamoLogger dynLogger)
 
             dynamoView.SizeChanged += DynamoView_SizeChanged;
             dynamoView.LocationChanged += DynamoView_LocationChanged;
-            notificationsButton.Click += NotificationsButton_Click;
+            notificationsButton.Click += NotificationsButton_Click;            
 
             notificationUIPopup = new NotificationUI
             {
@@ -56,7 +75,6 @@ internal NotificationCenterController(DynamoView view, DynamoLogger dynLogger)
                 HorizontalOffset = notificationPopupHorizontalOffset,
                 VerticalOffset = notificationPopupVerticalOffset
             };
-
             notificationUIPopup.webView.EnsureCoreWebView2Async();
             notificationUIPopup.webView.CoreWebView2InitializationCompleted += WebView_CoreWebView2InitializationCompleted;
             logger = dynLogger;
@@ -88,15 +106,42 @@ private void RequestNotifications()
                 jsonStringFile = reader.ReadToEnd();
                 notificationsModel = JsonConvert.DeserializeObject<NotificationsModel>(jsonStringFile);
 
-                var notificationsNumber = notificationsModel.Notifications.Count();
-
-                var shortcutToolbarViewModel = (ShortcutToolbarViewModel)dynamoView.ShortcutBar.DataContext;
-                shortcutToolbarViewModel.NotificationsNumber = notificationsNumber;
+                //We are adding a limit of months to grab the notifications
+                var limitDate = DateTime.Now.AddMonths(-limitOfMonthsFilterNotifications);
+                notificationsModel.Notifications = notificationsModel.Notifications.Where(x => x.Created >= limitDate).ToList();
             }
 
+            CountUnreadNotifications();
             notificationUIPopup.webView.NavigationCompleted += WebView_NavigationCompleted;
         }
 
+        private void CountUnreadNotifications()
+        {
+            var notificationsNumber = 0;
+            foreach (var notification in notificationsModel.Notifications)
+            {
+                if (!dynamoViewModel.Model.PreferenceSettings.ReadNotificationIds.Contains(notification.Id))
+                {
+                    notification.IsRead = false;
+                    notificationsNumber++;
+                }
+            }
+
+            var shortcutToolbarViewModel = (ShortcutToolbarViewModel)dynamoView.ShortcutBar.DataContext;
+            shortcutToolbarViewModel.NotificationsNumber = notificationsNumber;
+        }
+
+        internal void OnMarkAllAsRead(object[] ids)
+        {
+            string[] notificationIds = ids.Select(x => x.ToString()).
+                Where(x => !dynamoViewModel.Model.PreferenceSettings.ReadNotificationIds.Contains(x.ToString())).ToArray();
+
+            dynamoViewModel.Model.PreferenceSettings.ReadNotificationIds.AddRange(notificationIds);
+
+            var shortcutToolbarViewModel = (ShortcutToolbarViewModel)dynamoView.ShortcutBar.DataContext;
+            shortcutToolbarViewModel.NotificationsNumber = 0;
+        }
+
         // Handler for new Webview2 tab window request
         private void WebView_NewWindowRequested(object sender, Microsoft.Web.WebView2.Core.CoreWebView2NewWindowRequestedEventArgs e)
         {
@@ -130,6 +175,9 @@ private void WebView_CoreWebView2InitializationCompleted(object sender, Microsof
                 // Opening hyper-links using default system browser instead of WebView2 tab window
                 notificationUIPopup.webView.CoreWebView2.NewWindowRequested += WebView_NewWindowRequested;
                 notificationUIPopup.webView.CoreWebView2.NavigateToString(htmlString);
+                // Hosts an object that will expose the properties and methods to be called from the javascript side
+                notificationUIPopup.webView.CoreWebView2.AddHostObjectToScript("scriptObject", 
+                    new scriptObject(OnMarkAllAsRead));
             }
         }
 
diff --git a/src/Notifications/NotificationsModel.cs b/src/Notifications/NotificationsModel.cs
@@ -61,5 +61,8 @@ internal class NotificationItemModel
 
         [DataMember(Name = "isPinned")]
         internal bool IsPinned { get; set; }
+
+        [DataMember(Name = "isRead")]
+        internal bool IsRead { get; set; } = true;
     }
 }
diff --git a/src/Notifications/NotificationsUIViewModel.cs b/src/Notifications/NotificationsUIViewModel.cs
@@ -30,18 +30,18 @@ class NotificationsUIViewModel : ViewModelBase
 
         public NotificationsUIViewModel()
         {
-            var PointerVerticalOffset = PopupRectangleHeight / 8;
+            var pointerOffSet = 10;
 
             //First X,Y coordinate
-            double pointX1 = PopupRectangleWidth - PointerWidth;
+            double pointX1 = PopupRectangleWidth - PointerWidth + pointerOffSet;
             double pointY1 = PopupBordersOffSet;
 
             ////Second X,Y coordinate
-            double pointX2 = PopupRectangleWidth;
+            double pointX2 = PopupRectangleWidth + pointerOffSet;
             double pointY2 = PopupBordersOffSet;
 
             ////Third X,Y coordinate
-            double pointX3 = PopupRectangleWidth - PointerWidth / 2;
+            double pointX3 = PopupRectangleWidth - PointerWidth / 2 + pointerOffSet;
             double pointY3 = 0;
 
             //Creating the pointer pointing to the Run section of Dynamo

Original file line number	Diff line number	Diff line change
`@@ -61,5 +61,8 @@ internal class NotificationItemModel`
`61`	`61`
`62`	`62`	`[DataMember(Name = "isPinned")]`
`63`	`63`	`internal bool IsPinned { get; set; }`
	`64`	`+`
	`65`	`+ [DataMember(Name = "isRead")]`
	`66`	`+ internal bool IsRead { get; set; } = true;`
`64`	`67`	`}`
`65`	`68`	`}`