From b28cbb1aabda32725c81d36d8f32f915f9e88ca9 Mon Sep 17 00:00:00 2001
From: vishnu r kumar <rkumar.vishnu28@gmail.com>
Date: Tue, 26 May 2026 21:32:37 +0530
Subject: [PATCH 1/4] feat(floware): change to OAuth flow from DWD for cron job

---
 .../server/apps/floware/floware/config.ini    |  5 +-
 .../services/email_service.py                 | 61 ++++++++-----------
 .../user_management_module/user_container.py  |  5 +-
 3 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/wavefront/server/apps/floware/floware/config.ini b/wavefront/server/apps/floware/floware/config.ini
index 82e35721..10f3d32d 100644
--- a/wavefront/server/apps/floware/floware/config.ini
+++ b/wavefront/server/apps/floware/floware/config.ini
@@ -127,9 +127,10 @@ authority=${AUTHORITY}
 webhook_url=${WEBHOOK_URL}
 
 [gmail]
-service_account_file=${GMAIL_SERVICE_ACCOUNT_FILE}
+client_id=${GMAIL_CLIENT_ID}
+client_secret=${GMAIL_CLIENT_SECRET}
+refresh_token=${GMAIL_REFRESH_TOKEN}
 email_sender=${GMAIL_SENDER_EMAILID}
-delegate_user=${GMAIL_DELEGATE_USER}
 
 [scheduler]
 daily_alert_cron=${DAILY_ALERT_CRON:0 5 * * *}
diff --git a/wavefront/server/modules/user_management_module/user_management_module/services/email_service.py b/wavefront/server/modules/user_management_module/user_management_module/services/email_service.py
index 4430a2f6..d8555753 100644
--- a/wavefront/server/modules/user_management_module/user_management_module/services/email_service.py
+++ b/wavefront/server/modules/user_management_module/user_management_module/services/email_service.py
@@ -6,12 +6,12 @@
 import msal
 import requests
 import base64
-import json
 from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
 from email.mime.base import MIMEBase
 from email import encoders
-from google.oauth2 import service_account
+from google.auth.transport.requests import Request
+from google.oauth2.credentials import Credentials
 from googleapiclient.discovery import build
 
 
@@ -133,39 +133,39 @@ def send_email(
 
 
 class GmailEmailService(EmailService):
-    def __init__(self, service_account_b64, email_sender, delegate_user):
-        self.email_sender = email_sender or delegate_user
-        self.delegate_user = delegate_user
+    def __init__(self, client_id, client_secret, refresh_token, email_sender):
+        self.client_id = client_id
+        self.client_secret = client_secret
+        self.refresh_token = refresh_token
+        self.email_sender = email_sender
         self.scopes = ['https://www.googleapis.com/auth/gmail.send']
 
-        if not delegate_user:
-            raise Exception('Delegate user required for gmail')
-
-        try:
-            decoded_json = base64.b64decode(service_account_b64).decode('utf-8')
-            self.service_account_info = json.loads(decoded_json)
-        except Exception as e:
-            raise Exception(f'Invalid Gmail service account configuration: {str(e)}')
+        if not all([client_id, client_secret, refresh_token, email_sender]):
+            raise Exception(
+                'Gmail OAuth requires client_id, client_secret, refresh_token, and email_sender'
+            )
 
-    def get_access_token(self):
-        credentials = service_account.Credentials.from_service_account_info(
-            self.service_account_info, scopes=self.scopes
+    def get_credentials(self) -> Credentials:
+        creds = Credentials(
+            token=None,
+            refresh_token=self.refresh_token,
+            token_uri='https://oauth2.googleapis.com/token',
+            client_id=self.client_id,
+            client_secret=self.client_secret,
+            scopes=self.scopes,
         )
+        creds.refresh(Request())
+        return creds
 
-        credentials = credentials.with_subject(self.delegate_user)
+    def get_access_token(self):
+        return self.get_credentials()
 
-        return credentials
+    def _get_gmail_service(self):
+        return build('gmail', 'v1', credentials=self.get_credentials())
 
     def send_forget_password_email(self, forget_url_link: str, email: str) -> bool:
         try:
-            credentials = self.get_access_token()
-            if not credentials:
-                logger.error('failed to obtain gmail access token')
-                raise HTTPException(
-                    status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-                    detail='Failed to authenticate while sending the email.',
-                )
-            service = build('gmail', 'v1', credentials=credentials)
+            service = self._get_gmail_service()
 
             message = MIMEMultipart()
             message['to'] = email
@@ -206,14 +206,7 @@ def send_email(
         attachments: list[dict[str, Any]] | None = None,
     ) -> bool:
         try:
-            credentials = self.get_access_token()
-            if not credentials:
-                logger.error('failed to obtain gmail access token')
-                raise HTTPException(
-                    status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-                    detail='Failed to authenticate while sending the email.',
-                )
-            service = build('gmail', 'v1', credentials=credentials)
+            service = self._get_gmail_service()
             message = MIMEMultipart()
             message['to'] = email_id
             message['from'] = f'Rootflo Notifications <{self.email_sender}>'
diff --git a/wavefront/server/modules/user_management_module/user_management_module/user_container.py b/wavefront/server/modules/user_management_module/user_management_module/user_container.py
index 72496d54..2303f8b3 100644
--- a/wavefront/server/modules/user_management_module/user_management_module/user_container.py
+++ b/wavefront/server/modules/user_management_module/user_management_module/user_container.py
@@ -69,9 +69,10 @@ class UserContainer(containers.DeclarativeContainer):
         ),
         gmail=providers.Singleton(
             GmailEmailService,
-            service_account_b64=config.gmail.service_account_file,
+            client_id=config.gmail.client_id,
+            client_secret=config.gmail.client_secret,
+            refresh_token=config.gmail.refresh_token,
             email_sender=config.gmail.email_sender,
-            delegate_user=config.gmail.delegate_user,
         ),
     )
 

From 967da80f9afb867ef45589aaf158f349d46802a9 Mon Sep 17 00:00:00 2001
From: vishnu r kumar <rkumar.vishnu28@gmail.com>
Date: Fri, 29 May 2026 21:12:12 +0530
Subject: [PATCH 2/4] feat: make scheduled queries respect rls policy

---
 .../datasources/ScheduleEmailAlertDialog.tsx  | 280 ++++++++++++----
 wavefront/client/src/types/scheduled-job.ts   |   2 +-
 .../floware/di/application_container.py       |   7 +
 .../server/apps/floware/floware/server.py     |   3 +
 .../floware/services/scheduled_job_service.py | 302 ++++++++++++------
 5 files changed, 442 insertions(+), 152 deletions(-)

diff --git a/wavefront/client/src/pages/apps/[appId]/datasources/ScheduleEmailAlertDialog.tsx b/wavefront/client/src/pages/apps/[appId]/datasources/ScheduleEmailAlertDialog.tsx
index aefb1cb8..9c311140 100644
--- a/wavefront/client/src/pages/apps/[appId]/datasources/ScheduleEmailAlertDialog.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/datasources/ScheduleEmailAlertDialog.tsx
@@ -7,12 +7,26 @@ import {
   DialogHeader,
   DialogTitle,
 } from '@app/components/ui/dialog';
+import { Badge } from '@app/components/ui/badge';
+import {
+  Command,
+  CommandEmpty,
+  CommandGroup,
+  CommandInput,
+  CommandItem,
+  CommandList,
+} from '@app/components/ui/command';
 import { Input } from '@app/components/ui/input';
+import { Popover, PopoverContent, PopoverTrigger } from '@app/components/ui/popover';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@app/components/ui/select';
 import { Textarea } from '@app/components/ui/textarea';
+import { useGetUsers } from '@app/hooks';
+import { cn } from '@app/lib/utils';
 import { useNotifyStore } from '@app/store';
+import { IUser } from '@app/types/user';
 import { ScheduledJob } from '@app/types/scheduled-job';
 import floConsoleService from '@app/api';
