Remove template deprecation warning

BrunoQuaresma · BrunoQuaresma · commit 3c994741e45b · 2023-11-09T18:20:38.000Z
diff --git a/site/src/components/TemplateVersionWarnings/TemplateVersionWarnings.stories.tsx b/site/src/components/TemplateVersionWarnings/TemplateVersionWarnings.stories.tsx
diff --git a/site/src/components/TemplateVersionWarnings/TemplateVersionWarnings.tsx b/site/src/components/TemplateVersionWarnings/TemplateVersionWarnings.tsx
diff --git a/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPageView.tsx b/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPageView.tsx
@@ -9,7 +9,6 @@ import { Loader } from "components/Loader/Loader";
 import { Stack } from "components/Stack/Stack";
 import { TemplateResourcesTable } from "components/TemplateResourcesTable/TemplateResourcesTable";
 import { TemplateStats } from "./TemplateStats";
-import { TemplateVersionWarnings } from "components/TemplateVersionWarnings/TemplateVersionWarnings";
 
 export interface TemplateSummaryPageViewProps {
   resources?: WorkspaceResource[];
@@ -45,7 +44,6 @@ export const TemplateSummaryPageView: FC<TemplateSummaryPageViewProps> = ({
 
   return (
     <Stack spacing={4}>
-      <TemplateVersionWarnings warnings={activeVersion.warnings} />
       <TemplateStats template={template} activeVersion={activeVersion} />
       <TemplateResourcesTable resources={getStartedResources(resources)} />
     </Stack>
diff --git a/site/src/pages/WorkspacePage/Workspace.tsx b/site/src/pages/WorkspacePage/Workspace.tsx
@@ -15,7 +15,6 @@ import {
   PageHeaderTitle,
   PageHeaderSubtitle,
 } from "components/PageHeader/FullWidthPageHeader";
-import { TemplateVersionWarnings } from "components/TemplateVersionWarnings/TemplateVersionWarnings";
 import { ErrorAlert } from "components/Alert/ErrorAlert";
 import { DormantWorkspaceBanner } from "components/WorkspaceDeletion";
 import { Avatar } from "components/Avatar/Avatar";
@@ -55,7 +54,6 @@ export interface WorkspaceProps {
   isRestarting: boolean;
   workspace: TypesGen.Workspace;
   resources?: TypesGen.WorkspaceResource[];
-  templateWarnings?: TypesGen.TemplateVersionWarning[];
   canUpdateWorkspace: boolean;
   updateMessage?: string;
   canRetryDebugMode: boolean;
@@ -106,7 +104,6 @@ export const Workspace: FC<React.PropsWithChildren<WorkspaceProps>> = ({
   template,
   quotaBudget,
   handleBuildRetry,
-  templateWarnings,
   buildLogs,
   onLoadMoreBuilds,
   isLoadingMoreBuilds,
@@ -271,8 +268,6 @@ export const Workspace: FC<React.PropsWithChildren<WorkspaceProps>> = ({
             onDismiss={() => saveLocal("dismissedWorkspace", workspace.id)}
           />
 
-          <TemplateVersionWarnings warnings={templateWarnings} />
-
           {showAlertPendingInQueue && (
             <Alert severity="info">
               <AlertTitle>Workspace build is pending</AlertTitle>
diff --git a/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx b/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx
@@ -63,7 +63,6 @@ export const WorkspaceReadyPage = ({
   const {
     workspace,
     template,
-    templateVersion: currentVersion,
     deploymentValues,
     buildError,
     cancellationError,
@@ -207,7 +206,6 @@ export const WorkspaceReadyPage = ({
         sshPrefix={sshPrefix}
         template={template}
         quotaBudget={quota?.budget}
-        templateWarnings={currentVersion?.warnings}
         buildLogs={
           shouldDisplayBuildLogs && (
             <WorkspaceBuildLogsSection logs={buildLogs} />
diff --git a/site/src/xServices/workspace/workspaceXService.ts b/site/src/xServices/workspace/workspaceXService.ts
@@ -18,7 +18,6 @@ export interface WorkspaceContext {
   workspace?: TypesGen.Workspace;
   template?: TypesGen.Template;
   permissions?: Permissions;
-  templateVersion?: TypesGen.TemplateVersion;
   deploymentValues?: TypesGen.DeploymentValues;
   build?: TypesGen.WorkspaceBuild;
   // Builds
@@ -436,7 +435,6 @@ export const workspaceMachine = createMachine(
       assignInitialData: assign({
         workspace: (_, event) => event.data.workspace,
         template: (_, event) => event.data.template,
-        templateVersion: (_, event) => event.data.templateVersion,
         permissions: (_, event) => event.data.permissions as Permissions,
         deploymentValues: (_, event) => event.data.deploymentValues,
       }),
@@ -682,12 +680,9 @@ async function loadInitialWorkspaceData({
     },
   );
   const template = await API.getTemplateByName(orgId, workspace.template_name);
-  const [templateVersion, permissions] = await Promise.all([
-    API.getTemplateVersion(template.active_version_id),
-    API.checkAuthorization({
-      checks: permissionsToCheck(workspace, template),
-    }),
-  ]);
+  const permissions = await API.checkAuthorization({
+    checks: permissionsToCheck(workspace, template),
+  });
 
   const canViewDeploymentValues = Boolean(
     (permissions as Permissions)?.viewDeploymentValues,
@@ -698,7 +693,6 @@ async function loadInitialWorkspaceData({
   return {
     workspace,
     template,
-    templateVersion,
     permissions,
     deploymentValues,
   };
