@@ -293,7 +295,37 @@ frappe.pages['alert-users'].on_page_load = function(wrapper) {
}
}
- function sendAlert(title, description, tag) {
+ function loadAlertTypes() {
+ frappe.call({
+ method: 'admin_panel.api.admin_api.get_alert_types',
+ callback: function(r) {
+ const topics = r.message && r.message.topics;
+ $tagSelect.empty();
+
+ if (!topics || topics.length === 0) {
+ $tagSelect.append('
');
+ return;
+ }
+
+ topics.forEach(function(topic) {
+ $tagSelect.append(`
`);
+ });
+
+ $tagSelect.prop('disabled', false);
+ $sendButton.prop('disabled', false);
+ updatePreview();
+ },
+ error: function() {
+ $tagSelect.empty().append('
');
+ frappe.show_alert({
+ message: 'Could not load alert types from API.',
+ indicator: 'red'
+ }, 5);
+ }
+ });
+ }
+
+ function sendAlert(title, description, alertType) {
$sendButton.prop('disabled', true);
$sendButton.html('
');
@@ -302,7 +334,7 @@ frappe.pages['alert-users'].on_page_load = function(wrapper) {
args: {
title: title,
message: description,
- tag: tag
+ alert_type: alertType
},
callback: function(response) {
if (response.message && response.message.success) {
@@ -311,18 +343,16 @@ frappe.pages['alert-users'].on_page_load = function(wrapper) {
indicator: 'green'
}, 5);
- // Clear form
$titleInput.val('');
$descriptionInput.val('');
- $tagSelect.val('EMERGENCY');
$titleCount.text('0');
$descriptionCount.text('0');
$previewContainer.fadeOut();
-
+
loadAlertHistory();
} else {
- const errorMsg = response.message?.error ||
- (response.message?.errors ? response.message.errors.join(', ') : '') ||
+ const errorMsg = response.message?.error ||
+ (response.message?.errors ? response.message.errors.join(', ') : '') ||
'Unknown error';
frappe.msgprint({
@@ -332,7 +362,7 @@ frappe.pages['alert-users'].on_page_load = function(wrapper) {
});
}
},
- error: function(error) {
+ error: function() {
frappe.msgprint({
title: 'Error',
message: 'Failed to send alert. Please try again.',
@@ -346,6 +376,15 @@ frappe.pages['alert-users'].on_page_load = function(wrapper) {
});
}
+ function getSeverityClass(tag) {
+ const t = (tag || '').toUpperCase();
+ if (t.includes('EMERGENCY')) return 'severity-emergency';
+ if (t.includes('ATTENTION')) return 'severity-attention';
+ if (t.includes('INFO')) return 'severity-info';
+ if (t.includes('MARKETING')) return 'severity-marketing';
+ return '';
+ }
+
function loadAlertHistory() {
frappe.call({
method: 'admin_panel.api.admin_api.get_user_alerts',
@@ -359,10 +398,10 @@ frappe.pages['alert-users'].on_page_load = function(wrapper) {
return;
}
- r.message.logs.forEach(log => {
+ const html = r.message.logs.map(log => {
const date = frappe.datetime.str_to_user(log.sent_on);
- const item = `
-
+ return `
+
${frappe.utils.escape_html(log.title)}
${frappe.utils.escape_html(log.message)}
@@ -370,8 +409,8 @@ frappe.pages['alert-users'].on_page_load = function(wrapper) {
`;
- $historyList.append(item);
- });
+ }).join('');
+ $historyList.html(html);
}
});
}
@@ -392,7 +431,7 @@ frappe.pages['alert-users'].on_page_load = function(wrapper) {
$sendButton.on('click', function() {
const title = $titleInput.val().trim();
const description = $descriptionInput.val().trim();
- const tag = $tagSelect.val();
+ const alertType = $tagSelect.val();
if (!title) {
frappe.msgprint({
@@ -415,15 +454,16 @@ frappe.pages['alert-users'].on_page_load = function(wrapper) {
}
frappe.confirm(
- `Are you sure you want to send this ${tag.toLowerCase()} alert to all users?
+ `Are you sure you want to send this ${alertType} alert to all users?
Title: ${title}
Message: ${description}
-
Type: ${tag}`,
+
Type: ${alertType}`,
function() {
- sendAlert(title, description, tag);
+ sendAlert(title, description, alertType);
}
);
});
+ loadAlertTypes();
loadAlertHistory();
-}
\ No newline at end of file
+}
diff --git a/admin_panel/admin_panel/page/alert_users/alert_users.json b/admin_panel/admin_panel/page/alert_users/alert_users.json
index f4e3c14..a71d2cb 100644
--- a/admin_panel/admin_panel/page/alert_users/alert_users.json
+++ b/admin_panel/admin_panel/page/alert_users/alert_users.json
@@ -1,10 +1,10 @@
{
"content": null,
- "creation": "2025-10-29 18:46:51.633558",
+ "creation": "2026-04-03 11:38:18.350514",
"docstatus": 0,
"doctype": "Page",
"idx": 0,
- "modified": "2025-10-29 18:46:51.633558",
+ "modified": "2026-04-11 15:30:59.822871",
"modified_by": "Administrator",
"module": "Admin Panel",
"name": "alert-users",
diff --git a/admin_panel/api/admin_api.py b/admin_panel/api/admin_api.py
index edef24c..4218c7e 100644
--- a/admin_panel/api/admin_api.py
+++ b/admin_panel/api/admin_api.py
@@ -54,49 +54,58 @@ def update_account_level(uid, level):
@frappe.whitelist()
@handle_api_errors
-def send_alert(title, message, tag="EMERGENCY"):
- """Send broadcast alert to all users via admin API"""
- if not title or not message:
+def get_user_alerts(limit=10):
+ """Return latest User Alerts"""
+ logs = frappe.get_all(
+ "User Alerts",
+ fields=["title", "message", "tag", "sent_by", "sent_on"],
+ order_by="sent_on desc",
+ limit_page_length=int(limit)
+ )
+ return {"logs": logs}
+
+
+@frappe.whitelist()
+@handle_api_errors
+def get_alert_types():
+ """Fetch available notification topics from Flash API"""
+ client = GraphQLClient()
+ topics = client.get_notification_topics()
+ return {"topics": topics}
+
+
+@frappe.whitelist()
+@handle_api_errors
+def send_alert(alert_type, title, message):
+ """Send push notification via Flash sendNotification API"""
+ if not title or not message or not alert_type:
frappe.response['http_status_code'] = 400
- return {"success": False, "error": "Title and message are required"}
+ return {"success": False, "error": "Alert type, title, and message are required"}
client = GraphQLClient()
- result = client.send_broadcast_alert(title, message, tag)
+ result = client.send_alert(alert_type, title, message)
if result.get('errors'):
error_messages = [err.get('message', 'Unknown error') for err in result['errors']]
- frappe.logger().error(f"Broadcast alert errors: {error_messages}")
+ frappe.logger().error(f"Send alert errors: {error_messages}")
frappe.response['http_status_code'] = 400
return {"success": False, "errors": error_messages}
if not result.get('success'):
frappe.response['http_status_code'] = 500
- return {"success": False, "error": "Failed to send alert"}
+ return {"success": False, "error": "Failed to send notification"}
frappe.get_doc({
"doctype": "User Alerts",
"title": title,
"message": message,
- "tag": tag,
+ "tag": alert_type,
"sent_by": frappe.session.user,
"sent_on": frappe.utils.now_datetime()
}).insert(ignore_permissions=True)
frappe.db.commit()
- return {"success": True, "message": f"Alert sent successfully: {title}"}
-
-
-@frappe.whitelist()
-@handle_api_errors
-def get_user_alerts(limit=10):
- """Return latest User Alerts"""
- logs = frappe.get_all(
- "User Alerts",
- fields=["title", "message", "tag", "sent_by", "sent_on"],
- order_by="sent_on desc",
- limit_page_length=int(limit)
- )
- return {"logs": logs}
+ return {"success": True, "message": f"Notification sent successfully: {title}"}
@frappe.whitelist()
diff --git a/admin_panel/api/graphql_client.py b/admin_panel/api/graphql_client.py
index 80c7b8b..c4c8232 100644
--- a/admin_panel/api/graphql_client.py
+++ b/admin_panel/api/graphql_client.py
@@ -159,10 +159,10 @@ def execute_and_extract(self, query: str, variables: dict, data_key: str, allow_
}
"""
- BROADCAST_ALERT_MUTATION = """
- mutation adminBroadcastSend($input: AdminBroadcastSendInput!) {
- adminBroadcastSend(input: $input) {
- success
+ ID_DOCUMENT_URL_QUERY = """
+ query IdDocumentReadUrl($fileKey: String!) {
+ idDocumentReadUrl(fileKey: $fileKey) {
+ readUrl
errors {
message
}
@@ -170,13 +170,19 @@ def execute_and_extract(self, query: str, variables: dict, data_key: str, allow_
}
"""
- ID_DOCUMENT_URL_QUERY = """
- query IdDocumentReadUrl($fileKey: String!) {
- idDocumentReadUrl(fileKey: $fileKey) {
- readUrl
+ NOTIFICATION_TOPICS_QUERY = """
+ query {
+ notificationTopics
+ }
+ """
+
+ SEND_NOTIFICATION_MUTATION = """
+ mutation SendNotification($input: SendNotificationInput!) {
+ sendNotification(input: $input) {
errors {
message
}
+ success
}
}
"""
@@ -189,7 +195,7 @@ def get_account_by_phone(self, phone: str) -> dict | None:
"accountDetailsByUserPhone",
allow_not_found=True
)
-
+
def update_account_level(self, uid: str, level: str, erp_party: str = None) -> dict:
"""Update account level"""
variables = {"input": {"uid": uid, "level": level}}
@@ -200,14 +206,6 @@ def update_account_level(self, uid: str, level: str, erp_party: str = None) -> d
variables,
"accountUpdateLevel"
) or {}
-
- def send_broadcast_alert(self, title: str, body: str, tag: str = "EMERGENCY") -> dict:
- """Send broadcast alert to all users"""
- return self.execute_and_extract(
- self.BROADCAST_ALERT_MUTATION,
- {"input": {"title": title, "body": body, "tag": tag}},
- "adminBroadcastSend"
- )
def get_id_document_read_url(self, file_key: str) -> dict:
"""Get pre-signed URL for ID document from Digital Ocean Spaces"""
@@ -215,4 +213,18 @@ def get_id_document_read_url(self, file_key: str) -> dict:
self.ID_DOCUMENT_URL_QUERY,
{"fileKey": file_key},
"idDocumentReadUrl"
- )
\ No newline at end of file
+ )
+
+ def get_notification_topics(self) -> list:
+ """Fetch available notification topics from Flash API"""
+ resp = self.execute_query(self.NOTIFICATION_TOPICS_QUERY)
+ self._check_errors(resp)
+ return resp.get("data", {}).get("notificationTopics", [])
+
+ def send_alert(self, topic: str, title: str, body: str) -> dict:
+ """Send alert to Flash app users via topic"""
+ return self.execute_and_extract(
+ self.SEND_NOTIFICATION_MUTATION,
+ {"input": {"topic": topic, "title": title, "body": body}},
+ "sendNotification"
+ )