refactor: fetch push notification settings status from API instead of boot

Author: ruchamahabal

frontend/public/frappe-push-notification.js

@@ -12,10 +12,6 @@ class FrappePushNotification {
 		return window.frappe?.boot.push_relay_server_url
 	}
 
-	static get isNotificationRelayEnabled() {
-		return window.frappe?.boot.push_notifications_enabled
-	}
-
 	// Type definitions
 	/**
 	 * Web Config

frontend/src/data/notifications.js

@@ -27,3 +27,9 @@ export const notifications = createListResource({
 		unreadNotificationsCount.reload()
 	},
 })
+
+export const arePushNotificationsEnabled = createResource({
+	url: "hrms.api.are_push_notifications_enabled",
+	cache: "hrms:push_notifications_enabled",
+	auto: true,
+})

frontend/src/views/AppSettings.vue

@@ -55,6 +55,8 @@ import { FeatherIcon, Switch, toast, LoadingIndicator } from "frappe-ui"
 
 import { computed, ref } from "vue"
 
+import { arePushNotificationsEnabled } from "@/data/notifications"
+
 const router = useRouter()
 const pushNotificationState = ref(
 	window.frappePushNotification?.isNotificationEnabled()
@@ -63,8 +65,10 @@ const isLoading = ref(false)
 
 const disablePushSetting = computed(() => {
 	return (
-		!(window.push_relay_server_url && window.push_notifications_enabled) ||
-		isLoading.value
+		!(
+			window.frappe?.boot.push_relay_server_url &&
+			arePushNotificationsEnabled.data
+		) || isLoading.value
 	)
 })
 

frontend/src/views/Notifications.vue

@@ -96,14 +96,20 @@ import { computed, inject } from "vue"
 import EmployeeAvatar from "@/components/EmployeeAvatar.vue"
 import EmptyState from "@/components/EmptyState.vue"
 
-import { unreadNotificationsCount, notifications } from "@/data/notifications"
+import {
+	unreadNotificationsCount,
+	notifications,
+	arePushNotificationsEnabled,
+} from "@/data/notifications"
 
 const user = inject("$user")
 const dayjs = inject("$dayjs")
 const router = useRouter()
 
 const allowPushNotifications = computed(
-	() => window.push_relay_server_url && window.push_notifications_enabled
+	() =>
+		window.frappe?.boot.push_relay_server_url &&
+		arePushNotificationsEnabled.data
 )
 
 const markAllAsRead = createResource({

frontend/src/views/Profile.vue

@@ -147,6 +147,8 @@ import { formatCurrency } from "@/utils/formatters"
 
 import ProfileInfoModal from "@/components/ProfileInfoModal.vue"
 
+import { arePushNotificationsEnabled } from "@/data/notifications"
+
 const DOCTYPE = "Employee"
 
 const socket = inject("$socket")
@@ -214,7 +216,9 @@ const isInfoModalOpen = ref(false)
 const selectedItem = ref(null)
 
 const allowPushNotifications = computed(
-	() => window.push_relay_server_url && window.push_notifications_enabled
+	() =>
+		window.frappe?.boot.push_relay_server_url &&
+		arePushNotificationsEnabled.data
 )
 
 const openInfoModal = async (request) => {

hrms/api/__init__.py

@@ -75,6 +75,7 @@ def get_all_employees() -> list[dict]:
 	)
 
 
+# Notifications
 @frappe.whitelist()
 def get_unread_notifications_count() -> int:
 	return frappe.db.count(
@@ -94,6 +95,11 @@ def mark_all_notifications_as_read() -> None:
 	)
 
 
+@frappe.whitelist()
+def are_push_notifications_enabled() -> bool:
+	return frappe.db.get_single_value("Push Notification Settings", "enable_push_notification_relay")
+
+
 # Leaves and Holidays
 @frappe.whitelist()
 def get_leave_applications(

hrms/www/hrms.py

@@ -20,11 +20,4 @@ def get_context_for_dev():
 
 
 def get_boot():
-	return frappe._dict(
-		{
-			"push_notifications_enabled": frappe.db.get_single_value(
-				"Push Notification Settings", "enable_push_notification_relay"
-			),
-			"push_relay_server_url": frappe.conf.get("push_relay_server_url"),
-		}
-	)
+	return frappe._dict({"push_relay_server_url": frappe.conf.get("push_relay_server_url")})