From 9d63d82869a8cf074f3960ac03e5854722950091 Mon Sep 17 00:00:00 2001 From: brunoquaresma Date: Tue, 9 Aug 2022 13:26:35 -0300 Subject: [PATCH] feat: Add metadata support to the UI --- .../Resources/ResourceAvatarData.tsx | 117 ++++++++++++++++++ site/src/components/Resources/Resources.tsx | 12 +- site/src/testHelpers/entities.ts | 8 ++ 3 files changed, 127 insertions(+), 10 deletions(-) create mode 100644 site/src/components/Resources/ResourceAvatarData.tsx diff --git a/site/src/components/Resources/ResourceAvatarData.tsx b/site/src/components/Resources/ResourceAvatarData.tsx new file mode 100644 index 0000000000000..14e2bac8006aa --- /dev/null +++ b/site/src/components/Resources/ResourceAvatarData.tsx @@ -0,0 +1,117 @@ +import IconButton from "@material-ui/core/IconButton" +import { makeStyles } from "@material-ui/core/styles" +import Tooltip from "@material-ui/core/Tooltip" +import VisibilityOffOutlined from "@material-ui/icons/VisibilityOffOutlined" +import VisibilityOutlined from "@material-ui/icons/VisibilityOutlined" +import { WorkspaceResource } from "api/typesGenerated" +import { FC, useState } from "react" +import { TableCellData, TableCellDataPrimary } from "../TableCellData/TableCellData" +import { ResourceAvatar } from "./ResourceAvatar" + +const Language = { + showLabel: "Show value", + hideLabel: "Hide value", +} + +const SensitiveValue: React.FC<{ value: string }> = ({ value }) => { + const [shouldDisplay, setShouldDisplay] = useState(false) + const styles = useStyles() + const displayValue = shouldDisplay ? value : "••••••••" + const buttonLabel = shouldDisplay ? Language.hideLabel : Language.showLabel + const icon = shouldDisplay ? : + + return ( +
+ {displayValue} + + { + setShouldDisplay((value) => !value) + }} + size="small" + aria-label={buttonLabel} + > + {icon} + + +
+ ) +} + +export interface ResourceAvatarDataProps { + resource: WorkspaceResource +} + +export const ResourceAvatarData: FC = ({ resource }) => { + const styles = useStyles() + + return ( +
+
+ +
+ + + {resource.name} +
+ {resource.metadata?.map((metadata) => ( +
+ {metadata.key}: + {metadata.sensitive ? ( + + ) : ( +
{metadata.value}
+ )} +
+ ))} +
+
+
+ ) +} + +const useStyles = makeStyles((theme) => ({ + root: { + display: "flex", + }, + + avatarWrapper: { + marginRight: theme.spacing(3), + paddingTop: theme.spacing(0.5), + }, + + data: { + color: theme.palette.text.secondary, + fontSize: 14, + marginTop: theme.spacing(0.75), + display: "grid", + gridAutoFlow: "row", + whiteSpace: "nowrap", + gap: theme.spacing(0.75), + }, + + dataRow: { + display: "flex", + alignItems: "center", + + "& strong": { + marginRight: theme.spacing(1), + }, + }, + + sensitiveValue: { + display: "flex", + alignItems: "center", + }, + + button: { + marginLeft: theme.spacing(0.5), + color: "inherit", + + "& .MuiSvgIcon-root": { + width: 16, + height: 16, + }, + }, +})) diff --git a/site/src/components/Resources/Resources.tsx b/site/src/components/Resources/Resources.tsx index 989ddda75dab6..a8912078ff266 100644 --- a/site/src/components/Resources/Resources.tsx +++ b/site/src/components/Resources/Resources.tsx @@ -9,7 +9,6 @@ import useTheme from "@material-ui/styles/useTheme" import { ErrorSummary } from "components/ErrorSummary/ErrorSummary" import { FC } from "react" import { Workspace, WorkspaceResource } from "../../api/typesGenerated" -import { AvatarData } from "../../components/AvatarData/AvatarData" import { getDisplayAgentStatus } from "../../util/workspace" import { AppLink } from "../AppLink/AppLink" import { SSHButton } from "../SSHButton/SSHButton" @@ -18,7 +17,7 @@ import { TableHeaderRow } from "../TableHeaders/TableHeaders" import { TerminalLink } from "../TerminalLink/TerminalLink" import { AgentHelpTooltip } from "../Tooltips/AgentHelpTooltip" import { ResourcesHelpTooltip } from "../Tooltips/ResourcesHelpTooltip" -import { ResourceAvatar } from "./ResourceAvatar" +import { ResourceAvatarData } from "./ResourceAvatarData" const Language = { resources: "Resources", @@ -73,14 +72,7 @@ export const Resources: FC = ({ /* We need to initialize the agents to display the resource */ } const agents = resource.agents ?? [null] - const resourceName = ( - } - title={resource.name} - subtitle={resource.type} - highlightTitle - /> - ) + const resourceName = return agents.map((agent, agentIndex) => { { diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts index df765c278a592..1e08d88f4eeb8 100644 --- a/site/src/testHelpers/entities.ts +++ b/site/src/testHelpers/entities.ts @@ -287,12 +287,20 @@ export const MockWorkspaceResource: TypesGen.WorkspaceResource = { name: "a-workspace-resource", type: "google_compute_disk", workspace_transition: "start", + metadata: [ + { key: "type", value: "a-workspace-resource", sensitive: false }, + { key: "api_key", value: "12345678", sensitive: true }, + ], } export const MockWorkspaceResource2 = { ...MockWorkspaceResource, id: "test-workspace-resource-2", name: "another-workspace-resource", + metadata: [ + { key: "type", value: "google_compute_disk", sensitive: false }, + { key: "size", value: "32GB", sensitive: false }, + ], } export const MockUserAgent: Types.UserAgent = { pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy