diff --git a/site/src/components/Textarea/Textarea.tsx b/site/src/components/Textarea/Textarea.tsx
index 7b55c476d6..b9078ae98a 100644
--- a/site/src/components/Textarea/Textarea.tsx
+++ b/site/src/components/Textarea/Textarea.tsx
@@ -3,7 +3,6 @@
* @see {@link https://ui.shadcn.com/docs/components/textarea}
*/
import * as React from "react";
-
import { cn } from "utils/cn";
export const Textarea = React.forwardRef<
diff --git a/site/src/hooks/hookPolyfills.ts b/site/src/hooks/hookPolyfills.ts
index 743a3f8750..171ff2c053 100644
--- a/site/src/hooks/hookPolyfills.ts
+++ b/site/src/hooks/hookPolyfills.ts
@@ -7,7 +7,6 @@
* hooks do, especially for dependency arrays.
*/
import { useCallback, useLayoutEffect, useRef } from "react";
-
/**
* A DIY version of useEffectEvent.
*
diff --git a/site/src/hooks/useEmbeddedMetadata.ts b/site/src/hooks/useEmbeddedMetadata.ts
index 64926755ec..951aced7a7 100644
--- a/site/src/hooks/useEmbeddedMetadata.ts
+++ b/site/src/hooks/useEmbeddedMetadata.ts
@@ -8,7 +8,6 @@ import type {
UserAppearanceSettings,
} from "api/typesGenerated";
import { useMemo, useSyncExternalStore } from "react";
-
export const DEFAULT_METADATA_KEY = "property";
/**
diff --git a/site/src/hooks/useWindowSize.ts b/site/src/hooks/useWindowSize.ts
index 5fff5c17d8..f2c8a46414 100644
--- a/site/src/hooks/useWindowSize.ts
+++ b/site/src/hooks/useWindowSize.ts
@@ -1,5 +1,4 @@
import { useEffect, useState } from "react";
-
export function useWindowSize() {
const [windowSize, setWindowSize] = useState({
width: window.innerWidth,
diff --git a/site/src/hooks/useWorkspaceBuildLogs.ts b/site/src/hooks/useWorkspaceBuildLogs.ts
index 896ea49219..8ef249ef24 100644
--- a/site/src/hooks/useWorkspaceBuildLogs.ts
+++ b/site/src/hooks/useWorkspaceBuildLogs.ts
@@ -2,7 +2,6 @@ import { watchBuildLogsByBuildId } from "api/api";
import type { ProvisionerJobLog } from "api/typesGenerated";
import { displayError } from "components/GlobalSnackbar/utils";
import { useEffect, useRef, useState } from "react";
-
export const useWorkspaceBuildLogs = (
// buildId is optional because sometimes the build is not loaded yet
buildId: string | undefined,
diff --git a/site/src/modules/provisioners/ProvisionerAlert.tsx b/site/src/modules/provisioners/ProvisionerAlert.tsx
index a736e9a5b7..2160b4e7b3 100644
--- a/site/src/modules/provisioners/ProvisionerAlert.tsx
+++ b/site/src/modules/provisioners/ProvisionerAlert.tsx
@@ -3,7 +3,6 @@ import AlertTitle from "@mui/material/AlertTitle";
import { Alert, type AlertColor, AlertDetail } from "components/Alert/Alert";
import { ProvisionerTag } from "modules/provisioners/ProvisionerTag";
import type { FC } from "react";
-
export enum AlertVariant {
// Alerts are usually styled with a full rounded border and meant to use as a visually distinct element of the page.
// The Standalone variant conforms to this styling.
diff --git a/site/src/modules/resources/AgentButton.tsx b/site/src/modules/resources/AgentButton.tsx
index e5b4a54834..c02a591b2d 100644
--- a/site/src/modules/resources/AgentButton.tsx
+++ b/site/src/modules/resources/AgentButton.tsx
@@ -1,6 +1,5 @@
import { Button, type ButtonProps } from "components/Button/Button";
import { forwardRef } from "react";
-
export const AgentButton = forwardRef
(
(props, ref) => {
return ;
diff --git a/site/src/modules/resources/AgentLogs/AgentLogLine.tsx b/site/src/modules/resources/AgentLogs/AgentLogLine.tsx
index fb962fe560..ef216ca81f 100644
--- a/site/src/modules/resources/AgentLogs/AgentLogLine.tsx
+++ b/site/src/modules/resources/AgentLogs/AgentLogLine.tsx
@@ -2,7 +2,6 @@ import type { Interpolation, Theme } from "@emotion/react";
import AnsiToHTML from "ansi-to-html";
import { type Line, LogLine, LogLinePrefix } from "components/Logs/LogLine";
import { type FC, type ReactNode, useMemo } from "react";
-
// Approximate height of a log line. Used to control virtualized list height.
export const AGENT_LOG_LINE_HEIGHT = 20;
diff --git a/site/src/modules/resources/AppLink/AppPreview.tsx b/site/src/modules/resources/AppLink/AppPreview.tsx
index 8254164f9c..4ec162ec5a 100644
--- a/site/src/modules/resources/AppLink/AppPreview.tsx
+++ b/site/src/modules/resources/AppLink/AppPreview.tsx
@@ -1,6 +1,5 @@
import { Stack } from "components/Stack/Stack";
import type { FC, PropsWithChildren } from "react";
-
export const AppPreview: FC = ({ children }) => {
return (
Promise },
diff --git a/site/src/modules/workspaces/WorkspaceTiming/Chart/Bar.tsx b/site/src/modules/workspaces/WorkspaceTiming/Chart/Bar.tsx
index b76aa11a98..4a70beafc4 100644
--- a/site/src/modules/workspaces/WorkspaceTiming/Chart/Bar.tsx
+++ b/site/src/modules/workspaces/WorkspaceTiming/Chart/Bar.tsx
@@ -1,6 +1,5 @@
import type { Interpolation, Theme } from "@emotion/react";
import { type ButtonHTMLAttributes, forwardRef, type HTMLProps } from "react";
-
export type BarColors = {
stroke: string;
fill: string;
diff --git a/site/src/modules/workspaces/WorkspaceTiming/Chart/YAxis.tsx b/site/src/modules/workspaces/WorkspaceTiming/Chart/YAxis.tsx
index 2812904fdc..e1b15d1976 100644
--- a/site/src/modules/workspaces/WorkspaceTiming/Chart/YAxis.tsx
+++ b/site/src/modules/workspaces/WorkspaceTiming/Chart/YAxis.tsx
@@ -1,6 +1,5 @@
import type { Interpolation, Theme } from "@emotion/react";
import type { FC, HTMLProps } from "react";
-
export const YAxis: FC> = (props) => {
return ;
};
diff --git a/site/src/pages/AuditPage/AuditPage.tsx b/site/src/pages/AuditPage/AuditPage.tsx
index 6c8c52a679..3c4d8b6525 100644
--- a/site/src/pages/AuditPage/AuditPage.tsx
+++ b/site/src/pages/AuditPage/AuditPage.tsx
@@ -7,7 +7,6 @@ import { useDashboard } from "modules/dashboard/useDashboard";
import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
import { useOrganizationsFilterMenu } from "modules/tableFiltering/options";
import type { FC } from "react";
-import { Helmet } from "react-helmet-async";
import { useSearchParams } from "react-router";
import { pageTitle } from "utils/page";
import { useActionFilterMenu, useResourceTypeFilterMenu } from "./AuditFilter";
@@ -76,9 +75,7 @@ const AuditPage: FC = () => {
return (
<>
-
- {pageTitle("Audit")}
-
+ {pageTitle("Audit")}
{
return (
<>
-
- {pageTitle("CLI Auth")}
-
+ {pageTitle("CLI Auth")}
);
diff --git a/site/src/pages/CliInstallPage/CliInstallPage.tsx b/site/src/pages/CliInstallPage/CliInstallPage.tsx
index e8143256ea..540c7e4bcf 100644
--- a/site/src/pages/CliInstallPage/CliInstallPage.tsx
+++ b/site/src/pages/CliInstallPage/CliInstallPage.tsx
@@ -1,6 +1,5 @@
import isChromatic from "chromatic/isChromatic";
import type { FC } from "react";
-import { Helmet } from "react-helmet-async";
import { pageTitle } from "utils/page";
import { CliInstallPageView } from "./CliInstallPageView";
@@ -9,9 +8,7 @@ const CliInstallPage: FC = () => {
return (
<>
-
- {pageTitle("Install the Coder CLI")}
-
+ {pageTitle("Install the Coder CLI")}
);
diff --git a/site/src/pages/ConnectionLogPage/ConnectionLogPage.tsx b/site/src/pages/ConnectionLogPage/ConnectionLogPage.tsx
index fd7fc12e38..ea1c71ed00 100644
--- a/site/src/pages/ConnectionLogPage/ConnectionLogPage.tsx
+++ b/site/src/pages/ConnectionLogPage/ConnectionLogPage.tsx
@@ -7,7 +7,6 @@ import { useDashboard } from "modules/dashboard/useDashboard";
import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
import { useOrganizationsFilterMenu } from "modules/tableFiltering/options";
import type { FC } from "react";
-import { Helmet } from "react-helmet-async";
import { useSearchParams } from "react-router";
import { pageTitle } from "utils/page";
import { useStatusFilterMenu, useTypeFilterMenu } from "./ConnectionLogFilter";
@@ -72,9 +71,7 @@ const ConnectionLogPage: FC = () => {
return (
<>
-
- {pageTitle("Connection Log")}
-
+ {pageTitle("Connection Log")}
{
return (
<>
-
- {pageTitle("Create a Template")}
-
+ {pageTitle("Create a Template")}
+
{
return (
<>
-
- {pageTitle("Create Template")}
-
+ {pageTitle("Create Template")}
{searchParams.has("fromTemplate") ? (
diff --git a/site/src/pages/CreateTokenPage/CreateTokenPage.tsx b/site/src/pages/CreateTokenPage/CreateTokenPage.tsx
index f80e152a58..5184efb908 100644
--- a/site/src/pages/CreateTokenPage/CreateTokenPage.tsx
+++ b/site/src/pages/CreateTokenPage/CreateTokenPage.tsx
@@ -7,7 +7,6 @@ import { displayError, displaySuccess } from "components/GlobalSnackbar/utils";
import { Loader } from "components/Loader/Loader";
import { useFormik } from "formik";
import { type FC, useState } from "react";
-import { Helmet } from "react-helmet-async";
import { useMutation, useQuery } from "react-query";
import { useNavigate } from "react-router";
import { pageTitle } from "utils/page";
@@ -89,9 +88,8 @@ const CreateTokenPage: FC = () => {
return (
<>
-
- {pageTitle("Create Token")}
-
+ {pageTitle("Create Token")}
+
{tokenFetchFailed && }
{
return (
-
- {pageTitle("Create User")}
-
+ {pageTitle("Create User")}
{
return (
<>
-
- {pageTitle(title)}
-
+ {pageTitle(title)}
+
{isLoadingFormData || isLoadingExternalAuth || autoCreateReady ? (
) : (
diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageExperimental.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageExperimental.tsx
index 588606f527..19feeb318e 100644
--- a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageExperimental.tsx
+++ b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageExperimental.tsx
@@ -26,7 +26,6 @@ import {
useRef,
useState,
} from "react";
-import { Helmet } from "react-helmet-async";
import { useMutation, useQuery, useQueryClient } from "react-query";
import { useNavigate, useParams, useSearchParams } from "react-router";
import { pageTitle } from "utils/page";
@@ -283,9 +282,8 @@ const CreateWorkspacePageExperimental: FC = () => {
return (
<>
-
- {pageTitle(title)}
-
+ {pageTitle(title)}
+
{shouldShowLoader ? (
) : (
diff --git a/site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AppearanceSettingsPage.tsx b/site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AppearanceSettingsPage.tsx
index 994d76ff65..014184bdf7 100644
--- a/site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AppearanceSettingsPage.tsx
+++ b/site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AppearanceSettingsPage.tsx
@@ -5,7 +5,6 @@ import { displayError, displaySuccess } from "components/GlobalSnackbar/utils";
import { useDashboard } from "modules/dashboard/useDashboard";
import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
import type { FC } from "react";
-import { Helmet } from "react-helmet-async";
import { useMutation, useQueryClient } from "react-query";
import { pageTitle } from "utils/page";
import { AppearanceSettingsPageView } from "./AppearanceSettingsPageView";
@@ -38,9 +37,7 @@ const AppearanceSettingsPage: FC = () => {
return (
<>
-
- {pageTitle("Appearance Settings")}
-
+ {pageTitle("Appearance Settings")}
{
return (
<>
-
- {pageTitle("External Authentication Settings")}
-
+ {pageTitle("External Authentication Settings")}
+
);
diff --git a/site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/IdpOrgSyncPage.tsx b/site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/IdpOrgSyncPage.tsx
index 38a76a5f3d..838685443f 100644
--- a/site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/IdpOrgSyncPage.tsx
+++ b/site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/IdpOrgSyncPage.tsx
@@ -12,7 +12,6 @@ import { Paywall } from "components/Paywall/Paywall";
import { useDashboard } from "modules/dashboard/useDashboard";
import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
import { type FC, useEffect, useState } from "react";
-import { Helmet } from "react-helmet-async";
import { useMutation, useQuery, useQueryClient } from "react-query";
import { docs } from "utils/docs";
import { pageTitle } from "utils/page";
@@ -61,9 +60,7 @@ const IdpOrgSyncPage: FC = () => {
return (
<>
-
- {pageTitle("Organization IdP Sync")}
-
+ {pageTitle("Organization IdP Sync")}
diff --git a/site/src/pages/DeploymentSettingsPage/LicensesSettingsPage/AddNewLicensePage.tsx b/site/src/pages/DeploymentSettingsPage/LicensesSettingsPage/AddNewLicensePage.tsx
index aaa1f17061..af9bfb413f 100644
--- a/site/src/pages/DeploymentSettingsPage/LicensesSettingsPage/AddNewLicensePage.tsx
+++ b/site/src/pages/DeploymentSettingsPage/LicensesSettingsPage/AddNewLicensePage.tsx
@@ -1,7 +1,6 @@
import { API } from "api/api";
import { displayError, displaySuccess } from "components/GlobalSnackbar/utils";
import type { FC } from "react";
-import { Helmet } from "react-helmet-async";
import { useMutation } from "react-query";
import { useNavigate } from "react-router";
import { pageTitle } from "utils/page";
@@ -38,9 +37,7 @@ const AddNewLicensePage: FC = () => {
return (
<>
-
- {pageTitle("License Settings")}
-
+ {pageTitle("License Settings")}
= ({ children }) => {
return (
diff --git a/site/src/pages/DeploymentSettingsPage/LicensesSettingsPage/LicensesSettingsPage.tsx b/site/src/pages/DeploymentSettingsPage/LicensesSettingsPage/LicensesSettingsPage.tsx
index fe3fe0975e..7f8ee4d7d0 100644
--- a/site/src/pages/DeploymentSettingsPage/LicensesSettingsPage/LicensesSettingsPage.tsx
+++ b/site/src/pages/DeploymentSettingsPage/LicensesSettingsPage/LicensesSettingsPage.tsx
@@ -5,7 +5,6 @@ import { insightsUserStatusCounts } from "api/queries/insights";
import { displayError, displaySuccess } from "components/GlobalSnackbar/utils";
import { useEmbeddedMetadata } from "hooks/useEmbeddedMetadata";
import { type FC, useEffect, useState } from "react";
-import { Helmet } from "react-helmet-async";
import { useMutation, useQuery, useQueryClient } from "react-query";
import { useSearchParams } from "react-router";
import { pageTitle } from "utils/page";
@@ -72,9 +71,8 @@ const LicensesSettingsPage: FC = () => {
return (
<>
-
- {pageTitle("License Settings")}
-
+
{pageTitle("License Settings")}
+
{
return (
<>
-
- {pageTitle("Network Settings")}
-
+ {pageTitle("Network Settings")}
+
);
diff --git a/site/src/pages/DeploymentSettingsPage/NotificationsPage/NotificationsPage.tsx b/site/src/pages/DeploymentSettingsPage/NotificationsPage/NotificationsPage.tsx
index 180e31a28e..ecb077ae5d 100644
--- a/site/src/pages/DeploymentSettingsPage/NotificationsPage/NotificationsPage.tsx
+++ b/site/src/pages/DeploymentSettingsPage/NotificationsPage/NotificationsPage.tsx
@@ -17,7 +17,6 @@ import { useSearchParamsKey } from "hooks/useSearchParamsKey";
import { useDeploymentConfig } from "modules/management/DeploymentConfigProvider";
import { castNotificationMethod } from "modules/notifications/utils";
import type { FC } from "react";
-import { Helmet } from "react-helmet-async";
import { useQueries } from "react-query";
import { deploymentGroupHasParent } from "utils/deployOptions";
import { docs } from "utils/docs";
@@ -59,9 +58,7 @@ const NotificationsPage: FC = () => {
};
return (
<>
-
- {pageTitle("Notifications Settings")}
-
+ {pageTitle("Notifications Settings")}
{
return (
<>
-
- {pageTitle("New OAuth2 Application")}
-
+ {pageTitle("New OAuth2 Application")}
{
return (
<>
-
- {pageTitle("Edit OAuth2 Application")}
-
+ {pageTitle("Edit OAuth2 Application")}
{
return (
<>
-
- {pageTitle("OAuth2 Applications")}
-
+ {pageTitle("OAuth2 Applications")}
+
{
return (
<>
-
- {pageTitle("Observability Settings")}
-
+ {pageTitle("Observability Settings")}
+
{
return (
<>
-
- {pageTitle("Overview", "Deployment")}
-
+ {pageTitle("Overview", "Deployment")}
+
{
return (
<>
-
- {pageTitle("Premium Features")}
-
+ {pageTitle("Premium Features")}
+
);
diff --git a/site/src/pages/DeploymentSettingsPage/SecuritySettingsPage/SecuritySettingsPage.tsx b/site/src/pages/DeploymentSettingsPage/SecuritySettingsPage/SecuritySettingsPage.tsx
index 981f35d347..af0486786b 100644
--- a/site/src/pages/DeploymentSettingsPage/SecuritySettingsPage/SecuritySettingsPage.tsx
+++ b/site/src/pages/DeploymentSettingsPage/SecuritySettingsPage/SecuritySettingsPage.tsx
@@ -1,7 +1,6 @@
import { useDashboard } from "modules/dashboard/useDashboard";
import { useDeploymentConfig } from "modules/management/DeploymentConfigProvider";
import type { FC } from "react";
-import { Helmet } from "react-helmet-async";
import { pageTitle } from "utils/page";
import { SecuritySettingsPageView } from "./SecuritySettingsPageView";
@@ -11,9 +10,8 @@ const SecuritySettingsPage: FC = () => {
return (
<>
-
- {pageTitle("Security Settings")}
-
+ {pageTitle("Security Settings")}
+
{
return (
<>
-
- {pageTitle("User Authentication Settings")}
-
+ {pageTitle("User Authentication Settings")}
+
);
diff --git a/site/src/pages/GroupsPage/CreateGroupPage.tsx b/site/src/pages/GroupsPage/CreateGroupPage.tsx
index 07dcea0e5e..76e497a0c0 100644
--- a/site/src/pages/GroupsPage/CreateGroupPage.tsx
+++ b/site/src/pages/GroupsPage/CreateGroupPage.tsx
@@ -1,6 +1,5 @@
import { createGroup } from "api/queries/groups";
import type { FC } from "react";
-import { Helmet } from "react-helmet-async";
import { useMutation, useQueryClient } from "react-query";
import { useNavigate, useParams } from "react-router";
import { pageTitle } from "utils/page";
@@ -16,9 +15,8 @@ const CreateGroupPage: FC = () => {
return (
<>
-
- {pageTitle("Create Group")}
-
+ {pageTitle("Create Group")}
+
{
const newGroup = await createGroupMutation.mutateAsync(data);
diff --git a/site/src/pages/GroupsPage/GroupPage.tsx b/site/src/pages/GroupsPage/GroupPage.tsx
index 76d18f4603..c8906f6f4d 100644
--- a/site/src/pages/GroupsPage/GroupPage.tsx
+++ b/site/src/pages/GroupsPage/GroupPage.tsx
@@ -55,7 +55,6 @@ import {
UserPlusIcon,
} from "lucide-react";
import { type FC, useState } from "react";
-import { Helmet } from "react-helmet-async";
import { useMutation, useQuery, useQueryClient } from "react-query";
import { Link as RouterLink, useNavigate, useParams } from "react-router";
import { isEveryoneGroup } from "utils/groups";
@@ -81,14 +80,10 @@ const GroupPage: FC = () => {
const isLoading = groupQuery.isLoading || !groupData || !permissions;
const canUpdateGroup = permissions ? permissions.canUpdateGroup : false;
- const helmet = (
-
-
- {pageTitle(
- (groupData?.display_name || groupData?.name) ?? "Loading...",
- )}
-
-
+ const title = (
+
+ {pageTitle((groupData?.display_name || groupData?.name) ?? "Loading...")}
+
);
if (groupQuery.error) {
@@ -98,7 +93,7 @@ const GroupPage: FC = () => {
if (isLoading) {
return (
<>
- {helmet}
+ {title}
);
@@ -107,7 +102,7 @@ const GroupPage: FC = () => {
return (
<>
- {helmet}
+ {title}
{
navigate(`/organizations/${organization}/groups/${groupName}`);
};
- const helmet = (
-
- {pageTitle("Settings Group")}
-
- );
+ const title = {pageTitle("Settings Group")};
if (groupQuery.error) {
return ;
@@ -37,7 +32,7 @@ const GroupSettingsPage: FC = () => {
if (groupQuery.isLoading || !groupQuery.data) {
return (
<>
- {helmet}
+ {title}
);
@@ -46,7 +41,7 @@ const GroupSettingsPage: FC = () => {
return (
<>
- {helmet}
+ {title}
{
return ;
}
- const helmet = (
-
- {pageTitle("Groups")}
-
- );
+ const title = {pageTitle("Groups")};
const permissions = permissionsQuery.data?.[organization.id];
if (!permissions?.viewGroups) {
return (
<>
- {helmet}
+ {title}
);
@@ -77,7 +72,7 @@ const GroupsPage: FC = () => {
return (
- {helmet}
+ {title}
{
return (
<>
-
- {pageTitle("Access URL - Health")}
-
+ {pageTitle("Access URL - Health")}
diff --git a/site/src/pages/HealthPage/DERPPage.tsx b/site/src/pages/HealthPage/DERPPage.tsx
index 5f35e98d93..75ff55d5c8 100644
--- a/site/src/pages/HealthPage/DERPPage.tsx
+++ b/site/src/pages/HealthPage/DERPPage.tsx
@@ -8,7 +8,6 @@ import type {
} from "api/typesGenerated";
import { Alert } from "components/Alert/Alert";
import type { FC } from "react";
-import { Helmet } from "react-helmet-async";
import { Link, useOutletContext } from "react-router";
import { pageTitle } from "utils/page";
import {
@@ -51,9 +50,7 @@ const DERPPage: FC = () => {
return (
<>
-
- {pageTitle("DERP - Health")}
-
+ {pageTitle("DERP - Health")}
diff --git a/site/src/pages/HealthPage/DERPRegionPage.tsx b/site/src/pages/HealthPage/DERPRegionPage.tsx
index ef4df96a17..202493373b 100644
--- a/site/src/pages/HealthPage/DERPRegionPage.tsx
+++ b/site/src/pages/HealthPage/DERPRegionPage.tsx
@@ -9,7 +9,6 @@ import type {
import { Alert } from "components/Alert/Alert";
import { ChevronLeftIcon, CodeIcon, HashIcon } from "lucide-react";
import type { FC } from "react";
-import { Helmet } from "react-helmet-async";
import { Link, useOutletContext, useParams } from "react-router";
import { getLatencyColor } from "utils/latency";
import { pageTitle } from "utils/page";
@@ -38,9 +37,7 @@ const DERPRegionPage: FC = () => {
return (
<>
-
- {pageTitle(region!.RegionName, "Health")}
-
+ {pageTitle(region!.RegionName, "Health")}
diff --git a/site/src/pages/HealthPage/DatabasePage.tsx b/site/src/pages/HealthPage/DatabasePage.tsx
index 81efc47b4a..7837b5aae9 100644
--- a/site/src/pages/HealthPage/DatabasePage.tsx
+++ b/site/src/pages/HealthPage/DatabasePage.tsx
@@ -1,6 +1,5 @@
import type { HealthcheckReport } from "api/typesGenerated";
import { Alert } from "components/Alert/Alert";
-import { Helmet } from "react-helmet-async";
import { useOutletContext } from "react-router";
import { pageTitle } from "utils/page";
import {
@@ -21,9 +20,7 @@ const DatabasePage = () => {
return (
<>
-
- {pageTitle("Database - Health")}
-
+ {pageTitle("Database - Health")}
diff --git a/site/src/pages/HealthPage/HealthLayout.tsx b/site/src/pages/HealthPage/HealthLayout.tsx
index 86e79aa9ec..10c5b1695d 100644
--- a/site/src/pages/HealthPage/HealthLayout.tsx
+++ b/site/src/pages/HealthPage/HealthLayout.tsx
@@ -11,7 +11,6 @@ import { Loader } from "components/Loader/Loader";
import kebabCase from "lodash/fp/kebabCase";
import { DashboardFullPage } from "modules/dashboard/DashboardLayout";
import { type FC, Suspense } from "react";
-import { Helmet } from "react-helmet-async";
import { useMutation, useQuery, useQueryClient } from "react-query";
import { NavLink, Outlet } from "react-router";
import { cn } from "utils/cn";
@@ -70,9 +69,7 @@ export const HealthLayout: FC = () => {
return (
<>
-
- {pageTitle("Health")}
-
+ {pageTitle("Health")}
diff --git a/site/src/pages/HealthPage/ProvisionerDaemonsPage.tsx b/site/src/pages/HealthPage/ProvisionerDaemonsPage.tsx
index 4c4d2d2f20..19a2a0f9f4 100644
--- a/site/src/pages/HealthPage/ProvisionerDaemonsPage.tsx
+++ b/site/src/pages/HealthPage/ProvisionerDaemonsPage.tsx
@@ -2,7 +2,6 @@ import type { HealthcheckReport } from "api/typesGenerated";
import { Alert } from "components/Alert/Alert";
import { Provisioner } from "modules/provisioners/Provisioner";
import type { FC } from "react";
-import { Helmet } from "react-helmet-async";
import { useOutletContext } from "react-router";
import { pageTitle } from "utils/page";
import {
@@ -20,9 +19,7 @@ const ProvisionerDaemonsPage: FC = () => {
return (
<>
-
- {pageTitle("Provisioner Daemons - Health")}
-
+
{pageTitle("Provisioner Daemons - Health")}
diff --git a/site/src/pages/HealthPage/WebsocketPage.tsx b/site/src/pages/HealthPage/WebsocketPage.tsx
index f7406c8806..ef11b5049d 100644
--- a/site/src/pages/HealthPage/WebsocketPage.tsx
+++ b/site/src/pages/HealthPage/WebsocketPage.tsx
@@ -3,7 +3,6 @@ import Tooltip from "@mui/material/Tooltip";
import type { HealthcheckReport } from "api/typesGenerated";
import { Alert } from "components/Alert/Alert";
import { CodeIcon } from "lucide-react";
-import { Helmet } from "react-helmet-async";
import { useOutletContext } from "react-router";
import { MONOSPACE_FONT_FAMILY } from "theme/constants";
import { pageTitle } from "utils/page";
@@ -24,9 +23,7 @@ const WebsocketPage = () => {
return (
<>
-
- {pageTitle("Websocket - Health")}
-
+ {pageTitle("Websocket - Health")}
diff --git a/site/src/pages/HealthPage/WorkspaceProxyPage.tsx b/site/src/pages/HealthPage/WorkspaceProxyPage.tsx
index a076891620..986a8433d3 100644
--- a/site/src/pages/HealthPage/WorkspaceProxyPage.tsx
+++ b/site/src/pages/HealthPage/WorkspaceProxyPage.tsx
@@ -5,7 +5,6 @@ import type { HealthcheckReport } from "api/typesGenerated";
import { Alert } from "components/Alert/Alert";
import { HashIcon } from "lucide-react";
import type { FC } from "react";
-import { Helmet } from "react-helmet-async";
import { useOutletContext } from "react-router";
import { createDayString } from "utils/createDayString";
import { pageTitle } from "utils/page";
@@ -28,9 +27,7 @@ const WorkspaceProxyPage: FC = () => {
return (
<>
-
- {pageTitle("Workspace Proxy - Health")}
-
+ {pageTitle("Workspace Proxy - Health")}
diff --git a/site/src/pages/IconsPage/IconsPage.tsx b/site/src/pages/IconsPage/IconsPage.tsx
index d9dc19c784..a15ee72114 100644
--- a/site/src/pages/IconsPage/IconsPage.tsx
+++ b/site/src/pages/IconsPage/IconsPage.tsx
@@ -15,7 +15,6 @@ import {
import { Stack } from "components/Stack/Stack";
import { SearchIcon, XIcon } from "lucide-react";
import { type FC, type ReactNode, useMemo, useState } from "react";
-import { Helmet } from "react-helmet-async";
import {
defaultParametersForBuiltinIcons,
parseImageParameters,
@@ -73,9 +72,7 @@ const IconsPage: FC = () => {
return (
<>
-
- {pageTitle("Icons")}
-
+ {pageTitle("Icons")}
{
return (
<>
-
- Sign in to {applicationName}
-
+ Sign in to {applicationName}
{
: organizationPermissions.createOrgRoles
}
>
-
-
- {pageTitle(
- role !== undefined ? "Edit Custom Role" : "Create Custom Role",
- )}
-
-
+
+ {pageTitle(
+ role !== undefined ? "Edit Custom Role" : "Create Custom Role",
+ )}
+
{
return (
-
-
- {pageTitle(
- "Custom Roles",
- organization.display_name || organization.name,
- )}
-
-
+
+ {pageTitle(
+ "Custom Roles",
+ organization.display_name || organization.name,
+ )}
+
+
diff --git a/site/src/pages/OrganizationSettingsPage/Horizontal.tsx b/site/src/pages/OrganizationSettingsPage/Horizontal.tsx
index 00f9ead8a2..d089327c45 100644
--- a/site/src/pages/OrganizationSettingsPage/Horizontal.tsx
+++ b/site/src/pages/OrganizationSettingsPage/Horizontal.tsx
@@ -1,6 +1,5 @@
import type { Interpolation, Theme } from "@emotion/react";
import type { FC, HTMLAttributes, ReactNode } from "react";
-
export const HorizontalContainer: FC> = ({
...attrs
}) => {
diff --git a/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpSyncPage.tsx b/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpSyncPage.tsx
index ea9604a385..64365f94bb 100644
--- a/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpSyncPage.tsx
+++ b/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpSyncPage.tsx
@@ -17,7 +17,6 @@ import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
import { useOrganizationSettings } from "modules/management/OrganizationSettingsLayout";
import { RequirePermission } from "modules/permissions/RequirePermission";
import { type FC, useEffect, useState } from "react";
-import { Helmet } from "react-helmet-async";
import { useMutation, useQueries, useQuery, useQueryClient } from "react-query";
import { useParams, useSearchParams } from "react-router";
import { docs } from "utils/docs";
@@ -85,18 +84,16 @@ const IdpSyncPage: FC = () => {
return ;
}
- const helmet = (
-
-
- {pageTitle("IdP Sync", organization.display_name || organization.name)}
-
-
+ const title = (
+
+ {pageTitle("IdP Sync", organization.display_name || organization.name)}
+
);
if (!organizationPermissions?.viewIdpSyncSettings) {
return (
<>
- {helmet}
+ {title}
);
@@ -118,7 +115,7 @@ const IdpSyncPage: FC = () => {
return (
- {helmet}
+ {title}
diff --git a/site/src/pages/OrganizationSettingsPage/OrganizationMembersPage.tsx b/site/src/pages/OrganizationSettingsPage/OrganizationMembersPage.tsx
index 2e226f79f8..5006380c17 100644
--- a/site/src/pages/OrganizationSettingsPage/OrganizationMembersPage.tsx
+++ b/site/src/pages/OrganizationSettingsPage/OrganizationMembersPage.tsx
@@ -17,7 +17,6 @@ import { usePaginatedQuery } from "hooks/usePaginatedQuery";
import { useOrganizationSettings } from "modules/management/OrganizationSettingsLayout";
import { RequirePermission } from "modules/permissions/RequirePermission";
import { type FC, useState } from "react";
-import { Helmet } from "react-helmet-async";
import { useMutation, useQuery, useQueryClient } from "react-query";
import { useParams, useSearchParams } from "react-router";
import { pageTitle } from "utils/page";
@@ -65,18 +64,16 @@ const OrganizationMembersPage: FC = () => {
return ;
}
- const helmet = (
-
-
- {pageTitle("Members", organization.display_name || organization.name)}
-
-
+ const title = (
+
+ {pageTitle("Members", organization.display_name || organization.name)}
+
);
if (!organizationPermissions) {
return (
<>
- {helmet}
+ {title}
);
@@ -84,7 +81,7 @@ const OrganizationMembersPage: FC = () => {
return (
<>
- {helmet}
+ {title}
-
- {pageTitle("Provisioner Jobs")}
-
+ {pageTitle("Provisioner Jobs")}
+
);
@@ -100,14 +98,12 @@ const OrganizationProvisionerJobsPageView: FC<
return (
-
-
- {pageTitle(
- "Provisioner Jobs",
- organization.display_name || organization.name,
- )}
-
-
+
+ {pageTitle(
+ "Provisioner Jobs",
+ organization.display_name || organization.name,
+ )}
+
diff --git a/site/src/pages/OrganizationSettingsPage/OrganizationProvisionerKeysPage/OrganizationProvisionerKeysPage.tsx b/site/src/pages/OrganizationSettingsPage/OrganizationProvisionerKeysPage/OrganizationProvisionerKeysPage.tsx
index f757b48830..081f337bf9 100644
--- a/site/src/pages/OrganizationSettingsPage/OrganizationProvisionerKeysPage/OrganizationProvisionerKeysPage.tsx
+++ b/site/src/pages/OrganizationSettingsPage/OrganizationProvisionerKeysPage/OrganizationProvisionerKeysPage.tsx
@@ -4,7 +4,6 @@ import { useDashboard } from "modules/dashboard/useDashboard";
import { useOrganizationSettings } from "modules/management/OrganizationSettingsLayout";
import { RequirePermission } from "modules/permissions/RequirePermission";
import type { FC } from "react";
-import { Helmet } from "react-helmet-async";
import { useQuery } from "react-query";
import { useParams } from "react-router";
import { pageTitle } from "utils/page";
@@ -26,21 +25,19 @@ const OrganizationProvisionerKeysPage: FC = () => {
return ;
}
- const helmet = (
-
-
- {pageTitle(
- "Provisioner Keys",
- organization.display_name || organization.name,
- )}
-
-
+ const title = (
+
+ {pageTitle(
+ "Provisioner Keys",
+ organization.display_name || organization.name,
+ )}
+
);
if (!organizationPermissions?.viewProvisioners) {
return (
<>
- {helmet}
+ {title}
);
@@ -48,7 +45,7 @@ const OrganizationProvisionerKeysPage: FC = () => {
return (
<>
- {helmet}
+ {title}
{
return (
diff --git a/site/src/pages/OrganizationSettingsPage/OrganizationProvisionersPage/OrganizationProvisionersPage.tsx b/site/src/pages/OrganizationSettingsPage/OrganizationProvisionersPage/OrganizationProvisionersPage.tsx
index 95db66f2c4..94c09ac4d5 100644
--- a/site/src/pages/OrganizationSettingsPage/OrganizationProvisionersPage/OrganizationProvisionersPage.tsx
+++ b/site/src/pages/OrganizationSettingsPage/OrganizationProvisionersPage/OrganizationProvisionersPage.tsx
@@ -6,7 +6,6 @@ import { useDashboard } from "modules/dashboard/useDashboard";
import { useOrganizationSettings } from "modules/management/OrganizationSettingsLayout";
import { RequirePermission } from "modules/permissions/RequirePermission";
import type { FC } from "react";
-import { Helmet } from "react-helmet-async";
import { useQuery } from "react-query";
import { useParams, useSearchParams } from "react-router";
import { pageTitle } from "utils/page";
@@ -37,21 +36,19 @@ const OrganizationProvisionersPage: FC = () => {
return ;
}
- const helmet = (
-
-
- {pageTitle(
- "Provisioners",
- organization.display_name || organization.name,
- )}
-
-
+ const title = (
+
+ {pageTitle(
+ "Provisioners",
+ organization.display_name || organization.name,
+ )}
+
);
if (!organizationPermissions?.viewProvisioners) {
return (
<>
- {helmet}
+ {title}
);
@@ -59,7 +56,7 @@ const OrganizationProvisionersPage: FC = () => {
return (
<>
- {helmet}
+ {title}
{
return ;
}
- const helmet = (
-
-
- {pageTitle("Settings", organization.display_name || organization.name)}
-
-
+ const title = (
+
+ {pageTitle("Settings", organization.display_name || organization.name)}
+
);
if (!organizationPermissions?.editSettings) {
return (
<>
- {helmet}
+ {title}
);
@@ -52,7 +49,7 @@ const OrganizationSettingsPage: FC = () => {
return (
<>
- {helmet}
+ {title}
= ({ redirect }) => {
return (
<>
-
- Reset Password - {applicationName}
-
+ {pageTitle("Reset Password", applicationName)}
diff --git a/site/src/pages/ResetPasswordPage/RequestOTPPage.tsx b/site/src/pages/ResetPasswordPage/RequestOTPPage.tsx
index 66eea517e0..553e6479e0 100644
--- a/site/src/pages/ResetPasswordPage/RequestOTPPage.tsx
+++ b/site/src/pages/ResetPasswordPage/RequestOTPPage.tsx
@@ -7,10 +7,10 @@ import { CustomLogo } from "components/CustomLogo/CustomLogo";
import { Spinner } from "components/Spinner/Spinner";
import { Stack } from "components/Stack/Stack";
import type { FC } from "react";
-import { Helmet } from "react-helmet-async";
import { useMutation } from "react-query";
import { Link as RouterLink } from "react-router";
import { getApplicationName } from "utils/appearance";
+import { pageTitle } from "utils/page";
const RequestOTPPage: FC = () => {
const applicationName = getApplicationName();
@@ -18,9 +18,7 @@ const RequestOTPPage: FC = () => {
return (
<>
-
- Reset Password - {applicationName}
-
+ {pageTitle("Reset Password", applicationName)}
diff --git a/site/src/pages/SetupPage/SetupPage.tsx b/site/src/pages/SetupPage/SetupPage.tsx
index ece2a714a7..a166af48ca 100644
--- a/site/src/pages/SetupPage/SetupPage.tsx
+++ b/site/src/pages/SetupPage/SetupPage.tsx
@@ -4,7 +4,6 @@ import { Loader } from "components/Loader/Loader";
import { useAuthContext } from "contexts/auth/AuthProvider";
import { useEmbeddedMetadata } from "hooks/useEmbeddedMetadata";
import { type FC, useEffect, useRef } from "react";
-import { Helmet } from "react-helmet-async";
import { useMutation, useQuery } from "react-query";
import { Navigate } from "react-router";
import { pageTitle } from "utils/page";
@@ -57,9 +56,7 @@ export const SetupPage: FC = () => {
return (
<>
-
- {pageTitle("Set up your account")}
-
+ {pageTitle("Set up your account")}
{
return (
<>
-
- {pageTitle(starterTemplate?.name ?? exampleId)}
-
+ {pageTitle(starterTemplate?.name ?? exampleId)}
{
if (error) {
return (
-
- {pageTitle("Error loading task")}
-
+ {pageTitle("Error loading task")}
@@ -104,9 +101,7 @@ const TaskPage = () => {
if (!task) {
return (
-
- {pageTitle("Loading task")}
-
+ {pageTitle("Loading task")}
);
@@ -159,9 +154,7 @@ const TaskPage = () => {
return (
-
- {pageTitle(task.workspace.name)}
-
+ {pageTitle(task.workspace.name)}
{content}
diff --git a/site/src/pages/TasksPage/TasksPage.tsx b/site/src/pages/TasksPage/TasksPage.tsx
index 8f9dcadf3e..451a0f0709 100644
--- a/site/src/pages/TasksPage/TasksPage.tsx
+++ b/site/src/pages/TasksPage/TasksPage.tsx
@@ -12,7 +12,6 @@ import {
import { useAuthenticated } from "hooks";
import { useSearchParamsKey } from "hooks/useSearchParamsKey";
import type { FC } from "react";
-import { Helmet } from "react-helmet-async";
import { useQuery } from "react-query";
import { cn } from "utils/cn";
import { pageTitle } from "utils/page";
@@ -61,9 +60,7 @@ const TasksPage: FC = () => {
return (
<>
-
- {pageTitle("AI Tasks")}
-
+ {pageTitle("AI Tasks")}
diff --git a/site/src/pages/TemplatePage/TemplateDocsPage/TemplateDocsPage.tsx b/site/src/pages/TemplatePage/TemplateDocsPage/TemplateDocsPage.tsx
index ca4801fc2d..c4961acf6c 100644
--- a/site/src/pages/TemplatePage/TemplateDocsPage/TemplateDocsPage.tsx
+++ b/site/src/pages/TemplatePage/TemplateDocsPage/TemplateDocsPage.tsx
@@ -2,7 +2,7 @@ import { useTheme } from "@emotion/react";
import { MemoizedMarkdown } from "components/Markdown/Markdown";
import frontMatter from "front-matter";
import { useTemplateLayoutContext } from "pages/TemplatePage/TemplateLayout";
-import { Helmet } from "react-helmet-async";
+
import { pageTitle } from "utils/page";
export default function TemplateDocsPage() {
@@ -13,9 +13,7 @@ export default function TemplateDocsPage() {
return (
<>
-
- {pageTitle(template.name, "Documentation")}
-
+ {pageTitle(template.name, "Documentation")}
{
return (
<>
-
- {pageTitle(template.name)}
-
+
{pageTitle(template.name)}
+
= ({
return (
<>
-
- {pageTitle(template.name)}
-
+ {pageTitle(template.name)}
+
{!buttonValues || !templateParameters ? (
) : (
diff --git a/site/src/pages/TemplatePage/TemplateEmbedPage/TemplateEmbedPageExperimental.tsx b/site/src/pages/TemplatePage/TemplateEmbedPage/TemplateEmbedPageExperimental.tsx
index e1f53cb6af..a34d719f4c 100644
--- a/site/src/pages/TemplatePage/TemplateEmbedPage/TemplateEmbedPageExperimental.tsx
+++ b/site/src/pages/TemplatePage/TemplateEmbedPage/TemplateEmbedPageExperimental.tsx
@@ -24,7 +24,6 @@ import {
} from "modules/workspaces/DynamicParameter/DynamicParameter";
import { useTemplateLayoutContext } from "pages/TemplatePage/TemplateLayout";
import { type FC, useEffect, useMemo, useRef, useState } from "react";
-import { Helmet } from "react-helmet-async";
import { pageTitle } from "utils/page";
type ButtonValues = Record;
@@ -107,9 +106,8 @@ const TemplateEmbedPageExperimental: FC = () => {
return (
<>
-
- {pageTitle(template.name)}
-
+ {pageTitle(template.name)}
+
{
return (
<>
-
- {getTemplatePageTitle("Source Code", template)}
-
+ {getTemplatePageTitle("Source Code", template)}
{shouldDisplayFiles ? (
-
- {getTemplatePageTitle("Insights", template)}
-
+ {getTemplatePageTitle("Insights", template)}
+
{
return (
<>
-
- {getTemplatePageTitle("Template", template)}
-
+ {getTemplatePageTitle("Template", template)}
+
);
diff --git a/site/src/pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx b/site/src/pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx
index 31b57bdca9..0ba303f04b 100644
--- a/site/src/pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx
+++ b/site/src/pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx
@@ -4,7 +4,6 @@ import { ConfirmDialog } from "components/Dialogs/ConfirmDialog/ConfirmDialog";
import { displayError, displaySuccess } from "components/GlobalSnackbar/utils";
import { useTemplateLayoutContext } from "pages/TemplatePage/TemplateLayout";
import { useState } from "react";
-import { Helmet } from "react-helmet-async";
import { useMutation, useQuery } from "react-query";
import { getTemplatePageTitle } from "../utils";
import { VersionsTable } from "./VersionsTable";
@@ -62,9 +61,8 @@ const TemplateVersionsPage = () => {
return (
<>
-
- {getTemplatePageTitle("Versions", template)}
-
+ {getTemplatePageTitle("Versions", template)}
+
{
return (
<>
-
- {pageTitle(template.name, "General Settings")}
-
+ {pageTitle(template.name, "General Settings")}
+
{
return (
<>
-
- {pageTitle(template.name, "Permissions")}
-
+ {pageTitle(template.name, "Permissions")}
+
{!isTemplateRBACEnabled ? (
{
return (
<>
-
- {pageTitle(template.name, "Schedule")}
-
+ {pageTitle(template.name, "Schedule")}
+
{
return (
<>
-
- {pageTitle(templateName, "Settings")}
-
+ {pageTitle(templateName, "Settings")}
diff --git a/site/src/pages/TemplateSettingsPage/TemplateVariablesPage/TemplateVariableField.tsx b/site/src/pages/TemplateSettingsPage/TemplateVariablesPage/TemplateVariableField.tsx
index ade837b93f..3ec4003d40 100644
--- a/site/src/pages/TemplateSettingsPage/TemplateVariablesPage/TemplateVariableField.tsx
+++ b/site/src/pages/TemplateSettingsPage/TemplateVariablesPage/TemplateVariableField.tsx
@@ -4,7 +4,6 @@ import RadioGroup from "@mui/material/RadioGroup";
import TextField from "@mui/material/TextField";
import type { TemplateVersionVariable } from "api/typesGenerated";
import { type FC, useState } from "react";
-
export const SensitiveVariableHelperText: FC = () => {
return (
diff --git a/site/src/pages/TemplateSettingsPage/TemplateVariablesPage/TemplateVariablesPage.tsx b/site/src/pages/TemplateSettingsPage/TemplateVariablesPage/TemplateVariablesPage.tsx
index 372c123533..81d474eae6 100644
--- a/site/src/pages/TemplateSettingsPage/TemplateVariablesPage/TemplateVariablesPage.tsx
+++ b/site/src/pages/TemplateSettingsPage/TemplateVariablesPage/TemplateVariablesPage.tsx
@@ -14,7 +14,6 @@ import { displaySuccess } from "components/GlobalSnackbar/utils";
import { Loader } from "components/Loader/Loader";
import { linkToTemplate, useLinks } from "modules/navigation";
import { type FC, useCallback } from "react";
-import { Helmet } from "react-helmet-async";
import {
keepPreviousData,
useMutation,
@@ -94,9 +93,7 @@ const TemplateVariablesPage: FC = () => {
return (
<>
-
- {pageTitle(template.name, "Template variables")}
-
+ {pageTitle(template.name, "Template variables")}
{
return (
<>
-
- {pageTitle(templateName, "Template Editor")}
-
+ {pageTitle(templateName, "Template Editor")}
{!(templateQuery.data && activeTemplateVersion && fileTree) ? (
diff --git a/site/src/pages/TemplateVersionPage/TemplateVersionPage.tsx b/site/src/pages/TemplateVersionPage/TemplateVersionPage.tsx
index c6bd61eeec..a54dd6115c 100644
--- a/site/src/pages/TemplateVersionPage/TemplateVersionPage.tsx
+++ b/site/src/pages/TemplateVersionPage/TemplateVersionPage.tsx
@@ -7,7 +7,6 @@ import {
import { useAuthenticated } from "hooks";
import { linkToTemplate, useLinks } from "modules/navigation";
import { type FC, useMemo } from "react";
-import { Helmet } from "react-helmet-async";
import { useQuery } from "react-query";
import { useParams } from "react-router";
import { pageTitle } from "utils/page";
@@ -62,9 +61,7 @@ const TemplateVersionPage: FC = () => {
return (
<>
-
- {pageTitle(versionName, templateName)}
-
+ {pageTitle(versionName, templateName)}
{
return (
<>
-
- {pageTitle("Templates")}
-
+ {pageTitle("Templates")}
{
return (
-
+ {workspace.data && (
- {workspace.data
- ? pageTitle(
- `Terminal · ${workspace.data.owner_name}/${workspace.data.name}`,
- )
- : ""}
+ {pageTitle(
+ "Terminal",
+ `${workspace.data.owner_name}/${workspace.data.name}`,
+ )}
-
+ )}
+
{
return (
<>
-
- {pageTitle("Settings")}
-
+
{pageTitle("Settings")}
diff --git a/site/src/pages/UserSettingsPage/NotificationsPage/NotificationsPage.tsx b/site/src/pages/UserSettingsPage/NotificationsPage/NotificationsPage.tsx
index 46f3e8c98c..d077e4e456 100644
--- a/site/src/pages/UserSettingsPage/NotificationsPage/NotificationsPage.tsx
+++ b/site/src/pages/UserSettingsPage/NotificationsPage/NotificationsPage.tsx
@@ -31,7 +31,6 @@ import {
} from "modules/notifications/utils";
import type { Permissions } from "modules/permissions";
import { type FC, Fragment, useEffect } from "react";
-import { Helmet } from "react-helmet-async";
import { useMutation, useQueries, useQueryClient } from "react-query";
import { useSearchParams } from "react-router";
import { pageTitle } from "utils/page";
@@ -102,9 +101,8 @@ const NotificationsPage: FC = () => {
return (
<>
-
- {pageTitle("Notifications Settings")}
-
+ {pageTitle("Notifications Settings")}
+
= ({ defaultNewPassword }) => {
return (
<>
-
- {pageTitle("Users")}
-
+ {pageTitle("Users")}
> = ({
children,
...attrs
diff --git a/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.tsx b/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.tsx
index 551989efee..e020f345df 100644
--- a/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.tsx
+++ b/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.tsx
@@ -3,7 +3,6 @@ import { workspaceBuildByNumber } from "api/queries/workspaceBuilds";
import dayjs from "dayjs";
import { useWorkspaceBuildLogs } from "hooks/useWorkspaceBuildLogs";
import type { FC } from "react";
-import { Helmet } from "react-helmet-async";
import { keepPreviousData, useQuery } from "react-query";
import { useParams } from "react-router";
import { pageTitle } from "utils/page";
@@ -36,15 +35,11 @@ const WorkspaceBuildPage: FC = () => {
return (
<>
-
+ {build && (
- {build
- ? pageTitle(
- `Build #${build.build_number} · ${build.workspace_name}`,
- )
- : ""}
+ {pageTitle(`Build #${build.build_number} · ${build.workspace_name}`)}
-
+ )}
= ({
return (
<>
-
- {pageTitle(`${workspace.owner_name}/${workspace.name}`)}
-
-
-
+ {pageTitle(`${workspace.owner_name}/${workspace.name}`)}
+
+
{
return `${resource.type}_${resource.name}`;
};
diff --git a/site/src/pages/WorkspaceSettingsPage/WorkspaceParametersPage/WorkspaceParametersPage.tsx b/site/src/pages/WorkspaceSettingsPage/WorkspaceParametersPage/WorkspaceParametersPage.tsx
index d10db1fbe1..cc9af4a381 100644
--- a/site/src/pages/WorkspaceSettingsPage/WorkspaceParametersPage/WorkspaceParametersPage.tsx
+++ b/site/src/pages/WorkspaceSettingsPage/WorkspaceParametersPage/WorkspaceParametersPage.tsx
@@ -8,7 +8,6 @@ import { EmptyState } from "components/EmptyState/EmptyState";
import { Loader } from "components/Loader/Loader";
import { ExternalLinkIcon } from "lucide-react";
import type { FC } from "react";
-import { Helmet } from "react-helmet-async";
import { useMutation, useQuery } from "react-query";
import { useNavigate } from "react-router";
import { docs } from "utils/docs";
@@ -72,9 +71,7 @@ const WorkspaceParametersPage: FC = () => {
return (
<>
-
- {pageTitle(workspace.name, "Parameters")}
-
+ {pageTitle(workspace.name, "Parameters")}
{
return (
-
- {pageTitle(workspace.name, "Parameters")}
-
+
{pageTitle(workspace.name, "Parameters")}
diff --git a/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx b/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx
index 23255316d2..6e429f433b 100644
--- a/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx
+++ b/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx
@@ -18,7 +18,6 @@ import {
import { ttlMsToAutostop } from "pages/WorkspaceSettingsPage/WorkspaceSchedulePage/ttl";
import { useWorkspaceSettings } from "pages/WorkspaceSettingsPage/WorkspaceSettingsLayout";
import { type FC, useState } from "react";
-import { Helmet } from "react-helmet-async";
import { useMutation, useQuery, useQueryClient } from "react-query";
import { useNavigate, useParams } from "react-router";
import { docs } from "utils/docs";
@@ -78,9 +77,8 @@ const WorkspaceSchedulePage: FC = () => {
return (
<>
-
- {pageTitle(workspaceName, "Schedule")}
-
+ {pageTitle(workspaceName, "Schedule")}
+
Workspace Schedule
diff --git a/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsLayout.tsx b/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsLayout.tsx
index af64c06bef..57bf6a07df 100644
--- a/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsLayout.tsx
+++ b/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsLayout.tsx
@@ -5,7 +5,6 @@ import { Loader } from "components/Loader/Loader";
import { Margins } from "components/Margins/Margins";
import { Stack } from "components/Stack/Stack";
import { createContext, type FC, Suspense, useContext } from "react";
-import { Helmet } from "react-helmet-async";
import { useQuery } from "react-query";
import { Outlet, useParams } from "react-router";
import { pageTitle } from "utils/page";
@@ -44,9 +43,7 @@ export const WorkspaceSettingsLayout: FC = () => {
return (
<>
-
- {pageTitle(workspaceName, "Settings")}
-
+ {pageTitle(workspaceName, "Settings")}
diff --git a/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsPage.tsx b/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsPage.tsx
index 0c25c0a19f..d4a9e96905 100644
--- a/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsPage.tsx
+++ b/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsPage.tsx
@@ -1,7 +1,6 @@
import { API } from "api/api";
import { displaySuccess } from "components/GlobalSnackbar/utils";
import type { FC } from "react";
-import { Helmet } from "react-helmet-async";
import { useMutation } from "react-query";
import { useNavigate, useParams } from "react-router";
import { pageTitle } from "utils/page";
@@ -37,9 +36,7 @@ const WorkspaceSettingsPage: FC = () => {
return (
<>
-
- {pageTitle(workspaceName, "Settings")}
-
+ {pageTitle(workspaceName, "Settings")}
{
return (
<>
-
- {pageTitle(workspace.name, "Sharing")}
-
+ {pageTitle(workspace.name, "Sharing")}
+
Sharing
diff --git a/site/src/pages/WorkspacesPage/WorkspacesPage.tsx b/site/src/pages/WorkspacesPage/WorkspacesPage.tsx
index b8d8768e79..e565386fdc 100644
--- a/site/src/pages/WorkspacesPage/WorkspacesPage.tsx
+++ b/site/src/pages/WorkspacesPage/WorkspacesPage.tsx
@@ -12,7 +12,6 @@ import { useDashboard } from "modules/dashboard/useDashboard";
import { useOrganizationsFilterMenu } from "modules/tableFiltering/options";
import { ACTIVE_BUILD_STATUSES } from "modules/workspaces/status";
import { type FC, useMemo, useState } from "react";
-import { Helmet } from "react-helmet-async";
import { useQuery, useQueryClient } from "react-query";
import { useSearchParams } from "react-router";
import { pageTitle } from "utils/page";
@@ -144,9 +143,7 @@ const WorkspacesPage: FC = () => {
return (
<>
-
- {pageTitle("Workspaces")}
-
+ {pageTitle("Workspaces")}