Feature/sc 31715/sheets desktop notifications page

reader/views.py

@@ -170,6 +170,7 @@ def base_props(request):
 
     if request.user.is_authenticated:
         profile = UserProfile(user_obj=request.user)
+        active_module = getattr(request, "active_module", "library")
         user_data = {
             "_uid": request.user.id,
             "_email": request.user.email,
@@ -187,7 +188,7 @@ def base_props(request):
             "blocking": profile.blockees.uids,
             "calendars": get_todays_calendar_items(**_get_user_calendar_params(request)),
             "notificationCount": profile.unread_notification_count(),
-            "notifications": profile.recent_notifications().client_contents(),
+            "notifications": profile.recent_notifications(scope=active_module).client_contents(),
             "saved": {"loaded": False, "items": profile.get_history(saved=True, secondary=False, serialized=True, annotate=False)}, # saved is initially loaded without text annotations so it can quickly immediately mark any texts/sheets as saved, but marks as `loaded: false` so the full annotated data will be requested if the user visits the saved/history page
             "last_place": profile.get_history(last_place=True, secondary=False, sheets=False, serialized=True)
         }
@@ -1076,7 +1077,8 @@ def user_stats(request):
 def notifications(request):
     # Notifications content is not rendered server side
     title = _("Sefaria Notifications")
-    notifications = UserProfile(user_obj=request.user).recent_notifications()
+    active_module = getattr(request, 'active_module', 'library')
+    notifications = UserProfile(user_obj=request.user).recent_notifications(scope=active_module)
     props = {
         "notifications": notifications.client_contents(),
     }
@@ -2925,8 +2927,9 @@ def notifications_api(request):
 
     page      = int(request.GET.get("page", 0))
     page_size = int(request.GET.get("page_size", 10))
+    scope = str(request.GET.get("scope", "library"))
 
-    notifications = NotificationSet().recent_for_user(request.user.id, limit=page_size, page=page)
+    notifications = NotificationSet().recent_for_user(request.user.id, limit=page_size, page=page, scope=scope)
 
     return jsonResponse({
         "notifications": notifications.client_contents(),

sefaria/model/notification.py

@@ -171,6 +171,13 @@ class Notification(abst.AbstractMongoRecord):
         "suspected_spam"
     ]
 
+    sheets_notification_types = [
+        "collection add",
+        "follow",
+        "sheet like",
+        "sheet publish"
+    ]
+
     def _init_defaults(self):
         self.read      = False
         self.read_via  = None
@@ -326,7 +333,6 @@ def __init__(self, query=None, page=0, limit=0, sort=[["date", -1]]):
     def _add_global_messages(self, uid):
         """
         Add user Notification records for any new GlobalNotifications
-        :return:
         """
         latest_id_for_user = Notification.latest_global_for_user(uid)
         latest_global_id = GlobalNotification.latest_id()
@@ -336,28 +342,44 @@ def _add_global_messages(self, uid):
             else:
                 GlobalNotificationSet({"_id": {"$gt": latest_id_for_user}}, limit=10).register_for_user(uid)
 
-    def unread_for_user(self, uid):
+    def _build_query_with_scope(self, uid, read=None, is_global=None, suspected_spam=None, scope='library'):
+        """
+        Helper method to build a query with the given parameters and scope.
+        """
+        query = {"uid": uid}
+        if read is not None:
+            query["read"] = read
+        if is_global is not None:
+            query["is_global"] = is_global
+        if suspected_spam is not None:
+            query["suspected_spam"] = suspected_spam
+        query["type"] = {"$in" if scope == 'sheets' else "$nin": Notification.sheets_notification_types}
+        return query
+
+    def unread_for_user(self, uid, scope='library'):
         """
         Loads the unread notifications for uid.
         """
-        # Add globals ...
         self._add_global_messages(uid)
-        self.__init__(query={"uid": uid, "read": False})
+        query = self._build_query_with_scope(uid, read=False, scope=scope)
+        self.__init__(query=query)
         return self
 
-    def unread_personal_for_user(self, uid):
+    def unread_personal_for_user(self, uid, scope='library'):
         """
-        Loads the unread notifications for uid.
+        Loads the unread personal notifications for uid.
         """
-        self.__init__(query={"uid": uid, "read": False, "is_global": False, "suspected_spam": {'$in': [False, None]}})
+        query = self._build_query_with_scope(uid, read=False, is_global=False, suspected_spam={'$in': [False, None]}, scope=scope)
+        self.__init__(query=query)
         return self
 
-    def recent_for_user(self, uid, page=0, limit=10):
+    def recent_for_user(self, uid, page=0, limit=10, scope='library'):
         """
         Loads recent notifications for uid.
         """
         self._add_global_messages(uid)
-        self.__init__(query={"uid": uid, "suspected_spam": {'$in': [False, None]}}, page=page, limit=limit)
+        query = self._build_query_with_scope(uid, suspected_spam={"$in": [False, None]}, scope=scope)
+        self.__init__(query=query, page=page, limit=limit)
         return self
 
     def mark_read(self, via="site"):

sefaria/model/user_profile.py

@@ -592,13 +592,14 @@ def followed_by(self, uid):
         """Returns true if this user is followed by uid"""
         return uid in self.followers.uids
 
-    def recent_notifications(self):
+    def recent_notifications(self, scope="library"):
         from sefaria.model.notification import NotificationSet
-        return NotificationSet().recent_for_user(self.id)
+        return NotificationSet().recent_for_user(self.id, scope=scope)
 
-    def unread_notification_count(self):
+    def unread_notification_count(self, scope="library"):
+        # TODO: Why do we not need to scope the notifications to the module here?
         from sefaria.model.notification import NotificationSet
-        return NotificationSet().unread_for_user(self.id).count()
+        return NotificationSet().unread_for_user(self.id, scope=scope).count()
 
     def process_history_item(self, hist, time_stamp):
         action = hist.pop("action", None)

sefaria/urls.py

@@ -47,6 +47,7 @@
     url(r'^translations/(?P<slug>[^.]+)$', reader_views.translations_page),
     url(r'^community/?$', reader_views.community_page),
     url(r'^notifications/?$', reader_views.notifications),
+    url(r'^sheets/notifications/?$', reader_views.notifications),
     url(r'^modtools/?$', reader_views.modtools),
     url(r'^modtools/upload_text$', sefaria_views.modtools_upload_workflowy),
     url(r'^modtools/links$', sefaria_views.links_upload_api),

static/css/s2.css

@@ -8377,14 +8377,14 @@ But not to use a display block directive that might break continuous mode for ot
 }
 .notification .sheetTitle,
 .notification .collectionName {
-  --english-font: var(--english-serif-font-family);
-  --hebrew-font: var(--hebrew-serif-font-family);
+  --english-font: var(--english-sans-serif-font-family);
+  --hebrew-font: var(--hebrew-sans-serif-font-family);
   font-size: 24px;
   display: block;
 }
 .notification .sheetSummary {
-  --english-font: var(--english-serif-font-family);
-  --hebrew-font: var(--hebrew-serif-font-family);
+  --english-font: var(--english-sans-serif-font-family);
+  --hebrew-font: var(--hebrew-sans-serif-font-family);
   color: var(--dark-grey);
   font-size: 18px;
   margin-top: 10px;
@@ -15169,6 +15169,10 @@ span.ref-link-color-3 {color: blue}
   margin-top: 30px;
 }
 
