Coderabbit fixes

Author: samejr

apps/webapp/app/presenters/v3/ErrorsListPresenter.server.ts

@@ -234,13 +234,13 @@ export class ErrorsListPresenter extends BasePresenter {
 
     if (statusFilter.includeKeys) {
       queryBuilder.where(
-        "concat(task_identifier, '::', error_fingerprint) IN ({statusIncludeKeys: Array(String)})",
+        "concat(task_identifier, '::', error_fingerprint) IN {statusIncludeKeys: Array(String)}",
         { statusIncludeKeys: statusFilter.includeKeys }
       );
     }
     if (statusFilter.excludeKeys) {
       queryBuilder.where(
-        "concat(task_identifier, '::', error_fingerprint) NOT IN ({statusExcludeKeys: Array(String)})",
+        "concat(task_identifier, '::', error_fingerprint) NOT IN {statusExcludeKeys: Array(String)}",
         { statusExcludeKeys: statusFilter.excludeKeys }
       );
     }

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors.$fingerprint/route.tsx

@@ -1,10 +1,7 @@
 import { type LoaderFunctionArgs, type ActionFunctionArgs, json } from "@remix-run/server-runtime";
 import { type MetaFunction, Form, useNavigation, useSubmit } from "@remix-run/react";
 import { BellAlertIcon } from "@heroicons/react/20/solid";
-import {
-  IconAlarmSnooze as IconAlarmSnoozeBase,
-  IconCircleDotted,
-} from "@tabler/icons-react";
+import { IconAlarmSnooze as IconAlarmSnoozeBase, IconCircleDotted } from "@tabler/icons-react";
 import { parse } from "@conform-to/zod";
 import { z } from "zod";
 import { ErrorStatusBadge } from "~/components/errors/ErrorStatusBadge";
@@ -77,11 +74,7 @@ import { cn } from "~/utils/cn";
 import { LogsVersionFilter } from "~/components/logs/LogsVersionFilter";
 import { CodeBlock } from "~/components/code/CodeBlock";
 import { getSeriesColor } from "~/components/code/chartColors";
-import {
-  Popover,
-  PopoverArrowTrigger,
-  PopoverContent,
-} from "~/components/primitives/Popover";
+import { Popover, PopoverArrowTrigger, PopoverContent } from "~/components/primitives/Popover";
 import { ErrorGroupActions } from "~/v3/services/errorGroupActions.server";
 import { ErrorStatusMenuItems, CustomIgnoreDialog } from "~/components/errors/ErrorStatusMenu";
 
@@ -573,7 +566,7 @@ function ErrorDetailSidebar({
             </Property.Item>
 
             {/* Error message */}
-            <Property.Item>
+            <Property.Item className="gap-1">
               <Property.Label>Error</Property.Label>
               <Property.Value>
                 <CodeBlock

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors._index/route.tsx

@@ -403,7 +403,10 @@ function FiltersBar({
     searchParams.has("status") ||
     searchParams.has("tasks") ||
     searchParams.has("versions") ||
-    searchParams.has("search");
+    searchParams.has("search") ||
+    searchParams.has("period") ||
+    searchParams.has("from") ||
+    searchParams.has("to");
 
   return (
     <div className="flex items-start justify-between gap-x-2 border-b border-grid-bright p-2">

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors/route.tsx

@@ -87,6 +87,9 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
 
   const { emails, webhooks, slackChannel, slackIntegrationId } = submission.value;
 
+  const emailEnabled = env.ALERT_FROM_EMAIL !== undefined && env.ALERT_RESEND_API_KEY !== undefined;
+  const slackEnabled = !!slackIntegrationId;
+
   const existingChannels = await prisma.projectAlertChannel.findMany({
     where: {
       projectId: project.id,
@@ -99,19 +102,21 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
   const environmentTypes = [environment.type];
   const processedChannelIds = new Set<string>();
 
-  for (const email of emails) {
-    const options: CreateAlertChannelOptions = {
-      name: `Error alert to ${email}`,
-      alertTypes: ["ERROR_GROUP"],
-      environmentTypes,
-      deduplicationKey: `error-email:${email}:${environment.type}`,
-      channel: { type: "EMAIL", email },
-    };
-    const channel = await service.call(project.externalRef, userId, options);
-    processedChannelIds.add(channel.id);
+  if (emailEnabled) {
+    for (const email of emails) {
+      const options: CreateAlertChannelOptions = {
+        name: `Error alert to ${email}`,
+        alertTypes: ["ERROR_GROUP"],
+        environmentTypes,
+        deduplicationKey: `error-email:${email}:${environment.type}`,
+        channel: { type: "EMAIL", email },
+      };
+      const channel = await service.call(project.externalRef, userId, options);
+      processedChannelIds.add(channel.id);
+    }
   }
 
-  if (slackChannel) {
+  if (slackEnabled && slackChannel) {
     const [channelId, channelName] = slackChannel.split("/");
     if (channelId && channelName) {
       const options: CreateAlertChannelOptions = {
@@ -144,10 +149,10 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
   }
 
   const editableTypes = new Set<string>(["WEBHOOK"]);
-  if (env.ALERT_FROM_EMAIL !== undefined && env.ALERT_RESEND_API_KEY !== undefined) {
+  if (emailEnabled) {
     editableTypes.add("EMAIL");
   }
-  if (slackIntegrationId) {
+  if (slackEnabled) {
     editableTypes.add("SLACK");
   }
 

apps/webapp/app/v3/services/alerts/deliverErrorGroupAlert.server.ts

@@ -1,10 +1,8 @@
 import {
   type ChatPostMessageArguments,
   ErrorCode,
-  type WebAPIHTTPError,
   type WebAPIPlatformError,
   type WebAPIRateLimitedError,
-  type WebAPIRequestError,
 } from "@slack/web-api";
 import { type ProjectAlertChannelType } from "@trigger.dev/database";
 import assertNever from "assert-never";

apps/webapp/app/v3/services/alerts/errorAlertEvaluator.server.ts

@@ -74,7 +74,18 @@ export class ErrorAlertEvaluator {
     }
 
     const allEnvTypes = this.collectEnvironmentTypes(channels);
-    const environments = await this.resolveEnvironments(projectId, allEnvTypes);
+    const [project, environments] = await Promise.all([
+      this._replica.project.findFirst({
+        where: { id: projectId },
+        select: { organizationId: true },
+      }),
+      this.resolveEnvironments(projectId, allEnvTypes),
+    ]);
+
+    if (!project) {
+      logger.error("[ErrorAlertEvaluator] Project not found", { projectId });
+      return;
+    }
 
     if (environments.length === 0) {
       logger.info("[ErrorAlertEvaluator] No matching environments found", { projectId });
@@ -86,7 +97,12 @@ export class ErrorAlertEvaluator {
     const envMap = new Map(environments.map((e) => [e.id, e]));
     const channelsByEnvId = this.buildChannelsByEnvId(channels, environments);
 
-    const activeErrors = await this.getActiveErrors(projectId, envIds, scheduledAt);
+    const activeErrors = await this.getActiveErrors(
+      project.organizationId,
+      projectId,
+      envIds,
+      scheduledAt
+    );
 
     if (activeErrors.length === 0) {
       await this.selfChain(projectId, nextScheduledAt, minIntervalMs);
@@ -96,7 +112,12 @@ export class ErrorAlertEvaluator {
     const states = await this.getErrorGroupStates(activeErrors);
     const stateMap = this.buildStateMap(states);
 
-    const occurrenceCounts = await this.getOccurrenceCountsSince(projectId, envIds, scheduledAt);
+    const occurrenceCounts = await this.getOccurrenceCountsSince(
+      project.organizationId,
+      projectId,
+      envIds,
+      scheduledAt
+    );
     const occurrenceMap = this.buildOccurrenceMap(occurrenceCounts);
 
     const alertableErrors: AlertableError[] = [];
@@ -301,11 +322,13 @@ export class ErrorAlertEvaluator {
   }
 
   private async getActiveErrors(
+    organizationId: string,
     projectId: string,
     envIds: string[],
     scheduledAt: number
   ): Promise<ActiveErrorsSinceQueryResult[]> {
     const qb = this._clickhouse.errors.activeErrorsSinceQueryBuilder();
+    qb.where("organization_id = {organizationId: String}", { organizationId });
     qb.where("project_id = {projectId: String}", { projectId });
     qb.where("environment_id IN {envIds: Array(String)}", { envIds });
     qb.groupBy("environment_id, task_identifier, error_fingerprint");
@@ -346,6 +369,7 @@ export class ErrorAlertEvaluator {
   }
 
   private async getOccurrenceCountsSince(
+    organizationId: string,
     projectId: string,
     envIds: string[],
     scheduledAt: number
@@ -358,6 +382,7 @@ export class ErrorAlertEvaluator {
     }>
   > {
     const qb = this._clickhouse.errors.occurrenceCountsSinceQueryBuilder();
+    qb.where("organization_id = {organizationId: String}", { organizationId });
     qb.where("project_id = {projectId: String}", { projectId });
     qb.where("environment_id IN {envIds: Array(String)}", { envIds });
     qb.where("minute >= toStartOfMinute(fromUnixTimestamp64Milli({scheduledAt: Int64}))", {

apps/webapp/app/v3/services/alerts/errorGroupWebhook.server.ts

@@ -3,7 +3,7 @@ import type { ErrorWebhook } from "@trigger.dev/core/v3/schemas";
 
 export type ErrorAlertClassification = "new_issue" | "regression" | "unignored";
 
-export interface ErrorGroupAlertData {
+export type ErrorGroupAlertData = {
   classification: ErrorAlertClassification;
   error: {
     fingerprint: string;
@@ -29,7 +29,7 @@ export interface ErrorGroupAlertData {
     name: string;
   };
   dashboardUrl: string;
-}
+};
 
 /**
  * Generates a webhook payload for an error group alert that conforms to the

apps/webapp/test/slackErrorAlerts.test.ts

@@ -23,10 +23,11 @@ type ErrorAlertPayload = {
   };
 };
 
-// Test context for database setup
 let testChannelId: string;
 let testProjectId: string;
 let testOrganizationId: string;
+let testSecretKey: string;
+let testSecretReferenceId: string;
 
 // Helper to create mock error payloads
 function createMockErrorPayload(
@@ -90,20 +91,20 @@ describe.skipIf(!hasSlackCredentials)("Slack Error Alert Visual Tests", () => {
     });
     testProjectId = project.id;
 
-    // Create secret reference for Slack token
     const secretStore = getSecretStore("DATABASE");
-    const secretKey = `slack-test-token-${Date.now()}`;
+    testSecretKey = `slack-test-token-${Date.now()}`;
 
-    await secretStore.setSecret(secretKey, {
+    await secretStore.setSecret(testSecretKey, {
       botAccessToken: process.env.TEST_SLACK_BOT_TOKEN!,
     });
 
     const secretReference = await prisma.secretReference.create({
       data: {
-        key: secretKey,
+        key: testSecretKey,
         provider: "DATABASE",
       },
     });
+    testSecretReferenceId = secretReference.id;
 
     // Create Slack organization integration
     const integration = await prisma.organizationIntegration.create({
@@ -136,21 +137,31 @@ describe.skipIf(!hasSlackCredentials)("Slack Error Alert Visual Tests", () => {
   });
 
   afterAll(async () => {
-    // Clean up test data
     if (testChannelId) {
       await prisma.projectAlertChannel.deleteMany({
         where: { id: testChannelId },
       });
     }
+    if (testOrganizationId) {
+      await prisma.organizationIntegration.deleteMany({
+        where: { organizationId: testOrganizationId },
+      });
+    }
+    if (testSecretReferenceId) {
+      await prisma.secretReference.deleteMany({
+        where: { id: testSecretReferenceId },
+      });
+    }
+    if (testSecretKey) {
+      const secretStore = getSecretStore("DATABASE");
+      await secretStore.deleteSecret(testSecretKey);
+    }
     if (testProjectId) {
       await prisma.project.deleteMany({
         where: { id: testProjectId },
       });
     }
     if (testOrganizationId) {
-      await prisma.organizationIntegration.deleteMany({
-        where: { organizationId: testOrganizationId },
-      });
       await prisma.organization.deleteMany({
         where: { id: testOrganizationId },
       });