Apply PR comments

BrunoQuaresma · BrunoQuaresma · commit f1f43d03a86c · 2025-04-17T13:20:48.000Z
diff --git a/site/src/pages/WorkspacesPage/WorkspacesTable.tsx b/site/src/pages/WorkspacesPage/WorkspacesTable.tsx
@@ -41,7 +41,7 @@ import { type FC, type ReactNode, useMemo } from "react";
 import { useNavigate } from "react-router-dom";
 import { cn } from "utils/cn";
 import {
-	type GetWorkspaceDisplayStatusType,
+	type DisplayWorkspaceStatusType,
 	getDisplayWorkspaceStatus,
 	getDisplayWorkspaceTemplateName,
 	lastUsedMessage,
@@ -338,7 +338,7 @@ const TableLoader: FC<TableLoaderProps> = ({ canCheckWorkspaces }) => {
 					<AvatarDataSkeleton />
 				</TableCell>
 				<TableCell className="w-2/6">
-					<Skeleton variant="text" width="75%" />
+					<Skeleton variant="text" width="50%" />
 				</TableCell>
 				<TableCell className="w-0">
 					<Skeleton variant="text" width="25%" />
@@ -357,14 +357,15 @@ type WorkspaceStatusCellProps = {
 };
 
 const variantByStatusType: Record<
-	GetWorkspaceDisplayStatusType,
+	DisplayWorkspaceStatusType,
 	StatusIndicatorProps["variant"]
 > = {
 	active: "pending",
 	inactive: "inactive",
 	success: "success",
 	error: "failed",
 	danger: "warning",
+	warning: "warning",
 };
 
 const WorkspaceStatusCell: FC<WorkspaceStatusCellProps> = ({ workspace }) => {
diff --git a/site/src/utils/workspace.tsx b/site/src/utils/workspace.tsx
@@ -168,10 +168,24 @@ export const getDisplayWorkspaceTemplateName = (
 		: workspace.template_name;
 };
 
+export type DisplayWorkspaceStatusType =
+	| "success"
+	| "active"
+	| "inactive"
+	| "error"
+	| "warning"
+	| "danger";
+
+type DisplayWorkspaceStatus = {
+	text: string;
+	type: DisplayWorkspaceStatusType;
+	icon: React.ReactNode;
+};
+
 export const getDisplayWorkspaceStatus = (
 	workspaceStatus: TypesGen.WorkspaceStatus,
 	provisionerJob?: TypesGen.ProvisionerJob,
-) => {
+): DisplayWorkspaceStatus => {
 	switch (workspaceStatus) {
 		case undefined:
 			return {
@@ -242,10 +256,6 @@ export const getDisplayWorkspaceStatus = (
 	}
 };
 
-export type GetWorkspaceDisplayStatusType = ReturnType<
-	typeof getDisplayWorkspaceStatus
->["type"];
-
 export const hasJobError = (workspace: TypesGen.Workspace) => {
 	return workspace.latest_build.job.error !== undefined;
 };
@@ -313,7 +323,7 @@ export const getResourceIconPath = (resourceType: string): string => {
 	return BUILT_IN_ICON_PATHS[resourceType] ?? FALLBACK_ICON;
 };
 
-export const lastUsedMessage = (lastUsedAt: string | Date) => {
+export const lastUsedMessage = (lastUsedAt: string | Date): string => {
 	const t = dayjs(lastUsedAt);
 	const now = dayjs();
 	let message = t.fromNow();
