Skip to content

feat(site): fix stale metadata display issue #8745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 26, 2023
Merged

feat(site): fix stale metadata display issue #8745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions site/src/components/Resources/AgentMetadata.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Example.args = {
{
result: {
...resultDefaults,
value: "cant see it",
value: "stale value",
age: 300,
},
description: {
Expand All @@ -76,18 +76,7 @@ Example.args = {
description: {
...descriptionDefaults,
display_name: "Error",
},
},
{
result: {
...resultDefaults,
value: "oops",
error: "fatal error",
},
description: {
...descriptionDefaults,
display_name: "Error",
key: "stale",
key: "error",
},
},
{
Expand Down
32 changes: 25 additions & 7 deletions site/src/components/Resources/AgentMetadata.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import dayjs from "dayjs"
import { createContext, FC, useContext, useEffect, useState } from "react"
import Skeleton from "@mui/material/Skeleton"
import { MONOSPACE_FONT_FAMILY } from "theme/constants"
import { combineClasses } from "utils/combineClasses"
import Tooltip from "@mui/material/Tooltip"

type ItemStatus = "stale" | "valid" | "loading"

Expand Down Expand Up @@ -44,22 +46,33 @@ const MetadataItem: FC<{ item: WorkspaceAgentMetadata }> = ({ item }) => {
// users that what's shown is real. If times aren't correctly synced this
// could be buggy. But, how common is that anyways?
const value =
status === "stale" || status === "loading" ? (
status === "loading" ? (
<Skeleton
width={65}
height={12}
variant="text"
className={styles.skeleton}
/>
) : status === "stale" ? (
<Tooltip title="This data is stale and no longer up to date">
<div
className={combineClasses([
styles.metadataValue,
styles.metadataStale,
])}
>
{item.result.value}
</div>
</Tooltip>
) : (
<div
className={
styles.metadataValue +
" " +
(item.result.error.length === 0
className={combineClasses([
styles.metadataValue,

item.result.error.length === 0
? styles.metadataValueSuccess
: styles.metadataValueError)
}
: styles.metadataValueError,
])}
>
{item.result.value}
</div>
Expand Down Expand Up @@ -226,6 +239,11 @@ const useStyles = makeStyles((theme) => ({
color: theme.palette.error.main,
},

metadataStale: {
color: theme.palette.text.disabled,
cursor: "pointer",
},

skeleton: {
marginTop: theme.spacing(0.5),
},
Expand Down