From 8338af35d999f236b2faa108cd2a46de3fd464f0 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 13 Mar 2025 17:05:49 +0000 Subject: [PATCH] make fmt lint --- coderd/workspaceagents_test.go | 8 +- .../AgentDevcontainerCard.stories.tsx | 2 +- .../resources/AgentDevcontainerCard.tsx | 8 +- site/src/testHelpers/entities.ts | 78 +++++++++---------- 4 files changed, 49 insertions(+), 47 deletions(-) diff --git a/coderd/workspaceagents_test.go b/coderd/workspaceagents_test.go index 69bba9d8ba..5b03cf5270 100644 --- a/coderd/workspaceagents_test.go +++ b/coderd/workspaceagents_test.go @@ -1173,10 +1173,12 @@ func TestWorkspaceAgentContainers(t *testing.T) { Labels: testLabels, Running: true, Status: "running", - Ports: []codersdk.WorkspaceAgentListeningPort{ + Ports: []codersdk.WorkspaceAgentDevcontainerPort{ { - Network: "tcp", - Port: 80, + Network: "tcp", + Port: 80, + HostIP: "0.0.0.0", + HostPort: 8000, }, }, Volumes: map[string]string{ diff --git a/site/src/modules/resources/AgentDevcontainerCard.stories.tsx b/site/src/modules/resources/AgentDevcontainerCard.stories.tsx index 95462be3cc..fed618a428 100644 --- a/site/src/modules/resources/AgentDevcontainerCard.stories.tsx +++ b/site/src/modules/resources/AgentDevcontainerCard.stories.tsx @@ -1,10 +1,10 @@ import type { Meta, StoryObj } from "@storybook/react"; -import { AgentDevcontainerCard } from "./AgentDevcontainerCard"; import { MockWorkspace, MockWorkspaceAgentDevcontainer, MockWorkspaceAgentDevcontainerPorts, } from "testHelpers/entities"; +import { AgentDevcontainerCard } from "./AgentDevcontainerCard"; const meta: Meta = { title: "modules/resources/AgentDevcontainerCard", diff --git a/site/src/modules/resources/AgentDevcontainerCard.tsx b/site/src/modules/resources/AgentDevcontainerCard.tsx index b8cebc9db4..5f01ebb44f 100644 --- a/site/src/modules/resources/AgentDevcontainerCard.tsx +++ b/site/src/modules/resources/AgentDevcontainerCard.tsx @@ -1,4 +1,5 @@ import Link from "@mui/material/Link"; +import Tooltip, { type TooltipProps } from "@mui/material/Tooltip"; import type { Workspace, WorkspaceAgentDevcontainer, @@ -10,7 +11,6 @@ import { portForwardURL } from "utils/portForward"; import { AgentButton } from "./AgentButton"; import { AgentDevcontainerSSHButton } from "./SSHButton/SSHButton"; import { TerminalLink } from "./TerminalLink/TerminalLink"; -import Tooltip, { type TooltipProps } from "@mui/material/Tooltip"; type AgentDevcontainerCardProps = { container: WorkspaceAgentDevcontainer; @@ -52,13 +52,13 @@ export const AgentDevcontainerCard: FC = ({ /> {wildcardHostname !== "" && container.ports.map((port) => { - let portLabel = `${port.port}/${port.network.toUpperCase()}`; - let hasHostBind = + const portLabel = `${port.port}/${port.network.toUpperCase()}`; + const hasHostBind = port.host_port !== undefined && port.host_port !== null && port.host_ip !== undefined && port.host_ip !== null; - let helperText = hasHostBind + const helperText = hasHostBind ? `${port.host_ip}:${port.host_port}` : "Not bound to host"; return ( diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts index 55c5509025..cd12234e0f 100644 --- a/site/src/testHelpers/entities.ts +++ b/site/src/testHelpers/entities.ts @@ -4273,45 +4273,45 @@ function mockTwoDaysAgo() { return date.toISOString(); } -export const MockWorkspaceAgentDevcontainerPorts: TypesGen.WorkspaceAgentDevcontainerPort[] = [ - { - port: 1000, - network: "tcp", - host_port: 1000, - host_ip: "0.0.0.0" - }, - { - port: 2001, - network: "tcp", - host_port: 2000, - host_ip: "::1" - }, - { - port: 8888, - network: "tcp", - } -] +export const MockWorkspaceAgentDevcontainerPorts: TypesGen.WorkspaceAgentDevcontainerPort[] = + [ + { + port: 1000, + network: "tcp", + host_port: 1000, + host_ip: "0.0.0.0", + }, + { + port: 2001, + network: "tcp", + host_port: 2000, + host_ip: "::1", + }, + { + port: 8888, + network: "tcp", + }, + ]; -export const MockWorkspaceAgentDevcontainer : TypesGen.WorkspaceAgentDevcontainer = { - created_at: "2024-01-04T15:53:03.21563Z", - id: "abcd1234", - name: "container-1", - image: "ubuntu:latest", - labels: { - "foo": "bar" - }, - ports: [], - running: true, - status: "running", - volumes: { - "/mnt/volume1": "/volume1", - } -} +export const MockWorkspaceAgentDevcontainer: TypesGen.WorkspaceAgentDevcontainer = + { + created_at: "2024-01-04T15:53:03.21563Z", + id: "abcd1234", + name: "container-1", + image: "ubuntu:latest", + labels: { + foo: "bar", + }, + ports: [], + running: true, + status: "running", + volumes: { + "/mnt/volume1": "/volume1", + }, + }; export const MockWorkspaceAgentListContainersResponse: TypesGen.WorkspaceAgentListContainersResponse = -{ - containers: [ - MockWorkspaceAgentDevcontainer, - ], - "warnings": ["This is a warning"], -} + { + containers: [MockWorkspaceAgentDevcontainer], + warnings: ["This is a warning"], + };