Ensure the test task action uses the correct dev environment

Author: ericallam

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

@@ -104,9 +104,20 @@ export const action: ActionFunction = async ({ request, params }) => {
     return json(submission);
   }
 
+  const project = await findProjectBySlug(organizationSlug, projectParam, userId);
+  if (!project) {
+    return redirectBackWithErrorMessage(request, "Project not found");
+  }
+
+  const environment = await findEnvironmentBySlug(project.id, envParam, userId);
+
+  if (!environment) {
+    return redirectBackWithErrorMessage(request, "Environment not found");
+  }
+
   const testService = new TestTaskService();
   try {
-    const run = await testService.call(userId, submission.value);
+    const run = await testService.call(environment, submission.value);
 
     if (!run) {
       return redirectBackWithErrorMessage(

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

@@ -80,11 +80,6 @@ export default function Page() {
   const { tasks } = useTypedLoaderData<typeof loader>();
   const { taskParam } = useParams();
 
-  const navigation = useNavigation();
-
-  const isLoadingTasks =
-    navigation.state === "loading" && navigation.location.pathname === location.pathname;
-
   return (
     <PageContainer>
       <NavBar>

apps/webapp/app/v3/services/testTask.server.ts

@@ -1,31 +1,22 @@
 import { stringifyIO } from "@trigger.dev/core/v3";
-import { findEnvironmentById } from "~/models/runtimeEnvironment.server";
+import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
 import { TestTaskData } from "../testTask";
 import { BaseService } from "./baseService.server";
 import { TriggerTaskService } from "./triggerTask.server";
 
 export class TestTaskService extends BaseService {
-  public async call(userId: string, data: TestTaskData) {
-    const authenticatedEnvironment = await findEnvironmentById(data.environmentId);
-    if (!authenticatedEnvironment) {
-      return;
-    }
-
+  public async call(environment: AuthenticatedEnvironment, data: TestTaskData) {
     const triggerTaskService = new TriggerTaskService();
 
     switch (data.triggerSource) {
       case "STANDARD":
-        const result = await triggerTaskService.call(
-          data.taskIdentifier,
-          authenticatedEnvironment,
-          {
-            payload: data.payload,
-            options: {
-              test: true,
-              metadata: data.metadata,
-            },
-          }
-        );
+        const result = await triggerTaskService.call(data.taskIdentifier, environment, {
+          payload: data.payload,
+          options: {
+            test: true,
+            metadata: data.metadata,
+          },
+        });
 
         return result?.run;
       case "SCHEDULED": {
@@ -42,7 +33,7 @@ export class TestTaskService extends BaseService {
 
         const result = await triggerTaskService.call(
           data.taskIdentifier,
-          authenticatedEnvironment,
+          environment,
           {
             payload: payloadPacket.data,
             options: { payloadType: payloadPacket.dataType, test: true },