Merge branch 'main' into statusbar/presleyp/1032

coder · presleyp · May 16, 2022 · May 5, 2022 · May 5, 2022 · May 5, 2022
commit 91d581166d3ed9eb661ccd21a5681722f5eb04a7
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -139,7 +139,7 @@ export const startWorkspace = postWorkspaceBuild("start")
 export const stopWorkspace = postWorkspaceBuild("stop")
 export const deleteWorkspace = postWorkspaceBuild("delete")
 
-export const createUser = async (user: Types.CreateUserRequest): Promise<TypesGen.User> => {
+export const createUser = async (user: TypesGen.CreateUserRequest): Promise<TypesGen.User> => {
   const response = await axios.post<TypesGen.User>("/api/v2/users", user)
   return response.data
 }

diff --git a/site/src/api/types.ts b/site/src/api/types.ts
@@ -1,130 +1,14 @@
-import * as TypesGen from "./typesGenerated"
-
-/**
- * `BuildInfoResponse` must be kept in sync with the go struct in buildinfo.go.
- */
-export interface BuildInfoResponse {
-  external_url: string
-  version: string
-}
-
-export interface LoginResponse {
-  session_token: string
-}
-
-export interface CreateUserRequest {
-  username: string
-  email: string
-  password: string
-  organization_id: string
-}
-
-export interface UserResponse {
-  readonly id: string
-  readonly username: string
-  readonly email: string
-  readonly created_at: string
-  readonly status: "active" | "suspended"
-  readonly organization_ids: string[]
-  readonly roles: { name: string; display_name: string }[]
-}
-
-/**
- * `Organization` must be kept in sync with the go struct in organizations.go
- */
-export interface Organization {
-  id: string
-  name: string
-  created_at: string
-  updated_at: string
-}
-
-export interface Provisioner {
-  id: string
-  name: string
-}
-
-// This must be kept in sync with the `Template` struct in the back-end
-export interface Template {
-  id: string
-  created_at: string
-  updated_at: string
-  organization_id: string
-  name: string
-  provisioner: string
-  active_version_id: string
-}
-
-export interface CreateTemplateRequest {
-  name: string
-  organizationId: string
-  provisioner: string
-}
-
-export interface CreateWorkspaceRequest {
-  name: string
-  template_id: string
-  organization_id: string
-}
-
-export interface WorkspaceBuild {
-  id: string
-  transition: WorkspaceBuildTransition
-  job: TypesGen.ProvisionerJob
-}
-
-export interface Workspace {
-  id: string
-  outdated: boolean
-  created_at: string
-  updated_at: string
-  owner_id: string
-  template_id: string
-  name: string
-  autostart_schedule: string
-  autostop_schedule: string
-  latest_build: WorkspaceBuild
-}
-
-export interface WorkspaceResource {
-  id: string
-  agents?: WorkspaceAgent[]
-}
-
-export interface WorkspaceAgent {
-  id: string
-  name: string
-  operating_system: string
-}
-
-export interface APIKeyResponse {
-  key: string
-}
-
 export interface UserAgent {
   readonly browser: string
   readonly device: string
   readonly ip_address: string
   readonly os: string
 }
 
-export interface WorkspaceAutostartRequest {
-  schedule: string
-}
-
-export interface WorkspaceAutostopRequest {
-  schedule: string
-}
-
-export type WorkspaceBuildTransition = "start" | "stop" | "delete"
-
-export interface UpdateProfileRequest {
-  readonly username: string
-  readonly email: string
-}
-
 export interface ReconnectingPTYRequest {
   readonly data?: string
   readonly height?: number
   readonly width?: number
 }
+
+export type WorkspaceBuildTransition = "start" | "stop" | "delete"
diff --git a/site/src/components/Workspace/Workspace.tsx b/site/src/components/Workspace/Workspace.tsx
@@ -1,16 +1,16 @@
 import { makeStyles } from "@material-ui/core/styles"
 import Typography from "@material-ui/core/Typography"
 import React from "react"
-import * as Types from "../../api/types"
+import * as TypesGen from "../../api/typesGenerated"
 import { WorkspaceStatus } from "../../pages/WorkspacePage/WorkspacePage"
 import { WorkspaceSchedule } from "../WorkspaceSchedule/WorkspaceSchedule"
 import { WorkspaceSection } from "../WorkspaceSection/WorkspaceSection"
 import { WorkspaceStatusBar } from "../WorkspaceStatusBar/WorkspaceStatusBar"
 
 export interface WorkspaceProps {
-  organization?: Types.Organization
-  workspace: Types.Workspace
-  template?: Types.Template
+  organization?: TypesGen.Organization
+  workspace: TypesGen.Workspace
+  template?: TypesGen.Template
   handleStart: () => void
   handleStop: () => void
   handleRetry: () => void

diff --git a/site/src/pages/TemplatesPages/OrganizationPage/TemplatePage/TemplatePage.tsx b/site/src/pages/TemplatesPages/OrganizationPage/TemplatePage/TemplatePage.tsx
@@ -1,7 +1,7 @@
 import React from "react"
 import { Link, useNavigate, useParams } from "react-router-dom"
 import useSWR from "swr"
-import { Organization, Template, Workspace } from "../../../../api/types"
+import * as TypesGen from "../../../../api/typesGenerated"
 import { EmptyState } from "../../../../components/EmptyState/EmptyState"
 import { ErrorSummary } from "../../../../components/ErrorSummary/ErrorSummary"
 import { Header } from "../../../../components/Header/Header"
@@ -66,8 +66,8 @@ export const TemplatePage: React.FC = () => {
     {
       key: "name",
       name: "Name",
-      renderer: (_, workspace: Workspace) => {
-        return <Link to={`/workspaces/${workspace.id}`}>{workspace.name}</Link>
+      renderer: (nameField: string | TypesGen.WorkspaceBuild, workspace: TypesGen.Workspace) => {
+        return <Link to={`/workspaces/${workspace.id}`}>{nameField}</Link>
       },
     },
   ]

diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -1,17 +1,5 @@
-import {
-  BuildInfoResponse,
-  Organization,
-  Provisioner,
-  Template,
-  UserAgent,
-  UserResponse,
-  Workspace,
-  WorkspaceAgent,
-  WorkspaceAutostartRequest,
-  WorkspaceBuildTransition,
-  WorkspaceResource,
-} from "../api/types"
-import { AuthMethods, ProvisionerJobStatus, Role } from "../api/typesGenerated"
+import * as Types from "../api/types"
+import * as TypesGen from "../api/typesGenerated"
 
 export const MockSessionToken: TypesGen.LoginWithPasswordResponse = {
   session_token: "my-session-token",
@@ -83,6 +71,8 @@ export const MockProvisionerJob: TypesGen.ProvisionerJob = {
   status: "succeeded",
 }
 
+export const MockFailedProvisionerJob = { ...MockProvisionerJob, status: "failed" as TypesGen.ProvisionerJobStatus }
+
 export const MockTemplate: TypesGen.Template = {
   id: "test-template",
   created_at: "",
@@ -113,80 +103,59 @@ export const MockWorkspaceAutostopEnabled: TypesGen.UpdateWorkspaceAutostartRequ
   schedule: "CRON_TZ=America/Toronto 30 21 * * 1-5",
 }
 
-export const MockProvisionerJob = {
-  id: "test-provisioner-job",
-  created_at: "",
-  started_at: "",
-  completed_at: "",
-  error: "",
-  status: "succeeded" as ProvisionerJobStatus,
-  worker_id: "test-worker-id",
-}
-
-export const MockFailedProvisionerJob = {
-  id: "test-provisioner-job",
+export const MockWorkspaceBuild: TypesGen.WorkspaceBuild = {
+  after_id: "",
+  before_id: "",
   created_at: "",
-  started_at: "",
-  completed_at: "",
-  error: "",
-  status: "failed" as ProvisionerJobStatus,
-  worker_id: "test-worker-id",
-}
-
-export const MockWorkspaceBuild = {
   id: "test-workspace-build",
-  transition: "start" as WorkspaceBuildTransition,
-  job: MockProvisionerJob,
-}
-
-export const MockWorkspaceBuildStop = {
-  id: "test-workspace-build",
-  transition: "stop" as WorkspaceBuildTransition,
+  initiator_id: "",
   job: MockProvisionerJob,
+  name: "a-workspace-build",
+  template_version_id: "",
+  transition: "start",
+  updated_at: "",
+  workspace_id: "test-workspace",
 }
 
 export const MockFailedWorkspaceBuild = {
-  id: "test-workspace-build",
-  transition: "start" as WorkspaceBuildTransition,
+  ...MockWorkspaceBuild,
   job: MockFailedProvisionerJob,
 }
 
-// These are special cases of MockWorkspaceBuild for more precise testing
-export const MockWorkspaceStart = {
-  id: "test-workspace-build-start",
-  transition: "start",
-}
-
-export const MockWorkspaceStop = {
-  id: "test-workspace-build-stop",
+export const MockWorkspaceBuildStop = {
+  ...MockWorkspaceBuild,
   transition: "stop",
 }
 
-export const MockWorkspaceDelete = {
-  id: "test-workspace-build-delete",
+export const MockWorkspaceBuildDelete = {
+  ...MockWorkspaceBuild,
   transition: "delete",
 }
 
-export const MockWorkspace: Workspace = {
+export const MockWorkspace: TypesGen.Workspace = {
   id: "test-workspace",
   name: "Test-Workspace",
   created_at: "",
   updated_at: "",
   template_id: MockTemplate.id,
+  template_name: MockTemplate.name,
   outdated: false,
   owner_id: MockUser.id,
   autostart_schedule: MockWorkspaceAutostartEnabled.schedule,
   autostop_schedule: MockWorkspaceAutostopEnabled.schedule,
   latest_build: MockWorkspaceBuild,
 }
 
-export const MockStoppedWorkspace: Workspace = { ...MockWorkspace, latest_build: MockWorkspaceBuildStop }
+export const MockStoppedWorkspace: TypesGen.Workspace = { ...MockWorkspace, latest_build: MockWorkspaceBuildStop }
 
-export const MockFailedWorkspace: Workspace = { ...MockWorkspace, latest_build: MockFailedWorkspaceBuild }
+export const MockFailedWorkspace: TypesGen.Workspace = { ...MockWorkspace, latest_build: MockFailedWorkspaceBuild }
 
-export const MockOutdatedWorkspace: Workspace = { ...MockWorkspace, outdated: true }
+export const MockOutdatedWorkspace: TypesGen.Workspace = { ...MockWorkspace, outdated: true }
 
-export const MockWorkspaceAgent: WorkspaceAgent = {
+export const MockWorkspaceAgent: TypesGen.WorkspaceAgent = {
+  architecture: "amd64",
+  created_at: "",
+  environment_variables: {},
   id: "test-workspace-agent",
   name: "a-workspace-agent",
   operating_system: "linux",

diff --git a/site/src/xServices/workspace/workspaceXService.ts b/site/src/xServices/workspace/workspaceXService.ts
@@ -1,12 +1,11 @@
 import { assign, createMachine } from "xstate"
 import * as API from "../../api/api"
-import * as Types from "../../api/types"
 import * as TypesGen from "../../api/typesGenerated"
 
 interface WorkspaceContext {
-  workspace?: Types.Workspace
-  template?: Types.Template
-  organization?: Types.Organization
+  workspace?: TypesGen.Workspace
+  template?: TypesGen.Template
+  organization?: TypesGen.Organization
   build?: TypesGen.WorkspaceBuild
   getWorkspaceError?: Error | unknown
   getTemplateError?: Error | unknown
@@ -51,7 +50,7 @@ export const workspaceMachine = createMachine(
           data: TypesGen.WorkspaceBuild
         }
         refreshWorkspace: {
-          data: Types.Workspace | undefined
+          data: TypesGen.Workspace | undefined
         }
       },
     },