coder · BrunoQuaresma · Oct 31, 2022 · Oct 28, 2022 · Oct 28, 2022 · Oct 28, 2022
diff --git a/cli/templateversions.go b/cli/templateversions.go
@@ -94,7 +94,7 @@ func displayTemplateVersions(activeVersionID uuid.UUID, templateVersions ...code
 		rows[i] = templateVersionRow{
 			Name:      templateVersion.Name,
 			CreatedAt: templateVersion.CreatedAt,
-			CreatedBy: templateVersion.CreatedByName,
+			CreatedBy: templateVersion.CreatedBy.Username,
 			Status:    strings.Title(string(templateVersion.Job.Status)),
 			Active:    activeStatus,
 		}

diff --git a/cli/templateversions_test.go b/cli/templateversions_test.go
@@ -35,7 +35,7 @@ func TestTemplateVersions(t *testing.T) {
 		require.NoError(t, <-errC)
 
 		pty.ExpectMatch(version.Name)
-		pty.ExpectMatch(version.CreatedByName)
+		pty.ExpectMatch(version.CreatedBy.Username)
 		pty.ExpectMatch("Active")
 	})
 }
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000066_template_version_created_by.down.sql b/coderd/database/migrations/000066_template_version_created_by.down.sql
@@ -0,0 +1 @@
+ALTER TABLE template_versions ALTER COLUMN created_by SET NULL
diff --git a/coderd/database/migrations/000066_template_version_created_by.up.sql b/coderd/database/migrations/000066_template_version_created_by.up.sql
@@ -0,0 +1 @@
+ALTER TABLE template_versions ALTER COLUMN created_by SET NOT NULL
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/templates.go b/coderd/templates.go
@@ -658,10 +658,7 @@ func (api *API) autoImportTemplate(ctx context.Context, opts autoImportTemplateO
 			Name:           namesgenerator.GetRandomName(1),
 			Readme:         "",
 			JobID:          job.ID,
-			CreatedBy: uuid.NullUUID{
-				UUID:  opts.userID,
-				Valid: true,
-			},
+			CreatedBy:      opts.userID,
 		})
 		if err != nil {
 			return xerrors.Errorf("insert template version: %w", err)

diff --git a/coderd/templateversions.go b/coderd/templateversions.go
@@ -1,7 +1,6 @@
 package coderd
 
 import (
-	"context"
 	"database/sql"
 	"encoding/json"
 	"errors"
@@ -43,16 +42,16 @@ func (api *API) templateVersion(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	createdByName, err := getUsernameByUserID(ctx, api.Database, templateVersion.CreatedBy)
+	user, err := api.Database.GetUserByID(ctx, templateVersion.CreatedBy)
 	if err != nil {
 		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
-			Message: "Internal error fetching creator name.",
+			Message: "Internal error on fetching user.",
 			Detail:  err.Error(),
 		})
 		return
 	}
 
-	httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(templateVersion, convertProvisionerJob(job), createdByName))
+	httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(templateVersion, convertProvisionerJob(job), user))
 }
 
 func (api *API) patchCancelTemplateVersion(rw http.ResponseWriter, r *http.Request) {
@@ -523,15 +522,15 @@ func (api *API) templateVersionsByTemplate(rw http.ResponseWriter, r *http.Reque
 				})
 				return err
 			}
-			createdByName, err := getUsernameByUserID(ctx, store, version.CreatedBy)
+			user, err := api.Database.GetUserByID(ctx, version.CreatedBy)
 			if err != nil {
 				httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
-					Message: "Internal error fetching creator name.",
+					Message: "Internal error on fetching user.",
 					Detail:  err.Error(),
 				})
 				return err
 			}
-			apiVersions = append(apiVersions, convertTemplateVersion(version, convertProvisionerJob(job), createdByName))
+			apiVersions = append(apiVersions, convertTemplateVersion(version, convertProvisionerJob(job), user))
 		}
 
 		return nil
@@ -581,16 +580,16 @@ func (api *API) templateVersionByName(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	createdByName, err := getUsernameByUserID(ctx, api.Database, templateVersion.CreatedBy)
+	user, err := api.Database.GetUserByID(ctx, templateVersion.CreatedBy)
 	if err != nil {
 		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
-			Message: "Internal error fetching creator name.",
+			Message: "Internal error on fetching user.",
 			Detail:  err.Error(),
 		})
 		return
 	}
 
