Only show the environments, not tasks. Renamed to “Concurrency limits”

Author: matt-aitken

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

@@ -5,14 +5,12 @@ import {
   displayableEnvironment,
   type DisplayableInputEnvironment,
 } from "~/models/runtimeEnvironment.server";
-import { getAllTaskIdentifiers } from "~/models/task.server";
 import { type User } from "~/models/user.server";
 import { getLimit } from "~/services/platform.v3.server";
 import { sortEnvironments } from "~/utils/environmentSort";
 import { concurrencyTracker } from "~/v3/services/taskRunConcurrencyTracker.server";
 import { BasePresenter } from "./basePresenter.server";
 
-export type Task = Awaited<ReturnType<ConcurrencyPresenter["taskConcurrency"]>>[number];
 export type Environment = Awaited<
   ReturnType<ConcurrencyPresenter["environmentConcurrency"]>
 >[number];
@@ -56,52 +54,11 @@ export class ConcurrencyPresenter extends BasePresenter {
       throw new Error(`Project not found: ${projectSlug}`);
     }
 
-    const limit = await getLimit(project.organizationId, "concurrentRuns", 10);
-
     return {
       environments: this.environmentConcurrency(project.id, userId, project.environments),
-      tasks: this.taskConcurrency(project.id),
-      limit,
     };
   }
 
