coder · BrunoQuaresma · Sep 12, 2023 · Sep 11, 2023 · Sep 11, 2023 · Sep 12, 2023
diff --git a/site/src/api/queries/templates.ts b/site/src/api/queries/templates.ts
@@ -0,0 +1,17 @@
+import * as API from "api/api";
+
+const getTemplatesQueryKey = (orgId: string) => [orgId, "templates"];
+
+export const templates = (orgId: string) => {
+  return {
+    queryKey: getTemplatesQueryKey(orgId),
+    queryFn: () => API.getTemplates(orgId),
+  };
+};
+
+export const templateExamples = (orgId: string) => {
+  return {
+    queryKey: [...getTemplatesQueryKey(orgId), "examples"],
+    queryFn: () => API.getTemplateExamples(orgId),
+  };
+};
diff --git a/site/src/pages/TemplatesPage/EmptyTemplates.tsx b/site/src/pages/TemplatesPage/EmptyTemplates.tsx
@@ -10,7 +10,6 @@ import { FC } from "react";
 import { useTranslation } from "react-i18next";
 import { Link as RouterLink } from "react-router-dom";
 import { docs } from "utils/docs";
-import { Permissions } from "xServices/auth/authXService";
 
 // Those are from https://github.com/coder/coder/tree/main/examples/templates
 const featuredExampleIds = [
@@ -38,14 +37,14 @@ const findFeaturedExamples = (examples: TemplateExample[]) => {
 };
 
 export const EmptyTemplates: FC<{
-  permissions: Permissions;
+  canCreateTemplates: boolean;
   examples: TemplateExample[];
-}> = ({ permissions, examples }) => {
+}> = ({ canCreateTemplates, examples }) => {
   const styles = useStyles();
   const { t } = useTranslation("templatesPage");
   const featuredExamples = findFeaturedExamples(examples);
 
-  if (permissions.createTemplates) {
+  if (canCreateTemplates) {
     return (
       <TableEmpty
         message={t("empty.message")}

diff --git a/site/src/pages/TemplatesPage/TemplatesPage.tsx b/site/src/pages/TemplatesPage/TemplatesPage.tsx
@@ -1,28 +1,33 @@
-import { useMachine } from "@xstate/react";
 import { useOrganizationId } from "hooks/useOrganizationId";
 import { usePermissions } from "hooks/usePermissions";
 import { FC } from "react";
 import { Helmet } from "react-helmet-async";
 import { pageTitle } from "../../utils/page";
-import { templatesMachine } from "../../xServices/templates/templatesXService";
 import { TemplatesPageView } from "./TemplatesPageView";
+import { templateExamples, templates } from "api/queries/templates";
+import { useQuery } from "@tanstack/react-query";
 
 export const TemplatesPage: FC = () => {
   const organizationId = useOrganizationId();
   const permissions = usePermissions();
-  const [templatesState] = useMachine(templatesMachine, {
-    context: {
-      organizationId,
-      permissions,
-    },
+  const templatesQuery = useQuery(templates(organizationId));
+  const examplesQuery = useQuery({
+    ...templateExamples(organizationId),
+    enabled: permissions.createTemplates,
   });
+  const error = templatesQuery.error || examplesQuery.error;
 
   return (
     <>
       <Helmet>
         <title>{pageTitle("Templates")}</title>
       </Helmet>
-      <TemplatesPageView context={templatesState.context} />
+      <TemplatesPageView
+        error={error}
+        canCreateTemplates={permissions.createTemplates}
+        examples={examplesQuery.data}
+        templates={templatesQuery.data}
+      />
     </>
   );
 };

diff --git a/site/src/pages/TemplatesPage/TemplatesPageView.stories.tsx b/site/src/pages/TemplatesPage/TemplatesPageView.stories.tsx
@@ -1,7 +1,5 @@
 import {
   mockApiError,
-  MockOrganization,
-  MockPermissions,
   MockTemplate,
   MockTemplateExample,
   MockTemplateExample2,
@@ -19,32 +17,29 @@ type Story = StoryObj<typeof TemplatesPageView>;
 
 export const WithTemplates: Story = {
   args: {
-    context: {
-      organizationId: MockOrganization.id,
-      permissions: MockPermissions,
-      error: undefined,
-      templates: [
-        MockTemplate,
-        {
-          ...MockTemplate,
-          active_user_count: -1,
-          description: "🚀 Some new template that has no activity data",
-          icon: "/icon/goland.svg",
-        },
-        {
-          ...MockTemplate,
-          active_user_count: 150,
-          description: "😮 Wow, this one has a bunch of usage!",
-          icon: "",
-        },
-        {
-          ...MockTemplate,
-          description:
-            "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. ",
-        },
-      ],
-      examples: [],
-    },
+    canCreateTemplates: true,
+    error: undefined,
+    templates: [
+      MockTemplate,
+      {
+        ...MockTemplate,
+        active_user_count: -1,
+        description: "🚀 Some new template that has no activity data",
+        icon: "/icon/goland.svg",
+      },
+      {
+        ...MockTemplate,
+        active_user_count: 150,
+        description: "😮 Wow, this one has a bunch of usage!",
+        icon: "",
+      },
+      {
+        ...MockTemplate,
+        description:
+          "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. ",
+      },
+    ],
+    examples: [],
   },
 };
 
@@ -59,44 +54,29 @@ export const WithTemplatesSmallViewPort: Story = {
 
 export const EmptyCanCreate: Story = {
   args: {
-    context: {
-      organizationId: MockOrganization.id,
-      permissions: MockPermissions,
-      error: undefined,
-      templates: [],
-      examples: [MockTemplateExample, MockTemplateExample2],
-    },
+    canCreateTemplates: true,
+    error: undefined,
+    templates: [],
+    examples: [MockTemplateExample, MockTemplateExample2],
   },
 };
 
 export const EmptyCannotCreate: Story = {
   args: {
-    context: {
-      organizationId: MockOrganization.id,
-      permissions: {
-        ...MockPermissions,
-        createTemplates: false,
-      },
-      error: undefined,
-      templates: [],
-      examples: [MockTemplateExample, MockTemplateExample2],
-    },
+    error: undefined,
+    templates: [],
+    examples: [MockTemplateExample, MockTemplateExample2],
+    canCreateTemplates: false,
   },
 };
 
 export const Error: Story = {
   args: {
-    context: {
-      organizationId: MockOrganization.id,
-      permissions: {
-        ...MockPermissions,
-        createTemplates: false,
-      },
-      error: mockApiError({
-        message: "Something went wrong fetching templates.",
-      }),
-      templates: undefined,
-      examples: undefined,
-    },
+    error: mockApiError({
+      message: "Something went wrong fetching templates.",
+    }),
+    templates: undefined,
+    examples: undefined,
+    canCreateTemplates: false,
   },
 };
diff --git a/site/src/pages/TemplatesPage/TemplatesPageView.tsx b/site/src/pages/TemplatesPage/TemplatesPageView.tsx
@@ -16,18 +16,18 @@ import {
   formatTemplateBuildTime,
   formatTemplateActiveDevelopers,
 } from "utils/templates";
-import { AvatarData } from "../../components/AvatarData/AvatarData";
-import { Margins } from "../../components/Margins/Margins";
+import { AvatarData } from "components/AvatarData/AvatarData";
+import { Margins } from "components/Margins/Margins";
 import {
   PageHeader,
   PageHeaderSubtitle,
   PageHeaderTitle,
-} from "../../components/PageHeader/PageHeader";
-import { Stack } from "../../components/Stack/Stack";
+} from "components/PageHeader/PageHeader";
+import { Stack } from "components/Stack/Stack";
 import {
   TableLoaderSkeleton,
   TableRowSkeleton,
-} from "../../components/TableLoader/TableLoader";
+} from "components/TableLoader/TableLoader";
 import {
   HelpTooltip,
   HelpTooltipLink,
@@ -36,9 +36,8 @@ import {
   HelpTooltipTitle,
 } from "components/HelpTooltip/HelpTooltip";
 import { EmptyTemplates } from "./EmptyTemplates";
-import { TemplatesContext } from "xServices/templates/templatesXService";
 import { useClickableTableRow } from "hooks/useClickableTableRow";
-import { Template } from "api/typesGenerated";
+import { Template, TemplateExample } from "api/typesGenerated";
 import { combineClasses } from "utils/combineClasses";
 import { colors } from "theme/colors";
 import ArrowForwardOutlined from "@mui/icons-material/ArrowForwardOutlined";
@@ -141,21 +140,26 @@ const TemplateRow: FC<{ template: Template }> = ({ template }) => {
 };
 
 export interface TemplatesPageViewProps {
-  context: TemplatesContext;
+  error?: unknown;
+  examples: TemplateExample[] | undefined;
+  templates: Template[] | undefined;
+  canCreateTemplates: boolean;
 }
 
-export const TemplatesPageView: FC<
-  React.PropsWithChildren<TemplatesPageViewProps>
-> = ({ context }) => {
-  const { templates, error, examples, permissions } = context;
+export const TemplatesPageView: FC<TemplatesPageViewProps> = ({
+  templates,
+  error,
+  examples,
+  canCreateTemplates,
+}) => {
   const isLoading = !templates;
   const isEmpty = Boolean(templates && templates.length === 0);
 
   return (
     <Margins>
       <PageHeader
         actions={
-          <Maybe condition={permissions.createTemplates}>
+          <Maybe condition={canCreateTemplates}>
             <Button component={RouterLink} to="/starter-templates">
               Starter Templates
             </Button>
@@ -208,7 +212,7 @@ export const TemplatesPageView: FC<
                 <ChooseOne>
                   <Cond condition={isEmpty}>
                     <EmptyTemplates
-                      permissions={permissions}
+                      canCreateTemplates={canCreateTemplates}
                       examples={examples ?? []}
                     />
                   </Cond>

diff --git a/site/src/xServices/templates/templatesXService.ts b/site/src/xServices/templates/templatesXService.ts