-	httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(templateVersion, convertProvisionerJob(job), createdByName))
+	httpapi.Write(ctx, rw, http.StatusOK, convertTemplateVersion(templateVersion, convertProvisionerJob(job), user))
 }
 
 func (api *API) patchActiveTemplateVersion(rw http.ResponseWriter, r *http.Request) {
@@ -841,10 +840,7 @@ func (api *API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r *ht
 			Name:           req.Name,
 			Readme:         "",
 			JobID:          provisionerJob.ID,
-			CreatedBy: uuid.NullUUID{
-				UUID:  apiKey.UserID,
-				Valid: true,
-			},
+			CreatedBy:      apiKey.UserID,
 		})
 		if err != nil {
 			return xerrors.Errorf("insert template version: %w", err)
@@ -859,16 +855,16 @@ func (api *API) postTemplateVersionsByOrganization(rw http.ResponseWriter, r *ht
 	}
 	aReq.New = templateVersion
 
-	createdByName, err := getUsernameByUserID(ctx, api.Database, templateVersion.CreatedBy)
+	user, err := api.Database.GetUserByID(ctx, templateVersion.CreatedBy)
 	if err != nil {
 		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
-			Message: "Internal error fetching creator name.",
+			Message: "Internal error on fetching user.",
 			Detail:  err.Error(),
 		})
 		return
 	}
 
-	httpapi.Write(ctx, rw, http.StatusCreated, convertTemplateVersion(templateVersion, convertProvisionerJob(provisionerJob), createdByName))
+	httpapi.Write(ctx, rw, http.StatusCreated, convertTemplateVersion(templateVersion, convertProvisionerJob(provisionerJob), user))
 }
 
 // templateVersionResources returns the workspace agent resources associated
@@ -926,18 +922,17 @@ func (api *API) templateVersionLogs(rw http.ResponseWriter, r *http.Request) {
 	api.provisionerJobLogs(rw, r, job)
 }
 
