Merge remote-tracking branch 'origin/main' into fix/wait-with-suspend

Author: nicktrn

apps/webapp/app/components/BlankStatePanels.tsx

@@ -419,17 +419,15 @@ export function NoWaitpointTokens() {
       iconClassName="text-sky-500"
       panelClassName="max-w-md"
       accessory={
-        <LinkButton to={docsPath("wait")} variant="docs/small" LeadingIcon={BookOpenIcon}>
+        <LinkButton to={docsPath("wait-for-token")} variant="docs/small" LeadingIcon={BookOpenIcon}>
           Waitpoint docs
         </LinkButton>
       }
     >
       <Paragraph spacing variant="small">
-        Waitpoint tokens are used to pause runs until you complete the token so the run can
-        continue.
-      </Paragraph>
-      <Paragraph spacing variant="small">
-        You can build approval workflows using them, as well as other use cases.
+        Waitpoint tokens pause task runs until you complete the token. They're commonly used for
+        approval workflows and other scenarios where you need to wait for external confirmation,
+        such as human-in-the-loop processes.
       </Paragraph>
     </InfoPanel>
   );

apps/webapp/app/components/primitives/Avatar.tsx

@@ -135,7 +135,7 @@ function AvatarLetters({
 
   return (
     <span
-      className="grid place-items-center overflow-hidden text-charcoal-750"
+      className="grid shrink-0 place-items-center overflow-hidden text-charcoal-750"
       style={styleFromSize(size)}
     >
       {/* This is the square container */}

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

@@ -46,14 +46,14 @@ export class QueueListPresenter extends BasePresenter {
             code: "engine-version",
             totalQueues: 1,
           };
-        } else {
-          return {
-            success: false as const,
-            code: "engine-version",
-            totalQueues,
-          };
         }
       }
+
+      return {
+        success: false as const,
+        code: "engine-version",
+        totalQueues,
+      };
     }
 
     return {

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

@@ -439,14 +439,12 @@ export default function Page() {
             </div>
           ) : (
             <div className="grid place-items-center py-6 text-text-dimmed">
-              {code === "engine-version" ? (
-                totalQueues === 0 ? (
-                  <div className="pt-12">
-                    <QueuesHasNoTasks />
-                  </div>
-                ) : (
-                  <EngineVersionUpgradeCallout />
-                )
+              {totalQueues === 0 ? (
+                <div className="pt-12">
+                  <QueuesHasNoTasks />
+                </div>
+              ) : code === "engine-version" ? (
+                <EngineVersionUpgradeCallout />
               ) : (
                 <Callout variant="error">Something went wrong</Callout>
               )}
@@ -628,7 +626,11 @@ function EngineVersionUpgradeCallout() {
     <div className="mt-4 flex max-w-lg flex-col gap-4 rounded-sm border border-grid-bright bg-background-bright px-4">
       <div className="flex items-center justify-between gap-2 border-b border-grid-dimmed py-4">
         <h4 className="text-base text-text-bright">New queues table</h4>
-        <LinkButton LeadingIcon={BookOpenIcon} to={docsPath("v4-upgrade")} variant={"docs/small"}>
+        <LinkButton
+          LeadingIcon={BookOpenIcon}
+          to={docsPath("upgrade-to-v4")}
+          variant={"docs/small"}
+        >
           Upgrade guide
         </LinkButton>
       </div>

docs/docs.json

@@ -40,7 +40,7 @@
               "errors-retrying",
               {
                 "group": "Wait",
-                "pages": ["wait", "wait-for", "wait-until", "wait-for-event", "wait-for-request"]
+                "pages": ["wait", "wait-for", "wait-until", "wait-for-token"]
               },
               "queue-concurrency",
               "versioning",

docs/upgrade-to-v4.mdx

@@ -0,0 +1,8 @@
+---
+title: "Upgrading to v4"
+description: "How to upgrade to v4."
+---
+
+<Note>
+  Upgrading to v4 docs are coming soon.
+</Note>

docs/wait-for-event.mdx

@@ -0,0 +1,10 @@
+---
+title: "Wait for token"
+description: "Wait until a token is completed."
+---
+
+import ComingSoon from "/snippets/coming-soon-generic.mdx"
+
+Waitpoint tokens pause task runs until you complete the token. They're commonly used for approval workflows and other scenarios where you need to wait for external confirmation, such as human-in-the-loop processes.
+
+<ComingSoon />

docs/wait-for-request.mdx

@@ -10,9 +10,8 @@ Waiting allows you to write complex tasks as a set of async code, without having
 
 <PausedExecutionFree />
 
-| Function                                  | What it does                                                                              |
-| ----------------------------------------- | ----------------------------------------------------------------------------------------- |
+| Function                               | What it does                                                                              |
+| :--------------------------------------| :---------------------------------------------------------------------------------------- |
 | [wait.for()](/wait-for)                | Waits for a specific period of time, e.g. 1 day.                                          |
 | [wait.until()](/wait-until)            | Waits until the provided `Date`.                                                          |
-| [wait.forRequest()](/wait-for-request) | Waits until a matching HTTP request is received, and gives you the data to continue with. |
-| [waitForEvent()](/wait-for-event)      | Waits for a matching event, like in the example above.                                    |
+| [wait.forToken()](/wait-for-token)     | Pauses task runs until a token is completed.                                              |