From d638c1b4de8b65795f2743e4b68bfd99c57d86f5 Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Wed, 16 Aug 2023 12:39:12 +0000 Subject: [PATCH 1/4] Remove experiment --- coderd/apidoc/docs.go | 2 -- coderd/apidoc/swagger.json | 2 -- codersdk/deployment.go | 4 ---- docs/api/schemas.md | 1 - site/src/api/typesGenerated.ts | 2 -- 5 files changed, 11 deletions(-) diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go index 00f1b57ef7f8c..ea0979333b451 100644 --- a/coderd/apidoc/docs.go +++ b/coderd/apidoc/docs.go @@ -8091,7 +8091,6 @@ const docTemplate = `{ "single_tailnet", "template_restart_requirement", "deployment_health_page", - "template_parameters_insights", "workspaces_batch_actions" ], "x-enum-varnames": [ @@ -8101,7 +8100,6 @@ const docTemplate = `{ "ExperimentSingleTailnet", "ExperimentTemplateRestartRequirement", "ExperimentDeploymentHealthPage", - "ExperimentTemplateParametersInsights", "ExperimentWorkspacesBatchActions" ] }, diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json index eef5f6d0dae2a..375be4c013fff 100644 --- a/coderd/apidoc/swagger.json +++ b/coderd/apidoc/swagger.json @@ -7246,7 +7246,6 @@ "single_tailnet", "template_restart_requirement", "deployment_health_page", - "template_parameters_insights", "workspaces_batch_actions" ], "x-enum-varnames": [ @@ -7256,7 +7255,6 @@ "ExperimentSingleTailnet", "ExperimentTemplateRestartRequirement", "ExperimentDeploymentHealthPage", - "ExperimentTemplateParametersInsights", "ExperimentWorkspacesBatchActions" ] }, diff --git a/codersdk/deployment.go b/codersdk/deployment.go index d49297dbf8f3f..fca5d89278c21 100644 --- a/codersdk/deployment.go +++ b/codersdk/deployment.go @@ -1928,9 +1928,6 @@ const ( // Deployment health page ExperimentDeploymentHealthPage Experiment = "deployment_health_page" - // Template parameters insights - ExperimentTemplateParametersInsights Experiment = "template_parameters_insights" - // Workspaces batch actions ExperimentWorkspacesBatchActions Experiment = "workspaces_batch_actions" @@ -1944,7 +1941,6 @@ const ( // not be included here and will be essentially hidden. var ExperimentsAll = Experiments{ ExperimentDeploymentHealthPage, - ExperimentTemplateParametersInsights, ExperimentWorkspacesBatchActions, } diff --git a/docs/api/schemas.md b/docs/api/schemas.md index 523a0e0c3c649..8d73e64e84aa6 100644 --- a/docs/api/schemas.md +++ b/docs/api/schemas.md @@ -2710,7 +2710,6 @@ AuthorizationObject can represent a "set" of objects, such as: all workspaces in | `single_tailnet` | | `template_restart_requirement` | | `deployment_health_page` | -| `template_parameters_insights` | | `workspaces_batch_actions` | ## codersdk.Feature diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts index 909111cf5e740..ccb37bc923004 100644 --- a/site/src/api/typesGenerated.ts +++ b/site/src/api/typesGenerated.ts @@ -1598,7 +1598,6 @@ export type Experiment = | "moons" | "single_tailnet" | "tailnet_pg_coordinator" - | "template_parameters_insights" | "template_restart_requirement" | "workspace_actions" | "workspaces_batch_actions" @@ -1607,7 +1606,6 @@ export const Experiments: Experiment[] = [ "moons", "single_tailnet", "tailnet_pg_coordinator", - "template_parameters_insights", "template_restart_requirement", "workspace_actions", "workspaces_batch_actions", From de91a521f6384f30f89583a90b38cf9b452d25c5 Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Wed, 16 Aug 2023 12:41:18 +0000 Subject: [PATCH 2/4] Remove conditionals from the FE --- .../GeneralSettingsPageView.stories.tsx | 1 - .../TemplateInsightsPage.tsx | 18 ++++-------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/site/src/pages/DeploySettingsPage/GeneralSettingsPage/GeneralSettingsPageView.stories.tsx b/site/src/pages/DeploySettingsPage/GeneralSettingsPage/GeneralSettingsPageView.stories.tsx index 9e65fca98cc3a..4a11f6224c08a 100644 --- a/site/src/pages/DeploySettingsPage/GeneralSettingsPage/GeneralSettingsPageView.stories.tsx +++ b/site/src/pages/DeploySettingsPage/GeneralSettingsPage/GeneralSettingsPageView.stories.tsx @@ -36,7 +36,6 @@ const meta: Meta = { "workspace_actions", "single_tailnet", "deployment_health_page", - "template_parameters_insights", ], flag_shorthand: "", hidden: false, diff --git a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx index 584f36828139e..d642fc97163bb 100644 --- a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx +++ b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx @@ -30,7 +30,6 @@ import { subDays, isToday } from "date-fns" import "react-date-range/dist/styles.css" import "react-date-range/dist/theme/default.css" import { DateRange, DateRangeValue } from "./DateRange" -import { useDashboard } from "components/Dashboard/DashboardProvider" import OpenInNewOutlined from "@mui/icons-material/OpenInNewOutlined" import Link from "@mui/material/Link" import CheckCircleOutlined from "@mui/icons-material/CheckCircleOutlined" @@ -61,10 +60,6 @@ export default function TemplateInsightsPage() { queryKey: ["templates", template.id, "user-latency", insightsFilter], queryFn: () => getInsightsUserLatency(insightsFilter), }) - const dashboard = useDashboard() - const shouldDisplayParameters = - dashboard.experiments.includes("template_parameters_insights") || - process.env.NODE_ENV === "development" return ( <> @@ -77,7 +72,6 @@ export default function TemplateInsightsPage() { } templateInsights={templateInsights} userLatency={userLatency} - shouldDisplayParameters={shouldDisplayParameters} /> ) @@ -86,12 +80,10 @@ export default function TemplateInsightsPage() { export const TemplateInsightsPageView = ({ templateInsights, userLatency, - shouldDisplayParameters, dateRange, }: { templateInsights: TemplateInsightsResponse | undefined userLatency: UserLatencyInsightsResponse | undefined - shouldDisplayParameters: boolean dateRange: ReactNode }) => { return ( @@ -114,12 +106,10 @@ export const TemplateInsightsPageView = ({ sx={{ gridColumn: "span 3" }} data={templateInsights?.report.apps_usage} /> - {shouldDisplayParameters && ( - - )} + ) From e65fedcc170fecfc89f53d3f7aceadf703b09ca8 Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Wed, 16 Aug 2023 12:54:50 +0000 Subject: [PATCH 3/4] Add usage list header --- .../TemplateInsightsPage.tsx | 48 +++++++++++-------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx index d642fc97163bb..35bc84b285eca 100644 --- a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx +++ b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx @@ -35,6 +35,8 @@ import Link from "@mui/material/Link" import CheckCircleOutlined from "@mui/icons-material/CheckCircleOutlined" import CancelOutlined from "@mui/icons-material/CancelOutlined" import { getDateRangeFilter } from "./utils" +import { HelpOutlineOutlined } from "@mui/icons-material" +import Tooltip from "@mui/material/Tooltip" export default function TemplateInsightsPage() { const now = new Date() @@ -339,25 +341,34 @@ const TemplateParametersUsagePanel = ({ + theme.palette.text.secondary, + fontWeight: 500, + fontSize: 13, + cursor: "default", + }} + > + Value + + Count + + {parameter.values .sort((a, b) => b.count - a.count) .map((usage, usageIndex) => ( - {usage.count} - + ))} @@ -368,6 +379,14 @@ const TemplateParametersUsagePanel = ({ ) } +const ParameterUsageRow = styled(Box)(({ theme }) => ({ + display: "flex", + alignItems: "baseline", + justifyContent: "space-between", + padding: theme.spacing(0.5, 0), + gap: theme.spacing(5), +})) + const ParameterUsageLabel = ({ usage, parameter, @@ -376,16 +395,7 @@ const ParameterUsageLabel = ({ parameter: TemplateParameterUsage }) => { if (usage.value.trim() === "") { - return ( - theme.palette.text.secondary, - }} - > - Not set - - ) + return Not set } if (parameter.options) { From 99837df7f66e12641121ccfa290e46d9ea9a0f34 Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Wed, 16 Aug 2023 12:55:11 +0000 Subject: [PATCH 4/4] Remove unused import --- .../TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx index 35bc84b285eca..131d13104ded4 100644 --- a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx +++ b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx @@ -35,7 +35,6 @@ import Link from "@mui/material/Link" import CheckCircleOutlined from "@mui/icons-material/CheckCircleOutlined" import CancelOutlined from "@mui/icons-material/CancelOutlined" import { getDateRangeFilter } from "./utils" -import { HelpOutlineOutlined } from "@mui/icons-material" import Tooltip from "@mui/material/Tooltip" export default function TemplateInsightsPage() {