-func getUsernameByUserID(ctx context.Context, db database.Store, userID uuid.NullUUID) (string, error) {
-	if !userID.Valid {
-		return "", nil
-	}
-	user, err := db.GetUserByID(ctx, userID.UUID)
-	if err != nil {
-		return "", err
+func convertTemplateVersion(version database.TemplateVersion, job codersdk.ProvisionerJob, user database.User) codersdk.TemplateVersion {
+	createdBy := codersdk.User{
+		ID:        user.ID,
+		Username:  user.Username,
+		Email:     user.Email,
+		CreatedAt: user.CreatedAt,
+		Status:    codersdk.UserStatus(user.Status),
+		Roles:     []codersdk.Role{},
+		AvatarURL: user.AvatarURL.String,
 	}
-	return user.Username, nil
-}
 
-func convertTemplateVersion(version database.TemplateVersion, job codersdk.ProvisionerJob, createdByName string) codersdk.TemplateVersion {
 	return codersdk.TemplateVersion{
 		ID:             version.ID,
 		TemplateID:     &version.TemplateID.UUID,
@@ -947,7 +942,6 @@ func convertTemplateVersion(version database.TemplateVersion, job codersdk.Provi
 		Name:           version.Name,
 		Job:            job,
 		Readme:         version.Readme,
-		CreatedByID:    version.CreatedBy.UUID,
-		CreatedByName:  createdByName,
+		CreatedBy:      createdBy,
 	}
 }
diff --git a/codersdk/templateversions.go b/codersdk/templateversions.go
@@ -21,8 +21,7 @@ type TemplateVersion struct {
 	Name           string         `json:"name"`
 	Job            ProvisionerJob `json:"job"`
 	Readme         string         `json:"readme"`
-	CreatedByID    uuid.UUID      `json:"created_by_id"`
-	CreatedByName  string         `json:"created_by_name"`
+	CreatedBy      User           `json:"created_by"`
 }
 
 // TemplateVersion returns a template version by ID.

diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -656,8 +656,7 @@ export interface TemplateVersion {
   readonly name: string
   readonly job: ProvisionerJob
   readonly readme: string
-  readonly created_by_id: string
-  readonly created_by_name: string
+  readonly created_by: User
 }
 
 // From codersdk/templates.go

diff --git a/site/src/components/BuildsTable/BuildDateRow.tsx b/site/src/components/BuildsTable/BuildDateRow.tsx
diff --git a/site/src/components/BuildsTable/BuildsTable.tsx b/site/src/components/BuildsTable/BuildsTable.tsx
@@ -4,11 +4,11 @@ import TableBody from "@material-ui/core/TableBody"
 import TableCell from "@material-ui/core/TableCell"
 import TableContainer from "@material-ui/core/TableContainer"
 import TableRow from "@material-ui/core/TableRow"
-import { FC, Fragment } from "react"
+import { Timeline } from "components/Timeline/Timeline"
+import { FC } from "react"
 import * as TypesGen from "../../api/typesGenerated"
 import { EmptyState } from "../EmptyState/EmptyState"
 import { TableLoader } from "../TableLoader/TableLoader"
-import { BuildDateRow } from "./BuildDateRow"
 import { BuildRow } from "./BuildRow"
 
 export const Language = {
@@ -24,52 +24,22 @@ export interface BuildsTableProps {
   builds?: TypesGen.WorkspaceBuild[]
 }
 
-const groupBuildsByDate = (builds?: TypesGen.WorkspaceBuild[]) => {
-  const buildsByDate: Record<string, TypesGen.WorkspaceBuild[]> = {}
-
-  if (!builds) {
-    return
-  }
-
-  builds.forEach((build) => {
-    const dateKey = new Date(build.created_at).toDateString()
-
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-    if (buildsByDate[dateKey]) {
-      buildsByDate[dateKey].push(build)
-    } else {
-      buildsByDate[dateKey] = [build]
-    }
-  })
-
-  return buildsByDate
-}
-
 export const BuildsTable: FC<React.PropsWithChildren<BuildsTableProps>> = ({
   builds,
 }) => {
-  const isLoading = !builds
-  const buildsByDate = groupBuildsByDate(builds)
-
   return (
     <TableContainer>
       <Table data-testid="builds-table" aria-describedby="builds table">
         <TableBody>
-          {isLoading && <TableLoader />}
-
-          {buildsByDate &&
-            Object.keys(buildsByDate).map((dateStr) => {
-              const builds = buildsByDate[dateStr]
-
-              return (
-                <Fragment key={dateStr}>
-                  <BuildDateRow date={new Date(dateStr)} />
-                  {builds.map((build) => (
-                    <BuildRow key={build.id} build={build} />
-                  ))}
-                </Fragment>
-              )
-            })}
+          {builds ? (
+            <Timeline
+              items={builds}
+              getDate={(build) => new Date(build.created_at)}
+              row={(build) => <BuildRow key={build.id} build={build} />}
+            />
+          ) : (
+            <TableLoader />
+          )}
 
           {builds && builds.length === 0 && (
             <TableRow>

diff --git a/site/src/components/Timeline/Timeline.tsx b/site/src/components/Timeline/Timeline.tsx
@@ -0,0 +1,53 @@
+import { TimelineDateRow } from "components/Timeline/TimelineDateRow"
+import { Fragment } from "react"
+
+type GetDateFn<TData> = (data: TData) => Date
+
+const groupByDate = <TData,>(
+  items: TData[],
+  getDate: GetDateFn<TData>,
+): Record<string, TData[]> => {
+  const itemsByDate: Record<string, TData[]> = {}
+
+  items.forEach((item) => {
+    const dateKey = getDate(item).toDateString()
+
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    if (itemsByDate[dateKey]) {
+      itemsByDate[dateKey].push(item)
+    } else {
+      itemsByDate[dateKey] = [item]
+    }
+  })
+
+  return itemsByDate
+}
+
+export interface TimelineProps<TData> {
+  items: TData[]
+  getDate: GetDateFn<TData>
+  row: (item: TData) => JSX.Element
+}
+
+export const Timeline = <TData,>({
+  items,
+  getDate,
+  row,
+}: TimelineProps<TData>): JSX.Element => {
+  const itemsByDate = groupByDate(items, getDate)
+
+  return (
+    <>
+      {Object.keys(itemsByDate).map((dateStr) => {
+        const items = itemsByDate[dateStr]
+
+        return (
+          <Fragment key={dateStr}>
+            <TimelineDateRow date={new Date(dateStr)} />
+            {items.map(row)}
+          </Fragment>
+        )
+      })}
+    </>
+  )
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE template_versions ALTER COLUMN created_by SET NULL
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE template_versions ALTER COLUMN created_by SET NOT NULL
BrunoQuaresma marked this conversation as resolved. Show resolved Hide resolved