Move deployment values fetching

BrunoQuaresma · BrunoQuaresma · commit 878f99594c91 · 2023-11-09T18:30:35.000Z
diff --git a/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx b/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx
@@ -36,6 +36,7 @@ import { useWorkspaceBuildLogs } from "hooks/useWorkspaceBuildLogs";
 import { decreaseDeadline, increaseDeadline } from "api/queries/workspaces";
 import { getErrorMessage } from "api/errors";
 import { displaySuccess, displayError } from "components/GlobalSnackbar/utils";
+import { deploymentConfig } from "api/queries/deployment";
 
 interface WorkspaceReadyPageProps {
   workspaceState: StateFrom<typeof workspaceMachine>;
@@ -63,7 +64,6 @@ export const WorkspaceReadyPage = ({
   const {
     workspace,
     template,
-    deploymentValues,
     buildError,
     cancellationError,
     sshPrefix,
@@ -76,9 +76,13 @@ export const WorkspaceReadyPage = ({
   const deadline = getDeadline(workspace);
   const canUpdateWorkspace = Boolean(permissions?.updateWorkspace);
   const canUpdateTemplate = Boolean(permissions?.updateTemplate);
-  const canRetryDebugMode =
-    Boolean(permissions?.viewDeploymentValues) &&
-    Boolean(deploymentValues?.enable_terraform_debug_mode);
+  const { data: deploymentValues } = useQuery({
+    ...deploymentConfig(),
+    enabled: permissions?.viewDeploymentValues,
+  });
+  const canRetryDebugMode = Boolean(
+    deploymentValues?.config.enable_terraform_debug_mode,
+  );
   const favicon = getFaviconByStatus(workspace.latest_build);
   const navigate = useNavigate();
   const [changeVersionDialogOpen, setChangeVersionDialogOpen] = useState(false);
diff --git a/site/src/xServices/workspace/workspaceXService.ts b/site/src/xServices/workspace/workspaceXService.ts
@@ -11,14 +11,12 @@ export interface WorkspaceContext {
   orgId: string;
   username: string;
   workspaceName: string;
-
   error?: unknown;
   // our server side events instance
   eventSource?: EventSource;
   workspace?: TypesGen.Workspace;
   template?: TypesGen.Template;
   permissions?: Permissions;
-  deploymentValues?: TypesGen.DeploymentValues;
   build?: TypesGen.WorkspaceBuild;
   // Builds
   builds?: TypesGen.WorkspaceBuild[];
@@ -436,7 +434,6 @@ export const workspaceMachine = createMachine(
         workspace: (_, event) => event.data.workspace,
         template: (_, event) => event.data.template,
         permissions: (_, event) => event.data.permissions as Permissions,
-        deploymentValues: (_, event) => event.data.deploymentValues,
       }),
       assignError: assign({
         error: (_, event) => event.data,
@@ -684,16 +681,9 @@ async function loadInitialWorkspaceData({
     checks: permissionsToCheck(workspace, template),
   });
 
-  const canViewDeploymentValues = Boolean(
-    (permissions as Permissions)?.viewDeploymentValues,
-  );
-  const deploymentValues = canViewDeploymentValues
-    ? (await API.getDeploymentConfig())?.config
-    : undefined;
   return {
     workspace,
     template,
     permissions,
-    deploymentValues,
   };
 }
