From 6cc2835d31f4175388fd6095986220206b12dd55 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Tue, 9 Jul 2024 18:14:05 +0530
Subject: [PATCH 01/74] [chore] REST API changes

- Updated the `NotificationSettingSerializer` to also include
`organization_name`.
- New endpoint `/api/user-setting/organization/<uuid:organization_id>/`
to allow changes toggling of email/web notification settings of a
particular org with just a single API call.
---
 openwisp_notifications/api/serializers.py | 11 ++++++++++
 openwisp_notifications/api/urls.py        |  5 +++++
 openwisp_notifications/api/views.py       | 26 ++++++++++++++++++++++-
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/openwisp_notifications/api/serializers.py b/openwisp_notifications/api/serializers.py
index d4dbd41d..e67fcb73 100644
--- a/openwisp_notifications/api/serializers.py
+++ b/openwisp_notifications/api/serializers.py
@@ -73,6 +73,11 @@ class Meta(NotificationSerializer.Meta):
 
 
 class NotificationSettingSerializer(serializers.ModelSerializer):
+    organization_name = serializers.SerializerMethodField()
+
+    def get_organization_name(self, obj):
+        return obj.organization.name if obj.organization else None
+
     class Meta:
         model = NotificationSetting
         exclude = ['user']
@@ -87,3 +92,9 @@ class Meta:
             'object_content_type',
             'object_id',
         ]
+
+
+class NotificationSettingUpdateSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = NotificationSetting
+        fields = ['email', 'web']
diff --git a/openwisp_notifications/api/urls.py b/openwisp_notifications/api/urls.py
index 597d2a74..4b2b3b16 100644
--- a/openwisp_notifications/api/urls.py
+++ b/openwisp_notifications/api/urls.py
@@ -27,6 +27,11 @@ def get_api_urls(api_views=None):
             views.notification_setting,
             name='notification_setting',
         ),
+        path(
+            'user-setting/organization/<uuid:organization_id>/',
+            views.org_notification_setting,
+            name='org_notification_setting',
+        ),
         path(
             'ignore/',
             views.ignore_object_notification_list,
diff --git a/openwisp_notifications/api/views.py b/openwisp_notifications/api/views.py
index 7320c72e..3a9fa8d1 100644
--- a/openwisp_notifications/api/views.py
+++ b/openwisp_notifications/api/views.py
@@ -14,14 +14,16 @@
 from rest_framework.pagination import PageNumberPagination
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
+from rest_framework.views import APIView
 
 from openwisp_notifications.api.serializers import (
     IgnoreObjectNotificationSerializer,
     NotificationListSerializer,
     NotificationSerializer,
     NotificationSettingSerializer,
+    NotificationSettingUpdateSerializer,
 )
-from openwisp_notifications.swapper import load_model
+from openwisp_notifications.swapper import load_model, swapper_load_model
 from openwisp_users.api.authentication import BearerAuthentication
 
 from .filters import NotificationSettingFilter
@@ -135,6 +137,27 @@ class NotificationSettingView(BaseNotificationSettingView, RetrieveUpdateAPIView
     lookup_field = 'pk'
 
 
+class OrganizationNotificationSettingView(APIView):
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request, organization_id):
+        notification_settings = NotificationSetting.objects.filter(
+            organization_id=organization_id, user=request.user
+        )
+
+        serializer = NotificationSettingUpdateSerializer(data=request.data)
+        if serializer.is_valid():
+            email = serializer.validated_data.get('email')
+            web = serializer.validated_data.get('web')
+
+            # Update all notification settings for the specified organization
+            notification_settings.update(email=email, web=web)
+
+            return Response(status=status.HTTP_200_OK)
+        else:
+            return Response(status=status.HTTP_400_BAD_REQUEST)
+
+
 class BaseIgnoreObjectNotificationView(GenericAPIView):
     model = IgnoreObjectNotification
     serializer_class = IgnoreObjectNotificationSerializer
@@ -204,5 +227,6 @@ def perform_create(self, serializer):
 notification_read_redirect = NotificationReadRedirect.as_view()
 notification_setting_list = NotificationSettingListView.as_view()
 notification_setting = NotificationSettingView.as_view()
+org_notification_setting = OrganizationNotificationSettingView.as_view()
 ignore_object_notification_list = IgnoreObjectNotificationListView.as_view()
 ignore_object_notification = IgnoreObjectNotificationView.as_view()

From 7016f863eca7cf488c158c565f8770e62635d0b6 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Sun, 14 Jul 2024 23:29:47 +0530
Subject: [PATCH 02/74] [chore] Add tests

---
 openwisp_notifications/api/urls.py       | 15 +++--
 openwisp_notifications/api/views.py      | 70 ++++++++++++++++--------
 openwisp_notifications/tests/test_api.py | 35 ++++++++++++
 3 files changed, 91 insertions(+), 29 deletions(-)

diff --git a/openwisp_notifications/api/urls.py b/openwisp_notifications/api/urls.py
index 4b2b3b16..5cb004c7 100644
--- a/openwisp_notifications/api/urls.py
+++ b/openwisp_notifications/api/urls.py
@@ -27,11 +27,6 @@ def get_api_urls(api_views=None):
             views.notification_setting,
             name='notification_setting',
         ),
-        path(
-            'user-setting/organization/<uuid:organization_id>/',
-            views.org_notification_setting,
-            name='org_notification_setting',
-        ),
         path(
             'ignore/',
             views.ignore_object_notification_list,
@@ -42,4 +37,14 @@ def get_api_urls(api_views=None):
             views.ignore_object_notification,
             name='ignore_object_notification',
         ),
+        path(
+            'user-setting/organization/<uuid:organization_id>/',
+            views.organization_notification_setting,
+            name='organization_notification_setting',
+        ),
+        path(
+            'user/<uuid:user_id>/setting/organization/<uuid:organization_id>/',
+            views.admin_user_organization_notification_setting,
+            name='admin_user_organization_notification_setting',
+        ),
     ]
diff --git a/openwisp_notifications/api/views.py b/openwisp_notifications/api/views.py
index 3a9fa8d1..ff73ed43 100644
--- a/openwisp_notifications/api/views.py
+++ b/openwisp_notifications/api/views.py
@@ -12,7 +12,7 @@
 )
 from rest_framework.mixins import CreateModelMixin, ListModelMixin, UpdateModelMixin
 from rest_framework.pagination import PageNumberPagination
-from rest_framework.permissions import IsAuthenticated
+from rest_framework.permissions import IsAdminUser, IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
@@ -23,7 +23,7 @@
     NotificationSettingSerializer,
     NotificationSettingUpdateSerializer,
 )
-from openwisp_notifications.swapper import load_model, swapper_load_model
+from openwisp_notifications.swapper import load_model
 from openwisp_users.api.authentication import BearerAuthentication
 
 from .filters import NotificationSettingFilter
@@ -137,27 +137,6 @@ class NotificationSettingView(BaseNotificationSettingView, RetrieveUpdateAPIView
     lookup_field = 'pk'
 
 
-class OrganizationNotificationSettingView(APIView):
-    permission_classes = [IsAuthenticated]
-
-    def post(self, request, organization_id):
-        notification_settings = NotificationSetting.objects.filter(
-            organization_id=organization_id, user=request.user
-        )
-
-        serializer = NotificationSettingUpdateSerializer(data=request.data)
-        if serializer.is_valid():
-            email = serializer.validated_data.get('email')
-            web = serializer.validated_data.get('web')
-
-            # Update all notification settings for the specified organization
-            notification_settings.update(email=email, web=web)
-
-            return Response(status=status.HTTP_200_OK)
-        else:
-            return Response(status=status.HTTP_400_BAD_REQUEST)
-
-
 class BaseIgnoreObjectNotificationView(GenericAPIView):
     model = IgnoreObjectNotification
     serializer_class = IgnoreObjectNotificationSerializer
@@ -221,12 +200,55 @@ def perform_create(self, serializer):
         )
 
 
+class OrganizationNotificationSettingView(APIView):
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request, organization_id):
+        notification_settings = NotificationSetting.objects.filter(
+            organization_id=organization_id, user=request.user
+        )
+        serializer = NotificationSettingUpdateSerializer(data=request.data)
+        if serializer.is_valid():
+            email = serializer.validated_data.get('email')
+            web = serializer.validated_data.get('web')
+
+            # Update all notification settings for the specific organization
+            notification_settings.update(email=email, web=web)
+
+            return Response(status=status.HTTP_200_OK)
+        else:
+            return Response(status=status.HTTP_400_BAD_REQUEST)
+
+
+class AdminUserOrganizationNotificationSettingView(APIView):
+    permission_classes = [IsAdminUser]
+
+    def post(self, request, user_id, organization_id):
+        notification_settings = NotificationSetting.objects.filter(
+            organization_id=organization_id, user_id=user_id
+        )
+        serializer = NotificationSettingUpdateSerializer(data=request.data)
+        if serializer.is_valid():
+            email = serializer.validated_data.get('email')
+            web = serializer.validated_data.get('web')
+
+            # Update all notification settings for the specific organization and user
+            notification_settings.update(email=email, web=web)
+
+            return Response(status=status.HTTP_200_OK)
+        else:
+            return Response(status=status.HTTP_400_BAD_REQUEST)
+
+
 notifications_list = NotificationListView.as_view()
 notification_detail = NotificationDetailView.as_view()
 notifications_read_all = NotificationReadAllView.as_view()
 notification_read_redirect = NotificationReadRedirect.as_view()
 notification_setting_list = NotificationSettingListView.as_view()
 notification_setting = NotificationSettingView.as_view()
-org_notification_setting = OrganizationNotificationSettingView.as_view()
+organization_notification_setting = OrganizationNotificationSettingView.as_view()
+admin_user_organization_notification_setting = (
+    AdminUserOrganizationNotificationSettingView.as_view()
+)
 ignore_object_notification_list = IgnoreObjectNotificationListView.as_view()
 ignore_object_notification = IgnoreObjectNotificationView.as_view()
diff --git a/openwisp_notifications/tests/test_api.py b/openwisp_notifications/tests/test_api.py
index 56f53abc..e793552a 100644
--- a/openwisp_notifications/tests/test_api.py
+++ b/openwisp_notifications/tests/test_api.py
@@ -671,6 +671,41 @@ def _unread_notification(notification):
                 '{view}?next={url}'.format(view=reverse('admin:login'), url=url),
             )
 
+    def test_organization_notification_setting_update(self):
+        org = Organization.objects.first()
+        url = self._get_path('organization_notification_setting', org.pk)
+        response = self.client.post(url, data={'web': True, 'email': True})
+        self.assertEqual(response.status_code, 200)
+        notification_setting = NotificationSetting.objects.filter(
+            user=self.admin, organization_id=org.pk
+        ).first()
+        self.assertTrue(notification_setting.web, True)
+        self.assertTrue(notification_setting.email, True)
+
+    def test_admin_user_organization_notification_setting_update(self):
+        tester = self._create_user()
+        org = Organization.objects.first()
+
+        with self.subTest('Test for admin user'):
+            url = self._get_path(
+                'admin_user_organization_notification_setting', self.admin.pk, org.pk
+            )
+            response = self.client.post(url, data={'web': True, 'email': True})
+            self.assertEqual(response.status_code, 200)
+            notification_setting = NotificationSetting.objects.filter(
+                user=self.admin, organization_id=org.pk
+            ).first()
+            self.assertTrue(notification_setting.web, True)
+            self.assertTrue(notification_setting.email, True)
+
+        with self.subTest('Test for non-admin user'):
+            self.client.force_login(tester)
+            url = self._get_path(
+                'admin_user_organization_notification_setting', tester.pk, org.pk
+            )
+            response = self.client.post(url, data={'web': True, 'email': True})
+            self.assertEqual(response.status_code, 403)
+
     @patch('openwisp_notifications.tasks.delete_ignore_object_notification.apply_async')
     def test_create_ignore_obj_notification_api(self, mocked_task):
         org_user = self._get_org_user()

From 6d410fc836a80641a7d98748a64d08db20af9189 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Wed, 17 Jul 2024 19:49:31 +0530
Subject: [PATCH 03/74] [chore] Use GenericAPIView

---
 openwisp_notifications/api/permissions.py | 17 +++++++++
 openwisp_notifications/api/serializers.py | 13 +++++--
 openwisp_notifications/api/urls.py        |  7 +---
 openwisp_notifications/api/views.py       | 46 ++++++-----------------
 openwisp_notifications/tests/test_api.py  | 10 ++---
 5 files changed, 42 insertions(+), 51 deletions(-)
 create mode 100644 openwisp_notifications/api/permissions.py

diff --git a/openwisp_notifications/api/permissions.py b/openwisp_notifications/api/permissions.py
new file mode 100644
index 00000000..92a2dddf
--- /dev/null
+++ b/openwisp_notifications/api/permissions.py
@@ -0,0 +1,17 @@
+from rest_framework.permissions import BasePermission
+
+
+class IsAuthenticatedToUpdateNotificationSetting(BasePermission):
+    def has_permission(self, request, view):
+        user = request.user
+        user_id = view.kwargs.get('user_id')
+
+        # Allow superusers
+        if user.is_superuser:
+            return True
+
+        # Allow users to update their own settings
+        if user.id == user_id:
+            return True
+
+        return False
diff --git a/openwisp_notifications/api/serializers.py b/openwisp_notifications/api/serializers.py
index e67fcb73..9baf8eff 100644
--- a/openwisp_notifications/api/serializers.py
+++ b/openwisp_notifications/api/serializers.py
@@ -94,7 +94,12 @@ class Meta:
         ]
 
 
-class NotificationSettingUpdateSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = NotificationSetting
-        fields = ['email', 'web']
+class NotificationSettingUpdateSerializer(serializers.Serializer):
+    email = serializers.BooleanField()
+    web = serializers.BooleanField()
+
+    def update(self, instance, validated_data):
+        instance.email = validated_data.get('email', instance.email)
+        instance.web = validated_data.get('web', instance.web)
+        instance.save()
+        return instance
diff --git a/openwisp_notifications/api/urls.py b/openwisp_notifications/api/urls.py
index 5cb004c7..5ecf2051 100644
--- a/openwisp_notifications/api/urls.py
+++ b/openwisp_notifications/api/urls.py
@@ -38,13 +38,8 @@ def get_api_urls(api_views=None):
             name='ignore_object_notification',
         ),
         path(
-            'user-setting/organization/<uuid:organization_id>/',
+            'user/<uuid:user_id>/organization/<uuid:organization_id>/setting/',
             views.organization_notification_setting,
             name='organization_notification_setting',
         ),
-        path(
-            'user/<uuid:user_id>/setting/organization/<uuid:organization_id>/',
-            views.admin_user_organization_notification_setting,
-            name='admin_user_organization_notification_setting',
-        ),
     ]
diff --git a/openwisp_notifications/api/views.py b/openwisp_notifications/api/views.py
index ff73ed43..0fe787d6 100644
--- a/openwisp_notifications/api/views.py
+++ b/openwisp_notifications/api/views.py
@@ -12,10 +12,12 @@
 )
 from rest_framework.mixins import CreateModelMixin, ListModelMixin, UpdateModelMixin
 from rest_framework.pagination import PageNumberPagination
-from rest_framework.permissions import IsAdminUser, IsAuthenticated
+from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
-from rest_framework.views import APIView
 
+from openwisp_notifications.api.permissions import (
+    IsAuthenticatedToUpdateNotificationSetting,
+)
 from openwisp_notifications.api.serializers import (
     IgnoreObjectNotificationSerializer,
     NotificationListSerializer,
@@ -200,44 +202,21 @@ def perform_create(self, serializer):
         )
 
 
-class OrganizationNotificationSettingView(APIView):
-    permission_classes = [IsAuthenticated]
-
-    def post(self, request, organization_id):
-        notification_settings = NotificationSetting.objects.filter(
-            organization_id=organization_id, user=request.user
-        )
-        serializer = NotificationSettingUpdateSerializer(data=request.data)
-        if serializer.is_valid():
-            email = serializer.validated_data.get('email')
-            web = serializer.validated_data.get('web')
-
-            # Update all notification settings for the specific organization
-            notification_settings.update(email=email, web=web)
-
-            return Response(status=status.HTTP_200_OK)
-        else:
-            return Response(status=status.HTTP_400_BAD_REQUEST)
-
-
-class AdminUserOrganizationNotificationSettingView(APIView):
-    permission_classes = [IsAdminUser]
+class OrganizationNotificationSettingView(GenericAPIView):
+    permission_classes = [IsAuthenticated, IsAuthenticatedToUpdateNotificationSetting]
+    serializer_class = NotificationSettingUpdateSerializer
 
     def post(self, request, user_id, organization_id):
         notification_settings = NotificationSetting.objects.filter(
             organization_id=organization_id, user_id=user_id
         )
-        serializer = NotificationSettingUpdateSerializer(data=request.data)
+        serializer = self.get_serializer(data=request.data)
         if serializer.is_valid():
-            email = serializer.validated_data.get('email')
-            web = serializer.validated_data.get('web')
-
-            # Update all notification settings for the specific organization and user
-            notification_settings.update(email=email, web=web)
-
+            for notification_setting in notification_settings:
+                serializer.update(notification_setting, serializer.validated_data)
             return Response(status=status.HTTP_200_OK)
         else:
-            return Response(status=status.HTTP_400_BAD_REQUEST)
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
 
 notifications_list = NotificationListView.as_view()
@@ -247,8 +226,5 @@ def post(self, request, user_id, organization_id):
 notification_setting_list = NotificationSettingListView.as_view()
 notification_setting = NotificationSettingView.as_view()
 organization_notification_setting = OrganizationNotificationSettingView.as_view()
-admin_user_organization_notification_setting = (
-    AdminUserOrganizationNotificationSettingView.as_view()
-)
 ignore_object_notification_list = IgnoreObjectNotificationListView.as_view()
 ignore_object_notification = IgnoreObjectNotificationView.as_view()
diff --git a/openwisp_notifications/tests/test_api.py b/openwisp_notifications/tests/test_api.py
index e793552a..150f777a 100644
--- a/openwisp_notifications/tests/test_api.py
+++ b/openwisp_notifications/tests/test_api.py
@@ -673,7 +673,7 @@ def _unread_notification(notification):
 
     def test_organization_notification_setting_update(self):
         org = Organization.objects.first()
-        url = self._get_path('organization_notification_setting', org.pk)
+        url = self._get_path('organization_notification_setting', self.admin.pk, org.pk)
         response = self.client.post(url, data={'web': True, 'email': True})
         self.assertEqual(response.status_code, 200)
         notification_setting = NotificationSetting.objects.filter(
@@ -688,7 +688,7 @@ def test_admin_user_organization_notification_setting_update(self):
 
         with self.subTest('Test for admin user'):
             url = self._get_path(
-                'admin_user_organization_notification_setting', self.admin.pk, org.pk
+                'organization_notification_setting', self.admin.pk, org.pk
             )
             response = self.client.post(url, data={'web': True, 'email': True})
             self.assertEqual(response.status_code, 200)
@@ -700,11 +700,9 @@ def test_admin_user_organization_notification_setting_update(self):
 
         with self.subTest('Test for non-admin user'):
             self.client.force_login(tester)
-            url = self._get_path(
-                'admin_user_organization_notification_setting', tester.pk, org.pk
-            )
+            url = self._get_path('organization_notification_setting', tester.pk, org.pk)
             response = self.client.post(url, data={'web': True, 'email': True})
-            self.assertEqual(response.status_code, 403)
+            self.assertEqual(response.status_code, 200)
 
     @patch('openwisp_notifications.tasks.delete_ignore_object_notification.apply_async')
     def test_create_ignore_obj_notification_api(self, mocked_task):

From e6cbb9cd8cc00ba26e1ffbabd574256f4fac381c Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Wed, 17 Jul 2024 20:28:32 +0530
Subject: [PATCH 04/74] [refactor] URL routes

---
 openwisp_notifications/api/urls.py | 37 +++++++++++++++++++-----------
 openwisp_notifications/urls.py     |  4 +---
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/openwisp_notifications/api/urls.py b/openwisp_notifications/api/urls.py
index 5ecf2051..9ee729b7 100644
--- a/openwisp_notifications/api/urls.py
+++ b/openwisp_notifications/api/urls.py
@@ -9,31 +9,40 @@ def get_api_urls(api_views=None):
     if not api_views:
         api_views = views
     return [
-        path('', views.notifications_list, name='notifications_list'),
-        path('read/', views.notifications_read_all, name='notifications_read_all'),
-        path('<uuid:pk>/', views.notification_detail, name='notification_detail'),
+        path('notification/', views.notifications_list, name='notifications_list'),
         path(
-            '<uuid:pk>/redirect/',
-            views.notification_read_redirect,
-            name='notification_read_redirect',
+            'notification/read/',
+            views.notifications_read_all,
+            name='notifications_read_all',
         ),
         path(
-            'user-setting/',
-            views.notification_setting_list,
-            name='notification_setting_list',
+            'notification/<uuid:pk>/',
+            views.notification_detail,
+            name='notification_detail',
         ),
         path(
-            'user-setting/<uuid:pk>/',
-            views.notification_setting,
-            name='notification_setting',
+            'notification/<uuid:pk>/redirect/',
+            views.notification_read_redirect,
+            name='notification_read_redirect',
         ),
+        # WIP
+        # path(
+        #     'user/user-setting/',
+        #     views.notification_setting_list,
+        #     name='notification_setting_list',
+        # ),
+        # path(
+        #     'user/user-setting/<uuid:pk>/',
+        #     views.notification_setting,
+        #     name='notification_setting',
+        # ),
         path(
-            'ignore/',
+            'notification/ignore/',
             views.ignore_object_notification_list,
             name='ignore_object_notification_list',
         ),
         path(
-            'ignore/<str:app_label>/<str:model_name>/<uuid:object_id>/',
+            'notification/ignore/<str:app_label>/<str:model_name>/<uuid:object_id>/',
             views.ignore_object_notification,
             name='ignore_object_notification',
         ),
diff --git a/openwisp_notifications/urls.py b/openwisp_notifications/urls.py
index efc6d2ba..04a8f9d7 100644
--- a/openwisp_notifications/urls.py
+++ b/openwisp_notifications/urls.py
@@ -9,9 +9,7 @@ def get_urls(api_views=None, social_views=None):
     Arguments:
         api_views(optional): views for Notifications API
     """
-    urls = [
-        path('api/v1/notifications/notification/', include(get_api_urls(api_views)))
-    ]
+    urls = [path('api/v1/notifications/', include(get_api_urls(api_views)))]
     return urls
 
 

From 531acdadb7f806718a9e2f230ba697fda3a72e5a Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Fri, 19 Jul 2024 14:39:46 +0530
Subject: [PATCH 05/74] [chore] Update tests

---
 openwisp_notifications/tests/test_api.py | 27 ++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/openwisp_notifications/tests/test_api.py b/openwisp_notifications/tests/test_api.py
index 150f777a..ce85c8e8 100644
--- a/openwisp_notifications/tests/test_api.py
+++ b/openwisp_notifications/tests/test_api.py
@@ -672,20 +672,21 @@ def _unread_notification(notification):
             )
 
     def test_organization_notification_setting_update(self):
-        org = Organization.objects.first()
-        url = self._get_path('organization_notification_setting', self.admin.pk, org.pk)
-        response = self.client.post(url, data={'web': True, 'email': True})
-        self.assertEqual(response.status_code, 200)
-        notification_setting = NotificationSetting.objects.filter(
-            user=self.admin, organization_id=org.pk
-        ).first()
-        self.assertTrue(notification_setting.web, True)
-        self.assertTrue(notification_setting.email, True)
-
-    def test_admin_user_organization_notification_setting_update(self):
         tester = self._create_user()
         org = Organization.objects.first()
 
+        with self.subTest('Test for current user'):
+            url = self._get_path(
+                'organization_notification_setting', self.admin.pk, org.pk
+            )
+            response = self.client.post(url, data={'web': True, 'email': True})
+            self.assertEqual(response.status_code, 200)
+            notification_setting = NotificationSetting.objects.filter(
+                user=self.admin, organization_id=org.pk
+            ).first()
+            self.assertTrue(notification_setting.web, True)
+            self.assertTrue(notification_setting.email, True)
+
         with self.subTest('Test for admin user'):
             url = self._get_path(
                 'organization_notification_setting', self.admin.pk, org.pk
@@ -700,9 +701,9 @@ def test_admin_user_organization_notification_setting_update(self):
 
         with self.subTest('Test for non-admin user'):
             self.client.force_login(tester)
-            url = self._get_path('organization_notification_setting', tester.pk, org.pk)
+            url = self._get_path('organization_notification_setting', self.admin.pk, org.pk)
             response = self.client.post(url, data={'web': True, 'email': True})
-            self.assertEqual(response.status_code, 200)
+            self.assertEqual(response.status_code, 403)
 
     @patch('openwisp_notifications.tasks.delete_ignore_object_notification.apply_async')
     def test_create_ignore_obj_notification_api(self, mocked_task):

From 2dfc5a80b5fe254096320f7f2073dc8ef17b6f0f Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Fri, 19 Jul 2024 21:00:33 +0530
Subject: [PATCH 06/74] [chore] Add Global Notification

---
 openwisp_notifications/api/urls.py            | 25 ++++++-----
 openwisp_notifications/api/views.py           | 26 ++++++++++-
 openwisp_notifications/base/models.py         |  2 +
 openwisp_notifications/handlers.py            | 11 +++++
 ..._alter_notificationsetting_organization.py | 25 +++++++++++
 openwisp_notifications/tests/test_api.py      | 44 ++++++++++++++++++-
 .../tests/test_notifications.py               | 22 ++++++++++
 ..._alter_notificationsetting_organization.py | 25 +++++++++++
 8 files changed, 167 insertions(+), 13 deletions(-)
 create mode 100644 openwisp_notifications/migrations/0008_alter_notificationsetting_organization.py
 create mode 100644 tests/openwisp2/sample_notifications/migrations/0003_alter_notificationsetting_organization.py

diff --git a/openwisp_notifications/api/urls.py b/openwisp_notifications/api/urls.py
index 9ee729b7..18bcc2eb 100644
--- a/openwisp_notifications/api/urls.py
+++ b/openwisp_notifications/api/urls.py
@@ -26,16 +26,16 @@ def get_api_urls(api_views=None):
             name='notification_read_redirect',
         ),
         # WIP
-        # path(
-        #     'user/user-setting/',
-        #     views.notification_setting_list,
-        #     name='notification_setting_list',
-        # ),
-        # path(
-        #     'user/user-setting/<uuid:pk>/',
-        #     views.notification_setting,
-        #     name='notification_setting',
-        # ),
+        path(
+            'user/user-setting/',
+            views.notification_setting_list,
+            name='notification_setting_list',
+        ),
+        path(
+            'user/user-setting/<uuid:pk>/',
+            views.notification_setting,
+            name='notification_setting',
+        ),
         path(
             'notification/ignore/',
             views.ignore_object_notification_list,
@@ -51,4 +51,9 @@ def get_api_urls(api_views=None):
             views.organization_notification_setting,
             name='organization_notification_setting',
         ),
+        path(
+            'user/<uuid:user_id>/preference/',
+            views.notification_preference,
+            name='notification_preference',
+        ),
     ]
diff --git a/openwisp_notifications/api/views.py b/openwisp_notifications/api/views.py
index 0fe787d6..3cf6a48a 100644
--- a/openwisp_notifications/api/views.py
+++ b/openwisp_notifications/api/views.py
@@ -215,8 +215,29 @@ def post(self, request, user_id, organization_id):
             for notification_setting in notification_settings:
                 serializer.update(notification_setting, serializer.validated_data)
             return Response(status=status.HTTP_200_OK)
-        else:
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+
+class NotificationPreferenceView(GenericAPIView):
+    permission_classes = [IsAuthenticated, IsAuthenticatedToUpdateNotificationSetting]
+    serializer_class = NotificationSettingUpdateSerializer
+
+    def post(self, request, user_id):
+        serializer = self.get_serializer(data=request.data)
+        if serializer.is_valid():
+            email = serializer.validated_data.get('email')
+            web = serializer.validated_data.get('web')
+            (
+                notification_settings,
+                created,
+            ) = NotificationSetting.objects.update_or_create(
+                user_id=user_id,
+                organization=None,
+                type=None,
+                defaults={'email': email, 'web': web},
+            )
+            return Response(status=status.HTTP_200_OK)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
 
 notifications_list = NotificationListView.as_view()
@@ -228,3 +249,4 @@ def post(self, request, user_id, organization_id):
 organization_notification_setting = OrganizationNotificationSettingView.as_view()
 ignore_object_notification_list = IgnoreObjectNotificationListView.as_view()
 ignore_object_notification = IgnoreObjectNotificationView.as_view()
+notification_preference = NotificationPreferenceView.as_view()
diff --git a/openwisp_notifications/base/models.py b/openwisp_notifications/base/models.py
index f4e2fd55..59402a13 100644
--- a/openwisp_notifications/base/models.py
+++ b/openwisp_notifications/base/models.py
@@ -252,6 +252,8 @@ class AbstractNotificationSetting(UUIDModel):
     organization = models.ForeignKey(
         get_model_name('openwisp_users', 'Organization'),
         on_delete=models.CASCADE,
+        null=True,
+        blank=True,
     )
     web = models.BooleanField(
         _('web notifications'), null=True, blank=True, help_text=_(_RECEIVE_HELP)
diff --git a/openwisp_notifications/handlers.py b/openwisp_notifications/handlers.py
index 67da6898..b8e9bbe7 100644
--- a/openwisp_notifications/handlers.py
+++ b/openwisp_notifications/handlers.py
@@ -170,6 +170,17 @@ def send_email_notification(sender, instance, created, **kwargs):
         return
     # Get email preference of user for this type of notification.
     target_org = getattr(getattr(instance, 'target', None), 'organization_id', None)
+
+    # Check for global notification setting
+    try:
+        notification_setting = instance.recipient.notificationsetting_set.get(
+            organization=None, type=None
+        )
+        if not notification_setting.email_notification:
+            return
+    except NotificationSetting.DoesNotExist:
+        pass
+
     if instance.type and target_org:
         try:
             notification_setting = instance.recipient.notificationsetting_set.get(
diff --git a/openwisp_notifications/migrations/0008_alter_notificationsetting_organization.py b/openwisp_notifications/migrations/0008_alter_notificationsetting_organization.py
new file mode 100644
index 00000000..67f59942
--- /dev/null
+++ b/openwisp_notifications/migrations/0008_alter_notificationsetting_organization.py
@@ -0,0 +1,25 @@
+# Generated by Django 4.2.11 on 2024-06-18 13:05
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("openwisp_users", "0020_populate_password_updated_field"),
+        ("openwisp_notifications", "0007_notificationsetting_deleted"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="notificationsetting",
+            name="organization",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="openwisp_users.organization",
+            ),
+        ),
+    ]
diff --git a/openwisp_notifications/tests/test_api.py b/openwisp_notifications/tests/test_api.py
index ce85c8e8..f5c0d72d 100644
--- a/openwisp_notifications/tests/test_api.py
+++ b/openwisp_notifications/tests/test_api.py
@@ -701,7 +701,49 @@ def test_organization_notification_setting_update(self):
 
         with self.subTest('Test for non-admin user'):
             self.client.force_login(tester)
-            url = self._get_path('organization_notification_setting', self.admin.pk, org.pk)
+            url = self._get_path(
+                'organization_notification_setting',
+                self.admin.pk,
+                org.pk,
+            )
+            response = self.client.post(url, data={'web': True, 'email': True})
+            self.assertEqual(response.status_code, 403)
+
+    def test_notification_preference_update(self):
+        tester = self._create_user()
+
+        with self.subTest('Test for current user'):
+            url = self._get_path(
+                'notification_preference',
+                self.admin.pk,
+            )
+            response = self.client.post(url, data={'web': True, 'email': True})
+            self.assertEqual(response.status_code, 200)
+            notification_setting = NotificationSetting.objects.get(
+                user=self.admin, organization_id=None, type=None
+            )
+            self.assertTrue(notification_setting.web, True)
+            self.assertTrue(notification_setting.email, True)
+
+        with self.subTest('Test for admin user'):
+            url = self._get_path(
+                'notification_preference',
+                tester.pk,
+            )
+            response = self.client.post(url, data={'web': True, 'email': True})
+            self.assertEqual(response.status_code, 200)
+            notification_setting = NotificationSetting.objects.get(
+                user=tester, organization_id=None, type=None
+            )
+            self.assertTrue(notification_setting.web, True)
+            self.assertTrue(notification_setting.email, True)
+
+        with self.subTest('Test for non-admin user'):
+            self.client.force_login(tester)
+            url = self._get_path(
+                'notification_preference',
+                self.admin.pk,
+            )
             response = self.client.post(url, data={'web': True, 'email': True})
             self.assertEqual(response.status_code, 403)
 
diff --git a/openwisp_notifications/tests/test_notifications.py b/openwisp_notifications/tests/test_notifications.py
index 555eb060..8f157b7c 100644
--- a/openwisp_notifications/tests/test_notifications.py
+++ b/openwisp_notifications/tests/test_notifications.py
@@ -779,6 +779,28 @@ def test_notification_type_web_notification_setting_true(self):
             self._create_notification()
             self.assertEqual(notification_queryset.count(), 0)
 
+    @mock_notification_types
+    def test_global_email_notification_setting(self):
+        with self.subTest('Test email global preference is "False"'):
+            NotificationSetting.objects.update_or_create(
+                user=self.admin,
+                organization=None,
+                type=None,
+                defaults={'email': False, 'web': False},
+            )
+            self._create_notification()
+            self.assertEqual(len(mail.outbox), 0)
+
+        with self.subTest('Test email global preference is "True"'):
+            NotificationSetting.objects.update_or_create(
+                user=self.admin,
+                organization=None,
+                type=None,
+                defaults={'email': True, 'web': True},
+            )
+            self._create_notification()
+            self.assertEqual(len(mail.outbox), 1)
+
     @mock_notification_types
     def test_notification_type_web_notification_setting_false(self):
         target_obj = self._get_org_user()
diff --git a/tests/openwisp2/sample_notifications/migrations/0003_alter_notificationsetting_organization.py b/tests/openwisp2/sample_notifications/migrations/0003_alter_notificationsetting_organization.py
new file mode 100644
index 00000000..0ca0ff27
--- /dev/null
+++ b/tests/openwisp2/sample_notifications/migrations/0003_alter_notificationsetting_organization.py
@@ -0,0 +1,25 @@
+# Generated by Django 4.2.11 on 2024-06-20 13:02
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("openwisp_users", "0020_populate_password_updated_field"),
+        ("sample_notifications", "0002_testapp"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="notificationsetting",
+            name="organization",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="openwisp_users.organization",
+            ),
+        ),
+    ]

From 215118b4594cdebf3b7d0a4bb34188031436a73f Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Thu, 25 Jul 2024 10:45:32 +0530
Subject: [PATCH 07/74] [chore] Global Notification Preference changes

---
 openwisp_notifications/api/filters.py         |  5 +++
 openwisp_notifications/api/views.py           |  3 ++
 openwisp_notifications/handlers.py            | 10 ------
 openwisp_notifications/tasks.py               | 13 ++++++-
 openwisp_notifications/tests/test_api.py      | 24 +++++++++----
 .../tests/test_notifications.py               | 34 ++++---------------
 6 files changed, 43 insertions(+), 46 deletions(-)

diff --git a/openwisp_notifications/api/filters.py b/openwisp_notifications/api/filters.py
index b67a5604..0f785fde 100644
--- a/openwisp_notifications/api/filters.py
+++ b/openwisp_notifications/api/filters.py
@@ -8,3 +8,8 @@ class NotificationSettingFilter(OrganizationMembershipFilter):
     class Meta(OrganizationMembershipFilter.Meta):
         model = NotificationSetting
         fields = OrganizationMembershipFilter.Meta.fields + ['type']
+
+    @property
+    def qs(self):
+        parent_qs = super().qs
+        return parent_qs.exclude(organization__isnull=True, type__isnull=True)
diff --git a/openwisp_notifications/api/views.py b/openwisp_notifications/api/views.py
index 3cf6a48a..8578b45c 100644
--- a/openwisp_notifications/api/views.py
+++ b/openwisp_notifications/api/views.py
@@ -236,6 +236,9 @@ def post(self, request, user_id):
                 type=None,
                 defaults={'email': email, 'web': web},
             )
+            NotificationSetting.objects.filter(user_id=user_id).update(
+                email=email, web=web
+            )
             return Response(status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
diff --git a/openwisp_notifications/handlers.py b/openwisp_notifications/handlers.py
index b8e9bbe7..f247e67a 100644
--- a/openwisp_notifications/handlers.py
+++ b/openwisp_notifications/handlers.py
@@ -171,16 +171,6 @@ def send_email_notification(sender, instance, created, **kwargs):
     # Get email preference of user for this type of notification.
     target_org = getattr(getattr(instance, 'target', None), 'organization_id', None)
 
-    # Check for global notification setting
-    try:
-        notification_setting = instance.recipient.notificationsetting_set.get(
-            organization=None, type=None
-        )
-        if not notification_setting.email_notification:
-            return
-    except NotificationSetting.DoesNotExist:
-        pass
-
     if instance.type and target_org:
         try:
             notification_setting = instance.recipient.notificationsetting_set.get(
diff --git a/openwisp_notifications/tasks.py b/openwisp_notifications/tasks.py
index f1f6cdc4..e57fced6 100644
--- a/openwisp_notifications/tasks.py
+++ b/openwisp_notifications/tasks.py
@@ -82,10 +82,21 @@ def delete_old_notifications(days):
 # Following tasks updates notification settings in database.
 # 'ns' is short for notification_setting
 def create_notification_settings(user, organizations, notification_types):
+    global_setting, _ = NotificationSetting.objects.get_or_create(
+        user=user, organization=None, type=None, defaults={'email': True, 'web': True}
+    )
+
     for type in notification_types:
         for org in organizations:
             NotificationSetting.objects.update_or_create(
-                defaults={'deleted': False}, user=user, type=type, organization=org
+                defaults={
+                    'deleted': False,
+                    'email': global_setting.email,
+                    'web': global_setting.web,
+                },
+                user=user,
+                type=type,
+                organization=org,
             )
 
 
diff --git a/openwisp_notifications/tests/test_api.py b/openwisp_notifications/tests/test_api.py
index f5c0d72d..1fa30dc3 100644
--- a/openwisp_notifications/tests/test_api.py
+++ b/openwisp_notifications/tests/test_api.py
@@ -260,7 +260,9 @@ def test_bearer_authentication(self, mocked_test):
         notify.send(sender=self.admin, type='default', target=self._get_org_user())
         n = Notification.objects.first()
         notification_setting = NotificationSetting.objects.first()
-        notification_setting_count = NotificationSetting.objects.count()
+        notification_setting_count = NotificationSetting.objects.exclude(
+            organization__isnull=True
+        ).count()
         token = self._obtain_auth_token(username='admin', password='tester')
 
         with self.subTest('Test listing all notifications'):
@@ -499,7 +501,9 @@ def test_obsolete_notifications_busy_worker(self, mocked_task):
 
     def test_notification_setting_list_api(self):
         self._create_org_user(is_admin=True)
-        number_of_settings = NotificationSetting.objects.filter(user=self.admin).count()
+        number_of_settings = NotificationSetting.objects.filter(
+            user=self.admin, organization__isnull=False
+        ).count()
         url = self._get_path('notification_setting_list')
 
         with self.subTest('Test notification setting list view'):
@@ -551,15 +555,17 @@ def test_notification_setting_list_api(self):
             self.assertEqual(response.status_code, 200)
             notification_setting = response.data['results'][0]
             self.assertIn('id', notification_setting)
-            self.assertIsNone(notification_setting['web'])
-            self.assertIsNone(notification_setting['email'])
+            self.assertTrue(notification_setting['web'])
+            self.assertTrue(notification_setting['email'])
             self.assertIn('organization', notification_setting)
 
     def test_list_notification_setting_filtering(self):
         url = self._get_path('notification_setting_list')
 
         with self.subTest('Test listing notification setting without filters'):
-            count = NotificationSetting.objects.count()
+            count = NotificationSetting.objects.exclude(
+                organization__isnull=True
+            ).count()
             response = self.client.get(url)
             self.assertEqual(response.status_code, 200)
             self.assertEqual(len(response.data['results']), count)
@@ -593,7 +599,9 @@ def test_list_notification_setting_filtering(self):
             self.assertEqual(ns['type'], 'default')
 
     def test_retreive_notification_setting_api(self):
-        notification_setting = NotificationSetting.objects.first()
+        notification_setting = NotificationSetting.objects.exclude(
+            organization__isnull=True
+        ).first()
 
         with self.subTest('Test for non-existing notification setting'):
             url = self._get_path('notification_setting', uuid.uuid4())
@@ -614,7 +622,9 @@ def test_retreive_notification_setting_api(self):
             self.assertEqual(data['email'], notification_setting.email)
 
     def test_update_notification_setting_api(self):
-        notification_setting = NotificationSetting.objects.first()
+        notification_setting = NotificationSetting.objects.exclude(
+            organization__isnull=True
+        ).first()
         update_data = {'web': False}
 
         with self.subTest('Test for non-existing notification setting'):
diff --git a/openwisp_notifications/tests/test_notifications.py b/openwisp_notifications/tests/test_notifications.py
index 8f157b7c..cbc22454 100644
--- a/openwisp_notifications/tests/test_notifications.py
+++ b/openwisp_notifications/tests/test_notifications.py
@@ -132,7 +132,7 @@ def test_superuser_notifications_disabled(self):
             organization_id=target_obj.organization.pk,
             type='default',
         )
-        self.assertEqual(notification_preference.email, None)
+        self.assertTrue(notification_preference.email)
         notification_preference.web = False
         notification_preference.save()
         notification_preference.refresh_from_db()
@@ -743,7 +743,7 @@ def test_notification_type_email_notification_setting_false(self):
 
         with self.subTest('Test user email preference not defined'):
             self._create_notification()
-            self.assertEqual(len(mail.outbox), 0)
+            self.assertEqual(len(mail.outbox), 1)
 
         with self.subTest('Test user email preference is "True"'):
             NotificationSetting.objects.filter(
@@ -751,7 +751,7 @@ def test_notification_type_email_notification_setting_false(self):
                 type='test_type',
             ).update(email=True)
             self._create_notification()
-            self.assertEqual(len(mail.outbox), 1)
+            self.assertEqual(len(mail.outbox), 2)
 
     @mock_notification_types
     def test_notification_type_web_notification_setting_true(self):
@@ -779,28 +779,6 @@ def test_notification_type_web_notification_setting_true(self):
             self._create_notification()
             self.assertEqual(notification_queryset.count(), 0)
 
-    @mock_notification_types
-    def test_global_email_notification_setting(self):
-        with self.subTest('Test email global preference is "False"'):
-            NotificationSetting.objects.update_or_create(
-                user=self.admin,
-                organization=None,
-                type=None,
-                defaults={'email': False, 'web': False},
-            )
-            self._create_notification()
-            self.assertEqual(len(mail.outbox), 0)
-
-        with self.subTest('Test email global preference is "True"'):
-            NotificationSetting.objects.update_or_create(
-                user=self.admin,
-                organization=None,
-                type=None,
-                defaults={'email': True, 'web': True},
-            )
-            self._create_notification()
-            self.assertEqual(len(mail.outbox), 1)
-
     @mock_notification_types
     def test_notification_type_web_notification_setting_false(self):
         target_obj = self._get_org_user()
@@ -819,7 +797,7 @@ def test_notification_type_web_notification_setting_false(self):
 
         with self.subTest('Test user web preference not defined'):
             self._create_notification()
-            self.assertEqual(notification_queryset.count(), 0)
+            self.assertEqual(notification_queryset.count(), 1)
 
         with self.subTest('Test user email preference is "True"'):
             notification_setting = NotificationSetting.objects.get(
@@ -828,14 +806,14 @@ def test_notification_type_web_notification_setting_false(self):
             notification_setting.email = True
             notification_setting.save()
             notification_setting.refresh_from_db()
-            self.assertFalse(notification_setting.email)
+            self.assertTrue(notification_setting.email)
 
         with self.subTest('Test user web preference is "True"'):
             NotificationSetting.objects.filter(
                 user=self.admin, type='test_type'
             ).update(web=True)
             self._create_notification()
-            self.assertEqual(notification_queryset.count(), 1)
+            self.assertEqual(notification_queryset.count(), 2)
 
     @mock_notification_types
     def test_notification_type_email_web_notification_defaults(self):

From 90221ca47140264c325d16990976731ade0844cd Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Thu, 1 Aug 2024 19:20:39 +0530
Subject: [PATCH 08/74] [feat] Notification Settings Page

---
 openwisp_notifications/api/urls.py            |  20 ++-
 openwisp_notifications/api/views.py           |   9 ++
 openwisp_notifications/base/views.py          |  10 ++
 .../openwisp-notifications/css/settings.css   |  62 ++++++++
 .../openwisp-notifications/js/settings.js     | 149 ++++++++++++++++++
 .../openwisp_notifications/settings.html      |  41 +++++
 openwisp_notifications/tests/test_api.py      | 116 +++++++++++++-
 openwisp_notifications/urls.py                |   7 +-
 8 files changed, 407 insertions(+), 7 deletions(-)
 create mode 100644 openwisp_notifications/base/views.py
 create mode 100644 openwisp_notifications/static/openwisp-notifications/css/settings.css
 create mode 100644 openwisp_notifications/static/openwisp-notifications/js/settings.js
 create mode 100644 openwisp_notifications/templates/openwisp_notifications/settings.html

diff --git a/openwisp_notifications/api/urls.py b/openwisp_notifications/api/urls.py
index 18bcc2eb..482c8001 100644
--- a/openwisp_notifications/api/urls.py
+++ b/openwisp_notifications/api/urls.py
@@ -25,16 +25,15 @@ def get_api_urls(api_views=None):
             views.notification_read_redirect,
             name='notification_read_redirect',
         ),
-        # WIP
         path(
-            'user/user-setting/',
+            'user/<uuid:user_id>/user-setting/',
             views.notification_setting_list,
-            name='notification_setting_list',
+            name='user_notification_setting_list',
         ),
         path(
-            'user/user-setting/<uuid:pk>/',
+            'user/<uuid:user_id>/user-setting/<uuid:pk>/',
             views.notification_setting,
-            name='notification_setting',
+            name='user_notification_setting',
         ),
         path(
             'notification/ignore/',
@@ -56,4 +55,15 @@ def get_api_urls(api_views=None):
             views.notification_preference,
             name='notification_preference',
         ),
+        # DEPRECATED
+        path(
+            'user/user-setting/',
+            views.notification_setting_list,
+            name='notification_setting_list',
+        ),
+        path(
+            'user/user-setting/<uuid:pk>/',
+            views.notification_setting,
+            name='notification_setting',
+        ),
     ]
diff --git a/openwisp_notifications/api/views.py b/openwisp_notifications/api/views.py
index 8578b45c..2f218b14 100644
--- a/openwisp_notifications/api/views.py
+++ b/openwisp_notifications/api/views.py
@@ -1,4 +1,5 @@
 from django.contrib.contenttypes.models import ContentType
+from django.core.exceptions import PermissionDenied
 from django.http import Http404, HttpResponseRedirect
 from django.urls import reverse
 from django_filters.rest_framework import DjangoFilterBackend
@@ -123,6 +124,14 @@ class BaseNotificationSettingView(GenericAPIView):
     def get_queryset(self):
         if getattr(self, 'swagger_fake_view', False):
             return NotificationSetting.objects.none()  # pragma: no cover
+
+        user_id = self.kwargs.get('user_id')
+
+        if user_id:
+            if not (self.request.user.id == user_id or self.request.user.is_staff):
+                raise PermissionDenied()
+            return NotificationSetting.objects.filter(user_id=user_id)
+
         return NotificationSetting.objects.filter(user=self.request.user)
 
 
diff --git a/openwisp_notifications/base/views.py b/openwisp_notifications/base/views.py
new file mode 100644
index 00000000..6a188e10
--- /dev/null
+++ b/openwisp_notifications/base/views.py
@@ -0,0 +1,10 @@
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.views.generic import TemplateView
+
+
+class NotificationSettingPage(LoginRequiredMixin, TemplateView):
+    template_name = 'openwisp_notifications/settings.html'
+    login_url = '/admin/login/'
+
+
+notifiation_setting_page = NotificationSettingPage.as_view()
diff --git a/openwisp_notifications/static/openwisp-notifications/css/settings.css b/openwisp_notifications/static/openwisp-notifications/css/settings.css
new file mode 100644
index 00000000..90933110
--- /dev/null
+++ b/openwisp_notifications/static/openwisp-notifications/css/settings.css
@@ -0,0 +1,62 @@
+.container {
+  max-width: 1200px;
+  margin: 0 auto;
+  padding: 20px;
+}
+h2 {
+  margin-bottom: 10px;
+}
+.global-settings {
+  margin-bottom: 20px;
+}
+.org-panel {
+  background-color: #fff;
+  border: 1px solid #ddd;
+}
+.org-header {
+  background-color: #e0e0e0;
+  padding: 10px;
+  font-weight: bold;
+  display: flex;
+  justify-content: space-between;
+  cursor: pointer;
+}
+.org-content {
+  padding: 10px;
+  display: none;
+}
+.org-content.active {
+  display: block;
+}
+table {
+  width: 100%;
+  border-collapse: separate;
+  border-spacing: 0;
+}
+th,
+td {
+  padding: 8px;
+  text-align: left;
+  border-bottom: 1px solid #ddd;
+}
+th {
+  background-color: #f2f2f2;
+}
+th:not(:last-child),
+td:not(:last-child) {
+  border-right: 1px solid #ddd;
+}
+th:not(:first-child),
+td:not(:first-child) {
+  text-align: center;
+}
+.checkbox {
+  width: 15px;
+  height: 15px;
+  text-align: center;
+}
+.no-settings {
+  padding: 10px;
+  text-align: center;
+  color: #666;
+}
diff --git a/openwisp_notifications/static/openwisp-notifications/js/settings.js b/openwisp_notifications/static/openwisp-notifications/js/settings.js
new file mode 100644
index 00000000..7ee24481
--- /dev/null
+++ b/openwisp_notifications/static/openwisp-notifications/js/settings.js
@@ -0,0 +1,149 @@
+'use strict';
+
+(function ($) {
+    $(document).ready(function () {
+        fetchNotificationSettings();
+    });
+
+    function fetchNotificationSettings() {
+        $.ajax({
+            url: "/api/v1/notifications/user/user-setting",
+            method: "GET",
+            success: function (data) {
+                const groupedData = groupByOrganization(data.results);
+                renderNotificationSettings(groupedData);
+                initializeEventListeners();
+            },
+        });
+    }
+
+    function groupByOrganization(settings) {
+        const grouped = {};
+        settings.forEach((setting) => {
+            if (!grouped[setting.organization_name]) {
+                grouped[setting.organization_name] = [];
+            }
+            grouped[setting.organization_name].push(setting);
+        });
+        return grouped;
+    }
+
+    function renderNotificationSettings(data) {
+        const orgPanelsContainer = $("#org-panels");
+        orgPanelsContainer.empty(); // Clear existing content
+
+        Object.keys(data)
+            .sort()
+            .forEach((orgName) => {
+                const orgSettings = data[orgName].sort((a, b) =>
+                    a.type.localeCompare(b.type)
+                );
+                const orgPanel = $(`
+                    <div class="org-panel">
+                        <div class="org-header">
+                            <span>${orgName}</span><span class="toggle">▼</span>
+                        </div>
+                        <div class="org-content"></div>
+                    </div>
+                `);
+                const orgContent = orgPanel.find(".org-content");
+
+                if (orgSettings.length > 0) {
+                    const table = $(`
+                        <table>
+                            <tr>
+                                <th>Settings</th>
+                                <th>
+                                    <input type="checkbox" class="checkbox main-checkbox" data-column="email" /> Email
+                                </th>
+                                <th>
+                                    <input type="checkbox" class="checkbox main-checkbox" data-column="web" /> Web
+                                </th>
+                            </tr>
+                        </table>
+                    `);
+                    orgSettings.forEach((setting) => {
+                        const row = $(`
+                            <tr>
+                                <td>${setting.type}</td>
+                                <td><input type="checkbox" class="checkbox email-checkbox" ${setting.email ? "checked" : ""} /></td>
+                                <td><input type="checkbox" class="checkbox web-checkbox" ${setting.web ? "checked" : ""} /></td>
+                            </tr>
+                        `);
+                        table.append(row);
+                    });
+                    orgContent.append(table);
+                    updateMainCheckboxes(table);
+                } else {
+                    orgContent.append(`<div class="no-settings">No settings available for this organization</div>`);
+                }
+
+                orgPanelsContainer.append(orgPanel);
+            });
+    }
+
+    function updateMainCheckboxes(table) {
+        const emailCheckboxes = table.find('.email-checkbox');
+        const webCheckboxes = table.find('.web-checkbox');
+        const emailMainCheckbox = table.find('.main-checkbox[data-column="email"]');
+        const webMainCheckbox = table.find('.main-checkbox[data-column="web"]');
+
+        emailMainCheckbox.prop('checked', emailCheckboxes.length === emailCheckboxes.filter(':checked').length);
+        webMainCheckbox.prop('checked', webCheckboxes.length === webCheckboxes.filter(':checked').length);
+    }
+
+    function initializeEventListeners() {
+        $(document).on('click', '.org-header', function () {
+            const toggle = $(this).find(".toggle");
+            toggle.text(toggle.text() === "▼" ? "▲" : "▼");
+            $(this).next(".org-content").toggleClass("active");
+        });
+
+        $(document).on('change', '.main-checkbox', function () {
+            const column = $(this).data("column");
+            $(this).closest("table").find(`.${column}-checkbox`).prop("checked", $(this).prop("checked"));
+            showToast('success', 'Settings updated successfully.');
+        });
+
+        $(document).on('change', '.email-checkbox, .web-checkbox', function () {
+            const column = $(this).hasClass("email-checkbox") ? "email" : "web";
+            const mainCheckbox = $(this).closest("table").find(`.main-checkbox[data-column="${column}"]`);
+            const checkboxes = $(this).closest("table").find(`.${column}-checkbox`);
+            mainCheckbox.prop("checked", checkboxes.length === checkboxes.filter(":checked").length);
+            showToast('success', 'Settings updated successfully.');
+        });
+
+        $("#global-email, #global-web").change(function () {
+            const isEmail = $(this).attr("id") === "global-email";
+            const columnClass = isEmail ? "email-checkbox" : "web-checkbox";
+            $(`.${columnClass}`).prop("checked", $(this).prop("checked"));
+            $(`.main-checkbox[data-column="${isEmail ? "email" : "web"}"]`).prop("checked", $(this).prop("checked"));
+            showToast('success', 'Global settings updated successfully.');
+        });
+    }
+
+    function showToast(level, message) {
+        const toast = $(`
+            <div class="ow-notification-toast ${level}">
+                <div class="icon ow-notify-close btn" role="button" tabindex="1"></div>
+                <div style="display:flex">
+                    <div class="icon ow-notify-${level}"></div>
+                    ${message}
+                </div>
+            </div>
+        `);
+        $('.ow-notification-toast-wrapper').prepend(toast);
+        // toast.slideDown('slow', function () {
+        //     setTimeout(function () {
+        //         toast.slideUp('slow', function () {
+        //             toast.remove();
+        //         });
+        //     }, 3000);
+        // });
+
+        $(document).on('click', '.ow-notification-toast .ow-notify-close.btn', function () {
+            toast.remove();
+        });
+    }
+
+})(django.jQuery);
diff --git a/openwisp_notifications/templates/openwisp_notifications/settings.html b/openwisp_notifications/templates/openwisp_notifications/settings.html
new file mode 100644
index 00000000..42280ca5
--- /dev/null
+++ b/openwisp_notifications/templates/openwisp_notifications/settings.html
@@ -0,0 +1,41 @@
+{% extends "admin/base_site.html" %}
+
+{% load i18n %}
+{% load static %}
+
+{% block title %}{% trans "Notification Settings" %}{% endblock %}
+
+{% block extrastyle %}
+{{ block.super }}
+<link rel="stylesheet" type="text/css" href="{% static 'openwisp-notifications/css/settings.css' %}" />
+{% endblock extrastyle %}
+
+{% block breadcrumbs %}
+<div class='breadcrumbs'>
+<a href='{% url 'admin:index' %}'>{% trans 'Home' %}</a>
+&rsaquo; {% trans 'Notification Preferences' %}
+</div>
+{% endblock %}
+
+{% block content %}
+<div class="container">
+  <h2>Notification Preferences</h2>
+
+  <div class="global-settings">
+    <strong>Global Settings:</strong>
+    <label><input type="checkbox" id="global-email" checked /> Email</label>
+    <label><input type="checkbox" id="global-web" checked /> Web</label>
+  </div>
+
+  <div id="org-panels">
+    <!-- Organization panels will be dynamically inserted here -->
+  </div>
+</div>
+{% endblock content %}
+
+{% block footer %}
+  {{ block.super }}
+  {% if request.user.is_authenticated %}
+    <script type="text/javascript" src="{% static 'openwisp-notifications/js/settings.js' %}"></script>
+  {% endif %}
+{% endblock footer %}
diff --git a/openwisp_notifications/tests/test_api.py b/openwisp_notifications/tests/test_api.py
index 1fa30dc3..83cdd941 100644
--- a/openwisp_notifications/tests/test_api.py
+++ b/openwisp_notifications/tests/test_api.py
@@ -561,6 +561,7 @@ def test_notification_setting_list_api(self):
 
     def test_list_notification_setting_filtering(self):
         url = self._get_path('notification_setting_list')
+        tester = self._create_user()
 
         with self.subTest('Test listing notification setting without filters'):
             count = NotificationSetting.objects.exclude(
@@ -598,10 +599,33 @@ def test_list_notification_setting_filtering(self):
             ns = response.data['results'].pop()
             self.assertEqual(ns['type'], 'default')
 
+        with self.subTest('Test filtering by user_id as admin'):
+            user_url = self._get_path('user_notification_setting_list', tester.pk)
+            response = self.client.get(user_url)
+            self.assertEqual(response.status_code, 200)
+
+        with self.subTest('Test with user_id by user_id as the same user'):
+            self.client.force_login(tester)
+            user_url = self._get_path('user_notification_setting_list', tester.pk)
+            response = self.client.get(user_url)
+            self.assertEqual(response.status_code, 200)
+
+        with self.subTest('Test with user_id as a different non-admin user'):
+            self.client.force_login(tester)
+            user_url = self._get_path('user_notification_setting_list', self.admin.pk)
+            response = self.client.get(user_url)
+            self.assertEqual(response.status_code, 403)
+
     def test_retreive_notification_setting_api(self):
         notification_setting = NotificationSetting.objects.exclude(
             organization__isnull=True
         ).first()
+        tester = self._create_user()
+        tester_notification_setting = NotificationSetting.objects.create(
+            user=tester,
+            type='default',
+            organization=Organization.objects.first(),
+        )
 
         with self.subTest('Test for non-existing notification setting'):
             url = self._get_path('notification_setting', uuid.uuid4())
@@ -621,10 +645,49 @@ def test_retreive_notification_setting_api(self):
             self.assertEqual(data['web'], notification_setting.web)
             self.assertEqual(data['email'], notification_setting.email)
 
+        with self.subTest(
+            'Test retrieving details for existing notification setting as admin'
+        ):
+            url = self._get_path(
+                'user_notification_setting', tester.pk, tester_notification_setting.pk
+            )
+            response = self.client.get(url)
+            self.assertEqual(response.status_code, 200)
+            data = response.data
+            self.assertEqual(data['id'], str(tester_notification_setting.id))
+
+        with self.subTest(
+            'Test retrieving details for existing notification setting as the same user'
+        ):
+            self.client.force_login(tester)
+            url = self._get_path(
+                'user_notification_setting', tester.pk, tester_notification_setting.pk
+            )
+            response = self.client.get(url)
+            self.assertEqual(response.status_code, 200)
+            data = response.data
+            self.assertEqual(data['id'], str(tester_notification_setting.id))
+
+        with self.subTest(
+            'Test retrieving details for existing notification setting as different non-admin user'
+        ):
+            self.client.force_login(tester)
+            url = self._get_path(
+                'user_notification_setting', self.admin.pk, notification_setting.pk
+            )
+            response = self.client.get(url)
+            self.assertEqual(response.status_code, 403)
+
     def test_update_notification_setting_api(self):
         notification_setting = NotificationSetting.objects.exclude(
             organization__isnull=True
         ).first()
+        tester = self._create_user()
+        tester_notification_setting = NotificationSetting.objects.create(
+            user=tester,
+            type='default',
+            organization=Organization.objects.first(),
+        )
         update_data = {'web': False}
 
         with self.subTest('Test for non-existing notification setting'):
@@ -632,7 +695,7 @@ def test_update_notification_setting_api(self):
             response = self.client.put(url, data=update_data)
             self.assertEqual(response.status_code, 404)
 
-        with self.subTest('Test retrieving details for existing notification setting'):
+        with self.subTest('Test updating details for existing notification setting'):
             url = self._get_path(
                 'notification_setting',
                 notification_setting.pk,
@@ -648,6 +711,57 @@ def test_update_notification_setting_api(self):
             self.assertEqual(data['web'], notification_setting.web)
             self.assertEqual(data['email'], notification_setting.email)
 
+        with self.subTest(
+            'Test updating details for existing notification setting as admin'
+        ):
+            url = self._get_path(
+                'user_notification_setting', tester.pk, tester_notification_setting.pk
+            )
+            response = self.client.put(
+                url, update_data, content_type='application/json'
+            )
+            self.assertEqual(response.status_code, 200)
+            data = response.data
+            tester_notification_setting.refresh_from_db()
+            self.assertEqual(data['id'], str(tester_notification_setting.id))
+            self.assertEqual(
+                data['organization'], tester_notification_setting.organization.pk
+            )
+            self.assertEqual(data['web'], tester_notification_setting.web)
+            self.assertEqual(data['email'], tester_notification_setting.email)
+
+        with self.subTest(
+            'Test updating details for existing notification setting as the same user'
+        ):
+            self.client.force_login(tester)
+            url = self._get_path(
+                'user_notification_setting', tester.pk, tester_notification_setting.pk
+            )
+            response = self.client.put(
+                url, update_data, content_type='application/json'
+            )
+            self.assertEqual(response.status_code, 200)
+            data = response.data
+            tester_notification_setting.refresh_from_db()
+            self.assertEqual(data['id'], str(tester_notification_setting.id))
+            self.assertEqual(
+                data['organization'], tester_notification_setting.organization.pk
+            )
+            self.assertEqual(data['web'], tester_notification_setting.web)
+            self.assertEqual(data['email'], tester_notification_setting.email)
+
+        with self.subTest(
+            'Test updating details for existing notification setting as a different non-admin user'
+        ):
+            self.client.force_login(tester)
+            url = self._get_path(
+                'user_notification_setting', self.admin.pk, notification_setting.pk
+            )
+            response = self.client.put(
+                url, update_data, content_type='application/json'
+            )
+            self.assertEqual(response.status_code, 403)
+
     def test_notification_redirect_api(self):
         def _unread_notification(notification):
             notification.unread = True
diff --git a/openwisp_notifications/urls.py b/openwisp_notifications/urls.py
index 04a8f9d7..acc1043f 100644
--- a/openwisp_notifications/urls.py
+++ b/openwisp_notifications/urls.py
@@ -1,6 +1,7 @@
 from django.urls import include, path
 
 from .api.urls import get_api_urls
+from .base.views import notifiation_setting_page
 
 
 def get_urls(api_views=None, social_views=None):
@@ -9,7 +10,11 @@ def get_urls(api_views=None, social_views=None):
     Arguments:
         api_views(optional): views for Notifications API
     """
-    urls = [path('api/v1/notifications/', include(get_api_urls(api_views)))]
+    urls = [
+        path('api/v1/notifications/', include(get_api_urls(api_views))),
+        path('notifications/settings/', notifiation_setting_page),
+        path('notifications/user/<uuid:pk>/settings/', notifiation_setting_page),
+    ]
     return urls
 
 

From 64fe8732279ccd711eefae00a32f33da7c20ccca Mon Sep 17 00:00:00 2001
From: Gagan Deep <pandafy.dev@gmail.com>
Date: Tue, 9 Jul 2024 17:12:12 +0530
Subject: [PATCH 09/74] [ci] Run builds for gsoc24 branch

---
 .github/workflows/build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 07404263..d31d835e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,10 +5,12 @@ on:
     branches:
       - master
       - dev
+      - gsoc24
   pull_request:
     branches:
       - master
       - dev
+      - gsoc24
 
 jobs:
 

From fdb8fdfe51852eb7ef3749fb35d8404cc487d671 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Fri, 2 Aug 2024 20:06:55 +0530
Subject: [PATCH 10/74] [qa] Check fixes

---
 .../migrations/0008_alter_notificationsetting_organization.py   | 1 -
 openwisp_notifications/tests/test_notifications.py              | 2 +-
 .../migrations/0003_alter_notificationsetting_organization.py   | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/openwisp_notifications/migrations/0008_alter_notificationsetting_organization.py b/openwisp_notifications/migrations/0008_alter_notificationsetting_organization.py
index 67f59942..45930143 100644
--- a/openwisp_notifications/migrations/0008_alter_notificationsetting_organization.py
+++ b/openwisp_notifications/migrations/0008_alter_notificationsetting_organization.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("openwisp_users", "0020_populate_password_updated_field"),
         ("openwisp_notifications", "0007_notificationsetting_deleted"),
diff --git a/openwisp_notifications/tests/test_notifications.py b/openwisp_notifications/tests/test_notifications.py
index cbc22454..c0f102a4 100644
--- a/openwisp_notifications/tests/test_notifications.py
+++ b/openwisp_notifications/tests/test_notifications.py
@@ -751,7 +751,7 @@ def test_notification_type_email_notification_setting_false(self):
                 type='test_type',
             ).update(email=True)
             self._create_notification()
-            self.assertEqual(len(mail.outbox), 2)
+            self.assertEqual(len(mail.outbox), 1)
 
     @mock_notification_types
     def test_notification_type_web_notification_setting_true(self):
diff --git a/tests/openwisp2/sample_notifications/migrations/0003_alter_notificationsetting_organization.py b/tests/openwisp2/sample_notifications/migrations/0003_alter_notificationsetting_organization.py
index 0ca0ff27..7ab64f70 100644
--- a/tests/openwisp2/sample_notifications/migrations/0003_alter_notificationsetting_organization.py
+++ b/tests/openwisp2/sample_notifications/migrations/0003_alter_notificationsetting_organization.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("openwisp_users", "0020_populate_password_updated_field"),
         ("sample_notifications", "0002_testapp"),

From 7c5cbebe62bf944f5cca0274f12b91b40c52103c Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Sat, 3 Aug 2024 20:48:50 +0530
Subject: [PATCH 11/74] [chore] Notification settings page with breadcrumbs

---
 openwisp_notifications/base/views.py          | 34 ++++++++++++-
 .../openwisp-notifications/js/settings.js     | 29 +++++++----
 .../openwisp_notifications/settings.html      | 51 +++++++++++--------
 openwisp_notifications/urls.py                | 12 ++++-
 4 files changed, 91 insertions(+), 35 deletions(-)

diff --git a/openwisp_notifications/base/views.py b/openwisp_notifications/base/views.py
index 6a188e10..a7bf7ef8 100644
--- a/openwisp_notifications/base/views.py
+++ b/openwisp_notifications/base/views.py
@@ -1,10 +1,40 @@
-from django.contrib.auth.mixins import LoginRequiredMixin
+from django.contrib.auth import get_user_model
+from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
+from django.http import Http404
 from django.views.generic import TemplateView
 
+User = get_user_model()
 
-class NotificationSettingPage(LoginRequiredMixin, TemplateView):
+
+class NotificationSettingPage(LoginRequiredMixin, UserPassesTestMixin, TemplateView):
     template_name = 'openwisp_notifications/settings.html'
     login_url = '/admin/login/'
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        user_id = self.kwargs.get('pk')
+
+        if user_id:
+            try:
+                user = User.objects.get(pk=user_id)
+                # Only admin should access other users settings
+                if not self.request.user.is_staff:
+                    raise Http404("You do not have permission to access this page.")
+            except User.DoesNotExist:
+                raise Http404("User does not exist")
+        else:
+            user = self.request.user
+
+        context['user'] = user
+        return context
+
+    def test_func(self):
+        """
+        This method ensures that only admins can access the view when a custom user ID is provided.
+        """
+        if 'pk' in self.kwargs:
+            return self.request.user.is_staff
+        return True
+
 
 notifiation_setting_page = NotificationSettingPage.as_view()
diff --git a/openwisp_notifications/static/openwisp-notifications/js/settings.js b/openwisp_notifications/static/openwisp-notifications/js/settings.js
index 7ee24481..f41d6a3b 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/settings.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/settings.js
@@ -2,18 +2,25 @@
 
 (function ($) {
     $(document).ready(function () {
-        fetchNotificationSettings();
+        const userId = $('.container').data('user-id');
+        fetchNotificationSettings(userId);
     });
 
-    function fetchNotificationSettings() {
+    function fetchNotificationSettings(userId) {
+        console.log("Fetching notification settings...");
+        console.log(`/api/v1/notifications/user/${userId}/user-setting/`)
         $.ajax({
-            url: "/api/v1/notifications/user/user-setting",
+            url: `/api/v1/notifications/user/${userId}/user-setting/`,
             method: "GET",
             success: function (data) {
                 const groupedData = groupByOrganization(data.results);
                 renderNotificationSettings(groupedData);
                 initializeEventListeners();
             },
+            error: function (error) {
+                console.error("Error fetching notification settings:", error);
+                showToast('error', 'Error fetching notification settings. Please try again.');
+            }
         });
     }
 
@@ -109,7 +116,7 @@
             const column = $(this).hasClass("email-checkbox") ? "email" : "web";
             const mainCheckbox = $(this).closest("table").find(`.main-checkbox[data-column="${column}"]`);
             const checkboxes = $(this).closest("table").find(`.${column}-checkbox`);
-            mainCheckbox.prop("checked", checkboxes.length === checkboxes.filter(":checked").length);
+            mainCheckbox.prop("checked", checkboxes.length === checkboxes.filter(':checked').length);
             showToast('success', 'Settings updated successfully.');
         });
 
@@ -133,13 +140,13 @@
             </div>
         `);
         $('.ow-notification-toast-wrapper').prepend(toast);
-        // toast.slideDown('slow', function () {
-        //     setTimeout(function () {
-        //         toast.slideUp('slow', function () {
-        //             toast.remove();
-        //         });
-        //     }, 3000);
-        // });
+        toast.slideDown('slow', function () {
+            setTimeout(function () {
+                toast.slideUp('slow', function () {
+                    toast.remove();
+                });
+            }, 3000);
+        });
 
         $(document).on('click', '.ow-notification-toast .ow-notify-close.btn', function () {
             toast.remove();
diff --git a/openwisp_notifications/templates/openwisp_notifications/settings.html b/openwisp_notifications/templates/openwisp_notifications/settings.html
index 42280ca5..466201d8 100644
--- a/openwisp_notifications/templates/openwisp_notifications/settings.html
+++ b/openwisp_notifications/templates/openwisp_notifications/settings.html
@@ -3,34 +3,45 @@
 {% load i18n %}
 {% load static %}
 
-{% block title %}{% trans "Notification Settings" %}{% endblock %}
+{% block title %}
+  {% trans "Notification Settings" %}
+{% endblock %}
 
 {% block extrastyle %}
-{{ block.super }}
-<link rel="stylesheet" type="text/css" href="{% static 'openwisp-notifications/css/settings.css' %}" />
+  {{ block.super }}
+  <link rel="stylesheet" type="text/css" href="{% static 'openwisp-notifications/css/settings.css' %}" />
 {% endblock extrastyle %}
 
 {% block breadcrumbs %}
-<div class='breadcrumbs'>
-<a href='{% url 'admin:index' %}'>{% trans 'Home' %}</a>
-&rsaquo; {% trans 'Notification Preferences' %}
-</div>
-{% endblock %}
-
-{% block content %}
-<div class="container">
-  <h2>Notification Preferences</h2>
-
-  <div class="global-settings">
-    <strong>Global Settings:</strong>
-    <label><input type="checkbox" id="global-email" checked /> Email</label>
-    <label><input type="checkbox" id="global-web" checked /> Web</label>
+  <div class="breadcrumbs">
+    {% if request.user.id == user.id %}
+      <a href="{% url 'admin:index' %}">{% trans 'Home' %}</a> &rsaquo;
+    {% else %}
+      <a href="{% url 'admin:index' %}">{% trans 'Home' %}</a> &rsaquo;
+      <a href="{% url 'admin:app_list' app_label='openwisp_users' %}">{% trans 'Users and Organizations' %}</a> &rsaquo;
+      <a href="{% url 'admin:openwisp_users_user_changelist' %}">{% trans 'Users' %}</a> &rsaquo;
+      <a href="{% url 'admin:openwisp_users_user_change' user.id %}">{{ user.username }}</a> &rsaquo;
+    {% endif %}
+    {% trans 'Notification Preferences' %}
   </div>
+{% endblock breadcrumbs %}
 
-  <div id="org-panels">
-    <!-- Organization panels will be dynamically inserted here -->
+{% block content %}
+  <div class="container" data-user-id="{{ user.id }}">
+    <h2>Notification Preferences</h2>
+    <div class="global-settings">
+      <strong>Global Settings:</strong>
+      <label>
+        <input type="checkbox" id="global-email" checked />
+        Email
+      </label>
+      <label>
+        <input type="checkbox" id="global-web" checked />
+        Web
+      </label>
+    </div>
+    <div id="org-panels"></div>
   </div>
-</div>
 {% endblock content %}
 
 {% block footer %}
diff --git a/openwisp_notifications/urls.py b/openwisp_notifications/urls.py
index acc1043f..e5d2cfac 100644
--- a/openwisp_notifications/urls.py
+++ b/openwisp_notifications/urls.py
@@ -12,8 +12,16 @@ def get_urls(api_views=None, social_views=None):
     """
     urls = [
         path('api/v1/notifications/', include(get_api_urls(api_views))),
-        path('notifications/settings/', notifiation_setting_page),
-        path('notifications/user/<uuid:pk>/settings/', notifiation_setting_page),
+        path(
+            'notifications/settings/',
+            notifiation_setting_page,
+            name='notifications_settings',
+        ),
+        path(
+            'notifications/user/<uuid:pk>/settings/',
+            notifiation_setting_page,
+            name='user_notification_settings',
+        ),
     ]
     return urls
 

From dfca656046211070768b49478d5752b3e74256d5 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Sun, 4 Aug 2024 19:18:22 +0530
Subject: [PATCH 12/74] [chore] Notification settings update

---
 .../css/notifications.css                     |   2 +-
 .../openwisp-notifications/js/settings.js     | 263 +++++++++++-------
 2 files changed, 158 insertions(+), 107 deletions(-)

diff --git a/openwisp_notifications/static/openwisp-notifications/css/notifications.css b/openwisp_notifications/static/openwisp-notifications/css/notifications.css
index a8b27932..99d1c926 100644
--- a/openwisp_notifications/static/openwisp-notifications/css/notifications.css
+++ b/openwisp_notifications/static/openwisp-notifications/css/notifications.css
@@ -113,7 +113,7 @@
   float: right;
   position: relative;
   right: -2px;
-  bottom: -8px;
+  bottom: -3px;
   background-size: 9px;
 }
 .ow-notification-toast.info .icon {
diff --git a/openwisp_notifications/static/openwisp-notifications/js/settings.js b/openwisp_notifications/static/openwisp-notifications/js/settings.js
index f41d6a3b..d19af8b3 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/settings.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/settings.js
@@ -1,144 +1,196 @@
 'use strict';
 
 (function ($) {
+    let isGlobalChange = false;
+
     $(document).ready(function () {
         const userId = $('.container').data('user-id');
         fetchNotificationSettings(userId);
+        initializeGlobalSettingsEventListener(userId);
     });
 
     function fetchNotificationSettings(userId) {
-        console.log("Fetching notification settings...");
-        console.log(`/api/v1/notifications/user/${userId}/user-setting/`)
-        $.ajax({
-            url: `/api/v1/notifications/user/${userId}/user-setting/`,
-            method: "GET",
-            success: function (data) {
-                const groupedData = groupByOrganization(data.results);
-                renderNotificationSettings(groupedData);
-                initializeEventListeners();
-            },
-            error: function (error) {
-                console.error("Error fetching notification settings:", error);
-                showToast('error', 'Error fetching notification settings. Please try again.');
-            }
+        $.getJSON(`/api/v1/notifications/user/${userId}/user-setting/`, function (data) {
+            const groupedData = groupBy(data.results, 'organization_name');
+            renderNotificationSettings(groupedData);
+            initializeEventListeners(userId);
+        }).fail(function () {
+            showToast('error', 'Error fetching notification settings. Please try again.');
         });
     }
 
-    function groupByOrganization(settings) {
-        const grouped = {};
-        settings.forEach((setting) => {
-            if (!grouped[setting.organization_name]) {
-                grouped[setting.organization_name] = [];
-            }
-            grouped[setting.organization_name].push(setting);
-        });
-        return grouped;
+    function groupBy(array, key) {
+        return array.reduce((result, currentValue) => {
+            (result[currentValue[key]] = result[currentValue[key]] || []).push(currentValue);
+            return result;
+        }, {});
     }
 
     function renderNotificationSettings(data) {
-        const orgPanelsContainer = $("#org-panels");
-        orgPanelsContainer.empty(); // Clear existing content
-
-        Object.keys(data)
-            .sort()
-            .forEach((orgName) => {
-                const orgSettings = data[orgName].sort((a, b) =>
-                    a.type.localeCompare(b.type)
-                );
-                const orgPanel = $(`
-                    <div class="org-panel">
-                        <div class="org-header">
-                            <span>${orgName}</span><span class="toggle">▼</span>
-                        </div>
-                        <div class="org-content"></div>
-                    </div>
-                `);
-                const orgContent = orgPanel.find(".org-content");
-
-                if (orgSettings.length > 0) {
-                    const table = $(`
-                        <table>
-                            <tr>
-                                <th>Settings</th>
-                                <th>
-                                    <input type="checkbox" class="checkbox main-checkbox" data-column="email" /> Email
-                                </th>
-                                <th>
-                                    <input type="checkbox" class="checkbox main-checkbox" data-column="web" /> Web
-                                </th>
-                            </tr>
-                        </table>
-                    `);
-                    orgSettings.forEach((setting) => {
-                        const row = $(`
-                            <tr>
-                                <td>${setting.type}</td>
-                                <td><input type="checkbox" class="checkbox email-checkbox" ${setting.email ? "checked" : ""} /></td>
-                                <td><input type="checkbox" class="checkbox web-checkbox" ${setting.web ? "checked" : ""} /></td>
-                            </tr>
-                        `);
-                        table.append(row);
-                    });
-                    orgContent.append(table);
-                    updateMainCheckboxes(table);
-                } else {
-                    orgContent.append(`<div class="no-settings">No settings available for this organization</div>`);
-                }
-
-                orgPanelsContainer.append(orgPanel);
+        const orgPanelsContainer = $("#org-panels").empty();
+        Object.keys(data).sort().forEach(function(orgName) {
+            const orgSettings = data[orgName].sort(function(a, b) {
+                return a.type.localeCompare(b.type);
             });
+            const orgPanel = $(
+                '<div class="org-panel">' +
+                '<div class="org-header"><span>' + orgName + '</span><span class="toggle">▼</span></div>' +
+                '<div class="org-content"></div>' +
+                '</div>'
+            );
+            const orgContent = orgPanel.find(".org-content");
+            if (orgSettings.length > 0) {
+                const table = $(
+                    '<table>' +
+                    '<tr>' +
+                    '<th>Settings</th>' +
+                    '<th><input type="checkbox" class="checkbox main-checkbox" data-organization-id="' + orgSettings[0].organization + '" data-column="email" /> Email</th>' +
+                    '<th><input type="checkbox" class="checkbox main-checkbox" data-column="web" data-organization-id="' + orgSettings[0].organization + '" /> Web</th>' +
+                    '</tr>' +
+                    '</table>'
+                );
+                orgSettings.forEach(function(setting) {
+                    const row = $(
+                        '<tr>' +
+                        '<td>' + setting.type + '</td>' +
+                        '<td><input type="checkbox" class="checkbox email-checkbox" ' + (setting.email ? "checked" : "") + ' data-pk="' + setting.id + '" data-organization-id="' + setting.organization + '" data-type="email" /></td>' +
+                        '<td><input type="checkbox" class="checkbox web-checkbox" ' + (setting.web ? "checked" : "") + ' data-pk="' + setting.id + '" data-organization-id="' + setting.organization + '" data-type="web" /></td>' +
+                        '</tr>'
+                    );
+                    table.append(row);
+                });
+                orgContent.append(table);
+                updateMainCheckboxes(table);
+            } else {
+                orgContent.append('<div class="no-settings">No settings available for this organization</div>');
+            }
+            orgPanelsContainer.append(orgPanel);
+        });
     }
 
     function updateMainCheckboxes(table) {
-        const emailCheckboxes = table.find('.email-checkbox');
-        const webCheckboxes = table.find('.web-checkbox');
-        const emailMainCheckbox = table.find('.main-checkbox[data-column="email"]');
-        const webMainCheckbox = table.find('.main-checkbox[data-column="web"]');
-
-        emailMainCheckbox.prop('checked', emailCheckboxes.length === emailCheckboxes.filter(':checked').length);
-        webMainCheckbox.prop('checked', webCheckboxes.length === webCheckboxes.filter(':checked').length);
+        table.find('.main-checkbox').each(function () {
+            const column = $(this).data('column');
+            const allChecked = table.find('.' + column + '-checkbox').length === table.find('.' + column + '-checkbox:checked').length;
+            $(this).prop('checked', allChecked);
+        });
     }
 
-    function initializeEventListeners() {
+    function initializeEventListeners(userId) {
         $(document).on('click', '.org-header', function () {
             const toggle = $(this).find(".toggle");
             toggle.text(toggle.text() === "▼" ? "▲" : "▼");
             $(this).next(".org-content").toggleClass("active");
         });
 
+        $(document).on('change', '.email-checkbox, .web-checkbox', function () {
+            if (isGlobalChange) {
+                return;
+            }
+            updateIndividualSetting(userId, $(this));
+            updateOrgLevelCheckboxes($(this).data('organization-id'));
+        });
+
         $(document).on('change', '.main-checkbox', function () {
-            const column = $(this).data("column");
-            $(this).closest("table").find(`.${column}-checkbox`).prop("checked", $(this).prop("checked"));
-            showToast('success', 'Settings updated successfully.');
+            if (isGlobalChange) {
+                return;
+            }
+            updateOrganizationSetting(userId, $(this));
+            const table = $(this).closest('table');
+            table.find('.' + $(this).data('column') + '-checkbox').prop('checked', $(this).is(':checked'));
+            updateMainCheckboxes(table);
         });
+    }
 
-        $(document).on('change', '.email-checkbox, .web-checkbox', function () {
-            const column = $(this).hasClass("email-checkbox") ? "email" : "web";
-            const mainCheckbox = $(this).closest("table").find(`.main-checkbox[data-column="${column}"]`);
-            const checkboxes = $(this).closest("table").find(`.${column}-checkbox`);
-            mainCheckbox.prop("checked", checkboxes.length === checkboxes.filter(':checked').length);
-            showToast('success', 'Settings updated successfully.');
+    function updateIndividualSetting(userId, checkbox) {
+        const data = {};
+        data[checkbox.data('type')] = checkbox.is(':checked');
+        $.ajax({
+            type: 'PATCH',
+            url: '/api/v1/notifications/user/' + userId + '/user-setting/' + checkbox.data('pk') + '/',
+            headers: { 'X-CSRFToken': $('input[name="csrfmiddlewaretoken"]').val() },
+            contentType: "application/json",
+            data: JSON.stringify(data),
+            success: function () {
+                showToast('success', 'Settings updated successfully.');
+            },
+            error: function () {
+                showToast('error', 'Something went wrong. Please try again.');
+            }
+        });
+    }
+
+    function updateOrganizationSetting(userId, checkbox) {
+        const organizationId = checkbox.data('organization-id');
+        const data = {
+            email: checkbox.closest('tr').find('.main-checkbox[data-column="email"]').is(':checked'),
+            web: checkbox.closest('tr').find('.main-checkbox[data-column="web"]').is(':checked')
+        };
+        $.ajax({
+            type: 'POST',
+            url: '/api/v1/notifications/user/' + userId + '/organization/' + organizationId + '/setting/',
+            headers: { 'X-CSRFToken': $('input[name="csrfmiddlewaretoken"]').val() },
+            contentType: "application/json",
+            data: JSON.stringify(data),
+            success: function () {
+                showToast('success', 'Organization settings updated successfully.');
+            },
+            error: function () {
+                showToast('error', 'Something went wrong. Please try again.');
+            }
         });
+    }
+
+    function updateOrgLevelCheckboxes(organizationId) {
+        const emailCheckboxes = $('.email-checkbox[data-organization-id="' + organizationId + '"]');
+        const webCheckboxes = $('.web-checkbox[data-organization-id="' + organizationId + '"]');
+        const emailMainCheckbox = $('.main-checkbox[data-column="email"][data-organization-id="' + organizationId + '"]');
+        const webMainCheckbox = $('.main-checkbox[data-column="web"][data-organization-id="' + organizationId + '"]');
+        emailMainCheckbox.prop('checked', emailCheckboxes.length === emailCheckboxes.filter(':checked').length);
+        webMainCheckbox.prop('checked', webCheckboxes.length === webCheckboxes.filter(':checked').length);
+    }
 
-        $("#global-email, #global-web").change(function () {
-            const isEmail = $(this).attr("id") === "global-email";
-            const columnClass = isEmail ? "email-checkbox" : "web-checkbox";
-            $(`.${columnClass}`).prop("checked", $(this).prop("checked"));
-            $(`.main-checkbox[data-column="${isEmail ? "email" : "web"}"]`).prop("checked", $(this).prop("checked"));
-            showToast('success', 'Global settings updated successfully.');
+    function initializeGlobalSettingsEventListener(userId) {
+        $('#global-email, #global-web').change(function () {
+            const isGlobalEmailChecked = $('#global-email').is(':checked');
+            const isGlobalWebChecked = $('#global-web').is(':checked');
+            const data = { email: isGlobalEmailChecked, web: isGlobalWebChecked };
+
+            isGlobalChange = true;
+            $('.main-checkbox[data-column="email"]').prop('checked', isGlobalEmailChecked).change();
+            $('.main-checkbox[data-column="web"]').prop('checked', isGlobalWebChecked).change();
+            $('.email-checkbox').prop('checked', isGlobalEmailChecked);
+            $('.web-checkbox').prop('checked', isGlobalWebChecked);
+
+            $.ajax({
+                type: 'POST',
+                url: '/api/v1/notifications/user/' + userId + '/preference/',
+                headers: { 'X-CSRFToken': $('input[name="csrfmiddlewaretoken"]').val() },
+                contentType: "application/json",
+                data: JSON.stringify(data),
+                success: function () {
+                    showToast('success', 'Global settings updated successfully.');
+                },
+                error: function () {
+                    showToast('error', 'Something went wrong. Please try again.');
+                },
+                complete: function() {
+                    isGlobalChange = false;
+                }
+            });
         });
     }
 
     function showToast(level, message) {
-        const toast = $(`
-            <div class="ow-notification-toast ${level}">
-                <div class="icon ow-notify-close btn" role="button" tabindex="1"></div>
-                <div style="display:flex">
-                    <div class="icon ow-notify-${level}"></div>
-                    ${message}
-                </div>
-            </div>
-        `);
+        const toast = $(
+            '<div class="ow-notification-toast ' + level + '">' +
+            '<div class="icon ow-notify-close btn" role="button" tabindex="1"></div>' +
+            '<div style="display:flex">' +
+            '<div class="icon ow-notify-' + level + '"></div>' +
+            message +
+            '</div>' +
+            '</div>'
+        );
         $('.ow-notification-toast-wrapper').prepend(toast);
         toast.slideDown('slow', function () {
             setTimeout(function () {
@@ -152,5 +204,4 @@
             toast.remove();
         });
     }
-
 })(django.jQuery);

From 0e5ebd2c01f5b231a1f22675be71322711986c4a Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Mon, 5 Aug 2024 14:41:52 +0530
Subject: [PATCH 13/74] [chore] CSS updates

---
 .../openwisp-notifications/css/settings.css       | 15 ++++-----------
 .../static/openwisp-notifications/js/settings.js  |  2 +-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/openwisp_notifications/static/openwisp-notifications/css/settings.css b/openwisp_notifications/static/openwisp-notifications/css/settings.css
index 90933110..30f92207 100644
--- a/openwisp_notifications/static/openwisp-notifications/css/settings.css
+++ b/openwisp_notifications/static/openwisp-notifications/css/settings.css
@@ -1,17 +1,10 @@
-.container {
+.settings-container {
   max-width: 1200px;
   margin: 0 auto;
   padding: 20px;
 }
-h2 {
-  margin-bottom: 10px;
-}
 .global-settings {
-  margin-bottom: 20px;
-}
-.org-panel {
-  background-color: #fff;
-  border: 1px solid #ddd;
+  margin: 10px 0 20px;
 }
 .org-header {
   background-color: #e0e0e0;
@@ -51,8 +44,8 @@ td:not(:first-child) {
   text-align: center;
 }
 .checkbox {
-  width: 15px;
-  height: 15px;
+  width: 17px;
+  height: 17px;
   text-align: center;
 }
 .no-settings {
diff --git a/openwisp_notifications/static/openwisp-notifications/js/settings.js b/openwisp_notifications/static/openwisp-notifications/js/settings.js
index d19af8b3..6894d7ff 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/settings.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/settings.js
@@ -4,7 +4,7 @@
     let isGlobalChange = false;
 
     $(document).ready(function () {
-        const userId = $('.container').data('user-id');
+        const userId = $('.settings-container').data('user-id');
         fetchNotificationSettings(userId);
         initializeGlobalSettingsEventListener(userId);
     });

From 44ca0dc3f26c64b811b360577da88f3ca769a83d Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Tue, 6 Aug 2024 08:36:07 +0530
Subject: [PATCH 14/74] [chore] Bump changes

---
 openwisp_notifications/base/views.py          |  8 ++--
 .../openwisp-notifications/js/settings.js     | 46 ++++++++++---------
 .../openwisp_notifications/settings.html      |  2 +-
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/openwisp_notifications/base/views.py b/openwisp_notifications/base/views.py
index a7bf7ef8..cfaaa104 100644
--- a/openwisp_notifications/base/views.py
+++ b/openwisp_notifications/base/views.py
@@ -19,9 +19,9 @@ def get_context_data(self, **kwargs):
                 user = User.objects.get(pk=user_id)
                 # Only admin should access other users settings
                 if not self.request.user.is_staff:
-                    raise Http404("You do not have permission to access this page.")
+                    raise Http404('You do not have permission to access this page.')
             except User.DoesNotExist:
-                raise Http404("User does not exist")
+                raise Http404('User does not exist')
         else:
             user = self.request.user
 
@@ -29,9 +29,9 @@ def get_context_data(self, **kwargs):
         return context
 
     def test_func(self):
-        """
+        '''
         This method ensures that only admins can access the view when a custom user ID is provided.
-        """
+        '''
         if 'pk' in self.kwargs:
             return self.request.user.is_staff
         return True
diff --git a/openwisp_notifications/static/openwisp-notifications/js/settings.js b/openwisp_notifications/static/openwisp-notifications/js/settings.js
index 6894d7ff..4c2d0f74 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/settings.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/settings.js
@@ -1,5 +1,9 @@
 'use strict';
 
+if (typeof gettext === 'undefined') {
+    var gettext = function(word){ return word; };
+}
+
 (function ($) {
     let isGlobalChange = false;
 
@@ -15,7 +19,7 @@
             renderNotificationSettings(groupedData);
             initializeEventListeners(userId);
         }).fail(function () {
-            showToast('error', 'Error fetching notification settings. Please try again.');
+            showToast('error', gettext('Error fetching notification settings. Please try again.'));
         });
     }
 
@@ -27,7 +31,7 @@
     }
 
     function renderNotificationSettings(data) {
-        const orgPanelsContainer = $("#org-panels").empty();
+        const orgPanelsContainer = $('#org-panels').empty();
         Object.keys(data).sort().forEach(function(orgName) {
             const orgSettings = data[orgName].sort(function(a, b) {
                 return a.type.localeCompare(b.type);
@@ -38,14 +42,14 @@
                 '<div class="org-content"></div>' +
                 '</div>'
             );
-            const orgContent = orgPanel.find(".org-content");
+            const orgContent = orgPanel.find('.org-content');
             if (orgSettings.length > 0) {
                 const table = $(
                     '<table>' +
                     '<tr>' +
-                    '<th>Settings</th>' +
-                    '<th><input type="checkbox" class="checkbox main-checkbox" data-organization-id="' + orgSettings[0].organization + '" data-column="email" /> Email</th>' +
-                    '<th><input type="checkbox" class="checkbox main-checkbox" data-column="web" data-organization-id="' + orgSettings[0].organization + '" /> Web</th>' +
+                    '<th>' + gettext('Settings') + '</th>' +
+                    '<th><input type="checkbox" class="checkbox main-checkbox" data-organization-id="' + orgSettings[0].organization + '" data-column="email" /> ' + gettext('Email') + '</th>' +
+                    '<th><input type="checkbox" class="checkbox main-checkbox" data-column="web" data-organization-id="' + orgSettings[0].organization + '" /> ' + gettext('Web') + '</th>' +
                     '</tr>' +
                     '</table>'
                 );
@@ -53,8 +57,8 @@
                     const row = $(
                         '<tr>' +
                         '<td>' + setting.type + '</td>' +
-                        '<td><input type="checkbox" class="checkbox email-checkbox" ' + (setting.email ? "checked" : "") + ' data-pk="' + setting.id + '" data-organization-id="' + setting.organization + '" data-type="email" /></td>' +
-                        '<td><input type="checkbox" class="checkbox web-checkbox" ' + (setting.web ? "checked" : "") + ' data-pk="' + setting.id + '" data-organization-id="' + setting.organization + '" data-type="web" /></td>' +
+                        '<td><input type="checkbox" class="checkbox email-checkbox" ' + (setting.email ? 'checked' : '') + ' data-pk="' + setting.id + '" data-organization-id="' + setting.organization + '" data-type="email" /></td>' +
+                        '<td><input type="checkbox" class="checkbox web-checkbox" ' + (setting.web ? 'checked' : '') + ' data-pk="' + setting.id + '" data-organization-id="' + setting.organization + '" data-type="web" /></td>' +
                         '</tr>'
                     );
                     table.append(row);
@@ -62,7 +66,7 @@
                 orgContent.append(table);
                 updateMainCheckboxes(table);
             } else {
-                orgContent.append('<div class="no-settings">No settings available for this organization</div>');
+                orgContent.append('<div class="no-settings">' + gettext('No settings available for this organization') + '</div>');
             }
             orgPanelsContainer.append(orgPanel);
         });
@@ -78,9 +82,9 @@
 
     function initializeEventListeners(userId) {
         $(document).on('click', '.org-header', function () {
-            const toggle = $(this).find(".toggle");
-            toggle.text(toggle.text() === "▼" ? "▲" : "▼");
-            $(this).next(".org-content").toggleClass("active");
+            const toggle = $(this).find('.toggle');
+            toggle.text(toggle.text() === '▼' ? '▲' : '▼');
+            $(this).next('.org-content').toggleClass('active');
         });
 
         $(document).on('change', '.email-checkbox, .web-checkbox', function () {
@@ -109,13 +113,13 @@
             type: 'PATCH',
             url: '/api/v1/notifications/user/' + userId + '/user-setting/' + checkbox.data('pk') + '/',
             headers: { 'X-CSRFToken': $('input[name="csrfmiddlewaretoken"]').val() },
-            contentType: "application/json",
+            contentType: 'application/json',
             data: JSON.stringify(data),
             success: function () {
-                showToast('success', 'Settings updated successfully.');
+                showToast('success', gettext('Settings updated successfully.'));
             },
             error: function () {
-                showToast('error', 'Something went wrong. Please try again.');
+                showToast('error', gettext('Something went wrong. Please try again.'));
             }
         });
     }
@@ -130,13 +134,13 @@
             type: 'POST',
             url: '/api/v1/notifications/user/' + userId + '/organization/' + organizationId + '/setting/',
             headers: { 'X-CSRFToken': $('input[name="csrfmiddlewaretoken"]').val() },
-            contentType: "application/json",
+            contentType: 'application/json',
             data: JSON.stringify(data),
             success: function () {
-                showToast('success', 'Organization settings updated successfully.');
+                showToast('success', gettext('Organization settings updated successfully.'));
             },
             error: function () {
-                showToast('error', 'Something went wrong. Please try again.');
+                showToast('error', gettext('Something went wrong. Please try again.'));
             }
         });
     }
@@ -166,13 +170,13 @@
                 type: 'POST',
                 url: '/api/v1/notifications/user/' + userId + '/preference/',
                 headers: { 'X-CSRFToken': $('input[name="csrfmiddlewaretoken"]').val() },
-                contentType: "application/json",
+                contentType: 'application/json',
                 data: JSON.stringify(data),
                 success: function () {
-                    showToast('success', 'Global settings updated successfully.');
+                    showToast('success', gettext('Global settings updated successfully.'));
                 },
                 error: function () {
-                    showToast('error', 'Something went wrong. Please try again.');
+                    showToast('error', gettext('Something went wrong. Please try again.'));
                 },
                 complete: function() {
                     isGlobalChange = false;
diff --git a/openwisp_notifications/templates/openwisp_notifications/settings.html b/openwisp_notifications/templates/openwisp_notifications/settings.html
index 466201d8..0f816b35 100644
--- a/openwisp_notifications/templates/openwisp_notifications/settings.html
+++ b/openwisp_notifications/templates/openwisp_notifications/settings.html
@@ -27,7 +27,7 @@
 {% endblock breadcrumbs %}
 
 {% block content %}
-  <div class="container" data-user-id="{{ user.id }}">
+  <div class="settings-container" data-user-id="{{ user.id }}">
     <h2>Notification Preferences</h2>
     <div class="global-settings">
       <strong>Global Settings:</strong>

From 85bb0c9d93edf78efe54cfacf77907008b40664e Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Tue, 6 Aug 2024 22:39:50 +0530
Subject: [PATCH 15/74] [fix] Verbose errora admin user page

---
 openwisp_notifications/base/admin.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openwisp_notifications/base/admin.py b/openwisp_notifications/base/admin.py
index 003a814f..fda23a24 100644
--- a/openwisp_notifications/base/admin.py
+++ b/openwisp_notifications/base/admin.py
@@ -26,6 +26,7 @@ def get_queryset(self, request):
             super()
             .get_queryset(request)
             .filter(deleted=False)
+            .exclude(organization=None)
             .prefetch_related('organization')
         )
 

From b2643242e0a08789c1fdf8573e631cd88267c6a1 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Tue, 6 Aug 2024 22:40:01 +0530
Subject: [PATCH 16/74] [chore] Web notification on the left, email on the
 right

---
 .../openwisp-notifications/js/settings.js     | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/openwisp_notifications/static/openwisp-notifications/js/settings.js b/openwisp_notifications/static/openwisp-notifications/js/settings.js
index 4c2d0f74..7146558e 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/settings.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/settings.js
@@ -48,8 +48,8 @@ if (typeof gettext === 'undefined') {
                     '<table>' +
                     '<tr>' +
                     '<th>' + gettext('Settings') + '</th>' +
-                    '<th><input type="checkbox" class="checkbox main-checkbox" data-organization-id="' + orgSettings[0].organization + '" data-column="email" /> ' + gettext('Email') + '</th>' +
                     '<th><input type="checkbox" class="checkbox main-checkbox" data-column="web" data-organization-id="' + orgSettings[0].organization + '" /> ' + gettext('Web') + '</th>' +
+                    '<th><input type="checkbox" class="checkbox main-checkbox" data-organization-id="' + orgSettings[0].organization + '" data-column="email" /> ' + gettext('Email') + '</th>' +
                     '</tr>' +
                     '</table>'
                 );
@@ -57,8 +57,8 @@ if (typeof gettext === 'undefined') {
                     const row = $(
                         '<tr>' +
                         '<td>' + setting.type + '</td>' +
-                        '<td><input type="checkbox" class="checkbox email-checkbox" ' + (setting.email ? 'checked' : '') + ' data-pk="' + setting.id + '" data-organization-id="' + setting.organization + '" data-type="email" /></td>' +
                         '<td><input type="checkbox" class="checkbox web-checkbox" ' + (setting.web ? 'checked' : '') + ' data-pk="' + setting.id + '" data-organization-id="' + setting.organization + '" data-type="web" /></td>' +
+                        '<td><input type="checkbox" class="checkbox email-checkbox" ' + (setting.email ? 'checked' : '') + ' data-pk="' + setting.id + '" data-organization-id="' + setting.organization + '" data-type="email" /></td>' +
                         '</tr>'
                     );
                     table.append(row);
@@ -127,8 +127,8 @@ if (typeof gettext === 'undefined') {
     function updateOrganizationSetting(userId, checkbox) {
         const organizationId = checkbox.data('organization-id');
         const data = {
-            email: checkbox.closest('tr').find('.main-checkbox[data-column="email"]').is(':checked'),
-            web: checkbox.closest('tr').find('.main-checkbox[data-column="web"]').is(':checked')
+            web: checkbox.closest('tr').find('.main-checkbox[data-column="web"]').is(':checked'),
+            email: checkbox.closest('tr').find('.main-checkbox[data-column="email"]').is(':checked')
         };
         $.ajax({
             type: 'POST',
@@ -146,25 +146,25 @@ if (typeof gettext === 'undefined') {
     }
 
     function updateOrgLevelCheckboxes(organizationId) {
-        const emailCheckboxes = $('.email-checkbox[data-organization-id="' + organizationId + '"]');
         const webCheckboxes = $('.web-checkbox[data-organization-id="' + organizationId + '"]');
-        const emailMainCheckbox = $('.main-checkbox[data-column="email"][data-organization-id="' + organizationId + '"]');
+        const emailCheckboxes = $('.email-checkbox[data-organization-id="' + organizationId + '"]');
         const webMainCheckbox = $('.main-checkbox[data-column="web"][data-organization-id="' + organizationId + '"]');
-        emailMainCheckbox.prop('checked', emailCheckboxes.length === emailCheckboxes.filter(':checked').length);
+        const emailMainCheckbox = $('.main-checkbox[data-column="email"][data-organization-id="' + organizationId + '"]');
         webMainCheckbox.prop('checked', webCheckboxes.length === webCheckboxes.filter(':checked').length);
+        emailMainCheckbox.prop('checked', emailCheckboxes.length === emailCheckboxes.filter(':checked').length);
     }
 
     function initializeGlobalSettingsEventListener(userId) {
         $('#global-email, #global-web').change(function () {
-            const isGlobalEmailChecked = $('#global-email').is(':checked');
             const isGlobalWebChecked = $('#global-web').is(':checked');
-            const data = { email: isGlobalEmailChecked, web: isGlobalWebChecked };
+            const isGlobalEmailChecked = $('#global-email').is(':checked');
+            const data = { web: isGlobalWebChecked, email: isGlobalEmailChecked };
 
             isGlobalChange = true;
-            $('.main-checkbox[data-column="email"]').prop('checked', isGlobalEmailChecked).change();
             $('.main-checkbox[data-column="web"]').prop('checked', isGlobalWebChecked).change();
-            $('.email-checkbox').prop('checked', isGlobalEmailChecked);
+            $('.main-checkbox[data-column="email"]').prop('checked', isGlobalEmailChecked).change();
             $('.web-checkbox').prop('checked', isGlobalWebChecked);
+            $('.email-checkbox').prop('checked', isGlobalEmailChecked);
 
             $.ajax({
                 type: 'POST',

From b175fa15afd189e10c460ec9f06001fcfa556a57 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Sat, 10 Aug 2024 09:51:35 +0530
Subject: [PATCH 17/74] [chore] Handling auto trigger of email without web
 checkboxes

---
 .../openwisp-notifications/js/settings.js     | 91 ++++++++++++++++---
 1 file changed, 78 insertions(+), 13 deletions(-)

diff --git a/openwisp_notifications/static/openwisp-notifications/js/settings.js b/openwisp_notifications/static/openwisp-notifications/js/settings.js
index 7146558e..c21234fb 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/settings.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/settings.js
@@ -91,27 +91,74 @@ if (typeof gettext === 'undefined') {
             if (isGlobalChange) {
                 return;
             }
-            updateIndividualSetting(userId, $(this));
-            updateOrgLevelCheckboxes($(this).data('organization-id'));
+
+            const organizationId = $(this).data('organization-id');
+            const settingId = $(this).data('pk');
+            const triggeredBy = $(this).data('type');
+
+            let isWebChecked = $(`.web-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).is(':checked');
+            let isEmailChecked = $(`.email-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).is(':checked');
+
+            if (triggeredBy === 'email' && isEmailChecked) {
+                isWebChecked = true;
+            }
+
+            if (triggeredBy === 'web' && !isWebChecked) {
+                isEmailChecked = false;
+            }
+
+            $(`.web-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).prop('checked', isWebChecked);
+            $(`.email-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).prop('checked', isEmailChecked);
+
+            updateIndividualSetting(settingId, isWebChecked, isEmailChecked);
+            updateOrgLevelCheckboxes(organizationId);
         });
 
         $(document).on('change', '.main-checkbox', function () {
             if (isGlobalChange) {
                 return;
             }
-            updateOrganizationSetting(userId, $(this));
+            const orgId = $(this).data('organization-id');
+            const triggeredBy = $(this).data('column');
+
+            let isOrgWebChecked = $(`.main-checkbox[data-organization-id="${orgId}"][data-column="web"]`).is(':checked');
+            let isOrgEmailChecked = $(`.main-checkbox[data-organization-id="${orgId}"][data-column="email"]`).is(':checked');
+
+            // Ensure web is checked if email is checked
+            if (triggeredBy === 'email' && isOrgEmailChecked) {
+                isOrgWebChecked = true;
+            } 
+
+            // Ensure email is unchecked if web is unchecked
+            if (triggeredBy === 'web' && !isOrgWebChecked) {
+                isOrgEmailChecked = false;  
+            }
+
+            $(`.main-checkbox[data-organization-id="${orgId}"][data-column="web"]`).prop('checked', isOrgWebChecked);
+            $(`.main-checkbox[data-organization-id="${orgId}"][data-column="email"]`).prop('checked', isOrgEmailChecked);
+
+            isGlobalChange = true;
+
             const table = $(this).closest('table');
-            table.find('.' + $(this).data('column') + '-checkbox').prop('checked', $(this).is(':checked'));
+            table.find('.web-checkbox').prop('checked', isOrgWebChecked).change();
+            table.find('.email-checkbox').prop('checked', isOrgEmailChecked).change();
+
             updateMainCheckboxes(table);
+
+            updateOrganizationSetting(userId, $(this));
+            isGlobalChange = false;
         });
     }
 
-    function updateIndividualSetting(userId, checkbox) {
-        const data = {};
-        data[checkbox.data('type')] = checkbox.is(':checked');
+    function updateIndividualSetting(settingId, isWebChecked, isEmailChecked) {
+        const userId = $('.settings-container').data('user-id');
+        const data = {
+            web: isWebChecked,
+            email: isEmailChecked
+        };
         $.ajax({
             type: 'PATCH',
-            url: '/api/v1/notifications/user/' + userId + '/user-setting/' + checkbox.data('pk') + '/',
+            url: '/api/v1/notifications/user/' + userId + '/user-setting/' + settingId + '/',
             headers: { 'X-CSRFToken': $('input[name="csrfmiddlewaretoken"]').val() },
             contentType: 'application/json',
             data: JSON.stringify(data),
@@ -155,12 +202,30 @@ if (typeof gettext === 'undefined') {
     }
 
     function initializeGlobalSettingsEventListener(userId) {
-        $('#global-email, #global-web').change(function () {
-            const isGlobalWebChecked = $('#global-web').is(':checked');
-            const isGlobalEmailChecked = $('#global-email').is(':checked');
-            const data = { web: isGlobalWebChecked, email: isGlobalEmailChecked };
+        $('#global-email, #global-web').change(function (event) {
+            const triggeredBy = $(event.target).attr('id');
+            
+            let isGlobalWebChecked = $('#global-web').is(':checked');
+            let isGlobalEmailChecked = $('#global-email').is(':checked');
+
+            if (triggeredBy === 'global-email' && isGlobalEmailChecked) {
+                isGlobalWebChecked = true;
+            } 
+
+            if (triggeredBy === 'global-web' && !isGlobalWebChecked) {
+                isGlobalEmailChecked = false;  
+            }
+
+            $('#global-web').prop('checked', isGlobalWebChecked);
+            $('#global-email').prop('checked', isGlobalEmailChecked);
+
+            const data = {
+                web: isGlobalWebChecked,
+                email: isGlobalEmailChecked
+            };
 
             isGlobalChange = true;
+
             $('.main-checkbox[data-column="web"]').prop('checked', isGlobalWebChecked).change();
             $('.main-checkbox[data-column="email"]').prop('checked', isGlobalEmailChecked).change();
             $('.web-checkbox').prop('checked', isGlobalWebChecked);
@@ -178,7 +243,7 @@ if (typeof gettext === 'undefined') {
                 error: function () {
                     showToast('error', gettext('Something went wrong. Please try again.'));
                 },
-                complete: function() {
+                complete: function () {
                     isGlobalChange = false;
                 }
             });

From c0d373fa8246e81c2f5c2c162a06590fa0e297ae Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Sat, 10 Aug 2024 10:15:08 +0530
Subject: [PATCH 18/74] [chore] Automatically open first org dropdown, label
 for org level email and web checkboxes

---
 .../static/openwisp-notifications/js/settings.js     | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/openwisp_notifications/static/openwisp-notifications/js/settings.js b/openwisp_notifications/static/openwisp-notifications/js/settings.js
index c21234fb..6c1d3529 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/settings.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/settings.js
@@ -32,7 +32,7 @@ if (typeof gettext === 'undefined') {
 
     function renderNotificationSettings(data) {
         const orgPanelsContainer = $('#org-panels').empty();
-        Object.keys(data).sort().forEach(function(orgName) {
+        Object.keys(data).sort().forEach(function(orgName, index) {
             const orgSettings = data[orgName].sort(function(a, b) {
                 return a.type.localeCompare(b.type);
             });
@@ -48,8 +48,8 @@ if (typeof gettext === 'undefined') {
                     '<table>' +
                     '<tr>' +
                     '<th>' + gettext('Settings') + '</th>' +
-                    '<th><input type="checkbox" class="checkbox main-checkbox" data-column="web" data-organization-id="' + orgSettings[0].organization + '" /> ' + gettext('Web') + '</th>' +
-                    '<th><input type="checkbox" class="checkbox main-checkbox" data-organization-id="' + orgSettings[0].organization + '" data-column="email" /> ' + gettext('Email') + '</th>' +
+                    '<th><label><input type="checkbox" class="checkbox main-checkbox" data-column="web" data-organization-id="' + orgSettings[0].organization + '" /> ' + gettext('Web') + '</label></th>' +
+                    '<th><label><input type="checkbox" class="checkbox main-checkbox" data-organization-id="' + orgSettings[0].organization + '" data-column="email" /> ' + gettext('Email') + '</label></th>' +
                     '</tr>' +
                     '</table>'
                 );
@@ -69,6 +69,12 @@ if (typeof gettext === 'undefined') {
                 orgContent.append('<div class="no-settings">' + gettext('No settings available for this organization') + '</div>');
             }
             orgPanelsContainer.append(orgPanel);
+
+            // Automatically open the first organization panel
+            if (index === 0) {
+                orgContent.addClass('active');
+                orgPanel.find('.toggle').text('▲');
+            }
         });
     }
 

From 487f6dd732f048f194a9ebfdf671f74c0cf5a836 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Sat, 10 Aug 2024 13:28:39 +0530
Subject: [PATCH 19/74] [chore] Fetch current user global setting preference
 and make it default

---
 openwisp_notifications/api/views.py           | 10 +++++
 .../openwisp-notifications/js/settings.js     | 40 +++++++++++++------
 .../openwisp_notifications/settings.html      |  8 ++--
 3 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/openwisp_notifications/api/views.py b/openwisp_notifications/api/views.py
index 2f218b14..1a52c6fe 100644
--- a/openwisp_notifications/api/views.py
+++ b/openwisp_notifications/api/views.py
@@ -231,6 +231,16 @@ class NotificationPreferenceView(GenericAPIView):
     permission_classes = [IsAuthenticated, IsAuthenticatedToUpdateNotificationSetting]
     serializer_class = NotificationSettingUpdateSerializer
 
+    def get(self, request, user_id):
+        notification_settings, created = NotificationSetting.objects.get_or_create(
+            user_id=user_id,
+            organization=None,
+            type=None,
+            defaults={'email': True, 'web': True}
+        )
+        serializer = self.get_serializer(notification_settings)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
     def post(self, request, user_id):
         serializer = self.get_serializer(data=request.data)
         if serializer.is_valid():
diff --git a/openwisp_notifications/static/openwisp-notifications/js/settings.js b/openwisp_notifications/static/openwisp-notifications/js/settings.js
index 6c1d3529..6445a59f 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/settings.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/settings.js
@@ -9,14 +9,29 @@ if (typeof gettext === 'undefined') {
 
     $(document).ready(function () {
         const userId = $('.settings-container').data('user-id');
-        fetchNotificationSettings(userId);
-        initializeGlobalSettingsEventListener(userId);
+        fetchGlobalSettings(userId);
     });
 
-    function fetchNotificationSettings(userId) {
+    function fetchGlobalSettings(userId) {
+        $.getJSON(`/api/v1/notifications/user/${userId}/preference/`, function (globalData) {
+            const isGlobalWebChecked = globalData.web;
+            const isGlobalEmailChecked = globalData.email;
+
+            $('#global-web').prop('checked', isGlobalWebChecked);
+            $('#global-email').prop('checked', isGlobalEmailChecked);
+
+            initializeGlobalSettingsEventListener(userId);
+
+            fetchNotificationSettings(userId, isGlobalWebChecked, isGlobalEmailChecked);
+        }).fail(function () {
+            showToast('error', gettext('Error fetching global settings. Please try again.'));
+        });
+    }
+
+    function fetchNotificationSettings(userId, isGlobalWebChecked, isGlobalEmailChecked) {
         $.getJSON(`/api/v1/notifications/user/${userId}/user-setting/`, function (data) {
             const groupedData = groupBy(data.results, 'organization_name');
-            renderNotificationSettings(groupedData);
+            renderNotificationSettings(groupedData, isGlobalWebChecked, isGlobalEmailChecked);
             initializeEventListeners(userId);
         }).fail(function () {
             showToast('error', gettext('Error fetching notification settings. Please try again.'));
@@ -30,7 +45,7 @@ if (typeof gettext === 'undefined') {
         }, {});
     }
 
-    function renderNotificationSettings(data) {
+    function renderNotificationSettings(data, isGlobalWebChecked, isGlobalEmailChecked) {
         const orgPanelsContainer = $('#org-panels').empty();
         Object.keys(data).sort().forEach(function(orgName, index) {
             const orgSettings = data[orgName].sort(function(a, b) {
@@ -48,8 +63,8 @@ if (typeof gettext === 'undefined') {
                     '<table>' +
                     '<tr>' +
                     '<th>' + gettext('Settings') + '</th>' +
-                    '<th><label><input type="checkbox" class="checkbox main-checkbox" data-column="web" data-organization-id="' + orgSettings[0].organization + '" /> ' + gettext('Web') + '</label></th>' +
-                    '<th><label><input type="checkbox" class="checkbox main-checkbox" data-organization-id="' + orgSettings[0].organization + '" data-column="email" /> ' + gettext('Email') + '</label></th>' +
+                    '<th><label><input type="checkbox" class="checkbox main-checkbox" data-column="web" data-organization-id="' + orgSettings[0].organization + '" ' + (isGlobalWebChecked ? 'checked' : '') + ' /> ' + gettext('Web') + '</label></th>' +
+                    '<th><label><input type="checkbox" class="checkbox main-checkbox" data-organization-id="' + orgSettings[0].organization + '" data-column="email" ' + (isGlobalEmailChecked ? 'checked' : '') + ' /> ' + gettext('Email') + '</label></th>' +
                     '</tr>' +
                     '</table>'
                 );
@@ -200,7 +215,7 @@ if (typeof gettext === 'undefined') {
 
     function updateOrgLevelCheckboxes(organizationId) {
         const webCheckboxes = $('.web-checkbox[data-organization-id="' + organizationId + '"]');
-        const emailCheckboxes = $('.email-checkbox[data-organization-id="' + organizationId + '"]');
+        const emailCheckboxes = $('..email-checkbox[data-organization-id="' + organizationId + '"]');
         const webMainCheckbox = $('.main-checkbox[data-column="web"][data-organization-id="' + organizationId + '"]');
         const emailMainCheckbox = $('.main-checkbox[data-column="email"][data-organization-id="' + organizationId + '"]');
         webMainCheckbox.prop('checked', webCheckboxes.length === webCheckboxes.filter(':checked').length);
@@ -232,11 +247,6 @@ if (typeof gettext === 'undefined') {
 
             isGlobalChange = true;
 
-            $('.main-checkbox[data-column="web"]').prop('checked', isGlobalWebChecked).change();
-            $('.main-checkbox[data-column="email"]').prop('checked', isGlobalEmailChecked).change();
-            $('.web-checkbox').prop('checked', isGlobalWebChecked);
-            $('.email-checkbox').prop('checked', isGlobalEmailChecked);
-
             $.ajax({
                 type: 'POST',
                 url: '/api/v1/notifications/user/' + userId + '/preference/',
@@ -245,6 +255,10 @@ if (typeof gettext === 'undefined') {
                 data: JSON.stringify(data),
                 success: function () {
                     showToast('success', gettext('Global settings updated successfully.'));
+                    $('.main-checkbox[data-column="web"]').prop('checked', isGlobalWebChecked).change();
+                    $('.main-checkbox[data-column="email"]').prop('checked', isGlobalEmailChecked).change();
+                    $('.web-checkbox').prop('checked', isGlobalWebChecked);
+                    $('.email-checkbox').prop('checked', isGlobalEmailChecked);
                 },
                 error: function () {
                     showToast('error', gettext('Something went wrong. Please try again.'));
diff --git a/openwisp_notifications/templates/openwisp_notifications/settings.html b/openwisp_notifications/templates/openwisp_notifications/settings.html
index 0f816b35..a65633ec 100644
--- a/openwisp_notifications/templates/openwisp_notifications/settings.html
+++ b/openwisp_notifications/templates/openwisp_notifications/settings.html
@@ -32,12 +32,12 @@ <h2>Notification Preferences</h2>
     <div class="global-settings">
       <strong>Global Settings:</strong>
       <label>
-        <input type="checkbox" id="global-email" checked />
-        Email
+        <input type="checkbox" id="global-web" />
+        Web
       </label>
       <label>
-        <input type="checkbox" id="global-web" checked />
-        Web
+        <input type="checkbox" id="global-email" />
+        Email
       </label>
     </div>
     <div id="org-panels"></div>

From a5d8b4ec218c73fd7ccb320b5c5498d612d55972 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Sat, 10 Aug 2024 14:03:14 +0530
Subject: [PATCH 20/74] [chore] Update type_label for user-setting api

---
 openwisp_notifications/api/serializers.py                     | 4 ++++
 .../static/openwisp-notifications/js/settings.js              | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/openwisp_notifications/api/serializers.py b/openwisp_notifications/api/serializers.py
index 9baf8eff..a64ff3eb 100644
--- a/openwisp_notifications/api/serializers.py
+++ b/openwisp_notifications/api/serializers.py
@@ -74,10 +74,14 @@ class Meta(NotificationSerializer.Meta):
 
 class NotificationSettingSerializer(serializers.ModelSerializer):
     organization_name = serializers.SerializerMethodField()
+    type_label = serializers.SerializerMethodField()
 
     def get_organization_name(self, obj):
         return obj.organization.name if obj.organization else None
 
+    def get_type_label(self, obj):
+        return obj.type_config['verbose_name']
+
     class Meta:
         model = NotificationSetting
         exclude = ['user']
diff --git a/openwisp_notifications/static/openwisp-notifications/js/settings.js b/openwisp_notifications/static/openwisp-notifications/js/settings.js
index 6445a59f..a4766b95 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/settings.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/settings.js
@@ -71,7 +71,7 @@ if (typeof gettext === 'undefined') {
                 orgSettings.forEach(function(setting) {
                     const row = $(
                         '<tr>' +
-                        '<td>' + setting.type + '</td>' +
+                        '<td>' + setting.type_label + '</td>' +
                         '<td><input type="checkbox" class="checkbox web-checkbox" ' + (setting.web ? 'checked' : '') + ' data-pk="' + setting.id + '" data-organization-id="' + setting.organization + '" data-type="web" /></td>' +
                         '<td><input type="checkbox" class="checkbox email-checkbox" ' + (setting.email ? 'checked' : '') + ' data-pk="' + setting.id + '" data-organization-id="' + setting.organization + '" data-type="email" /></td>' +
                         '</tr>'

From cb8a296c7e34a83f1467b2fe2ee60fba6d686e39 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Sun, 11 Aug 2024 18:44:06 +0530
Subject: [PATCH 21/74] [chore] Reduced CSS and replicate admin design

---
 .../openwisp-notifications/css/settings.css   | 23 +------------------
 .../openwisp-notifications/js/settings.js     |  9 +++++---
 .../openwisp_notifications/settings.html      |  5 ++--
 3 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/openwisp_notifications/static/openwisp-notifications/css/settings.css b/openwisp_notifications/static/openwisp-notifications/css/settings.css
index 30f92207..8be297ad 100644
--- a/openwisp_notifications/static/openwisp-notifications/css/settings.css
+++ b/openwisp_notifications/static/openwisp-notifications/css/settings.css
@@ -1,8 +1,3 @@
-.settings-container {
-  max-width: 1200px;
-  margin: 0 auto;
-  padding: 20px;
-}
 .global-settings {
   margin: 10px 0 20px;
 }
@@ -15,7 +10,7 @@
   cursor: pointer;
 }
 .org-content {
-  padding: 10px;
+  padding-top: 10px;
   display: none;
 }
 .org-content.active {
@@ -23,17 +18,6 @@
 }
 table {
   width: 100%;
-  border-collapse: separate;
-  border-spacing: 0;
-}
-th,
-td {
-  padding: 8px;
-  text-align: left;
-  border-bottom: 1px solid #ddd;
-}
-th {
-  background-color: #f2f2f2;
 }
 th:not(:last-child),
 td:not(:last-child) {
@@ -43,11 +27,6 @@ th:not(:first-child),
 td:not(:first-child) {
   text-align: center;
 }
-.checkbox {
-  width: 17px;
-  height: 17px;
-  text-align: center;
-}
 .no-settings {
   padding: 10px;
   text-align: center;
diff --git a/openwisp_notifications/static/openwisp-notifications/js/settings.js b/openwisp_notifications/static/openwisp-notifications/js/settings.js
index a4766b95..62349de3 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/settings.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/settings.js
@@ -49,7 +49,7 @@ if (typeof gettext === 'undefined') {
         const orgPanelsContainer = $('#org-panels').empty();
         Object.keys(data).sort().forEach(function(orgName, index) {
             const orgSettings = data[orgName].sort(function(a, b) {
-                return a.type.localeCompare(b.type);
+                return a.type_label.localeCompare(b.type_label);
             });
             const orgPanel = $(
                 '<div class="org-panel">' +
@@ -61,11 +61,14 @@ if (typeof gettext === 'undefined') {
             if (orgSettings.length > 0) {
                 const table = $(
                     '<table>' +
+                    '<thead>' +
                     '<tr>' +
                     '<th>' + gettext('Settings') + '</th>' +
                     '<th><label><input type="checkbox" class="checkbox main-checkbox" data-column="web" data-organization-id="' + orgSettings[0].organization + '" ' + (isGlobalWebChecked ? 'checked' : '') + ' /> ' + gettext('Web') + '</label></th>' +
                     '<th><label><input type="checkbox" class="checkbox main-checkbox" data-organization-id="' + orgSettings[0].organization + '" data-column="email" ' + (isGlobalEmailChecked ? 'checked' : '') + ' /> ' + gettext('Email') + '</label></th>' +
                     '</tr>' +
+                    '</thead>' +
+                    '<tbody></tbody>' +
                     '</table>'
                 );
                 orgSettings.forEach(function(setting) {
@@ -76,7 +79,7 @@ if (typeof gettext === 'undefined') {
                         '<td><input type="checkbox" class="checkbox email-checkbox" ' + (setting.email ? 'checked' : '') + ' data-pk="' + setting.id + '" data-organization-id="' + setting.organization + '" data-type="email" /></td>' +
                         '</tr>'
                     );
-                    table.append(row);
+                    table.find('tbody').append(row);
                 });
                 orgContent.append(table);
                 updateMainCheckboxes(table);
@@ -215,7 +218,7 @@ if (typeof gettext === 'undefined') {
 
     function updateOrgLevelCheckboxes(organizationId) {
         const webCheckboxes = $('.web-checkbox[data-organization-id="' + organizationId + '"]');
-        const emailCheckboxes = $('..email-checkbox[data-organization-id="' + organizationId + '"]');
+        const emailCheckboxes = $('.email-checkbox[data-organization-id="' + organizationId + '"]');
         const webMainCheckbox = $('.main-checkbox[data-column="web"][data-organization-id="' + organizationId + '"]');
         const emailMainCheckbox = $('.main-checkbox[data-column="email"][data-organization-id="' + organizationId + '"]');
         webMainCheckbox.prop('checked', webCheckboxes.length === webCheckboxes.filter(':checked').length);
diff --git a/openwisp_notifications/templates/openwisp_notifications/settings.html b/openwisp_notifications/templates/openwisp_notifications/settings.html
index a65633ec..18caa9f0 100644
--- a/openwisp_notifications/templates/openwisp_notifications/settings.html
+++ b/openwisp_notifications/templates/openwisp_notifications/settings.html
@@ -4,7 +4,7 @@
 {% load static %}
 
 {% block title %}
-  {% trans "Notification Settings" %}
+  {% trans "Notification Preferences" %}
 {% endblock %}
 
 {% block extrastyle %}
@@ -26,9 +26,10 @@
   </div>
 {% endblock breadcrumbs %}
 
+{% block pretitle %}Notification Preferences{% endblock %}
+
 {% block content %}
   <div class="settings-container" data-user-id="{{ user.id }}">
-    <h2>Notification Preferences</h2>
     <div class="global-settings">
       <strong>Global Settings:</strong>
       <label>

From 4d5fca5147b01d6b4f4582741fa90a4e313ec329 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Sun, 11 Aug 2024 23:30:37 +0530
Subject: [PATCH 22/74] [chore] Update org name styles and add no setting
 available

---
 .../openwisp-notifications/css/settings.css   | 12 ++++-----
 .../openwisp-notifications/js/settings.js     | 25 ++++++++++++-------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/openwisp_notifications/static/openwisp-notifications/css/settings.css b/openwisp_notifications/static/openwisp-notifications/css/settings.css
index 8be297ad..fc4a1942 100644
--- a/openwisp_notifications/static/openwisp-notifications/css/settings.css
+++ b/openwisp_notifications/static/openwisp-notifications/css/settings.css
@@ -1,13 +1,13 @@
 .global-settings {
-  margin: 10px 0 20px;
+    margin: 10px 0 20px;
 }
-.org-header {
-  background-color: #e0e0e0;
+.module h2 {
   padding: 10px;
-  font-weight: bold;
+  cursor: pointer;
   display: flex;
   justify-content: space-between;
-  cursor: pointer;
+  align-items: center;
+  font-weight: bold;
 }
 .org-content {
   padding-top: 10px;
@@ -27,7 +27,7 @@ th:not(:first-child),
 td:not(:first-child) {
   text-align: center;
 }
-.no-settings {
+.no-settings, .no-organizations {
   padding: 10px;
   text-align: center;
   color: #666;
diff --git a/openwisp_notifications/static/openwisp-notifications/js/settings.js b/openwisp_notifications/static/openwisp-notifications/js/settings.js
index 62349de3..82d47bf0 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/settings.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/settings.js
@@ -47,13 +47,20 @@ if (typeof gettext === 'undefined') {
 
     function renderNotificationSettings(data, isGlobalWebChecked, isGlobalEmailChecked) {
         const orgPanelsContainer = $('#org-panels').empty();
+
+        // Check if there are no organizations
+        if (Object.keys(data).length === 0) {
+            orgPanelsContainer.append('<div class="no-organizations">' + gettext('No organizations available.') + '</div>');
+            return;
+        }
+
         Object.keys(data).sort().forEach(function(orgName, index) {
             const orgSettings = data[orgName].sort(function(a, b) {
                 return a.type_label.localeCompare(b.type_label);
             });
             const orgPanel = $(
-                '<div class="org-panel">' +
-                '<div class="org-header"><span>' + orgName + '</span><span class="toggle">▼</span></div>' +
+                '<div class="module">' +
+                '<h2 class="toggle-header"><span>' + orgName + '</span><span class="toggle-icon">▼</span></h2>' +
                 '<div class="org-content"></div>' +
                 '</div>'
             );
@@ -91,7 +98,9 @@ if (typeof gettext === 'undefined') {
             // Automatically open the first organization panel
             if (index === 0) {
                 orgContent.addClass('active');
-                orgPanel.find('.toggle').text('▲');
+                orgPanel.find('.toggle-icon').text('▲');
+            } else {
+                orgContent.hide();
             }
         });
     }
@@ -105,10 +114,10 @@ if (typeof gettext === 'undefined') {
     }
 
     function initializeEventListeners(userId) {
-        $(document).on('click', '.org-header', function () {
-            const toggle = $(this).find('.toggle');
-            toggle.text(toggle.text() === '▼' ? '▲' : '▼');
-            $(this).next('.org-content').toggleClass('active');
+        $(document).on('click', '.toggle-header', function () {
+            const toggleIcon = $(this).find('.toggle-icon');
+            toggleIcon.text(toggleIcon.text() === '▼' ? '▲' : '▼');
+            $(this).next('.org-content').slideToggle();
         });
 
         $(document).on('change', '.email-checkbox, .web-checkbox', function () {
@@ -148,12 +157,10 @@ if (typeof gettext === 'undefined') {
             let isOrgWebChecked = $(`.main-checkbox[data-organization-id="${orgId}"][data-column="web"]`).is(':checked');
             let isOrgEmailChecked = $(`.main-checkbox[data-organization-id="${orgId}"][data-column="email"]`).is(':checked');
 
-            // Ensure web is checked if email is checked
             if (triggeredBy === 'email' && isOrgEmailChecked) {
                 isOrgWebChecked = true;
             } 
 
-            // Ensure email is unchecked if web is unchecked
             if (triggeredBy === 'web' && !isOrgWebChecked) {
                 isOrgEmailChecked = false;  
             }

From 5c6bf565bc0743c1aa56ae8c7fa918c7d557a0a4 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Sun, 11 Aug 2024 23:45:50 +0530
Subject: [PATCH 23/74] [QA] Fixes

---
 openwisp_notifications/api/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openwisp_notifications/api/views.py b/openwisp_notifications/api/views.py
index 1a52c6fe..39ccbf5a 100644
--- a/openwisp_notifications/api/views.py
+++ b/openwisp_notifications/api/views.py
@@ -236,7 +236,7 @@ def get(self, request, user_id):
             user_id=user_id,
             organization=None,
             type=None,
-            defaults={'email': True, 'web': True}
+            defaults={'email': True, 'web': True},
         )
         serializer = self.get_serializer(notification_settings)
         return Response(serializer.data, status=status.HTTP_200_OK)

From 8a8437ff3991bec8f875593f39a67f1667beec55 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Mon, 12 Aug 2024 13:56:04 +0530
Subject: [PATCH 24/74] [chore] Toast dialog update

---
 .../openwisp-notifications/css/settings.css   | 21 +++++++
 .../openwisp-notifications/js/settings.js     | 58 +++++++++++++------
 2 files changed, 60 insertions(+), 19 deletions(-)

diff --git a/openwisp_notifications/static/openwisp-notifications/css/settings.css b/openwisp_notifications/static/openwisp-notifications/css/settings.css
index fc4a1942..c6ae1094 100644
--- a/openwisp_notifications/static/openwisp-notifications/css/settings.css
+++ b/openwisp_notifications/static/openwisp-notifications/css/settings.css
@@ -32,3 +32,24 @@ td:not(:first-child) {
   text-align: center;
   color: #666;
 }
+.toast {
+    position: fixed;
+    bottom: 20px;
+    right: 20px;
+    background-color: #333;
+    color: white;
+    padding: 12px 20px;
+    border-radius: 5px;
+    transition: opacity 0.5s ease-in-out;
+    z-index: 9999;
+    cursor: pointer;
+}
+.toast .progress-bar {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    height: 4px;
+    background-color: #007bff;
+    width: 100%;
+    transition: width 3s linear;
+}
diff --git a/openwisp_notifications/static/openwisp-notifications/js/settings.js b/openwisp_notifications/static/openwisp-notifications/js/settings.js
index 82d47bf0..915d075f 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/settings.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/settings.js
@@ -281,26 +281,46 @@ if (typeof gettext === 'undefined') {
     }
 
     function showToast(level, message) {
-        const toast = $(
-            '<div class="ow-notification-toast ' + level + '">' +
-            '<div class="icon ow-notify-close btn" role="button" tabindex="1"></div>' +
-            '<div style="display:flex">' +
-            '<div class="icon ow-notify-' + level + '"></div>' +
-            message +
-            '</div>' +
-            '</div>'
-        );
-        $('.ow-notification-toast-wrapper').prepend(toast);
-        toast.slideDown('slow', function () {
-            setTimeout(function () {
-                toast.slideUp('slow', function () {
-                    toast.remove();
-                });
-            }, 3000);
-        });
+        const existingToast = document.querySelector('.toast');
+        if (existingToast) {
+            document.body.removeChild(existingToast);
+        }
 
-        $(document).on('click', '.ow-notification-toast .ow-notify-close.btn', function () {
-            toast.remove();
+        const toast = document.createElement('div');
+        toast.className = `toast ${level}`;
+        toast.innerHTML = `
+            <div style="display:flex">
+                <div class="icon ow-notify-${level}"></div>
+                ${message}
+            </div>
+            <div class="progress-bar"></div>
+        `;
+
+        document.body.appendChild(toast);
+
+        setTimeout(() => {
+            toast.style.opacity = '1';
+        }, 10);
+
+        const progressBar = toast.querySelector('.progress-bar');
+        progressBar.style.transition = `width 3000ms linear`;
+        setTimeout(() => {
+            progressBar.style.width = '0%';
+        }, 10);
+
+        setTimeout(() => {
+            toast.style.opacity = '0';
+            setTimeout(() => {
+                if (document.body.contains(toast)) {
+                    document.body.removeChild(toast);
+                }
+            }, 500);
+        }, 3000);
+
+        toast.addEventListener('click', () => {
+            if (document.body.contains(toast)) {
+                document.body.removeChild(toast);
+            }
         });
     }
 })(django.jQuery);

From 8fb919c52c7831e49c877c60a855eafdd558b8b2 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Mon, 12 Aug 2024 14:00:28 +0530
Subject: [PATCH 25/74] [chore] Variable naming

---
 .../static/openwisp-notifications/js/settings.js   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/openwisp_notifications/static/openwisp-notifications/js/settings.js b/openwisp_notifications/static/openwisp-notifications/js/settings.js
index 915d075f..62578216 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/settings.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/settings.js
@@ -5,7 +5,7 @@ if (typeof gettext === 'undefined') {
 }
 
 (function ($) {
-    let isGlobalChange = false;
+    let isUpdateInProgress = false;
 
     $(document).ready(function () {
         const userId = $('.settings-container').data('user-id');
@@ -121,7 +121,7 @@ if (typeof gettext === 'undefined') {
         });
 
         $(document).on('change', '.email-checkbox, .web-checkbox', function () {
-            if (isGlobalChange) {
+            if (isUpdateInProgress) {
                 return;
             }
 
@@ -148,7 +148,7 @@ if (typeof gettext === 'undefined') {
         });
 
         $(document).on('change', '.main-checkbox', function () {
-            if (isGlobalChange) {
+            if (isUpdateInProgress) {
                 return;
             }
             const orgId = $(this).data('organization-id');
@@ -168,7 +168,7 @@ if (typeof gettext === 'undefined') {
             $(`.main-checkbox[data-organization-id="${orgId}"][data-column="web"]`).prop('checked', isOrgWebChecked);
             $(`.main-checkbox[data-organization-id="${orgId}"][data-column="email"]`).prop('checked', isOrgEmailChecked);
 
-            isGlobalChange = true;
+            isUpdateInProgress = true;
 
             const table = $(this).closest('table');
             table.find('.web-checkbox').prop('checked', isOrgWebChecked).change();
@@ -177,7 +177,7 @@ if (typeof gettext === 'undefined') {
             updateMainCheckboxes(table);
 
             updateOrganizationSetting(userId, $(this));
-            isGlobalChange = false;
+            isUpdateInProgress = false;
         });
     }
 
@@ -255,7 +255,7 @@ if (typeof gettext === 'undefined') {
                 email: isGlobalEmailChecked
             };
 
-            isGlobalChange = true;
+            isUpdateInProgress = true;
 
             $.ajax({
                 type: 'POST',
@@ -274,7 +274,7 @@ if (typeof gettext === 'undefined') {
                     showToast('error', gettext('Something went wrong. Please try again.'));
                 },
                 complete: function () {
-                    isGlobalChange = false;
+                    isUpdateInProgress = false;
                 }
             });
         });

From 76288929eb2e1fe9c93412743003d42bbe72abd9 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Mon, 12 Aug 2024 14:21:17 +0530
Subject: [PATCH 26/74] [chore] Org level email/web center to the checkbox

---
 .../static/openwisp-notifications/js/settings.js              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openwisp_notifications/static/openwisp-notifications/js/settings.js b/openwisp_notifications/static/openwisp-notifications/js/settings.js
index 62578216..e2dd55e8 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/settings.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/settings.js
@@ -71,8 +71,8 @@ if (typeof gettext === 'undefined') {
                     '<thead>' +
                     '<tr>' +
                     '<th>' + gettext('Settings') + '</th>' +
-                    '<th><label><input type="checkbox" class="checkbox main-checkbox" data-column="web" data-organization-id="' + orgSettings[0].organization + '" ' + (isGlobalWebChecked ? 'checked' : '') + ' /> ' + gettext('Web') + '</label></th>' +
-                    '<th><label><input type="checkbox" class="checkbox main-checkbox" data-organization-id="' + orgSettings[0].organization + '" data-column="email" ' + (isGlobalEmailChecked ? 'checked' : '') + ' /> ' + gettext('Email') + '</label></th>' +
+'<th style="text-align: center;"><label style="display: inline-flex; align-items: center;"><input type="checkbox" class="checkbox main-checkbox" data-column="web" data-organization-id="' + orgSettings[0].organization + '" ' + (isGlobalWebChecked ? 'checked' : '') + ' style="margin-right: 4px;" /> ' + gettext('Web') + '</label></th>' +
+'<th style="text-align: center;"><label style="display: inline-flex; align-items: center;"><input type="checkbox" class="checkbox main-checkbox" data-organization-id="' + orgSettings[0].organization + '" data-column="email" ' + (isGlobalEmailChecked ? 'checked' : '') + ' style="margin-right: 4px;" /> ' + gettext('Email') + '</label></th>' +
                     '</tr>' +
                     '</thead>' +
                     '<tbody></tbody>' +

From 946d74323b24141a898db37c5951a955e7c89dee Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Mon, 12 Aug 2024 14:26:22 +0530
Subject: [PATCH 27/74] [fix] Tests

---
 openwisp_notifications/api/serializers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openwisp_notifications/api/serializers.py b/openwisp_notifications/api/serializers.py
index a64ff3eb..bf2836fc 100644
--- a/openwisp_notifications/api/serializers.py
+++ b/openwisp_notifications/api/serializers.py
@@ -80,7 +80,7 @@ def get_organization_name(self, obj):
         return obj.organization.name if obj.organization else None
 
     def get_type_label(self, obj):
-        return obj.type_config['verbose_name']
+        return obj.type_config.get('verbose_name', None)
 
     class Meta:
         model = NotificationSetting

From 1268fe63697afc1977cc07c5856a3be8b71d5f05 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Sat, 17 Aug 2024 01:39:07 +0530
Subject: [PATCH 28/74] [chore] Reviewed change bump

---
 openwisp_notifications/admin.py               | 22 ------
 openwisp_notifications/api/permissions.py     | 21 +++---
 openwisp_notifications/api/serializers.py     | 12 ++--
 openwisp_notifications/base/views.py          | 10 +--
 .../css/preferences.css                       | 69 +++++++++++++++++++
 .../openwisp-notifications/css/settings.css   | 55 ---------------
 .../js/{settings.js => preferences.js}        | 23 ++++---
 openwisp_notifications/tasks.py               |  7 +-
 .../user/change_form_object_tools.html        |  8 +++
 .../{settings.html => preferences.html}       |  6 +-
 openwisp_notifications/tests/test_admin.py    | 53 --------------
 .../tests/test_notifications.py               | 11 ++-
 openwisp_notifications/tests/test_utils.py    |  9 ---
 openwisp_notifications/urls.py                | 14 ++--
 tests/openwisp2/sample_notifications/admin.py |  4 --
 15 files changed, 132 insertions(+), 192 deletions(-)
 create mode 100644 openwisp_notifications/static/openwisp-notifications/css/preferences.css
 delete mode 100644 openwisp_notifications/static/openwisp-notifications/css/settings.css
 rename openwisp_notifications/static/openwisp-notifications/js/{settings.js => preferences.js} (90%)
 create mode 100644 openwisp_notifications/templates/admin/openwisp_users/user/change_form_object_tools.html
 rename openwisp_notifications/templates/openwisp_notifications/{settings.html => preferences.html} (91%)

diff --git a/openwisp_notifications/admin.py b/openwisp_notifications/admin.py
index 0e320be6..92ca3c2b 100644
--- a/openwisp_notifications/admin.py
+++ b/openwisp_notifications/admin.py
@@ -1,25 +1,3 @@
-from django.contrib import admin
-
-from openwisp_notifications.base.admin import NotificationSettingAdminMixin
-from openwisp_notifications.swapper import load_model
 from openwisp_notifications.widgets import _add_object_notification_widget
-from openwisp_users.admin import UserAdmin
-from openwisp_utils.admin import AlwaysHasChangedMixin
-
-Notification = load_model('Notification')
-NotificationSetting = load_model('NotificationSetting')
-
-
-class NotificationSettingInline(
-    NotificationSettingAdminMixin, AlwaysHasChangedMixin, admin.TabularInline
-):
-    model = NotificationSetting
-    extra = 0
-
-    def has_change_permission(self, request, obj=None):
-        return request.user.is_superuser or request.user == obj
-
-
-UserAdmin.inlines = [NotificationSettingInline] + UserAdmin.inlines
 
 _add_object_notification_widget()
diff --git a/openwisp_notifications/api/permissions.py b/openwisp_notifications/api/permissions.py
index 92a2dddf..b722beae 100644
--- a/openwisp_notifications/api/permissions.py
+++ b/openwisp_notifications/api/permissions.py
@@ -2,16 +2,13 @@
 
 
 class IsAuthenticatedToUpdateNotificationSetting(BasePermission):
-    def has_permission(self, request, view):
-        user = request.user
-        user_id = view.kwargs.get('user_id')
-
-        # Allow superusers
-        if user.is_superuser:
-            return True
+    """
+    Permission class to check if the user is authenticated to update notification settings.
+    Allows superusers to change the notification preferences of other users.
+    Regular users can only update their own settings.
+    """
 
-        # Allow users to update their own settings
-        if user.id == user_id:
-            return True
-
-        return False
+    def has_permission(self, request, view):
+        return request.user.is_superuser or request.user.id == view.kwargs.get(
+            'user_id'
+        )
diff --git a/openwisp_notifications/api/serializers.py b/openwisp_notifications/api/serializers.py
index bf2836fc..7698fb0d 100644
--- a/openwisp_notifications/api/serializers.py
+++ b/openwisp_notifications/api/serializers.py
@@ -73,14 +73,10 @@ class Meta(NotificationSerializer.Meta):
 
 
 class NotificationSettingSerializer(serializers.ModelSerializer):
-    organization_name = serializers.SerializerMethodField()
-    type_label = serializers.SerializerMethodField()
-
-    def get_organization_name(self, obj):
-        return obj.organization.name if obj.organization else None
-
-    def get_type_label(self, obj):
-        return obj.type_config.get('verbose_name', None)
+    organization_name = serializers.CharField(
+        source='organization.name', read_only=True
+    )
+    type_label = serializers.CharField(source='get_type_display', read_only=True)
 
     class Meta:
         model = NotificationSetting
diff --git a/openwisp_notifications/base/views.py b/openwisp_notifications/base/views.py
index cfaaa104..34909dcd 100644
--- a/openwisp_notifications/base/views.py
+++ b/openwisp_notifications/base/views.py
@@ -1,13 +1,14 @@
 from django.contrib.auth import get_user_model
 from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
 from django.http import Http404
+from django.utils.translation import gettext as _
 from django.views.generic import TemplateView
 
 User = get_user_model()
 
 
-class NotificationSettingPage(LoginRequiredMixin, UserPassesTestMixin, TemplateView):
-    template_name = 'openwisp_notifications/settings.html'
+class NotificationPreferencePage(LoginRequiredMixin, UserPassesTestMixin, TemplateView):
+    template_name = 'openwisp_notifications/preferences.html'
     login_url = '/admin/login/'
 
     def get_context_data(self, **kwargs):
@@ -17,7 +18,7 @@ def get_context_data(self, **kwargs):
         if user_id:
             try:
                 user = User.objects.get(pk=user_id)
-                # Only admin should access other users settings
+                # Only admin should access other users preferences
                 if not self.request.user.is_staff:
                     raise Http404('You do not have permission to access this page.')
             except User.DoesNotExist:
@@ -26,6 +27,7 @@ def get_context_data(self, **kwargs):
             user = self.request.user
 
         context['user'] = user
+        context['title'] = _('Notification Preferences')
         return context
 
     def test_func(self):
@@ -37,4 +39,4 @@ def test_func(self):
         return True
 
 
-notifiation_setting_page = NotificationSettingPage.as_view()
+notifiation_preference_page = NotificationPreferencePage.as_view()
diff --git a/openwisp_notifications/static/openwisp-notifications/css/preferences.css b/openwisp_notifications/static/openwisp-notifications/css/preferences.css
new file mode 100644
index 00000000..6f219a1d
--- /dev/null
+++ b/openwisp_notifications/static/openwisp-notifications/css/preferences.css
@@ -0,0 +1,69 @@
+.global-settings {
+  margin: 10px 0 20px;
+}
+.module h2 {
+  padding: 10px;
+  cursor: pointer;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-weight: bold;
+}
+.org-content {
+  padding-top: 10px;
+  display: none;
+}
+.org-content.active {
+  display: block;
+}
+table {
+  width: 100%;
+}
+th:not(:last-child),
+td:not(:last-child) {
+  border-right: 1px solid #ddd;
+}
+th:not(:first-child),
+td:not(:first-child) {
+  text-align: center;
+}
+.no-settings,
+.no-organizations {
+  padding: 10px;
+  text-align: center;
+  color: #666;
+}
+.toast {
+  position: fixed;
+  bottom: 20px;
+  right: 20px;
+  background-color: #333;
+  color: white;
+  padding: 12px 20px;
+  border-radius: 5px;
+  transition: opacity 0.5s ease-in-out;
+  z-index: 9999;
+  cursor: pointer;
+}
+.toast .progress-bar {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  height: 4px;
+  background-color: #007bff;
+  width: 100%;
+  transition: width 3s linear;
+}
+span.toggle-icon {
+  width: 16px;
+  height: 16px;
+  background: url(/static/admin/img/sorting-icons.svg) 0 0 no-repeat;
+  background-size: 20px auto;
+  transition: background-position 0.3s ease;
+}
+span.toggle-icon.collapsed {
+  background-position: 0px -84px;
+}
+span.toggle-icon.expanded {
+  background-position: 0px -64px;
+}
diff --git a/openwisp_notifications/static/openwisp-notifications/css/settings.css b/openwisp_notifications/static/openwisp-notifications/css/settings.css
deleted file mode 100644
index c6ae1094..00000000
--- a/openwisp_notifications/static/openwisp-notifications/css/settings.css
+++ /dev/null
@@ -1,55 +0,0 @@
-.global-settings {
-    margin: 10px 0 20px;
-}
-.module h2 {
-  padding: 10px;
-  cursor: pointer;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  font-weight: bold;
-}
-.org-content {
-  padding-top: 10px;
-  display: none;
-}
-.org-content.active {
-  display: block;
-}
-table {
-  width: 100%;
-}
-th:not(:last-child),
-td:not(:last-child) {
-  border-right: 1px solid #ddd;
-}
-th:not(:first-child),
-td:not(:first-child) {
-  text-align: center;
-}
-.no-settings, .no-organizations {
-  padding: 10px;
-  text-align: center;
-  color: #666;
-}
-.toast {
-    position: fixed;
-    bottom: 20px;
-    right: 20px;
-    background-color: #333;
-    color: white;
-    padding: 12px 20px;
-    border-radius: 5px;
-    transition: opacity 0.5s ease-in-out;
-    z-index: 9999;
-    cursor: pointer;
-}
-.toast .progress-bar {
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    height: 4px;
-    background-color: #007bff;
-    width: 100%;
-    transition: width 3s linear;
-}
diff --git a/openwisp_notifications/static/openwisp-notifications/js/settings.js b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
similarity index 90%
rename from openwisp_notifications/static/openwisp-notifications/js/settings.js
rename to openwisp_notifications/static/openwisp-notifications/js/preferences.js
index e2dd55e8..c0c9d6c4 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/settings.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
@@ -48,7 +48,6 @@ if (typeof gettext === 'undefined') {
     function renderNotificationSettings(data, isGlobalWebChecked, isGlobalEmailChecked) {
         const orgPanelsContainer = $('#org-panels').empty();
 
-        // Check if there are no organizations
         if (Object.keys(data).length === 0) {
             orgPanelsContainer.append('<div class="no-organizations">' + gettext('No organizations available.') + '</div>');
             return;
@@ -60,7 +59,7 @@ if (typeof gettext === 'undefined') {
             });
             const orgPanel = $(
                 '<div class="module">' +
-                '<h2 class="toggle-header"><span>' + orgName + '</span><span class="toggle-icon">▼</span></h2>' +
+                '<h2 class="toggle-header"><span>' + orgName + '</span><span class="toggle-icon collapsed"></span></h2>' +
                 '<div class="org-content"></div>' +
                 '</div>'
             );
@@ -70,9 +69,9 @@ if (typeof gettext === 'undefined') {
                     '<table>' +
                     '<thead>' +
                     '<tr>' +
-                    '<th>' + gettext('Settings') + '</th>' +
-'<th style="text-align: center;"><label style="display: inline-flex; align-items: center;"><input type="checkbox" class="checkbox main-checkbox" data-column="web" data-organization-id="' + orgSettings[0].organization + '" ' + (isGlobalWebChecked ? 'checked' : '') + ' style="margin-right: 4px;" /> ' + gettext('Web') + '</label></th>' +
-'<th style="text-align: center;"><label style="display: inline-flex; align-items: center;"><input type="checkbox" class="checkbox main-checkbox" data-organization-id="' + orgSettings[0].organization + '" data-column="email" ' + (isGlobalEmailChecked ? 'checked' : '') + ' style="margin-right: 4px;" /> ' + gettext('Email') + '</label></th>' +
+                    '<th>' + gettext('Notification Type') + '</th>' +
+                    '<th style="text-align: center;"><label style="display: inline-flex; align-items: center;"><input type="checkbox" class="checkbox main-checkbox" data-column="web" data-organization-id="' + orgSettings[0].organization + '" ' + (isGlobalWebChecked ? 'checked' : '') + ' style="margin-right: 4px;" /> ' + gettext('Web') + '</label></th>' +
+                    '<th style="text-align: center;"><label style="display: inline-flex; align-items: center;"><input type="checkbox" class="checkbox main-checkbox" data-organization-id="' + orgSettings[0].organization + '" data-column="email" ' + (isGlobalEmailChecked ? 'checked' : '') + ' style="margin-right: 4px;" /> ' + gettext('Email') + '</label></th>' +
                     '</tr>' +
                     '</thead>' +
                     '<tbody></tbody>' +
@@ -95,10 +94,9 @@ if (typeof gettext === 'undefined') {
             }
             orgPanelsContainer.append(orgPanel);
 
-            // Automatically open the first organization panel
             if (index === 0) {
                 orgContent.addClass('active');
-                orgPanel.find('.toggle-icon').text('▲');
+                orgPanel.find('.toggle-icon').removeClass('collapsed').addClass('expanded');
             } else {
                 orgContent.hide();
             }
@@ -116,8 +114,15 @@ if (typeof gettext === 'undefined') {
     function initializeEventListeners(userId) {
         $(document).on('click', '.toggle-header', function () {
             const toggleIcon = $(this).find('.toggle-icon');
-            toggleIcon.text(toggleIcon.text() === '▼' ? '▲' : '▼');
-            $(this).next('.org-content').slideToggle();
+            const orgContent = $(this).next('.org-content');
+
+            if (orgContent.hasClass('active')) {
+                orgContent.removeClass('active').slideUp();
+                toggleIcon.removeClass('expanded').addClass('collapsed');
+            } else {
+                orgContent.addClass('active').slideDown();
+                toggleIcon.removeClass('collapsed').addClass('expanded');
+            }
         });
 
         $(document).on('change', '.email-checkbox, .web-checkbox', function () {
diff --git a/openwisp_notifications/tasks.py b/openwisp_notifications/tasks.py
index e57fced6..05de2bdb 100644
--- a/openwisp_notifications/tasks.py
+++ b/openwisp_notifications/tasks.py
@@ -87,12 +87,15 @@ def create_notification_settings(user, organizations, notification_types):
     )
 
     for type in notification_types:
+        notification_config = types.get_notification_configuration(type)
         for org in organizations:
             NotificationSetting.objects.update_or_create(
                 defaults={
                     'deleted': False,
-                    'email': global_setting.email,
-                    'web': global_setting.web,
+                    'email': global_setting.email
+                    and notification_config.get('email_notification'),
+                    'web': global_setting.web
+                    and notification_config.get('web_notification'),
                 },
                 user=user,
                 type=type,
diff --git a/openwisp_notifications/templates/admin/openwisp_users/user/change_form_object_tools.html b/openwisp_notifications/templates/admin/openwisp_users/user/change_form_object_tools.html
new file mode 100644
index 00000000..8b93a751
--- /dev/null
+++ b/openwisp_notifications/templates/admin/openwisp_users/user/change_form_object_tools.html
@@ -0,0 +1,8 @@
+{% extends "admin/change_form_object_tools.html" %}
+
+{% load i18n admin_urls %}
+
+{% block object-tools-items %}
+  <li><a class="button" href="{% url 'notifications:notification_preferences' %}">Notification Preferences</a></li>
+  {{ block.super }}
+{% endblock %}
diff --git a/openwisp_notifications/templates/openwisp_notifications/settings.html b/openwisp_notifications/templates/openwisp_notifications/preferences.html
similarity index 91%
rename from openwisp_notifications/templates/openwisp_notifications/settings.html
rename to openwisp_notifications/templates/openwisp_notifications/preferences.html
index 18caa9f0..36a83075 100644
--- a/openwisp_notifications/templates/openwisp_notifications/settings.html
+++ b/openwisp_notifications/templates/openwisp_notifications/preferences.html
@@ -9,7 +9,7 @@
 
 {% block extrastyle %}
   {{ block.super }}
-  <link rel="stylesheet" type="text/css" href="{% static 'openwisp-notifications/css/settings.css' %}" />
+  <link rel="stylesheet" type="text/css" href="{% static 'openwisp-notifications/css/preferences.css' %}" />
 {% endblock extrastyle %}
 
 {% block breadcrumbs %}
@@ -26,8 +26,6 @@
   </div>
 {% endblock breadcrumbs %}
 
-{% block pretitle %}Notification Preferences{% endblock %}
-
 {% block content %}
   <div class="settings-container" data-user-id="{{ user.id }}">
     <div class="global-settings">
@@ -48,6 +46,6 @@
 {% block footer %}
   {{ block.super }}
   {% if request.user.is_authenticated %}
-    <script type="text/javascript" src="{% static 'openwisp-notifications/js/settings.js' %}"></script>
+    <script type="text/javascript" src="{% static 'openwisp-notifications/js/preferences.js' %}"></script>
   {% endif %}
 {% endblock footer %}
diff --git a/openwisp_notifications/tests/test_admin.py b/openwisp_notifications/tests/test_admin.py
index 7dcd6843..0f7c8480 100644
--- a/openwisp_notifications/tests/test_admin.py
+++ b/openwisp_notifications/tests/test_admin.py
@@ -10,7 +10,6 @@
 from django.urls import reverse
 
 from openwisp_notifications import settings as app_settings
-from openwisp_notifications.admin import NotificationSettingInline
 from openwisp_notifications.signals import notify
 from openwisp_notifications.swapper import load_model, swapper_load_model
 from openwisp_notifications.widgets import _add_object_notification_widget
@@ -63,7 +62,6 @@ def setUp(self):
             url='localhost:8000/admin',
         )
         self.site = AdminSite()
-        self.ns_inline = NotificationSettingInline(NotificationSetting, self.site)
 
     @property
     def _url(self):
@@ -159,56 +157,6 @@ def test_websocket_protocol(self):
             response = self.client.get(self._url)
             self.assertContains(response, 'wss')
 
-    def test_notification_setting_inline_read_only_fields(self):
-        with self.subTest('Test for superuser'):
-            self.assertListEqual(self.ns_inline.get_readonly_fields(su_request), [])
-
-        with self.subTest('Test for non-superuser'):
-            self.assertListEqual(
-                self.ns_inline.get_readonly_fields(op_request),
-                ['type', 'organization'],
-            )
-
-    def test_notification_setting_inline_add_permission(self):
-        with self.subTest('Test for superuser'):
-            self.assertTrue(self.ns_inline.has_add_permission(su_request))
-
-        with self.subTest('Test for non-superuser'):
-            self.assertFalse(
-                self.ns_inline.has_add_permission(op_request),
-            )
-
-    def test_notification_setting_inline_delete_permission(self):
-        with self.subTest('Test for superuser'):
-            self.assertTrue(self.ns_inline.has_delete_permission(su_request))
-
-        with self.subTest('Test for non-superuser'):
-            self.assertFalse(self.ns_inline.has_delete_permission(op_request))
-
-    def test_notification_setting_inline_organization_formfield(self):
-        response = self.client.get(
-            reverse('admin:openwisp_users_user_change', args=(self.admin.pk,))
-        )
-        organization = self._get_org(org_name='default')
-        self.assertContains(
-            response,
-            f'<option value="{organization.id}">{organization.name}</option>',
-        )
-
-    def test_notification_setting_inline_admin_has_change_permission(self):
-        with self.subTest('Test for superuser'):
-            self.assertTrue(
-                self.ns_inline.has_change_permission(su_request),
-            )
-
-        with self.subTest('Test for non-superuser'):
-            self.assertFalse(
-                self.ns_inline.has_change_permission(op_request),
-            )
-            self.assertTrue(
-                self.ns_inline.has_change_permission(op_request, obj=op_request.user),
-            )
-
     def test_org_admin_view_same_org_user_notification_setting(self):
         org_owner = self._create_org_user(
             user=self._get_operator(),
@@ -229,7 +177,6 @@ def test_org_admin_view_same_org_user_notification_setting(self):
             reverse('admin:openwisp_users_user_change', args=(org_admin.user_id,)),
         )
         self.assertEqual(response.status_code, 200)
-        self.assertContains(response, 'User notification settings')
         self.assertNotContains(
             response, '<option value="default" selected>Default Type</option>'
         )
diff --git a/openwisp_notifications/tests/test_notifications.py b/openwisp_notifications/tests/test_notifications.py
index c0f102a4..017ae158 100644
--- a/openwisp_notifications/tests/test_notifications.py
+++ b/openwisp_notifications/tests/test_notifications.py
@@ -743,7 +743,7 @@ def test_notification_type_email_notification_setting_false(self):
 
         with self.subTest('Test user email preference not defined'):
             self._create_notification()
-            self.assertEqual(len(mail.outbox), 1)
+            self.assertEqual(len(mail.outbox), 0)
 
         with self.subTest('Test user email preference is "True"'):
             NotificationSetting.objects.filter(
@@ -797,9 +797,14 @@ def test_notification_type_web_notification_setting_false(self):
 
         with self.subTest('Test user web preference not defined'):
             self._create_notification()
-            self.assertEqual(notification_queryset.count(), 1)
+            self.assertEqual(notification_queryset.count(), 0)
 
         with self.subTest('Test user email preference is "True"'):
+            unregister_notification_type('test_type')
+            test_type.update({'web_notification': True})
+            register_notification_type('test_type', test_type)
+            self.notification_options.update({'type': 'test_type'})
+
             notification_setting = NotificationSetting.objects.get(
                 user=self.admin, type='test_type', organization=target_obj.organization
             )
@@ -813,7 +818,7 @@ def test_notification_type_web_notification_setting_false(self):
                 user=self.admin, type='test_type'
             ).update(web=True)
             self._create_notification()
-            self.assertEqual(notification_queryset.count(), 2)
+            self.assertEqual(notification_queryset.count(), 1)
 
     @mock_notification_types
     def test_notification_type_email_web_notification_defaults(self):
diff --git a/openwisp_notifications/tests/test_utils.py b/openwisp_notifications/tests/test_utils.py
index 29156165..a4cdc9a0 100644
--- a/openwisp_notifications/tests/test_utils.py
+++ b/openwisp_notifications/tests/test_utils.py
@@ -105,12 +105,3 @@ def run_check():
                 )
                 error = run_check()
                 self.assertIn(error_message, error.hint)
-
-        with self.subTest('Test setting dotted path is not subclass of ModelAdmin'):
-            path = 'openwisp_notifications.admin.NotificationSettingInline'
-            with patch.object(app_settings, 'IGNORE_ENABLED_ADMIN', [path]):
-                error_message = (
-                    f'"{path}" does not subclasses "django.contrib.admin.ModelAdmin"'
-                )
-                error = run_check()
-                self.assertIn(error_message, error.hint)
diff --git a/openwisp_notifications/urls.py b/openwisp_notifications/urls.py
index e5d2cfac..1680ed7d 100644
--- a/openwisp_notifications/urls.py
+++ b/openwisp_notifications/urls.py
@@ -1,7 +1,7 @@
 from django.urls import include, path
 
 from .api.urls import get_api_urls
-from .base.views import notifiation_setting_page
+from .base.views import notifiation_preference_page
 
 
 def get_urls(api_views=None, social_views=None):
@@ -13,14 +13,14 @@ def get_urls(api_views=None, social_views=None):
     urls = [
         path('api/v1/notifications/', include(get_api_urls(api_views))),
         path(
-            'notifications/settings/',
-            notifiation_setting_page,
-            name='notifications_settings',
+            'notifications/preferences/',
+            notifiation_preference_page,
+            name='notification_preferences',
         ),
         path(
-            'notifications/user/<uuid:pk>/settings/',
-            notifiation_setting_page,
-            name='user_notification_settings',
+            'notifications/user/<uuid:pk>/preferences/',
+            notifiation_preference_page,
+            name='user_notification_preferences',
         ),
     ]
     return urls
diff --git a/tests/openwisp2/sample_notifications/admin.py b/tests/openwisp2/sample_notifications/admin.py
index 375655d1..97d5e91b 100644
--- a/tests/openwisp2/sample_notifications/admin.py
+++ b/tests/openwisp2/sample_notifications/admin.py
@@ -1,7 +1,3 @@
-# isort:skip_file
-from openwisp_notifications.admin import NotificationSettingInline  # noqa
-
-
 # Used for testing of openwisp-notifications
 from django.contrib import admin
 

From c8cfdf00d4363ef3f915491f02f5afc417406974 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Sat, 17 Aug 2024 22:42:50 +0530
Subject: [PATCH 29/74] [chore] Add tooltips

---
 .../css/preferences.css                       | 31 +++++++++++++++++++
 .../openwisp-notifications/js/preferences.js  | 16 ++++++++--
 .../openwisp_notifications/preferences.html   |  2 ++
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/openwisp_notifications/static/openwisp-notifications/css/preferences.css b/openwisp_notifications/static/openwisp-notifications/css/preferences.css
index 6f219a1d..d076fafa 100644
--- a/openwisp_notifications/static/openwisp-notifications/css/preferences.css
+++ b/openwisp_notifications/static/openwisp-notifications/css/preferences.css
@@ -67,3 +67,34 @@ span.toggle-icon.collapsed {
 span.toggle-icon.expanded {
   background-position: 0px -64px;
 }
+.tooltip-icon {
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  border-radius: 50%;
+  color: var(--body-quiet-color);
+  text-align: center;
+  line-height: 14px;
+  font-size: 12px;
+  font-weight: bold;
+  position: relative;
+  border: 1px solid var(--body-quiet-color);
+  text-transform: none;
+}
+.tooltip-icon::after {
+  content: attr(data-tooltip);
+  position: absolute;
+  bottom: 125%;
+  left: 50%;
+  transform: translateX(-50%);
+  background-color: #333;
+  color: #fff;
+  padding: 3px 6px;
+  border-radius: 2px;
+  font-size: 10px;
+  white-space: nowrap;
+  visibility: hidden;
+}
+.tooltip-icon:hover::after {
+  visibility: visible;
+}
diff --git a/openwisp_notifications/static/openwisp-notifications/js/preferences.js b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
index c0c9d6c4..dffee5a0 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/preferences.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
@@ -70,8 +70,20 @@ if (typeof gettext === 'undefined') {
                     '<thead>' +
                     '<tr>' +
                     '<th>' + gettext('Notification Type') + '</th>' +
-                    '<th style="text-align: center;"><label style="display: inline-flex; align-items: center;"><input type="checkbox" class="checkbox main-checkbox" data-column="web" data-organization-id="' + orgSettings[0].organization + '" ' + (isGlobalWebChecked ? 'checked' : '') + ' style="margin-right: 4px;" /> ' + gettext('Web') + '</label></th>' +
-                    '<th style="text-align: center;"><label style="display: inline-flex; align-items: center;"><input type="checkbox" class="checkbox main-checkbox" data-organization-id="' + orgSettings[0].organization + '" data-column="email" ' + (isGlobalEmailChecked ? 'checked' : '') + ' style="margin-right: 4px;" /> ' + gettext('Email') + '</label></th>' +
+                    '<th style="text-align: center;">' +
+                    '<label style="display: inline-flex; align-items: center;">' +
+                    '<input type="checkbox" class="checkbox main-checkbox" data-column="web" data-organization-id="' + orgSettings[0].organization + '" ' + (isGlobalWebChecked ? 'checked' : '') + ' style="margin-right: 4px;" />' +
+                    gettext('Web') +
+                    '<span class="tooltip-icon" data-tooltip="' + gettext('Enable or disable web notifications for this organization') + '" style="margin-left: 2px;">?</span>' +
+                    '</label>' +
+                    '</th>' +
+                    '<th style="text-align: center;">' +
+                    '<label style="display: inline-flex; align-items: center;">' +
+                    '<input type="checkbox" class="checkbox main-checkbox" data-organization-id="' + orgSettings[0].organization + '" data-column="email" ' + (isGlobalEmailChecked ? 'checked' : '') + ' style="margin-right: 4px;" />' +
+                    gettext('Email') +
+                    '<span class="tooltip-icon" data-tooltip="' + gettext('Enable or disable email notifications for this organization') + '" style="margin-left: 2px;">?</span>' +
+                    '</label>' +
+                    '</th>' +
                     '</tr>' +
                     '</thead>' +
                     '<tbody></tbody>' +
diff --git a/openwisp_notifications/templates/openwisp_notifications/preferences.html b/openwisp_notifications/templates/openwisp_notifications/preferences.html
index 36a83075..5b43e2b8 100644
--- a/openwisp_notifications/templates/openwisp_notifications/preferences.html
+++ b/openwisp_notifications/templates/openwisp_notifications/preferences.html
@@ -33,10 +33,12 @@
       <label>
         <input type="checkbox" id="global-web" />
         Web
+        <span class="tooltip-icon" data-tooltip="{% trans 'Enable or disable web notifications globally' %}">?</span>
       </label>
       <label>
         <input type="checkbox" id="global-email" />
         Email
+        <span class="tooltip-icon" data-tooltip="{% trans 'Enable or disable email notifications globally' %}">?</span>
       </label>
     </div>
     <div id="org-panels"></div>

From f38dce353002f749ca1e65b1f466789716e59dce Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Sat, 17 Aug 2024 22:48:35 +0530
Subject: [PATCH 30/74] [chore] Remove unused

---
 openwisp_notifications/base/admin.py          |  1 -
 .../js/notification-settings.js               | 23 -------------------
 2 files changed, 24 deletions(-)
 delete mode 100644 openwisp_notifications/static/openwisp-notifications/js/notification-settings.js

diff --git a/openwisp_notifications/base/admin.py b/openwisp_notifications/base/admin.py
index fda23a24..3ac537ce 100644
--- a/openwisp_notifications/base/admin.py
+++ b/openwisp_notifications/base/admin.py
@@ -34,5 +34,4 @@ class Media:
         extends = True
         js = [
             'admin/js/jquery.init.js',
-            'openwisp-notifications/js/notification-settings.js',
         ]
diff --git a/openwisp_notifications/static/openwisp-notifications/js/notification-settings.js b/openwisp_notifications/static/openwisp-notifications/js/notification-settings.js
deleted file mode 100644
index 6c4390b4..00000000
--- a/openwisp_notifications/static/openwisp-notifications/js/notification-settings.js
+++ /dev/null
@@ -1,23 +0,0 @@
-'use strict';
-(function ($) {
-    $(document).ready(function () {
-        let emailCheckboxSelector = '.dynamic-notificationsetting_set .field-email > input[type="checkbox"]',
-            webCheckboxSelector = '.dynamic-notificationsetting_set .field-web > input[type="checkbox"]';
-        // If email notification is checked, web should also be checked.
-        $(document).on('change', emailCheckboxSelector, function(){
-            let emailCheckBoxId = $(this).attr('id'),
-            webCheckboxId = emailCheckBoxId.replace('-email', '-web');
-            if($(this).prop('checked') == true){
-                $(`#${webCheckboxId}`).prop('checked', $(this).prop('checked'));
-            }
-        });
-        // If web notification is unchecked, email should also be unchecked.
-        $(document).on('change', webCheckboxSelector, function(){
-            let webCheckboxId = $(this).attr('id'),
-            emailCheckBoxId = webCheckboxId.replace('-web', '-email');
-            if($(this).prop('checked') == false){
-                $(`#${emailCheckBoxId}`).prop('checked', $(this).prop('checked'));
-            }
-        });
-    });
-})(django.jQuery);

From cd40a29761b96bf942f5e2061c2fcaca379b48c1 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Mon, 19 Aug 2024 11:02:53 +0530
Subject: [PATCH 31/74] [chore] Add link in notification widget

---
 .../static/openwisp-notifications/css/notifications.css       | 2 +-
 openwisp_notifications/templates/admin/base_site.html         | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/openwisp_notifications/static/openwisp-notifications/css/notifications.css b/openwisp_notifications/static/openwisp-notifications/css/notifications.css
index 99d1c926..efec5f82 100644
--- a/openwisp_notifications/static/openwisp-notifications/css/notifications.css
+++ b/openwisp_notifications/static/openwisp-notifications/css/notifications.css
@@ -144,7 +144,7 @@
   top: 49px;
 }
 .ow-notification-dropdown .toggle-btn {
-  color: #777;
+  color: #777 !important;
 }
 .ow-notification-dropdown .toggle-btn:active {
   position: relative;
diff --git a/openwisp_notifications/templates/admin/base_site.html b/openwisp_notifications/templates/admin/base_site.html
index 4861d9f1..eb2b50ba 100644
--- a/openwisp_notifications/templates/admin/base_site.html
+++ b/openwisp_notifications/templates/admin/base_site.html
@@ -26,7 +26,9 @@
   <div class="ow-notification-dropdown ow-hide">
     <div class="filters">
       <span class="toggle-btn" id="ow-mark-all-read" tabindex="0" role="button">{% trans 'Mark all as read' %}</span>
-      <span class="toggle-btn" id="ow-show-unread" tabindex="0" role="button">{% trans 'Show unread only' %}</span>
+      <a href="{% url 'notifications:notification_preferences' %}">
+        <span class="toggle-btn" id="ow-mark-all-read" tabindex="0" role="button">{% trans 'Settings' %}</span>
+      </a>
     </div>
     <div class="ow-notification-wrapper ow-round-bottom-border">
       <div id="ow-notifications-loader" class="ow-hide"><div class="loader"></div></div>

From b99f801029cd3893e6e26f35e71d9e42f30a9ad0 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Tue, 20 Aug 2024 12:05:58 +0530
Subject: [PATCH 32/74] [chore] Fix settings button in widget

---
 .../static/openwisp-notifications/css/notifications.css       | 1 +
 openwisp_notifications/templates/admin/base_site.html         | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/openwisp_notifications/static/openwisp-notifications/css/notifications.css b/openwisp_notifications/static/openwisp-notifications/css/notifications.css
index efec5f82..14a65197 100644
--- a/openwisp_notifications/static/openwisp-notifications/css/notifications.css
+++ b/openwisp_notifications/static/openwisp-notifications/css/notifications.css
@@ -145,6 +145,7 @@
 }
 .ow-notification-dropdown .toggle-btn {
   color: #777 !important;
+  text-decoration: none !important;
 }
 .ow-notification-dropdown .toggle-btn:active {
   position: relative;
diff --git a/openwisp_notifications/templates/admin/base_site.html b/openwisp_notifications/templates/admin/base_site.html
index eb2b50ba..1734fa21 100644
--- a/openwisp_notifications/templates/admin/base_site.html
+++ b/openwisp_notifications/templates/admin/base_site.html
@@ -26,9 +26,7 @@
   <div class="ow-notification-dropdown ow-hide">
     <div class="filters">
       <span class="toggle-btn" id="ow-mark-all-read" tabindex="0" role="button">{% trans 'Mark all as read' %}</span>
-      <a href="{% url 'notifications:notification_preferences' %}">
-        <span class="toggle-btn" id="ow-mark-all-read" tabindex="0" role="button">{% trans 'Settings' %}</span>
-      </a>
+      <a class="toggle-btn" href="{% url 'notifications:notification_preferences' %}">{% trans 'Settings' %}</a>
     </div>
     <div class="ow-notification-wrapper ow-round-bottom-border">
       <div id="ow-notifications-loader" class="ow-hide"><div class="loader"></div></div>

From 3ecbd921cbb1fb0cac7c1b7bd1e751964473f8de Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Tue, 20 Aug 2024 12:08:22 +0530
Subject: [PATCH 33/74] [chore] Drop ow-show-unread button functionality

---
 .../openwisp-notifications/js/notifications.js    | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/openwisp_notifications/static/openwisp-notifications/js/notifications.js b/openwisp_notifications/static/openwisp-notifications/js/notifications.js
index 65bd7401..c2a91f10 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/notifications.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/notifications.js
@@ -170,9 +170,6 @@ function notificationWidget($) {
                     // If response does not have any notification, show no-notifications message.
                     $('.ow-no-notifications').removeClass('ow-hide');
                     $('#ow-mark-all-read').addClass('disabled');
-                    if ($('#ow-show-unread').html() !== 'Show all') {
-                        $('#ow-show-unread').addClass('disabled');
-                    }
                     busy = false;
                 } else {
                     if (res.results.length === 0 && nextPageUrl !== null){
@@ -301,17 +298,6 @@ function notificationWidget($) {
 
     $('.ow-notifications').on('click', initNotificationWidget);
 
-    // Handler for filtering unread notifications
-    $('#ow-show-unread').click(function () {
-        if ($(this).html().includes('Show unread only')) {
-            refreshNotificationWidget(null, '/api/v1/notifications/notification/?unread=true');
-            $(this).html('Show all');
-        } else {
-            refreshNotificationWidget(null, '/api/v1/notifications/notification/');
-            $(this).html('Show unread only');
-        }
-    });
-
     // Handler for marking all notifications read
     $('#ow-mark-all-read').click(function () {
         var unreads = $('.ow-notification-elem.unread');
@@ -328,7 +314,6 @@ function notificationWidget($) {
             },
             crossDomain: true,
             success: function () {
-                $('#ow-show-unread').html('Show unread only');
                 $('#ow-notification-count').remove();
             },
             error: function (error) {

From 33ec904cda82af38e45c26a5c04254bce798b1fc Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Tue, 20 Aug 2024 14:03:56 +0530
Subject: [PATCH 34/74] [chore] Handle UI on API errors

---
 .../openwisp-notifications/js/preferences.js  | 127 ++++++++++++------
 1 file changed, 83 insertions(+), 44 deletions(-)

diff --git a/openwisp_notifications/static/openwisp-notifications/js/preferences.js b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
index dffee5a0..fed98551 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/preferences.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
@@ -157,11 +157,39 @@ if (typeof gettext === 'undefined') {
                 isEmailChecked = false;
             }
 
-            $(`.web-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).prop('checked', isWebChecked);
-            $(`.email-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).prop('checked', isEmailChecked);
+            isUpdateInProgress = true;
+
+            const data = {
+                web: isWebChecked,
+                email: isEmailChecked
+            };
+
+            $.ajax({
+                type: 'PATCH',
+                url: `/api/v1/notifications/user/${userId}/user-setting/${settingId}/`,
+                headers: { 'X-CSRFToken': $('input[name="csrfmiddlewaretoken"]').val() },
+                contentType: 'application/json',
+                data: JSON.stringify(data),
+                success: function () {
+                    $(`.web-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).prop('checked', isWebChecked);
+                    $(`.email-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).prop('checked', isEmailChecked);
 
-            updateIndividualSetting(settingId, isWebChecked, isEmailChecked);
-            updateOrgLevelCheckboxes(organizationId);
+                    updateOrgLevelCheckboxes(organizationId);
+
+                    showToast('success', gettext('Settings updated successfully.'));
+                },
+                error: function () {
+                    showToast('error', gettext('Something went wrong. Please try again.'));
+                    if (triggeredBy === 'web') {
+                        $(`.web-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).prop('checked', !isWebChecked);
+                    } else if (triggeredBy === 'email') {
+                        $(`.email-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).prop('checked', !isEmailChecked);
+                    }
+                },
+                complete: function () {
+                    isUpdateInProgress = false;
+                }
+            });
         });
 
         $(document).on('change', '.main-checkbox', function () {
@@ -176,25 +204,50 @@ if (typeof gettext === 'undefined') {
 
             if (triggeredBy === 'email' && isOrgEmailChecked) {
                 isOrgWebChecked = true;
-            } 
+            }
 
             if (triggeredBy === 'web' && !isOrgWebChecked) {
-                isOrgEmailChecked = false;  
+                isOrgEmailChecked = false;
             }
 
-            $(`.main-checkbox[data-organization-id="${orgId}"][data-column="web"]`).prop('checked', isOrgWebChecked);
-            $(`.main-checkbox[data-organization-id="${orgId}"][data-column="email"]`).prop('checked', isOrgEmailChecked);
-
             isUpdateInProgress = true;
 
+            const data = {
+                web: isOrgWebChecked,
+                email: isOrgEmailChecked
+            };
+
             const table = $(this).closest('table');
-            table.find('.web-checkbox').prop('checked', isOrgWebChecked).change();
-            table.find('.email-checkbox').prop('checked', isOrgEmailChecked).change();
 
-            updateMainCheckboxes(table);
+            $.ajax({
+                type: 'POST',
+                url: `/api/v1/notifications/user/${userId}/organization/${orgId}/setting/`,
+                headers: { 'X-CSRFToken': $('input[name="csrfmiddlewaretoken"]').val() },
+                contentType: 'application/json',
+                data: JSON.stringify(data),
+                success: function () {
+                    $(`.main-checkbox[data-organization-id="${orgId}"][data-column="web"]`).prop('checked', isOrgWebChecked);
+                    $(`.main-checkbox[data-organization-id="${orgId}"][data-column="email"]`).prop('checked', isOrgEmailChecked);
+
+                    table.find('.web-checkbox').prop('checked', isOrgWebChecked).change();
+                    table.find('.email-checkbox').prop('checked', isOrgEmailChecked).change();
+
+                    updateMainCheckboxes(table);
 
-            updateOrganizationSetting(userId, $(this));
-            isUpdateInProgress = false;
+                    showToast('success', gettext('Organization settings updated successfully.'));
+                },
+                error: function () {
+                    showToast('error', gettext('Something went wrong. Please try again.'));
+                    if (triggeredBy === 'web') {
+                        $(`.main-checkbox[data-organization-id="${orgId}"][data-column="web"]`).prop('checked', !isOrgWebChecked);
+                    } else if (triggeredBy === 'email') {
+                        $(`.main-checkbox[data-organization-id="${orgId}"][data-column="email"]`).prop('checked', !isOrgEmailChecked);
+                    }
+                },
+                complete: function () {
+                    isUpdateInProgress = false;
+                }
+            });
         });
     }
 
@@ -215,27 +268,8 @@ if (typeof gettext === 'undefined') {
             },
             error: function () {
                 showToast('error', gettext('Something went wrong. Please try again.'));
-            }
-        });
-    }
-
-    function updateOrganizationSetting(userId, checkbox) {
-        const organizationId = checkbox.data('organization-id');
-        const data = {
-            web: checkbox.closest('tr').find('.main-checkbox[data-column="web"]').is(':checked'),
-            email: checkbox.closest('tr').find('.main-checkbox[data-column="email"]').is(':checked')
-        };
-        $.ajax({
-            type: 'POST',
-            url: '/api/v1/notifications/user/' + userId + '/organization/' + organizationId + '/setting/',
-            headers: { 'X-CSRFToken': $('input[name="csrfmiddlewaretoken"]').val() },
-            contentType: 'application/json',
-            data: JSON.stringify(data),
-            success: function () {
-                showToast('success', gettext('Organization settings updated successfully.'));
-            },
-            error: function () {
-                showToast('error', gettext('Something went wrong. Please try again.'));
+                $(`.web-checkbox[data-pk="${settingId}"]`).prop('checked', !isWebChecked);
+                $(`.email-checkbox[data-pk="${settingId}"]`).prop('checked', !isEmailChecked);
             }
         });
     }
@@ -252,21 +286,16 @@ if (typeof gettext === 'undefined') {
     function initializeGlobalSettingsEventListener(userId) {
         $('#global-email, #global-web').change(function (event) {
             const triggeredBy = $(event.target).attr('id');
-            
+
             let isGlobalWebChecked = $('#global-web').is(':checked');
             let isGlobalEmailChecked = $('#global-email').is(':checked');
 
             if (triggeredBy === 'global-email' && isGlobalEmailChecked) {
                 isGlobalWebChecked = true;
-            } 
-
-            if (triggeredBy === 'global-web' && !isGlobalWebChecked) {
-                isGlobalEmailChecked = false;  
+            } else if (triggeredBy === 'global-web' && !isGlobalWebChecked) {
+                isGlobalEmailChecked = false;
             }
 
-            $('#global-web').prop('checked', isGlobalWebChecked);
-            $('#global-email').prop('checked', isGlobalEmailChecked);
-
             const data = {
                 web: isGlobalWebChecked,
                 email: isGlobalEmailChecked
@@ -281,13 +310,23 @@ if (typeof gettext === 'undefined') {
                 contentType: 'application/json',
                 data: JSON.stringify(data),
                 success: function () {
-                    showToast('success', gettext('Global settings updated successfully.'));
+                    $('#global-web').prop('checked', isGlobalWebChecked);
+                    $('#global-email').prop('checked', isGlobalEmailChecked);
+
                     $('.main-checkbox[data-column="web"]').prop('checked', isGlobalWebChecked).change();
                     $('.main-checkbox[data-column="email"]').prop('checked', isGlobalEmailChecked).change();
                     $('.web-checkbox').prop('checked', isGlobalWebChecked);
                     $('.email-checkbox').prop('checked', isGlobalEmailChecked);
+
+                    showToast('success', gettext('Global settings updated successfully.'));
                 },
                 error: function () {
+                    if (triggeredBy === 'global-web') {
+                        $('#global-web').prop('checked', !isGlobalWebChecked);
+                    } else if (triggeredBy === 'global-email') {
+                        $('#global-email').prop('checked', !isGlobalEmailChecked);
+                    }
+
                     showToast('error', gettext('Something went wrong. Please try again.'));
                 },
                 complete: function () {

From a0f08df43ad586227299bbc768da588bb7e430ed Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Tue, 20 Aug 2024 14:07:07 +0530
Subject: [PATCH 35/74] [chore] Remove unused

---
 .../openwisp-notifications/js/preferences.js  | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/openwisp_notifications/static/openwisp-notifications/js/preferences.js b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
index fed98551..640b6236 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/preferences.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
@@ -251,29 +251,6 @@ if (typeof gettext === 'undefined') {
         });
     }
 
-    function updateIndividualSetting(settingId, isWebChecked, isEmailChecked) {
-        const userId = $('.settings-container').data('user-id');
-        const data = {
-            web: isWebChecked,
-            email: isEmailChecked
-        };
-        $.ajax({
-            type: 'PATCH',
-            url: '/api/v1/notifications/user/' + userId + '/user-setting/' + settingId + '/',
-            headers: { 'X-CSRFToken': $('input[name="csrfmiddlewaretoken"]').val() },
-            contentType: 'application/json',
-            data: JSON.stringify(data),
-            success: function () {
-                showToast('success', gettext('Settings updated successfully.'));
-            },
-            error: function () {
-                showToast('error', gettext('Something went wrong. Please try again.'));
-                $(`.web-checkbox[data-pk="${settingId}"]`).prop('checked', !isWebChecked);
-                $(`.email-checkbox[data-pk="${settingId}"]`).prop('checked', !isEmailChecked);
-            }
-        });
-    }
-
     function updateOrgLevelCheckboxes(organizationId) {
         const webCheckboxes = $('.web-checkbox[data-organization-id="' + organizationId + '"]');
         const emailCheckboxes = $('.email-checkbox[data-organization-id="' + organizationId + '"]');

From 5a60f7d4b92a3279c9160459072e455368df2e54 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Wed, 21 Aug 2024 15:57:19 +0530
Subject: [PATCH 36/74] [chore] Immediately apply setting changes and rollback
 on API error

---
 .../openwisp-notifications/js/preferences.js  | 136 ++++++++++++------
 1 file changed, 96 insertions(+), 40 deletions(-)

diff --git a/openwisp_notifications/static/openwisp-notifications/js/preferences.js b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
index 640b6236..71a461e8 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/preferences.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
@@ -149,6 +149,16 @@ if (typeof gettext === 'undefined') {
             let isWebChecked = $(`.web-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).is(':checked');
             let isEmailChecked = $(`.email-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).is(':checked');
 
+            let previousWebChecked, previousEmailChecked;
+
+            if (triggeredBy === 'email') {
+                previousEmailChecked = !isEmailChecked;
+                previousWebChecked = isWebChecked;
+            } else {
+                previousWebChecked = !isWebChecked;
+                previousEmailChecked = isEmailChecked;
+            }
+
             if (triggeredBy === 'email' && isEmailChecked) {
                 isWebChecked = true;
             }
@@ -164,6 +174,10 @@ if (typeof gettext === 'undefined') {
                 email: isEmailChecked
             };
 
+            $(`.web-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).prop('checked', isWebChecked);
+            $(`.email-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).prop('checked', isEmailChecked);
+            updateOrgLevelCheckboxes(organizationId);
+
             $.ajax({
                 type: 'PATCH',
                 url: `/api/v1/notifications/user/${userId}/user-setting/${settingId}/`,
@@ -171,20 +185,13 @@ if (typeof gettext === 'undefined') {
                 contentType: 'application/json',
                 data: JSON.stringify(data),
                 success: function () {
-                    $(`.web-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).prop('checked', isWebChecked);
-                    $(`.email-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).prop('checked', isEmailChecked);
-
-                    updateOrgLevelCheckboxes(organizationId);
-
                     showToast('success', gettext('Settings updated successfully.'));
                 },
                 error: function () {
                     showToast('error', gettext('Something went wrong. Please try again.'));
-                    if (triggeredBy === 'web') {
-                        $(`.web-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).prop('checked', !isWebChecked);
-                    } else if (triggeredBy === 'email') {
-                        $(`.email-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).prop('checked', !isEmailChecked);
-                    }
+                    $(`.web-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).prop('checked', previousWebChecked);
+                    $(`.email-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).prop('checked', previousEmailChecked);
+                    updateOrgLevelCheckboxes(organizationId);
                 },
                 complete: function () {
                     isUpdateInProgress = false;
@@ -202,6 +209,16 @@ if (typeof gettext === 'undefined') {
             let isOrgWebChecked = $(`.main-checkbox[data-organization-id="${orgId}"][data-column="web"]`).is(':checked');
             let isOrgEmailChecked = $(`.main-checkbox[data-organization-id="${orgId}"][data-column="email"]`).is(':checked');
 
+            let previousOrgWebChecked, previousOrgEmailChecked;
+
+            if (triggeredBy === 'email') {
+                previousOrgEmailChecked = !isOrgEmailChecked;
+                previousOrgWebChecked = isOrgWebChecked;
+            } else {
+                previousOrgWebChecked = !isOrgWebChecked;
+                previousOrgEmailChecked = isOrgEmailChecked;
+            }
+
             if (triggeredBy === 'email' && isOrgEmailChecked) {
                 isOrgWebChecked = true;
             }
@@ -217,7 +234,14 @@ if (typeof gettext === 'undefined') {
                 email: isOrgEmailChecked
             };
 
+            $(`.main-checkbox[data-organization-id="${orgId}"][data-column="web"]`).prop('checked', isOrgWebChecked);
+            $(`.main-checkbox[data-organization-id="${orgId}"][data-column="email"]`).prop('checked', isOrgEmailChecked);
+
             const table = $(this).closest('table');
+            table.find('.web-checkbox').prop('checked', isOrgWebChecked).change();
+            table.find('.email-checkbox').prop('checked', isOrgEmailChecked).change();
+
+            updateMainCheckboxes(table);
 
             $.ajax({
                 type: 'POST',
@@ -226,23 +250,15 @@ if (typeof gettext === 'undefined') {
                 contentType: 'application/json',
                 data: JSON.stringify(data),
                 success: function () {
-                    $(`.main-checkbox[data-organization-id="${orgId}"][data-column="web"]`).prop('checked', isOrgWebChecked);
-                    $(`.main-checkbox[data-organization-id="${orgId}"][data-column="email"]`).prop('checked', isOrgEmailChecked);
-
-                    table.find('.web-checkbox').prop('checked', isOrgWebChecked).change();
-                    table.find('.email-checkbox').prop('checked', isOrgEmailChecked).change();
-
-                    updateMainCheckboxes(table);
-
                     showToast('success', gettext('Organization settings updated successfully.'));
                 },
                 error: function () {
                     showToast('error', gettext('Something went wrong. Please try again.'));
-                    if (triggeredBy === 'web') {
-                        $(`.main-checkbox[data-organization-id="${orgId}"][data-column="web"]`).prop('checked', !isOrgWebChecked);
-                    } else if (triggeredBy === 'email') {
-                        $(`.main-checkbox[data-organization-id="${orgId}"][data-column="email"]`).prop('checked', !isOrgEmailChecked);
-                    }
+                    $(`.main-checkbox[data-organization-id="${orgId}"][data-column="web"]`).prop('checked', previousOrgWebChecked);
+                    $(`.main-checkbox[data-organization-id="${orgId}"][data-column="email"]`).prop('checked', previousOrgEmailChecked);
+                    table.find('.web-checkbox').prop('checked', previousOrgWebChecked);
+                    table.find('.email-checkbox').prop('checked', previousOrgEmailChecked);
+                    updateMainCheckboxes(table);
                 },
                 complete: function () {
                     isUpdateInProgress = false;
@@ -262,49 +278,89 @@ if (typeof gettext === 'undefined') {
 
     function initializeGlobalSettingsEventListener(userId) {
         $('#global-email, #global-web').change(function (event) {
+            if (isUpdateInProgress) {
+                return;
+            }
+
             const triggeredBy = $(event.target).attr('id');
 
             let isGlobalWebChecked = $('#global-web').is(':checked');
             let isGlobalEmailChecked = $('#global-email').is(':checked');
 
+            let previousGlobalWebChecked, previousGlobalEmailChecked;
+            if (triggeredBy === 'global-email') {
+                previousGlobalEmailChecked = !isGlobalEmailChecked;
+                previousGlobalWebChecked = isGlobalWebChecked;
+            } else {
+                previousGlobalWebChecked = !isGlobalWebChecked;
+                previousGlobalEmailChecked = isGlobalEmailChecked;
+            }
+
+            const previousCheckboxStates = {
+                mainWebChecked: $('.main-checkbox[data-column="web"]').map(function() {
+                    return { orgId: $(this).data('organization-id'), checked: $(this).is(':checked') };
+                }).get(),
+                mainEmailChecked: $('.main-checkbox[data-column="email"]').map(function() {
+                    return { orgId: $(this).data('organization-id'), checked: $(this).is(':checked') };
+                }).get(),
+                webChecked: $('.web-checkbox').map(function() {
+                    return { id: $(this).data('pk'), orgId: $(this).data('organization-id'), checked: $(this).is(':checked') };
+                }).get(),
+                emailChecked: $('.email-checkbox').map(function() {
+                    return { id: $(this).data('pk'), orgId: $(this).data('organization-id'), checked: $(this).is(':checked') };
+                }).get()
+            };
+
             if (triggeredBy === 'global-email' && isGlobalEmailChecked) {
                 isGlobalWebChecked = true;
-            } else if (triggeredBy === 'global-web' && !isGlobalWebChecked) {
+            }
+
+            if (triggeredBy === 'global-web' && !isGlobalWebChecked) {
                 isGlobalEmailChecked = false;
             }
 
+            isUpdateInProgress = true;
+
             const data = {
                 web: isGlobalWebChecked,
                 email: isGlobalEmailChecked
             };
 
-            isUpdateInProgress = true;
+            $('#global-web').prop('checked', isGlobalWebChecked);
+            $('#global-email').prop('checked', isGlobalEmailChecked);
+
+            $('.main-checkbox[data-column="web"]').prop('checked', isGlobalWebChecked).change();
+            $('.main-checkbox[data-column="email"]').prop('checked', isGlobalEmailChecked).change();
+            $('.web-checkbox').prop('checked', isGlobalWebChecked);
+            $('.email-checkbox').prop('checked', isGlobalEmailChecked);
 
             $.ajax({
                 type: 'POST',
-                url: '/api/v1/notifications/user/' + userId + '/preference/',
+                url: `/api/v1/notifications/user/${userId}/preference/`,
                 headers: { 'X-CSRFToken': $('input[name="csrfmiddlewaretoken"]').val() },
                 contentType: 'application/json',
                 data: JSON.stringify(data),
                 success: function () {
-                    $('#global-web').prop('checked', isGlobalWebChecked);
-                    $('#global-email').prop('checked', isGlobalEmailChecked);
-
-                    $('.main-checkbox[data-column="web"]').prop('checked', isGlobalWebChecked).change();
-                    $('.main-checkbox[data-column="email"]').prop('checked', isGlobalEmailChecked).change();
-                    $('.web-checkbox').prop('checked', isGlobalWebChecked);
-                    $('.email-checkbox').prop('checked', isGlobalEmailChecked);
-
                     showToast('success', gettext('Global settings updated successfully.'));
                 },
                 error: function () {
-                    if (triggeredBy === 'global-web') {
-                        $('#global-web').prop('checked', !isGlobalWebChecked);
-                    } else if (triggeredBy === 'global-email') {
-                        $('#global-email').prop('checked', !isGlobalEmailChecked);
-                    }
-
                     showToast('error', gettext('Something went wrong. Please try again.'));
+
+                    $('#global-web').prop('checked', previousGlobalWebChecked);
+                    $('#global-email').prop('checked', previousGlobalEmailChecked);
+
+                    previousCheckboxStates.mainWebChecked.forEach(function(item) {
+                        $(`.main-checkbox[data-organization-id="${item.orgId}"][data-column="web"]`).prop('checked', item.checked);
+                    });
+                    previousCheckboxStates.mainEmailChecked.forEach(function(item) {
+                        $(`.main-checkbox[data-organization-id="${item.orgId}"][data-column="email"]`).prop('checked', item.checked);
+                    });
+                    previousCheckboxStates.webChecked.forEach(function(item) {
+                        $(`.web-checkbox[data-organization-id="${item.orgId}"][data-pk="${item.id}"]`).prop('checked', item.checked);
+                    });
+                    previousCheckboxStates.emailChecked.forEach(function(item) {
+                        $(`.email-checkbox[data-organization-id="${item.orgId}"][data-pk="${item.id}"]`).prop('checked', item.checked);
+                    });
                 },
                 complete: function () {
                     isUpdateInProgress = false;

From 852790b98ea77ea54d0085521642643a5b47ea7e Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Wed, 21 Aug 2024 18:11:05 +0530
Subject: [PATCH 37/74] [chore] Use switch

---
 .../css/preferences.css                       | 57 +++++++++++++++++++
 .../openwisp-notifications/js/preferences.js  | 36 ++++++++----
 .../openwisp_notifications/preferences.html   | 22 ++++---
 3 files changed, 97 insertions(+), 18 deletions(-)

diff --git a/openwisp_notifications/static/openwisp-notifications/css/preferences.css b/openwisp_notifications/static/openwisp-notifications/css/preferences.css
index d076fafa..29f3376d 100644
--- a/openwisp_notifications/static/openwisp-notifications/css/preferences.css
+++ b/openwisp_notifications/static/openwisp-notifications/css/preferences.css
@@ -1,6 +1,12 @@
 .global-settings {
   margin: 10px 0 20px;
 }
+.global-settings-container {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 4px;
+}
 .module h2 {
   padding: 10px;
   cursor: pointer;
@@ -98,3 +104,54 @@ span.toggle-icon.expanded {
 .tooltip-icon:hover::after {
   visibility: visible;
 }
+.switch {
+  position: relative;
+  display: inline-block;
+  width: 40px;
+  height: 20px;
+}
+.switch input {
+  opacity: 0;
+  width: 0;
+  height: 0;
+}
+.slider {
+  position: absolute;
+  cursor: pointer;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: #ccc;
+  -webkit-transition: 0.4s;
+  transition: 0.4s;
+}
+.slider:before {
+  position: absolute;
+  content: "";
+  height: 14px;
+  width: 14px;
+  left: 3px;
+  bottom: 3px;
+  background-color: white;
+  -webkit-transition: 0.4s;
+  transition: 0.4s;
+}
+input:checked + .slider {
+  background-color: #2196f3;
+}
+input:focus + .slider {
+  box-shadow: 0 0 5px 2px #2196f3;
+  outline: none;
+}
+input:checked + .slider:before {
+  -webkit-transform: translateX(20px);
+  -ms-transform: translateX(20px);
+  transform: translateX(20px);
+}
+.slider.round {
+  border-radius: 20px;
+}
+.slider.round:before {
+  border-radius: 50%;
+}
diff --git a/openwisp_notifications/static/openwisp-notifications/js/preferences.js b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
index 71a461e8..4952ef57 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/preferences.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
@@ -71,18 +71,24 @@ if (typeof gettext === 'undefined') {
                     '<tr>' +
                     '<th>' + gettext('Notification Type') + '</th>' +
                     '<th style="text-align: center;">' +
-                    '<label style="display: inline-flex; align-items: center;">' +
-                    '<input type="checkbox" class="checkbox main-checkbox" data-column="web" data-organization-id="' + orgSettings[0].organization + '" ' + (isGlobalWebChecked ? 'checked' : '') + ' style="margin-right: 4px;" />' +
-                    gettext('Web') +
-                    '<span class="tooltip-icon" data-tooltip="' + gettext('Enable or disable web notifications for this organization') + '" style="margin-left: 2px;">?</span>' +
+                    '<div style="display: inline-flex; align-items: center; justify-content: center; gap: 4px;">' +
+                    '<label class="switch">' +
+                    '<input type="checkbox" class="main-checkbox" data-column="web" data-organization-id="' + orgSettings[0].organization + '" ' + (isGlobalWebChecked ? 'checked' : '') + ' />' +
+                    '<span class="slider round"></span>' +
                     '</label>' +
+                    '<span>' + gettext('Web') + '</span>' +
+                    '<span class="tooltip-icon" data-tooltip="' + gettext('Enable or disable web notifications for this organization') + '">?</span>' +
+                    '</div>' +
                     '</th>' +
                     '<th style="text-align: center;">' +
-                    '<label style="display: inline-flex; align-items: center;">' +
-                    '<input type="checkbox" class="checkbox main-checkbox" data-organization-id="' + orgSettings[0].organization + '" data-column="email" ' + (isGlobalEmailChecked ? 'checked' : '') + ' style="margin-right: 4px;" />' +
-                    gettext('Email') +
-                    '<span class="tooltip-icon" data-tooltip="' + gettext('Enable or disable email notifications for this organization') + '" style="margin-left: 2px;">?</span>' +
+                    '<div style="display: inline-flex; align-items: center; justify-content: center; gap: 4px;">' +
+                    '<label class="switch">' +
+                    '<input type="checkbox" class="main-checkbox" data-organization-id="' + orgSettings[0].organization + '" data-column="email" ' + (isGlobalEmailChecked ? 'checked' : '') + ' />' +
+                    '<span class="slider round"></span>' +
                     '</label>' +
+                    '<span>' + gettext('Email') + '</span>' +
+                    '<span class="tooltip-icon" data-tooltip="' + gettext('Enable or disable email notifications for this organization') + '">?</span>' +
+                    '</div>' +
                     '</th>' +
                     '</tr>' +
                     '</thead>' +
@@ -93,8 +99,18 @@ if (typeof gettext === 'undefined') {
                     const row = $(
                         '<tr>' +
                         '<td>' + setting.type_label + '</td>' +
-                        '<td><input type="checkbox" class="checkbox web-checkbox" ' + (setting.web ? 'checked' : '') + ' data-pk="' + setting.id + '" data-organization-id="' + setting.organization + '" data-type="web" /></td>' +
-                        '<td><input type="checkbox" class="checkbox email-checkbox" ' + (setting.email ? 'checked' : '') + ' data-pk="' + setting.id + '" data-organization-id="' + setting.organization + '" data-type="email" /></td>' +
+                        '<td>' +
+                        '<label class="switch">' +
+                        '<input type="checkbox" class="web-checkbox" ' + (setting.web ? 'checked' : '') + ' data-pk="' + setting.id + '" data-organization-id="' + setting.organization + '" data-type="web" />' +
+                        '<span class="slider round"></span>' +
+                        '</label>' +
+                        '</td>' +
+                        '<td>' +
+                        '<label class="switch">' +
+                        '<input type="checkbox" class="email-checkbox" ' + (setting.email ? 'checked' : '') + ' data-pk="' + setting.id + '" data-organization-id="' + setting.organization + '" data-type="email" />' +
+                        '<span class="slider round"></span>' +
+                        '</label>' +
+                        '</td>' +
                         '</tr>'
                     );
                     table.find('tbody').append(row);
diff --git a/openwisp_notifications/templates/openwisp_notifications/preferences.html b/openwisp_notifications/templates/openwisp_notifications/preferences.html
index 5b43e2b8..d3d96f19 100644
--- a/openwisp_notifications/templates/openwisp_notifications/preferences.html
+++ b/openwisp_notifications/templates/openwisp_notifications/preferences.html
@@ -30,16 +30,22 @@
   <div class="settings-container" data-user-id="{{ user.id }}">
     <div class="global-settings">
       <strong>Global Settings:</strong>
-      <label>
-        <input type="checkbox" id="global-web" />
-        Web
+      <div class="global-settings-container">
+        <span>Web</span>
+        <label class="switch">
+          <input type="checkbox" id="global-web" />
+          <span class="slider round"></span>
+        </label>
         <span class="tooltip-icon" data-tooltip="{% trans 'Enable or disable web notifications globally' %}">?</span>
-      </label>
-      <label>
-        <input type="checkbox" id="global-email" />
-        Email
+      </div>
+      <div class="global-settings-container">
+        <span>Email</span>
+        <label class="switch">
+          <input type="checkbox" id="global-email" />
+          <span class="slider round"></span>
+        </label>
         <span class="tooltip-icon" data-tooltip="{% trans 'Enable or disable email notifications globally' %}">?</span>
-      </label>
+      </div>
     </div>
     <div id="org-panels"></div>
   </div>

From 3caaeda810080a84b4d50c62055a7af19835fe6a Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Wed, 21 Aug 2024 19:06:58 +0530
Subject: [PATCH 38/74] [chore] Bump reviewed changes

---
 openwisp_notifications/base/views.py                   |  8 +++++---
 openwisp_notifications/templates/admin/base_site.html  |  2 +-
 .../openwisp_users/user/change_form_object_tools.html  |  2 +-
 .../templates/openwisp_notifications/preferences.html  |  8 ++++----
 openwisp_notifications/urls.py                         | 10 +++++-----
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/openwisp_notifications/base/views.py b/openwisp_notifications/base/views.py
index 34909dcd..aee85b7e 100644
--- a/openwisp_notifications/base/views.py
+++ b/openwisp_notifications/base/views.py
@@ -21,13 +21,15 @@ def get_context_data(self, **kwargs):
                 # Only admin should access other users preferences
                 if not self.request.user.is_staff:
                     raise Http404('You do not have permission to access this page.')
+                context['username'] = user.username
+                context['title'] = _(f'Notification Preference ({user.username})')
             except User.DoesNotExist:
                 raise Http404('User does not exist')
         else:
             user = self.request.user
+            context['title'] = _('Notification Preference')
 
-        context['user'] = user
-        context['title'] = _('Notification Preferences')
+        context['user_id'] = user.id
         return context
 
     def test_func(self):
@@ -39,4 +41,4 @@ def test_func(self):
         return True
 
 
-notifiation_preference_page = NotificationPreferencePage.as_view()
+notification_preference_page = NotificationPreferencePage.as_view()
diff --git a/openwisp_notifications/templates/admin/base_site.html b/openwisp_notifications/templates/admin/base_site.html
index 1734fa21..bc8a8f33 100644
--- a/openwisp_notifications/templates/admin/base_site.html
+++ b/openwisp_notifications/templates/admin/base_site.html
@@ -26,7 +26,7 @@
   <div class="ow-notification-dropdown ow-hide">
     <div class="filters">
       <span class="toggle-btn" id="ow-mark-all-read" tabindex="0" role="button">{% trans 'Mark all as read' %}</span>
-      <a class="toggle-btn" href="{% url 'notifications:notification_preferences' %}">{% trans 'Settings' %}</a>
+      <a class="toggle-btn" href="{% url 'notifications:notification_preference' %}">{% trans 'Notification Preferences' %}</a>
     </div>
     <div class="ow-notification-wrapper ow-round-bottom-border">
       <div id="ow-notifications-loader" class="ow-hide"><div class="loader"></div></div>
diff --git a/openwisp_notifications/templates/admin/openwisp_users/user/change_form_object_tools.html b/openwisp_notifications/templates/admin/openwisp_users/user/change_form_object_tools.html
index 8b93a751..1e92deb9 100644
--- a/openwisp_notifications/templates/admin/openwisp_users/user/change_form_object_tools.html
+++ b/openwisp_notifications/templates/admin/openwisp_users/user/change_form_object_tools.html
@@ -3,6 +3,6 @@
 {% load i18n admin_urls %}
 
 {% block object-tools-items %}
-  <li><a class="button" href="{% url 'notifications:notification_preferences' %}">Notification Preferences</a></li>
+  <li><a class="button" href="{% url 'notifications:user_notification_preference' object_id %}">Notification Preferences</a></li>
   {{ block.super }}
 {% endblock %}
diff --git a/openwisp_notifications/templates/openwisp_notifications/preferences.html b/openwisp_notifications/templates/openwisp_notifications/preferences.html
index d3d96f19..2616928e 100644
--- a/openwisp_notifications/templates/openwisp_notifications/preferences.html
+++ b/openwisp_notifications/templates/openwisp_notifications/preferences.html
@@ -14,13 +14,13 @@
 
 {% block breadcrumbs %}
   <div class="breadcrumbs">
-    {% if request.user.id == user.id %}
-      <a href="{% url 'admin:index' %}">{% trans 'Home' %}</a> &rsaquo;
-    {% else %}
+    {% if username %}
       <a href="{% url 'admin:index' %}">{% trans 'Home' %}</a> &rsaquo;
       <a href="{% url 'admin:app_list' app_label='openwisp_users' %}">{% trans 'Users and Organizations' %}</a> &rsaquo;
       <a href="{% url 'admin:openwisp_users_user_changelist' %}">{% trans 'Users' %}</a> &rsaquo;
-      <a href="{% url 'admin:openwisp_users_user_change' user.id %}">{{ user.username }}</a> &rsaquo;
+      <a href="{% url 'admin:openwisp_users_user_change' user_id %}">{{ username }}</a> &rsaquo;
+    {% else %}
+      <a href="{% url 'admin:index' %}">{% trans 'Home' %}</a> &rsaquo;
     {% endif %}
     {% trans 'Notification Preferences' %}
   </div>
diff --git a/openwisp_notifications/urls.py b/openwisp_notifications/urls.py
index 1680ed7d..c0e801b4 100644
--- a/openwisp_notifications/urls.py
+++ b/openwisp_notifications/urls.py
@@ -1,7 +1,7 @@
 from django.urls import include, path
 
 from .api.urls import get_api_urls
-from .base.views import notifiation_preference_page
+from .base.views import notification_preference_page
 
 
 def get_urls(api_views=None, social_views=None):
@@ -14,13 +14,13 @@ def get_urls(api_views=None, social_views=None):
         path('api/v1/notifications/', include(get_api_urls(api_views))),
         path(
             'notifications/preferences/',
-            notifiation_preference_page,
-            name='notification_preferences',
+            notification_preference_page,
+            name='notification_preference',
         ),
         path(
             'notifications/user/<uuid:pk>/preferences/',
-            notifiation_preference_page,
-            name='user_notification_preferences',
+            notification_preference_page,
+            name='user_notification_preference',
         ),
     ]
     return urls

From ec83771436c25fc98c7100ae3097a527fbd67e6a Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Wed, 21 Aug 2024 19:10:55 +0530
Subject: [PATCH 39/74] [chore] Remove gsoc24 branch from builds

---
 .github/workflows/build.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d31d835e..07404263 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,12 +5,10 @@ on:
     branches:
       - master
       - dev
-      - gsoc24
   pull_request:
     branches:
       - master
       - dev
-      - gsoc24
 
 jobs:
 

From 088abf2a37f295987b756d264be6b9a90ce8a3d7 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Wed, 21 Aug 2024 20:01:07 +0530
Subject: [PATCH 40/74] [chore] Fetch upto 100 user-settings per api request

---
 .../openwisp-notifications/js/preferences.js  | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/openwisp_notifications/static/openwisp-notifications/js/preferences.js b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
index 4952ef57..f5dabccd 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/preferences.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
@@ -29,13 +29,27 @@ if (typeof gettext === 'undefined') {
     }
 
     function fetchNotificationSettings(userId, isGlobalWebChecked, isGlobalEmailChecked) {
-        $.getJSON(`/api/v1/notifications/user/${userId}/user-setting/`, function (data) {
-            const groupedData = groupBy(data.results, 'organization_name');
-            renderNotificationSettings(groupedData, isGlobalWebChecked, isGlobalEmailChecked);
-            initializeEventListeners(userId);
-        }).fail(function () {
-            showToast('error', gettext('Error fetching notification settings. Please try again.'));
-        });
+        let allResults = [];
+        let currentPage = 1;
+
+        (function fetchPage() {
+            $.getJSON(`/api/v1/notifications/user/${userId}/user-setting/?page_size=100&page=${currentPage}`, function (data) {
+                allResults = allResults.concat(data.results);
+
+                if (data.next) {
+                    currentPage++;
+                    // Continue fetching next page
+                    fetchPage();
+                } else {
+                    // Runs after all the pages are fetched
+                    const groupedData = groupBy(allResults, 'organization_name');
+                    renderNotificationSettings(groupedData, isGlobalWebChecked, isGlobalEmailChecked);
+                    initializeEventListeners(userId);
+                }
+            }).fail(function () {
+                showToast('error', gettext('Error fetching notification settings. Please try again.'));
+            });
+        })();
     }
 
     function groupBy(array, key) {

From 5f8e0085e657839b1b4203d0a736ac7e336bebb5 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Wed, 21 Aug 2024 20:32:28 +0530
Subject: [PATCH 41/74] [chore] Add 'Organization:' on the header

---
 .../static/openwisp-notifications/js/preferences.js             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openwisp_notifications/static/openwisp-notifications/js/preferences.js b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
index f5dabccd..2d908c6a 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/preferences.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
@@ -73,7 +73,7 @@ if (typeof gettext === 'undefined') {
             });
             const orgPanel = $(
                 '<div class="module">' +
-                '<h2 class="toggle-header"><span>' + orgName + '</span><span class="toggle-icon collapsed"></span></h2>' +
+                '<h2 class="toggle-header"><span>Organization: ' + orgName + '</span><span class="toggle-icon collapsed"></span></h2>' +
                 '<div class="org-content"></div>' +
                 '</div>'
             );

From 1d4faae5f072bad1800963cf2773a9c4227b0554 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Wed, 21 Aug 2024 21:50:35 +0530
Subject: [PATCH 42/74] [chore] Increase spacing around email/web global
 switches

---
 .../static/openwisp-notifications/css/preferences.css          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/openwisp_notifications/static/openwisp-notifications/css/preferences.css b/openwisp_notifications/static/openwisp-notifications/css/preferences.css
index 29f3376d..fd8568b7 100644
--- a/openwisp_notifications/static/openwisp-notifications/css/preferences.css
+++ b/openwisp_notifications/static/openwisp-notifications/css/preferences.css
@@ -7,6 +7,9 @@
   justify-content: center;
   gap: 4px;
 }
+.global-settings-container {
+  margin-left: 10px;
+}
 .module h2 {
   padding: 10px;
   cursor: pointer;

From 40471ba74699f2594c36f5c57b40fd1a7a4faab6 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Wed, 28 Aug 2024 22:53:16 +0530
Subject: [PATCH 43/74] [chore] Add space around settings

---
 .../static/openwisp-notifications/css/preferences.css     | 4 ++--
 .../static/openwisp-notifications/js/preferences.js       | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/openwisp_notifications/static/openwisp-notifications/css/preferences.css b/openwisp_notifications/static/openwisp-notifications/css/preferences.css
index fd8568b7..7d39e417 100644
--- a/openwisp_notifications/static/openwisp-notifications/css/preferences.css
+++ b/openwisp_notifications/static/openwisp-notifications/css/preferences.css
@@ -5,10 +5,10 @@
   display: inline-flex;
   align-items: center;
   justify-content: center;
-  gap: 4px;
+  gap: 8px;
 }
 .global-settings-container {
-  margin-left: 10px;
+  margin-left: 20px;
 }
 .module h2 {
   padding: 10px;
diff --git a/openwisp_notifications/static/openwisp-notifications/js/preferences.js b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
index 2d908c6a..b8ff2a20 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/preferences.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
@@ -86,22 +86,22 @@ if (typeof gettext === 'undefined') {
                     '<th>' + gettext('Notification Type') + '</th>' +
                     '<th style="text-align: center;">' +
                     '<div style="display: inline-flex; align-items: center; justify-content: center; gap: 4px;">' +
+                    '<span>' + gettext('Web') + '</span>' +
+                    '<span class="tooltip-icon" data-tooltip="' + gettext('Enable or disable web notifications for this organization') + '">?</span>' +
                     '<label class="switch">' +
                     '<input type="checkbox" class="main-checkbox" data-column="web" data-organization-id="' + orgSettings[0].organization + '" ' + (isGlobalWebChecked ? 'checked' : '') + ' />' +
                     '<span class="slider round"></span>' +
                     '</label>' +
-                    '<span>' + gettext('Web') + '</span>' +
-                    '<span class="tooltip-icon" data-tooltip="' + gettext('Enable or disable web notifications for this organization') + '">?</span>' +
                     '</div>' +
                     '</th>' +
                     '<th style="text-align: center;">' +
                     '<div style="display: inline-flex; align-items: center; justify-content: center; gap: 4px;">' +
+                    '<span>' + gettext('Email') + '</span>' +
+                    '<span class="tooltip-icon" data-tooltip="' + gettext('Enable or disable email notifications for this organization') + '">?</span>' +
                     '<label class="switch">' +
                     '<input type="checkbox" class="main-checkbox" data-organization-id="' + orgSettings[0].organization + '" data-column="email" ' + (isGlobalEmailChecked ? 'checked' : '') + ' />' +
                     '<span class="slider round"></span>' +
                     '</label>' +
-                    '<span>' + gettext('Email') + '</span>' +
-                    '<span class="tooltip-icon" data-tooltip="' + gettext('Enable or disable email notifications for this organization') + '">?</span>' +
                     '</div>' +
                     '</th>' +
                     '</tr>' +

From 1e1978ff9cb4c56a51d59d9a7c3348f70aa8e1eb Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Sat, 31 Aug 2024 14:45:50 +0530
Subject: [PATCH 44/74] [docs] Update Notification Preference page

---
 docs/user/notification-preferences.rst | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/user/notification-preferences.rst b/docs/user/notification-preferences.rst
index 1e2dfa8d..dd1713be 100644
--- a/docs/user/notification-preferences.rst
+++ b/docs/user/notification-preferences.rst
@@ -1,8 +1,8 @@
 Notification Preferences
 ========================
 
-.. image:: https://raw.githubusercontent.com/openwisp/openwisp-notifications/docs/docs/images/notification-settings.png
-    :target: https://raw.githubusercontent.com/openwisp/openwisp-notifications/docs/docs/images/notification-settings.png
+.. image:: https://i.imgur.com/lIGqry5.png
+    :target: https://i.imgur.com/lIGqry5.png
     :align: center
 
 OpenWISP Notifications enables users to customize their notification
@@ -12,6 +12,10 @@ organized by notification type and organization, allowing users to tailor
 their notification experience by opting to receive updates only from
 specific organizations or notification types.
 
+Users can access and manage their notification preferences by visiting the
+``/notification/preferences/``. Alternatively, this page can also be
+accessed directly from the notification widget.
+
 Notification settings are automatically generated for all notification
 types and organizations for every user. Superusers have the ability to
 manage notification settings for all users, including adding or deleting

From c912883511348d9fe64b6c9dde885ce913e63b86 Mon Sep 17 00:00:00 2001
From: Federico Capoano <f.capoano@openwisp.io>
Date: Mon, 2 Sep 2024 13:34:17 -0400
Subject: [PATCH 45/74] [chores] Small UI and view improvements

---
 openwisp_notifications/base/views.py                 |  4 ++--
 .../openwisp-notifications/css/preferences.css       | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/openwisp_notifications/base/views.py b/openwisp_notifications/base/views.py
index aee85b7e..4e94f6e7 100644
--- a/openwisp_notifications/base/views.py
+++ b/openwisp_notifications/base/views.py
@@ -14,6 +14,7 @@ class NotificationPreferencePage(LoginRequiredMixin, UserPassesTestMixin, Templa
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         user_id = self.kwargs.get('pk')
+        context['title'] = _('Notification Preferences')
 
         if user_id:
             try:
@@ -22,12 +23,11 @@ def get_context_data(self, **kwargs):
                 if not self.request.user.is_staff:
                     raise Http404('You do not have permission to access this page.')
                 context['username'] = user.username
-                context['title'] = _(f'Notification Preference ({user.username})')
+                context['title'] += f' ({user.username})'
             except User.DoesNotExist:
                 raise Http404('User does not exist')
         else:
             user = self.request.user
-            context['title'] = _('Notification Preference')
 
         context['user_id'] = user.id
         return context
diff --git a/openwisp_notifications/static/openwisp-notifications/css/preferences.css b/openwisp_notifications/static/openwisp-notifications/css/preferences.css
index 7d39e417..a759dadc 100644
--- a/openwisp_notifications/static/openwisp-notifications/css/preferences.css
+++ b/openwisp_notifications/static/openwisp-notifications/css/preferences.css
@@ -11,15 +11,18 @@
   margin-left: 20px;
 }
 .module h2 {
-  padding: 10px;
+  padding: 15px 10px;
   cursor: pointer;
   display: flex;
   justify-content: space-between;
   align-items: center;
   font-weight: bold;
+  font-size: 14px;
+  text-transform: uppercase;
 }
 .org-content {
-  padding-top: 10px;
+  margin-top: 0;
+  padding-top: 0;
   display: none;
 }
 .org-content.active {
@@ -66,6 +69,7 @@ td:not(:first-child) {
 span.toggle-icon {
   width: 16px;
   height: 16px;
+  margin-right: 5px;
   background: url(/static/admin/img/sorting-icons.svg) 0 0 no-repeat;
   background-size: 20px auto;
   transition: background-position 0.3s ease;
@@ -89,6 +93,7 @@ span.toggle-icon.expanded {
   position: relative;
   border: 1px solid var(--body-quiet-color);
   text-transform: none;
+  cursor: default;
 }
 .tooltip-icon::after {
   content: attr(data-tooltip);
@@ -158,3 +163,6 @@ input:checked + .slider:before {
 .slider.round:before {
   border-radius: 50%;
 }
+.module {
+  border: 1px solid rgba(0, 0, 0, 0.1);
+}

From 3fc35339854516cb22af2985fa84488342a7e4f4 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Tue, 3 Sep 2024 14:47:17 +0530
Subject: [PATCH 46/74] [chore] Bump review changes

---
 openwisp_notifications/api/permissions.py            | 10 ++++++----
 openwisp_notifications/api/urls.py                   |  2 +-
 openwisp_notifications/api/views.py                  | 10 ++++------
 .../static/openwisp-notifications/js/preferences.js  | 12 ++++++++----
 .../openwisp_notifications/preferences.html          | 12 +++++-------
 openwisp_notifications/urls.py                       |  2 +-
 openwisp_notifications/{base => }/views.py           | 10 +++++-----
 7 files changed, 30 insertions(+), 28 deletions(-)
 rename openwisp_notifications/{base => }/views.py (86%)

diff --git a/openwisp_notifications/api/permissions.py b/openwisp_notifications/api/permissions.py
index b722beae..e2aecf07 100644
--- a/openwisp_notifications/api/permissions.py
+++ b/openwisp_notifications/api/permissions.py
@@ -1,11 +1,13 @@
 from rest_framework.permissions import BasePermission
 
 
-class IsAuthenticatedToUpdateNotificationSetting(BasePermission):
+class PreferencesPermission(BasePermission):
     """
-    Permission class to check if the user is authenticated to update notification settings.
-    Allows superusers to change the notification preferences of other users.
-    Regular users can only update their own settings.
+    Permission class for the notification preferences.
+
+    Permission is granted only in these two cases:
+    1. Superusers can change the notification preferences of any user.
+    2. Regular users can only change their own preferences.
     """
 
     def has_permission(self, request, view):
diff --git a/openwisp_notifications/api/urls.py b/openwisp_notifications/api/urls.py
index 482c8001..77ea5263 100644
--- a/openwisp_notifications/api/urls.py
+++ b/openwisp_notifications/api/urls.py
@@ -9,7 +9,7 @@ def get_api_urls(api_views=None):
     if not api_views:
         api_views = views
     return [
-        path('notification/', views.notifications_list, name='notifications_list'),
+        path('notifications/', views.notifications_list, name='notifications_list'),
         path(
             'notification/read/',
             views.notifications_read_all,
diff --git a/openwisp_notifications/api/views.py b/openwisp_notifications/api/views.py
index 39ccbf5a..544f9da8 100644
--- a/openwisp_notifications/api/views.py
+++ b/openwisp_notifications/api/views.py
@@ -17,7 +17,7 @@
 from rest_framework.response import Response
 
 from openwisp_notifications.api.permissions import (
-    IsAuthenticatedToUpdateNotificationSetting,
+    PreferencesPermission,
 )
 from openwisp_notifications.api.serializers import (
     IgnoreObjectNotificationSerializer,
@@ -119,7 +119,7 @@ class BaseNotificationSettingView(GenericAPIView):
     model = NotificationSetting
     serializer_class = NotificationSettingSerializer
     authentication_classes = [BearerAuthentication, SessionAuthentication]
-    permission_classes = [IsAuthenticated]
+    permission_classes = [PreferencesPermission]
 
     def get_queryset(self):
         if getattr(self, 'swagger_fake_view', False):
@@ -128,8 +128,6 @@ def get_queryset(self):
         user_id = self.kwargs.get('user_id')
 
         if user_id:
-            if not (self.request.user.id == user_id or self.request.user.is_staff):
-                raise PermissionDenied()
             return NotificationSetting.objects.filter(user_id=user_id)
 
         return NotificationSetting.objects.filter(user=self.request.user)
@@ -212,7 +210,7 @@ def perform_create(self, serializer):
 
 
 class OrganizationNotificationSettingView(GenericAPIView):
-    permission_classes = [IsAuthenticated, IsAuthenticatedToUpdateNotificationSetting]
+    permission_classes = [IsAuthenticated, PreferencesPermission]
     serializer_class = NotificationSettingUpdateSerializer
 
     def post(self, request, user_id, organization_id):
@@ -228,7 +226,7 @@ def post(self, request, user_id, organization_id):
 
 
 class NotificationPreferenceView(GenericAPIView):
-    permission_classes = [IsAuthenticated, IsAuthenticatedToUpdateNotificationSetting]
+    permission_classes = [IsAuthenticated, PreferencesPermission]
     serializer_class = NotificationSettingUpdateSerializer
 
     def get(self, request, user_id):
diff --git a/openwisp_notifications/static/openwisp-notifications/js/preferences.js b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
index b8ff2a20..d99bab4f 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/preferences.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
@@ -4,6 +4,10 @@ if (typeof gettext === 'undefined') {
     var gettext = function(word){ return word; };
 }
 
+function getAbsoluteUrl(url) {
+    return notificationApiHost.origin + url;
+}
+
 (function ($) {
     let isUpdateInProgress = false;
 
@@ -13,7 +17,7 @@ if (typeof gettext === 'undefined') {
     });
 
     function fetchGlobalSettings(userId) {
-        $.getJSON(`/api/v1/notifications/user/${userId}/preference/`, function (globalData) {
+        $.getJSON(getAbsoluteUrl(`/api/v1/notifications/user/${userId}/preference/`), function (globalData) {
             const isGlobalWebChecked = globalData.web;
             const isGlobalEmailChecked = globalData.email;
 
@@ -33,7 +37,7 @@ if (typeof gettext === 'undefined') {
         let currentPage = 1;
 
         (function fetchPage() {
-            $.getJSON(`/api/v1/notifications/user/${userId}/user-setting/?page_size=100&page=${currentPage}`, function (data) {
+            $.getJSON(getAbsoluteUrl(`/api/v1/notifications/user/${userId}/user-setting/?page_size=100&page=${currentPage}`), function (data) {
                 allResults = allResults.concat(data.results);
 
                 if (data.next) {
@@ -275,7 +279,7 @@ if (typeof gettext === 'undefined') {
 
             $.ajax({
                 type: 'POST',
-                url: `/api/v1/notifications/user/${userId}/organization/${orgId}/setting/`,
+                url: getAbsoluteUrl(`/api/v1/notifications/user/${userId}/organization/${orgId}/setting/`),
                 headers: { 'X-CSRFToken': $('input[name="csrfmiddlewaretoken"]').val() },
                 contentType: 'application/json',
                 data: JSON.stringify(data),
@@ -366,7 +370,7 @@ if (typeof gettext === 'undefined') {
 
             $.ajax({
                 type: 'POST',
-                url: `/api/v1/notifications/user/${userId}/preference/`,
+                url: getAbsoluteUrl(`/api/v1/notifications/user/${userId}/preference/`),
                 headers: { 'X-CSRFToken': $('input[name="csrfmiddlewaretoken"]').val() },
                 contentType: 'application/json',
                 data: JSON.stringify(data),
diff --git a/openwisp_notifications/templates/openwisp_notifications/preferences.html b/openwisp_notifications/templates/openwisp_notifications/preferences.html
index 2616928e..eaaa2e56 100644
--- a/openwisp_notifications/templates/openwisp_notifications/preferences.html
+++ b/openwisp_notifications/templates/openwisp_notifications/preferences.html
@@ -5,7 +5,7 @@
 
 {% block title %}
   {% trans "Notification Preferences" %}
-{% endblock %}
+{% endblock title %}
 
 {% block extrastyle %}
   {{ block.super }}
@@ -14,13 +14,11 @@
 
 {% block breadcrumbs %}
   <div class="breadcrumbs">
+    <a href="{% url 'admin:index' %}">{% trans 'Home' %}</a> &rsaquo;
     {% if username %}
-      <a href="{% url 'admin:index' %}">{% trans 'Home' %}</a> &rsaquo;
       <a href="{% url 'admin:app_list' app_label='openwisp_users' %}">{% trans 'Users and Organizations' %}</a> &rsaquo;
       <a href="{% url 'admin:openwisp_users_user_changelist' %}">{% trans 'Users' %}</a> &rsaquo;
       <a href="{% url 'admin:openwisp_users_user_change' user_id %}">{{ username }}</a> &rsaquo;
-    {% else %}
-      <a href="{% url 'admin:index' %}">{% trans 'Home' %}</a> &rsaquo;
     {% endif %}
     {% trans 'Notification Preferences' %}
   </div>
@@ -29,9 +27,9 @@
 {% block content %}
   <div class="settings-container" data-user-id="{{ user.id }}">
     <div class="global-settings">
-      <strong>Global Settings:</strong>
+      <strong>{% trans "Global Settings:" %}</strong>
       <div class="global-settings-container">
-        <span>Web</span>
+        <span>{% trans "Web" %}</span>
         <label class="switch">
           <input type="checkbox" id="global-web" />
           <span class="slider round"></span>
@@ -39,7 +37,7 @@
         <span class="tooltip-icon" data-tooltip="{% trans 'Enable or disable web notifications globally' %}">?</span>
       </div>
       <div class="global-settings-container">
-        <span>Email</span>
+        <span>{% trans "Email" %}</span>
         <label class="switch">
           <input type="checkbox" id="global-email" />
           <span class="slider round"></span>
diff --git a/openwisp_notifications/urls.py b/openwisp_notifications/urls.py
index c0e801b4..8e83ff4d 100644
--- a/openwisp_notifications/urls.py
+++ b/openwisp_notifications/urls.py
@@ -1,7 +1,7 @@
 from django.urls import include, path
 
 from .api.urls import get_api_urls
-from .base.views import notification_preference_page
+from .views import notification_preference_page
 
 
 def get_urls(api_views=None, social_views=None):
diff --git a/openwisp_notifications/base/views.py b/openwisp_notifications/views.py
similarity index 86%
rename from openwisp_notifications/base/views.py
rename to openwisp_notifications/views.py
index 4e94f6e7..31009b34 100644
--- a/openwisp_notifications/base/views.py
+++ b/openwisp_notifications/views.py
@@ -20,8 +20,6 @@ def get_context_data(self, **kwargs):
             try:
                 user = User.objects.get(pk=user_id)
                 # Only admin should access other users preferences
-                if not self.request.user.is_staff:
-                    raise Http404('You do not have permission to access this page.')
                 context['username'] = user.username
                 context['title'] += f' ({user.username})'
             except User.DoesNotExist:
@@ -33,11 +31,13 @@ def get_context_data(self, **kwargs):
         return context
 
     def test_func(self):
-        '''
+        """
         This method ensures that only admins can access the view when a custom user ID is provided.
-        '''
+        """
         if 'pk' in self.kwargs:
-            return self.request.user.is_staff
+            return self.request.user.is_superuser or self.request.user.id == self.kwargs.get(
+                'pk'
+            )
         return True
 
 

From 06bc604c0a589fdaf832b81cb3a1b21b15af6733 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Tue, 3 Sep 2024 14:53:14 +0530
Subject: [PATCH 47/74] [qa] Fix checks

---
 openwisp_notifications/api/views.py | 5 +----
 openwisp_notifications/views.py     | 5 +++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/openwisp_notifications/api/views.py b/openwisp_notifications/api/views.py
index 544f9da8..74f9c772 100644
--- a/openwisp_notifications/api/views.py
+++ b/openwisp_notifications/api/views.py
@@ -1,5 +1,4 @@
 from django.contrib.contenttypes.models import ContentType
-from django.core.exceptions import PermissionDenied
 from django.http import Http404, HttpResponseRedirect
 from django.urls import reverse
 from django_filters.rest_framework import DjangoFilterBackend
@@ -16,9 +15,7 @@
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 
-from openwisp_notifications.api.permissions import (
-    PreferencesPermission,
-)
+from openwisp_notifications.api.permissions import PreferencesPermission
 from openwisp_notifications.api.serializers import (
     IgnoreObjectNotificationSerializer,
     NotificationListSerializer,
diff --git a/openwisp_notifications/views.py b/openwisp_notifications/views.py
index 31009b34..fdb06676 100644
--- a/openwisp_notifications/views.py
+++ b/openwisp_notifications/views.py
@@ -35,8 +35,9 @@ def test_func(self):
         This method ensures that only admins can access the view when a custom user ID is provided.
         """
         if 'pk' in self.kwargs:
-            return self.request.user.is_superuser or self.request.user.id == self.kwargs.get(
-                'pk'
+            return (
+                self.request.user.is_superuser
+                or self.request.user.id == self.kwargs.get('pk')
             )
         return True
 

From 72211c8d07b7e4c4fce260dc44f164df8a30f0a9 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Tue, 3 Sep 2024 15:02:33 +0530
Subject: [PATCH 48/74] [fix] URL update

---
 openwisp_notifications/api/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openwisp_notifications/api/urls.py b/openwisp_notifications/api/urls.py
index 77ea5263..482c8001 100644
--- a/openwisp_notifications/api/urls.py
+++ b/openwisp_notifications/api/urls.py
@@ -9,7 +9,7 @@ def get_api_urls(api_views=None):
     if not api_views:
         api_views = views
     return [
-        path('notifications/', views.notifications_list, name='notifications_list'),
+        path('notification/', views.notifications_list, name='notifications_list'),
         path(
             'notification/read/',
             views.notifications_read_all,

From 5f265bec087a83014ae05bd1bf3e5f54fa3fdd6f Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Tue, 3 Sep 2024 16:40:27 +0530
Subject: [PATCH 49/74] [chore] Add test for missing notification_preference
 get api

---
 openwisp_notifications/tests/test_api.py | 31 +++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/openwisp_notifications/tests/test_api.py b/openwisp_notifications/tests/test_api.py
index 83cdd941..05d5be83 100644
--- a/openwisp_notifications/tests/test_api.py
+++ b/openwisp_notifications/tests/test_api.py
@@ -833,7 +833,36 @@ def test_organization_notification_setting_update(self):
             response = self.client.post(url, data={'web': True, 'email': True})
             self.assertEqual(response.status_code, 403)
 
-    def test_notification_preference_update(self):
+    def test_get_notification_preference(self):
+        tester = self._create_user()
+
+        with self.subTest('Test for current user'):
+            self.client.force_login(self.admin)
+            url = self._get_path('notification_preference', self.admin.pk)
+            response = self.client.get(url)
+            self.assertEqual(response.status_code, 200)
+            self.assertIn('web', response.json())
+            self.assertIn('email', response.json())
+            self.assertTrue(response.json()['web'])
+            self.assertTrue(response.json()['email'])
+
+        with self.subTest('Test for admin user accessing another user'):
+            self.client.force_login(self.admin)
+            url = self._get_path('notification_preference', tester.pk)
+            response = self.client.get(url)
+            self.assertEqual(response.status_code, 200)
+            self.assertIn('web', response.json())
+            self.assertIn('email', response.json())
+            self.assertTrue(response.json()['web'])
+            self.assertTrue(response.json()['email'])
+
+        with self.subTest('Test for non-admin user accessing another user'):
+            self.client.force_login(tester)
+            url = self._get_path('notification_preference', self.admin.pk)
+            response = self.client.get(url)
+            self.assertEqual(response.status_code, 403)
+
+    def test_post_notification_preference(self):
         tester = self._create_user()
 
         with self.subTest('Test for current user'):

From 7982603fe9e51531b1e12b82318b0eb377bbced8 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Tue, 3 Sep 2024 20:07:54 +0530
Subject: [PATCH 50/74] [chore] Add missing tests

---
 openwisp_notifications/tests/test_api.py      | 19 +++++++++++
 .../tests/test_notifications.py               | 33 +++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/openwisp_notifications/tests/test_api.py b/openwisp_notifications/tests/test_api.py
index 05d5be83..1b1face6 100644
--- a/openwisp_notifications/tests/test_api.py
+++ b/openwisp_notifications/tests/test_api.py
@@ -833,6 +833,16 @@ def test_organization_notification_setting_update(self):
             response = self.client.post(url, data={'web': True, 'email': True})
             self.assertEqual(response.status_code, 403)
 
+        with self.subTest('Test with invalid data'):
+            self.client.force_login(self.admin)
+            url = self._get_path(
+                'organization_notification_setting',
+                self.admin.pk,
+                org.pk,
+            )
+            response = self.client.post(url, data={'web': 'invalid'})
+            self.assertEqual(response.status_code, 400)
+
     def test_get_notification_preference(self):
         tester = self._create_user()
 
@@ -900,6 +910,15 @@ def test_post_notification_preference(self):
             response = self.client.post(url, data={'web': True, 'email': True})
             self.assertEqual(response.status_code, 403)
 
+        with self.subTest('Test with invalid data'):
+            self.client.force_login(self.admin)
+            url = self._get_path(
+                'notification_preference',
+                self.admin.pk,
+            )
+            response = self.client.post(url, data={'web': 'invalid'})
+            self.assertEqual(response.status_code, 400)
+
     @patch('openwisp_notifications.tasks.delete_ignore_object_notification.apply_async')
     def test_create_ignore_obj_notification_api(self, mocked_task):
         org_user = self._get_org_user()
diff --git a/openwisp_notifications/tests/test_notifications.py b/openwisp_notifications/tests/test_notifications.py
index 017ae158..2f7c3430 100644
--- a/openwisp_notifications/tests/test_notifications.py
+++ b/openwisp_notifications/tests/test_notifications.py
@@ -1,5 +1,6 @@
 from datetime import datetime, timedelta
 from unittest.mock import patch
+from uuid import uuid4
 
 from allauth.account.models import EmailAddress
 from celery.exceptions import OperationalError
@@ -1052,6 +1053,38 @@ def test_that_the_notification_is_only_sent_once_to_the_user(self):
         self._create_notification()
         self.assertEqual(notification_queryset.count(), 1)
 
+    def test_notification_preference_page(self):
+        preference_page = 'notifications:user_notification_preference'
+        tester = self._create_user(username='tester')
+
+        with self.subTest('Test user is not authenticated'):
+            response = self.client.get(reverse(preference_page, args=(self.admin.pk,)))
+            self.assertEqual(response.status_code, 302)
+
+        with self.subTest('Test with same user'):
+            self.client.force_login(self.admin)
+            response = self.client.get(reverse('notifications:notification_preference'))
+            self.assertEqual(response.status_code, 200)
+
+        with self.subTest('Test user is authenticated'):
+            self.client.force_login(self.admin)
+            response = self.client.get(reverse(preference_page, args=(self.admin.pk,)))
+            self.assertEqual(response.status_code, 200)
+
+        with self.subTest('Test user is authenticated but not superuser'):
+            self.client.force_login(tester)
+            response = self.client.get(reverse(preference_page, args=(self.admin.pk,)))
+            self.assertEqual(response.status_code, 403)
+
+        with self.subTest('Test user is authenticated and superuser'):
+            self.client.force_login(self.admin)
+            response = self.client.get(reverse(preference_page, args=(tester.pk,)))
+            self.assertEqual(response.status_code, 200)
+
+        with self.subTest('Test invalid user ID'):
+            response = self.client.get(reverse(preference_page, args=(uuid4(),)))
+            self.assertEqual(response.status_code, 404)
+
 
 class TestTransactionNotifications(TestOrganizationMixin, TransactionTestCase):
     def setUp(self):

From 890d764084b628a67ffaaba5e31b5183f5552186 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Tue, 3 Sep 2024 23:55:52 +0530
Subject: [PATCH 51/74] [chore] Bump changes

---
 .../admin/openwisp_users/user/change_form_object_tools.html   | 4 +++-
 .../templates/openwisp_notifications/preferences.html         | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/openwisp_notifications/templates/admin/openwisp_users/user/change_form_object_tools.html b/openwisp_notifications/templates/admin/openwisp_users/user/change_form_object_tools.html
index 1e92deb9..66bfa006 100644
--- a/openwisp_notifications/templates/admin/openwisp_users/user/change_form_object_tools.html
+++ b/openwisp_notifications/templates/admin/openwisp_users/user/change_form_object_tools.html
@@ -3,6 +3,8 @@
 {% load i18n admin_urls %}
 
 {% block object-tools-items %}
-  <li><a class="button" href="{% url 'notifications:user_notification_preference' object_id %}">Notification Preferences</a></li>
+  {% if request.user.is_staff %}
+    <li><a class="button" href="{% url 'notifications:user_notification_preference' object_id %}">Notification Preferences</a></li>
+  {% endif %}
   {{ block.super }}
 {% endblock %}
diff --git a/openwisp_notifications/templates/openwisp_notifications/preferences.html b/openwisp_notifications/templates/openwisp_notifications/preferences.html
index eaaa2e56..0d8473e0 100644
--- a/openwisp_notifications/templates/openwisp_notifications/preferences.html
+++ b/openwisp_notifications/templates/openwisp_notifications/preferences.html
@@ -25,7 +25,7 @@
 {% endblock breadcrumbs %}
 
 {% block content %}
-  <div class="settings-container" data-user-id="{{ user.id }}">
+  <div class="settings-container" data-user-id="{{ user_id }}">
     <div class="global-settings">
       <strong>{% trans "Global Settings:" %}</strong>
       <div class="global-settings-container">

From fcb9e237566dfb0ab7582bd546690cf21ac957b7 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Fri, 6 Sep 2024 14:46:52 +0530
Subject: [PATCH 52/74] [chore] View Notification preferences button in user
 admin model for the current user staff

---
 .../admin/openwisp_users/user/change_form_object_tools.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openwisp_notifications/templates/admin/openwisp_users/user/change_form_object_tools.html b/openwisp_notifications/templates/admin/openwisp_users/user/change_form_object_tools.html
index 66bfa006..ce26feea 100644
--- a/openwisp_notifications/templates/admin/openwisp_users/user/change_form_object_tools.html
+++ b/openwisp_notifications/templates/admin/openwisp_users/user/change_form_object_tools.html
@@ -3,8 +3,10 @@
 {% load i18n admin_urls %}
 
 {% block object-tools-items %}
-  {% if request.user.is_staff %}
-    <li><a class="button" href="{% url 'notifications:user_notification_preference' object_id %}">Notification Preferences</a></li>
+  {% if request.user.is_staff and original.is_staff %}
+    <li>
+      <a class="button" href="{% url 'notifications:user_notification_preference' object_id %}">Notification Preferences</a>
+    </li>
   {% endif %}
   {{ block.super }}
 {% endblock %}

From 6dd8ca5100cce2e8afef26c109eb072541c3763a Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Fri, 6 Sep 2024 15:18:37 +0530
Subject: [PATCH 53/74] [chore] Show loader

---
 .../css/preferences.css                       |  1 +
 .../openwisp-notifications/js/preferences.js  | 78 ++++++++++++-------
 .../openwisp_notifications/preferences.html   |  2 +
 3 files changed, 55 insertions(+), 26 deletions(-)

diff --git a/openwisp_notifications/static/openwisp-notifications/css/preferences.css b/openwisp_notifications/static/openwisp-notifications/css/preferences.css
index a759dadc..1af9263f 100644
--- a/openwisp_notifications/static/openwisp-notifications/css/preferences.css
+++ b/openwisp_notifications/static/openwisp-notifications/css/preferences.css
@@ -1,5 +1,6 @@
 .global-settings {
   margin: 10px 0 20px;
+  display: none;
 }
 .global-settings-container {
   display: inline-flex;
diff --git a/openwisp_notifications/static/openwisp-notifications/js/preferences.js b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
index d99bab4f..aea10fdd 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/preferences.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
@@ -10,6 +10,7 @@ function getAbsoluteUrl(url) {
 
 (function ($) {
     let isUpdateInProgress = false;
+    $('#ow-notifications-loader').removeClass('ow-hide');
 
     $(document).ready(function () {
         const userId = $('.settings-container').data('user-id');
@@ -17,18 +18,30 @@ function getAbsoluteUrl(url) {
     });
 
     function fetchGlobalSettings(userId) {
-        $.getJSON(getAbsoluteUrl(`/api/v1/notifications/user/${userId}/preference/`), function (globalData) {
-            const isGlobalWebChecked = globalData.web;
-            const isGlobalEmailChecked = globalData.email;
-
-            $('#global-web').prop('checked', isGlobalWebChecked);
-            $('#global-email').prop('checked', isGlobalEmailChecked);
-
-            initializeGlobalSettingsEventListener(userId);
-
-            fetchNotificationSettings(userId, isGlobalWebChecked, isGlobalEmailChecked);
-        }).fail(function () {
-            showToast('error', gettext('Error fetching global settings. Please try again.'));
+        $.ajax({
+            url: getAbsoluteUrl(`/api/v1/notifications/user/${userId}/preference/`),
+            dataType: 'json',
+            beforeSend: function () {
+                $('.loader').show();
+                $('.global-settings').hide();
+            },
+            complete: function () {
+                $('.loader').hide();
+            },
+            success: function (globalData) {
+                const isGlobalWebChecked = globalData.web;
+                const isGlobalEmailChecked = globalData.email;
+
+                $('#global-web').prop('checked', isGlobalWebChecked);
+                $('#global-email').prop('checked', isGlobalEmailChecked);
+
+                initializeGlobalSettingsEventListener(userId);
+
+                fetchNotificationSettings(userId, isGlobalWebChecked, isGlobalEmailChecked);
+            },
+            error: function () {
+                showToast('error', gettext('Error fetching global settings. Please try again.'));
+            }
         });
     }
 
@@ -37,21 +50,34 @@ function getAbsoluteUrl(url) {
         let currentPage = 1;
 
         (function fetchPage() {
-            $.getJSON(getAbsoluteUrl(`/api/v1/notifications/user/${userId}/user-setting/?page_size=100&page=${currentPage}`), function (data) {
-                allResults = allResults.concat(data.results);
-
-                if (data.next) {
-                    currentPage++;
-                    // Continue fetching next page
-                    fetchPage();
-                } else {
-                    // Runs after all the pages are fetched
-                    const groupedData = groupBy(allResults, 'organization_name');
-                    renderNotificationSettings(groupedData, isGlobalWebChecked, isGlobalEmailChecked);
-                    initializeEventListeners(userId);
+            $.ajax({
+                url: getAbsoluteUrl(`/api/v1/notifications/user/${userId}/user-setting/?page_size=100&page=${currentPage}`),
+                dataType: 'json',
+                beforeSend: function () {
+                    $('.loader').show();
+                    $('.global-settings').hide();
+                },
+                complete: function () {
+                    $('.loader').hide();
+                },
+                success: function (data) {
+                    allResults = allResults.concat(data.results);
+
+                    if (data.next) {
+                        currentPage++;
+                        // Continue fetching next page
+                        fetchPage();
+                    } else {
+                        // Runs after all the pages are fetched
+                        const groupedData = groupBy(allResults, 'organization_name');
+                        renderNotificationSettings(groupedData, isGlobalWebChecked, isGlobalEmailChecked);
+                        initializeEventListeners(userId);
+                        $('.global-settings').show();
+                    }
+                },
+                error: function () {
+                    showToast('error', gettext('Error fetching notification settings. Please try again.'));
                 }
-            }).fail(function () {
-                showToast('error', gettext('Error fetching notification settings. Please try again.'));
             });
         })();
     }
diff --git a/openwisp_notifications/templates/openwisp_notifications/preferences.html b/openwisp_notifications/templates/openwisp_notifications/preferences.html
index 0d8473e0..f201d197 100644
--- a/openwisp_notifications/templates/openwisp_notifications/preferences.html
+++ b/openwisp_notifications/templates/openwisp_notifications/preferences.html
@@ -24,8 +24,10 @@
   </div>
 {% endblock breadcrumbs %}
 
+
 {% block content %}
   <div class="settings-container" data-user-id="{{ user_id }}">
+    <div class="loader"></div>
     <div class="global-settings">
       <strong>{% trans "Global Settings:" %}</strong>
       <div class="global-settings-container">

From d1c52156aaac281f9056b84a1e06c56433b0682f Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Fri, 6 Sep 2024 18:43:26 +0530
Subject: [PATCH 54/74] [chore] Add selenium test

---
 openwisp_notifications/tests/test_selenium.py | 87 +++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 openwisp_notifications/tests/test_selenium.py

diff --git a/openwisp_notifications/tests/test_selenium.py b/openwisp_notifications/tests/test_selenium.py
new file mode 100644
index 00000000..3570f3e9
--- /dev/null
+++ b/openwisp_notifications/tests/test_selenium.py
@@ -0,0 +1,87 @@
+import time
+
+from django.contrib.staticfiles.testing import StaticLiveServerTestCase
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+
+from openwisp_users.tests.utils import TestOrganizationMixin
+from openwisp_utils.test_selenium_mixins import SeleniumTestMixin
+
+
+class TestSelenium(
+    SeleniumTestMixin,
+    TestOrganizationMixin,
+    StaticLiveServerTestCase,
+):
+    serve_static = True
+
+    def setUp(self):
+        self.admin = self._create_admin(
+            username=self.admin_username, password=self.admin_password
+        )
+        self.driver = self.web_driver
+
+    def open(self, url, driver=None):
+        driver = self.driver or self.web_driver
+        driver.get(f'{self.live_server_url}{url}')
+
+    def test_notification_preference_page(self):
+        self.login()
+        self.open('/notifications/preferences/')
+        time.sleep(0.1)
+
+        # Uncheck the global web checkbox
+        global_web_checkbox = WebDriverWait(self.driver, 10).until(
+            EC.presence_of_element_located((By.ID, 'global-web'))
+        )
+
+        self.driver.execute_script(
+            """
+            arguments[0].checked = false;
+            arguments[0].dispatchEvent(new Event('change', { bubbles: true }));
+            """,
+            global_web_checkbox,
+        )
+
+        all_checkboxes = self.driver.find_elements(
+            By.CSS_SELECTOR, 'input[type="checkbox"]'
+        )
+        for checkbox in all_checkboxes:
+            self.assertTrue(checkbox.is_selected())
+
+        # Check the org level web checkbox
+        org_level_email_checkbox = WebDriverWait(self.driver, 10).until(
+            EC.presence_of_element_located(
+                (
+                    By.XPATH,
+                    '//div[3]/div[3]/div/div[1]/div[2]/div[3]/div[1]/div/table/thead/tr/th[2]/div/label/span',
+                )
+            )
+        )
+        org_level_email_checkbox.click()
+
+        web_checkboxes = self.driver.find_elements(
+            By.XPATH,
+            '//div[3]/div[3]/div/div[1]/div[2]/div[3]/div[1]/div/table/tbody//input[@class="web-checkbox"]',
+        )
+
+        for checkbox in web_checkboxes:
+            self.assertTrue(checkbox.is_selected())
+
+        # Check a single email checkbox
+        first_org_email_checkbox = WebDriverWait(self.driver, 10).until(
+            EC.presence_of_element_located(
+                (
+                    By.XPATH,
+                    '//div[3]/div[3]/div/div[1]/div[2]/div[3]/div[1]/div/table/tbody/tr[1]/td[3]/label/span',
+                )
+            )
+        )
+        first_org_email_checkbox.click()
+
+        is_first_org_email_checkbox = self.driver.find_element(
+            By.XPATH,
+            '//div[3]/div[3]/div/div[1]/div[2]/div[3]/div[1]/div/table/tbody/tr[1]/td[3]/label//input',
+        )
+        self.assertTrue(is_first_org_email_checkbox.is_selected())

From 082c96762a8bc630fff491482053a3cc27086c2d Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Fri, 6 Sep 2024 18:46:00 +0530
Subject: [PATCH 55/74] [fix] Tests

---
 openwisp_notifications/tests/test_selenium.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openwisp_notifications/tests/test_selenium.py b/openwisp_notifications/tests/test_selenium.py
index 3570f3e9..1e8adf11 100644
--- a/openwisp_notifications/tests/test_selenium.py
+++ b/openwisp_notifications/tests/test_selenium.py
@@ -48,7 +48,7 @@ def test_notification_preference_page(self):
             By.CSS_SELECTOR, 'input[type="checkbox"]'
         )
         for checkbox in all_checkboxes:
-            self.assertTrue(checkbox.is_selected())
+            self.assertFalse(checkbox.is_selected())
 
         # Check the org level web checkbox
         org_level_email_checkbox = WebDriverWait(self.driver, 10).until(

From c0b7357de4a36300d22c91cd04ce83b91e9da424 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Fri, 6 Sep 2024 20:20:56 +0530
Subject: [PATCH 56/74] [fix] Tests

---
 openwisp_notifications/tests/test_selenium.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openwisp_notifications/tests/test_selenium.py b/openwisp_notifications/tests/test_selenium.py
index 1e8adf11..cd947df8 100644
--- a/openwisp_notifications/tests/test_selenium.py
+++ b/openwisp_notifications/tests/test_selenium.py
@@ -43,6 +43,7 @@ def test_notification_preference_page(self):
             """,
             global_web_checkbox,
         )
+        time.sleep(0.4)
 
         all_checkboxes = self.driver.find_elements(
             By.CSS_SELECTOR, 'input[type="checkbox"]'

From 6106f9b2d8b55172c1a89dcbb070990e9a6b0da1 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Fri, 6 Sep 2024 21:08:52 +0530
Subject: [PATCH 57/74] [fix] Tests

---
 openwisp_notifications/tests/test_selenium.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openwisp_notifications/tests/test_selenium.py b/openwisp_notifications/tests/test_selenium.py
index cd947df8..24f0e211 100644
--- a/openwisp_notifications/tests/test_selenium.py
+++ b/openwisp_notifications/tests/test_selenium.py
@@ -56,7 +56,7 @@ def test_notification_preference_page(self):
             EC.presence_of_element_located(
                 (
                     By.XPATH,
-                    '//div[3]/div[3]/div/div[1]/div[2]/div[3]/div[1]/div/table/thead/tr/th[2]/div/label/span',
+                    '//div[3]/div[3]/div/div[1]/div[2]/div[3]/div/div/table/thead/tr/th[2]/div/label/span',
                 )
             )
         )
@@ -64,7 +64,7 @@ def test_notification_preference_page(self):
 
         web_checkboxes = self.driver.find_elements(
             By.XPATH,
-            '//div[3]/div[3]/div/div[1]/div[2]/div[3]/div[1]/div/table/tbody//input[@class="web-checkbox"]',
+            '//div[3]/div[3]/div/div[1]/div[2]/div[3]/div/div/table/tbody//input[@class="web-checkbox"]',
         )
 
         for checkbox in web_checkboxes:
@@ -75,7 +75,7 @@ def test_notification_preference_page(self):
             EC.presence_of_element_located(
                 (
                     By.XPATH,
-                    '//div[3]/div[3]/div/div[1]/div[2]/div[3]/div[1]/div/table/tbody/tr[1]/td[3]/label/span',
+                    '//div[3]/div[3]/div/div[1]/div[2]/div[3]/div/div/table/tbody/tr[1]/td[3]/label/span',
                 )
             )
         )
@@ -83,6 +83,6 @@ def test_notification_preference_page(self):
 
         is_first_org_email_checkbox = self.driver.find_element(
             By.XPATH,
-            '//div[3]/div[3]/div/div[1]/div[2]/div[3]/div[1]/div/table/tbody/tr[1]/td[3]/label//input',
+            '//div[3]/div[3]/div/div[1]/div[2]/div[3]/div/div/table/tbody/tr[1]/td[3]/label//input',
         )
         self.assertTrue(is_first_org_email_checkbox.is_selected())

From 234627e5c98bfaa377c69f1cb104f3e96d66eb16 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Sat, 7 Sep 2024 13:58:31 +0530
Subject: [PATCH 58/74] [fix] Tests

---
 .../openwisp-notifications/js/preferences.js  | 14 +++----
 openwisp_notifications/tests/test_selenium.py | 42 ++++---------------
 2 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/openwisp_notifications/static/openwisp-notifications/js/preferences.js b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
index aea10fdd..c7a5431d 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/preferences.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
@@ -97,7 +97,7 @@ function getAbsoluteUrl(url) {
             return;
         }
 
-        Object.keys(data).sort().forEach(function(orgName, index) {
+        Object.keys(data).sort().forEach(function(orgName, orgIndex) {
             const orgSettings = data[orgName].sort(function(a, b) {
                 return a.type_label.localeCompare(b.type_label);
             });
@@ -118,7 +118,7 @@ function getAbsoluteUrl(url) {
                     '<div style="display: inline-flex; align-items: center; justify-content: center; gap: 4px;">' +
                     '<span>' + gettext('Web') + '</span>' +
                     '<span class="tooltip-icon" data-tooltip="' + gettext('Enable or disable web notifications for this organization') + '">?</span>' +
-                    '<label class="switch">' +
+                    '<label class="switch" id="org-' + (orgIndex + 1) + '-web">' +
                     '<input type="checkbox" class="main-checkbox" data-column="web" data-organization-id="' + orgSettings[0].organization + '" ' + (isGlobalWebChecked ? 'checked' : '') + ' />' +
                     '<span class="slider round"></span>' +
                     '</label>' +
@@ -128,7 +128,7 @@ function getAbsoluteUrl(url) {
                     '<div style="display: inline-flex; align-items: center; justify-content: center; gap: 4px;">' +
                     '<span>' + gettext('Email') + '</span>' +
                     '<span class="tooltip-icon" data-tooltip="' + gettext('Enable or disable email notifications for this organization') + '">?</span>' +
-                    '<label class="switch">' +
+                    '<label class="switch" id="org-' + (orgIndex + 1) + '-email">' +
                     '<input type="checkbox" class="main-checkbox" data-organization-id="' + orgSettings[0].organization + '" data-column="email" ' + (isGlobalEmailChecked ? 'checked' : '') + ' />' +
                     '<span class="slider round"></span>' +
                     '</label>' +
@@ -139,18 +139,18 @@ function getAbsoluteUrl(url) {
                     '<tbody></tbody>' +
                     '</table>'
                 );
-                orgSettings.forEach(function(setting) {
+                orgSettings.forEach(function(setting, settingIndex) {
                     const row = $(
                         '<tr>' +
                         '<td>' + setting.type_label + '</td>' +
                         '<td>' +
-                        '<label class="switch">' +
+                        '<label class="switch" id="org-' + (orgIndex + 1) + '-web-' + (settingIndex + 1) + '">' +
                         '<input type="checkbox" class="web-checkbox" ' + (setting.web ? 'checked' : '') + ' data-pk="' + setting.id + '" data-organization-id="' + setting.organization + '" data-type="web" />' +
                         '<span class="slider round"></span>' +
                         '</label>' +
                         '</td>' +
                         '<td>' +
-                        '<label class="switch">' +
+                        '<label class="switch" id="org-' + (orgIndex + 1) + '-email-' + (settingIndex + 1) + '">' +
                         '<input type="checkbox" class="email-checkbox" ' + (setting.email ? 'checked' : '') + ' data-pk="' + setting.id + '" data-organization-id="' + setting.organization + '" data-type="email" />' +
                         '<span class="slider round"></span>' +
                         '</label>' +
@@ -166,7 +166,7 @@ function getAbsoluteUrl(url) {
             }
             orgPanelsContainer.append(orgPanel);
 
-            if (index === 0) {
+            if (orgIndex === 0) {
                 orgContent.addClass('active');
                 orgPanel.find('.toggle-icon').removeClass('collapsed').addClass('expanded');
             } else {
diff --git a/openwisp_notifications/tests/test_selenium.py b/openwisp_notifications/tests/test_selenium.py
index 24f0e211..47e0a0da 100644
--- a/openwisp_notifications/tests/test_selenium.py
+++ b/openwisp_notifications/tests/test_selenium.py
@@ -35,15 +35,8 @@ def test_notification_preference_page(self):
         global_web_checkbox = WebDriverWait(self.driver, 10).until(
             EC.presence_of_element_located((By.ID, 'global-web'))
         )
-
-        self.driver.execute_script(
-            """
-            arguments[0].checked = false;
-            arguments[0].dispatchEvent(new Event('change', { bubbles: true }));
-            """,
-            global_web_checkbox,
-        )
-        time.sleep(0.4)
+        global_web_label = global_web_checkbox.find_element(By.XPATH, './parent::label')
+        global_web_label.click()
 
         all_checkboxes = self.driver.find_elements(
             By.CSS_SELECTOR, 'input[type="checkbox"]'
@@ -51,38 +44,21 @@ def test_notification_preference_page(self):
         for checkbox in all_checkboxes:
             self.assertFalse(checkbox.is_selected())
 
-        # Check the org level web checkbox
-        org_level_email_checkbox = WebDriverWait(self.driver, 10).until(
-            EC.presence_of_element_located(
-                (
-                    By.XPATH,
-                    '//div[3]/div[3]/div/div[1]/div[2]/div[3]/div/div/table/thead/tr/th[2]/div/label/span',
-                )
-            )
+        # Check the org-level web checkbox
+        org_level_web_checkbox = WebDriverWait(self.driver, 10).until(
+            EC.presence_of_element_located((By.ID, 'org-1-web'))
         )
-        org_level_email_checkbox.click()
+        org_level_web_checkbox.click()
 
         web_checkboxes = self.driver.find_elements(
-            By.XPATH,
-            '//div[3]/div[3]/div/div[1]/div[2]/div[3]/div/div/table/tbody//input[@class="web-checkbox"]',
+            By.CSS_SELECTOR, 'input[id^="org-1-web-"]'
         )
-
         for checkbox in web_checkboxes:
             self.assertTrue(checkbox.is_selected())
 
         # Check a single email checkbox
         first_org_email_checkbox = WebDriverWait(self.driver, 10).until(
-            EC.presence_of_element_located(
-                (
-                    By.XPATH,
-                    '//div[3]/div[3]/div/div[1]/div[2]/div[3]/div/div/table/tbody/tr[1]/td[3]/label/span',
-                )
-            )
+            EC.presence_of_element_located((By.ID, 'org-1-email-1'))
         )
         first_org_email_checkbox.click()
-
-        is_first_org_email_checkbox = self.driver.find_element(
-            By.XPATH,
-            '//div[3]/div[3]/div/div[1]/div[2]/div[3]/div/div/table/tbody/tr[1]/td[3]/label//input',
-        )
-        self.assertTrue(is_first_org_email_checkbox.is_selected())
+        self.assertTrue(first_org_email_checkbox.find_element(By.TAG_NAME, 'input').is_selected())

From 3d53083b944ef08b860b2544e3052cc4b948cdf1 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Sat, 7 Sep 2024 15:08:35 +0530
Subject: [PATCH 59/74] [fix] Should fix Tests

---
 openwisp_notifications/tests/test_selenium.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/openwisp_notifications/tests/test_selenium.py b/openwisp_notifications/tests/test_selenium.py
index 47e0a0da..d6c3b48d 100644
--- a/openwisp_notifications/tests/test_selenium.py
+++ b/openwisp_notifications/tests/test_selenium.py
@@ -5,9 +5,12 @@
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import WebDriverWait
 
+from openwisp_notifications.swapper import swapper_load_model
 from openwisp_users.tests.utils import TestOrganizationMixin
 from openwisp_utils.test_selenium_mixins import SeleniumTestMixin
 
+OrganizationUser = swapper_load_model('openwisp_users', 'OrganizationUser')
+
 
 class TestSelenium(
     SeleniumTestMixin,
@@ -21,6 +24,8 @@ def setUp(self):
             username=self.admin_username, password=self.admin_password
         )
         self.driver = self.web_driver
+        org = self._create_org()
+        OrganizationUser.objects.create(user=self.admin, organization=org)
 
     def open(self, url, driver=None):
         driver = self.driver or self.web_driver
@@ -46,7 +51,7 @@ def test_notification_preference_page(self):
 
         # Check the org-level web checkbox
         org_level_web_checkbox = WebDriverWait(self.driver, 10).until(
-            EC.presence_of_element_located((By.ID, 'org-1-web'))
+            EC.visibility_of_element_located((By.ID, 'org-1-web'))
         )
         org_level_web_checkbox.click()
 
@@ -61,4 +66,6 @@ def test_notification_preference_page(self):
             EC.presence_of_element_located((By.ID, 'org-1-email-1'))
         )
         first_org_email_checkbox.click()
-        self.assertTrue(first_org_email_checkbox.find_element(By.TAG_NAME, 'input').is_selected())
+        self.assertTrue(
+            first_org_email_checkbox.find_element(By.TAG_NAME, 'input').is_selected()
+        )

From 9661ae6bcd9af34b4cef4ffc380dd0f0007030dd Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Sat, 7 Sep 2024 16:12:20 +0530
Subject: [PATCH 60/74] [chore] Bump changes

---
 openwisp_notifications/api/serializers.py |  6 ------
 openwisp_notifications/api/views.py       | 22 +++++++++++++---------
 openwisp_notifications/tests/test_api.py  |  7 +++++++
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/openwisp_notifications/api/serializers.py b/openwisp_notifications/api/serializers.py
index 7698fb0d..dba0b9b5 100644
--- a/openwisp_notifications/api/serializers.py
+++ b/openwisp_notifications/api/serializers.py
@@ -97,9 +97,3 @@ class Meta:
 class NotificationSettingUpdateSerializer(serializers.Serializer):
     email = serializers.BooleanField()
     web = serializers.BooleanField()
-
-    def update(self, instance, validated_data):
-        instance.email = validated_data.get('email', instance.email)
-        instance.web = validated_data.get('web', instance.web)
-        instance.save()
-        return instance
diff --git a/openwisp_notifications/api/views.py b/openwisp_notifications/api/views.py
index 74f9c772..4067248a 100644
--- a/openwisp_notifications/api/views.py
+++ b/openwisp_notifications/api/views.py
@@ -116,18 +116,13 @@ class BaseNotificationSettingView(GenericAPIView):
     model = NotificationSetting
     serializer_class = NotificationSettingSerializer
     authentication_classes = [BearerAuthentication, SessionAuthentication]
-    permission_classes = [PreferencesPermission]
+    permission_classes = [IsAuthenticated, PreferencesPermission]
 
     def get_queryset(self):
         if getattr(self, 'swagger_fake_view', False):
             return NotificationSetting.objects.none()  # pragma: no cover
-
-        user_id = self.kwargs.get('user_id')
-
-        if user_id:
-            return NotificationSetting.objects.filter(user_id=user_id)
-
-        return NotificationSetting.objects.filter(user=self.request.user)
+        user_id = self.kwargs.get('user_id', self.request.user.id)
+        return NotificationSetting.objects.filter(user=user_id)
 
 
 class NotificationSettingListView(BaseNotificationSettingView, ListModelMixin):
@@ -216,8 +211,17 @@ def post(self, request, user_id, organization_id):
         )
         serializer = self.get_serializer(data=request.data)
         if serializer.is_valid():
+            validated_data = serializer.validated_data
             for notification_setting in notification_settings:
-                serializer.update(notification_setting, serializer.validated_data)
+                notification_setting.email = validated_data.get(
+                    'email', notification_setting.email
+                )
+                notification_setting.web = validated_data.get(
+                    'web', notification_setting.web
+                )
+            NotificationSetting.objects.bulk_update(
+                notification_settings, ['email', 'web']
+            )
             return Response(status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
diff --git a/openwisp_notifications/tests/test_api.py b/openwisp_notifications/tests/test_api.py
index 1b1face6..196455a8 100644
--- a/openwisp_notifications/tests/test_api.py
+++ b/openwisp_notifications/tests/test_api.py
@@ -599,7 +599,14 @@ def test_list_notification_setting_filtering(self):
             ns = response.data['results'].pop()
             self.assertEqual(ns['type'], 'default')
 
+        with self.subTest('Test without authenticated'):
+            self.client.logout()
+            user_url = self._get_path('user_notification_setting_list', tester.pk)
+            response = self.client.get(user_url)
+            self.assertEqual(response.status_code, 401)
+
         with self.subTest('Test filtering by user_id as admin'):
+            self.client.force_login(self.admin)
             user_url = self._get_path('user_notification_setting_list', tester.pk)
             response = self.client.get(user_url)
             self.assertEqual(response.status_code, 200)

From 0ecaa74d373e8db96ad07fc8e9802df7972aa825 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Sat, 7 Sep 2024 16:51:35 +0530
Subject: [PATCH 61/74] [chore] Reuse serializer

---
 openwisp_notifications/api/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openwisp_notifications/api/views.py b/openwisp_notifications/api/views.py
index 4067248a..dc435e35 100644
--- a/openwisp_notifications/api/views.py
+++ b/openwisp_notifications/api/views.py
@@ -241,7 +241,7 @@ def get(self, request, user_id):
         return Response(serializer.data, status=status.HTTP_200_OK)
 
     def post(self, request, user_id):
-        serializer = self.get_serializer(data=request.data)
+        serializer = NotificationSettingUpdateSerializer(data=request.data)
         if serializer.is_valid():
             email = serializer.validated_data.get('email')
             web = serializer.validated_data.get('web')

From 4ec65b7fe3e1d925a673ef580da6a9dc90918e46 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Sat, 7 Sep 2024 16:58:11 +0530
Subject: [PATCH 62/74] [chore] Increase waiting time for selenium tests

---
 openwisp_notifications/tests/test_selenium.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/openwisp_notifications/tests/test_selenium.py b/openwisp_notifications/tests/test_selenium.py
index d6c3b48d..629d2130 100644
--- a/openwisp_notifications/tests/test_selenium.py
+++ b/openwisp_notifications/tests/test_selenium.py
@@ -1,5 +1,3 @@
-import time
-
 from django.contrib.staticfiles.testing import StaticLiveServerTestCase
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
@@ -34,10 +32,10 @@ def open(self, url, driver=None):
     def test_notification_preference_page(self):
         self.login()
         self.open('/notifications/preferences/')
-        time.sleep(0.1)
+        self.driver.implicitly_wait(1)
 
         # Uncheck the global web checkbox
-        global_web_checkbox = WebDriverWait(self.driver, 10).until(
+        global_web_checkbox = WebDriverWait(self.driver, 30).until(
             EC.presence_of_element_located((By.ID, 'global-web'))
         )
         global_web_label = global_web_checkbox.find_element(By.XPATH, './parent::label')

From b9d62b4e41caa8c7faf4b37424e184dbe3529cb9 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Sat, 7 Sep 2024 17:14:11 +0530
Subject: [PATCH 63/74] [chore] Update preference page org dropdown icon
 position

---
 .../static/openwisp-notifications/css/preferences.css           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openwisp_notifications/static/openwisp-notifications/css/preferences.css b/openwisp_notifications/static/openwisp-notifications/css/preferences.css
index 1af9263f..31f4c28e 100644
--- a/openwisp_notifications/static/openwisp-notifications/css/preferences.css
+++ b/openwisp_notifications/static/openwisp-notifications/css/preferences.css
@@ -79,7 +79,7 @@ span.toggle-icon.collapsed {
   background-position: 0px -84px;
 }
 span.toggle-icon.expanded {
-  background-position: 0px -64px;
+  background-position: 0px -44px;
 }
 .tooltip-icon {
   display: inline-block;

From baa61111bafde1b5226514534d992b7dc916054a Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Wed, 11 Sep 2024 18:33:17 +0530
Subject: [PATCH 64/74] [fix] Error displaying __str__ for global notification
 setting

---
 openwisp_notifications/base/models.py              | 12 ++++++++----
 .../tests/test_notification_setting.py             | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/openwisp_notifications/base/models.py b/openwisp_notifications/base/models.py
index 59402a13..dd5eeb5e 100644
--- a/openwisp_notifications/base/models.py
+++ b/openwisp_notifications/base/models.py
@@ -279,10 +279,14 @@ class Meta:
         ]
 
     def __str__(self):
-        return '{type} - {organization}'.format(
-            type=self.type_config['verbose_name'],
-            organization=self.organization,
-        )
+        type_name = self.type_config.get('verbose_name', 'Global Setting')
+        if self.organization:
+            return '{type} - {organization}'.format(
+                type=type_name,
+                organization=self.organization,
+            )
+        else:
+            return type_name
 
     def save(self, *args, **kwargs):
         if not self.web_notification:
diff --git a/openwisp_notifications/tests/test_notification_setting.py b/openwisp_notifications/tests/test_notification_setting.py
index 254ddb9f..d91170d2 100644
--- a/openwisp_notifications/tests/test_notification_setting.py
+++ b/openwisp_notifications/tests/test_notification_setting.py
@@ -251,3 +251,17 @@ def test_deleted_notificationsetting_autocreated(self):
         self.assertEqual(ns_queryset.count(), 1)
         ns.refresh_from_db()
         self.assertEqual(ns.deleted, False)
+
+    def test_global_notification_setting_delete(self):
+        admin = self._get_admin()
+        global_setting = NotificationSetting.objects.get(
+            user=admin, type=None, organization=None
+        )
+        self.assertEqual(str(global_setting), 'Global Setting')
+        global_setting.delete()
+        self.assertEqual(
+            NotificationSetting.objects.filter(
+                user=admin, type=None, organization=None
+            ).count(),
+            0,
+        )

From c10952e879da50ead6b0037be0d5f556c62e206e Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Wed, 11 Sep 2024 18:45:20 +0530
Subject: [PATCH 65/74] [chore] Verify global setting creation in
 test_post_migration_handler test

---
 openwisp_notifications/tests/test_notification_setting.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/openwisp_notifications/tests/test_notification_setting.py b/openwisp_notifications/tests/test_notification_setting.py
index d91170d2..d3b27a33 100644
--- a/openwisp_notifications/tests/test_notification_setting.py
+++ b/openwisp_notifications/tests/test_notification_setting.py
@@ -122,6 +122,14 @@ def test_post_migration_handler(self):
             queryset.filter(user=org_user.user).count(), 1 * notification_types_count
         )
 
+        # Global Notification Setting for admin is created
+        self.assertEqual(
+            NotificationSetting.objects.filter(
+                user=admin, type=None, organization=None
+            ).count(),
+            1,
+        )
+
     def test_superuser_demoted_to_user(self):
         admin = self._get_admin()
         admin.is_superuser = False

From 7efa79ea8fdad2757bfa4f4c6cc90f1414aaa9b6 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Wed, 11 Sep 2024 18:46:53 +0530
Subject: [PATCH 66/74] [chore] Remove transition on accordion

---
 .../static/openwisp-notifications/css/preferences.css            | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openwisp_notifications/static/openwisp-notifications/css/preferences.css b/openwisp_notifications/static/openwisp-notifications/css/preferences.css
index 31f4c28e..0319c10b 100644
--- a/openwisp_notifications/static/openwisp-notifications/css/preferences.css
+++ b/openwisp_notifications/static/openwisp-notifications/css/preferences.css
@@ -73,7 +73,6 @@ span.toggle-icon {
   margin-right: 5px;
   background: url(/static/admin/img/sorting-icons.svg) 0 0 no-repeat;
   background-size: 20px auto;
-  transition: background-position 0.3s ease;
 }
 span.toggle-icon.collapsed {
   background-position: 0px -84px;

From 0e687b4bdfa48a6114c27cbf5eafb816395fc12b Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Wed, 11 Sep 2024 20:16:38 +0530
Subject: [PATCH 67/74] [chore] Update tests

---
 openwisp_notifications/tests/test_notification_setting.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/openwisp_notifications/tests/test_notification_setting.py b/openwisp_notifications/tests/test_notification_setting.py
index d3b27a33..8156c44e 100644
--- a/openwisp_notifications/tests/test_notification_setting.py
+++ b/openwisp_notifications/tests/test_notification_setting.py
@@ -122,7 +122,13 @@ def test_post_migration_handler(self):
             queryset.filter(user=org_user.user).count(), 1 * notification_types_count
         )
 
-        # Global Notification Setting for admin is created
+        # Delete existing global notification settings
+        NotificationSetting.objects.filter(
+            user=admin, type=None, organization=None
+        ).delete()
+
+        # Check Global Notification Setting is created
+        notification_type_registered_unregistered_handler(sender=admin)
         self.assertEqual(
             NotificationSetting.objects.filter(
                 user=admin, type=None, organization=None

From 9156700215f0123ff1c9688c62b95a63bcae8224 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Fri, 13 Sep 2024 23:11:59 +0530
Subject: [PATCH 68/74] [chore] Bump changes

- Removed preference api endpoint and just used the `/user-setting`
endpoint.
- Fixed some bugs in preference page for handling few cases like
enabling of global web setting when any one email setting is turned on
(toggles it off).
- Handled validation of only one global setting per user in model level.
---
 openwisp_notifications/api/filters.py         |  5 -
 openwisp_notifications/api/urls.py            |  5 -
 openwisp_notifications/api/views.py           | 53 ++--------
 openwisp_notifications/base/models.py         | 29 +++++-
 .../openwisp-notifications/js/preferences.js  | 99 ++++++++++---------
 openwisp_notifications/tests/test_api.py      | 94 ++----------------
 .../tests/test_notifications.py               | 20 +++-
 7 files changed, 117 insertions(+), 188 deletions(-)

diff --git a/openwisp_notifications/api/filters.py b/openwisp_notifications/api/filters.py
index 0f785fde..b67a5604 100644
--- a/openwisp_notifications/api/filters.py
+++ b/openwisp_notifications/api/filters.py
@@ -8,8 +8,3 @@ class NotificationSettingFilter(OrganizationMembershipFilter):
     class Meta(OrganizationMembershipFilter.Meta):
         model = NotificationSetting
         fields = OrganizationMembershipFilter.Meta.fields + ['type']
-
-    @property
-    def qs(self):
-        parent_qs = super().qs
-        return parent_qs.exclude(organization__isnull=True, type__isnull=True)
diff --git a/openwisp_notifications/api/urls.py b/openwisp_notifications/api/urls.py
index 482c8001..5550fc39 100644
--- a/openwisp_notifications/api/urls.py
+++ b/openwisp_notifications/api/urls.py
@@ -50,11 +50,6 @@ def get_api_urls(api_views=None):
             views.organization_notification_setting,
             name='organization_notification_setting',
         ),
-        path(
-            'user/<uuid:user_id>/preference/',
-            views.notification_preference,
-            name='notification_preference',
-        ),
         # DEPRECATED
         path(
             'user/user-setting/',
diff --git a/openwisp_notifications/api/views.py b/openwisp_notifications/api/views.py
index dc435e35..4dcc5216 100644
--- a/openwisp_notifications/api/views.py
+++ b/openwisp_notifications/api/views.py
@@ -212,50 +212,18 @@ def post(self, request, user_id, organization_id):
         serializer = self.get_serializer(data=request.data)
         if serializer.is_valid():
             validated_data = serializer.validated_data
-            for notification_setting in notification_settings:
-                notification_setting.email = validated_data.get(
-                    'email', notification_setting.email
-                )
-                notification_setting.web = validated_data.get(
-                    'web', notification_setting.web
-                )
-            NotificationSetting.objects.bulk_update(
-                notification_settings, ['email', 'web']
-            )
-            return Response(status=status.HTTP_200_OK)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-
-class NotificationPreferenceView(GenericAPIView):
-    permission_classes = [IsAuthenticated, PreferencesPermission]
-    serializer_class = NotificationSettingUpdateSerializer
+            web = validated_data.get('web')
+            email = validated_data.get('email')
 
-    def get(self, request, user_id):
-        notification_settings, created = NotificationSetting.objects.get_or_create(
-            user_id=user_id,
-            organization=None,
-            type=None,
-            defaults={'email': True, 'web': True},
-        )
-        serializer = self.get_serializer(notification_settings)
-        return Response(serializer.data, status=status.HTTP_200_OK)
+            for notification_setting in notification_settings:
+                if web and not email:
+                    notification_setting.web = web
+                else:
+                    notification_setting.web = web
+                    notification_setting.email = email
 
-    def post(self, request, user_id):
-        serializer = NotificationSettingUpdateSerializer(data=request.data)
-        if serializer.is_valid():
-            email = serializer.validated_data.get('email')
-            web = serializer.validated_data.get('web')
-            (
-                notification_settings,
-                created,
-            ) = NotificationSetting.objects.update_or_create(
-                user_id=user_id,
-                organization=None,
-                type=None,
-                defaults={'email': email, 'web': web},
-            )
-            NotificationSetting.objects.filter(user_id=user_id).update(
-                email=email, web=web
+            NotificationSetting.objects.bulk_update(
+                notification_settings, ['web', 'email']
             )
             return Response(status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -270,4 +238,3 @@ def post(self, request, user_id):
 organization_notification_setting = OrganizationNotificationSettingView.as_view()
 ignore_object_notification_list = IgnoreObjectNotificationListView.as_view()
 ignore_object_notification = IgnoreObjectNotificationView.as_view()
-notification_preference = NotificationPreferenceView.as_view()
diff --git a/openwisp_notifications/base/models.py b/openwisp_notifications/base/models.py
index dd5eeb5e..b99e9704 100644
--- a/openwisp_notifications/base/models.py
+++ b/openwisp_notifications/base/models.py
@@ -7,7 +7,7 @@
 from django.contrib.sites.models import Site
 from django.core.cache import cache
 from django.db import models
-from django.db.models.constraints import UniqueConstraint
+from django.db.models.constraints import UniqueConstraint, ValidationError
 from django.template.loader import render_to_string
 from django.urls import reverse
 from django.utils.functional import cached_property
@@ -288,9 +288,36 @@ def __str__(self):
         else:
             return type_name
 
+    def validate_global_setting(self):
+        if self.organization is None and self.type is None:
+            if (
+                self.__class__.objects.filter(
+                    user=self.user,
+                    organization=None,
+                    type=None,
+                )
+                .exclude(pk=self.pk)
+                .exists()
+            ):
+                raise ValidationError("There can only be one global setting per user.")
+
     def save(self, *args, **kwargs):
+        self.validate_global_setting()
         if not self.web_notification:
             self.email = self.web_notification
+        if not self.organization and not self.type:
+            try:
+                original = self.__class__.objects.get(pk=self.pk)
+                if self.web and (self.email == original.email):
+                    self.user.notificationsetting_set.exclude(pk=self.pk).update(
+                        web=self.web
+                    )
+                else:
+                    self.user.notificationsetting_set.exclude(pk=self.pk).update(
+                        web=self.web, email=self.email
+                    )
+            except self.__class__.DoesNotExist:
+                pass
         return super().save(*args, **kwargs)
 
     def full_clean(self, *args, **kwargs):
diff --git a/openwisp_notifications/static/openwisp-notifications/js/preferences.js b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
index c7a5431d..182232a5 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/preferences.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
@@ -10,42 +10,15 @@ function getAbsoluteUrl(url) {
 
 (function ($) {
     let isUpdateInProgress = false;
+    let globalSettingId = null;
     $('#ow-notifications-loader').removeClass('ow-hide');
 
     $(document).ready(function () {
         const userId = $('.settings-container').data('user-id');
-        fetchGlobalSettings(userId);
+        fetchNotificationSettings(userId);
     });
 
-    function fetchGlobalSettings(userId) {
-        $.ajax({
-            url: getAbsoluteUrl(`/api/v1/notifications/user/${userId}/preference/`),
-            dataType: 'json',
-            beforeSend: function () {
-                $('.loader').show();
-                $('.global-settings').hide();
-            },
-            complete: function () {
-                $('.loader').hide();
-            },
-            success: function (globalData) {
-                const isGlobalWebChecked = globalData.web;
-                const isGlobalEmailChecked = globalData.email;
-
-                $('#global-web').prop('checked', isGlobalWebChecked);
-                $('#global-email').prop('checked', isGlobalEmailChecked);
-
-                initializeGlobalSettingsEventListener(userId);
-
-                fetchNotificationSettings(userId, isGlobalWebChecked, isGlobalEmailChecked);
-            },
-            error: function () {
-                showToast('error', gettext('Error fetching global settings. Please try again.'));
-            }
-        });
-    }
-
-    function fetchNotificationSettings(userId, isGlobalWebChecked, isGlobalEmailChecked) {
+    function fetchNotificationSettings(userId) {
         let allResults = [];
         let currentPage = 1;
 
@@ -68,11 +41,7 @@ function getAbsoluteUrl(url) {
                         // Continue fetching next page
                         fetchPage();
                     } else {
-                        // Runs after all the pages are fetched
-                        const groupedData = groupBy(allResults, 'organization_name');
-                        renderNotificationSettings(groupedData, isGlobalWebChecked, isGlobalEmailChecked);
-                        initializeEventListeners(userId);
-                        $('.global-settings').show();
+                        processNotificationSettings(allResults, userId);
                     }
                 },
                 error: function () {
@@ -82,6 +51,28 @@ function getAbsoluteUrl(url) {
         })();
     }
 
+    function processNotificationSettings(allResults, userId) {
+        const globalSetting = allResults.find(setting => setting.organization === null && setting.type === null);
+        const filteredResults = allResults.filter(setting => !(setting.organization === null && setting.type === null));
+
+        if (globalSetting) {
+            const isGlobalWebChecked = globalSetting.web;
+            const isGlobalEmailChecked = globalSetting.email;
+            globalSettingId = globalSetting.id;
+
+            $('#global-web').prop('checked', isGlobalWebChecked);
+            $('#global-email').prop('checked', isGlobalEmailChecked);
+
+            initializeGlobalSettingsEventListener(userId);
+        }
+
+        const groupedData = groupBy(filteredResults, 'organization_name');
+        renderNotificationSettings(groupedData);
+
+        initializeEventListeners(userId);
+        $('.global-settings').show();
+    }
+
     function groupBy(array, key) {
         return array.reduce((result, currentValue) => {
             (result[currentValue[key]] = result[currentValue[key]] || []).push(currentValue);
@@ -89,7 +80,7 @@ function getAbsoluteUrl(url) {
         }, {});
     }
 
-    function renderNotificationSettings(data, isGlobalWebChecked, isGlobalEmailChecked) {
+    function renderNotificationSettings(data) {
         const orgPanelsContainer = $('#org-panels').empty();
 
         if (Object.keys(data).length === 0) {
@@ -119,7 +110,7 @@ function getAbsoluteUrl(url) {
                     '<span>' + gettext('Web') + '</span>' +
                     '<span class="tooltip-icon" data-tooltip="' + gettext('Enable or disable web notifications for this organization') + '">?</span>' +
                     '<label class="switch" id="org-' + (orgIndex + 1) + '-web">' +
-                    '<input type="checkbox" class="main-checkbox" data-column="web" data-organization-id="' + orgSettings[0].organization + '" ' + (isGlobalWebChecked ? 'checked' : '') + ' />' +
+                    '<input type="checkbox" class="main-checkbox" data-column="web" data-organization-id="' + orgSettings[0].organization + '" />' +
                     '<span class="slider round"></span>' +
                     '</label>' +
                     '</div>' +
@@ -129,7 +120,7 @@ function getAbsoluteUrl(url) {
                     '<span>' + gettext('Email') + '</span>' +
                     '<span class="tooltip-icon" data-tooltip="' + gettext('Enable or disable email notifications for this organization') + '">?</span>' +
                     '<label class="switch" id="org-' + (orgIndex + 1) + '-email">' +
-                    '<input type="checkbox" class="main-checkbox" data-organization-id="' + orgSettings[0].organization + '" data-column="email" ' + (isGlobalEmailChecked ? 'checked' : '') + ' />' +
+                    '<input type="checkbox" class="main-checkbox" data-organization-id="' + orgSettings[0].organization + '" data-column="email" />' +
                     '<span class="slider round"></span>' +
                     '</label>' +
                     '</div>' +
@@ -263,6 +254,7 @@ function getAbsoluteUrl(url) {
             if (isUpdateInProgress) {
                 return;
             }
+            const table = $(this).closest('table');
             const orgId = $(this).data('organization-id');
             const triggeredBy = $(this).data('column');
 
@@ -271,6 +263,14 @@ function getAbsoluteUrl(url) {
 
             let previousOrgWebChecked, previousOrgEmailChecked;
 
+            const previousWebState = table.find('.web-checkbox').map(function() {
+                return { id: $(this).data('pk'), checked: $(this).is(':checked') };
+            }).get();
+
+            const previousEmailState = table.find('.email-checkbox').map(function() {
+                return { id: $(this).data('pk'), checked: $(this).is(':checked') };
+            }).get();
+
             if (triggeredBy === 'email') {
                 previousOrgEmailChecked = !isOrgEmailChecked;
                 previousOrgWebChecked = isOrgWebChecked;
@@ -297,9 +297,10 @@ function getAbsoluteUrl(url) {
             $(`.main-checkbox[data-organization-id="${orgId}"][data-column="web"]`).prop('checked', isOrgWebChecked);
             $(`.main-checkbox[data-organization-id="${orgId}"][data-column="email"]`).prop('checked', isOrgEmailChecked);
 
-            const table = $(this).closest('table');
             table.find('.web-checkbox').prop('checked', isOrgWebChecked).change();
-            table.find('.email-checkbox').prop('checked', isOrgEmailChecked).change();
+            if ((triggeredBy === 'web' && !isOrgWebChecked) || triggeredBy === 'email') {
+                table.find('.email-checkbox').prop('checked', isOrgEmailChecked).change();
+            }
 
             updateMainCheckboxes(table);
 
@@ -316,8 +317,12 @@ function getAbsoluteUrl(url) {
                     showToast('error', gettext('Something went wrong. Please try again.'));
                     $(`.main-checkbox[data-organization-id="${orgId}"][data-column="web"]`).prop('checked', previousOrgWebChecked);
                     $(`.main-checkbox[data-organization-id="${orgId}"][data-column="email"]`).prop('checked', previousOrgEmailChecked);
-                    table.find('.web-checkbox').prop('checked', previousOrgWebChecked);
-                    table.find('.email-checkbox').prop('checked', previousOrgEmailChecked);
+                    previousWebState.forEach(function(item) {
+                        $(`.web-checkbox[data-pk="${item.id}"]`).prop('checked', item.checked);
+                    });
+                    previousEmailState.forEach(function(item) {
+                        $(`.email-checkbox[data-pk="${item.id}"]`).prop('checked', item.checked);
+                    });
                     updateMainCheckboxes(table);
                 },
                 complete: function () {
@@ -390,13 +395,15 @@ function getAbsoluteUrl(url) {
             $('#global-email').prop('checked', isGlobalEmailChecked);
 
             $('.main-checkbox[data-column="web"]').prop('checked', isGlobalWebChecked).change();
-            $('.main-checkbox[data-column="email"]').prop('checked', isGlobalEmailChecked).change();
             $('.web-checkbox').prop('checked', isGlobalWebChecked);
-            $('.email-checkbox').prop('checked', isGlobalEmailChecked);
+            if ((triggeredBy === 'global-web' && !isGlobalWebChecked) || triggeredBy === 'global-email') {
+                $('.email-checkbox').prop('checked', isGlobalEmailChecked);
+                $('.main-checkbox[data-column="email"]').prop('checked', isGlobalEmailChecked).change();
+            }
 
             $.ajax({
-                type: 'POST',
-                url: getAbsoluteUrl(`/api/v1/notifications/user/${userId}/preference/`),
+                type: 'PATCH',
+                url: getAbsoluteUrl(`/api/v1/notifications/user/${userId}/user-setting/${globalSettingId}/`),
                 headers: { 'X-CSRFToken': $('input[name="csrfmiddlewaretoken"]').val() },
                 contentType: 'application/json',
                 data: JSON.stringify(data),
diff --git a/openwisp_notifications/tests/test_api.py b/openwisp_notifications/tests/test_api.py
index 196455a8..45ce24ea 100644
--- a/openwisp_notifications/tests/test_api.py
+++ b/openwisp_notifications/tests/test_api.py
@@ -259,10 +259,10 @@ def test_bearer_authentication(self, mocked_test):
         self.client.logout()
         notify.send(sender=self.admin, type='default', target=self._get_org_user())
         n = Notification.objects.first()
-        notification_setting = NotificationSetting.objects.first()
-        notification_setting_count = NotificationSetting.objects.exclude(
-            organization__isnull=True
-        ).count()
+        notification_setting = NotificationSetting.objects.exclude(
+            organization=None
+        ).first()
+        notification_setting_count = NotificationSetting.objects.count()
         token = self._obtain_auth_token(username='admin', password='tester')
 
         with self.subTest('Test listing all notifications'):
@@ -501,9 +501,7 @@ def test_obsolete_notifications_busy_worker(self, mocked_task):
 
     def test_notification_setting_list_api(self):
         self._create_org_user(is_admin=True)
-        number_of_settings = NotificationSetting.objects.filter(
-            user=self.admin, organization__isnull=False
-        ).count()
+        number_of_settings = NotificationSetting.objects.filter(user=self.admin).count()
         url = self._get_path('notification_setting_list')
 
         with self.subTest('Test notification setting list view'):
@@ -548,7 +546,7 @@ def test_notification_setting_list_api(self):
                     next_response.data['next'],
                 )
             else:
-                self.assertIsNone(next_response.data['next'])
+                self.assertIsNotNone(next_response.data['next'])
 
         with self.subTest('Test individual result object'):
             response = self.client.get(url)
@@ -564,9 +562,7 @@ def test_list_notification_setting_filtering(self):
         tester = self._create_user()
 
         with self.subTest('Test listing notification setting without filters'):
-            count = NotificationSetting.objects.exclude(
-                organization__isnull=True
-            ).count()
+            count = NotificationSetting.objects.count()
             response = self.client.get(url)
             self.assertEqual(response.status_code, 200)
             self.assertEqual(len(response.data['results']), count)
@@ -850,82 +846,6 @@ def test_organization_notification_setting_update(self):
             response = self.client.post(url, data={'web': 'invalid'})
             self.assertEqual(response.status_code, 400)
 
-    def test_get_notification_preference(self):
-        tester = self._create_user()
-
-        with self.subTest('Test for current user'):
-            self.client.force_login(self.admin)
-            url = self._get_path('notification_preference', self.admin.pk)
-            response = self.client.get(url)
-            self.assertEqual(response.status_code, 200)
-            self.assertIn('web', response.json())
-            self.assertIn('email', response.json())
-            self.assertTrue(response.json()['web'])
-            self.assertTrue(response.json()['email'])
-
-        with self.subTest('Test for admin user accessing another user'):
-            self.client.force_login(self.admin)
-            url = self._get_path('notification_preference', tester.pk)
-            response = self.client.get(url)
-            self.assertEqual(response.status_code, 200)
-            self.assertIn('web', response.json())
-            self.assertIn('email', response.json())
-            self.assertTrue(response.json()['web'])
-            self.assertTrue(response.json()['email'])
-
-        with self.subTest('Test for non-admin user accessing another user'):
-            self.client.force_login(tester)
-            url = self._get_path('notification_preference', self.admin.pk)
-            response = self.client.get(url)
-            self.assertEqual(response.status_code, 403)
-
-    def test_post_notification_preference(self):
-        tester = self._create_user()
-
-        with self.subTest('Test for current user'):
-            url = self._get_path(
-                'notification_preference',
-                self.admin.pk,
-            )
-            response = self.client.post(url, data={'web': True, 'email': True})
-            self.assertEqual(response.status_code, 200)
-            notification_setting = NotificationSetting.objects.get(
-                user=self.admin, organization_id=None, type=None
-            )
-            self.assertTrue(notification_setting.web, True)
-            self.assertTrue(notification_setting.email, True)
-
-        with self.subTest('Test for admin user'):
-            url = self._get_path(
-                'notification_preference',
-                tester.pk,
-            )
-            response = self.client.post(url, data={'web': True, 'email': True})
-            self.assertEqual(response.status_code, 200)
-            notification_setting = NotificationSetting.objects.get(
-                user=tester, organization_id=None, type=None
-            )
-            self.assertTrue(notification_setting.web, True)
-            self.assertTrue(notification_setting.email, True)
-
-        with self.subTest('Test for non-admin user'):
-            self.client.force_login(tester)
-            url = self._get_path(
-                'notification_preference',
-                self.admin.pk,
-            )
-            response = self.client.post(url, data={'web': True, 'email': True})
-            self.assertEqual(response.status_code, 403)
-
-        with self.subTest('Test with invalid data'):
-            self.client.force_login(self.admin)
-            url = self._get_path(
-                'notification_preference',
-                self.admin.pk,
-            )
-            response = self.client.post(url, data={'web': 'invalid'})
-            self.assertEqual(response.status_code, 400)
-
     @patch('openwisp_notifications.tasks.delete_ignore_object_notification.apply_async')
     def test_create_ignore_obj_notification_api(self, mocked_task):
         org_user = self._get_org_user()
diff --git a/openwisp_notifications/tests/test_notifications.py b/openwisp_notifications/tests/test_notifications.py
index 2f7c3430..3e6d1b92 100644
--- a/openwisp_notifications/tests/test_notifications.py
+++ b/openwisp_notifications/tests/test_notifications.py
@@ -9,7 +9,7 @@
 from django.contrib.contenttypes.models import ContentType
 from django.core import mail
 from django.core.cache import cache
-from django.core.exceptions import ImproperlyConfigured
+from django.core.exceptions import ImproperlyConfigured, ValidationError
 from django.db.models.signals import post_migrate, post_save
 from django.template import TemplateDoesNotExist
 from django.test import TransactionTestCase
@@ -950,6 +950,24 @@ def test_notification_for_unverified_email(self):
         # we don't send emails to unverified email addresses
         self.assertEqual(len(mail.outbox), 0)
 
+    def test_validate_global_notification_setting(self):
+        with self.subTest('Test global notification setting creation'):
+            NotificationSetting.objects.filter(
+                user=self.admin, organization=None, type=None
+            ).delete()
+            global_setting = NotificationSetting(
+                user=self.admin, organization=None, type=None, email=True, web=True
+            )
+            global_setting.save()
+            self.assertIsNotNone(global_setting)
+
+        with self.subTest('Test only one global notification setting per user'):
+            global_setting = NotificationSetting(
+                user=self.admin, organization=None, type=None, email=True, web=True
+            )
+            with self.assertRaises(ValidationError):
+                global_setting.save()
+
     @patch('openwisp_notifications.tasks.send_batched_email_notifications.apply_async')
     def test_batch_email_notification(self, mock_send_email):
         fixed_datetime = datetime(2024, 7, 26, 11, 40)

From 5413859ece828ba904488885021ea8d1755b48f1 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Fri, 13 Sep 2024 23:16:49 +0530
Subject: [PATCH 69/74] [fix] Import error

---
 openwisp_notifications/base/models.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openwisp_notifications/base/models.py b/openwisp_notifications/base/models.py
index b99e9704..1b441a3b 100644
--- a/openwisp_notifications/base/models.py
+++ b/openwisp_notifications/base/models.py
@@ -6,8 +6,9 @@
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.models import Site
 from django.core.cache import cache
+from django.core.exceptions import ValidationError
 from django.db import models
-from django.db.models.constraints import UniqueConstraint, ValidationError
+from django.db.models.constraints import UniqueConstraint
 from django.template.loader import render_to_string
 from django.urls import reverse
 from django.utils.functional import cached_property

From a796372fac040afdda7b314f4d491f6eb6167e71 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Tue, 17 Sep 2024 16:36:41 +0530
Subject: [PATCH 70/74] [chore] Bump changes

---
 openwisp_notifications/base/models.py         |  39 +++---
 ...ificationsetting_organization_and_more.py} |  16 ++-
 .../css/preferences.css                       |   9 ++
 .../openwisp-notifications/js/preferences.js  | 116 +++++++++++-------
 openwisp_notifications/tests/test_admin.py    |  47 ++++---
 openwisp_notifications/tests/test_api.py      |  95 ++++++++------
 .../tests/test_notification_setting.py        |  73 ++++++++++-
 .../tests/test_notifications.py               |  20 +--
 openwisp_notifications/tests/test_selenium.py | 112 ++++++++++++++---
 openwisp_notifications/tests/test_utils.py    |   9 ++
 openwisp_notifications/tests/test_widget.py   |  95 --------------
 openwisp_notifications/views.py               |   3 +-
 ...ificationsetting_organization_and_more.py} |  17 ++-
 13 files changed, 389 insertions(+), 262 deletions(-)
 rename openwisp_notifications/migrations/{0008_alter_notificationsetting_organization.py => 0008_alter_notificationsetting_organization_and_more.py} (56%)
 delete mode 100644 openwisp_notifications/tests/test_widget.py
 rename tests/openwisp2/sample_notifications/migrations/{0003_alter_notificationsetting_organization.py => 0003_alter_notificationsetting_organization_and_more.py} (52%)

diff --git a/openwisp_notifications/base/models.py b/openwisp_notifications/base/models.py
index 1b441a3b..43417a17 100644
--- a/openwisp_notifications/base/models.py
+++ b/openwisp_notifications/base/models.py
@@ -7,7 +7,7 @@
 from django.contrib.sites.models import Site
 from django.core.cache import cache
 from django.core.exceptions import ValidationError
-from django.db import models
+from django.db import models, transaction
 from django.db.models.constraints import UniqueConstraint
 from django.template.loader import render_to_string
 from django.urls import reverse
@@ -247,6 +247,7 @@ class AbstractNotificationSetting(UUIDModel):
     type = models.CharField(
         max_length=30,
         null=True,
+        blank=True,
         choices=NOTIFICATION_CHOICES,
         verbose_name='Notification Type',
     )
@@ -303,29 +304,33 @@ def validate_global_setting(self):
                 raise ValidationError("There can only be one global setting per user.")
 
     def save(self, *args, **kwargs):
-        self.validate_global_setting()
         if not self.web_notification:
             self.email = self.web_notification
-        if not self.organization and not self.type:
-            try:
-                original = self.__class__.objects.get(pk=self.pk)
-                if self.web and (self.email == original.email):
-                    self.user.notificationsetting_set.exclude(pk=self.pk).update(
-                        web=self.web
-                    )
-                else:
+        with transaction.atomic():
+            if not self.organization and not self.type:
+                try:
+                    original = self.__class__.objects.get(pk=self.pk)
+                    updates = {'web': self.web}
+
+                    # Update 'email' only if it's different from the previous state
+                    if not self.web or self.email != original.email:
+                        updates['email'] = self.email
+
                     self.user.notificationsetting_set.exclude(pk=self.pk).update(
-                        web=self.web, email=self.email
+                        **updates
                     )
-            except self.__class__.DoesNotExist:
-                pass
+                except self.__class__.DoesNotExist:
+                    # Handle case when the object is being created
+                    pass
         return super().save(*args, **kwargs)
 
     def full_clean(self, *args, **kwargs):
-        if self.email == self.type_config['email_notification']:
-            self.email = None
-        if self.web == self.type_config['web_notification']:
-            self.web = None
+        self.validate_global_setting()
+        if self.organization and self.type:
+            if self.email == self.type_config['email_notification']:
+                self.email = None
+            if self.web == self.type_config['web_notification']:
+                self.web = None
         return super().full_clean(*args, **kwargs)
 
     @property
diff --git a/openwisp_notifications/migrations/0008_alter_notificationsetting_organization.py b/openwisp_notifications/migrations/0008_alter_notificationsetting_organization_and_more.py
similarity index 56%
rename from openwisp_notifications/migrations/0008_alter_notificationsetting_organization.py
rename to openwisp_notifications/migrations/0008_alter_notificationsetting_organization_and_more.py
index 45930143..95a1e4ee 100644
--- a/openwisp_notifications/migrations/0008_alter_notificationsetting_organization.py
+++ b/openwisp_notifications/migrations/0008_alter_notificationsetting_organization_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.11 on 2024-06-18 13:05
+# Generated by Django 4.2.16 on 2024-09-17 13:19
 
 import django.db.models.deletion
 from django.db import migrations, models
@@ -21,4 +21,18 @@ class Migration(migrations.Migration):
                 to="openwisp_users.organization",
             ),
         ),
+        migrations.AlterField(
+            model_name="notificationsetting",
+            name="type",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("default", "Default Type"),
+                    ("generic_message", "Generic Message Type"),
+                ],
+                max_length=30,
+                null=True,
+                verbose_name="Notification Type",
+            ),
+        ),
     ]
diff --git a/openwisp_notifications/static/openwisp-notifications/css/preferences.css b/openwisp_notifications/static/openwisp-notifications/css/preferences.css
index 0319c10b..982cda1e 100644
--- a/openwisp_notifications/static/openwisp-notifications/css/preferences.css
+++ b/openwisp_notifications/static/openwisp-notifications/css/preferences.css
@@ -157,6 +157,15 @@ input:checked + .slider:before {
   -ms-transform: translateX(20px);
   transform: translateX(20px);
 }
+.notification-web-header, .notification-email-header {
+  text-align: center;
+}
+.notification-header-container {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 4px;
+}
 .slider.round {
   border-radius: 20px;
 }
diff --git a/openwisp_notifications/static/openwisp-notifications/js/preferences.js b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
index 182232a5..af538bec 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/preferences.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
@@ -11,7 +11,6 @@ function getAbsoluteUrl(url) {
 (function ($) {
     let isUpdateInProgress = false;
     let globalSettingId = null;
-    $('#ow-notifications-loader').removeClass('ow-hide');
 
     $(document).ready(function () {
         const userId = $('.settings-container').data('user-id');
@@ -20,11 +19,10 @@ function getAbsoluteUrl(url) {
 
     function fetchNotificationSettings(userId) {
         let allResults = [];
-        let currentPage = 1;
 
-        (function fetchPage() {
+        function fetchPage(url) {
             $.ajax({
-                url: getAbsoluteUrl(`/api/v1/notifications/user/${userId}/user-setting/?page_size=100&page=${currentPage}`),
+                url: url,
                 dataType: 'json',
                 beforeSend: function () {
                     $('.loader').show();
@@ -37,20 +35,24 @@ function getAbsoluteUrl(url) {
                     allResults = allResults.concat(data.results);
 
                     if (data.next) {
-                        currentPage++;
                         // Continue fetching next page
-                        fetchPage();
+                        fetchPage(data.next);
                     } else {
                         processNotificationSettings(allResults, userId);
                     }
                 },
                 error: function () {
+                    $('#org-panels').append('<div class="no-organizations">' + gettext('Error fetching notification settings. Please try again.') + '</div>');
                     showToast('error', gettext('Error fetching notification settings. Please try again.'));
                 }
             });
-        })();
+        }
+
+        const initialUrl = getAbsoluteUrl(`/api/v1/notifications/user/${userId}/user-setting/?page_size=100`);
+        fetchPage(initialUrl);
     }
 
+    // Process the fetched notification settings
     function processNotificationSettings(allResults, userId) {
         const globalSetting = allResults.find(setting => setting.organization === null && setting.type === null);
         const filteredResults = allResults.filter(setting => !(setting.organization === null && setting.type === null));
@@ -64,9 +66,12 @@ function getAbsoluteUrl(url) {
             $('#global-email').prop('checked', isGlobalEmailChecked);
 
             initializeGlobalSettingsEventListener(userId);
+        } else {
+            showToast('error', gettext('Global settings not found.'));
         }
 
-        const groupedData = groupBy(filteredResults, 'organization_name');
+        // Group and render settings by organization_id
+        const groupedData = groupBy(filteredResults, 'organization');
         renderNotificationSettings(groupedData);
 
         initializeEventListeners(userId);
@@ -88,16 +93,21 @@ function getAbsoluteUrl(url) {
             return;
         }
 
-        Object.keys(data).sort().forEach(function(orgName, orgIndex) {
-            const orgSettings = data[orgName].sort(function(a, b) {
+        // Render settings for each organization
+        Object.keys(data).sort().forEach(function(orgId, orgIndex) {
+            const orgSettings = data[orgId].sort(function(a, b) {
                 return a.type_label.localeCompare(b.type_label);
             });
+
+            const orgName = orgSettings[0].organization_name;
+
             const orgPanel = $(
                 '<div class="module">' +
-                '<h2 class="toggle-header"><span>Organization: ' + orgName + '</span><span class="toggle-icon collapsed"></span></h2>' +
+                '<h2 class="toggle-header"><span>' + `${gettext('Organization')}: ${orgName}` + '</span><span class="toggle-icon collapsed"></span></h2>' +
                 '<div class="org-content"></div>' +
                 '</div>'
             );
+
             const orgContent = orgPanel.find('.org-content');
             if (orgSettings.length > 0) {
                 const table = $(
@@ -105,44 +115,46 @@ function getAbsoluteUrl(url) {
                     '<thead>' +
                     '<tr>' +
                     '<th>' + gettext('Notification Type') + '</th>' +
-                    '<th style="text-align: center;">' +
-                    '<div style="display: inline-flex; align-items: center; justify-content: center; gap: 4px;">' +
-                    '<span>' + gettext('Web') + '</span>' +
-                    '<span class="tooltip-icon" data-tooltip="' + gettext('Enable or disable web notifications for this organization') + '">?</span>' +
-                    '<label class="switch" id="org-' + (orgIndex + 1) + '-web">' +
-                    '<input type="checkbox" class="main-checkbox" data-column="web" data-organization-id="' + orgSettings[0].organization + '" />' +
-                    '<span class="slider round"></span>' +
-                    '</label>' +
-                    '</div>' +
+                    '<th class="notification-web-header">' + 
+                        '<div class="notification-header-container">' +
+                        '<span>' + gettext('Web') + '</span>' +
+                        '<span class="tooltip-icon" data-tooltip="' + gettext('Enable or disable web notifications for this organization') + '">?</span>' +
+                        '<label class="switch" id="org-' + (orgIndex + 1) + '-web">' +
+                        '<input type="checkbox" class="main-checkbox" data-column="web" data-organization-id="' + orgId + '" />' +
+                        '<span class="slider round"></span>' +
+                        '</label>' +
+                        '</div>' +
                     '</th>' +
-                    '<th style="text-align: center;">' +
-                    '<div style="display: inline-flex; align-items: center; justify-content: center; gap: 4px;">' +
-                    '<span>' + gettext('Email') + '</span>' +
-                    '<span class="tooltip-icon" data-tooltip="' + gettext('Enable or disable email notifications for this organization') + '">?</span>' +
-                    '<label class="switch" id="org-' + (orgIndex + 1) + '-email">' +
-                    '<input type="checkbox" class="main-checkbox" data-organization-id="' + orgSettings[0].organization + '" data-column="email" />' +
-                    '<span class="slider round"></span>' +
-                    '</label>' +
-                    '</div>' +
+                    '<th class="notification-email-header">' +
+                        '<div class="notification-header-container">' +
+                        '<span>' + gettext('Email') + '</span>' +
+                        '<span class="tooltip-icon" data-tooltip="' + gettext('Enable or disable email notifications for this organization') + '">?</span>' +
+                        '<label class="switch" id="org-' + (orgIndex + 1) + '-email">' +
+                        '<input type="checkbox" class="main-checkbox" data-organization-id="' + orgId + '" data-column="email" />' +
+                        '<span class="slider round"></span>' +
+                        '</label>' +
+                        '</div>' +
                     '</th>' +
                     '</tr>' +
                     '</thead>' +
                     '<tbody></tbody>' +
                     '</table>'
                 );
+
+                // Populate table rows with individual settings
                 orgSettings.forEach(function(setting, settingIndex) {
                     const row = $(
                         '<tr>' +
                         '<td>' + setting.type_label + '</td>' +
                         '<td>' +
                         '<label class="switch" id="org-' + (orgIndex + 1) + '-web-' + (settingIndex + 1) + '">' +
-                        '<input type="checkbox" class="web-checkbox" ' + (setting.web ? 'checked' : '') + ' data-pk="' + setting.id + '" data-organization-id="' + setting.organization + '" data-type="web" />' +
+                        '<input type="checkbox" class="web-checkbox" ' + (setting.web ? 'checked' : '') + ' data-pk="' + setting.id + '" data-organization-id="' + orgId + '" data-type="web" />' +
                         '<span class="slider round"></span>' +
                         '</label>' +
                         '</td>' +
                         '<td>' +
                         '<label class="switch" id="org-' + (orgIndex + 1) + '-email-' + (settingIndex + 1) + '">' +
-                        '<input type="checkbox" class="email-checkbox" ' + (setting.email ? 'checked' : '') + ' data-pk="' + setting.id + '" data-organization-id="' + setting.organization + '" data-type="email" />' +
+                        '<input type="checkbox" class="email-checkbox" ' + (setting.email ? 'checked' : '') + ' data-pk="' + setting.id + '" data-organization-id="' + orgId + '" data-type="email" />' +
                         '<span class="slider round"></span>' +
                         '</label>' +
                         '</td>' +
@@ -150,13 +162,16 @@ function getAbsoluteUrl(url) {
                     );
                     table.find('tbody').append(row);
                 });
+
                 orgContent.append(table);
                 updateMainCheckboxes(table);
             } else {
                 orgContent.append('<div class="no-settings">' + gettext('No settings available for this organization') + '</div>');
             }
+
             orgPanelsContainer.append(orgPanel);
 
+            // Expand the first organization by default
             if (orgIndex === 0) {
                 orgContent.addClass('active');
                 orgPanel.find('.toggle-icon').removeClass('collapsed').addClass('expanded');
@@ -166,6 +181,7 @@ function getAbsoluteUrl(url) {
         });
     }
 
+    // Update the org level checkboxes based on individual checkbox states in the table
     function updateMainCheckboxes(table) {
         table.find('.main-checkbox').each(function () {
             const column = $(this).data('column');
@@ -175,6 +191,7 @@ function getAbsoluteUrl(url) {
     }
 
     function initializeEventListeners(userId) {
+        // Toggle organization content visibility
         $(document).on('click', '.toggle-header', function () {
             const toggleIcon = $(this).find('.toggle-icon');
             const orgContent = $(this).next('.org-content');
@@ -188,7 +205,9 @@ function getAbsoluteUrl(url) {
             }
         });
 
+        // Event listener for Individual notification setting
         $(document).on('change', '.email-checkbox, .web-checkbox', function () {
+            // Prevent multiple simultaneous updates
             if (isUpdateInProgress) {
                 return;
             }
@@ -200,8 +219,8 @@ function getAbsoluteUrl(url) {
             let isWebChecked = $(`.web-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).is(':checked');
             let isEmailChecked = $(`.email-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).is(':checked');
 
+            // Store previous states for potential rollback
             let previousWebChecked, previousEmailChecked;
-
             if (triggeredBy === 'email') {
                 previousEmailChecked = !isEmailChecked;
                 previousWebChecked = isWebChecked;
@@ -210,21 +229,19 @@ function getAbsoluteUrl(url) {
                 previousEmailChecked = isEmailChecked;
             }
 
+            // Email notifications require web notifications to be enabled
             if (triggeredBy === 'email' && isEmailChecked) {
                 isWebChecked = true;
             }
 
+            // Disabling web notifications also disables email notifications
             if (triggeredBy === 'web' && !isWebChecked) {
                 isEmailChecked = false;
             }
 
             isUpdateInProgress = true;
 
-            const data = {
-                web: isWebChecked,
-                email: isEmailChecked
-            };
-
+            // Update the UI
             $(`.web-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).prop('checked', isWebChecked);
             $(`.email-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).prop('checked', isEmailChecked);
             updateOrgLevelCheckboxes(organizationId);
@@ -234,11 +251,12 @@ function getAbsoluteUrl(url) {
                 url: `/api/v1/notifications/user/${userId}/user-setting/${settingId}/`,
                 headers: { 'X-CSRFToken': $('input[name="csrfmiddlewaretoken"]').val() },
                 contentType: 'application/json',
-                data: JSON.stringify(data),
+                data: JSON.stringify({ web: isWebChecked, email: isEmailChecked }),
                 success: function () {
                     showToast('success', gettext('Settings updated successfully.'));
                 },
                 error: function () {
+                    // Rollback changes in case of error
                     showToast('error', gettext('Something went wrong. Please try again.'));
                     $(`.web-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).prop('checked', previousWebChecked);
                     $(`.email-checkbox[data-organization-id="${organizationId}"][data-pk="${settingId}"]`).prop('checked', previousEmailChecked);
@@ -250,10 +268,13 @@ function getAbsoluteUrl(url) {
             });
         });
 
+        // Event listener for organization level checkbox changes
         $(document).on('change', '.main-checkbox', function () {
+            // Prevent multiple simultaneous updates
             if (isUpdateInProgress) {
                 return;
             }
+
             const table = $(this).closest('table');
             const orgId = $(this).data('organization-id');
             const triggeredBy = $(this).data('column');
@@ -261,8 +282,8 @@ function getAbsoluteUrl(url) {
             let isOrgWebChecked = $(`.main-checkbox[data-organization-id="${orgId}"][data-column="web"]`).is(':checked');
             let isOrgEmailChecked = $(`.main-checkbox[data-organization-id="${orgId}"][data-column="email"]`).is(':checked');
 
+            // Store previous states for potential rollback
             let previousOrgWebChecked, previousOrgEmailChecked;
-
             const previousWebState = table.find('.web-checkbox').map(function() {
                 return { id: $(this).data('pk'), checked: $(this).is(':checked') };
             }).get();
@@ -279,10 +300,12 @@ function getAbsoluteUrl(url) {
                 previousOrgEmailChecked = isOrgEmailChecked;
             }
 
+            // Email notifications require web notifications to be enabled
             if (triggeredBy === 'email' && isOrgEmailChecked) {
                 isOrgWebChecked = true;
             }
 
+            // Disabling web notifications also disables email notifications
             if (triggeredBy === 'web' && !isOrgWebChecked) {
                 isOrgEmailChecked = false;
             }
@@ -294,9 +317,9 @@ function getAbsoluteUrl(url) {
                 email: isOrgEmailChecked
             };
 
+            // Update the UI
             $(`.main-checkbox[data-organization-id="${orgId}"][data-column="web"]`).prop('checked', isOrgWebChecked);
             $(`.main-checkbox[data-organization-id="${orgId}"][data-column="email"]`).prop('checked', isOrgEmailChecked);
-
             table.find('.web-checkbox').prop('checked', isOrgWebChecked).change();
             if ((triggeredBy === 'web' && !isOrgWebChecked) || triggeredBy === 'email') {
                 table.find('.email-checkbox').prop('checked', isOrgEmailChecked).change();
@@ -332,6 +355,7 @@ function getAbsoluteUrl(url) {
         });
     }
 
+    // Update individual setting checkboxes at the organization level
     function updateOrgLevelCheckboxes(organizationId) {
         const webCheckboxes = $('.web-checkbox[data-organization-id="' + organizationId + '"]');
         const emailCheckboxes = $('.email-checkbox[data-organization-id="' + organizationId + '"]');
@@ -341,6 +365,7 @@ function getAbsoluteUrl(url) {
         emailMainCheckbox.prop('checked', emailCheckboxes.length === emailCheckboxes.filter(':checked').length);
     }
 
+    // Initialize event listener for global settings
     function initializeGlobalSettingsEventListener(userId) {
         $('#global-email, #global-web').change(function (event) {
             if (isUpdateInProgress) {
@@ -352,6 +377,7 @@ function getAbsoluteUrl(url) {
             let isGlobalWebChecked = $('#global-web').is(':checked');
             let isGlobalEmailChecked = $('#global-email').is(':checked');
 
+            // Store previous states for potential rollback
             let previousGlobalWebChecked, previousGlobalEmailChecked;
             if (triggeredBy === 'global-email') {
                 previousGlobalEmailChecked = !isGlobalEmailChecked;
@@ -376,21 +402,19 @@ function getAbsoluteUrl(url) {
                 }).get()
             };
 
+            // Email notifications require web notifications to be enabled
             if (triggeredBy === 'global-email' && isGlobalEmailChecked) {
                 isGlobalWebChecked = true;
             }
 
+            // Disabling web notifications also disables email notifications
             if (triggeredBy === 'global-web' && !isGlobalWebChecked) {
                 isGlobalEmailChecked = false;
             }
 
             isUpdateInProgress = true;
 
-            const data = {
-                web: isGlobalWebChecked,
-                email: isGlobalEmailChecked
-            };
-
+            // Update the UI
             $('#global-web').prop('checked', isGlobalWebChecked);
             $('#global-email').prop('checked', isGlobalEmailChecked);
 
@@ -406,7 +430,7 @@ function getAbsoluteUrl(url) {
                 url: getAbsoluteUrl(`/api/v1/notifications/user/${userId}/user-setting/${globalSettingId}/`),
                 headers: { 'X-CSRFToken': $('input[name="csrfmiddlewaretoken"]').val() },
                 contentType: 'application/json',
-                data: JSON.stringify(data),
+                data: JSON.stringify({ web: isGlobalWebChecked, email: isGlobalEmailChecked }),
                 success: function () {
                     showToast('success', gettext('Global settings updated successfully.'));
                 },
diff --git a/openwisp_notifications/tests/test_admin.py b/openwisp_notifications/tests/test_admin.py
index 0f7c8480..5e73c717 100644
--- a/openwisp_notifications/tests/test_admin.py
+++ b/openwisp_notifications/tests/test_admin.py
@@ -3,7 +3,6 @@
 
 from django.contrib.admin.sites import AdminSite
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import Permission
 from django.core.cache import cache
 from django.forms.widgets import MediaOrderConflictWarning
 from django.test import TestCase, override_settings, tag
@@ -157,35 +156,33 @@ def test_websocket_protocol(self):
             response = self.client.get(self._url)
             self.assertContains(response, 'wss')
 
-    def test_org_admin_view_same_org_user_notification_setting(self):
-        org_owner = self._create_org_user(
-            user=self._get_operator(),
-            is_admin=True,
-        )
-        org_admin = self._create_org_user(
-            user=self._create_user(
-                username='user', email='user@user.com', is_staff=True
-            ),
-            is_admin=True,
-        )
-        permissions = Permission.objects.all()
-        org_owner.user.user_permissions.set(permissions)
-        org_admin.user.user_permissions.set(permissions)
-        self.client.force_login(org_owner.user)
-
-        response = self.client.get(
-            reverse('admin:openwisp_users_user_change', args=(org_admin.user_id,)),
-        )
-        self.assertEqual(response.status_code, 200)
-        self.assertNotContains(
-            response, '<option value="default" selected>Default Type</option>'
-        )
-
     def test_ignore_notification_widget_add_view(self):
         url = reverse('admin:openwisp_users_organization_add')
         response = self.client.get(url)
         self.assertNotContains(response, 'owIsChangeForm')
 
+    def test_notification_preferences_button_staff_user(self):
+        user = self._create_user(is_staff=True)
+        user_admin_page = reverse('admin:openwisp_users_user_change', args=(user.pk,))
+        expected_url = reverse(
+            "notifications:user_notification_preference", args=(user.pk,)
+        )
+        expected_html = (
+            f'<a class="button" href="{expected_url}">Notification Preferences</a>'
+        )
+
+        # Button appears for staff user
+        with self.subTest("Button should appear for staff user"):
+            response = self.client.get(user_admin_page)
+            self.assertContains(response, expected_html, html=True)
+
+        # Button does not appear for non-staff user
+        with self.subTest("Button should not appear for non-staff user"):
+            user.is_staff = False
+            user.save()
+            response = self.client.get(user_admin_page)
+            self.assertNotContains(response, expected_html, html=True)
+
 
 @tag('skip_prod')
 # For more info, look at TestAdmin.test_default_notification_setting
diff --git a/openwisp_notifications/tests/test_api.py b/openwisp_notifications/tests/test_api.py
index 45ce24ea..3914d1d2 100644
--- a/openwisp_notifications/tests/test_api.py
+++ b/openwisp_notifications/tests/test_api.py
@@ -559,17 +559,21 @@ def test_notification_setting_list_api(self):
 
     def test_list_notification_setting_filtering(self):
         url = self._get_path('notification_setting_list')
-        tester = self._create_user()
+        tester = self._create_administrator(
+            organizations=[self._get_org(org_name='default')]
+        )
 
         with self.subTest('Test listing notification setting without filters'):
-            count = NotificationSetting.objects.count()
+            count = NotificationSetting.objects.filter(user=self.admin).count()
             response = self.client.get(url)
             self.assertEqual(response.status_code, 200)
             self.assertEqual(len(response.data['results']), count)
 
         with self.subTest('Test listing notification setting for "default" org'):
             org = Organization.objects.first()
-            count = NotificationSetting.objects.filter(organization_id=org.id).count()
+            count = NotificationSetting.objects.filter(
+                user=self.admin, organization_id=org.id
+            ).count()
             org_url = f'{url}?organization={org.id}'
             response = self.client.get(org_url)
             self.assertEqual(response.status_code, 200)
@@ -579,7 +583,9 @@ def test_list_notification_setting_filtering(self):
 
         with self.subTest('Test listing notification setting for "default" org slug'):
             org = Organization.objects.first()
-            count = NotificationSetting.objects.filter(organization=org).count()
+            count = NotificationSetting.objects.filter(
+                user=self.admin, organization=org
+            ).count()
             org_slug_url = f'{url}?organization_slug={org.slug}'
             response = self.client.get(org_slug_url)
             self.assertEqual(response.status_code, 200)
@@ -620,15 +626,15 @@ def test_list_notification_setting_filtering(self):
             self.assertEqual(response.status_code, 403)
 
     def test_retreive_notification_setting_api(self):
-        notification_setting = NotificationSetting.objects.exclude(
-            organization__isnull=True
-        ).first()
-        tester = self._create_user()
-        tester_notification_setting = NotificationSetting.objects.create(
-            user=tester,
-            type='default',
-            organization=Organization.objects.first(),
+        tester = self._create_administrator(
+            organizations=[self._get_org(org_name='default')]
         )
+        notification_setting = NotificationSetting.objects.filter(
+            user=self.admin, organization__isnull=False
+        ).first()
+        tester_notification_setting = NotificationSetting.objects.filter(
+            user=tester, organization__isnull=False
+        ).first()
 
         with self.subTest('Test for non-existing notification setting'):
             url = self._get_path('notification_setting', uuid.uuid4())
@@ -682,15 +688,15 @@ def test_retreive_notification_setting_api(self):
             self.assertEqual(response.status_code, 403)
 
     def test_update_notification_setting_api(self):
-        notification_setting = NotificationSetting.objects.exclude(
-            organization__isnull=True
-        ).first()
-        tester = self._create_user()
-        tester_notification_setting = NotificationSetting.objects.create(
-            user=tester,
-            type='default',
-            organization=Organization.objects.first(),
+        tester = self._create_administrator(
+            organizations=[self._get_org(org_name='default')]
         )
+        notification_setting = NotificationSetting.objects.filter(
+            user=self.admin, organization__isnull=False
+        ).first()
+        tester_notification_setting = NotificationSetting.objects.filter(
+            user=tester, organization__isnull=False
+        ).first()
         update_data = {'web': False}
 
         with self.subTest('Test for non-existing notification setting'):
@@ -806,25 +812,20 @@ def test_organization_notification_setting_update(self):
             url = self._get_path(
                 'organization_notification_setting', self.admin.pk, org.pk
             )
-            response = self.client.post(url, data={'web': True, 'email': True})
-            self.assertEqual(response.status_code, 200)
-            notification_setting = NotificationSetting.objects.filter(
+            NotificationSetting.objects.filter(
                 user=self.admin, organization_id=org.pk
-            ).first()
-            self.assertTrue(notification_setting.web, True)
-            self.assertTrue(notification_setting.email, True)
-
-        with self.subTest('Test for admin user'):
-            url = self._get_path(
-                'organization_notification_setting', self.admin.pk, org.pk
-            )
+            ).update(email=False, web=False)
+            org_setting_count = NotificationSetting.objects.filter(
+                user=self.admin, organization_id=org.pk
+            ).count()
             response = self.client.post(url, data={'web': True, 'email': True})
             self.assertEqual(response.status_code, 200)
-            notification_setting = NotificationSetting.objects.filter(
-                user=self.admin, organization_id=org.pk
-            ).first()
-            self.assertTrue(notification_setting.web, True)
-            self.assertTrue(notification_setting.email, True)
+            self.assertEqual(
+                NotificationSetting.objects.filter(
+                    user=self.admin, organization_id=org.pk, email=True, web=True
+                ).count(),
+                org_setting_count,
+            )
 
         with self.subTest('Test for non-admin user'):
             self.client.force_login(tester)
@@ -846,6 +847,28 @@ def test_organization_notification_setting_update(self):
             response = self.client.post(url, data={'web': 'invalid'})
             self.assertEqual(response.status_code, 400)
 
+        with self.subTest(
+            'Update organization-level web to False while keeping one of email notification setting to true'
+        ):
+            url = self._get_path(
+                'organization_notification_setting',
+                self.admin.pk,
+                org.pk,
+            )
+
+            # Set the default type notification setting's email to True
+            NotificationSetting.objects.filter(
+                user=self.admin, organization_id=org.pk, type='default'
+            ).update(email=True)
+
+            response = self.client.post(url, data={'web': True, 'email': False})
+
+            self.assertTrue(
+                NotificationSetting.objects.filter(
+                    user=self.admin, organization_id=org.pk, type='default', email=True
+                ).exists()
+            )
+
     @patch('openwisp_notifications.tasks.delete_ignore_object_notification.apply_async')
     def test_create_ignore_obj_notification_api(self, mocked_task):
         org_user = self._get_org_user()
diff --git a/openwisp_notifications/tests/test_notification_setting.py b/openwisp_notifications/tests/test_notification_setting.py
index 8156c44e..f89b6a0c 100644
--- a/openwisp_notifications/tests/test_notification_setting.py
+++ b/openwisp_notifications/tests/test_notification_setting.py
@@ -1,3 +1,4 @@
+from django.core.exceptions import ValidationError
 from django.db.models.signals import post_save
 from django.test import TransactionTestCase
 
@@ -106,6 +107,16 @@ def test_post_migration_handler(self):
 
         base_unregister_notification_type('default')
         base_register_notification_type('test', test_notification_type)
+
+        # Delete existing global notification settings
+        NotificationSetting.objects.filter(
+            user=org_user.user, type=None, organization=None
+        ).delete()
+
+        NotificationSetting.objects.filter(
+            user=admin, type=None, organization=None
+        ).delete()
+
         notification_type_registered_unregistered_handler(sender=self)
 
         # Notification Setting for "default" type are deleted
@@ -122,19 +133,19 @@ def test_post_migration_handler(self):
             queryset.filter(user=org_user.user).count(), 1 * notification_types_count
         )
 
-        # Delete existing global notification settings
-        NotificationSetting.objects.filter(
-            user=admin, type=None, organization=None
-        ).delete()
-
         # Check Global Notification Setting is created
-        notification_type_registered_unregistered_handler(sender=admin)
         self.assertEqual(
             NotificationSetting.objects.filter(
                 user=admin, type=None, organization=None
             ).count(),
             1,
         )
+        self.assertEqual(
+            NotificationSetting.objects.filter(
+                user=org_user.user, type=None, organization=None
+            ).count(),
+            1,
+        )
 
     def test_superuser_demoted_to_user(self):
         admin = self._get_admin()
@@ -266,6 +277,35 @@ def test_deleted_notificationsetting_autocreated(self):
         ns.refresh_from_db()
         self.assertEqual(ns.deleted, False)
 
+    def test_global_notification_setting_update(self):
+        admin = self._get_admin()
+        org = self._get_org('default')
+        global_setting = NotificationSetting.objects.get(
+            user=admin, type=None, organization=None
+        )
+
+        # Update global settings
+        global_setting.email = False
+        global_setting.web = False
+        global_setting.save()
+
+        with self.subTest(
+            'Update global web to False while ensuring at least one email setting is True'
+        ):
+            # Set the default type notification setting's email to True
+            NotificationSetting.objects.filter(
+                user=admin, organization=org, type='default'
+            ).update(email=True)
+
+            global_setting.web = True
+            global_setting.save()
+
+            self.assertTrue(
+                NotificationSetting.objects.filter(
+                    user=admin, organization=org, email=True, type='default'
+                ).exists()
+            )
+
     def test_global_notification_setting_delete(self):
         admin = self._get_admin()
         global_setting = NotificationSetting.objects.get(
@@ -279,3 +319,24 @@ def test_global_notification_setting_delete(self):
             ).count(),
             0,
         )
+
+    def test_validate_global_notification_setting(self):
+        admin = self._get_admin()
+        with self.subTest('Test global notification setting creation'):
+            NotificationSetting.objects.filter(
+                user=admin, organization=None, type=None
+            ).delete()
+            global_setting = NotificationSetting(
+                user=admin, organization=None, type=None, email=True, web=True
+            )
+            global_setting.full_clean()
+            global_setting.save()
+            self.assertIsNotNone(global_setting)
+
+        with self.subTest('Test only one global notification setting per user'):
+            global_setting = NotificationSetting(
+                user=admin, organization=None, type=None, email=True, web=True
+            )
+            with self.assertRaises(ValidationError):
+                global_setting.full_clean()
+                global_setting.save()
diff --git a/openwisp_notifications/tests/test_notifications.py b/openwisp_notifications/tests/test_notifications.py
index 3e6d1b92..2f7c3430 100644
--- a/openwisp_notifications/tests/test_notifications.py
+++ b/openwisp_notifications/tests/test_notifications.py
@@ -9,7 +9,7 @@
 from django.contrib.contenttypes.models import ContentType
 from django.core import mail
 from django.core.cache import cache
-from django.core.exceptions import ImproperlyConfigured, ValidationError
+from django.core.exceptions import ImproperlyConfigured
 from django.db.models.signals import post_migrate, post_save
 from django.template import TemplateDoesNotExist
 from django.test import TransactionTestCase
@@ -950,24 +950,6 @@ def test_notification_for_unverified_email(self):
         # we don't send emails to unverified email addresses
         self.assertEqual(len(mail.outbox), 0)
 
-    def test_validate_global_notification_setting(self):
-        with self.subTest('Test global notification setting creation'):
-            NotificationSetting.objects.filter(
-                user=self.admin, organization=None, type=None
-            ).delete()
-            global_setting = NotificationSetting(
-                user=self.admin, organization=None, type=None, email=True, web=True
-            )
-            global_setting.save()
-            self.assertIsNotNone(global_setting)
-
-        with self.subTest('Test only one global notification setting per user'):
-            global_setting = NotificationSetting(
-                user=self.admin, organization=None, type=None, email=True, web=True
-            )
-            with self.assertRaises(ValidationError):
-                global_setting.save()
-
     @patch('openwisp_notifications.tasks.send_batched_email_notifications.apply_async')
     def test_batch_email_notification(self, mock_send_email):
         fixed_datetime = datetime(2024, 7, 26, 11, 40)
diff --git a/openwisp_notifications/tests/test_selenium.py b/openwisp_notifications/tests/test_selenium.py
index 629d2130..8d0d2548 100644
--- a/openwisp_notifications/tests/test_selenium.py
+++ b/openwisp_notifications/tests/test_selenium.py
@@ -3,10 +3,14 @@
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import WebDriverWait
 
-from openwisp_notifications.swapper import swapper_load_model
+from openwisp_notifications.signals import notify
+from openwisp_notifications.swapper import load_model, swapper_load_model
+from openwisp_notifications.utils import _get_object_link
 from openwisp_users.tests.utils import TestOrganizationMixin
 from openwisp_utils.test_selenium_mixins import SeleniumTestMixin
 
+Notification = load_model('Notification')
+Organization = swapper_load_model('openwisp_users', 'Organization')
 OrganizationUser = swapper_load_model('openwisp_users', 'OrganizationUser')
 
 
@@ -15,55 +19,133 @@ class TestSelenium(
     TestOrganizationMixin,
     StaticLiveServerTestCase,
 ):
-    serve_static = True
-
     def setUp(self):
         self.admin = self._create_admin(
             username=self.admin_username, password=self.admin_password
         )
-        self.driver = self.web_driver
         org = self._create_org()
         OrganizationUser.objects.create(user=self.admin, organization=org)
+        self.operator = super()._get_operator()
+        self.notification_options = dict(
+            sender=self.admin,
+            recipient=self.admin,
+            verb='Test Notification',
+            email_subject='Test Email subject',
+            action_object=self.operator,
+            target=self.operator,
+            type='default',
+        )
+
+    def _create_notification(self):
+        return notify.send(**self.notification_options)
+
+    def test_notification_relative_link(self):
+        self.login()
+        notification = self._create_notification().pop()[1][0]
+        self.web_driver.find_element(By.ID, 'openwisp_notifications').click()
+        WebDriverWait(self.web_driver, 10).until(
+            EC.visibility_of_element_located((By.CLASS_NAME, 'ow-notification-elem'))
+        )
+        notification_elem = self.web_driver.find_element(
+            By.CLASS_NAME, 'ow-notification-elem'
+        )
+        data_location_value = notification_elem.get_attribute('data-location')
+        self.assertEqual(
+            data_location_value, _get_object_link(notification, 'target', False)
+        )
+
+    def test_notification_dialog(self):
+        self.login()
+        self.notification_options.update(
+            {'message': 'Test Message', 'description': 'Test Description'}
+        )
+        notification = self._create_notification().pop()[1][0]
+        self.web_driver.find_element(By.ID, 'openwisp_notifications').click()
+        WebDriverWait(self.web_driver, 10).until(
+            EC.visibility_of_element_located((By.ID, f'ow-{notification.id}'))
+        )
+        self.web_driver.find_element(By.ID, f'ow-{notification.id}').click()
+        WebDriverWait(self.web_driver, 10).until(
+            EC.visibility_of_element_located((By.CLASS_NAME, 'ow-dialog-notification'))
+        )
+        dialog = self.web_driver.find_element(By.CLASS_NAME, 'ow-dialog-notification')
+        self.assertEqual(
+            dialog.find_element(By.CLASS_NAME, 'ow-message-title').text, 'Test Message'
+        )
+        self.assertEqual(
+            dialog.find_element(By.CLASS_NAME, 'ow-message-description').text,
+            'Test Description',
+        )
 
-    def open(self, url, driver=None):
-        driver = self.driver or self.web_driver
-        driver.get(f'{self.live_server_url}{url}')
+    def test_notification_dialog_open_button_visibility(self):
+        self.login()
+        self.notification_options.pop('target')
+        self.notification_options.update(
+            {'message': 'Test Message', 'description': 'Test Description'}
+        )
+        notification = self._create_notification().pop()[1][0]
+        self.web_driver.find_element(By.ID, 'openwisp_notifications').click()
+        WebDriverWait(self.web_driver, 10).until(
+            EC.visibility_of_element_located((By.ID, f'ow-{notification.id}'))
+        )
+        self.web_driver.find_element(By.ID, f'ow-{notification.id}').click()
+        WebDriverWait(self.web_driver, 10).until(
+            EC.visibility_of_element_located((By.CLASS_NAME, 'ow-dialog-notification'))
+        )
+        dialog = self.web_driver.find_element(By.CLASS_NAME, 'ow-dialog-notification')
+        # This confirms the button is hidden
+        dialog.find_element(By.CSS_SELECTOR, '.ow-message-target-redirect.ow-hide')
 
     def test_notification_preference_page(self):
         self.login()
         self.open('/notifications/preferences/')
-        self.driver.implicitly_wait(1)
 
         # Uncheck the global web checkbox
-        global_web_checkbox = WebDriverWait(self.driver, 30).until(
-            EC.presence_of_element_located((By.ID, 'global-web'))
+        global_web_label = WebDriverWait(self.web_driver, 30).until(
+            EC.element_to_be_clickable(
+                (By.XPATH, "//*[@id='global-web']/parent::label")
+            )
         )
-        global_web_label = global_web_checkbox.find_element(By.XPATH, './parent::label')
         global_web_label.click()
 
-        all_checkboxes = self.driver.find_elements(
+        all_checkboxes = self.web_driver.find_elements(
             By.CSS_SELECTOR, 'input[type="checkbox"]'
         )
         for checkbox in all_checkboxes:
             self.assertFalse(checkbox.is_selected())
 
         # Check the org-level web checkbox
-        org_level_web_checkbox = WebDriverWait(self.driver, 10).until(
+        org_level_web_checkbox = WebDriverWait(self.web_driver, 10).until(
             EC.visibility_of_element_located((By.ID, 'org-1-web'))
         )
         org_level_web_checkbox.click()
 
-        web_checkboxes = self.driver.find_elements(
+        web_checkboxes = self.web_driver.find_elements(
             By.CSS_SELECTOR, 'input[id^="org-1-web-"]'
         )
         for checkbox in web_checkboxes:
             self.assertTrue(checkbox.is_selected())
 
         # Check a single email checkbox
-        first_org_email_checkbox = WebDriverWait(self.driver, 10).until(
+        first_org_email_checkbox = WebDriverWait(self.web_driver, 10).until(
             EC.presence_of_element_located((By.ID, 'org-1-email-1'))
         )
         first_org_email_checkbox.click()
         self.assertTrue(
             first_org_email_checkbox.find_element(By.TAG_NAME, 'input').is_selected()
         )
+
+    def test_empty_notification_preference_page(self):
+        # Delete all organizations
+        Organization.objects.all().delete()
+
+        self.login()
+        self.open('/notifications/preferences/')
+
+        no_organizations_element = WebDriverWait(self.web_driver, 10).until(
+            EC.visibility_of_element_located((By.CLASS_NAME, 'no-organizations'))
+        )
+        self.assertEqual(
+            no_organizations_element.text,
+            'No organizations available.',
+        )
diff --git a/openwisp_notifications/tests/test_utils.py b/openwisp_notifications/tests/test_utils.py
index a4cdc9a0..7bd17d22 100644
--- a/openwisp_notifications/tests/test_utils.py
+++ b/openwisp_notifications/tests/test_utils.py
@@ -105,3 +105,12 @@ def run_check():
                 )
                 error = run_check()
                 self.assertIn(error_message, error.hint)
+
+        with self.subTest('Test setting dotted path is not subclass of ModelAdmin'):
+            path = 'openwisp_users.admin.OrganizationUserInline'
+            with patch.object(app_settings, 'IGNORE_ENABLED_ADMIN', [path]):
+                error_message = (
+                    f'"{path}" does not subclasses "django.contrib.admin.ModelAdmin"'
+                )
+                error = run_check()
+                self.assertIn(error_message, error.hint)
diff --git a/openwisp_notifications/tests/test_widget.py b/openwisp_notifications/tests/test_widget.py
deleted file mode 100644
index 48bebeca..00000000
--- a/openwisp_notifications/tests/test_widget.py
+++ /dev/null
@@ -1,95 +0,0 @@
-from django.contrib.staticfiles.testing import StaticLiveServerTestCase
-from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions as EC
-from selenium.webdriver.support.ui import WebDriverWait
-
-from openwisp_notifications.signals import notify
-from openwisp_notifications.swapper import load_model
-from openwisp_notifications.utils import _get_object_link
-from openwisp_users.tests.utils import TestOrganizationMixin
-from openwisp_utils.test_selenium_mixins import SeleniumTestMixin
-
-Notification = load_model('Notification')
-
-
-class TestWidget(
-    SeleniumTestMixin,
-    TestOrganizationMixin,
-    StaticLiveServerTestCase,
-):
-    serve_static = True
-
-    def setUp(self):
-        self.admin = self._create_admin(
-            username=self.admin_username, password=self.admin_password
-        )
-        self.operator = super()._get_operator()
-        self.notification_options = dict(
-            sender=self.admin,
-            recipient=self.admin,
-            verb='Test Notification',
-            email_subject='Test Email subject',
-            action_object=self.operator,
-            target=self.operator,
-            type='default',
-        )
-
-    def _create_notification(self):
-        return notify.send(**self.notification_options)
-
-    def test_notification_relative_link(self):
-        self.login()
-        notification = self._create_notification().pop()[1][0]
-        self.web_driver.find_element(By.ID, 'openwisp_notifications').click()
-        WebDriverWait(self.web_driver, 10).until(
-            EC.visibility_of_element_located((By.CLASS_NAME, 'ow-notification-elem'))
-        )
-        notification_elem = self.web_driver.find_element(
-            By.CLASS_NAME, 'ow-notification-elem'
-        )
-        data_location_value = notification_elem.get_attribute('data-location')
-        self.assertEqual(
-            data_location_value, _get_object_link(notification, 'target', False)
-        )
-
-    def test_notification_dialog(self):
-        self.login()
-        self.notification_options.update(
-            {'message': 'Test Message', 'description': 'Test Description'}
-        )
-        notification = self._create_notification().pop()[1][0]
-        self.web_driver.find_element(By.ID, 'openwisp_notifications').click()
-        WebDriverWait(self.web_driver, 10).until(
-            EC.visibility_of_element_located((By.ID, f'ow-{notification.id}'))
-        )
-        self.web_driver.find_element(By.ID, f'ow-{notification.id}').click()
-        WebDriverWait(self.web_driver, 10).until(
-            EC.visibility_of_element_located((By.CLASS_NAME, 'ow-dialog-notification'))
-        )
-        dialog = self.web_driver.find_element(By.CLASS_NAME, 'ow-dialog-notification')
-        self.assertEqual(
-            dialog.find_element(By.CLASS_NAME, 'ow-message-title').text, 'Test Message'
-        )
-        self.assertEqual(
-            dialog.find_element(By.CLASS_NAME, 'ow-message-description').text,
-            'Test Description',
-        )
-
-    def test_notification_dialog_open_button_visibility(self):
-        self.login()
-        self.notification_options.pop('target')
-        self.notification_options.update(
-            {'message': 'Test Message', 'description': 'Test Description'}
-        )
-        notification = self._create_notification().pop()[1][0]
-        self.web_driver.find_element(By.ID, 'openwisp_notifications').click()
-        WebDriverWait(self.web_driver, 10).until(
-            EC.visibility_of_element_located((By.ID, f'ow-{notification.id}'))
-        )
-        self.web_driver.find_element(By.ID, f'ow-{notification.id}').click()
-        WebDriverWait(self.web_driver, 10).until(
-            EC.visibility_of_element_located((By.CLASS_NAME, 'ow-dialog-notification'))
-        )
-        dialog = self.web_driver.find_element(By.CLASS_NAME, 'ow-dialog-notification')
-        # This confirms the button is hidden
-        dialog.find_element(By.CSS_SELECTOR, '.ow-message-target-redirect.ow-hide')
diff --git a/openwisp_notifications/views.py b/openwisp_notifications/views.py
index fdb06676..281afa27 100644
--- a/openwisp_notifications/views.py
+++ b/openwisp_notifications/views.py
@@ -1,6 +1,7 @@
 from django.contrib.auth import get_user_model
 from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
 from django.http import Http404
+from django.urls import reverse_lazy
 from django.utils.translation import gettext as _
 from django.views.generic import TemplateView
 
@@ -9,7 +10,7 @@
 
 class NotificationPreferencePage(LoginRequiredMixin, UserPassesTestMixin, TemplateView):
     template_name = 'openwisp_notifications/preferences.html'
-    login_url = '/admin/login/'
+    login_url = reverse_lazy('admin:login')
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
diff --git a/tests/openwisp2/sample_notifications/migrations/0003_alter_notificationsetting_organization.py b/tests/openwisp2/sample_notifications/migrations/0003_alter_notificationsetting_organization_and_more.py
similarity index 52%
rename from tests/openwisp2/sample_notifications/migrations/0003_alter_notificationsetting_organization.py
rename to tests/openwisp2/sample_notifications/migrations/0003_alter_notificationsetting_organization_and_more.py
index 7ab64f70..e8c94403 100644
--- a/tests/openwisp2/sample_notifications/migrations/0003_alter_notificationsetting_organization.py
+++ b/tests/openwisp2/sample_notifications/migrations/0003_alter_notificationsetting_organization_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.11 on 2024-06-20 13:02
+# Generated by Django 4.2.16 on 2024-09-17 13:27
 
 import django.db.models.deletion
 from django.db import migrations, models
@@ -21,4 +21,19 @@ class Migration(migrations.Migration):
                 to="openwisp_users.organization",
             ),
         ),
+        migrations.AlterField(
+            model_name="notificationsetting",
+            name="type",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("default", "Default Type"),
+                    ("generic_message", "Generic Message Type"),
+                    ("object_created", "Object created"),
+                ],
+                max_length=30,
+                null=True,
+                verbose_name="Notification Type",
+            ),
+        ),
     ]

From c3f01e543efdc38ca0358d4434ac2677918bd986 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Fri, 20 Sep 2024 16:12:45 +0530
Subject: [PATCH 71/74] [chore] Update org level changes

---
 openwisp_notifications/api/serializers.py     | 10 +++++--
 openwisp_notifications/api/views.py           | 19 ++----------
 .../openwisp-notifications/js/preferences.js  |  5 +++-
 openwisp_notifications/tests/test_api.py      | 29 +++++++++++++++++--
 4 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/openwisp_notifications/api/serializers.py b/openwisp_notifications/api/serializers.py
index dba0b9b5..676059d0 100644
--- a/openwisp_notifications/api/serializers.py
+++ b/openwisp_notifications/api/serializers.py
@@ -95,5 +95,11 @@ class Meta:
 
 
 class NotificationSettingUpdateSerializer(serializers.Serializer):
-    email = serializers.BooleanField()
-    web = serializers.BooleanField()
+    email = serializers.BooleanField(required=False)
+    web = serializers.BooleanField(required=False)
+
+    def validate(self, attrs):
+        attrs = super().validate(attrs)
+        if 'email' not in attrs and attrs.get('web') is False:
+            attrs['email'] = False
+        return attrs
diff --git a/openwisp_notifications/api/views.py b/openwisp_notifications/api/views.py
index 4dcc5216..b50d2160 100644
--- a/openwisp_notifications/api/views.py
+++ b/openwisp_notifications/api/views.py
@@ -206,25 +206,12 @@ class OrganizationNotificationSettingView(GenericAPIView):
     serializer_class = NotificationSettingUpdateSerializer
 
     def post(self, request, user_id, organization_id):
-        notification_settings = NotificationSetting.objects.filter(
-            organization_id=organization_id, user_id=user_id
-        )
         serializer = self.get_serializer(data=request.data)
         if serializer.is_valid():
             validated_data = serializer.validated_data
-            web = validated_data.get('web')
-            email = validated_data.get('email')
-
-            for notification_setting in notification_settings:
-                if web and not email:
-                    notification_setting.web = web
-                else:
-                    notification_setting.web = web
-                    notification_setting.email = email
-
-            NotificationSetting.objects.bulk_update(
-                notification_settings, ['web', 'email']
-            )
+            NotificationSetting.objects.filter(
+                organization_id=organization_id, user_id=user_id
+            ).update(**validated_data)
             return Response(status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
diff --git a/openwisp_notifications/static/openwisp-notifications/js/preferences.js b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
index af538bec..13906d87 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/preferences.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
@@ -314,9 +314,12 @@ function getAbsoluteUrl(url) {
 
             const data = {
                 web: isOrgWebChecked,
-                email: isOrgEmailChecked
             };
 
+            if (triggeredBy === 'email') {
+                data.email = isOrgEmailChecked;
+            }
+
             // Update the UI
             $(`.main-checkbox[data-organization-id="${orgId}"][data-column="web"]`).prop('checked', isOrgWebChecked);
             $(`.main-checkbox[data-organization-id="${orgId}"][data-column="email"]`).prop('checked', isOrgEmailChecked);
diff --git a/openwisp_notifications/tests/test_api.py b/openwisp_notifications/tests/test_api.py
index 3914d1d2..09fdfa5a 100644
--- a/openwisp_notifications/tests/test_api.py
+++ b/openwisp_notifications/tests/test_api.py
@@ -848,7 +848,7 @@ def test_organization_notification_setting_update(self):
             self.assertEqual(response.status_code, 400)
 
         with self.subTest(
-            'Update organization-level web to False while keeping one of email notification setting to true'
+            'Test email to False while keeping one of email notification setting to true'
         ):
             url = self._get_path(
                 'organization_notification_setting',
@@ -856,6 +856,10 @@ def test_organization_notification_setting_update(self):
                 org.pk,
             )
 
+            NotificationSetting.objects.filter(
+                user=self.admin, organization_id=org.pk
+            ).update(web=False, email=False)
+
             # Set the default type notification setting's email to True
             NotificationSetting.objects.filter(
                 user=self.admin, organization_id=org.pk, type='default'
@@ -863,9 +867,28 @@ def test_organization_notification_setting_update(self):
 
             response = self.client.post(url, data={'web': True, 'email': False})
 
-            self.assertTrue(
+            self.assertFalse(
+                NotificationSetting.objects.filter(
+                    user=self.admin, organization_id=org.pk, email=True
+                ).exists()
+            )
+
+        with self.subTest('Test web to False'):
+            url = self._get_path(
+                'organization_notification_setting',
+                self.admin.pk,
+                org.pk,
+            )
+
+            NotificationSetting.objects.filter(
+                user=self.admin, organization_id=org.pk
+            ).update(web=True, email=True)
+
+            response = self.client.post(url, data={'web': False})
+
+            self.assertFalse(
                 NotificationSetting.objects.filter(
-                    user=self.admin, organization_id=org.pk, type='default', email=True
+                    user=self.admin, organization_id=org.pk, email=True
                 ).exists()
             )
 

From ad8ff56e04d7b1e4bf4753c8a32d69822be308ae Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Fri, 20 Sep 2024 17:57:33 +0530
Subject: [PATCH 72/74] [chore] Use full_clean instead of saving directly

---
 openwisp_notifications/tests/test_admin.py                | 1 +
 openwisp_notifications/tests/test_notification_setting.py | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/openwisp_notifications/tests/test_admin.py b/openwisp_notifications/tests/test_admin.py
index 5e73c717..35e48ef4 100644
--- a/openwisp_notifications/tests/test_admin.py
+++ b/openwisp_notifications/tests/test_admin.py
@@ -179,6 +179,7 @@ def test_notification_preferences_button_staff_user(self):
         # Button does not appear for non-staff user
         with self.subTest("Button should not appear for non-staff user"):
             user.is_staff = False
+            user.full_clean()
             user.save()
             response = self.client.get(user_admin_page)
             self.assertNotContains(response, expected_html, html=True)
diff --git a/openwisp_notifications/tests/test_notification_setting.py b/openwisp_notifications/tests/test_notification_setting.py
index f89b6a0c..44c9ac1b 100644
--- a/openwisp_notifications/tests/test_notification_setting.py
+++ b/openwisp_notifications/tests/test_notification_setting.py
@@ -287,6 +287,7 @@ def test_global_notification_setting_update(self):
         # Update global settings
         global_setting.email = False
         global_setting.web = False
+        global_setting.full_clean()
         global_setting.save()
 
         with self.subTest(
@@ -298,6 +299,7 @@ def test_global_notification_setting_update(self):
             ).update(email=True)
 
             global_setting.web = True
+            global_setting.full_clean()
             global_setting.save()
 
             self.assertTrue(

From 6c53bf677cedddffe3a82c1069d6318c774ecdaf Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Fri, 20 Sep 2024 19:28:05 +0530
Subject: [PATCH 73/74] [chore] Update global notification setting changes

---
 openwisp_notifications/base/models.py          | 14 +++++++++++---
 .../tests/test_notification_setting.py         | 18 +++++++++++++++++-
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/openwisp_notifications/base/models.py b/openwisp_notifications/base/models.py
index 43417a17..29e33778 100644
--- a/openwisp_notifications/base/models.py
+++ b/openwisp_notifications/base/models.py
@@ -309,11 +309,19 @@ def save(self, *args, **kwargs):
         with transaction.atomic():
             if not self.organization and not self.type:
                 try:
-                    original = self.__class__.objects.get(pk=self.pk)
+                    previous_state = self.__class__.objects.only('email').get(
+                        pk=self.pk
+                    )
                     updates = {'web': self.web}
 
-                    # Update 'email' only if it's different from the previous state
-                    if not self.web or self.email != original.email:
+                    # If global web notifiations are disabled, then disable email notifications as well
+                    if not self.web:
+                        updates['email'] = False
+
+                    # Update email notifiations only if it's different from the previous state
+                    # Otherwise, it would overwrite the email notification settings for specific
+                    # setting that were enabled by the user after disabling global email notifications
+                    if self.email != previous_state.email:
                         updates['email'] = self.email
 
                     self.user.notificationsetting_set.exclude(pk=self.pk).update(
diff --git a/openwisp_notifications/tests/test_notification_setting.py b/openwisp_notifications/tests/test_notification_setting.py
index 44c9ac1b..16a2712b 100644
--- a/openwisp_notifications/tests/test_notification_setting.py
+++ b/openwisp_notifications/tests/test_notification_setting.py
@@ -291,7 +291,7 @@ def test_global_notification_setting_update(self):
         global_setting.save()
 
         with self.subTest(
-            'Update global web to False while ensuring at least one email setting is True'
+            'Test global web to False while ensuring at least one email setting is True'
         ):
             # Set the default type notification setting's email to True
             NotificationSetting.objects.filter(
@@ -308,6 +308,22 @@ def test_global_notification_setting_update(self):
                 ).exists()
             )
 
+        with self.subTest('Test global web to False'):
+            global_setting.web = False
+            global_setting.full_clean()
+            global_setting.save()
+
+            self.assertFalse(
+                NotificationSetting.objects.filter(
+                    user=admin, organization=org, web=True
+                ).exists()
+            )
+            self.assertFalse(
+                NotificationSetting.objects.filter(
+                    user=admin, organization=org, email=True
+                ).exists()
+            )
+
     def test_global_notification_setting_delete(self):
         admin = self._get_admin()
         global_setting = NotificationSetting.objects.get(

From 2836bbda4490b76aa699589524cde52f40dc89b5 Mon Sep 17 00:00:00 2001
From: Dhanus <dhanus3133@gmail.com>
Date: Mon, 30 Sep 2024 20:53:38 +0530
Subject: [PATCH 74/74] [chore] UI changes

---
 .../css/preferences.css                       | 133 ++++-
 .../images/icons/icon-email.svg               |   3 +
 .../images/icons/icon-web.svg                 |   3 +
 .../openwisp-notifications/js/preferences.js  | 558 +++++++++++++-----
 .../openwisp_notifications/preferences.html   |  67 ++-
 openwisp_notifications/tests/test_selenium.py |  47 +-
 6 files changed, 649 insertions(+), 162 deletions(-)
 create mode 100644 openwisp_notifications/static/openwisp-notifications/images/icons/icon-email.svg
 create mode 100644 openwisp_notifications/static/openwisp-notifications/images/icons/icon-web.svg

diff --git a/openwisp_notifications/static/openwisp-notifications/css/preferences.css b/openwisp_notifications/static/openwisp-notifications/css/preferences.css
index 982cda1e..ce5f990a 100644
--- a/openwisp_notifications/static/openwisp-notifications/css/preferences.css
+++ b/openwisp_notifications/static/openwisp-notifications/css/preferences.css
@@ -3,23 +3,128 @@
   display: none;
 }
 .global-settings-container {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  gap: 8px;
+  display: flex;
+  border: 1px solid #e0e0e0;
+  border-radius: 8px;
+}
+.icon {
+  min-width: 24px;
+  min-height: 24px;
+  padding-right: 6px;
+}
+.icon-web {
+  background: url("../../openwisp-notifications/images/icons/icon-web.svg")
+    0 0 no-repeat;
+}
+.icon-email {
+  background: url("../../openwisp-notifications/images/icons/icon-email.svg")
+    0 0 no-repeat;
+}
+.global-setting-text h2 {
+  margin: 0 0 5px 0;
+}
+.global-setting-text p {
+  color: #666;
+}
+.global-setting-divider {
+  width: 1px;
+  background-color: #e0e0e0;
+}
+.global-setting-dropdown {
+  position: relative;
+}
+.global-setting-dropdown-toggle .mg-arrow {
+  display: block;
+}
+.global-setting-dropdown-toggle {
+  display: flex;
+  padding: 10px 15px;
+  background-color: #f5f5f5;
+  border: 1px solid #e0e0e0;
+  border-radius: 4px;
+  cursor: pointer;
+}
+.global-setting-dropdown-menu {
+  display: none;
+  position: absolute;
+  background-color: #fff;
+  border: 1px solid #e0e0e0;
+  border-radius: 4px;
+  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
+  padding: 0;
+  margin: 0;
+}
+.global-setting-dropdown-menu li {
+  padding: 10px 15px;
+  cursor: pointer;
+}
+.global-setting-dropdown-menu-open {
+  display: block;
+}
+.global-setting {
+  flex: 1;
+  padding: 20px;
 }
 .global-settings-container {
-  margin-left: 20px;
+  width: 840px;
+}
+.global-setting-content {
+  display: flex;
+  margin-bottom: 10px;
+}
+.global-setting-content h2 {
+    color: #555;
+}
+.modal {
+  display: none;
+  position: fixed;
+  z-index: 9999;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  overflow: auto;
+  background-color: rgba(0, 0, 0, 0.4);
+}
+.modal-content {
+  background-color: #fff;
+  margin: 15% auto;
+  padding: 20px;
+  border: 1px solid #888;
+  width: 400px;
+  border-radius: 5px;
+}
+.modal-header {
+  margin-bottom: 20px;
+}
+.modal-buttons {
+  display: flex;
+  gap: 10px;
+  margin-top: 20px;
+}
+#go-back,
+#confirm {
+  width: 100%;
 }
 .module h2 {
   padding: 15px 10px;
   cursor: pointer;
   display: flex;
-  justify-content: space-between;
+  justify-content: space-around;
   align-items: center;
   font-weight: bold;
   font-size: 14px;
   text-transform: uppercase;
+  padding: 6px;
+}
+.toggle-header {
+    border: none !important;
+}
+.org-name {
+    width: 40%;
+}
+.email-row {
+    position: relative;
 }
 .org-content {
   margin-top: 0;
@@ -32,8 +137,8 @@
 table {
   width: 100%;
 }
-th:not(:last-child),
-td:not(:last-child) {
+table:not(.toggle-header) th:not(:last-child),
+table:not(.toggle-header) td:not(:last-child) {
   border-right: 1px solid #ddd;
 }
 th:not(:first-child),
@@ -58,6 +163,9 @@ td:not(:first-child) {
   z-index: 9999;
   cursor: pointer;
 }
+.toast .icon {
+    background-repeat: no-repeat;
+}
 .toast .progress-bar {
   position: absolute;
   bottom: 0;
@@ -68,6 +176,9 @@ td:not(:first-child) {
   transition: width 3s linear;
 }
 span.toggle-icon {
+  position: absolute;
+  right: 15px;
+  top: 15px;
   width: 16px;
   height: 16px;
   margin-right: 5px;
@@ -157,7 +268,8 @@ input:checked + .slider:before {
   -ms-transform: translateX(20px);
   transform: translateX(20px);
 }
-.notification-web-header, .notification-email-header {
+.notification-web-header,
+.notification-email-header {
   text-align: center;
 }
 .notification-header-container {
@@ -175,3 +287,6 @@ input:checked + .slider:before {
 .module {
   border: 1px solid rgba(0, 0, 0, 0.1);
 }
+ul > li {
+  list-style-type: none !important;
+}
diff --git a/openwisp_notifications/static/openwisp-notifications/images/icons/icon-email.svg b/openwisp_notifications/static/openwisp-notifications/images/icons/icon-email.svg
new file mode 100644
index 00000000..a1816b7c
--- /dev/null
+++ b/openwisp_notifications/static/openwisp-notifications/images/icons/icon-email.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="18" viewBox="0 0 24 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3 1.5C2.15625 1.5 1.5 2.20312 1.5 3V4.875L10.6406 11.625C11.4375 12.1875 12.5156 12.1875 13.3125 11.625L22.5 4.875V3C22.5 2.20312 21.7969 1.5 21 1.5H3ZM1.5 6.75V15C1.5 15.8438 2.15625 16.5 3 16.5H21C21.7969 16.5 22.5 15.8438 22.5 15V6.75L14.2031 12.8438C12.8906 13.7812 11.0625 13.7812 9.75 12.8438L1.5 6.75ZM0 3C0 1.35938 1.3125 0 3 0H21C22.6406 0 24 1.35938 24 3V15C24 16.6875 22.6406 18 21 18H3C1.3125 18 0 16.6875 0 15V3Z" fill="#A1A1AA"/>
+</svg>
diff --git a/openwisp_notifications/static/openwisp-notifications/images/icons/icon-web.svg b/openwisp_notifications/static/openwisp-notifications/images/icons/icon-web.svg
new file mode 100644
index 00000000..212c6ae1
--- /dev/null
+++ b/openwisp_notifications/static/openwisp-notifications/images/icons/icon-web.svg
@@ -0,0 +1,3 @@
+<svg width="26" height="24" viewBox="0 0 26 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13 22.5C13.75 22.5 14.875 21.8438 15.8594 19.8281C16.3281 18.8906 16.75 17.7656 17.0312 16.5H8.96875C9.20312 17.7656 9.625 18.8906 10.0938 19.8281C11.0781 21.8438 12.2031 22.5 13 22.5ZM8.6875 15H17.2656C17.4062 14.0625 17.5 13.0781 17.5 12C17.5 10.9688 17.4062 9.98438 17.2656 9H8.6875C8.54688 9.98438 8.5 10.9688 8.5 12C8.5 13.0781 8.54688 14.0625 8.6875 15ZM8.96875 7.5H17.0312C16.75 6.23438 16.3281 5.15625 15.8594 4.21875C14.875 2.20312 13.75 1.5 13 1.5C12.2031 1.5 11.0781 2.20312 10.0938 4.21875C9.625 5.15625 9.20312 6.23438 8.96875 7.5ZM18.8125 9C18.9062 9.98438 19 10.9688 19 12C19 13.0781 18.9062 14.0625 18.8125 15H23.0312C23.3125 14.0625 23.5 13.0781 23.5 12C23.5 10.9688 23.3125 9.98438 23.0312 9H18.8125ZM22.4688 7.5C21.25 4.96875 19.0469 3 16.3281 2.0625C17.3125 3.375 18.1094 5.29688 18.5312 7.5H22.4688ZM7.42188 7.5C7.89062 5.29688 8.64062 3.375 9.625 2.0625C6.90625 3 4.70312 4.96875 3.48438 7.5H7.42188ZM2.92188 9C2.64062 9.98438 2.5 10.9688 2.5 12C2.5 13.0781 2.64062 14.0625 2.92188 15H7.1875C7.04688 14.0625 7 13.0781 7 12C7 10.9688 7.04688 9.98438 7.1875 9H2.92188ZM16.3281 21.9844C19.0469 21.0469 21.25 19.0781 22.4688 16.5H18.5312C18.1094 18.75 17.3125 20.625 16.3281 21.9844ZM9.625 21.9844C8.64062 20.625 7.89062 18.75 7.42188 16.5H3.48438C4.70312 19.0781 6.90625 21.0469 9.625 21.9844ZM13 24C8.6875 24 4.75 21.75 2.59375 18C0.4375 14.2969 0.4375 9.75 2.59375 6C4.75 2.29688 8.6875 0 13 0C17.2656 0 21.2031 2.29688 23.3594 6C25.5156 9.75 25.5156 14.2969 23.3594 18C21.2031 21.75 17.2656 24 13 24Z" fill="#A1A1AA"/>
+</svg>
diff --git a/openwisp_notifications/static/openwisp-notifications/js/preferences.js b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
index 13906d87..c1a9cc89 100644
--- a/openwisp_notifications/static/openwisp-notifications/js/preferences.js
+++ b/openwisp_notifications/static/openwisp-notifications/js/preferences.js
@@ -15,6 +15,7 @@ function getAbsoluteUrl(url) {
     $(document).ready(function () {
         const userId = $('.settings-container').data('user-id');
         fetchNotificationSettings(userId);
+        initializeGlobalSettings(userId);
     });
 
     function fetchNotificationSettings(userId) {
@@ -62,10 +63,7 @@ function getAbsoluteUrl(url) {
             const isGlobalEmailChecked = globalSetting.email;
             globalSettingId = globalSetting.id;
 
-            $('#global-web').prop('checked', isGlobalWebChecked);
-            $('#global-email').prop('checked', isGlobalEmailChecked);
-
-            initializeGlobalSettingsEventListener(userId);
+            initializeGlobalDropdowns(isGlobalWebChecked, isGlobalEmailChecked);
         } else {
             showToast('error', gettext('Global settings not found.'));
         }
@@ -78,6 +76,26 @@ function getAbsoluteUrl(url) {
         $('.global-settings').show();
     }
 
+    function initializeGlobalDropdowns(isGlobalWebChecked, isGlobalEmailChecked) {
+        // Initialize Web dropdown
+        const webDropdown = document.querySelector('.global-setting-dropdown[data-web-state]');
+        const webToggle = webDropdown.querySelector('.global-setting-dropdown-toggle');
+        const webState = isGlobalWebChecked ? 'on' : 'off';
+
+        // Update toggle's data-state and button text
+        webToggle.setAttribute('data-state', webState);
+        webToggle.innerHTML = (isGlobalWebChecked ? 'Notify on Web' : 'Don\'t Notify on Web') + ' ' + createArrowSpanHtml();
+
+        // Initialize Email dropdown
+        const emailDropdown = document.querySelector('.global-setting-dropdown[data-email-state]');
+        const emailToggle = emailDropdown.querySelector('.global-setting-dropdown-toggle');
+        const emailState = isGlobalEmailChecked ? 'on' : 'off';
+
+        // Update toggle's data-state and button text
+        emailToggle.setAttribute('data-state', emailState);
+        emailToggle.innerHTML = (isGlobalEmailChecked ? 'Notify by Email' : 'Don\'t Notify by Email') + ' ' + createArrowSpanHtml();
+    }
+
     function groupBy(array, key) {
         return array.reduce((result, currentValue) => {
             (result[currentValue[key]] = result[currentValue[key]] || []).push(currentValue);
@@ -101,10 +119,23 @@ function getAbsoluteUrl(url) {
 
             const orgName = orgSettings[0].organization_name;
 
+            // Calculate counts
+            const totalNotifications = orgSettings.length;
+            const enabledWebNotifications = orgSettings.filter(setting => setting.web).length;
+            const enabledEmailNotifications = orgSettings.filter(setting => setting.email).length;
+
             const orgPanel = $(
                 '<div class="module">' +
-                '<h2 class="toggle-header"><span>' + `${gettext('Organization')}: ${orgName}` + '</span><span class="toggle-icon collapsed"></span></h2>' +
-                '<div class="org-content"></div>' +
+                    '<table class="toggle-header" style="border: none;">' +
+                            '<thead>' +
+                                '<tr style="background: #f9f9f9">' +
+                                    '<td class="org-name"><h2 style="justify-content: flex-start;">' + `${gettext('Organization')}: ${orgName}` + '</h2></td>' +
+                                    '<td><h2 class="web-count">' + gettext('Web') + ' ' + enabledWebNotifications + '/' + totalNotifications + '</h2></td>' +
+                                    '<td class="email-row"><h2 class="email-count">' + gettext('Email') + ' ' + enabledEmailNotifications + '/' + totalNotifications + '</h2><span class="toggle-icon collapsed"></span></td>' +
+                                '</tr>' +
+                            '</thead>' +
+                    '</table>' +
+                    '<div class="org-content"></div>' +
                 '</div>'
             );
 
@@ -112,32 +143,32 @@ function getAbsoluteUrl(url) {
             if (orgSettings.length > 0) {
                 const table = $(
                     '<table>' +
-                    '<thead>' +
-                    '<tr>' +
-                    '<th>' + gettext('Notification Type') + '</th>' +
-                    '<th class="notification-web-header">' + 
-                        '<div class="notification-header-container">' +
-                        '<span>' + gettext('Web') + '</span>' +
-                        '<span class="tooltip-icon" data-tooltip="' + gettext('Enable or disable web notifications for this organization') + '">?</span>' +
-                        '<label class="switch" id="org-' + (orgIndex + 1) + '-web">' +
-                        '<input type="checkbox" class="main-checkbox" data-column="web" data-organization-id="' + orgId + '" />' +
-                        '<span class="slider round"></span>' +
-                        '</label>' +
-                        '</div>' +
-                    '</th>' +
-                    '<th class="notification-email-header">' +
-                        '<div class="notification-header-container">' +
-                        '<span>' + gettext('Email') + '</span>' +
-                        '<span class="tooltip-icon" data-tooltip="' + gettext('Enable or disable email notifications for this organization') + '">?</span>' +
-                        '<label class="switch" id="org-' + (orgIndex + 1) + '-email">' +
-                        '<input type="checkbox" class="main-checkbox" data-organization-id="' + orgId + '" data-column="email" />' +
-                        '<span class="slider round"></span>' +
-                        '</label>' +
-                        '</div>' +
-                    '</th>' +
-                    '</tr>' +
-                    '</thead>' +
-                    '<tbody></tbody>' +
+                        '<thead>' +
+                            '<tr>' +
+                                '<th style="width: 40%;">' + gettext('Notification Type') + '</th>' +
+                                '<th>' + 
+                                    '<div class="notification-header-container">' +
+                                    '<span>' + gettext('Web') + '</span>' +
+                                    '<span class="tooltip-icon" data-tooltip="' + gettext('Enable or disable web notifications for this organization') + '">?</span>' +
+                                    '<label class="switch" id="org-' + (orgIndex + 1) + '-web">' +
+                                    '<input type="checkbox" class="main-checkbox" data-column="web" data-organization-id="' + orgId + '" />' +
+                                    '<span class="slider round"></span>' +
+                                    '</label>' +
+                                    '</div>' +
+                                '</th>' +
+                                '<th>' +
+                                    '<div class="notification-header-container">' +
+                                    '<span>' + gettext('Email') + '</span>' +
+                                    '<span class="tooltip-icon" data-tooltip="' + gettext('Enable or disable email notifications for this organization') + '">?</span>' +
+                                    '<label class="switch" id="org-' + (orgIndex + 1) + '-email">' +
+                                    '<input type="checkbox" class="main-checkbox" data-organization-id="' + orgId + '" data-column="email" />' +
+                                    '<span class="slider round"></span>' +
+                                    '</label>' +
+                                    '</div>' +
+                                '</th>' +
+                            '</tr>' +
+                        '</thead>' +
+                        '<tbody></tbody>' +
                     '</table>'
                 );
 
@@ -145,19 +176,19 @@ function getAbsoluteUrl(url) {
                 orgSettings.forEach(function(setting, settingIndex) {
                     const row = $(
                         '<tr>' +
-                        '<td>' + setting.type_label + '</td>' +
-                        '<td>' +
-                        '<label class="switch" id="org-' + (orgIndex + 1) + '-web-' + (settingIndex + 1) + '">' +
-                        '<input type="checkbox" class="web-checkbox" ' + (setting.web ? 'checked' : '') + ' data-pk="' + setting.id + '" data-organization-id="' + orgId + '" data-type="web" />' +
-                        '<span class="slider round"></span>' +
-                        '</label>' +
-                        '</td>' +
-                        '<td>' +
-                        '<label class="switch" id="org-' + (orgIndex + 1) + '-email-' + (settingIndex + 1) + '">' +
-                        '<input type="checkbox" class="email-checkbox" ' + (setting.email ? 'checked' : '') + ' data-pk="' + setting.id + '" data-organization-id="' + orgId + '" data-type="email" />' +
-                        '<span class="slider round"></span>' +
-                        '</label>' +
-                        '</td>' +
+                            '<td>' + setting.type_label + '</td>' +
+                            '<td>' +
+                                '<label class="switch" id="org-' + (orgIndex + 1) + '-web-' + (settingIndex + 1) + '">' +
+                                '<input type="checkbox" class="web-checkbox" ' + (setting.web ? 'checked' : '') + ' data-pk="' + setting.id + '" data-organization-id="' + orgId + '" data-type="web" />' +
+                                '<span class="slider round"></span>' +
+                                '</label>' +
+                            '</td>' +
+                            '<td>' +
+                                '<label class="switch" id="org-' + (orgIndex + 1) + '-email-' + (settingIndex + 1) + '">' +
+                                    '<input type="checkbox" class="email-checkbox" ' + (setting.email ? 'checked' : '') + ' data-pk="' + setting.id + '" data-organization-id="' + orgId + '" data-type="email" />' +
+                                    '<span class="slider round"></span>' +
+                                '</label>' +
+                            '</td>' +
                         '</tr>'
                     );
                     table.find('tbody').append(row);
@@ -171,8 +202,8 @@ function getAbsoluteUrl(url) {
 
             orgPanelsContainer.append(orgPanel);
 
-            // Expand the first organization by default
-            if (orgIndex === 0) {
+            // Expand the first organization if there is only one organization
+            if (orgIndex === 0 && orgSettings.length === 1) {
                 orgContent.addClass('active');
                 orgPanel.find('.toggle-icon').removeClass('collapsed').addClass('expanded');
             } else {
@@ -181,12 +212,18 @@ function getAbsoluteUrl(url) {
         });
     }
 
-    // Update the org level checkboxes based on individual checkbox states in the table
+    // Update the org level checkboxes
     function updateMainCheckboxes(table) {
         table.find('.main-checkbox').each(function () {
             const column = $(this).data('column');
-            const allChecked = table.find('.' + column + '-checkbox').length === table.find('.' + column + '-checkbox:checked').length;
+            const totalCheckboxes = table.find('.' + column + '-checkbox').length;
+            const checkedCheckboxes = table.find('.' + column + '-checkbox:checked').length;
+            const allChecked = totalCheckboxes === checkedCheckboxes;
             $(this).prop('checked', allChecked);
+
+            // Update counts in the header
+            const headerSpan = table.find('.notification-' + column + '-header .notification-header-container span').first();
+            headerSpan.text((column === 'web' ? gettext('Web') : gettext('Email')) + ' ' + checkedCheckboxes + '/' + totalCheckboxes);
         });
     }
 
@@ -329,6 +366,7 @@ function getAbsoluteUrl(url) {
             }
 
             updateMainCheckboxes(table);
+            updateOrgLevelCheckboxes(orgId);
 
             $.ajax({
                 type: 'POST',
@@ -358,109 +396,361 @@ function getAbsoluteUrl(url) {
         });
     }
 
-    // Update individual setting checkboxes at the organization level
+    // Update individual setting checkboxes and counts at the organization level
     function updateOrgLevelCheckboxes(organizationId) {
-        const webCheckboxes = $('.web-checkbox[data-organization-id="' + organizationId + '"]');
-        const emailCheckboxes = $('.email-checkbox[data-organization-id="' + organizationId + '"]');
-        const webMainCheckbox = $('.main-checkbox[data-column="web"][data-organization-id="' + organizationId + '"]');
-        const emailMainCheckbox = $('.main-checkbox[data-column="email"][data-organization-id="' + organizationId + '"]');
-        webMainCheckbox.prop('checked', webCheckboxes.length === webCheckboxes.filter(':checked').length);
-        emailMainCheckbox.prop('checked', emailCheckboxes.length === emailCheckboxes.filter(':checked').length);
+        const table = $(`.main-checkbox[data-organization-id="${organizationId}"]`).closest('table');
+        const webCheckboxes = table.find('.web-checkbox');
+        const emailCheckboxes = table.find('.email-checkbox');
+        const webMainCheckbox = table.find('.main-checkbox[data-column="web"]');
+        const emailMainCheckbox = table.find('.main-checkbox[data-column="email"]');
+        const totalWebCheckboxes = webCheckboxes.length;
+        const totalEmailCheckboxes = emailCheckboxes.length;
+        const checkedWebCheckboxes = webCheckboxes.filter(':checked').length;
+        const checkedEmailCheckboxes = emailCheckboxes.filter(':checked').length;
+
+        webMainCheckbox.prop('checked', totalWebCheckboxes === checkedWebCheckboxes);
+        emailMainCheckbox.prop('checked', totalEmailCheckboxes === checkedEmailCheckboxes);
+
+        // Update counts in the header
+        const orgModule = table.closest('.module');
+        const webCountSpan = orgModule.find('.web-count');
+        const emailCountSpan = orgModule.find('.email-count');
+        webCountSpan.text(gettext('Web') + ' ' + checkedWebCheckboxes + '/' + totalWebCheckboxes);
+        emailCountSpan.text(gettext('Email') + ' ' + checkedEmailCheckboxes + '/' + totalEmailCheckboxes);
     }
 
-    // Initialize event listener for global settings
-    function initializeGlobalSettingsEventListener(userId) {
-        $('#global-email, #global-web').change(function (event) {
+    function initializeGlobalSettings(userId) {
+        var $dropdowns = $(".global-setting-dropdown");
+        var $modal = $("#confirmation-modal");
+        var $goBackBtn = $("#go-back");
+        var $confirmBtn = $("#confirm");
+        var activeDropdown = null;
+        var selectedOptionText = "";
+        var selectedOptionElement = null;
+        var previousCheckboxStates = null;
+
+        $dropdowns.each(function () {
+            var $dropdown = $(this);
+            var $toggle = $dropdown.find(".global-setting-dropdown-toggle");
+            var $menu = $dropdown.find(".global-setting-dropdown-menu");
+
+            $toggle.on("click", function (e) {
+                e.stopPropagation();
+                closeAllDropdowns();
+                $menu.toggleClass("global-setting-dropdown-menu-open");
+                adjustDropdownWidth($menu);
+            });
+
+            $menu.find("li").on("click", function () {
+                activeDropdown = $dropdown;
+                selectedOptionText = $(this).text().trim();
+                selectedOptionElement = $(this);
+                updateModalContent(); // Update modal content before showing
+                $modal.show();
+            });
+        });
+
+        // Close all dropdowns when clicking outside
+        $(document).on("click", closeAllDropdowns);
+
+        function closeAllDropdowns() {
+            $dropdowns.each(function () {
+                $(this)
+                    .find(".global-setting-dropdown-menu")
+                    .removeClass("global-setting-dropdown-menu-open");
+            });
+        }
+
+        function adjustDropdownWidth($menu) {
+            var $toggle = $menu.prev(".global-setting-dropdown-toggle");
+            var maxWidth = Math.max.apply(
+                null,
+                $menu
+                    .find("li")
+                    .map(function () {
+                        return $(this).outerWidth();
+                    })
+                    .get()
+            );
+            $menu.css(
+                "width",
+                Math.max($toggle.outerWidth(), maxWidth) + "px"
+            );
+        }
+
+        $goBackBtn.on("click", function () {
+            $modal.hide();
+        });
+
+        $confirmBtn.on("click", function () {
             if (isUpdateInProgress) {
                 return;
             }
 
-            const triggeredBy = $(event.target).attr('id');
+            if (activeDropdown) {
+                var dropdownType = activeDropdown.is("[data-web-state]") ? "web" : "email";
+                var triggeredBy = dropdownType;
+
+                var $webDropdown = $('.global-setting-dropdown[data-web-state]');
+                var $emailDropdown = $('.global-setting-dropdown[data-email-state]');
+                var $webToggle = $webDropdown.find('.global-setting-dropdown-toggle');
+                var $emailToggle = $emailDropdown.find('.global-setting-dropdown-toggle');
+
+                // Determine the current states
+                var isGlobalWebChecked = $webToggle.attr('data-state') === 'on';
+                var isGlobalEmailChecked = $emailToggle.attr('data-state') === 'on';
+
+                // Store previous states for potential rollback
+                var previousGlobalWebChecked = isGlobalWebChecked;
+                var previousGlobalEmailChecked = isGlobalEmailChecked;
+
+                previousCheckboxStates = {
+                    mainWebChecked: $('.main-checkbox[data-column="web"]')
+                        .map(function () {
+                            return {
+                                orgId: $(this).data("organization-id"),
+                                checked: $(this).is(":checked"),
+                            };
+                        })
+                        .get(),
+                    mainEmailChecked: $('.main-checkbox[data-column="email"]')
+                        .map(function () {
+                            return {
+                                orgId: $(this).data("organization-id"),
+                                checked: $(this).is(":checked"),
+                            };
+                        })
+                        .get(),
+                    webChecked: $(".web-checkbox")
+                        .map(function () {
+                            return {
+                                id: $(this).data("pk"),
+                                orgId: $(this).data("organization-id"),
+                                checked: $(this).is(":checked"),
+                            };
+                        })
+                        .get(),
+                    emailChecked: $(".email-checkbox")
+                        .map(function () {
+                            return {
+                                id: $(this).data("pk"),
+                                orgId: $(this).data("organization-id"),
+                                checked: $(this).is(":checked"),
+                            };
+                        })
+                        .get(),
+                };
+
+                // Update the state based on the selected option
+                if (dropdownType === "web") {
+                    isGlobalWebChecked = selectedOptionText === "Notify on Web";
+                } else if (dropdownType === "email") {
+                    isGlobalEmailChecked = selectedOptionText === "Notify by Email";
+                }
 
-            let isGlobalWebChecked = $('#global-web').is(':checked');
-            let isGlobalEmailChecked = $('#global-email').is(':checked');
+                // Email notifications require web notifications to be enabled
+                if (triggeredBy === "email" && isGlobalEmailChecked) {
+                    isGlobalWebChecked = true;
+                }
 
-            // Store previous states for potential rollback
-            let previousGlobalWebChecked, previousGlobalEmailChecked;
-            if (triggeredBy === 'global-email') {
-                previousGlobalEmailChecked = !isGlobalEmailChecked;
-                previousGlobalWebChecked = isGlobalWebChecked;
-            } else {
-                previousGlobalWebChecked = !isGlobalWebChecked;
-                previousGlobalEmailChecked = isGlobalEmailChecked;
+                // Disabling web notifications also disables email notifications
+                if (triggeredBy === "web" && !isGlobalWebChecked) {
+                    isGlobalEmailChecked = false;
+                }
+
+                isUpdateInProgress = true;
+
+                // Update the UI and data-state attributes
+                $webToggle
+                    .html(
+                        (isGlobalWebChecked ? "Notify on Web" : "Don't Notify on Web") +
+                            " " +
+                            createArrowSpanHtml()
+                    )
+                    .attr("data-state", isGlobalWebChecked ? "on" : "off");
+                $webDropdown.attr("data-web-state", isGlobalWebChecked ? "Yes" : "No");
+
+                $emailToggle
+                    .html(
+                        (isGlobalEmailChecked ? "Notify by Email" : "Don't Notify by Email") +
+                            " " +
+                            createArrowSpanHtml()
+                    )
+                    .attr("data-state", isGlobalEmailChecked ? "on" : "off");
+                $emailDropdown.attr("data-email-state", isGlobalEmailChecked ? "Yes" : "No");
+
+                // Update the checkboxes
+                $('.main-checkbox[data-column="web"]')
+                    .prop("checked", isGlobalWebChecked)
+                    .change();
+                $(".web-checkbox").prop("checked", isGlobalWebChecked);
+                if (
+                    (dropdownType === "web" && !isGlobalWebChecked) ||
+                    dropdownType === "email"
+                ) {
+                    $(".email-checkbox").prop("checked", isGlobalEmailChecked);
+                    $('.main-checkbox[data-column="email"]')
+                        .prop("checked", isGlobalEmailChecked)
+                        .change();
+                }
+
+                var data = JSON.stringify({
+                    web: isGlobalWebChecked,
+                    email: isGlobalEmailChecked,
+                });
+
+                $('.module').each(function () {
+                    const organizationId = $(this).find('.main-checkbox').data('organization-id');
+                    updateOrgLevelCheckboxes(organizationId);
+                });
+
+                $.ajax({
+                    type: "PATCH",
+                    url: getAbsoluteUrl(
+                        `/api/v1/notifications/user/${userId}/user-setting/${globalSettingId}/`
+                    ),
+                    headers: {
+                        "X-CSRFToken": $('input[name="csrfmiddlewaretoken"]').val(),
+                    },
+                    contentType: "application/json",
+                    data: data,
+                    success: function () {
+                        showToast(
+                            "success",
+                            gettext("Global settings updated successfully.")
+                        );
+                    },
+                    error: function () {
+                        showToast(
+                            "error",
+                            gettext("Something went wrong. Please try again.")
+                        );
+
+                        // Rollback the UI changes
+                        isGlobalWebChecked = previousGlobalWebChecked;
+                        isGlobalEmailChecked = previousGlobalEmailChecked;
+
+                        // Update the dropdown toggles and data-state attributes
+                        $webToggle
+                            .html(
+                                (isGlobalWebChecked ? "Notify on Web" : "Don't Notify on Web") +
+                                    " " +
+                                    createArrowSpanHtml()
+                            )
+                            .attr("data-state", isGlobalWebChecked ? "on" : "off");
+                        $webDropdown.attr("data-web-state", isGlobalWebChecked ? "Yes" : "No");
+
+                        $emailToggle
+                            .html(
+                                (isGlobalEmailChecked ? "Notify by Email" : "Don't Notify by Email") +
+                                    " " +
+                                    createArrowSpanHtml()
+                            )
+                            .attr("data-state", isGlobalEmailChecked ? "on" : "off");
+                        $emailDropdown.attr("data-email-state", isGlobalEmailChecked ? "Yes" : "No");
+
+                        // Restore the checkboxes
+                        previousCheckboxStates.mainWebChecked.forEach(function (item) {
+                            $(
+                                `.main-checkbox[data-organization-id="${item.orgId}"][data-column="web"]`
+                            ).prop("checked", item.checked);
+                        });
+                        previousCheckboxStates.mainEmailChecked.forEach(function (item) {
+                            $(
+                                `.main-checkbox[data-organization-id="${item.orgId}"][data-column="email"]`
+                            ).prop("checked", item.checked);
+                        });
+                        previousCheckboxStates.webChecked.forEach(function (item) {
+                            $(
+                                `.web-checkbox[data-organization-id="${item.orgId}"][data-pk="${item.id}"]`
+                            ).prop("checked", item.checked);
+                        });
+                        previousCheckboxStates.emailChecked.forEach(function (item) {
+                            $(
+                                `.email-checkbox[data-organization-id="${item.orgId}"][data-pk="${item.id}"]`
+                            ).prop("checked", item.checked);
+                        });
+
+                        $('.module').each(function () {
+                            const organizationId = $(this).find('.main-checkbox').data('organization-id');
+                            updateOrgLevelCheckboxes(organizationId);
+                        });
+                    },
+                    complete: function () {
+                        isUpdateInProgress = false;
+                    },
+                });
             }
+            $modal.hide();
+        });
 
-            const previousCheckboxStates = {
-                mainWebChecked: $('.main-checkbox[data-column="web"]').map(function() {
-                    return { orgId: $(this).data('organization-id'), checked: $(this).is(':checked') };
-                }).get(),
-                mainEmailChecked: $('.main-checkbox[data-column="email"]').map(function() {
-                    return { orgId: $(this).data('organization-id'), checked: $(this).is(':checked') };
-                }).get(),
-                webChecked: $('.web-checkbox').map(function() {
-                    return { id: $(this).data('pk'), orgId: $(this).data('organization-id'), checked: $(this).is(':checked') };
-                }).get(),
-                emailChecked: $('.email-checkbox').map(function() {
-                    return { id: $(this).data('pk'), orgId: $(this).data('organization-id'), checked: $(this).is(':checked') };
-                }).get()
-            };
+        // Update modal content dynamically
+        function updateModalContent() {
+            var $modalIcon = $modal.find('.modal-icon');
+            var $modalHeader = $modal.find('.modal-header h2');
+            var $modalMessage = $modal.find('.modal-message');
 
-            // Email notifications require web notifications to be enabled
-            if (triggeredBy === 'global-email' && isGlobalEmailChecked) {
-                isGlobalWebChecked = true;
+            // Clear previous icon
+            $modalIcon.empty();
+
+            var dropdownType = activeDropdown.is("[data-web-state]") ? "web" : "email";
+
+            var newGlobalWebChecked = selectedOptionText === "Notify on Web";
+            var newGlobalEmailChecked = selectedOptionText === "Notify by Email";
+
+            // Enabling email notifications requires web notifications to be enabled
+            if (newGlobalEmailChecked && !newGlobalWebChecked) {
+                newGlobalWebChecked = true;
             }
 
             // Disabling web notifications also disables email notifications
-            if (triggeredBy === 'global-web' && !isGlobalWebChecked) {
-                isGlobalEmailChecked = false;
+            if (!newGlobalWebChecked) {
+                newGlobalEmailChecked = false;
             }
 
-            isUpdateInProgress = true;
-
-            // Update the UI
-            $('#global-web').prop('checked', isGlobalWebChecked);
-            $('#global-email').prop('checked', isGlobalEmailChecked);
-
-            $('.main-checkbox[data-column="web"]').prop('checked', isGlobalWebChecked).change();
-            $('.web-checkbox').prop('checked', isGlobalWebChecked);
-            if ((triggeredBy === 'global-web' && !isGlobalWebChecked) || triggeredBy === 'global-email') {
-                $('.email-checkbox').prop('checked', isGlobalEmailChecked);
-                $('.main-checkbox[data-column="email"]').prop('checked', isGlobalEmailChecked).change();
+            // Message to show the settings that will be updated
+            var changes = [];
+
+            // Case 1: Enabling global web notifications, email remains the same
+            var isOnlyEnablingWeb =
+                newGlobalWebChecked === true &&
+                dropdownType === "web";
+
+            // Case 2: Disabling global email notifications, web remains the same
+            var isOnlyDisablingEmail =
+                newGlobalEmailChecked === false &&
+                dropdownType === "email";
+
+            if (isOnlyEnablingWeb) {
+                // Only web notification is being enabled
+                changes.push('Web notifications will be enabled.');
+            } else if (isOnlyDisablingEmail) {
+                // Only email notification is being disabled
+                changes.push('Email notifications will be disabled.');
+            } else {
+                // For all other cases, display both settings
+                changes.push('Web notifications will be ' + (newGlobalWebChecked ? 'enabled' : 'disabled') + '.');
+                changes.push('Email notifications will be ' + (newGlobalEmailChecked ? 'enabled' : 'disabled') + '.');
             }
 
-            $.ajax({
-                type: 'PATCH',
-                url: getAbsoluteUrl(`/api/v1/notifications/user/${userId}/user-setting/${globalSettingId}/`),
-                headers: { 'X-CSRFToken': $('input[name="csrfmiddlewaretoken"]').val() },
-                contentType: 'application/json',
-                data: JSON.stringify({ web: isGlobalWebChecked, email: isGlobalEmailChecked }),
-                success: function () {
-                    showToast('success', gettext('Global settings updated successfully.'));
-                },
-                error: function () {
-                    showToast('error', gettext('Something went wrong. Please try again.'));
+            // Set the modal icon
+            if (dropdownType === "web") {
+                $modalIcon.html('<div class="icon icon-web"></div>');
+            } else if (dropdownType === "email") {
+                $modalIcon.html('<div class="icon icon-email"></div>');
+            }
 
-                    $('#global-web').prop('checked', previousGlobalWebChecked);
-                    $('#global-email').prop('checked', previousGlobalEmailChecked);
+            // Update the modal header text
+            if (dropdownType === "web") {
+                $modalHeader.text('Apply Global Setting for Web');
+            } else if (dropdownType === "email") {
+                $modalHeader.text('Apply Global Setting for Email');
+            }
 
-                    previousCheckboxStates.mainWebChecked.forEach(function(item) {
-                        $(`.main-checkbox[data-organization-id="${item.orgId}"][data-column="web"]`).prop('checked', item.checked);
-                    });
-                    previousCheckboxStates.mainEmailChecked.forEach(function(item) {
-                        $(`.main-checkbox[data-organization-id="${item.orgId}"][data-column="email"]`).prop('checked', item.checked);
-                    });
-                    previousCheckboxStates.webChecked.forEach(function(item) {
-                        $(`.web-checkbox[data-organization-id="${item.orgId}"][data-pk="${item.id}"]`).prop('checked', item.checked);
-                    });
-                    previousCheckboxStates.emailChecked.forEach(function(item) {
-                        $(`.email-checkbox[data-organization-id="${item.orgId}"][data-pk="${item.id}"]`).prop('checked', item.checked);
-                    });
-                },
-                complete: function () {
-                    isUpdateInProgress = false;
-                }
-            });
-        });
+            // Update the modal message
+            var message = 'The following settings will be applied:<br>' + changes.join('<br>') + '<br>Do you want to continue?';
+            $modalMessage.html(message);
+        }
     }
 
     function showToast(level, message) {
@@ -472,7 +762,7 @@ function getAbsoluteUrl(url) {
         const toast = document.createElement('div');
         toast.className = `toast ${level}`;
         toast.innerHTML = `
-            <div style="display:flex">
+            <div style="display:flex; align-items: center;">
                 <div class="icon ow-notify-${level}"></div>
                 ${message}
             </div>
@@ -506,4 +796,8 @@ function getAbsoluteUrl(url) {
             }
         });
     }
+
+    function createArrowSpanHtml() {
+        return '<span class="mg-arrow"></span>';
+    }
 })(django.jQuery);
diff --git a/openwisp_notifications/templates/openwisp_notifications/preferences.html b/openwisp_notifications/templates/openwisp_notifications/preferences.html
index f201d197..4170f4eb 100644
--- a/openwisp_notifications/templates/openwisp_notifications/preferences.html
+++ b/openwisp_notifications/templates/openwisp_notifications/preferences.html
@@ -24,31 +24,66 @@
   </div>
 {% endblock breadcrumbs %}
 
-
 {% block content %}
   <div class="settings-container" data-user-id="{{ user_id }}">
     <div class="loader"></div>
     <div class="global-settings">
-      <strong>{% trans "Global Settings:" %}</strong>
-      <div class="global-settings-container">
-        <span>{% trans "Web" %}</span>
-        <label class="switch">
-          <input type="checkbox" id="global-web" />
-          <span class="slider round"></span>
-        </label>
-        <span class="tooltip-icon" data-tooltip="{% trans 'Enable or disable web notifications globally' %}">?</span>
-      </div>
+      <h2>Global Settings</h2>
       <div class="global-settings-container">
-        <span>{% trans "Email" %}</span>
-        <label class="switch">
-          <input type="checkbox" id="global-email" />
-          <span class="slider round"></span>
-        </label>
-        <span class="tooltip-icon" data-tooltip="{% trans 'Enable or disable email notifications globally' %}">?</span>
+        <!-- Global Web Setting -->
+        <div class="global-setting">
+          <div class="global-setting-content">
+            <div class="icon icon-web"></div>
+            <div class="global-setting-text">
+              <h2>Web</h2>
+              <p>Enable or Disable all web notifications globally</p>
+              <div class="global-setting-dropdown" data-web-state="No">
+                <button class="global-setting-dropdown-toggle"></button>
+                <ul class="global-setting-dropdown-menu">
+                  <li>Notify on Web</li>
+                  <li>Don't Notify on Web</li>
+                </ul>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="global-setting-divider"></div>
+        <!-- Global Email Setting -->
+        <div class="global-setting">
+          <div class="global-setting-content">
+            <div class="icon icon-email"></div>
+            <div class="global-setting-text">
+              <h2>Email</h2>
+              <p>Enable or Disable all email notifications globally</p>
+              <div class="global-setting-dropdown" data-email-state="No">
+                <button class="global-setting-dropdown-toggle"></button>
+                <ul class="global-setting-dropdown-menu">
+                  <li>Notify by Email</li>
+                  <li>Don't Notify by Email</li>
+                </ul>
+              </div>
+            </div>
+          </div>
+        </div>
       </div>
     </div>
     <div id="org-panels"></div>
   </div>
+
+  <!-- Confirmation Modal -->
+  <div id="confirmation-modal" class="modal" style="display:none;">
+    <div class="modal-content">
+      <div class="modal-header">
+        <div class="modal-icon"></div>
+        <h2></h2>
+      </div>
+      <p class="modal-message"></p>
+      <div class="modal-buttons">
+        <button class="button default" id="go-back">Go Back</button>
+        <button class="button default success-btn" id="confirm">Confirm</button>
+      </div>
+    </div>
+  </div>
 {% endblock content %}
 
 {% block footer %}
diff --git a/openwisp_notifications/tests/test_selenium.py b/openwisp_notifications/tests/test_selenium.py
index 8d0d2548..fa2cf330 100644
--- a/openwisp_notifications/tests/test_selenium.py
+++ b/openwisp_notifications/tests/test_selenium.py
@@ -100,13 +100,43 @@ def test_notification_preference_page(self):
         self.login()
         self.open('/notifications/preferences/')
 
+        WebDriverWait(self.web_driver, 30).until(
+            EC.visibility_of_element_located(
+                (By.CLASS_NAME, 'global-settings-container')
+            )
+        )
+
         # Uncheck the global web checkbox
-        global_web_label = WebDriverWait(self.web_driver, 30).until(
+        global_web_dropdown_toggle = WebDriverWait(self.web_driver, 30).until(
             EC.element_to_be_clickable(
-                (By.XPATH, "//*[@id='global-web']/parent::label")
+                (
+                    By.CSS_SELECTOR,
+                    '.global-setting-dropdown[data-web-state] .global-setting-dropdown-toggle',
+                )
             )
         )
-        global_web_label.click()
+        global_web_dropdown_toggle.click()
+
+        global_web_dropdown_menu = WebDriverWait(self.web_driver, 10).until(
+            EC.visibility_of_element_located(
+                (
+                    By.CSS_SELECTOR,
+                    '.global-setting-dropdown[data-web-state] .global-setting-dropdown-menu-open',
+                )
+            )
+        )
+
+        dont_notify_on_web_option = global_web_dropdown_menu.find_element(
+            By.XPATH, './/li[normalize-space()="Don\'t Notify on Web"]'
+        )
+        dont_notify_on_web_option.click()
+
+        confirmation_modal = WebDriverWait(self.web_driver, 10).until(
+            EC.visibility_of_element_located((By.ID, 'confirmation-modal'))
+        )
+
+        confirm_button = confirmation_modal.find_element(By.ID, 'confirm')
+        confirm_button.click()
 
         all_checkboxes = self.web_driver.find_elements(
             By.CSS_SELECTOR, 'input[type="checkbox"]'
@@ -114,12 +144,19 @@ def test_notification_preference_page(self):
         for checkbox in all_checkboxes:
             self.assertFalse(checkbox.is_selected())
 
+        # Expand the first organization panel if it's collapsed
+        first_org_toggle = WebDriverWait(self.web_driver, 10).until(
+            EC.element_to_be_clickable((By.CSS_SELECTOR, '.module .toggle-header'))
+        )
+        first_org_toggle.click()
+
         # Check the org-level web checkbox
         org_level_web_checkbox = WebDriverWait(self.web_driver, 10).until(
-            EC.visibility_of_element_located((By.ID, 'org-1-web'))
+            EC.element_to_be_clickable((By.ID, 'org-1-web'))
         )
         org_level_web_checkbox.click()
 
+        # Verify that all web checkboxes under org-1 are selected
         web_checkboxes = self.web_driver.find_elements(
             By.CSS_SELECTOR, 'input[id^="org-1-web-"]'
         )
@@ -142,7 +179,7 @@ def test_empty_notification_preference_page(self):
         self.login()
         self.open('/notifications/preferences/')
 
-        no_organizations_element = WebDriverWait(self.web_driver, 10).until(
+        no_organizations_element = WebDriverWait(self.web_driver, 30).until(
             EC.visibility_of_element_located((By.CLASS_NAME, 'no-organizations'))
         )
         self.assertEqual(