Skip to content

Commit 022bbe1

Browse files
committed
Fixed type issues with emails
1 parent 3e0881c commit 022bbe1

File tree

5 files changed

+23
-13
lines changed

5 files changed

+23
-13
lines changed

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

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -177,15 +177,22 @@ export class DeliverAlertService extends BaseService {
177177
switch (alert.type) {
178178
case "TASK_RUN_ATTEMPT": {
179179
if (alert.taskRunAttempt) {
180-
const taskRunError = TaskRunError.safeParse(alert.taskRunAttempt.error);
180+
const parseError = TaskRunError.safeParse(alert.taskRunAttempt.error);
181181

182-
if (!taskRunError.success) {
183-
logger.error("[DeliverAlert] Failed to parse task run error", {
184-
issues: taskRunError.error.issues,
182+
let taskRunError: TaskRunError;
183+
184+
if (!parseError.success) {
185+
logger.error("[DeliverAlert] Attempt: Failed to parse task run error", {
186+
issues: parseError.error.issues,
185187
taskAttemptError: alert.taskRunAttempt.error,
186188
});
187189

188-
return;
190+
taskRunError = {
191+
type: "STRING_ERROR" as const,
192+
raw: "No error on task",
193+
};
194+
} else {
195+
taskRunError = parseError.data;
189196
}
190197

191198
await sendAlertEmail({
@@ -196,7 +203,7 @@ export class DeliverAlertService extends BaseService {
196203
exportName: alert.taskRunAttempt.backgroundWorkerTask.exportName,
197204
version: alert.taskRunAttempt.backgroundWorker.version,
198205
environment: alert.environment.slug,
199-
error: createJsonErrorObject(taskRunError.data),
206+
error: createJsonErrorObject(taskRunError),
200207
attemptLink: `${env.APP_ORIGIN}/projects/v3/${alert.project.externalRef}/runs/${alert.taskRunAttempt.taskRun.friendlyId}`,
201208
});
202209
} else {
@@ -219,6 +226,7 @@ export class DeliverAlertService extends BaseService {
219226
fileName: alert.taskRun.lockedBy?.filePath ?? "Unknown",
220227
exportName: alert.taskRun.lockedBy?.exportName ?? "Unknown",
221228
version: alert.taskRun.lockedToVersion?.version ?? "Unknown",
229+
project: alert.project.name,
222230
environment: alert.environment.slug,
223231
error: createJsonErrorObject(taskRunError),
224232
runLink: `${env.APP_ORIGIN}/projects/v3/${alert.project.externalRef}/runs/${alert.taskRun.friendlyId}`,
@@ -307,7 +315,7 @@ export class DeliverAlertService extends BaseService {
307315
const taskRunError = TaskRunError.safeParse(alert.taskRunAttempt.error);
308316

309317
if (!taskRunError.success) {
310-
logger.error("[DeliverAlert] Failed to parse task run error", {
318+
logger.error("[DeliverAlert] Attempt: Failed to parse task run error", {
311319
issues: taskRunError.error.issues,
312320
taskAttemptError: alert.taskRunAttempt.error,
313321
});
@@ -573,7 +581,7 @@ export class DeliverAlertService extends BaseService {
573581
const taskRunError = TaskRunError.safeParse(alert.taskRunAttempt.error);
574582

575583
if (!taskRunError.success) {
576-
logger.error("[DeliverAlert] Failed to parse task run error", {
584+
logger.error("[DeliverAlert] Attempt: Failed to parse task run error", {
577585
issues: taskRunError.error.issues,
578586
taskAttemptError: alert.taskRunAttempt.error,
579587
});
@@ -1019,7 +1027,7 @@ export class DeliverAlertService extends BaseService {
10191027
const res = TaskRunError.safeParse(alert.failedAttempt.error);
10201028

10211029
if (!res.success) {
1022-
logger.error("[DeliverAlert] Failed to parse task run error", {
1030+
logger.error("[DeliverAlert] Failed to parse task run error, sending with unknown error", {
10231031
issues: res.error.issues,
10241032
taskAttemptError: alert.failedAttempt.error,
10251033
});

packages/build/tsconfig.src.tsbuildinfo

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

packages/cli-v3/tsconfig.src.tsbuildinfo

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

packages/emails/emails/alert-run-failure.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ export const AlertRunEmailSchema = z.object({
3535
type AlertRunEmailProps = z.infer<typeof AlertRunEmailSchema>;
3636

3737
const previewDefaults: AlertRunEmailProps = {
38+
email: "alert-run",
3839
runId: "run_12345678",
3940
project: "my-project",
4041
taskIdentifier: "my-task",

packages/emails/tsconfig.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"lib": ["dom", "dom.iterable", "esnext"],
44
"allowJs": true,
55
"skipLibCheck": true,
6-
"strict": false,
6+
"strict": true,
77
"forceConsistentCasingInFileNames": true,
88
"noEmit": true,
99
"incremental": true,
@@ -12,7 +12,8 @@
1212
"moduleResolution": "node",
1313
"resolveJsonModule": true,
1414
"isolatedModules": true,
15-
"jsx": "preserve"
15+
"jsx": "preserve",
16+
"target": "ES2015",
1617
},
1718
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
1819
"exclude": ["node_modules"]

0 commit comments

Comments
 (0)