Waitpoint token filtering

Author: matt-aitken

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

@@ -46,6 +46,7 @@ type Result =
         previous: string | undefined;
       };
       hasFilters: boolean;
+      hasAnyTokens: boolean;
       filters: WaitpointSearchParams;
     }
   | {
@@ -58,6 +59,7 @@ type Result =
         previous: undefined;
       };
       hasFilters: false;
+      hasAnyTokens: false;
       filters: undefined;
     };
 
@@ -87,6 +89,7 @@ export class WaitpointTokenListPresenter extends BasePresenter {
           previous: undefined,
         },
         hasFilters: false,
+        hasAnyTokens: false,
         filters: undefined,
       };
     }
@@ -242,6 +245,20 @@ export class WaitpointTokenListPresenter extends BasePresenter {
         ? tokens.slice(1, pageSize + 1)
         : tokens.slice(0, pageSize);
 
+    let hasAnyTokens = tokensToReturn.length > 0;
+    if (!hasAnyTokens) {
+      const firstToken = await this._replica.waitpoint.findFirst({
+        where: {
+          environmentId: environment.id,
+          type: "MANUAL",
+        },
+      });
+
+      if (firstToken) {
+        hasAnyTokens = true;
+      }
+    }
+
     return {
       success: true,
       tokens: tokensToReturn.map((token) => ({
@@ -262,6 +279,7 @@ export class WaitpointTokenListPresenter extends BasePresenter {
         previous,
       },
       hasFilters,
+      hasAnyTokens,
       filters: {
         id,
         statuses: statuses?.length ? statuses : undefined,

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

@@ -1,4 +1,3 @@
-import upgradeForWaitpointsPath from "~/assets/images/waitpoints-dashboard.png";
 import { BookOpenIcon } from "@heroicons/react/20/solid";
 import { Outlet, useParams, type MetaFunction } from "@remix-run/react";
 import { type LoaderFunctionArgs } from "@remix-run/server-runtime";
@@ -8,6 +7,7 @@ import { NoWaitpointTokens } from "~/components/BlankStatePanels";
 import { MainCenteredContainer, PageBody, PageContainer } from "~/components/layout/AppLayout";
 import { ListPagination } from "~/components/ListPagination";
 import { LinkButton } from "~/components/primitives/Buttons";
+import { CopyableText } from "~/components/primitives/CopyableText";
 import { DateTime } from "~/components/primitives/DateTime";
 import { NavBar, PageAccessories, PageTitle } from "~/components/primitives/PageHeader";
 import { Paragraph } from "~/components/primitives/Paragraph";
@@ -39,8 +39,6 @@ import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
 import { WaitpointTokenListPresenter } from "~/presenters/v3/WaitpointTokenListPresenter.server";
 import { requireUserId } from "~/services/session.server";
 import { docsPath, EnvironmentParamSchema, v3WaitpointTokenPath } from "~/utils/pathBuilder";
-import { determineEngineVersion } from "~/v3/engineVersion.server";
-import { CopyableText } from "~/components/primitives/CopyableText";
 
 export const meta: MetaFunction = () => {
   return [
@@ -103,7 +101,8 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
 };
 
 export default function Page() {
-  const { success, tokens, pagination, hasFilters, filters } = useTypedLoaderData<typeof loader>();
+  const { success, tokens, pagination, hasFilters, hasAnyTokens, filters } =
+    useTypedLoaderData<typeof loader>();
 
   const organization = useOrganization();
   const project = useProject();
@@ -124,7 +123,7 @@ export default function Page() {
         </PageAccessories>
       </NavBar>
       <PageBody scrollable={false}>
-        {!hasFilters && tokens.length === 0 ? (
+        {!hasAnyTokens ? (
           <MainCenteredContainer className="max-w-md">
             <NoWaitpointTokens />
           </MainCenteredContainer>