+import { Check, ChevronDown, X } from 'lucide-react';
 import { useEffect, useMemo, useState } from 'react';
 
 interface ScheduleEmailAlertDialogProps {
@@ -22,6 +36,28 @@ interface ScheduleEmailAlertDialogProps {
   onOpenChange: (open: boolean) => void;
 }
 
+const normalizeUserId = (id: string) => id.trim().toLowerCase();
+
+const formatUserLabel = (user: IUser) => `${user.first_name} ${user.last_name} (${user.email})`;
+
+const parseRecipientUserIdsFromPayload = (payload: Record<string, unknown>, users: IUser[]): string[] => {
+  const rawIds = payload.recipient_user_ids;
+  const ids: string[] = [];
+  if (Array.isArray(rawIds)) {
+    for (const item of rawIds) {
+      const id = String(item).trim();
+      if (id) ids.push(id);
+    }
+  } else if (typeof rawIds === 'string' && rawIds.trim()) {
+    ids.push(rawIds.trim());
+  }
+
+  return ids.map((id) => {
+    const match = users.find((u) => normalizeUserId(u.id) === normalizeUserId(id));
+    return match ? match.id : id;
+  });
+};
+
 const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
   isOpen,
   datasourceId,
@@ -33,7 +69,77 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
   const [loadingJobs, setLoadingJobs] = useState(false);
   const [cronExpr, setCronExpr] = useState('0 9 * * *');
   const [timezone, setTimezone] = useState('Asia/Kolkata');
-  const [recipientsText, setRecipientsText] = useState('');
+  const [selectedRecipientUserIds, setSelectedRecipientUserIds] = useState<string[]>([]);
+  const [recipientsSelectOpen, setRecipientsSelectOpen] = useState(false);
+  const { data: users = [], isLoading: usersLoading } = useGetUsers();
+
+  const selectedRecipientUsers = useMemo(() => {
+    return selectedRecipientUserIds.map((id) => {
+      const user = users.find((u) => normalizeUserId(u.id) === normalizeUserId(id));
+      if (user) return user;
+      return {
+        id,
+        email: id,
+        first_name: 'Unknown',
+        last_name: 'user',
+        role: '',
+      } satisfies IUser;
+    });
+  }, [selectedRecipientUserIds, users]);
+
+  const isRecipientSelected = (userId: string) =>
+    selectedRecipientUserIds.some((id) => normalizeUserId(id) === normalizeUserId(userId));
+
+  const toggleRecipientUser = (userId: string) => {
+    setSelectedRecipientUserIds((prev) =>
+      isRecipientSelected(userId)
+        ? prev.filter((id) => normalizeUserId(id) !== normalizeUserId(userId))
+        : [...prev, userId]
+    );
+  };
+
+  const removeRecipientUser = (userId: string) => {
+    setSelectedRecipientUserIds((prev) => prev.filter((id) => normalizeUserId(id) !== normalizeUserId(userId)));
+  };
+
+  const applyJobToForm = (job: ScheduledJob) => {
+    setEditingJobId(job.id);
+    setCronExpr(job.cron_expr || '0 9 * * *');
+    setTimezone(job.timezone || 'Asia/Kolkata');
+    setMaxRetries(String(job.max_retries ?? 3));
+    const payload = (job.payload || {}) as Record<string, unknown>;
+    setSelectedRecipientUserIds(parseRecipientUserIdsFromPayload(payload, users));
+    setSubject(typeof payload.subject === 'string' ? payload.subject : '');
+    const paramsValue = payload.params;
+    const dateRangeValue = payload.date_range;
+    if (
+      dateRangeValue === 'last_day' ||
+      dateRangeValue === 'last_hour' ||
+      dateRangeValue === 'last_7_days' ||
+      dateRangeValue === 'last_30_days'
+    ) {
+      setDateRange(dateRangeValue);
+    } else {
+      setDateRange('none');
+    }
+    setStartDateParamKey(typeof payload.start_date_param === 'string' ? payload.start_date_param : 'start_date');
+    setEndDateParamKey(typeof payload.end_date_param === 'string' ? payload.end_date_param : 'end_date');
+    if (paramsValue && typeof paramsValue === 'object' && !Array.isArray(paramsValue)) {
+      setQueryParamsJson(JSON.stringify(paramsValue, null, 2));
+    } else {
+      setQueryParamsJson('');
+    }
+    setError('');
+  };
+
+  const getJobRecipientLabels = (job: ScheduledJob): string[] => {
+    const payload = (job.payload || {}) as Record<string, unknown>;
+    const ids = parseRecipientUserIdsFromPayload(payload, users);
+    return ids.map((id) => {
+      const user = users.find((u) => normalizeUserId(u.id) === normalizeUserId(id));
+      return user ? formatUserLabel(user) : id;
+    });
+  };
   const [subject, setSubject] = useState('');
   const [queryParamsJson, setQueryParamsJson] = useState('');
   const [dateRange, setDateRange] = useState<'none' | 'last_day' | 'last_hour' | 'last_7_days' | 'last_30_days'>(
@@ -46,19 +152,10 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
   const [saving, setSaving] = useState(false);
   const [error, setError] = useState('');
 
-  const recipients = useMemo(
-    () =>
-      recipientsText
-        .split(',')
-        .map((email) => email.trim())
-        .filter(Boolean),
-    [recipientsText]
-  );
-
   const resetForm = () => {
     setCronExpr('0 9 * * *');
     setTimezone('Asia/Kolkata');
-    setRecipientsText('');
+    setSelectedRecipientUserIds([]);
     setSubject('');
     setQueryParamsJson('');
     setDateRange('none');
@@ -96,6 +193,19 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isOpen, datasourceId, queryId]);
 
+  useEffect(() => {
+    if (!editingJobId || usersLoading) return;
+    const job = jobs.find((j) => j.id === editingJobId);
+    if (!job) return;
+    setSelectedRecipientUserIds((prev) => {
+      if (prev.some((id) => users.some((u) => normalizeUserId(u.id) === normalizeUserId(id)))) {
+        return prev;
+      }
+      const parsedIds = parseRecipientUserIdsFromPayload((job.payload || {}) as Record<string, unknown>, users);
+      return parsedIds.length > 0 ? parsedIds : prev;
+    });
+  }, [editingJobId, jobs, users, usersLoading]);
+
   const handleOpenChange = (open: boolean) => {
     if (!open && !saving) {
       resetForm();
@@ -113,8 +223,8 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
       setError('Timezone is required');
       return;
     }
-    if (recipients.length === 0) {
-      setError('At least one recipient email is required');
+    if (selectedRecipientUserIds.length === 0) {
+      setError('At least one recipient user is required');
       return;
     }
     if (!Number.isInteger(retries) || retries < 0 || retries > 10) {
@@ -147,7 +257,7 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
           payload: {
             datasource_id: datasourceId,
             query_id: queryId,
-            recipients,
+            recipient_user_ids: selectedRecipientUserIds,
             subject: subject.trim() || undefined,
             date_range: dateRange === 'none' ? undefined : dateRange,
             start_date_param: dateRange === 'none' ? undefined : startDateParamKey.trim() || 'start_date',
@@ -156,6 +266,7 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
           },
         });
         notifySuccess('Schedule updated successfully');
+        await fetchJobs();
       } else {
         await floConsoleService.scheduledJobService.createScheduledJob({
           job_type: 'email_dynamic_query',
@@ -165,7 +276,7 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
           payload: {
             datasource_id: datasourceId,
             query_id: queryId,
-            recipients,
+            recipient_user_ids: selectedRecipientUserIds,
             subject: subject.trim() || undefined,
             date_range: dateRange === 'none' ? undefined : dateRange,
             start_date_param: dateRange === 'none' ? undefined : startDateParamKey.trim() || 'start_date',
@@ -174,9 +285,9 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
           },
         });
         notifySuccess('Email alert scheduled successfully');
+        resetForm();
+        await fetchJobs();
       }
-      resetForm();
-      await fetchJobs();
     } catch {
       setError('Unable to create schedule. Please verify the details and try again.');
     } finally {
@@ -185,33 +296,7 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
   };
 
   const handleEdit = (job: ScheduledJob) => {
-    setEditingJobId(job.id);
-    setCronExpr(job.cron_expr || '0 9 * * *');
-    setTimezone(job.timezone || 'Asia/Kolkata');
-    setMaxRetries(String(job.max_retries ?? 3));
-    const payload = (job.payload || {}) as Record<string, unknown>;
-    const recipients = Array.isArray(payload.recipients) ? payload.recipients : [];
-    setRecipientsText(recipients.map((item) => String(item)).join(', '));
-    setSubject(typeof payload.subject === 'string' ? payload.subject : '');
-    const paramsValue = payload.params;
-    const dateRangeValue = payload.date_range;
-    if (
-      dateRangeValue === 'last_day' ||
-      dateRangeValue === 'last_hour' ||
-      dateRangeValue === 'last_7_days' ||
-      dateRangeValue === 'last_30_days'
-    ) {
-      setDateRange(dateRangeValue);
-    } else {
-      setDateRange('none');
-    }
-    setStartDateParamKey(typeof payload.start_date_param === 'string' ? payload.start_date_param : 'start_date');
-    setEndDateParamKey(typeof payload.end_date_param === 'string' ? payload.end_date_param : 'end_date');
-    if (paramsValue && typeof paramsValue === 'object' && !Array.isArray(paramsValue)) {
-      setQueryParamsJson(JSON.stringify(paramsValue, null, 2));
-    } else {
-      setQueryParamsJson('');
-    }
+    applyJobToForm(job);
   };
 
   const handleDelete = async (jobId: string) => {
@@ -232,7 +317,7 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
 
   return (
     <Dialog open={isOpen} onOpenChange={handleOpenChange}>
-      <DialogContent className="max-h-[90vh] max-w-[800px] overflow-y-auto">
+      <DialogContent className="max-h-[90vh] overflow-y-auto lg:max-w-[800px] xl:max-w-[1000px]">
         <DialogHeader>
           <DialogTitle>Schedule Email Alert</DialogTitle>
           <DialogDescription>Create a scheduled query email for this dynamic query.</DialogDescription>
@@ -261,7 +346,10 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
                 {jobs.map((job) => (
                   <div
                     key={job.id}
-                    className="flex items-center justify-between rounded-md border border-[#EFF0F1] bg-white p-3"
+                    className={cn(
+                      'flex items-center justify-between rounded-md border bg-white p-3',
+                      editingJobId === job.id ? 'border-[#282828]' : 'border-[#EFF0F1]'
+                    )}
                   >
                     <div className="text-xs text-[#282828]">
                       <p>
@@ -274,6 +362,15 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
                         <span className="font-medium">Next Run:</span>{' '}
                         {job.next_run_at ? new Date(job.next_run_at).toLocaleString() : '-'}
                       </p>
+                      <p>
+                        <span className="font-medium">Recipients:</span>{' '}
+                        {usersLoading
+                          ? 'Loading...'
+                          : (() => {
+                              const labels = getJobRecipientLabels(job);
+                              return labels.length > 0 ? labels.join(', ') : 'None';
+                            })()}
+                      </p>
                     </div>
                     <div className="flex gap-2">
                       <Button variant="outline" onClick={() => handleEdit(job)} disabled={saving}>
@@ -295,7 +392,7 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
             )}
           </div>
 
-          <div className="grid grid-cols-2 gap-3">
+          <div className="grid grid-cols-3 gap-3">
             <div>
               <p className="mb-1 text-xs text-[#878787]">Datasource ID</p>
               <Input value={datasourceId} disabled />
@@ -304,9 +401,13 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
               <p className="mb-1 text-xs text-[#878787]">Query ID</p>
               <Input value={queryId} disabled />
             </div>
+            <div>
+              <p className="mb-1 text-xs text-[#878787]">Subject (optional)</p>
+              <Input value={subject} onChange={(e) => setSubject(e.target.value)} placeholder="Daily report" />
+            </div>
           </div>
 
-          <div className="grid grid-cols-2 gap-3">
+          <div className="grid grid-cols-3 gap-3">
             <div>
               <p className="mb-1 text-xs text-[#878787]">Cron expression</p>
               <Input value={cronExpr} onChange={(e) => setCronExpr(e.target.value)} placeholder="0 9 * * *" />
@@ -315,27 +416,82 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
               <p className="mb-1 text-xs text-[#878787]">Timezone</p>
               <Input value={timezone} onChange={(e) => setTimezone(e.target.value)} placeholder="Asia/Kolkata" />
             </div>
-          </div>
-
-          <div className="grid grid-cols-2 gap-3">
             <div>
               <p className="mb-1 text-xs text-[#878787]">Max retries</p>
               <Input value={maxRetries} onChange={(e) => setMaxRetries(e.target.value)} placeholder="3" />
             </div>
-            <div>
-              <p className="mb-1 text-xs text-[#878787]">Subject (optional)</p>
-              <Input value={subject} onChange={(e) => setSubject(e.target.value)} placeholder="Daily report" />
-            </div>
           </div>
 
           <div>
-            <p className="mb-1 text-xs text-[#878787]">Recipients (comma-separated emails)</p>
-            <Textarea
-              value={recipientsText}
-              onChange={(e) => setRecipientsText(e.target.value)}
-              placeholder="user1@company.com, user2@company.com"
-              className="min-h-[90px]"
-            />
+            <p className="mb-1 text-xs text-[#878787]">Recipient users</p>
+            <p className="mb-2 text-xs text-[#878787]">
+              Each user receives a report filtered by their data access (RLS).
+            </p>
+            <Popover open={recipientsSelectOpen} onOpenChange={setRecipientsSelectOpen}>
+              <PopoverTrigger asChild>
+                <button
+                  type="button"
+                  role="combobox"
+                  aria-expanded={recipientsSelectOpen}
+                  disabled={usersLoading}
+                  className={cn(
+                    'border-input ring-offset-background focus:ring-ring flex min-h-9 w-full items-center justify-between rounded-md border bg-white px-3 py-2 text-sm shadow-sm focus:ring-1 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50',
+                    selectedRecipientUserIds.length === 0 && 'text-[#878787]'
+                  )}
+                >
+                  <span className="truncate text-left">
+                    {usersLoading
+                      ? 'Loading users...'
+                      : selectedRecipientUsers.length === 0
+                        ? 'Select recipient users'
+                        : selectedRecipientUsers.length <= 2
+                          ? selectedRecipientUsers.map((u) => formatUserLabel(u)).join(', ')
+                          : `${selectedRecipientUsers.length} users selected`}
+                  </span>
+                  <ChevronDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+                </button>
+              </PopoverTrigger>
+              <PopoverContent className="w-[var(--radix-popover-trigger-width)] p-0" align="start">
+                <Command>
+                  <CommandInput placeholder="Search users..." />
+                  <CommandList>
+                    <CommandEmpty>No users found.</CommandEmpty>
+                    <CommandGroup>
+                      {users.map((user) => {
+                        const isSelected = isRecipientSelected(user.id);
+                        return (
+                          <CommandItem
+                            key={user.id}
+                            value={`${user.first_name} ${user.last_name} ${user.email}`}
+                            onSelect={() => toggleRecipientUser(user.id)}
+                          >
+                            <Check className={cn('mr-2 h-4 w-4 shrink-0', isSelected ? 'opacity-100' : 'opacity-0')} />
+                            {formatUserLabel(user)}
+                          </CommandItem>
+                        );
+                      })}
+                    </CommandGroup>
+                  </CommandList>
+                </Command>
+              </PopoverContent>
+            </Popover>
+            {selectedRecipientUsers.length > 0 ? (
+              <div className="mt-2 flex flex-wrap gap-2">
+                {selectedRecipientUsers.map((user) => (
+                  <Badge key={user.id} variant="secondary" className="gap-1 pr-1 font-normal">
+                    <span className="max-w-[240px] truncate">{formatUserLabel(user)}</span>
+                    <button
+                      type="button"
+                      className="rounded-full p-0.5 hover:bg-black/10"
+                      aria-label={`Remove ${formatUserLabel(user)}`}
+                      onClick={() => removeRecipientUser(user.id)}
+                    >
+                      <X className="h-3 w-3" />
+                    </button>
+                  </Badge>
+                ))}
+              </div>
+            ) : null}
           </div>
 
           <div>
diff --git a/wavefront/client/src/types/scheduled-job.ts b/wavefront/client/src/types/scheduled-job.ts
index 93bac536..a2d0739e 100644
--- a/wavefront/client/src/types/scheduled-job.ts
+++ b/wavefront/client/src/types/scheduled-job.ts
@@ -32,7 +32,7 @@ export interface CreateScheduledJobRequest {
   payload: {
     datasource_id: string;
     query_id: string;
-    recipients: string[];
+    recipient_user_ids: string[];
     subject?: string;
     date_range?: 'last_day' | 'last_hour' | 'last_7_days' | 'last_30_days';
     start_date_param?: string;
diff --git a/wavefront/server/apps/floware/floware/di/application_container.py b/wavefront/server/apps/floware/floware/di/application_container.py
index 60d2232c..b764703c 100644
--- a/wavefront/server/apps/floware/floware/di/application_container.py
+++ b/wavefront/server/apps/floware/floware/di/application_container.py
@@ -25,6 +25,9 @@ class ApplicationContainer(containers.DeclarativeContainer):
     datasource_repository = providers.Dependency()
     dynamic_query_repository = providers.Dependency()
     email_service = providers.Dependency()
+    user_service = providers.Dependency()
+    role_repository = providers.Dependency()
+    user_role_repository = providers.Dependency()
 
     # services
     notification_service = providers.Singleton(
@@ -48,4 +51,8 @@ class ApplicationContainer(containers.DeclarativeContainer):
         cloud_storage_manager=cloud_storage_manager,
         bucket_name=config.floware.asset_storage_bucket,
         email_service=email_service,
+        user_repository=user_repository,
+        user_service=user_service,
+        role_repository=role_repository,
+        user_role_repository=user_role_repository,
     )
diff --git a/wavefront/server/apps/floware/floware/server.py b/wavefront/server/apps/floware/floware/server.py
index 9f99134f..2441a463 100644
--- a/wavefront/server/apps/floware/floware/server.py
+++ b/wavefront/server/apps/floware/floware/server.py
@@ -132,6 +132,9 @@
     datasource_repository=db_repo_container.datasource_repository,
     dynamic_query_repository=db_repo_container.dynamic_query_repository,
     email_service=user_module_container.email_service,
+    user_service=user_module_container.user_service,
+    role_repository=user_module_container.role_repository,
+    user_role_repository=user_module_container.user_role_repository,
 )
 
 email_rag_container = KnowledgeBaseContainer(
diff --git a/wavefront/server/apps/floware/floware/services/scheduled_job_service.py b/wavefront/server/apps/floware/floware/services/scheduled_job_service.py
index 45879eb5..126e77aa 100644
--- a/wavefront/server/apps/floware/floware/services/scheduled_job_service.py
+++ b/wavefront/server/apps/floware/floware/services/scheduled_job_service.py
@@ -12,14 +12,23 @@
 from db_repo_module.database.connection import DatabaseClient
 from db_repo_module.models.datasource import Datasource
 from db_repo_module.models.dynamic_query_yaml import DynamicQueryYaml
+from db_repo_module.models.resource import ResourceScope
+from db_repo_module.models.role import Role
 from db_repo_module.models.scheduled_job import ScheduledJob
 from db_repo_module.models.scheduled_job_execution import ScheduledJobExecution
+from db_repo_module.models.user import User
+from db_repo_module.models.user_role import UserRole
 from db_repo_module.repositories.sql_alchemy_repository import SQLAlchemyRepository
 from plugins_module.services.dynamic_query_service import DynamicQueryService
-from plugins_module.services.datasource_services import get_datasource_config
+from plugins_module.services.datasource_services import (
+    fetch_data_filters,
+    get_datasource_config,
+)
 from sqlalchemy import select, text
 from sqlalchemy.exc import IntegrityError
+from user_management_module.constants.auth import SERVICE_AUTH_ROLE_ID
 from user_management_module.services.email_service import EmailService
+from user_management_module.services.user_service import UserService
 
 STALE_LOCK_TIMEOUT_MINUTES = 30
 SIGNED_URL_EXPIRY_SECONDS = 7 * 24 * 60 * 60
@@ -38,6 +47,10 @@ def __init__(
         cloud_storage_manager,
         bucket_name: str,
         email_service: EmailService,
+        user_repository: SQLAlchemyRepository[User],
+        user_service: UserService,
+        role_repository: SQLAlchemyRepository[Role],
+        user_role_repository: SQLAlchemyRepository[UserRole],
     ):
         self.db_client = db_client
         self.scheduled_job_repository = scheduled_job_repository
@@ -47,6 +60,10 @@ def __init__(
         self.cloud_storage_manager = cloud_storage_manager
         self.bucket_name = bucket_name
         self.email_service = email_service
+        self.user_repository = user_repository
+        self.user_service = user_service
+        self.role_repository = role_repository
+        self.user_role_repository = user_role_repository
         self.worker_id = os.getenv('HOSTNAME', 'floware-worker')
         self.dynamic_query_service = DynamicQueryService(
             cloud_storage_manager=self.cloud_storage_manager,
@@ -350,38 +367,55 @@ def recover_stale_locks_sync(self):
 
         asyncio.run(self.recover_stale_locks())
 
-    async def _execute_email_dynamic_query_job(self, payload: dict, job_timezone: str):
-        datasource_id = payload.get('datasource_id')
-        query_id = payload.get('query_id')
-        recipients = payload.get('recipients', [])
-        subject = payload.get('subject', f'Scheduled Dynamic Query Report: {query_id}')
-        filter_expr = payload.get('filter')
-        offset = payload.get('offset', 0)
-        limit = payload.get('limit', 100)
-        params = self._resolve_runtime_params(payload, job_timezone)
-
-        if isinstance(recipients, str):
-            recipients = [recipients]
-
-        if not datasource_id or not query_id or not recipients:
-            raise ValueError('payload must include datasource_id, query_id, recipients')
-
-        datasource_type, datasource_config = await get_datasource_config(
-            datasource_id=datasource_id,
-            datasource_repository=self.datasource_repository,
+    @staticmethod
+    def _normalize_recipient_user_ids(payload: dict) -> list[str]:
+        recipient_user_ids = payload.get('recipient_user_ids', [])
+        if isinstance(recipient_user_ids, str):
+            recipient_user_ids = [recipient_user_ids]
+        return [
+            str(user_id).strip()
+            for user_id in recipient_user_ids
+            if str(user_id).strip()
+        ]
+
+    async def _role_is_admin(self, role_id: str) -> bool:
+        if role_id == SERVICE_AUTH_ROLE_ID:
+            return True
+        role = await self.role_repository.find_one(id=role_id)
+        return bool(role and role.name == 'admin')
+
+    async def _user_is_admin(self, user_id: str) -> bool:
+        user_roles = await self.user_role_repository.find(user_id=user_id, limit=100)
+        for user_role in user_roles:
+            if await self._role_is_admin(str(user_role.role_id)):
+                return True
+        return False
+
+    async def _rls_filter_for_user(self, user_id: str) -> str | None:
+        if await self._user_is_admin(user_id):
+            return None
+        rls_filters = await self.user_service.get_user_resources(
+            user_id=user_id, scope=ResourceScope.DATA
         )
-        if not datasource_type or not datasource_config:
-            raise ValueError(f'Datasource not found: {datasource_id}')
+        if len(rls_filters) == 0:
+            raise ValueError(f'Data access not set for non-admin user {user_id}')
+        additional_filters = fetch_data_filters(rls_filters)
+        return f"{' $and '.join(additional_filters)}"
 
-        yaml_query, yaml_name = await self.dynamic_query_service.get_dynamic_yaml_query(
-            query_id
-        )
-        if not yaml_query:
-            raise ValueError(f'Dynamic query not found: {query_id}')
-        datasource_plugin = DatasourcePlugin(datasource_type, datasource_config)
+    async def _fetch_dynamic_query_rows(
+        self,
+        datasource_plugin: DatasourcePlugin,
+        yaml_query: list,
+        query_id: str,
+        rls_filter_str: str | None,
+        filter_expr: str | None,
+        offset: int,
+        limit: int,
+        params: dict | None,
+    ) -> list[dict]:
         result = await datasource_plugin.execute_dynamic_query(
             yaml_query,
-            None,
+            rls_filter_str,
             filter_expr,
             offset,
             limit,
@@ -393,67 +427,54 @@ async def _execute_email_dynamic_query_job(self, payload: dict, job_timezone: st
         first_key = next(iter(result))
         if result[first_key].get('status') != 'success':
             raise ValueError(
-                f'Unexpected dynamic query result format for query_id {query_id}, no successful results'
+                f'Unexpected dynamic query result format for query_id {query_id}, '
+                'no successful results'
             )
-
         rows = result[first_key].get('result') or []
         if not isinstance(rows, list):
             raise ValueError(
                 f'Unexpected dynamic query result format for query_id {query_id}, invalid rows'
             )
+        return rows
 
-        if len(rows) == 0:
-            start_key = str(payload.get('start_date_param', 'start_date'))
-            end_key = str(payload.get('end_date_param', 'end_date'))
-            applied_start = params.get(start_key) if isinstance(params, dict) else None
-            applied_end = params.get(end_key) if isinstance(params, dict) else None
-            logger.info(
-                f'No records in scheduled window for query_id={query_id}; '
-                f'applying range {applied_start}..{applied_end} (keys: {start_key}, {end_key}). '
-                'Skipping email.'
-            )
-            return
-
+    @staticmethod
+    def _rows_to_csv_bytes(rows: list[dict]) -> tuple[bytes, list[str]]:
         if rows:
             fieldnames = list(rows[0].keys())
             for row in rows[1:]:
-                for k in row:
-                    if k not in fieldnames:
-                        fieldnames.append(k)
+                for key in row:
+                    if key not in fieldnames:
+                        fieldnames.append(key)
         else:
             fieldnames = []
 
-        def _cell_value(v):
-            if isinstance(v, (dict, list)):
-                return json.dumps(v)
-            return v if v is None or isinstance(v, str) else str(v)
+        def cell_value(value):
+            if isinstance(value, (dict, list)):
+                return json.dumps(value)
+            return value if value is None or isinstance(value, str) else str(value)
 
-        report_filename = f'{query_id}_{datetime.now(timezone.utc).strftime("%Y%m%d%H%M%S")}_report.csv'
         buf = io.StringIO()
         if fieldnames:
             writer = csv.DictWriter(buf, fieldnames=fieldnames, extrasaction='ignore')
             writer.writeheader()
             for row in rows:
-                writer.writerow({k: _cell_value(row.get(k)) for k in fieldnames})
-        csv_bytes = buf.getvalue().encode('utf-8')
-        csv_size = len(csv_bytes)
-
-        report_url: str | None = None
-        use_attachment = csv_size <= MAX_EMAIL_ATTACHMENT_BYTES
-        if not use_attachment:
-            report_key = f'scheduled_query_reports/{query_id}/{report_filename}'
-            self.cloud_storage_manager.save_small_file(
-                file_content=csv_bytes,
-                bucket_name=self.bucket_name,
-                key=report_key,
-                content_type='text/csv',
-            )
-            report_url = self.cloud_storage_manager.generate_presigned_url(
-                bucket_name=self.bucket_name,
-                key=report_key,
-                type='GET',
-                expiresIn=SIGNED_URL_EXPIRY_SECONDS,
-            )
+                writer.writerow({k: cell_value(row.get(k)) for k in fieldnames})
+        return buf.getvalue().encode('utf-8'), fieldnames
+
+    def _build_report_email_body(
+        self,
+        *,
+        yaml_name: str | None,
+        query_id: str,
+        datasource_id: str,
+        rows: list[dict],
+        fieldnames: list[str],
+        params: dict | None,
+        payload: dict,
+        csv_size: int,
+        use_attachment: bool,
+        report_url: str | None,
+    ) -> str:
         generated_at_utc = datetime.now(timezone.utc).strftime('%Y-%m-%d %H:%M:%S UTC')
         start_key = str(payload.get('start_date_param', 'start_date'))
         end_key = str(payload.get('end_date_param', 'end_date'))
@@ -492,9 +513,115 @@ def _cell_value(v):
                     f'<p><a href="{report_url}" target="_blank" rel="noopener noreferrer">'
                     'Download CSV report (valid for 7 days)</a></p>'
                 )
+        return body
+
+    async def _execute_email_dynamic_query_job(self, payload: dict, job_timezone: str):
+        datasource_id = payload.get('datasource_id')
+        query_id = payload.get('query_id')
+        recipient_user_ids = self._normalize_recipient_user_ids(payload)
+        subject = payload.get('subject', f'Scheduled Dynamic Query Report: {query_id}')
+        filter_expr = payload.get('filter')
+        offset = payload.get('offset', 0)
+        limit = payload.get('limit', 100)
+        params = self._resolve_runtime_params(payload, job_timezone)
+
+        if not datasource_id or not query_id or not recipient_user_ids:
+            raise ValueError(
+                'payload must include datasource_id, query_id, recipient_user_ids'
+            )
+
+        datasource_type, datasource_config = await get_datasource_config(
+            datasource_id=datasource_id,
+            datasource_repository=self.datasource_repository,
+        )
+        if not datasource_type or not datasource_config:
+            raise ValueError(f'Datasource not found: {datasource_id}')
+
+        yaml_query, yaml_name = await self.dynamic_query_service.get_dynamic_yaml_query(
+            query_id
+        )
+        if not yaml_query:
+            raise ValueError(f'Dynamic query not found: {query_id}')
+        datasource_plugin = DatasourcePlugin(datasource_type, datasource_config)
+
+        failed_recipient_user_ids: list[str] = []
+        delivered_count = 0
+        run_timestamp = datetime.now(timezone.utc).strftime('%Y%m%d%H%M%S')
+
+        for user_id in recipient_user_ids:
+            user = await self.user_repository.find_one(id=user_id)
+            if not user or user.deleted:
+                logger.warning(
+                    f'Scheduled report skipped: user not found or deleted ({user_id})'
+                )
+                failed_recipient_user_ids.append(user_id)
+                continue
+
+            try:
+                rls_filter_str = await self._rls_filter_for_user(user_id)
+                rows = await self._fetch_dynamic_query_rows(
+                    datasource_plugin,
+                    yaml_query,
+                    query_id,
+                    rls_filter_str,
+                    filter_expr,
+                    offset,
+                    limit,
+                    params,
+                )
+            except Exception as exc:
+                logger.error(
+                    f'Scheduled report failed for user_id={user_id}, query_id={query_id}: {exc}'
+                )
+                failed_recipient_user_ids.append(user_id)
+                continue
+
+            if len(rows) == 0:
+                start_key = str(payload.get('start_date_param', 'start_date'))
+                end_key = str(payload.get('end_date_param', 'end_date'))
+                applied_start = (
+                    params.get(start_key) if isinstance(params, dict) else None
+                )
+                applied_end = params.get(end_key) if isinstance(params, dict) else None
+                logger.info(
+                    f'No records for user_id={user_id}, query_id={query_id}; '
+                    f'range {applied_start}..{applied_end} (keys: {start_key}, {end_key}). '
+                    'Skipping email.'
+                )
+                continue
+
+            csv_bytes, fieldnames = self._rows_to_csv_bytes(rows)
+            csv_size = len(csv_bytes)
+            report_filename = f'{query_id}_{user_id}_{run_timestamp}_report.csv'
+            report_url: str | None = None
+            use_attachment = csv_size <= MAX_EMAIL_ATTACHMENT_BYTES
+            if not use_attachment:
+                report_key = f'scheduled_query_reports/{query_id}/{report_filename}'
+                self.cloud_storage_manager.save_small_file(
+                    file_content=csv_bytes,
+                    bucket_name=self.bucket_name,
+                    key=report_key,
+                    content_type='text/csv',
+                )
+                report_url = self.cloud_storage_manager.generate_presigned_url(
+                    bucket_name=self.bucket_name,
+                    key=report_key,
+                    type='GET',
+                    expiresIn=SIGNED_URL_EXPIRY_SECONDS,
+                )
 
-        failed_recipients = []
-        for recipient in recipients:
+            body = self._build_report_email_body(
+                yaml_name=yaml_name,
+                query_id=query_id,
+                datasource_id=datasource_id,
+                rows=rows,
+                fieldnames=fieldnames,
+                params=params,
+                payload=payload,
+                csv_size=csv_size,
+                use_attachment=use_attachment,
+                report_url=report_url,
+            )
             attachments = None
             if use_attachment:
                 attachments = [
@@ -507,30 +634,27 @@ def _cell_value(v):
             is_sent = self.email_service.send_email(
                 subject,
                 body,
-                recipient,
+                user.email,
                 attachments=attachments,
             )
             if not is_sent:
-                failed_recipients.append(recipient)
+                failed_recipient_user_ids.append(user_id)
+            else:
+                delivered_count += 1
 
-        if failed_recipients:
-            if len(failed_recipients) == len(recipients):
-                # Every send failed — no one has the report, so raising here is
-                # safe: the next-run retry will resend to all recipients without
-                # creating duplicates.
+        if failed_recipient_user_ids:
+            if delivered_count == 0 and len(failed_recipient_user_ids) == len(
+                recipient_user_ids
+            ):
                 raise ValueError(
-                    f'Failed sending report to all {len(recipients)} recipient(s) '
-                    f'for query={query_id}'
+                    f'Failed scheduled report for all {len(recipient_user_ids)} '
+                    f'recipient user(s) for query={query_id}'
                 )
-            # Partial failure: some recipients already have the report.  Do NOT
-            # raise — that would schedule a retry which re-sends to the
-            # already-successful recipients.  Log the failures so they are
-            # visible in job.last_error via the caller, but let execution
-            # complete normally.
             logger.error(
                 f'Partial delivery failure for query={query_id}: '
-                f'{len(failed_recipients)}/{len(recipients)} recipient(s) failed: '
-                f'{", ".join(failed_recipients)}'
+                f'{len(failed_recipient_user_ids)}/{len(recipient_user_ids)} '
+                f'recipient user(s) failed: '
+                f'{", ".join(failed_recipient_user_ids)}'
             )
 
     async def _run_job(self, job_row: dict):

From 255ca14238481e1ea4e073938fad3069539305a7 Mon Sep 17 00:00:00 2001
From: vishnu r kumar <rkumar.vishnu28@gmail.com>
Date: Fri, 29 May 2026 22:00:22 +0530
Subject: [PATCH 3/4] feat: use xlsx for reports

---
 .../datasources/ScheduleEmailAlertDialog.tsx  | 477 +++++++++++-------
 wavefront/client/src/types/scheduled-job.ts   |  17 +
 .../floware/services/scheduled_job_service.py | 286 +++++++++--
 wavefront/server/apps/floware/pyproject.toml  |   3 +-
 wavefront/server/uv.lock                      |  23 +
 5 files changed, 578 insertions(+), 228 deletions(-)

diff --git a/wavefront/client/src/pages/apps/[appId]/datasources/ScheduleEmailAlertDialog.tsx b/wavefront/client/src/pages/apps/[appId]/datasources/ScheduleEmailAlertDialog.tsx
index 9c311140..04a25066 100644
--- a/wavefront/client/src/pages/apps/[appId]/datasources/ScheduleEmailAlertDialog.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/datasources/ScheduleEmailAlertDialog.tsx
@@ -19,14 +19,16 @@ import {
 import { Input } from '@app/components/ui/input';
 import { Popover, PopoverContent, PopoverTrigger } from '@app/components/ui/popover';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@app/components/ui/select';
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@app/components/ui/tabs';
 import { Textarea } from '@app/components/ui/textarea';
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@app/components/ui/tooltip';
 import { useGetUsers } from '@app/hooks';
 import { cn } from '@app/lib/utils';
 import { useNotifyStore } from '@app/store';
 import { IUser } from '@app/types/user';
-import { ScheduledJob } from '@app/types/scheduled-job';
+import { ScheduledJob, ColumnStyleConfig } from '@app/types/scheduled-job';
 import floConsoleService from '@app/api';
-import { Check, ChevronDown, X } from 'lucide-react';
+import { Check, ChevronDown, Info, X } from 'lucide-react';
 import { useEffect, useMemo, useState } from 'react';
 
 interface ScheduleEmailAlertDialogProps {
@@ -40,7 +42,7 @@ const normalizeUserId = (id: string) => id.trim().toLowerCase();
 
 const formatUserLabel = (user: IUser) => `${user.first_name} ${user.last_name} (${user.email})`;
 
-const parseRecipientUserIdsFromPayload = (payload: Record<string, unknown>, users: IUser[]): string[] => {
+const extractRecipientUserIdsFromPayload = (payload: Record<string, unknown>): string[] => {
   const rawIds = payload.recipient_user_ids;
   const ids: string[] = [];
   if (Array.isArray(rawIds)) {
@@ -51,13 +53,34 @@ const parseRecipientUserIdsFromPayload = (payload: Record<string, unknown>, user
   } else if (typeof rawIds === 'string' && rawIds.trim()) {
     ids.push(rawIds.trim());
   }
+  return ids;
+};
 
-  return ids.map((id) => {
-    const match = users.find((u) => normalizeUserId(u.id) === normalizeUserId(id));
-    return match ? match.id : id;
-  });
+const resolveUsersFromRecipientIds = (ids: string[], users: IUser[]): IUser[] => {
+  const resolved: IUser[] = [];
+  const seen = new Set<string>();
+  for (const id of ids) {
+    const user = users.find((u) => normalizeUserId(u.id) === normalizeUserId(id));
+    if (user && !seen.has(normalizeUserId(user.id))) {
+      seen.add(normalizeUserId(user.id));
+      resolved.push(user);
+    }
+  }
+  return resolved;
 };
 
+const COLUMN_STYLES_PLACEHOLDER = `[
+  {
+    "column": "Total calls attempted",
+    "rules": [
+      { "op": "eq", "value": 0, "fill": "light_red" },
+      { "op": "lt", "value": 160, "fill": "light_yellow" },
+      { "op": "lt", "value": 225, "fill": "light_green" },
+      { "op": "gte", "value": 225, "fill": "dark_green" }
+    ]
+  }
+]`;
+
 const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
   isOpen,
   datasourceId,
@@ -73,19 +96,10 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
   const [recipientsSelectOpen, setRecipientsSelectOpen] = useState(false);
   const { data: users = [], isLoading: usersLoading } = useGetUsers();
 
-  const selectedRecipientUsers = useMemo(() => {
-    return selectedRecipientUserIds.map((id) => {
-      const user = users.find((u) => normalizeUserId(u.id) === normalizeUserId(id));
-      if (user) return user;
-      return {
-        id,
-        email: id,
-        first_name: 'Unknown',
-        last_name: 'user',
-        role: '',
-      } satisfies IUser;
-    });
-  }, [selectedRecipientUserIds, users]);
+  const selectedRecipientUsers = useMemo(
+    () => resolveUsersFromRecipientIds(selectedRecipientUserIds, users),
+    [selectedRecipientUserIds, users]
+  );
 
   const isRecipientSelected = (userId: string) =>
     selectedRecipientUserIds.some((id) => normalizeUserId(id) === normalizeUserId(userId));
@@ -108,8 +122,9 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
     setTimezone(job.timezone || 'Asia/Kolkata');
     setMaxRetries(String(job.max_retries ?? 3));
     const payload = (job.payload || {}) as Record<string, unknown>;
-    setSelectedRecipientUserIds(parseRecipientUserIdsFromPayload(payload, users));
+    setSelectedRecipientUserIds(extractRecipientUserIdsFromPayload(payload));
     setSubject(typeof payload.subject === 'string' ? payload.subject : '');
+    setEmailContent(typeof payload.email_content === 'string' ? payload.email_content : '');
     const paramsValue = payload.params;
     const dateRangeValue = payload.date_range;
     if (
@@ -129,19 +144,23 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
     } else {
       setQueryParamsJson('');
     }
+    const columnStylesValue = payload.column_styles;
+    if (Array.isArray(columnStylesValue) && columnStylesValue.length > 0) {
+      setColumnStylesJson(JSON.stringify(columnStylesValue, null, 2));
+    } else {
+      setColumnStylesJson('');
+    }
     setError('');
   };
 
   const getJobRecipientLabels = (job: ScheduledJob): string[] => {
     const payload = (job.payload || {}) as Record<string, unknown>;
-    const ids = parseRecipientUserIdsFromPayload(payload, users);
-    return ids.map((id) => {
-      const user = users.find((u) => normalizeUserId(u.id) === normalizeUserId(id));
-      return user ? formatUserLabel(user) : id;
-    });
+    return resolveUsersFromRecipientIds(extractRecipientUserIdsFromPayload(payload), users).map(formatUserLabel);
   };
   const [subject, setSubject] = useState('');
+  const [emailContent, setEmailContent] = useState('');
   const [queryParamsJson, setQueryParamsJson] = useState('');
+  const [columnStylesJson, setColumnStylesJson] = useState('');
   const [dateRange, setDateRange] = useState<'none' | 'last_day' | 'last_hour' | 'last_7_days' | 'last_30_days'>(
     'none'
   );
@@ -149,6 +168,7 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
   const [endDateParamKey, setEndDateParamKey] = useState('end_date');
   const [maxRetries, setMaxRetries] = useState('3');
   const [editingJobId, setEditingJobId] = useState<string | null>(null);
+  const [activeTab, setActiveTab] = useState<'schedule' | 'email'>('schedule');
   const [saving, setSaving] = useState(false);
   const [error, setError] = useState('');
 
@@ -157,12 +177,15 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
     setTimezone('Asia/Kolkata');
     setSelectedRecipientUserIds([]);
     setSubject('');
+    setEmailContent('');
     setQueryParamsJson('');
+    setColumnStylesJson('');
     setDateRange('none');
     setStartDateParamKey('start_date');
     setEndDateParamKey('end_date');
     setMaxRetries('3');
     setEditingJobId(null);
+    setActiveTab('schedule');
     setError('');
   };
 
@@ -193,19 +216,6 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isOpen, datasourceId, queryId]);
 
-  useEffect(() => {
-    if (!editingJobId || usersLoading) return;
-    const job = jobs.find((j) => j.id === editingJobId);
-    if (!job) return;
-    setSelectedRecipientUserIds((prev) => {
-      if (prev.some((id) => users.some((u) => normalizeUserId(u.id) === normalizeUserId(id)))) {
-        return prev;
-      }
-      const parsedIds = parseRecipientUserIdsFromPayload((job.payload || {}) as Record<string, unknown>, users);
-      return parsedIds.length > 0 ? parsedIds : prev;
-    });
-  }, [editingJobId, jobs, users, usersLoading]);
-
   const handleOpenChange = (open: boolean) => {
     if (!open && !saving) {
       resetForm();
@@ -217,18 +227,22 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
     const retries = Number(maxRetries);
     if (!cronExpr.trim()) {
       setError('Cron expression is required');
+      setActiveTab('schedule');
       return;
     }
     if (!timezone.trim()) {
       setError('Timezone is required');
+      setActiveTab('schedule');
       return;
     }
     if (selectedRecipientUserIds.length === 0) {
       setError('At least one recipient user is required');
+      setActiveTab('email');
       return;
     }
     if (!Number.isInteger(retries) || retries < 0 || retries > 10) {
       setError('Max retries must be an integer between 0 and 10');
+      setActiveTab('schedule');
       return;
     }
     let parsedParams: Record<string, unknown> | undefined;
@@ -237,11 +251,30 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
         const value = JSON.parse(queryParamsJson);
         if (typeof value !== 'object' || value === null || Array.isArray(value)) {
           setError('Query params must be a JSON object');
+          setActiveTab('schedule');
           return;
         }
         parsedParams = value as Record<string, unknown>;
       } catch {
         setError('Query params must be valid JSON (object)');
+        setActiveTab('schedule');
+        return;
+      }
+    }
+
+    let parsedColumnStyles: ColumnStyleConfig[] | undefined;
+    if (columnStylesJson.trim()) {
+      try {
+        const value = JSON.parse(columnStylesJson);
+        if (!Array.isArray(value)) {
+          setError('Column styles must be a JSON array');
+          setActiveTab('email');
+          return;
+        }
+        parsedColumnStyles = value as ColumnStyleConfig[];
+      } catch {
+        setError('Column styles must be valid JSON (array)');
+        setActiveTab('email');
         return;
       }
     }
@@ -259,6 +292,8 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
             query_id: queryId,
             recipient_user_ids: selectedRecipientUserIds,
             subject: subject.trim() || undefined,
+            email_content: emailContent.trim() || undefined,
+            column_styles: parsedColumnStyles,
             date_range: dateRange === 'none' ? undefined : dateRange,
             start_date_param: dateRange === 'none' ? undefined : startDateParamKey.trim() || 'start_date',
             end_date_param: dateRange === 'none' ? undefined : endDateParamKey.trim() || 'end_date',
@@ -278,6 +313,8 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
             query_id: queryId,
             recipient_user_ids: selectedRecipientUserIds,
             subject: subject.trim() || undefined,
+            email_content: emailContent.trim() || undefined,
+            column_styles: parsedColumnStyles,
             date_range: dateRange === 'none' ? undefined : dateRange,
             start_date_param: dateRange === 'none' ? undefined : startDateParamKey.trim() || 'start_date',
             end_date_param: dateRange === 'none' ? undefined : endDateParamKey.trim() || 'end_date',
@@ -297,6 +334,7 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
 
   const handleEdit = (job: ScheduledJob) => {
     applyJobToForm(job);
+    setActiveTab('email');
   };
 
   const handleDelete = async (jobId: string) => {
@@ -392,143 +430,240 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
             )}
           </div>
 
-          <div className="grid grid-cols-3 gap-3">
-            <div>
-              <p className="mb-1 text-xs text-[#878787]">Datasource ID</p>
-              <Input value={datasourceId} disabled />
-            </div>
-            <div>
-              <p className="mb-1 text-xs text-[#878787]">Query ID</p>
-              <Input value={queryId} disabled />
-            </div>
-            <div>
-              <p className="mb-1 text-xs text-[#878787]">Subject (optional)</p>
-              <Input value={subject} onChange={(e) => setSubject(e.target.value)} placeholder="Daily report" />
-            </div>
-          </div>
+          <Tabs value={activeTab} onValueChange={(value) => setActiveTab(value as 'schedule' | 'email')}>
+            <TabsList className="grid w-full grid-cols-2">
+              <TabsTrigger value="schedule">Schedule</TabsTrigger>
+              <TabsTrigger value="email">Email</TabsTrigger>
+            </TabsList>
 
-          <div className="grid grid-cols-3 gap-3">
-            <div>
-              <p className="mb-1 text-xs text-[#878787]">Cron expression</p>
-              <Input value={cronExpr} onChange={(e) => setCronExpr(e.target.value)} placeholder="0 9 * * *" />
-            </div>
-            <div>
-              <p className="mb-1 text-xs text-[#878787]">Timezone</p>
-              <Input value={timezone} onChange={(e) => setTimezone(e.target.value)} placeholder="Asia/Kolkata" />
-            </div>
-            <div>
-              <p className="mb-1 text-xs text-[#878787]">Max retries</p>
-              <Input value={maxRetries} onChange={(e) => setMaxRetries(e.target.value)} placeholder="3" />
-            </div>
-          </div>
+            <TabsContent value="schedule" className="mt-4 space-y-5">
+              <div className="grid grid-cols-2 gap-3">
+                <div>
+                  <p className="mb-1 text-xs text-[#878787]">Datasource ID</p>
+                  <Input value={datasourceId} disabled />
+                </div>
+                <div>
+                  <p className="mb-1 text-xs text-[#878787]">Query ID</p>
+                  <Input value={queryId} disabled />
+                </div>
+              </div>
 
-          <div>
-            <p className="mb-1 text-xs text-[#878787]">Recipient users</p>
-            <p className="mb-2 text-xs text-[#878787]">
-              Each user receives a report filtered by their data access (RLS).
-            </p>
-            <Popover open={recipientsSelectOpen} onOpenChange={setRecipientsSelectOpen}>
-              <PopoverTrigger asChild>
-                <button
-                  type="button"
-                  role="combobox"
-                  aria-expanded={recipientsSelectOpen}
-                  disabled={usersLoading}
-                  className={cn(
-                    'border-input ring-offset-background focus:ring-ring flex min-h-9 w-full items-center justify-between rounded-md border bg-white px-3 py-2 text-sm shadow-sm focus:ring-1 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50',
-                    selectedRecipientUserIds.length === 0 && 'text-[#878787]'
-                  )}
-                >
-                  <span className="truncate text-left">
-                    {usersLoading
-                      ? 'Loading users...'
-                      : selectedRecipientUsers.length === 0
-                        ? 'Select recipient users'
-                        : selectedRecipientUsers.length <= 2
-                          ? selectedRecipientUsers.map((u) => formatUserLabel(u)).join(', ')
-                          : `${selectedRecipientUsers.length} users selected`}
-                  </span>
-                  <ChevronDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
-                </button>
-              </PopoverTrigger>
-              <PopoverContent className="w-[var(--radix-popover-trigger-width)] p-0" align="start">
-                <Command>
-                  <CommandInput placeholder="Search users..." />
-                  <CommandList>
-                    <CommandEmpty>No users found.</CommandEmpty>
-                    <CommandGroup>
-                      {users.map((user) => {
-                        const isSelected = isRecipientSelected(user.id);
-                        return (
-                          <CommandItem
-                            key={user.id}
-                            value={`${user.first_name} ${user.last_name} ${user.email}`}
-                            onSelect={() => toggleRecipientUser(user.id)}
-                          >
-                            <Check className={cn('mr-2 h-4 w-4 shrink-0', isSelected ? 'opacity-100' : 'opacity-0')} />
-                            {formatUserLabel(user)}
-                          </CommandItem>
-                        );
-                      })}
-                    </CommandGroup>
-                  </CommandList>
-                </Command>
-              </PopoverContent>
-            </Popover>
-            {selectedRecipientUsers.length > 0 ? (
-              <div className="mt-2 flex flex-wrap gap-2">
-                {selectedRecipientUsers.map((user) => (
-                  <Badge key={user.id} variant="secondary" className="gap-1 pr-1 font-normal">
-                    <span className="max-w-[240px] truncate">{formatUserLabel(user)}</span>
-                    <button
-                      type="button"
-                      className="rounded-full p-0.5 hover:bg-black/10"
-                      aria-label={`Remove ${formatUserLabel(user)}`}
-                      onClick={() => removeRecipientUser(user.id)}
-                    >
-                      <X className="h-3 w-3" />
-                    </button>
-                  </Badge>
-                ))}
+              <div className="grid grid-cols-3 gap-3">
+                <div>
+                  <p className="mb-1 text-xs text-[#878787]">Cron expression</p>
+                  <Input value={cronExpr} onChange={(e) => setCronExpr(e.target.value)} placeholder="0 9 * * *" />
+                </div>
+                <div>
+                  <p className="mb-1 text-xs text-[#878787]">Timezone</p>
+                  <Input value={timezone} onChange={(e) => setTimezone(e.target.value)} placeholder="Asia/Kolkata" />
+                </div>
+                <div>
+                  <p className="mb-1 text-xs text-[#878787]">Max retries</p>
+                  <Input value={maxRetries} onChange={(e) => setMaxRetries(e.target.value)} placeholder="3" />
+                </div>
               </div>
-            ) : null}
-          </div>
 
-          <div>
-            <p className="mb-1 text-xs text-[#878787]">Query params (optional JSON)</p>
-            <Textarea
-              value={queryParamsJson}
-              onChange={(e) => setQueryParamsJson(e.target.value)}
-              placeholder={'{"start_date":"2026-03-01","end_date":"2026-03-31"}'}
-              className="min-h-[90px] font-mono"
-            />
-          </div>
+              <div className="grid grid-cols-3 gap-3">
+                <div>
+                  <p className="mb-1 text-xs text-[#878787]">Dynamic date range (optional)</p>
+                  <Select value={dateRange} onValueChange={(v) => setDateRange(v as typeof dateRange)}>
+                    <SelectTrigger>
+                      <SelectValue placeholder="Select range" />
+                    </SelectTrigger>
+                    <SelectContent>
+                      <SelectItem value="none">None</SelectItem>
+                      <SelectItem value="last_day">Last day</SelectItem>
+                      <SelectItem value="last_hour">Last hour</SelectItem>
+                      <SelectItem value="last_7_days">Last 7 days</SelectItem>
+                      <SelectItem value="last_30_days">Last 30 days</SelectItem>
+                    </SelectContent>
+                  </Select>
+                </div>
+                <div>
+                  <p className="mb-1 text-xs text-[#878787]">Start date param key</p>
+                  <Input value={startDateParamKey} onChange={(e) => setStartDateParamKey(e.target.value)} />
+                </div>
+                <div>
+                  <p className="mb-1 text-xs text-[#878787]">End date param key</p>
+                  <Input value={endDateParamKey} onChange={(e) => setEndDateParamKey(e.target.value)} />
+                </div>
+              </div>
 
-          <div className="grid grid-cols-3 gap-3">
-            <div>
-              <p className="mb-1 text-xs text-[#878787]">Dynamic date range (optional)</p>
-              <Select value={dateRange} onValueChange={(v) => setDateRange(v as typeof dateRange)}>
-                <SelectTrigger>
-                  <SelectValue placeholder="Select range" />
-                </SelectTrigger>
-                <SelectContent>
-                  <SelectItem value="none">None</SelectItem>
-                  <SelectItem value="last_day">Last day</SelectItem>
-                  <SelectItem value="last_hour">Last hour</SelectItem>
-                  <SelectItem value="last_7_days">Last 7 days</SelectItem>
-                  <SelectItem value="last_30_days">Last 30 days</SelectItem>
-                </SelectContent>
-              </Select>
-            </div>
-            <div>
-              <p className="mb-1 text-xs text-[#878787]">Start date param key</p>
-              <Input value={startDateParamKey} onChange={(e) => setStartDateParamKey(e.target.value)} />
-            </div>
-            <div>
-              <p className="mb-1 text-xs text-[#878787]">End date param key</p>
-              <Input value={endDateParamKey} onChange={(e) => setEndDateParamKey(e.target.value)} />
-            </div>
-          </div>
+              <div>
+                <p className="mb-1 text-xs text-[#878787]">Query params (optional JSON)</p>
+                <Textarea
+                  value={queryParamsJson}
+                  onChange={(e) => setQueryParamsJson(e.target.value)}
+                  placeholder={'{"start_date":"2026-03-01","end_date":"2026-03-31"}'}
+                  className="min-h-[90px] font-mono"
+                />
+              </div>
+            </TabsContent>
+
+            <TabsContent value="email" className="mt-4 space-y-5">
+              <TooltipProvider delayDuration={200}>
+                <div>
+                  <p className="mb-1 text-xs text-[#878787]">Subject (optional)</p>
+                  <Input value={subject} onChange={(e) => setSubject(e.target.value)} placeholder="Daily report" />
+                </div>
+
+                <div className="grid grid-cols-2 gap-3">
+                  <div>
+                    <div className="mb-1 flex items-center gap-1.5">
+                      <p className="text-xs text-[#878787]">Email content (optional)</p>
+                      <Tooltip>
+                        <TooltipTrigger asChild>
+                          <button
+                            type="button"
+                            className="inline-flex cursor-pointer text-[#878787] hover:text-[#555555]"
+                            aria-label="Email content help"
+                          >
+                            <Info className="h-3.5 w-3.5" />
+                          </button>
+                        </TooltipTrigger>
+                        <TooltipContent side="top" className="max-w-xs">
+                          HTML is supported. Leave empty to use the default report summary.
+                        </TooltipContent>
+                      </Tooltip>
+                    </div>
+                    <Textarea
+                      value={emailContent}
+                      onChange={(e) => setEmailContent(e.target.value)}
+                      placeholder="<p>Your daily report is ready.</p>"
+                      className="min-h-[120px]"
+                    />
+                  </div>
+
+                  <div>
+                    <div className="mb-1 flex items-center gap-1.5">
+                      <p className="text-xs text-[#878787]">Column styles (optional JSON)</p>
+                      <Tooltip>
+                        <TooltipTrigger asChild>
+                          <button
+                            type="button"
+                            className="inline-flex cursor-pointer text-[#878787] hover:text-[#555555]"
+                            aria-label="Column styles help"
+                          >
+                            <Info className="h-3.5 w-3.5" />
+                          </button>
+                        </TooltipTrigger>
+                        <TooltipContent side="top" className="max-w-xs">
+                          Rules are evaluated top-to-bottom; first match wins. Fills: light_red, light_yellow,
+                          light_green, dark_green, or a hex color.
+                        </TooltipContent>
+                      </Tooltip>
+                    </div>
+                    <Textarea
+                      value={columnStylesJson}
+                      onChange={(e) => setColumnStylesJson(e.target.value)}
+                      placeholder={COLUMN_STYLES_PLACEHOLDER}
+                      className="min-h-[120px] font-mono text-xs"
+                    />
+                  </div>
+                </div>
+
+                <div>
+                  <div className="mb-1 flex items-center gap-1.5">
+                    <p className="text-xs text-[#878787]">Recipient users</p>
+                    <Tooltip>
+                      <TooltipTrigger asChild>
+                        <button
+                          type="button"
+                          className="inline-flex cursor-pointer text-[#878787] hover:text-[#555555]"
+                          aria-label="Recipient users help"
+                        >
+                          <Info className="h-3.5 w-3.5" />
+                        </button>
+                      </TooltipTrigger>
+                      <TooltipContent side="top" className="max-w-xs">
+                        Each user receives a report filtered by their data access (RLS).
+                      </TooltipContent>
+                    </Tooltip>
+                  </div>
+                  <Popover open={recipientsSelectOpen} onOpenChange={setRecipientsSelectOpen}>
+                    <PopoverTrigger asChild>
+                      <button
+                        type="button"
+                        role="combobox"
+                        aria-expanded={recipientsSelectOpen}
+                        disabled={usersLoading}
+                        className={cn(
+                          'border-input ring-offset-background focus:ring-ring flex min-h-9 w-full items-center justify-between rounded-md border bg-white px-3 py-2 text-sm shadow-sm focus:ring-1 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50',
+                          selectedRecipientUserIds.length === 0 && 'text-[#878787]'
+                        )}
+                      >
+                        <span className="truncate text-left">
+                          {usersLoading
+                            ? 'Loading users...'
+                            : selectedRecipientUserIds.length === 0
+                              ? 'Select recipient users'
+                              : selectedRecipientUsers.length === 0
+                                ? `${selectedRecipientUserIds.length} user${selectedRecipientUserIds.length === 1 ? '' : 's'} selected`
+                                : selectedRecipientUsers.length <= 2
+                                  ? selectedRecipientUsers.map((u) => formatUserLabel(u)).join(', ')
+                                  : `${selectedRecipientUsers.length} users selected`}
+                        </span>
+                        <ChevronDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+                      </button>
+                    </PopoverTrigger>
+                    <PopoverContent className="w-(--radix-popover-trigger-width) p-0" align="start">
+                      <Command>
+                        <CommandInput placeholder="Search users..." />
+                        <CommandList>
+                          <CommandEmpty>No users found.</CommandEmpty>
+                          {selectedRecipientUsers.length > 0 ? (
+                            <CommandGroup heading="Selected">
+                              {selectedRecipientUsers.map((user) => (
+                                <CommandItem
+                                  key={`selected-${user.id}`}
+                                  value={`selected-${user.id}-${user.email}`}
+                                  onSelect={() => toggleRecipientUser(user.id)}
+                                >
+                                  <Check className="mr-2 h-4 w-4 shrink-0 opacity-100" />
+                                  {formatUserLabel(user)}
+                                </CommandItem>
+                              ))}
+                            </CommandGroup>
+                          ) : null}
+                          <CommandGroup heading="All users">
+                            {users
+                              .filter((user) => !isRecipientSelected(user.id))
+                              .map((user) => (
+                                <CommandItem
+                                  key={user.id}
+                                  value={`${user.first_name} ${user.last_name} ${user.email}`}
+                                  onSelect={() => toggleRecipientUser(user.id)}
+                                >
+                                  <Check className="mr-2 h-4 w-4 shrink-0 opacity-0" />
+                                  {formatUserLabel(user)}
+                                </CommandItem>
+                              ))}
+                          </CommandGroup>
+                        </CommandList>
+                      </Command>
+                    </PopoverContent>
+                  </Popover>
+                  {selectedRecipientUsers.length > 0 ? (
+                    <div className="mt-2 flex gap-2 overflow-x-auto pb-1">
+                      {selectedRecipientUsers.map((user) => (
+                        <Badge key={user.id} variant="secondary" className="shrink-0 gap-1 pr-1 font-normal">
+                          <span className="max-w-[240px] truncate">{formatUserLabel(user)}</span>
+                          <button
+                            type="button"
+                            className="rounded-full p-0.5 hover:bg-black/10"
+                            aria-label={`Remove ${formatUserLabel(user)}`}
+                            onClick={() => removeRecipientUser(user.id)}
+                          >
+                            <X className="h-3 w-3" />
+                          </button>
+                        </Badge>
+                      ))}
+                    </div>
+                  ) : null}
+                </div>
+              </TooltipProvider>
+            </TabsContent>
+          </Tabs>
 
           {error ? <p className="text-sm text-red-500">{error}</p> : null}
         </div>
diff --git a/wavefront/client/src/types/scheduled-job.ts b/wavefront/client/src/types/scheduled-job.ts
index a2d0739e..b8f3ad8e 100644
--- a/wavefront/client/src/types/scheduled-job.ts
+++ b/wavefront/client/src/types/scheduled-job.ts
@@ -1,5 +1,20 @@
 import { IApiResponse } from '@app/lib/axios';
 
+export interface ColumnStyleRule {
+  op: 'eq' | 'neq' | 'lt' | 'lte' | 'gt' | 'gte' | 'between';
+  fill: string;
+  value?: number;
+  min?: number;
+  max?: number;
+  min_inclusive?: boolean;
+  max_inclusive?: boolean;
+}
+
+export interface ColumnStyleConfig {
+  column: string;
+  rules: ColumnStyleRule[];
+}
+
 export interface ScheduledJob {
   id: string;
   job_type: string;
@@ -34,6 +49,8 @@ export interface CreateScheduledJobRequest {
     query_id: string;
     recipient_user_ids: string[];
     subject?: string;
+    email_content?: string;
+    column_styles?: ColumnStyleConfig[];
     date_range?: 'last_day' | 'last_hour' | 'last_7_days' | 'last_30_days';
     start_date_param?: string;
     end_date_param?: string;
diff --git a/wavefront/server/apps/floware/floware/services/scheduled_job_service.py b/wavefront/server/apps/floware/floware/services/scheduled_job_service.py
index 126e77aa..3a09d311 100644
--- a/wavefront/server/apps/floware/floware/services/scheduled_job_service.py
+++ b/wavefront/server/apps/floware/floware/services/scheduled_job_service.py
@@ -1,4 +1,3 @@
-import csv
 import io
 import json
 import os
@@ -9,6 +8,8 @@
 from common_module.log.logger import logger
 from common_module.utils.serializer import serialize_values
 from datasource import DatasourcePlugin
+from openpyxl import Workbook
+from openpyxl.styles import Font, PatternFill
 from db_repo_module.database.connection import DatabaseClient
 from db_repo_module.models.datasource import Datasource
 from db_repo_module.models.dynamic_query_yaml import DynamicQueryYaml
@@ -35,6 +36,16 @@
 # Gmail and many providers cap attachments; keep below typical limits.
 MAX_EMAIL_ATTACHMENT_BYTES = 10 * 1024 * 1024
 
+COLUMN_FILL_COLORS = {
+    'light_red': 'FFC7CE',
+    'light_yellow': 'FFEB9C',
+    'light_green': 'C6EFCE',
+    'dark_green': '006100',
+}
+COLUMN_FILL_FONT_COLORS = {
+    'dark_green': 'FFFFFF',
+}
+
 
 class ScheduledJobService:
     def __init__(
@@ -438,7 +449,174 @@ async def _fetch_dynamic_query_rows(
         return rows
 
     @staticmethod
-    def _rows_to_csv_bytes(rows: list[dict]) -> tuple[bytes, list[str]]:
+    def _parse_numeric_cell_value(value) -> float | None:
+        if value is None or value == '':
+            return None
+        if isinstance(value, bool):
+            return float(value)
+        if isinstance(value, (int, float)):
+            return float(value)
+        if isinstance(value, str):
+            stripped = value.strip().replace(',', '')
+            if not stripped:
+                return None
+            try:
+                return float(stripped)
+            except ValueError:
+                return None
+        return None
+
+    @staticmethod
+    def _normalize_column_key(name: str) -> str:
+        return name.strip().casefold()
+
+    @classmethod
+    def _parse_column_styles_config(cls, raw_config) -> list[dict]:
+        if not isinstance(raw_config, list):
+            return []
+
+        parsed_configs: list[dict] = []
+        supported_ops = {'eq', 'neq', 'lt', 'lte', 'gt', 'gte', 'between'}
+        for item in raw_config:
+            if not isinstance(item, dict):
+                continue
+            column = item.get('column')
+            rules = item.get('rules')
+            if not isinstance(column, str) or not column.strip():
+                continue
+            if not isinstance(rules, list):
+                continue
+
+            parsed_rules: list[dict] = []
+            for rule in rules:
+                if not isinstance(rule, dict):
+                    continue
+                op = rule.get('op')
+                fill = rule.get('fill')
+                if (
+                    op not in supported_ops
+                    or not isinstance(fill, str)
+                    or not fill.strip()
+                ):
+                    continue
+
+                parsed_rule: dict = {'op': op, 'fill': fill.strip()}
+                if op == 'between':
+                    min_value = rule.get('min')
+                    max_value = rule.get('max')
+                    if not isinstance(min_value, (int, float)) or not isinstance(
+                        max_value, (int, float)
+                    ):
+                        continue
+                    parsed_rule['min'] = float(min_value)
+                    parsed_rule['max'] = float(max_value)
+                    parsed_rule['min_inclusive'] = bool(rule.get('min_inclusive', True))
+                    parsed_rule['max_inclusive'] = bool(rule.get('max_inclusive', True))
+                else:
+                    value = rule.get('value')
+                    if not isinstance(value, (int, float)):
+                        continue
+                    parsed_rule['value'] = float(value)
+                parsed_rules.append(parsed_rule)
+
+            if parsed_rules:
+                parsed_configs.append({'column': column.strip(), 'rules': parsed_rules})
+        return parsed_configs
+
+    @classmethod
+    def _resolve_fill_styles(
+        cls, fill_name: str
+    ) -> tuple[PatternFill | None, Font | None]:
+        normalized = fill_name.strip()
+        bg_hex: str | None = None
+        font_hex: str | None = None
+
+        if normalized.startswith('#'):
+            bg_hex = normalized[1:].upper()
+        elif normalized.casefold() in COLUMN_FILL_COLORS:
+            key = normalized.casefold()
+            bg_hex = COLUMN_FILL_COLORS[key]
+            font_hex = COLUMN_FILL_FONT_COLORS.get(key)
+        elif len(normalized) == 6 and all(
+            ch in '0123456789ABCDEFabcdef' for ch in normalized
+        ):
+            bg_hex = normalized.upper()
+        else:
+            return None, None
+
+        fill = PatternFill(start_color=bg_hex, end_color=bg_hex, fill_type='solid')
+        font = Font(color=font_hex) if font_hex else None
+        return fill, font
+
+    @classmethod
+    def _rule_matches(cls, rule: dict, numeric_value: float) -> bool:
+        op = rule['op']
+        if op == 'eq':
+            return numeric_value == rule['value']
+        if op == 'neq':
+            return numeric_value != rule['value']
+        if op == 'lt':
+            return numeric_value < rule['value']
+        if op == 'lte':
+            return numeric_value <= rule['value']
+        if op == 'gt':
+            return numeric_value > rule['value']
+        if op == 'gte':
+            return numeric_value >= rule['value']
+
+        min_value = rule['min']
+        max_value = rule['max']
+        if rule.get('min_inclusive', True):
+            if numeric_value < min_value:
+                return False
+        elif numeric_value <= min_value:
+            return False
+        if rule.get('max_inclusive', True):
+            if numeric_value > max_value:
+                return False
+        elif numeric_value >= max_value:
+            return False
+        return True
+
+    @classmethod
+    def _build_column_style_map(
+        cls, fieldnames: list[str], column_styles: list[dict]
+    ) -> dict[int, list[dict]]:
+        column_index = {
+            cls._normalize_column_key(name): idx for idx, name in enumerate(fieldnames)
+        }
+        style_map: dict[int, list[dict]] = {}
+        for config in column_styles:
+            col_idx = column_index.get(cls._normalize_column_key(config['column']))
+            if col_idx is None:
+                logger.warning(
+                    f'Column style config ignored; column not found: {config["column"]}'
+                )
+                continue
+            style_map[col_idx] = config['rules']
+        return style_map
+
+    @classmethod
+    def _apply_cell_style(cls, cell, raw_value, rules: list[dict]) -> None:
+        numeric_value = cls._parse_numeric_cell_value(raw_value)
+        if numeric_value is None:
+            return
+        for rule in rules:
+            if not cls._rule_matches(rule, numeric_value):
+                continue
+            fill, font = cls._resolve_fill_styles(rule['fill'])
+            if fill:
+                cell.fill = fill
+            if font:
+                cell.font = font
+            return
+
+    @classmethod
+    def _rows_to_xlsx_bytes(
+        cls,
+        rows: list[dict],
+        column_styles: list[dict] | None = None,
+    ) -> tuple[bytes, list[str]]:
         if rows:
             fieldnames = list(rows[0].keys())
             for row in rows[1:]:
@@ -453,57 +631,52 @@ def cell_value(value):
                 return json.dumps(value)
             return value if value is None or isinstance(value, str) else str(value)
 
-        buf = io.StringIO()
+        workbook = Workbook()
+        worksheet = workbook.active
+        worksheet.title = 'Report'
+        style_map = cls._build_column_style_map(fieldnames, column_styles or [])
         if fieldnames:
-            writer = csv.DictWriter(buf, fieldnames=fieldnames, extrasaction='ignore')
-            writer.writeheader()
-            for row in rows:
-                writer.writerow({k: cell_value(row.get(k)) for k in fieldnames})
-        return buf.getvalue().encode('utf-8'), fieldnames
+            header_font = Font(bold=True)
+            for col_idx, fieldname in enumerate(fieldnames, start=1):
+                header_cell = worksheet.cell(row=1, column=col_idx, value=fieldname)
+                header_cell.font = header_font
+            for row_idx, row in enumerate(rows, start=2):
+                for col_idx, fieldname in enumerate(fieldnames, start=1):
+                    raw_value = row.get(fieldname)
+                    cell = worksheet.cell(
+                        row=row_idx, column=col_idx, value=cell_value(raw_value)
+                    )
+                    rules = style_map.get(col_idx - 1)
+                    if rules:
+                        cls._apply_cell_style(cell, raw_value, rules)
+
+        buf = io.BytesIO()
+        workbook.save(buf)
+        return buf.getvalue(), fieldnames
 
     def _build_report_email_body(
         self,
         *,
-        yaml_name: str | None,
-        query_id: str,
-        datasource_id: str,
-        rows: list[dict],
-        fieldnames: list[str],
-        params: dict | None,
-        payload: dict,
-        csv_size: int,
+        report_name: str,
+        email_content: str | None,
+        report_size: int,
         use_attachment: bool,
         report_url: str | None,
     ) -> str:
-        generated_at_utc = datetime.now(timezone.utc).strftime('%Y-%m-%d %H:%M:%S UTC')
-        start_key = str(payload.get('start_date_param', 'start_date'))
-        end_key = str(payload.get('end_date_param', 'end_date'))
-        applied_start = params.get(start_key) if isinstance(params, dict) else None
-        applied_end = params.get(end_key) if isinstance(params, dict) else None
-        applied_range_html = (
-            f'<p><b>Applied Date Range:</b> {applied_start} to {applied_end} '
-            f'(keys: {start_key}, {end_key})</p>'
-            if applied_start and applied_end
-            else '<p><b>Applied Date Range:</b> Not specified in query parameters</p>'
-        )
-        body = (
-            f'<p>Scheduled report: <b>{yaml_name or query_id}</b></p>'
-            f'<p><b>Datasource ID:</b> {datasource_id}</p>'
-            f'<p><b>Query ID:</b> {query_id}</p>'
-            f'<p><b>Generated At:</b> {generated_at_utc}</p>'
-            f'{applied_range_html}'
-            f'<p><b>Total Rows:</b> {len(rows)}</p>'
-            f'<p><b>Columns:</b> {len(fieldnames)}</p>'
-            '<p>The report has been generated successfully.</p>'
-        )
+        if email_content and email_content.strip():
+            body = email_content.strip()
+            if not body.lstrip().startswith('<'):
+                body = f'<p>{body}</p>'
+        else:
+            body = f'<p>Scheduled report: <b>{report_name}</b></p>'
         if use_attachment:
             body += (
-                f'<p><b>Delivery:</b> CSV attached ({csv_size:,} bytes, '
+                f'<p><b>Delivery:</b> Excel report attached ({report_size:,} bytes, '
                 f'max {MAX_EMAIL_ATTACHMENT_BYTES // (1024 * 1024)} MB for email).</p>'
             )
         else:
             body += (
-                f'<p><b>Delivery:</b> Report is {csv_size:,} bytes (over '
+                f'<p><b>Delivery:</b> Report is {report_size:,} bytes (over '
                 f'{MAX_EMAIL_ATTACHMENT_BYTES // (1024 * 1024)} MB email limit). '
                 'Use the download link below instead of an attachment.</p>'
                 '<p>The link is secure and expires in 7 days.</p>'
@@ -511,7 +684,7 @@ def _build_report_email_body(
             if report_url:
                 body += (
                     f'<p><a href="{report_url}" target="_blank" rel="noopener noreferrer">'
-                    'Download CSV report (valid for 7 days)</a></p>'
+                    'Download Excel report (valid for 7 days)</a></p>'
                 )
         return body
 
@@ -520,10 +693,14 @@ async def _execute_email_dynamic_query_job(self, payload: dict, job_timezone: st
         query_id = payload.get('query_id')
         recipient_user_ids = self._normalize_recipient_user_ids(payload)
         subject = payload.get('subject', f'Scheduled Dynamic Query Report: {query_id}')
+        email_content = payload.get('email_content')
+        if email_content is not None and not isinstance(email_content, str):
+            email_content = None
         filter_expr = payload.get('filter')
         offset = payload.get('offset', 0)
         limit = payload.get('limit', 100)
         params = self._resolve_runtime_params(payload, job_timezone)
+        column_styles = self._parse_column_styles_config(payload.get('column_styles'))
 
         if not datasource_id or not query_id or not recipient_user_ids:
             raise ValueError(
@@ -590,18 +767,20 @@ async def _execute_email_dynamic_query_job(self, payload: dict, job_timezone: st
                 )
                 continue
 
-            csv_bytes, fieldnames = self._rows_to_csv_bytes(rows)
-            csv_size = len(csv_bytes)
-            report_filename = f'{query_id}_{user_id}_{run_timestamp}_report.csv'
+            report_bytes, _ = self._rows_to_xlsx_bytes(
+                rows, column_styles=column_styles
+            )
+            report_size = len(report_bytes)
+            report_filename = f'{query_id}_{user_id}_{run_timestamp}_report.xlsx'
             report_url: str | None = None
-            use_attachment = csv_size <= MAX_EMAIL_ATTACHMENT_BYTES
+            use_attachment = report_size <= MAX_EMAIL_ATTACHMENT_BYTES
             if not use_attachment:
                 report_key = f'scheduled_query_reports/{query_id}/{report_filename}'
                 self.cloud_storage_manager.save_small_file(
-                    file_content=csv_bytes,
+                    file_content=report_bytes,
                     bucket_name=self.bucket_name,
                     key=report_key,
-                    content_type='text/csv',
+                    content_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
                 )
                 report_url = self.cloud_storage_manager.generate_presigned_url(
                     bucket_name=self.bucket_name,
@@ -611,14 +790,9 @@ async def _execute_email_dynamic_query_job(self, payload: dict, job_timezone: st
                 )
 
             body = self._build_report_email_body(
-                yaml_name=yaml_name,
-                query_id=query_id,
-                datasource_id=datasource_id,
-                rows=rows,
-                fieldnames=fieldnames,
-                params=params,
-                payload=payload,
-                csv_size=csv_size,
+                report_name=yaml_name or query_id,
+                email_content=email_content,
+                report_size=report_size,
                 use_attachment=use_attachment,
                 report_url=report_url,
             )
@@ -627,8 +801,8 @@ async def _execute_email_dynamic_query_job(self, payload: dict, job_timezone: st
                 attachments = [
                     {
                         'filename': report_filename,
-                        'content_bytes': csv_bytes,
-                        'mime_type': 'text/csv',
+                        'content_bytes': report_bytes,
+                        'mime_type': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
                     }
                 ]
             is_sent = self.email_service.send_email(
diff --git a/wavefront/server/apps/floware/pyproject.toml b/wavefront/server/apps/floware/pyproject.toml
index 143f3995..80fcd43b 100644
--- a/wavefront/server/apps/floware/pyproject.toml
+++ b/wavefront/server/apps/floware/pyproject.toml
@@ -30,7 +30,8 @@ dependencies = [
     "python-multipart==0.0.9",
     "python-dotenv>=1.1.0,<2.0.0",
     "pottery>=3.0.1,<4.0.0",
-    "psycopg2-binary>=2.9.10,<3.0.0"
+    "psycopg2-binary>=2.9.10,<3.0.0",
+    "openpyxl>=3.1.5,<4.0.0",
 ]
 
 [tool.uv.sources]
diff --git a/wavefront/server/uv.lock b/wavefront/server/uv.lock
index e4714500..0787bd79 100644
--- a/wavefront/server/uv.lock
+++ b/wavefront/server/uv.lock
@@ -1310,6 +1310,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/de/15/545e2b6cf2e3be84bc1ed85613edd75b8aea69807a71c26f4ca6a9258e82/email_validator-2.3.0-py3-none-any.whl", hash = "sha256:80f13f623413e6b197ae73bb10bf4eb0908faf509ad8362c5edeb0be7fd450b4", size = 35604, upload-time = "2025-08-26T13:09:05.858Z" },
 ]
 
+[[package]]
+name = "et-xmlfile"
+version = "2.0.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/d3/38/af70d7ab1ae9d4da450eeec1fa3918940a5fafb9055e934af8d6eb0c2313/et_xmlfile-2.0.0.tar.gz", hash = "sha256:dab3f4764309081ce75662649be815c4c9081e88f0837825f90fd28317d4da54", size = 17234, upload-time = "2024-10-25T17:25:40.039Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/c1/8b/5fe2cc11fee489817272089c4203e679c63b570a5aaeb18d852ae3cbba6a/et_xmlfile-2.0.0-py3-none-any.whl", hash = "sha256:7a91720bc756843502c3b7504c77b8fe44217c85c537d85037f0f536151b2caa", size = 18059, upload-time = "2024-10-25T17:25:39.051Z" },
+]
+
 [[package]]
 name = "extract-msg"
 version = "0.29.0"
@@ -1647,6 +1656,7 @@ dependencies = [
     { name = "inference-module" },
     { name = "knowledge-base-module" },
     { name = "llm-inference-config-module" },
+    { name = "openpyxl" },
     { name = "plugins-module" },
     { name = "pottery" },
     { name = "product-analysis-module" },
@@ -1672,6 +1682,7 @@ requires-dist = [
     { name = "inference-module", editable = "modules/inference_module" },
     { name = "knowledge-base-module", editable = "modules/knowledge_base_module" },
     { name = "llm-inference-config-module", editable = "modules/llm_inference_config_module" },
+    { name = "openpyxl", specifier = ">=3.1.5,<4.0.0" },
     { name = "plugins-module", editable = "modules/plugins_module" },
     { name = "pottery", specifier = ">=3.0.1,<4.0.0" },
     { name = "product-analysis-module", editable = "modules/product_analysis_module" },
@@ -3663,6 +3674,18 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/a4/7d/f1c30a92854540bf789e9cd5dde7ef49bbe63f855b85a2e6b3db8135c591/opencv_python-4.11.0.86-cp37-abi3-win_amd64.whl", hash = "sha256:085ad9b77c18853ea66283e98affefe2de8cc4c1f43eda4c100cf9b2721142ec", size = 39488044, upload-time = "2025-01-16T13:52:21.928Z" },
 ]
 
+[[package]]
+name = "openpyxl"
+version = "3.1.5"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "et-xmlfile" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/3d/f9/88d94a75de065ea32619465d2f77b29a0469500e99012523b91cc4141cd1/openpyxl-3.1.5.tar.gz", hash = "sha256:cf0e3cf56142039133628b5acffe8ef0c12bc902d2aadd3e0fe5878dc08d1050", size = 186464, upload-time = "2024-06-28T14:03:44.161Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/c0/da/977ded879c29cbd04de313843e76868e6e13408a94ed6b987245dc7c8506/openpyxl-3.1.5-py2.py3-none-any.whl", hash = "sha256:5282c12b107bffeef825f4617dc029afaf41d0ea60823bbb665ef3079dc79de2", size = 250910, upload-time = "2024-06-28T14:03:41.161Z" },
+]
+
 [[package]]
 name = "opentelemetry-api"
 version = "1.40.0"

From 2ee9ae62d103b27f97cf9e038b6e64a888e7b361 Mon Sep 17 00:00:00 2001
From: vishnu r kumar <rkumar.vishnu28@gmail.com>
Date: Sat, 30 May 2026 11:35:15 +0530
Subject: [PATCH 4/4] fix: use users from the app and fix float cell formatting

---
 wavefront/client/src/api/app-user-service.ts  |  4 +-
 .../client/src/hooks/data/fetch-hooks.ts      | 14 ++++--
 .../client/src/hooks/data/mutation-hooks.ts   |  8 +--
 .../client/src/hooks/data/query-functions.ts  | 13 ++++-
 wavefront/client/src/hooks/data/query-keys.ts |  6 ++-
 .../datasources/ScheduleEmailAlertDialog.tsx  | 30 +++++++----
 .../[appId]/datasources/[datasourceId].tsx    |  1 +
 .../client/src/pages/apps/users/index.tsx     | 18 +++----
 .../floware/services/scheduled_job_service.py | 50 ++++++++++++++++---
 9 files changed, 102 insertions(+), 42 deletions(-)

diff --git a/wavefront/client/src/api/app-user-service.ts b/wavefront/client/src/api/app-user-service.ts
index 0bd3f471..87ae8cbc 100644
--- a/wavefront/client/src/api/app-user-service.ts
+++ b/wavefront/client/src/api/app-user-service.ts
@@ -22,8 +22,8 @@ export class AppUserService {
   /**
    * List users with access to an app (owners only)
    */
-  async listAppUsers(appId: string): Promise<IApiResponse<{ users: IUser[] }>> {
-    return this.http.get(`/v1/apps/${appId}/users`);
+  async listAppUsers(): Promise<IApiResponse<{ users: IUser[] }>> {
+    return this.http.get(`/v1/:appId/floware/v1/users`);
   }
 
   /**
diff --git a/wavefront/client/src/hooks/data/fetch-hooks.ts b/wavefront/client/src/hooks/data/fetch-hooks.ts
index c49feb3d..2d63def9 100644
--- a/wavefront/client/src/hooks/data/fetch-hooks.ts
+++ b/wavefront/client/src/hooks/data/fetch-hooks.ts
@@ -28,6 +28,7 @@ import {
   getApiServiceQueryFn,
   getApiServicesQueryFn,
   getAppByIdFn,
+  getAppUsersQueryFn,
   getAuthenticatorQueryFn,
   getAuthenticatorsQueryFn,
   getCurrentUserQueryFn,
@@ -54,7 +55,7 @@ import {
   getToolsQueryFn,
   getTtsConfigQueryFn,
   getTtsConfigsQueryFn,
-  getUsersQueryFn,
+  getConsoleUsersQueryFn,
   getVoiceAgentQueryFn,
   getVoiceAgentToolQueryFn,
   getVoiceAgentToolsQueryFn,
@@ -74,6 +75,7 @@ import {
   getApiServiceKey,
   getApiServicesKey,
   getAppByIdKey,
+  getAppUsersKey,
   getAuthenticatorKey,
   getAuthenticatorsKey,
   getCurrentUserKey,
@@ -100,7 +102,7 @@ import {
   getToolsKey,
   getTtsConfigKey,
   getTtsConfigsKey,
-  getUsersKey,
+  getConsoleUsersKey,
   getVoiceAgentKey,
   getVoiceAgentToolKey,
   getVoiceAgentToolsKey,
@@ -417,8 +419,12 @@ export const useGetAppById = (appId: string, enabled: boolean = true): UseQueryR
   return useQueryInit<App | undefined>(getAppByIdKey(appId), () => getAppByIdFn(appId), enabled);
 };
 
-export const useGetUsers = (): UseQueryResult<IUser[], Error> => {
-  return useQueryInit(getUsersKey(), getUsersQueryFn, true);
+export const useGetAppUsers = (appId: string | undefined): UseQueryResult<IUser[], Error> => {
+  return useQueryInit(getAppUsersKey(appId || ''), () => getAppUsersQueryFn(), !!appId);
+};
+
+export const useGetConsoleUsers = (): UseQueryResult<IUser[], Error> => {
+  return useQueryInit(getConsoleUsersKey(), getConsoleUsersQueryFn, true);
 };
 
 // Voice Agent Tools Hooks
diff --git a/wavefront/client/src/hooks/data/mutation-hooks.ts b/wavefront/client/src/hooks/data/mutation-hooks.ts
index 287bec1f..1482f0e2 100644
--- a/wavefront/client/src/hooks/data/mutation-hooks.ts
+++ b/wavefront/client/src/hooks/data/mutation-hooks.ts
@@ -1,5 +1,5 @@
 import { QueryClient, useMutation, useQueryClient } from '@tanstack/react-query';
-import { getAgentKey, getAgentsKey, getAppByIdKey, getUserKey, getUsersKey } from './query-keys';
+import { getAgentKey, getAgentsKey, getAppByIdKey, getConsoleUsersKey, getUserKey } from './query-keys';
 import {
   createUserMutationFn,
   deleteAgentMutationFn,
@@ -90,7 +90,7 @@ export const useCreateUser = () => {
     mutationFn: createUserMutationFn,
     onSuccess: () => {
       notifySuccess('User created successfully');
-      queryClient.invalidateQueries({ queryKey: getUsersKey() });
+      queryClient.invalidateQueries({ queryKey: getConsoleUsersKey() });
     },
     onError: (error) => {
       console.error('Error creating user:', error);
@@ -108,7 +108,7 @@ export const useUpdateUser = (userId: string | undefined) => {
     mutationFn: updateUserMutationFn,
     onSuccess: () => {
       notifySuccess('User updated successfully');
-      queryClient.invalidateQueries({ queryKey: getUsersKey() });
+      queryClient.invalidateQueries({ queryKey: getConsoleUsersKey() });
       if (userId) {
         queryClient.invalidateQueries({ queryKey: getUserKey(userId) });
       }
@@ -129,7 +129,7 @@ export const useDeleteUser = () => {
     mutationFn: deleteUserMutationFn,
     onSuccess: () => {
       notifySuccess('User deleted successfully');
-      queryClient.invalidateQueries({ queryKey: getUsersKey() });
+      queryClient.invalidateQueries({ queryKey: getConsoleUsersKey() });
     },
     onError: (error) => {
       console.error('Error deleting user:', error);
diff --git a/wavefront/client/src/hooks/data/query-functions.ts b/wavefront/client/src/hooks/data/query-functions.ts
index 4b463c6f..65aa4921 100644
--- a/wavefront/client/src/hooks/data/query-functions.ts
+++ b/wavefront/client/src/hooks/data/query-functions.ts
@@ -396,7 +396,15 @@ const getAgentToolsQueryFn = async (agentId: string): Promise<VoiceAgentToolWith
   return [];
 };
 
-const getUsersQueryFn = async (): Promise<IUser[]> => {
+const getAppUsersQueryFn = async (): Promise<IUser[]> => {
+  const response = await floConsoleService.appUserService.listAppUsers();
+  if (response.data?.data?.users && Array.isArray(response.data.data.users)) {
+    return response.data.data.users;
+  }
+  return [];
+};
+
+const getConsoleUsersQueryFn = async (): Promise<IUser[]> => {
   const response = await floConsoleService.userService.listUsers();
   if (response.data?.data?.users && Array.isArray(response.data.data.users)) {
     return response.data.data.users;
@@ -414,6 +422,7 @@ export {
   getApiServiceQueryFn,
   getApiServicesQueryFn,
   getAppByIdFn,
+  getAppUsersQueryFn,
   getAuthenticatorQueryFn,
   getAuthenticatorsQueryFn,
   getCurrentUserQueryFn,
@@ -440,7 +449,7 @@ export {
   getToolsQueryFn,
   getTtsConfigQueryFn,
   getTtsConfigsQueryFn,
-  getUsersQueryFn,
+  getConsoleUsersQueryFn,
   getVoiceAgentQueryFn,
   getVoiceAgentToolQueryFn,
   getVoiceAgentToolsQueryFn,
diff --git a/wavefront/client/src/hooks/data/query-keys.ts b/wavefront/client/src/hooks/data/query-keys.ts
index b7cddee6..021a938b 100644
--- a/wavefront/client/src/hooks/data/query-keys.ts
+++ b/wavefront/client/src/hooks/data/query-keys.ts
@@ -62,7 +62,8 @@ const getPipelinesKey = (appId: string, statusFilter?: string) => {
 const getPipelineKey = (appId: string, pipelineId: string) => ['pipeline', appId, pipelineId];
 const getPipelineFilesKey = (appId: string, pipelineId: string) => ['pipeline-files', appId, pipelineId];
 const getAppByIdKey = (appId: string) => ['app-by-id', appId];
-const getUsersKey = () => ['users'];
+const getAppUsersKey = (appId: string) => ['app-users', appId];
+const getConsoleUsersKey = () => ['console-users'];
 const getUserKey = (userId: string) => ['user', userId];
 const getVoiceAgentToolsKey = (appId: string) => ['voice-agent-tools', appId];
 const getVoiceAgentToolKey = (appId: string, toolId: string) => ['voice-agent-tool', appId, toolId];
@@ -105,7 +106,7 @@ export {
   getTtsConfigKey,
   getTtsConfigsKey,
   getUserKey,
-  getUsersKey,
+  getConsoleUsersKey,
   getVoiceAgentKey,
   getVoiceAgentToolKey,
   getVoiceAgentToolsKey,
@@ -114,4 +115,5 @@ export {
   getWorkflowRunsKey,
   getWorkflowsKey,
   getAppByIdKey,
+  getAppUsersKey,
 };
diff --git a/wavefront/client/src/pages/apps/[appId]/datasources/ScheduleEmailAlertDialog.tsx b/wavefront/client/src/pages/apps/[appId]/datasources/ScheduleEmailAlertDialog.tsx
index 04a25066..54e7b76f 100644
--- a/wavefront/client/src/pages/apps/[appId]/datasources/ScheduleEmailAlertDialog.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/datasources/ScheduleEmailAlertDialog.tsx
@@ -22,7 +22,7 @@ import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@app/components/ui/tabs';
 import { Textarea } from '@app/components/ui/textarea';
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@app/components/ui/tooltip';
-import { useGetUsers } from '@app/hooks';
+import { useGetAppUsers } from '@app/hooks';
 import { cn } from '@app/lib/utils';
 import { useNotifyStore } from '@app/store';
 import { IUser } from '@app/types/user';
@@ -33,6 +33,7 @@ import { useEffect, useMemo, useState } from 'react';
 
 interface ScheduleEmailAlertDialogProps {
   isOpen: boolean;
+  appId: string;
   datasourceId: string;
   queryId: string;
   onOpenChange: (open: boolean) => void;
@@ -83,6 +84,7 @@ const COLUMN_STYLES_PLACEHOLDER = `[
 
 const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
   isOpen,
+  appId,
   datasourceId,
   queryId,
   onOpenChange,
@@ -94,11 +96,11 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
   const [timezone, setTimezone] = useState('Asia/Kolkata');
   const [selectedRecipientUserIds, setSelectedRecipientUserIds] = useState<string[]>([]);
   const [recipientsSelectOpen, setRecipientsSelectOpen] = useState(false);
-  const { data: users = [], isLoading: usersLoading } = useGetUsers();
+  const { data: appUsers = [], isLoading: appUsersLoading } = useGetAppUsers(appId);
 
   const selectedRecipientUsers = useMemo(
-    () => resolveUsersFromRecipientIds(selectedRecipientUserIds, users),
-    [selectedRecipientUserIds, users]
+    () => resolveUsersFromRecipientIds(selectedRecipientUserIds, appUsers),
+    [selectedRecipientUserIds, appUsers]
   );
 
   const isRecipientSelected = (userId: string) =>
@@ -155,7 +157,7 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
 
   const getJobRecipientLabels = (job: ScheduledJob): string[] => {
     const payload = (job.payload || {}) as Record<string, unknown>;
-    return resolveUsersFromRecipientIds(extractRecipientUserIdsFromPayload(payload), users).map(formatUserLabel);
+    return resolveUsersFromRecipientIds(extractRecipientUserIdsFromPayload(payload), appUsers).map(formatUserLabel);
   };
   const [subject, setSubject] = useState('');
   const [emailContent, setEmailContent] = useState('');
@@ -402,7 +404,7 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
                       </p>
                       <p>
                         <span className="font-medium">Recipients:</span>{' '}
-                        {usersLoading
+                        {appUsersLoading
                           ? 'Loading...'
                           : (() => {
                               const labels = getJobRecipientLabels(job);
@@ -580,20 +582,20 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
                       </TooltipContent>
                     </Tooltip>
                   </div>
-                  <Popover open={recipientsSelectOpen} onOpenChange={setRecipientsSelectOpen}>
+                  <Popover modal open={recipientsSelectOpen} onOpenChange={setRecipientsSelectOpen}>
                     <PopoverTrigger asChild>
                       <button
                         type="button"
                         role="combobox"
                         aria-expanded={recipientsSelectOpen}
-                        disabled={usersLoading}
+                        disabled={appUsersLoading}
                         className={cn(
                           'border-input ring-offset-background focus:ring-ring flex min-h-9 w-full items-center justify-between rounded-md border bg-white px-3 py-2 text-sm shadow-sm focus:ring-1 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50',
                           selectedRecipientUserIds.length === 0 && 'text-[#878787]'
                         )}
                       >
                         <span className="truncate text-left">
-                          {usersLoading
+                          {appUsersLoading
                             ? 'Loading users...'
                             : selectedRecipientUserIds.length === 0
                               ? 'Select recipient users'
@@ -609,7 +611,13 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
                     <PopoverContent className="w-(--radix-popover-trigger-width) p-0" align="start">
                       <Command>
                         <CommandInput placeholder="Search users..." />
-                        <CommandList>
+                        <CommandList
+                          onWheel={(e) => {
+                            e.preventDefault();
+                            e.stopPropagation();
+                            e.currentTarget.scrollTop += e.deltaY;
+                          }}
+                        >
                           <CommandEmpty>No users found.</CommandEmpty>
                           {selectedRecipientUsers.length > 0 ? (
                             <CommandGroup heading="Selected">
@@ -626,7 +634,7 @@ const ScheduleEmailAlertDialog: React.FC<ScheduleEmailAlertDialogProps> = ({
                             </CommandGroup>
                           ) : null}
                           <CommandGroup heading="All users">
-                            {users
+                            {appUsers
                               .filter((user) => !isRecipientSelected(user.id))
                               .map((user) => (
                                 <CommandItem
diff --git a/wavefront/client/src/pages/apps/[appId]/datasources/[datasourceId].tsx b/wavefront/client/src/pages/apps/[appId]/datasources/[datasourceId].tsx
index 82829ece..2f7a9dd9 100644
--- a/wavefront/client/src/pages/apps/[appId]/datasources/[datasourceId].tsx
+++ b/wavefront/client/src/pages/apps/[appId]/datasources/[datasourceId].tsx
@@ -368,6 +368,7 @@ const DatasourceDetail: React.FC = () => {
         {datasourceId && scheduleQueryId && (
           <ScheduleEmailAlertDialog
             isOpen={scheduleDialogOpen}
+            appId={appId!}
             datasourceId={datasourceId}
             queryId={scheduleQueryId}
             onOpenChange={setScheduleDialogOpen}
diff --git a/wavefront/client/src/pages/apps/users/index.tsx b/wavefront/client/src/pages/apps/users/index.tsx
index baa66362..be5a8d15 100644
--- a/wavefront/client/src/pages/apps/users/index.tsx
+++ b/wavefront/client/src/pages/apps/users/index.tsx
@@ -4,8 +4,8 @@ import { EmptyStateCard } from '@app/components/EmptyCard';
 import { Button } from '@app/components/ui/button';
 import { Input } from '@app/components/ui/input';
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@app/components/ui/table';
-import { useGetCurrentUser, useGetUsers } from '@app/hooks';
-import { getUsersKey } from '@app/hooks/data/query-keys';
+import { useGetConsoleUsers, useGetCurrentUser } from '@app/hooks';
+import { getConsoleUsersKey } from '@app/hooks/data/query-keys';
 import { extractErrorMessage } from '@app/lib/utils';
 import { useNotifyStore } from '@app/store';
 import { IUser } from '@app/types/user';
@@ -27,8 +27,8 @@ const UsersPage: React.FC = () => {
   const [editItem, setEditItem] = useState<IUser | null>(null);
   const [manageAppAccessItem, setManageAppAccessItem] = useState<IUser | null>(null);
 
-  // Fetch users and current user
-  const { data: users = [], isLoading: usersLoading } = useGetUsers();
+  // Fetch console users and current user
+  const { data: consoleUsers = [], isLoading: consoleUsersLoading } = useGetConsoleUsers();
   const { data: currentUser } = useGetCurrentUser(true);
 
   // Check if current user is owner
@@ -65,7 +65,7 @@ const UsersPage: React.FC = () => {
   };
 
   const handleEditSuccess = () => {
-    queryClient.invalidateQueries({ queryKey: getUsersKey() });
+    queryClient.invalidateQueries({ queryKey: getConsoleUsersKey() });
     setEditItem(null);
   };
 
@@ -76,7 +76,7 @@ const UsersPage: React.FC = () => {
     try {
       await floConsoleService.userService.deleteUser(deleteItem.id);
       notifySuccess('User deleted successfully');
-      queryClient.invalidateQueries({ queryKey: getUsersKey() });
+      queryClient.invalidateQueries({ queryKey: getConsoleUsersKey() });
       setDeleteItem(null);
     } catch (error) {
       const errorMessage = extractErrorMessage(error);
@@ -95,11 +95,11 @@ const UsersPage: React.FC = () => {
   };
 
   const handleCreateSuccess = () => {
-    queryClient.invalidateQueries({ queryKey: getUsersKey() });
+    queryClient.invalidateQueries({ queryKey: getConsoleUsersKey() });
     setCreateDialogOpen(false);
   };
 
-  const filteredUsers = users.filter((user) => {
+  const filteredUsers = consoleUsers.filter((user) => {
     const query = searchQuery.toLowerCase();
     return (
       user.email.toLowerCase().includes(query) ||
@@ -131,7 +131,7 @@ const UsersPage: React.FC = () => {
         </div>
       </div>
 
-      {usersLoading ? (
+      {consoleUsersLoading ? (
         <div className="flex justify-center py-10">
           <div className="text-gray-500">Loading users...</div>
         </div>
diff --git a/wavefront/server/apps/floware/floware/services/scheduled_job_service.py b/wavefront/server/apps/floware/floware/services/scheduled_job_service.py
index 3a09d311..bdba62ca 100644
--- a/wavefront/server/apps/floware/floware/services/scheduled_job_service.py
+++ b/wavefront/server/apps/floware/floware/services/scheduled_job_service.py
@@ -1,7 +1,9 @@
+import hashlib
 import io
 import json
 import os
 from datetime import datetime, timedelta, timezone
+from decimal import Decimal
 from zoneinfo import ZoneInfo
 
 from apscheduler.triggers.cron import CronTrigger
@@ -448,13 +450,43 @@ async def _fetch_dynamic_query_rows(
             )
         return rows
 
+    @staticmethod
+    def _sanitize_filename_part(value: str) -> str:
+        return ''.join(
+            ch if ch.isalnum() or ch in '-_' else '_' for ch in value.strip()
+        )
+
+    @classmethod
+    def _build_report_filename(
+        cls,
+        *,
+        query_id: str,
+        user_id: str,
+        run_timestamp: str,
+        params: dict | None,
+        payload: dict,
+    ) -> str:
+        unique_hash = hashlib.sha256(f'{user_id}:{run_timestamp}'.encode()).hexdigest()[
+            :12
+        ]
+        start_key = str(payload.get('start_date_param', 'start_date'))
+        end_key = str(payload.get('end_date_param', 'end_date'))
+        start_date = params.get(start_key) if isinstance(params, dict) else None
+        end_date = params.get(end_key) if isinstance(params, dict) else None
+
+        if start_date and end_date:
+            start_part = cls._sanitize_filename_part(str(start_date))
+            end_part = cls._sanitize_filename_part(str(end_date))
+            return f'{query_id}_{start_part}_{end_part}_{unique_hash}_report.xlsx'
+        return f'{query_id}_{unique_hash}_report.xlsx'
+
     @staticmethod
     def _parse_numeric_cell_value(value) -> float | None:
         if value is None or value == '':
             return None
         if isinstance(value, bool):
             return float(value)
-        if isinstance(value, (int, float)):
+        if isinstance(value, (int, float, Decimal)):
             return float(value)
         if isinstance(value, str):
             stripped = value.strip().replace(',', '')
@@ -669,12 +701,8 @@ def _build_report_email_body(
                 body = f'<p>{body}</p>'
         else:
             body = f'<p>Scheduled report: <b>{report_name}</b></p>'
-        if use_attachment:
-            body += (
-                f'<p><b>Delivery:</b> Excel report attached ({report_size:,} bytes, '
-                f'max {MAX_EMAIL_ATTACHMENT_BYTES // (1024 * 1024)} MB for email).</p>'
-            )
-        else:
+
+        if not use_attachment:
             body += (
                 f'<p><b>Delivery:</b> Report is {report_size:,} bytes (over '
                 f'{MAX_EMAIL_ATTACHMENT_BYTES // (1024 * 1024)} MB email limit). '
@@ -771,7 +799,13 @@ async def _execute_email_dynamic_query_job(self, payload: dict, job_timezone: st
                 rows, column_styles=column_styles
             )
             report_size = len(report_bytes)
-            report_filename = f'{query_id}_{user_id}_{run_timestamp}_report.xlsx'
+            report_filename = self._build_report_filename(
+                query_id=query_id,
+                user_id=user_id,
+                run_timestamp=run_timestamp,
+                params=params,
+                payload=payload,
+            )
             report_url: str | None = None
             use_attachment = report_size <= MAX_EMAIL_ATTACHMENT_BYTES
             if not use_attachment: