Skip to content

Commit 30ab313

Browse files
committed
Removing more exportName stuff
1 parent 0e6fc81 commit 30ab313

11 files changed

+10
-17
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,10 @@ export class DeploymentPresenter {
108108
tasks: {
109109
select: {
110110
slug: true,
111-
exportName: true,
112111
filePath: true,
113112
},
114113
orderBy: {
115-
exportName: "asc",
114+
slug: "asc",
116115
},
117116
},
118117
sdkVersion: true,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ export class SpanPresenter extends BasePresenter {
191191
lockedBy: {
192192
select: {
193193
filePath: true,
194-
exportName: true,
195194
},
196195
},
197196
//relationships

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ export class TaskPresenter {
2424
id: true,
2525
slug: true,
2626
filePath: true,
27-
exportName: true,
2827
friendlyId: true,
2928
createdAt: true,
3029
worker: {

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ export class TestPresenter extends BasePresenter {
2424
id: task.id,
2525
taskIdentifier: task.slug,
2626
filePath: task.filePath,
27-
exportName: task.exportName,
2827
friendlyId: task.friendlyId,
2928
triggerSource: task.triggerSource,
3029
};
@@ -40,7 +39,6 @@ export class TestPresenter extends BasePresenter {
4039
version: string;
4140
slug: string;
4241
filePath: string;
43-
exportName: string;
4442
friendlyId: string;
4543
triggerSource: TaskTriggerSource;
4644
}[]
@@ -53,10 +51,10 @@ export class TestPresenter extends BasePresenter {
5351
WHERE "runtimeEnvironmentId" = ${envId}
5452
),
5553
latest_workers AS (SELECT * FROM workers WHERE rn = 1)
56-
SELECT bwt.id, version, slug, "filePath", "exportName", bwt."friendlyId", bwt."triggerSource"
54+
SELECT bwt.id, version, slug, "filePath", bwt."friendlyId", bwt."triggerSource"
5755
FROM latest_workers
5856
JOIN ${sqlDatabaseSchema}."BackgroundWorkerTask" bwt ON bwt."workerId" = latest_workers.id
59-
ORDER BY bwt."exportName" ASC;`;
57+
ORDER BY slug ASC;`;
6058
} else {
6159
const currentDeployment = await findCurrentWorkerDeployment(envId);
6260
return currentDeployment?.worker?.tasks ?? [];

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ type Task = {
2121
id: string;
2222
taskIdentifier: string;
2323
filePath: string;
24-
exportName?: string;
2524
friendlyId: string;
2625
};
2726

apps/webapp/app/routes/api.v1.deployments.$deploymentId.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
6161
id: task.friendlyId,
6262
slug: task.slug,
6363
filePath: task.filePath,
64-
exportName: task.exportName,
64+
exportName: task.exportName ?? "@deprecated",
6565
})),
6666
}
6767
: undefined,

apps/webapp/app/routes/api.v1.projects.$projectRef.background-workers.$envSlug.$version.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
6666
updatedAt: backgroundWorker.updatedAt,
6767
tasks: backgroundWorker.tasks.map((task) => ({
6868
id: task.slug,
69-
exportName: task.exportName,
69+
exportName: task.exportName ?? "@deprecated",
7070
filePath: task.filePath,
7171
source: task.triggerSource,
7272
retryConfig: task.retryConfig,

apps/webapp/app/routes/resources.runs.$runParam.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
7676
lockedBy: {
7777
select: {
7878
filePath: true,
79-
exportName: true,
8079
},
8180
},
8281
},
@@ -150,7 +149,7 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
150149
task: {
151150
id: run.taskIdentifier,
152151
filePath: run.lockedBy?.filePath,
153-
exportName: run.lockedBy?.exportName,
152+
exportName: "@deprecated",
154153
},
155154
run: {
156155
id: run.friendlyId,

apps/webapp/app/v3/otlpExporter.server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ function extractResourceProperties(attributes: KeyValue[]) {
382382
attemptNumber: extractNumberAttribute(attributes, SemanticInternalAttributes.ATTEMPT_NUMBER),
383383
taskSlug: extractStringAttribute(attributes, SemanticInternalAttributes.TASK_SLUG, "unknown"),
384384
taskPath: extractStringAttribute(attributes, SemanticInternalAttributes.TASK_PATH),
385-
taskExportName: extractStringAttribute(attributes, SemanticInternalAttributes.TASK_EXPORT_NAME),
385+
taskExportName: "@deprecated",
386386
workerId: extractStringAttribute(attributes, SemanticInternalAttributes.WORKER_ID),
387387
workerVersion: extractStringAttribute(attributes, SemanticInternalAttributes.WORKER_VERSION),
388388
queueId: extractStringAttribute(attributes, SemanticInternalAttributes.QUEUE_ID),

packages/core/src/v3/schemas/api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ export const GetDeploymentResponseBody = z.object({
379379
id: z.string(),
380380
slug: z.string(),
381381
filePath: z.string(),
382-
exportName: z.string(),
382+
exportName: z.string().optional(),
383383
})
384384
),
385385
})

packages/core/src/v3/schemas/webhooks.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const AlertWebhookRunFailedObject = z.object({
1111
/** File path where the task is defined */
1212
filePath: z.string(),
1313
/** Name of the exported task function */
14-
exportName: z.string(),
14+
exportName: z.string().optional(),
1515
/** Version of the task */
1616
version: z.string(),
1717
/** Version of the SDK used */
@@ -142,7 +142,7 @@ export const AlertWebhookDeploymentSuccessObject = z.object({
142142
/** File path where the task is defined */
143143
filePath: z.string(),
144144
/** Name of the exported task function */
145-
exportName: z.string(),
145+
exportName: z.string().optional(),
146146
/** Source of the trigger */
147147
triggerSource: z.string(),
148148
})

0 commit comments

Comments
 (0)