From badb8e92e93f371dd3799b954d2d886c40b69300 Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Thu, 20 Jul 2023 12:38:03 +0000 Subject: [PATCH] chore(site): remove build logs from experimental --- coderd/apidoc/docs.go | 6 ++---- coderd/apidoc/swagger.json | 6 ++---- codersdk/deployment.go | 5 +---- docs/api/schemas.md | 15 +++++++-------- site/src/api/typesGenerated.ts | 2 -- .../pages/WorkspacePage/WorkspaceReadyPage.tsx | 8 +++----- 6 files changed, 15 insertions(+), 27 deletions(-) diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go index e4edd51bc9cb1..9ae3ad89c4f4e 100644 --- a/coderd/apidoc/docs.go +++ b/coderd/apidoc/docs.go @@ -7677,16 +7677,14 @@ const docTemplate = `{ "workspace_actions", "tailnet_ha_coordinator", "convert-to-oidc", - "single_tailnet", - "workspace_build_logs_ui" + "single_tailnet" ], "x-enum-varnames": [ "ExperimentMoons", "ExperimentWorkspaceActions", "ExperimentTailnetHACoordinator", "ExperimentConvertToOIDC", - "ExperimentSingleTailnet", - "ExperimentWorkspaceBuildLogsUI" + "ExperimentSingleTailnet" ] }, "codersdk.Feature": { diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json index 283c2290c8437..76dd096c6d8ee 100644 --- a/coderd/apidoc/swagger.json +++ b/coderd/apidoc/swagger.json @@ -6872,16 +6872,14 @@ "workspace_actions", "tailnet_ha_coordinator", "convert-to-oidc", - "single_tailnet", - "workspace_build_logs_ui" + "single_tailnet" ], "x-enum-varnames": [ "ExperimentMoons", "ExperimentWorkspaceActions", "ExperimentTailnetHACoordinator", "ExperimentConvertToOIDC", - "ExperimentSingleTailnet", - "ExperimentWorkspaceBuildLogsUI" + "ExperimentSingleTailnet" ] }, "codersdk.Feature": { diff --git a/codersdk/deployment.go b/codersdk/deployment.go index 73e3c2dd5d450..361e0e112c123 100644 --- a/codersdk/deployment.go +++ b/codersdk/deployment.go @@ -1781,7 +1781,6 @@ const ( // WARNING: This cannot be enabled when using HA. ExperimentSingleTailnet Experiment = "single_tailnet" - ExperimentWorkspaceBuildLogsUI Experiment = "workspace_build_logs_ui" // Add new experiments here! // ExperimentExample Experiment = "example" ) @@ -1790,9 +1789,7 @@ const ( // 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{ - ExperimentWorkspaceBuildLogsUI, -} +var ExperimentsAll = Experiments{} // Experiments is a list of experiments that are enabled for the deployment. // Multiple experiments may be enabled at the same time. diff --git a/docs/api/schemas.md b/docs/api/schemas.md index c7860c4d22a0a..bfda0b1973dea 100644 --- a/docs/api/schemas.md +++ b/docs/api/schemas.md @@ -2566,14 +2566,13 @@ AuthorizationObject can represent a "set" of objects, such as: all workspaces in #### Enumerated Values -| Value | -| ------------------------- | -| `moons` | -| `workspace_actions` | -| `tailnet_ha_coordinator` | -| `convert-to-oidc` | -| `single_tailnet` | -| `workspace_build_logs_ui` | +| Value | +| ------------------------ | +| `moons` | +| `workspace_actions` | +| `tailnet_ha_coordinator` | +| `convert-to-oidc` | +| `single_tailnet` | ## codersdk.Feature diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts index 26ca40b60aad4..7092afb6bd038 100644 --- a/site/src/api/typesGenerated.ts +++ b/site/src/api/typesGenerated.ts @@ -1436,14 +1436,12 @@ export type Experiment = | "single_tailnet" | "tailnet_ha_coordinator" | "workspace_actions" - | "workspace_build_logs_ui" export const Experiments: Experiment[] = [ "convert-to-oidc", "moons", "single_tailnet", "tailnet_ha_coordinator", "workspace_actions", - "workspace_build_logs_ui", ] // From codersdk/deployment.go diff --git a/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx b/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx index cca7ec98b0986..c4aacc24ee8b9 100644 --- a/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx +++ b/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx @@ -93,13 +93,11 @@ export const WorkspaceReadyPage = ({ const user = useMe() const { isWarningIgnored, ignoreWarning } = useIgnoreWarnings(user.id) const buildLogs = useBuildLogs(workspace) - const dashboard = useDashboard() const shouldDisplayBuildLogs = hasJobError(workspace) || - (dashboard.experiments.includes("workspace_build_logs_ui") && - ["canceling", "deleting", "pending", "starting", "stopping"].includes( - workspace.latest_build.status, - )) + ["canceling", "deleting", "pending", "starting", "stopping"].includes( + workspace.latest_build.status, + ) const { mutate: restartWorkspace, error: restartBuildError,