feature/M11 | Rich Commenting

.env.example

@@ -49,3 +49,9 @@ NGROK_AUTHTOKEN=
 
 # --- Enable/disable logging prisma's generated queries in dev environments
 PRISMA_SHOW_QUERIES=1
+
+# --- Add trigger env vars
+TRIGGER_PROJECT=
+TRIGGER_SECRET_KEY=
+# Only required if you are planning to deploy trigger jobs from external sources, like Github Action, build pipelines, etc
+TRIGGER_ACCESS_TOKEN=

.github/workflows/lint.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 18.18.2
+          node-version: 18.20.0
           cache: yarn
           cache-dependency-path: './yarn.lock'
 

.github/workflows/trigger.yml

@@ -17,15 +17,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # Automatically checkout the same branch/tag from "Use workflow from" dropdown
           ref: ${{ github.ref_name }}
 
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
+      - name: Setup Node.JS v20
+        uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: '20.x'
 
       # Dynamically set TRIGGER_SECRET_KEY from the correct secrets based on whether 'prod' or 'staging' was chosen.
       - name: Configure environment variables
@@ -38,6 +38,10 @@ jobs:
 
           # TRIGGER_ACCESS_TOKEN (same for both)
           echo "TRIGGER_ACCESS_TOKEN=${{ secrets.TRIGGER_ACCESS_TOKEN }}" >> $GITHUB_ENV
+          echo "TRIGGER_PROJECT=proj_gaxcpkutbhhxzjvnevvi" >> $GITHUB_ENV
+
+      - name: Install build dependencies
+        run: yarn add "@trigger.dev/[email protected]" "@trigger.dev/[email protected]"
 
       - name: Run deploy command
-        run: npx trigger.dev@latest deploy -e ${{ github.event.inputs.environment }}
+        run: npx trigger.dev@3.3.13 deploy -e ${{ github.event.inputs.environment }}

.gitignore

@@ -44,3 +44,6 @@ next-env.d.ts
 
 # Test routes
 **/test-route-*
+
+# Trigger
+.trigger

package.json

@@ -27,6 +27,9 @@
     "lint-staged": "npx lint-staged",
     "postinstall": "prisma generate",
     "test": "jest",
+    "trigger": "npx [email protected]",
+    "trigger:dev": "yarn trigger dev",
+    "trigger:deploy-staging": "yarn trigger deploy -e staging",
     "loadtest": "tsx ./src/cmd/load-testing",
     "loadtest:delete-clients": "tsx ./src/cmd/load-testing/deleteClients.ts",
     "seed:activity-logs": "tsx ./src/cmd/fill-activity-logs",
@@ -42,6 +45,7 @@
     "@reduxjs/toolkit": "^2.2.3",
     "@sentry/nextjs": "^8",
     "@supabase/supabase-js": "^2.47.5",
+    "@trigger.dev/sdk": "3.3.13",
     "@types/date-fns": "^2.6.0",
     "@vercel/blob": "^0.23.2",
     "@vercel/postgres": "^0.8.0",
@@ -71,6 +75,7 @@
     "@faker-js/faker": "^8.4.1",
     "@ngrok/ngrok": "^1.4.1",
     "@svgr/webpack": "^8.1.0",
+    "@trigger.dev/build": "3.3.13",
     "@types/jest": "^29.5.12",
     "@types/jsdom": "^21.1.7",
     "@types/node": "^20",
@@ -93,5 +98,6 @@
       "yarn lint:fix",
       "yarn prettier:fix"
     ]
-  }
+  },
+  "packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

prisma/schema/main.prisma