-  async taskConcurrency(projectId: string) {
-    //get all possible tasks
-    const possibleTasks = await getAllTaskIdentifiers(this._replica, projectId);
-    const concurrencies = await concurrencyTracker.taskConcurrentRunCounts(
-      projectId,
-      possibleTasks.map((task) => task.slug)
-    );
-    const queued = await this._replica.$queryRaw<
-      {
-        taskIdentifier: string;
-        count: BigInt;
-      }[]
-    >`
-SELECT 
-  tr."taskIdentifier",
-  COUNT(*) 
-FROM 
-  ${sqlDatabaseSchema}."TaskRun" as tr
-WHERE 
-  tr."taskIdentifier" IN (${Prisma.join(possibleTasks.map((task) => task.slug))})
-  AND tr."projectId" = ${projectId}
-  AND tr."status" = ANY(ARRAY[${Prisma.join(QUEUED_STATUSES)}]::\"TaskRunStatus\"[])
-GROUP BY 
-  tr."taskIdentifier"
-ORDER BY 
-  tr."taskIdentifier" ASC`;
-
-    return possibleTasks
-      .map((task) => ({
-        identifier: task.slug,
-        triggerSource: task.triggerSource,
-        concurrency: concurrencies[task.slug] ?? 0,
-        queued: Number(queued.find((q) => q.taskIdentifier === task.slug)?.count ?? 0),
-      }))
-      .sort((a, b) => a.identifier.localeCompare(b.identifier));
-  }
-
   async environmentConcurrency(
     projectId: string,
     userId: string,

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.v3.$projectParam.concurrency/route.tsx

@@ -1,43 +1,32 @@
 import { ArrowUpCircleIcon, BookOpenIcon } from "@heroicons/react/20/solid";
-import { LoaderFunctionArgs } from "@remix-run/server-runtime";
-import { typeddefer, typedjson, UseDataFunctionReturn, useTypedLoaderData } from "remix-typedjson";
+import { Await } from "@remix-run/react";
+import { type LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { Suspense } from "react";
+import { typeddefer, useTypedLoaderData } from "remix-typedjson";
 import { AdminDebugTooltip } from "~/components/admin/debugTooltip";
 import { EnvironmentLabel } from "~/components/environments/EnvironmentLabel";
+import { Feedback } from "~/components/Feedback";
 import { PageBody, PageContainer } from "~/components/layout/AppLayout";
 import { Button, LinkButton } from "~/components/primitives/Buttons";
 import { Header2 } from "~/components/primitives/Headers";
-import { Input } from "~/components/primitives/Input";
 import { NavBar, PageAccessories, PageTitle } from "~/components/primitives/PageHeader";
-import { Paragraph } from "~/components/primitives/Paragraph";
-import * as Property from "~/components/primitives/PropertyTable";
+import { Spinner } from "~/components/primitives/Spinner";
 import {
   Table,
-  TableBlankRow,
   TableBody,
   TableCell,
   TableHeader,
   TableHeaderCell,
   TableRow,
 } from "~/components/primitives/Table";
-import { SimpleTooltip } from "~/components/primitives/Tooltip";
-import {
-  taskTriggerSourceDescription,
-  TaskTriggerSourceIcon,
-} from "~/components/runs/v3/TaskTriggerSource";
 import { useOrganization } from "~/hooks/useOrganizations";
-import { useTextFilter } from "~/hooks/useTextFilter";
 import {
   ConcurrencyPresenter,
-  Environment,
-  Task,
+  type Environment,
 } from "~/presenters/v3/ConcurrencyPresenter.server";
 import { requireUserId } from "~/services/session.server";
-import { ProjectParamSchema, docsPath, v3BillingPath } from "~/utils/pathBuilder";
+import { docsPath, ProjectParamSchema, v3BillingPath } from "~/utils/pathBuilder";
 import { useCurrentPlan } from "../_app.orgs.$organizationSlug/route";
-import { Feedback } from "~/components/Feedback";
-import { Suspense } from "react";
-import { Await } from "@remix-run/react";
-import { Spinner } from "~/components/primitives/Spinner";
 
 export const loader = async ({ request, params }: LoaderFunctionArgs) => {
   const userId = await requireUserId(request);
@@ -61,15 +50,15 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
 };
 
 export default function Page() {
-  const { environments, tasks, limit } = useTypedLoaderData<typeof loader>();
+  const { environments } = useTypedLoaderData<typeof loader>();
 
   const organization = useOrganization();
   const plan = useCurrentPlan();
 
   return (
     <PageContainer>
       <NavBar>
-        <PageTitle title="Concurrency" />
+        <PageTitle title="Concurrency limits" />
         <PageAccessories>
           <AdminDebugTooltip />
           <LinkButton
@@ -125,14 +114,6 @@ export default function Page() {
               </TableBody>
             </Table>
           </div>
-          <div>
-            <Header2 spacing>Tasks</Header2>
-            <Suspense fallback={<Spinner />}>
-              <Await resolve={tasks} errorElement={<p>Error loading tasks</p>}>
-                {(tasks) => <TaskTable tasks={tasks} />}
-              </Await>
-            </Suspense>
-          </div>
         </div>
       </PageBody>
     </PageContainer>
@@ -155,70 +136,3 @@ function EnvironmentsTable({ environments }: { environments: Environment[] }) {
     </>
   );
 }
-
-function TaskTable({ tasks }: { tasks: Task[] }) {
-  const { filterText, setFilterText, filteredItems } = useTextFilter<Task>({
-    items: tasks,
-    filter: (task, text) => {
-      if (task.identifier.toLowerCase().includes(text.toLowerCase())) {
-        return true;
-      }
-
-      if (task.triggerSource === "SCHEDULED" && "scheduled".includes(text.toLowerCase())) {
-        return true;
-      }
-
-      return false;
-    },
-  });
-
-  return (
-    <>
-      <div className="h-8">
-        <Input
-          placeholder="Search tasks"
-          variant="small"
-          icon="search"
-          fullWidth={true}
-          value={filterText}
-          onChange={(e) => setFilterText(e.target.value)}
-          autoFocus
-        />
-      </div>
-      <Table>
-        <TableHeader>
-          <TableRow>
-            <TableHeaderCell>Task ID</TableHeaderCell>
-            <TableHeaderCell alignment="right">Queued</TableHeaderCell>
-            <TableHeaderCell alignment="right">Running</TableHeaderCell>
-          </TableRow>
-        </TableHeader>
-        <TableBody>
-          {filteredItems.length > 0 ? (
-            filteredItems.map((task) => (
-              <TableRow key={task.identifier}>
-                <TableCell>
-                  <div className="flex items-center gap-2">
-                    <SimpleTooltip
-                      button={<TaskTriggerSourceIcon source={task.triggerSource} />}
-                      content={taskTriggerSourceDescription(task.triggerSource)}
-                    />
-                    <span>{task.identifier}</span>
-                  </div>
-                </TableCell>
-                <TableCell alignment="right">{task.queued}</TableCell>
-                <TableCell alignment="right">{task.concurrency}</TableCell>
-              </TableRow>
-            ))
-          ) : (
-            <TableBlankRow colSpan={3}>
-              <Paragraph variant="small" className="flex items-center justify-center">
-                {tasks.length > 0 ? "No tasks match your filters" : "No tasks"}
-              </Paragraph>
-            </TableBlankRow>
-          )}
-        </TableBody>
-      </Table>
-    </>
-  );
-}