Purchasing concurrency and quota emails working

Author: matt-aitken

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

@@ -117,7 +117,12 @@ export class ManageConcurrencyPresenter extends BasePresenter {
       extraAllocatedConcurrency: extraAllocated,
       extraUnallocatedConcurrency: extraConcurrency - extraAllocated,
       maxQuota: currentPlan.v3Subscription.addOns?.concurrentRuns?.quota ?? 0,
-      environments: sortEnvironments(projectEnvironments).reverse(),
+      environments: sortEnvironments(projectEnvironments, [
+        "PRODUCTION",
+        "STAGING",
+        "PREVIEW",
+        "DEVELOPMENT",
+      ]),
       concurrencyPricing: plans.addOnPricing.concurrency,
     };
   }

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

@@ -146,7 +146,13 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
     return json(submission);
   }
 
-  return redirectWithSuccessMessage(redirectPath, request, "Concurrency updated successfully");
+  return redirectWithSuccessMessage(
+    `${redirectPath}?success=true`,
+    request,
+    submission.value.action === "purchase"
+      ? "Concurrency updated successfully"
+      : "Requested extra concurrency, we'll get back to you soon."
+  );
 };
 
 export default function Page() {
@@ -283,13 +289,13 @@ function Upgradable({
                     <EnvironmentCombo environment={environment} />
                   </TableCell>
                   <TableCell alignment="right">{environment.planConcurrencyLimit}</TableCell>
-                  <TableCell alignment="right" className="text-text-bright">
+                  <TableCell alignment="right">
                     <div className="flex items-center justify-end">
                       <Input
                         type="number"
-                        variant="secondary-small"
+                        variant="outline/small"
                         className="text-right"
-                        containerClassName="w-16 bg-transparent"
+                        containerClassName="w-16"
                         fullWidth={false}
                         defaultValue={Math.max(
                           0,
@@ -381,7 +387,6 @@ function PurchaseConcurrencyModal({
 
   const [amountValue, setAmountValue] = useState(0);
   const navigation = useNavigation();
-  console.log(navigation);
   const isLoading = navigation.state !== "idle" && navigation.formMethod === "POST";
 
   const maximum = maxQuota - extraConcurrency;
@@ -422,10 +427,13 @@ function PurchaseConcurrencyModal({
             </Fieldset>
             {isAboveMaxQuota ? (
               <div className="flex flex-col pb-3">
+                <Paragraph variant="small" className="text-warning" spacing>
+                  Currently you can only have up to {maxQuota} extra concurrency. This request for{" "}
+                  {formatNumber(amountValue)} takes you to{" "}
+                  {formatNumber(extraConcurrency + amountValue)} extra concurrency.
+                </Paragraph>
                 <Paragraph variant="small" className="text-warning">
-                  Your Org’s total would be {formatNumber(extraConcurrency + amountValue)}{" "}
-                  concurrency. Send us a request to purchase {formatNumber(amountValue - maximum)}{" "}
-                  more, or reduce the amount to buy more today.
+                  Send a request below to lift your current limit. We'll get back to you soon.
                 </Paragraph>
               </div>
             ) : (
@@ -466,7 +474,7 @@ function PurchaseConcurrencyModal({
                     type="submit"
                     disabled={isLoading}
                   >
-                    {`Send request for ${formatNumber(amountValue - maximum)}`}
+                    {`Send request for ${formatNumber(extraConcurrency + amountValue)}`}
                   </Button>
                 </>
               ) : (

apps/webapp/app/utils/environmentSort.ts

@@ -12,10 +12,14 @@ type SortType = {
   userName?: string | null;
 };
 
-export function sortEnvironments<T extends SortType>(environments: T[]): T[] {
+export function sortEnvironments<T extends SortType>(
+  environments: T[],
+  sortOrder?: RuntimeEnvironmentType[]
+): T[] {
+  const order = sortOrder ?? environmentSortOrder;
   return environments.sort((a, b) => {
-    const aIndex = environmentSortOrder.indexOf(a.type);
-    const bIndex = environmentSortOrder.indexOf(b.type);
+    const aIndex = order.indexOf(a.type);
+    const bIndex = order.indexOf(b.type);
 
     const difference = aIndex - bIndex;
 

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

@@ -3,6 +3,8 @@ import { BaseService } from "./baseService.server";
 import { tryCatch } from "@trigger.dev/core";
 import { setConcurrencyAddOn } from "~/services/platform.v3.server";
 import assertNever from "assert-never";
+import { sendToPlain } from "~/utils/plain.server";
+import { uiComponent } from "@team-plain/typescript-sdk";
 
 type Input = {
   userId: string;
@@ -80,11 +82,58 @@ export class SetConcurrencyAddOnService extends BaseService {
         }
       }
       case "quota-increase": {
+        const user = await this._replica.user.findFirst({
+          where: { id: userId },
+        });
+
+        if (!user) {
+          return {
+            success: false,
+            error: "No matching user found.",
+          };
+        }
+
+        const organization = await this._replica.organization.findFirst({
+          select: {
+            title: true,
+          },
+          where: { id: organizationId },
+        });
+
+        const [error, result] = await tryCatch(
+          sendToPlain({
+            userId,
+            email: user.email,
+            name: user.name ?? user.displayName ?? user.email,
+            title: `Concurrency quota request: ${totalExtraConcurrency}`,
+            components: [
+              uiComponent.text({
+                text: `Org: ${organization?.title} (${organizationId})`,
+              }),
+              uiComponent.divider({ spacingSize: "M" }),
+              uiComponent.text({
+                text: `Total concurrency (set this): ${totalExtraConcurrency}`,
+              }),
+              uiComponent.text({
+                text: `Current extra concurrency: ${currentConcurrency}`,
+              }),
+              uiComponent.text({
+                text: `Amount requested: ${amount}`,
+              }),
+            ],
+          })
+        );
+
+        if (error) {
+          return {
+            success: false,
+            error: error.message,
+          };
+        }
+
         return {
-          success: false,
-          error: "Quota increase is not supported yet.",
+          success: true,
         };
-        break;
       }
       default: {
         assertNever(action);