fixed duplicate types

Author: waleedlatif1

apps/sim/app/api/workspaces/[id]/notifications/[notificationId]/test/route.ts

@@ -5,7 +5,11 @@ import { createLogger } from '@sim/logger'
 import { and, eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { v4 as uuidv4 } from 'uuid'
-import { renderWorkflowNotificationEmail } from '@/components/emails'
+import {
+  type EmailRateLimitsData,
+  type EmailUsageData,
+  renderWorkflowNotificationEmail,
+} from '@/components/emails'
 import { getSession } from '@/lib/auth'
 import { decryptSecret } from '@/lib/core/security/encryption'
 import { getBaseUrl } from '@/lib/core/utils/urls'
@@ -27,25 +31,6 @@ interface SlackConfig {
   accountId: string
 }
 
-interface RateLimitStatus {
-  requestsPerMinute: number
-  remaining: number
-  maxBurst?: number
-  resetAt?: string
-}
-
-interface RateLimitsData {
-  sync?: RateLimitStatus
-  async?: RateLimitStatus
-}
-
-interface UsageDataProps {
-  currentPeriodCost: number
-  limit: number
-  percentUsed: number
-  isExceeded?: boolean
-}
-
 function generateSignature(secret: string, timestamp: number, body: string): string {
   const signatureBase = `${timestamp}.${body}`
   const hmac = createHmac('sha256', secret)
@@ -183,15 +168,15 @@ async function testEmail(subscription: typeof workspaceNotificationSubscription.
     cost: `$${(((data.cost as Record<string, unknown>)?.total as number) || 0).toFixed(4)}`,
     logUrl,
     finalOutput: data.finalOutput,
-    rateLimits: data.rateLimits as RateLimitsData | undefined,
-    usageData: data.usage as UsageDataProps | undefined,
+    rateLimits: data.rateLimits as EmailRateLimitsData | undefined,
+    usageData: data.usage as EmailUsageData | undefined,
   })
 
   const result = await sendEmail({
     to: subscription.emailRecipients,
     subject: `[Test] Workflow Execution: ${data.workflowName}`,
     html,
-    text: `This is a test notification from Sim Studio.\n\nWorkflow: ${data.workflowName}\nStatus: ${data.status}\nDuration: ${data.totalDurationMs}ms\n\nView Log: ${logUrl}\n\nThis notification is configured for workspace notifications.`,
+    text: `This is a test notification from Sim.\n\nWorkflow: ${data.workflowName}\nStatus: ${data.status}\nDuration: ${data.totalDurationMs}ms\n\nView Log: ${logUrl}\n\nThis notification is configured for workspace notifications.`,
     emailType: 'notifications',
   })
 
@@ -245,7 +230,7 @@ async function testSlack(
         elements: [
           {
             type: 'mrkdwn',
-            text: 'This is a test notification from Sim Studio workspace notifications.',
+            text: 'This is a test notification from Sim workspace notifications.',
           },
         ],
       },

apps/sim/background/workspace-notification-delivery.ts

@@ -10,7 +10,11 @@ import { createLogger } from '@sim/logger'
 import { task } from '@trigger.dev/sdk'
 import { and, eq, isNull, lte, or, sql } from 'drizzle-orm'
 import { v4 as uuidv4 } from 'uuid'
-import { renderWorkflowNotificationEmail } from '@/components/emails'
+import {
+  type EmailRateLimitsData,
+  type EmailUsageData,
+  renderWorkflowNotificationEmail,
+} from '@/components/emails'
 import { checkUsageStatus } from '@/lib/billing/calculations/usage-monitor'
 import { getHighestPrioritySubscription } from '@/lib/billing/core/subscription'
 import { RateLimiter } from '@/lib/core/rate-limiter'
@@ -30,25 +34,6 @@ function getRetryDelayWithJitter(baseDelay: number): number {
   return Math.floor(baseDelay + jitter)
 }
 
-interface RateLimitStatus {
-  requestsPerMinute: number
-  remaining: number
-  maxBurst?: number
-  resetAt?: string
-}
-
-interface RateLimitsData {
-  sync?: RateLimitStatus
-  async?: RateLimitStatus
-}
-
-interface UsageDataPayload {
-  currentPeriodCost: number
-  limit: number
-  percentUsed: number
-  isExceeded?: boolean
-}
-
 interface NotificationPayload {
   id: string
   type: 'workflow.execution.completed'
@@ -65,8 +50,8 @@ interface NotificationPayload {
     totalDurationMs: number
     cost?: Record<string, unknown>
     finalOutput?: unknown
-    rateLimits?: RateLimitsData
-    usage?: UsageDataPayload
+    rateLimits?: EmailRateLimitsData
+    usage?: EmailUsageData
   }
 }
 

apps/sim/components/emails/notifications/index.ts

@@ -1 +1,7 @@
+export type {
+  EmailRateLimitStatus,
+  EmailRateLimitsData,
+  EmailUsageData,
+  WorkflowNotificationEmailProps,
+} from './workflow-notification-email'
 export { WorkflowNotificationEmail } from './workflow-notification-email'

apps/sim/components/emails/notifications/workflow-notification-email.tsx

@@ -3,26 +3,31 @@ import { baseStyles } from '@/components/emails/_styles'
 import { EmailLayout } from '@/components/emails/components'
 import { getBrandConfig } from '@/lib/branding/branding'
 
-interface RateLimitStatus {
+/**
+ * Serialized rate limit status for email payloads.
+ * Note: This differs from the canonical RateLimitStatus in @/lib/core/rate-limiter
+ * which uses Date for resetAt. This version uses string for JSON serialization.
+ */
+export interface EmailRateLimitStatus {
   requestsPerMinute: number
   remaining: number
   maxBurst?: number
   resetAt?: string
 }
 
-interface RateLimitsData {
-  sync?: RateLimitStatus
-  async?: RateLimitStatus
+export interface EmailRateLimitsData {
+  sync?: EmailRateLimitStatus
+  async?: EmailRateLimitStatus
 }
 
-interface UsageDataProps {
+export interface EmailUsageData {
   currentPeriodCost: number
   limit: number
   percentUsed: number
   isExceeded?: boolean
 }
 
-interface WorkflowNotificationEmailProps {
+export interface WorkflowNotificationEmailProps {
   workflowName: string
   status: 'success' | 'error'
   trigger: string
@@ -31,8 +36,8 @@ interface WorkflowNotificationEmailProps {
   logUrl: string
   alertReason?: string
   finalOutput?: unknown
-  rateLimits?: RateLimitsData
-  usageData?: UsageDataProps
+  rateLimits?: EmailRateLimitsData
+  usageData?: EmailUsageData
 }
 
 function formatJsonForEmail(data: unknown): string {

apps/sim/components/emails/render.ts

@@ -15,7 +15,10 @@ import {
   PollingGroupInvitationEmail,
   WorkspaceInvitationEmail,
 } from '@/components/emails/invitations'
-import { WorkflowNotificationEmail } from '@/components/emails/notifications'
+import {
+  WorkflowNotificationEmail,
+  type WorkflowNotificationEmailProps,
+} from '@/components/emails/notifications'
 import { HelpConfirmationEmail } from '@/components/emails/support'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 
@@ -260,49 +263,8 @@ export async function renderCareersSubmissionEmail(params: {
   )
 }
 
-interface RateLimitStatus {
-  requestsPerMinute: number
-  remaining: number
-  maxBurst?: number
-  resetAt?: string
-}
-
-interface RateLimitsData {
-  sync?: RateLimitStatus
-  async?: RateLimitStatus
-}
-
-interface UsageDataProps {
-  currentPeriodCost: number
-  limit: number
-  percentUsed: number
-  isExceeded?: boolean
-}
-
-export async function renderWorkflowNotificationEmail(params: {
-  workflowName: string
-  status: 'success' | 'error'
-  trigger: string
-  duration: string
-  cost: string
-  logUrl: string
-  alertReason?: string
-  finalOutput?: unknown
-  rateLimits?: RateLimitsData
-  usageData?: UsageDataProps
-}): Promise<string> {
-  return await render(
-    WorkflowNotificationEmail({
-      workflowName: params.workflowName,
-      status: params.status,
-      trigger: params.trigger,
-      duration: params.duration,
-      cost: params.cost,
-      logUrl: params.logUrl,
-      alertReason: params.alertReason,
-      finalOutput: params.finalOutput,
-      rateLimits: params.rateLimits,
-      usageData: params.usageData,
-    })
-  )
+export async function renderWorkflowNotificationEmail(
+  params: WorkflowNotificationEmailProps
+): Promise<string> {
+  return await render(WorkflowNotificationEmail(params))
 }