@@ -1,6 +1,8 @@
 generator client {
   provider        = "prisma-client-js"
   previewFeatures = ["prismaSchemaFolder", "relationJoins"]
+  // debian-openssl-3.0.x is for trigger.dev's runtime
+  binaryTargets   = ["native", "debian-openssl-3.0.x"]
 }
 
 datasource db {

scripts/build.sh

@@ -0,0 +1,42 @@
+# Script to build Tasks App on Vercel
+
+echo "👷 Running build script for environment: $VERCEL_ENV"
+
+# Build and deploy latest trigger jobs to trigger cloud
+# DEPRECATED: Building from Github Actions now instead
+# (
+# echo "💼 [1/4] Build and deploy latest trigger jobs"
+#
+# if [ "$VERCEL_ENV" = "production" ]; then
+#   echo "🚀 Deploying trigger jobs for production environment..."
+#   npx trigger.dev@latest deploy
+# elif [ "$VERCEL_ENV" = "preview" ]; then
+# Check if the branch name contains 'feature' OR 'tdb'
+# VERCEL_GIT_COMMIT_REF is the branch name in Vercel, e.g. "feature/some-branch"
+# if [[ "$VERCEL_GIT_COMMIT_REF" =~ (feature/|tdb) ]]; then
+#   echo "🚀 Deploying trigger jobs for staging environment (branch is '$VERCEL_GIT_COMMIT_REF')..."
+#   npx trigger.dev@latest deploy -e staging
+# else
+#   echo "🔒 Skip deploying trigger jobs for preview branch '$VERCEL_GIT_COMMIT_REF' as it isn't a feature branch (checking 'feature/' or 'tdb' prefix"
+# fi
+#   else
+#     echo "🔒 Skip deploying trigger jobs for dev environment"
+#   fi
+# ) &
+
+(
+  echo "🔧 [1/3] Applying latest prisma migrations"
+  yarn prisma migrate deploy
+) &
+
+(
+  echo "🛠️ [2/3] Building Next app"
+  yarn next build
+) &
+wait
+
+# Grant anon privileges so realtime channel can work using only Copilot token
+echo "🏃 [3/3] Running grant-supabase-privileges"
+yarn db:grant-supabase-privileges
+
+echo "🥳 Deployment completed! 🎉🎉🎉"

src/app/api/comment/comment.controller.ts

@@ -34,8 +34,7 @@ export const updateComment = async (req: NextRequest, { params: { id } }: IdPara
   const data = UpdateCommentSchema.parse(await req.json())
 
   const commentService = new CommentService(user)
+  const comment = await commentService.update(id, data)
 
-  const updatedComment = await commentService.update(id, data)
-
-  return NextResponse.json({ comment: updatedComment }, { status: httpStatus.OK })
+  return NextResponse.json({ comment })
 }

src/app/api/comment/comment.service.ts

@@ -1,3 +1,4 @@
+import { sendCommentCreateNotifications } from '@/jobs/notifications'
 import { CreateComment, UpdateComment } from '@/types/dto/comment.dto'
 import { CopilotAPI } from '@/utils/CopilotAPI'
 import { CommentAddedSchema } from '@api/activity-logs/schemas/CommentAddedSchema'
@@ -15,45 +16,6 @@ import httpStatus from 'http-status'
 import { z } from 'zod'
 
 export class CommentService extends BaseService {
-  private async sendCommentCreatedNotifications(task: Task, comment: Comment) {
-    // If task is unassigned, there's nobody to send notifications to
-    if (!task.assigneeId || !task.assigneeType) return
-
-    const notificationService = new NotificationService(this.user)
-    await this.handleCommentNotifications(task, comment, notificationService)
-  }
-
-  private handleCommentNotifications = async (task: Task, comment: Comment, notificationService: NotificationService) => {
-    const copilot = new CopilotAPI(this.user.token)
-    const { recipientIds: clientRecipientIds } = await notificationService.getNotificationParties(
-      copilot,
-      task,
-      NotificationTaskActions.CommentToCU,
-    )
-
-    const filteredCUIds = clientRecipientIds.filter((id: string) => id !== comment.initiatorId)
-    console.info('creating notifications for CUS', filteredCUIds)
-    await notificationService.createBulkNotification(NotificationTaskActions.Commented, task, filteredCUIds, {
-      email: true,
-      disableInProduct: true,
-      commentId: comment.id,
-    })
-
-    const { recipientIds: iuRecipientIds } = await notificationService.getNotificationParties(
-      copilot,
-      task,
-      NotificationTaskActions.CommentToIU,
-    )
-
-    const filteredIUIds = iuRecipientIds.filter((id: string) => id !== comment.initiatorId)
-    console.info('creating notifications for IUs', filteredIUIds)
-    await notificationService.createBulkNotification(NotificationTaskActions.Commented, task, filteredIUIds, {
-      email: false,
-      disableInProduct: false,
-      commentId: comment.id,
-    })
-  }
-
   async create(data: CreateComment) {
     const policyGate = new PoliciesService(this.user)
     policyGate.authorize(UserAction.Create, Resource.Comment)
@@ -88,9 +50,8 @@ export class CommentService extends BaseService {
       }),
     )
 
-    const sendCommentCreatedNotifications = this.sendCommentCreatedNotifications(task, comment)
-
-    await Promise.all([logActivity, sendCommentCreatedNotifications])
+    await sendCommentCreateNotifications.trigger({ user: this.user, task: task, comment: comment })
+    await logActivity
     // if (data.mentions) {
     //   await notificationService.createBulkNotification(NotificationTaskActions.Mentioned, task, data.mentions, {
     //     commentId: comment.id,
@@ -115,14 +76,19 @@ export class CommentService extends BaseService {
     const policyGate = new PoliciesService(this.user)
     policyGate.authorize(UserAction.Update, Resource.Comment)
 
+    const filters = { id, workspaceId: this.user.workspaceId, initiatorId: this.user.internalUserId }
+    const prevComment = await this.db.comment.findFirst({
+      where: filters,
+    })
+    if (!prevComment) throw new APIError(httpStatus.NOT_FOUND, 'The comment to update was not found')
+
     const comment = await this.db.comment.update({
-      where: { id },
-      data: {
-        ...data,
-      },
+      where: filters,
+      data,
     })
     const tasksService = new TasksService(this.user)
     await tasksService.setNewLastActivityLogUpdated(comment.taskId)
+    return comment
   }
 
   async getCommentsByIds(commentIds: string[]) {

src/app/api/health-check/route.ts

@@ -1,7 +1,35 @@
+import DBClient from '@/lib/db'
+import { healthCheck } from '@/jobs/health-check'
+import { tasks } from '@trigger.dev/sdk/v3'
 import { NextResponse } from 'next/server'
 
 export async function GET() {
+  let dbConnection: boolean = false
+  let triggerConnection: boolean = false
+  let triggerRunId: string | undefined = undefined
+
+  // Check database connection
+  try {
+    console.time('db')
+    const client = DBClient.getInstance()
+    await client.$queryRaw`SELECT 1`
+    console.timeEnd('db')
+    dbConnection = true
+  } catch {}
+
+  // Check trigger.dev workers connection
+  try {
+    console.time('trigger')
+    const queueRunHandler = await tasks.trigger<typeof healthCheck>('health-check', {})
+    console.timeEnd('trigger')
+    triggerConnection = !!queueRunHandler?.id.startsWith('run')
+    triggerRunId = queueRunHandler.id
+  } catch {}
+
   return NextResponse.json({
-    message: 'Copilot Tasks app API is rolling 🔥',
+    message: 'Copilot Tasks App API is rolling 🔥',
+    dbConnection,
+    triggerConnection,
+    triggerRunId,
   })
 }

src/app/api/notification/notification.service.ts

@@ -35,6 +35,7 @@ export class NotificationService extends BaseService {
         // If any of the given action is not present in details obj, that type of notification is not sent
         deliveryTargets: { inProduct, email },
       }
+      console.info('NotificationService#create | Creating single notification:', notificationDetails)
 
       const notification = await copilot.createNotification(notificationDetails)
       // NOTE: There are cases where task.assigneeType does not account for IU notification!
@@ -94,6 +95,8 @@ export class NotificationService extends BaseService {
             recipientId,
             deliveryTargets: { inProduct, email },
           }
+          console.info('NotificationService#bulkCreate | Creating single notification:', notificationDetails)
+
           notifications.push(await copilot.createNotification(notificationDetails))
         } catch (err: unknown) {
           console.error(`Failed to send notifications to ${recipientId}:`, err)
@@ -137,7 +140,11 @@ export class NotificationService extends BaseService {
     }
     console.info(`Deleting all notifications triggerd by task ${taskId}`)
     await Promise.all(markAsReadPromises)
-    await this.db.internalUserNotification.deleteMany({ where: { taskId } })
+    // Hard delete this since we are not marking these as read, but deleting them
+    await this.db.$executeRaw`
+      DELETE FROM "InternalUserNotifications"
+      WHERE "taskId" = ${taskId}::uuid
+    `
   }
 
   /**

src/app/api/tasks/tasks.service.ts

@@ -1,4 +1,6 @@
 import { MAX_FETCH_ASSIGNEE_COUNT } from '@/constants/users'
+import { deleteTaskNotifications, sendTaskCreateNotifications, sendTaskUpdateNotifications } from '@/jobs/notifications'
+import { sendClientUpdateTaskNotifications } from '@/jobs/notifications/send-client-task-update-notifications'
 import { ClientResponse, CompanyResponse, InternalUsers } from '@/types/common'
 import { CreateTaskRequest, UpdateTaskRequest } from '@/types/dto/tasks.dto'
 import { CopilotAPI } from '@/utils/CopilotAPI'
@@ -179,8 +181,9 @@ export class TasksService extends BaseService {
       }
     }
 
-    const taskNotificationsSevice = new TaskNotificationsService(this.user)
-    await taskNotificationsSevice.sendTaskCreateNotifications(newTask)
+    // Send task created notifications to users
+    await sendTaskCreateNotifications.trigger({ user: this.user, task: newTask })
+
     return newTask
   }
 
@@ -269,8 +272,7 @@ export class TasksService extends BaseService {
       await activityLogger.logTaskUpdated(prevTask)
     }
 
-    const taskNotificationsSevice = new TaskNotificationsService(this.user)
-    await taskNotificationsSevice.sendTaskUpdateNotifications(prevTask, updatedTask)
+    await sendTaskUpdateNotifications.trigger({ prevTask, updatedTask, user: this.user })
 
     return updatedTask
   }
@@ -288,8 +290,7 @@ export class TasksService extends BaseService {
 
     if (!task) throw new APIError(httpStatus.NOT_FOUND, 'The requested task to delete was not found')
 
-    const taskNotificationsSevice = new TaskNotificationsService(this.user)
-    await taskNotificationsSevice.removeDeletedTaskNotifications(task)
+    await deleteTaskNotifications.trigger({ user: this.user, task })
 
     //delete the associated label
     const labelMappingService = new LabelMappingService(this.user)
@@ -443,8 +444,7 @@ export class TasksService extends BaseService {
       await activityLogger.logTaskUpdated(prevTask)
     }
 
-    const taskNotificationsSevice = new TaskNotificationsService(this.user)
-    await taskNotificationsSevice.sendClientUpdateTaskNotifications(prevTask, updatedTask, updatedWorkflowState)
+    await sendClientUpdateTaskNotifications.trigger({ user: this.user, prevTask, updatedTask, updatedWorkflowState })
     return updatedTask
   }
 }

src/components/AttachmentLayout.tsx

@@ -30,7 +30,6 @@ const AttachmentLayout: React.FC<AttachmentLayoutProps> = ({ selected, src, file
     padding: { sm: '4px 8px', md: '4px 12px 4px 8px' },
     border: (theme) => `1px solid ${theme.color.gray[selected ? 600 : 150]}`,
     background: '#fff',
-    boxShadow: '0px 3px 4px 0px rgba(16, 17, 19, 0.06), 0px 4px 11px 0px rgba(20, 21, 24, 0.18)',
 
     '@media (max-width: 600px)': {
       '&:active': {

src/components/cards/CommentCard.tsx

@@ -2,6 +2,7 @@
 
 import { DotSeparator } from '@/app/detail/ui/DotSeparator'
 import { BoldTypography, CommentCardContainer, StyledModal, StyledTypography } from '@/app/detail/ui/styledComponent'
+import AttachmentLayout from '@/components/AttachmentLayout'
 import { ListBtn } from '@/components/buttons/ListBtn'
 import { PrimaryBtn } from '@/components/buttons/PrimaryBtn'
 import { MenuBox } from '@/components/inputs/MenuBox'
@@ -127,6 +128,7 @@ export const CommentCard = ({
           getContent={() => {}}
           readonly
           editorClass="tapwrite-comment"
+          attachmentLayout={AttachmentLayout}
         />
 
         {Array.isArray((comment as LogResponse).details?.replies) &&
@@ -150,6 +152,7 @@ export const CommentCard = ({
                   getContent={() => {}}
                   readonly
                   editorClass="tapwrite-comment"
+                  attachmentLayout={AttachmentLayout}
                 />
               </Stack>
             )
@@ -168,6 +171,7 @@ export const CommentCard = ({
                 placeholder="Leave a reply..."
                 suggestions={assigneeSuggestions}
                 editorClass="tapwrite-reply-input"
+                attachmentLayout={AttachmentLayout}
               />
               <InputAdornment
                 position="end"