wip

Author: arcoraven

apps/dashboard/src/@3rdweb-sdk/react/cache-keys.ts

@@ -111,7 +111,7 @@ export const engineKeys = {
     ] as const,
   health: (instance: string) =>
     [...engineKeys.all, instance, "health"] as const,
-  latestVersion: () => [...engineKeys.all, "latestVersion"] as const,
+  deployment: () => [...engineKeys.all, "deployment"] as const,
   systemMetrics: (engineId: string) =>
     [...engineKeys.all, engineId, "systemMetrics"] as const,
   queueMetrics: (engineId: string) =>

apps/dashboard/src/@3rdweb-sdk/react/hooks/useEngine.ts

@@ -190,32 +190,46 @@ export function useEngineQueueMetrics(
   });
 }
 
-export function useEngineLatestVersion() {
+interface GetDeploymentInput {
+  teamId: string;
+  deploymentId: string;
+}
+
+export function useEngineGetDeployment(input: GetDeploymentInput) {
   return useQuery({
-    queryKey: engineKeys.latestVersion(),
+    queryKey: engineKeys.deployment(),
     queryFn: async () => {
-      const res = await fetch(`${THIRDWEB_API_HOST}/v1/engine/latest-version`, {
-        method: "GET",
-      });
+      const res = await fetch(
+        `${THIRDWEB_API_HOST}/v1/teams/${input.teamId}/engine/deployments/${input.deploymentId}`,
+        {
+          method: "GET",
+        },
+      );
       if (!res.ok) {
         throw new Error(`Unexpected status ${res.status}: ${await res.text()}`);
       }
       const json = await res.json();
-      return json.data.version as string;
+      return json.data as {
+        serverVersions: {
+          latest: string;
+          recent: string[];
+        };
+      };
     },
   });
 }
 
-interface UpdateVersionInput {
+interface UpdateDeploymentInput {
+  teamId: string;
   deploymentId: string;
   serverVersion: string;
 }
 
-export function useEngineUpdateServerVersion() {
+export function useEngineUpdateDeployment() {
   return useMutation({
-    mutationFn: async (input: UpdateVersionInput) => {
+    mutationFn: async (input: UpdateDeploymentInput) => {
       const res = await fetch(
-        `${THIRDWEB_API_HOST}/v2/engine/deployments/${input.deploymentId}/infrastructure`,
+        `${THIRDWEB_API_HOST}/v1/teams/${input.teamId}/engine/deployments/${input.deploymentId}`,
         {
           method: "PUT",
           headers: {
@@ -261,24 +275,26 @@ export function useEngineRemoveFromDashboard() {
   });
 }
 
-export interface DeleteCloudHostedInput {
+export interface DeleteDeploymentInput {
+  teamId: string;
   deploymentId: string;
   reason: "USING_SELF_HOSTED" | "TOO_EXPENSIVE" | "MISSING_FEATURES" | "OTHER";
   feedback: string;
 }
 
-export function useEngineDeleteCloudHosted() {
+export function useEngineDeleteDeployment() {
   const { user } = useLoggedInUser();
   const queryClient = useQueryClient();
 
   return useMutation({
     mutationFn: async ({
+      teamId,
       deploymentId,
       reason,
       feedback,
-    }: DeleteCloudHostedInput) => {
+    }: DeleteDeploymentInput) => {
       const res = await fetch(
-        `${THIRDWEB_API_HOST}/v2/engine/deployments/${deploymentId}/infrastructure/delete`,
+        `${THIRDWEB_API_HOST}/v1/teams/${teamId}/engine/deployments/${deploymentId}/delete`,
         {
           method: "POST",
           headers: {

apps/dashboard/src/components/engine/badges/version.tsx

@@ -2,9 +2,9 @@ import { Button } from "@/components/ui/button";
 import { ToolTipLabel } from "@/components/ui/tooltip";
 import {
   type EngineInstance,
-  useEngineLatestVersion,
+  useEngineGetDeployment,
   useEngineSystemHealth,
-  useEngineUpdateServerVersion,
+  useEngineUpdateDeployment,
 } from "@3rdweb-sdk/react/hooks/useEngine";
 import { CircleArrowDownIcon, CloudDownloadIcon } from "lucide-react";
 import { useState } from "react";
@@ -28,7 +28,7 @@ export const EngineVersionBadge = ({
   instance: EngineInstance;
 }) => {
   const healthQuery = useEngineSystemHealth(instance.url);
-  const latestVersionQuery = useEngineLatestVersion();
+  const latestVersionQuery = useEngineGetDeployment();
   const [isModalOpen, setModalOpen] = useState(false);
 
   const currentVersion = healthQuery.data?.engineVersion ?? "...";
@@ -86,7 +86,9 @@ const UpdateVersionModal = (props: {
   instance: EngineInstance;
 }) => {
   const { open, onOpenChange, latestVersion, instance } = props;
-  const updateEngineServerMutation = useEngineUpdateServerVersion();
+  const updateDeploymentMutation = useEngineUpdateDeployment();
+
+  const teamId = "DEBUG - UNIMPLEMENTED";
 
   if (!instance.deploymentId) {
     // For self-hosted, show a prompt to the Github release page.
@@ -123,7 +125,8 @@ const UpdateVersionModal = (props: {
     invariant(instance.deploymentId, "Engine is missing deploymentId.");
 
     try {
-      const promise = updateEngineServerMutation.mutateAsync({
+      const promise = updateDeploymentMutation.mutateAsync({
+        teamId,
         deploymentId: instance.deploymentId,
         serverVersion: latestVersion,
       });
@@ -166,7 +169,7 @@ const UpdateVersionModal = (props: {
             variant="primary"
             className="gap-2"
           >
-            {updateEngineServerMutation.isPending ? (
+            {updateDeploymentMutation.isPending ? (
               <Spinner className="size-4" />
             ) : (
               <CloudDownloadIcon className="size-4" />

apps/dashboard/src/components/engine/engine-instances-table.tsx

@@ -14,10 +14,10 @@ import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
 import { ToolTipLabel } from "@/components/ui/tooltip";
 import {
-  type DeleteCloudHostedInput,
+  type DeleteDeploymentInput,
   type EditEngineInstanceInput,
   type EngineInstance,
-  useEngineDeleteCloudHosted,
+  useEngineDeleteDeployment,
   useEngineEditInstance,
   type useEngineInstances,
   useEngineRemoveFromDashboard,
@@ -383,17 +383,20 @@ function DeleteSubscriptionModalContent(props: {
     "Instance must have a deploymentId to be cancelled.",
   );
 
-  const deleteCloudHosted = useEngineDeleteCloudHosted();
+  const teamId = "DEBUG - UNIMPLEMENTED";
+
+  const deleteDeploymentMutation = useEngineDeleteDeployment();
   const [ackDeletion, setAckDeletion] = useState(false);
-  const form = useForm<DeleteCloudHostedInput>({
+  const form = useForm<DeleteDeploymentInput>({
     defaultValues: {
+      teamId,
       deploymentId: instance.deploymentId,
     },
     reValidateMode: "onChange",
   });
 
-  const onSubmit = (data: DeleteCloudHostedInput) => {
-    deleteCloudHosted.mutate(data, {
+  const onSubmit = (data: DeleteDeploymentInput) => {
+    deleteDeploymentMutation.mutate(data, {
       onSuccess: () => {
         toast.success("Deleting Engine. Please check again in a few minutes.", {
           dismissible: true,
@@ -502,12 +505,14 @@ function DeleteSubscriptionModalContent(props: {
             variant="destructive"
             disabled={
               !ackDeletion ||
-              deleteCloudHosted.isPending ||
+              deleteDeploymentMutation.isPending ||
               !form.formState.isValid
             }
             className="gap-2"
           >
-            {deleteCloudHosted.isPending && <Spinner className="size-4" />}
+            {deleteDeploymentMutation.isPending && (
+              <Spinner className="size-4" />
+            )}
             Permanently Delete Engine
           </Button>
         </DialogFooter>