refactor: Improve agent loading state (coder#4814)

BrunoQuaresma · web-flow · commit 97bcd441f3b9 · 2022-10-31T17:35:05.000-03:00
diff --git a/site/src/components/AppLink/AppLink.tsx b/site/src/components/AppLink/AppLink.tsx
@@ -61,7 +61,7 @@ export const AppLink: FC<AppLinkProps> = ({
   let primaryTooltip = ""
   if (app.health === "initializing") {
     canClick = false
-    icon = <CircularProgress size={16} />
+    icon = <CircularProgress size={12} />
     primaryTooltip = "Initializing..."
   }
   if (app.health === "unhealthy") {
diff --git a/site/src/components/AppLink/AppLinkSkeleton.tsx b/site/src/components/AppLink/AppLinkSkeleton.tsx
@@ -0,0 +1,22 @@
+import { makeStyles } from "@material-ui/core/styles"
+import { Skeleton } from "@material-ui/lab"
+import React from "react"
+import { borderRadiusSm } from "theme/constants"
+
+export const AppLinkSkeleton: React.FC<{ width: number }> = ({ width }) => {
+  const styles = useStyles()
+  return (
+    <Skeleton
+      width={width}
+      height={36}
+      variant="rect"
+      className={styles.skeleton}
+    />
+  )
+}
+
+export const useStyles = makeStyles(() => ({
+  skeleton: {
+    borderRadius: borderRadiusSm,
+  },
+}))
diff --git a/site/src/components/Resources/AgentRow.stories.tsx b/site/src/components/Resources/AgentRow.stories.tsx
@@ -2,6 +2,7 @@ import { Story } from "@storybook/react"
 import {
   MockWorkspace,
   MockWorkspaceAgent,
+  MockWorkspaceAgentConnecting,
   MockWorkspaceApp,
 } from "testHelpers/entities"
 import { AgentRow, AgentRowProps } from "./AgentRow"
@@ -58,3 +59,11 @@ BunchOfApps.args = {
   applicationsHost: "",
   showApps: true,
 }
+
+export const Connecting = Template.bind({})
+Connecting.args = {
+  agent: MockWorkspaceAgentConnecting,
+  workspace: MockWorkspace,
+  applicationsHost: "",
+  showApps: true,
+}
diff --git a/site/src/components/Resources/AgentRow.tsx b/site/src/components/Resources/AgentRow.tsx
@@ -11,6 +11,7 @@ import { AgentLatency } from "./AgentLatency"
 import { AgentVersion } from "./AgentVersion"
 import { Maybe } from "components/Conditionals/Maybe"
 import { AgentStatus } from "./AgentStatus"
+import { AppLinkSkeleton } from "components/AppLink/AppLinkSkeleton"
 
 export interface AgentRowProps {
   agent: WorkspaceAgent
@@ -59,6 +60,11 @@ export const AgentRow: FC<AgentRowProps> = ({
             </Maybe>
 
             <AgentLatency agent={agent} />
+
+            <Maybe condition={agent.status === "connecting"}>
+              <Skeleton width={160} variant="text" />
+              <Skeleton width={36} variant="text" />
+            </Maybe>
           </Stack>
         </div>
       </Stack>
@@ -106,8 +112,8 @@ export const AgentRow: FC<AgentRowProps> = ({
         )}
         {showApps && agent.status === "connecting" && (
           <>
-            <Skeleton width={80} height={36} variant="rect" />
-            <Skeleton width={120} height={36} variant="rect" />
+            <AppLinkSkeleton width={84} />
+            <AppLinkSkeleton width={112} />
           </>
         )}
       </Stack>
diff --git a/site/src/components/Resources/AgentStatus.tsx b/site/src/components/Resources/AgentStatus.tsx
@@ -84,18 +84,18 @@ const useStyles = makeStyles((theme) => ({
 
   "@keyframes pulse": {
     "0%": {
-      opacity: 0.25,
+      opacity: 1,
     },
     "50%": {
-      opacity: 1,
+      opacity: 0.4,
     },
     "100%": {
-      opacity: 0.25,
+      opacity: 1,
     },
   },
 
   connecting: {
     backgroundColor: theme.palette.info.light,
-    animation: "$pulse 1s ease-in-out forwards infinite",
+    animation: "$pulse 1.5s 0.5s ease-in-out forwards infinite",
   },
 }))
diff --git a/site/src/theme/constants.ts b/site/src/theme/constants.ts
@@ -1,5 +1,6 @@
 export const spacing = 8
 export const borderRadius = 8
+export const borderRadiusSm = 6
 export const buttonBorderWidth = 2
 export const MONOSPACE_FONT_FAMILY =
   "'IBM Plex Mono', 'Lucida Console', 'Lucida Sans Typewriter', 'Liberation Mono', 'Monaco', 'Courier New', Courier, monospace"
diff --git a/site/src/theme/overrides.ts b/site/src/theme/overrides.ts
@@ -1,7 +1,7 @@
 import { lighten, Theme } from "@material-ui/core/styles"
 import { Overrides } from "@material-ui/core/styles/overrides"
 import { colors } from "./colors"
-import { borderRadius } from "./constants"
+import { borderRadius, borderRadiusSm } from "./constants"
 
 export const getOverrides = ({ palette, breakpoints }: Theme): Overrides => {
   return {
@@ -61,15 +61,15 @@ export const getOverrides = ({ palette, breakpoints }: Theme): Overrides => {
         padding: `0 16px`,
         fontSize: 14,
         minHeight: 36,
-        borderRadius: 6,
+        borderRadius: borderRadiusSm,
       },
       iconSizeSmall: {
         width: 14,
         height: 14,
         marginLeft: "0 !important",
         marginRight: 8,
 
-        "& svg": {
+        "& svg:not(.MuiCircularProgress-svg)": {
           width: 14,
           height: 14,
         },
@@ -190,5 +190,12 @@ export const getOverrides = ({ palette, breakpoints }: Theme): Overrides => {
         marginTop: 8,
       },
     },
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment -- The Mui types don't accept the MuiSkeleton but it works. I tried to extends the Overrides interface with no success.
+    // @ts-ignore
+    MuiSkeleton: {
+      root: {
+        backgroundColor: palette.divider,
+      },
+    },
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ export const AppLink: FC<AppLinkProps> = ({`
`61`	`61`	`let primaryTooltip = ""`
`62`	`62`	`if (app.health === "initializing") {`
`63`	`63`	`canClick = false`
`64`		`- icon = <CircularProgress size={16} />`
	`64`	`+ icon = <CircularProgress size={12} />`
`65`	`65`	`primaryTooltip = "Initializing..."`
`66`	`66`	`}`
`67`	`67`	`if (app.health === "unhealthy") {`