+.notificationUserName {
+  color: var(--midrash-green) !important;
+}
+
 .emptyNotificationsTitle{
   font-family: Roboto;
   font-size: 16px;

static/js/NotificationsPanel.jsx

@@ -53,7 +53,8 @@ class NotificationsPanel extends Component {
     }
   }
   getMoreNotifications() {
-    $.getJSON("/api/notifications?page=" + this.state.page, this.loadMoreNotifications);
+    const activeModule = Sefaria.activeModule;
+    $.getJSON(`/api/notifications?page=${this.state.page}&scope=${activeModule}`, this.loadMoreNotifications);
     this.setState({loading: true});
   }
   loadMoreNotifications(data) {
@@ -81,13 +82,10 @@ class NotificationsPanel extends Component {
                     <InterfaceText>Notifications</InterfaceText>
                   </h1>
                 </div>
-                {(Sefaria._uid) ? (
-                     Sefaria.notificationCount > 0 && notifications
-                ) : (
-                  <LoginPrompt fullPanel={true} />
-                )}
+                {!Sefaria._uid && <LoginPrompt fullPanel={true} />}
               </div>
-              {Sefaria._uid && Sefaria.notificationCount < 1 && <EmptyNotificationsMessage /> } 
+              {Sefaria._uid && notifications.length < 1 && <EmptyNotificationsMessage /> } 
+              {Sefaria._uid && notifications.length > 0 && notifications}
             </div>
             <NavSidebar sidebarModules={sidebarModules} />
           </div>
@@ -167,7 +165,7 @@ const Notification = ({imageUrl, imageLink, topLine, date, body}) => {
 const SheetPublishNotification = ({date, content}) => {
   const topLine = (
     <>
-      <a href={content.profileUrl}>{content.name}</a>&nbsp;
+      <a href={content.profileUrl} className="notificationUserName">{content.name}</a>&nbsp;
       <InterfaceText>published a new sheet</InterfaceText>
     </>
   );
@@ -197,7 +195,7 @@ const SheetPublishNotification = ({date, content}) => {
 const SheetLikeNotification = ({date, content}) => {
   const topLine = (
     <>
-      <a href={content.profileUrl}>{content.name}</a>&nbsp;
+      <a href={content.profileUrl} className="notificationUserName">{content.name}</a>&nbsp;
       <InterfaceText>liked your sheet</InterfaceText>
     </>
   );
@@ -223,7 +221,7 @@ const FollowNotification = ({date, content}) => {
 
   const topLine = (
     <>
-      <a href={content.profileUrl}>{content.name}</a>&nbsp;
+      <a href={content.profileUrl} className="notificationUserName">{content.name}</a>&nbsp;
       <InterfaceText>is now following you</InterfaceText>
     </>
   );