From 1701c41535a4e4cea82660aaca6c48d7625a6246 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 11 Jan 2024 13:18:55 +0000 Subject: [PATCH] feat(site): remove experiment deployment_health_page --- coderd/apidoc/docs.go | 7 +++++-- coderd/apidoc/swagger.json | 7 +++++-- codersdk/deployment.go | 9 ++------- docs/api/general.md | 4 ++-- docs/api/schemas.md | 8 ++++---- site/src/api/typesGenerated.ts | 4 ++-- .../Dashboard/DeploymentBanner/DeploymentBanner.tsx | 6 +----- site/src/components/Dashboard/Navbar/Navbar.tsx | 6 +----- .../GeneralSettingsPageView.stories.tsx | 4 ++-- site/src/pages/DeploySettingsPage/Sidebar.tsx | 11 +++-------- site/src/testHelpers/entities.ts | 4 +--- 11 files changed, 28 insertions(+), 42 deletions(-) diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go index b3f90cfa06b09..1fcdd45da7381 100644 --- a/coderd/apidoc/docs.go +++ b/coderd/apidoc/docs.go @@ -9108,10 +9108,13 @@ const docTemplate = `{ "codersdk.Experiment": { "type": "string", "enum": [ - "deployment_health_page" + "example" ], + "x-enum-comments": { + "ExperimentExample": "This isn't used for anything." + }, "x-enum-varnames": [ - "ExperimentDeploymentHealthPage" + "ExperimentExample" ] }, "codersdk.ExternalAuth": { diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json index d517185ec2218..cbf49d80568b6 100644 --- a/coderd/apidoc/swagger.json +++ b/coderd/apidoc/swagger.json @@ -8153,8 +8153,11 @@ }, "codersdk.Experiment": { "type": "string", - "enum": ["deployment_health_page"], - "x-enum-varnames": ["ExperimentDeploymentHealthPage"] + "enum": ["example"], + "x-enum-comments": { + "ExperimentExample": "This isn't used for anything." + }, + "x-enum-varnames": ["ExperimentExample"] }, "codersdk.ExternalAuth": { "type": "object", diff --git a/codersdk/deployment.go b/codersdk/deployment.go index 29d5a0cd3cf89..5ee0ce478ca8a 100644 --- a/codersdk/deployment.go +++ b/codersdk/deployment.go @@ -2076,20 +2076,15 @@ func (c *Client) BuildInfo(ctx context.Context) (BuildInfoResponse, error) { type Experiment string const ( - // Deployment health page - ExperimentDeploymentHealthPage Experiment = "deployment_health_page" - // Add new experiments here! - // ExperimentExample Experiment = "example" + ExperimentExample Experiment = "example" // This isn't used for anything. ) // ExperimentsAll should include all experiments that are safe for // users to opt-in to via --experimental='*'. // Experiments that are not ready for consumption by all users should // not be included here and will be essentially hidden. -var ExperimentsAll = Experiments{ - ExperimentDeploymentHealthPage, -} +var ExperimentsAll = Experiments{} // Experiments is a list of experiments. // Multiple experiments may be enabled at the same time. diff --git a/docs/api/general.md b/docs/api/general.md index 2ca0a6c5d9873..303b36a1a26d6 100644 --- a/docs/api/general.md +++ b/docs/api/general.md @@ -563,7 +563,7 @@ curl -X GET http://coder-server:8080/api/v2/experiments \ > 200 Response ```json -["deployment_health_page"] +["example"] ``` ### Responses @@ -600,7 +600,7 @@ curl -X GET http://coder-server:8080/api/v2/experiments/available \ > 200 Response ```json -["deployment_health_page"] +["example"] ``` ### Responses diff --git a/docs/api/schemas.md b/docs/api/schemas.md index a93f5cfc1d9ba..6e4df6d796cdc 100644 --- a/docs/api/schemas.md +++ b/docs/api/schemas.md @@ -2869,16 +2869,16 @@ AuthorizationObject can represent a "set" of objects, such as: all workspaces in ## codersdk.Experiment ```json -"deployment_health_page" +"example" ``` ### Properties #### Enumerated Values -| Value | -| ------------------------ | -| `deployment_health_page` | +| Value | +| --------- | +| `example` | ## codersdk.ExternalAuth diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts index be677e07d58d7..a5a7663d0de9f 100644 --- a/site/src/api/typesGenerated.ts +++ b/site/src/api/typesGenerated.ts @@ -1813,8 +1813,8 @@ export const Entitlements: Entitlement[] = [ ]; // From codersdk/deployment.go -export type Experiment = "deployment_health_page"; -export const Experiments: Experiment[] = ["deployment_health_page"]; +export type Experiment = "example"; +export const Experiments: Experiment[] = ["example"]; // From codersdk/deployment.go export type FeatureName = diff --git a/site/src/components/Dashboard/DeploymentBanner/DeploymentBanner.tsx b/site/src/components/Dashboard/DeploymentBanner/DeploymentBanner.tsx index f87cf31314e0a..526f822f21a2a 100644 --- a/site/src/components/Dashboard/DeploymentBanner/DeploymentBanner.tsx +++ b/site/src/components/Dashboard/DeploymentBanner/DeploymentBanner.tsx @@ -3,18 +3,14 @@ import { useQuery } from "react-query"; import { deploymentStats } from "api/queries/deployment"; import { usePermissions } from "hooks/usePermissions"; import { DeploymentBannerView } from "./DeploymentBannerView"; -import { useDashboard } from "../DashboardProvider"; import { health } from "api/queries/debug"; export const DeploymentBanner: FC = () => { - const dashboard = useDashboard(); const permissions = usePermissions(); const deploymentStatsQuery = useQuery(deploymentStats()); const healthQuery = useQuery({ ...health(), - enabled: - dashboard.experiments.includes("deployment_health_page") && - permissions.viewDeploymentValues, + enabled: permissions.viewDeploymentValues, }); if (!permissions.viewDeploymentValues || !deploymentStatsQuery.data) { diff --git a/site/src/components/Dashboard/Navbar/Navbar.tsx b/site/src/components/Dashboard/Navbar/Navbar.tsx index 3e66d60b3d556..4eeca4825e9fb 100644 --- a/site/src/components/Dashboard/Navbar/Navbar.tsx +++ b/site/src/components/Dashboard/Navbar/Navbar.tsx @@ -18,11 +18,7 @@ export const Navbar: FC = () => { const canViewDeployment = Boolean(permissions.viewDeploymentValues); const canViewAllUsers = Boolean(permissions.readAllUsers); const proxyContextValue = useProxy(); - const dashboard = useDashboard(); - const canViewHealth = - canViewDeployment && - dashboard.experiments.includes("deployment_health_page"); - + const canViewHealth = canViewDeployment; return ( = { }, ], deploymentDAUs: MockDeploymentDAUResponse, - safeExperiments: ["deployment_health_page"], + safeExperiments: [], }, }; @@ -102,6 +102,6 @@ export const allExperimentsEnabled: Story = { hidden: false, }, ], - safeExperiments: ["deployment_health_page"], + safeExperiments: [], }, }; diff --git a/site/src/pages/DeploySettingsPage/Sidebar.tsx b/site/src/pages/DeploySettingsPage/Sidebar.tsx index d51cba7bb6776..c7f6961676dbb 100644 --- a/site/src/pages/DeploySettingsPage/Sidebar.tsx +++ b/site/src/pages/DeploySettingsPage/Sidebar.tsx @@ -9,7 +9,6 @@ import VpnKeyOutlined from "@mui/icons-material/VpnKeyOutlined"; import MonitorHeartOutlined from "@mui/icons-material/MonitorHeartOutlined"; // import Token from "@mui/icons-material/Token"; import { type FC } from "react"; -import { useDashboard } from "components/Dashboard/DashboardProvider"; import { GitIcon } from "components/Icons/GitIcon"; import { Sidebar as BaseSidebar, @@ -17,8 +16,6 @@ import { } from "components/Sidebar/Sidebar"; export const Sidebar: FC = () => { - const dashboard = useDashboard(); - return ( @@ -52,11 +49,9 @@ export const Sidebar: FC = () => { Observability - {dashboard.experiments.includes("deployment_health_page") && ( - - Health - - )} + + Health + ); }; diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts index 5751d7ccb2777..1ccfec3395386 100644 --- a/site/src/testHelpers/entities.ts +++ b/site/src/testHelpers/entities.ts @@ -2047,9 +2047,7 @@ export const MockEntitlementsWithUserLimit: TypesGen.Entitlements = { }), }; -export const MockExperiments: TypesGen.Experiment[] = [ - "deployment_health_page", -]; +export const MockExperiments: TypesGen.Experiment[] = []; export const MockAuditLog: TypesGen.AuditLog = { id: "fbd2116a-8961-4954-87ae-e4575bd29ce0",