Merge branch 'main' of github.com:coder/coder into spike/1375_in_proc_provisionerd_comms

spikecurtis · spikecurtis · commit c5aaa825626a · 2022-05-19T15:04:26.000-07:00
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,2 +1 @@
 site/ @coder/frontend
-site/src/xServices @presleyp
diff --git a/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.tsx b/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.tsx
@@ -3,13 +3,18 @@ import Typography from "@material-ui/core/Typography"
 import { useMachine } from "@xstate/react"
 import React from "react"
 import { useParams } from "react-router-dom"
+import { ProvisionerJobLog } from "../../api/typesGenerated"
 import { Loader } from "../../components/Loader/Loader"
 import { Margins } from "../../components/Margins/Margins"
 import { Stack } from "../../components/Stack/Stack"
 import { WorkspaceBuildLogs } from "../../components/WorkspaceBuildLogs/WorkspaceBuildLogs"
 import { WorkspaceBuildStats } from "../../components/WorkspaceBuildStats/WorkspaceBuildStats"
 import { workspaceBuildMachine } from "../../xServices/workspaceBuild/workspaceBuildXService"
 
+const sortLogsByCreatedAt = (logs: ProvisionerJobLog[]) => {
+  return [...logs].sort((a, b) => new Date(a.created_at).getTime() - new Date(b.created_at).getTime())
+}
+
 const useBuildId = () => {
   const { buildId } = useParams()
 
@@ -35,7 +40,7 @@ export const WorkspaceBuildPage: React.FC = () => {
 
         {build && <WorkspaceBuildStats build={build} />}
         {!logs && <Loader />}
-        {logs && <WorkspaceBuildLogs logs={logs} />}
+        {logs && <WorkspaceBuildLogs logs={sortLogsByCreatedAt(logs)} />}
       </Stack>
     </Margins>
   )

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`	`1`	`site/ @coder/frontend`
`2`		`-site/src/xServices @presleyp`