Merge remote-tracking branch 'origin/main' into stevenmasley/suspended_users

Emyrk · Emyrk · commit 43dece2e3d57 · 2022-05-27T10:59:07.000-05:00
diff --git a/README.md b/README.md
@@ -10,7 +10,8 @@ Follow](https://img.shields.io/twitter/follow/CoderHQ?label=%40CoderHQ&style=soc
 
 Coder creates remote development machines so you can develop your code from anywhere.
 
-**Coder is in an alpha state.** But, any serious bugs are P1 for us so please report them.
+> **Note**:
+> Coder is in an alpha state. But, any serious bugs are P1 for us so please report them.
 
 <p align="center">
   <img src="./docs/images/hero-image.png">
diff --git a/site/package.json b/site/package.json
@@ -38,6 +38,7 @@
     "cronstrue": "2.5.0",
     "dayjs": "1.11.2",
     "formik": "2.2.9",
+    "front-matter": "4.0.2",
     "history": "5.3.0",
     "react": "17.0.2",
     "react-dom": "17.0.2",
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -219,7 +219,7 @@ export const updateProfile = async (
 }
 
 export const suspendUser = async (userId: TypesGen.User["id"]): Promise<TypesGen.User> => {
-  const response = await axios.put<TypesGen.User>(`/api/v2/users/${userId}/suspend`)
+  const response = await axios.put<TypesGen.User>(`/api/v2/users/${userId}/status/suspend`)
   return response.data
 }
 
diff --git a/site/src/pages/TemplatePage/TemplatePageView.tsx b/site/src/pages/TemplatePage/TemplatePageView.tsx
@@ -3,6 +3,7 @@ import Link from "@material-ui/core/Link"
 import { makeStyles } from "@material-ui/core/styles"
 import Typography from "@material-ui/core/Typography"
 import AddCircleOutline from "@material-ui/icons/AddCircleOutline"
+import frontMatter from "front-matter"
 import React from "react"
 import ReactMarkdown from "react-markdown"
 import { Link as RouterLink } from "react-router-dom"
@@ -33,6 +34,7 @@ export const TemplatePageView: React.FC<TemplatePageViewProps> = ({
   templateResources,
 }) => {
   const styles = useStyles()
+  const readme = frontMatter(activeTemplateVersion.readme)
 
   const getStartedResources = (resources: WorkspaceResource[]) => {
     return resources.filter((resource) => resource.workspace_transition === "start")
@@ -74,7 +76,7 @@ export const TemplatePageView: React.FC<TemplatePageViewProps> = ({
                 ),
               }}
             >
-              {activeTemplateVersion.readme}
+              {readme.body}
             </ReactMarkdown>
           </div>
         </WorkspaceSection>
diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -88,7 +88,13 @@ export const MockTemplateVersion: TypesGen.TemplateVersion = {
   updated_at: "",
   job: MockProvisionerJob,
   name: "test-version",
-  readme: "## Instructions\nYou can add instructions here\n\n[Some link info](https://coder.com)",
+  readme: `---
+name:Template test
+---
+## Instructions
+You can add instructions here
+
+[Some link info](https://coder.com)`,
 }
 
 export const MockTemplate: TypesGen.Template = {
diff --git a/site/yarn.lock b/site/yarn.lock
@@ -6969,6 +6969,13 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
+front-matter@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/front-matter/-/front-matter-4.0.2.tgz#b14e54dc745cfd7293484f3210d15ea4edd7f4d5"
+  integrity sha512-I8ZuJ/qG92NWX8i5x1Y8qyj3vizhXS31OxjKDu3LKP+7/qBgfIKValiZIEwoVoJKUHlhWtYrktkxV1XsX+pPlg==
+  dependencies:
+    js-yaml "^3.13.1"
+
 fs-extra@^0.30.0:
   version "0.30.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0"

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ export const updateProfile = async (`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`export const suspendUser = async (userId: TypesGen.User["id"]): Promise<TypesGen.User> => {`
`222`		- const response = await axios.put<TypesGen.User>(`/api/v2/users/${userId}/suspend`)
	`222`	+ const response = await axios.put<TypesGen.User>(`/api/v2/users/${userId}/status/suspend`)
`223`	`223`	`return response.data`
`224`	`224`	`}`
`225`	`225`