From bf915b39b61bbeb5dde7d6455b4afc67bcb3a573 Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Wed, 27 Sep 2023 16:42:23 +0000 Subject: [PATCH 1/2] chore: simplify imports --- site/e2e/global.setup.ts | 2 +- site/src/components/CodeExample/CodeExample.tsx | 4 ++-- site/src/components/CopyButton/CopyButton.tsx | 2 +- .../Dashboard/Navbar/NavbarView.stories.tsx | 2 +- .../Dashboard/Navbar/NavbarView.test.tsx | 7 ++----- .../components/Dashboard/Navbar/NavbarView.tsx | 6 +++--- .../Navbar/UserDropdown/UserDropdown.stories.tsx | 2 +- site/src/components/Dialogs/Dialog.tsx | 2 +- site/src/components/EmptyState/EmptyState.tsx | 2 +- site/src/components/GlobalSnackbar/utils.ts | 2 +- site/src/components/Margins/Margins.tsx | 2 +- site/src/components/RequireAuth/RequireAuth.tsx | 2 +- site/src/components/Resources/AppLink/AppLink.tsx | 4 ++-- .../components/Resources/AppLink/ShareIcon.tsx | 2 +- site/src/components/Resources/ResourceAvatar.tsx | 2 +- site/src/components/Resources/ResourceCard.tsx | 2 +- site/src/components/Resources/Resources.tsx | 2 +- .../Resources/TerminalLink/TerminalLink.tsx | 4 ++-- .../components/SettingsLayout/SettingsLayout.tsx | 2 +- site/src/components/Stack/Stack.tsx | 2 +- site/src/components/TableEmpty/TableEmpty.tsx | 5 +---- .../TemplateResourcesTable.tsx | 2 +- site/src/components/Typography/Typography.tsx | 2 +- site/src/components/UsersLayout/UsersLayout.tsx | 4 ++-- .../WorkspaceBuildLogs/WorkspaceBuildLogs.tsx | 4 ++-- site/src/hooks/events.test.ts | 2 +- site/src/hooks/events.ts | 2 +- site/src/pages/CliAuthPage/CliAuthPage.tsx | 4 ++-- site/src/pages/CliAuthPage/CliAuthPageView.tsx | 2 +- .../pages/CreateTemplatePage/VariableInput.tsx | 2 +- .../CreateWorkspacePageView.stories.tsx | 2 +- .../SelectedTemplate.stories.tsx | 2 +- .../LicensesSettingsPage/LicenseCard.test.tsx | 2 +- site/src/pages/LoginPage/LoginPage.tsx | 2 +- site/src/pages/SetupPage/SetupPageView.tsx | 2 +- .../TemplateFilesPage/TemplateFilesPage.tsx | 2 +- .../TemplateInsightsPage/TemplateInsightsPage.tsx | 2 +- .../TemplateSummaryPage/TemplateSummaryPage.tsx | 2 +- .../TemplateVersionsPage/TemplateVersionsPage.tsx | 2 +- .../TemplateSettingsPage.test.tsx | 4 ++-- .../TemplateSettingsLayout.tsx | 2 +- site/src/pages/TemplatesPage/TemplatesPage.tsx | 2 +- .../TemplatesPage/TemplatesPageView.stories.tsx | 2 +- site/src/pages/TerminalPage/TerminalPage.test.tsx | 4 ++-- site/src/pages/TerminalPage/TerminalPage.tsx | 6 +++--- .../SSHKeysPage/SSHKeysPage.test.tsx | 4 ++-- .../SecurityPage/SecurityPage.test.tsx | 4 ++-- .../SecurityPage/SingleSignOnSection.tsx | 2 +- site/src/pages/UsersPage/UsersPage.tsx | 4 ++-- site/src/pages/UsersPage/UsersPageView.tsx | 2 +- .../src/pages/UsersPage/UsersTable/UsersTable.tsx | 4 ++-- .../pages/UsersPage/UsersTable/UsersTableBody.tsx | 12 ++++++------ .../WorkspaceBuildPage.test.tsx | 2 +- .../WorkspaceBuildPageView.stories.tsx | 2 +- .../WorkspaceBuildPage/WorkspaceBuildPageView.tsx | 8 ++++---- .../WorkspaceSchedulePage/schedule.ts | 2 +- .../WorkspaceSettingsLayout.tsx | 2 +- site/src/testHelpers/handlers.ts | 4 ++-- site/src/utils/apps.ts | 2 +- site/src/utils/filters.test.ts | 2 +- site/src/utils/filters.ts | 2 +- site/src/utils/schedule.test.ts | 4 ++-- site/src/utils/workspace.test.ts | 4 ++-- site/src/utils/workspace.tsx | 2 +- site/src/xServices/auth/authXService.ts | 6 +++--- site/src/xServices/users/usersXService.ts | 15 ++++++--------- .../workspaceScheduleBannerXService.ts | 7 ++----- .../workspaceScheduleXService.ts | 4 ++-- 68 files changed, 105 insertions(+), 117 deletions(-) diff --git a/site/e2e/global.setup.ts b/site/e2e/global.setup.ts index 254d982e0933d..59f314edaa317 100644 --- a/site/e2e/global.setup.ts +++ b/site/e2e/global.setup.ts @@ -1,7 +1,7 @@ import { test, expect } from "@playwright/test"; import * as constants from "./constants"; import { STORAGE_STATE } from "./playwright.config"; -import { Language } from "../src/pages/CreateUserPage/CreateUserForm"; +import { Language } from "pages/CreateUserPage/CreateUserForm"; test("create first user", async ({ page }) => { await page.goto("/", { waitUntil: "domcontentloaded" }); diff --git a/site/src/components/CodeExample/CodeExample.tsx b/site/src/components/CodeExample/CodeExample.tsx index 34cf1cb50a31f..abfdf3b206d0a 100644 --- a/site/src/components/CodeExample/CodeExample.tsx +++ b/site/src/components/CodeExample/CodeExample.tsx @@ -1,7 +1,7 @@ import { makeStyles } from "@mui/styles"; import { FC } from "react"; -import { MONOSPACE_FONT_FAMILY } from "../../theme/constants"; -import { combineClasses } from "../../utils/combineClasses"; +import { MONOSPACE_FONT_FAMILY } from "theme/constants"; +import { combineClasses } from "utils/combineClasses"; import { CopyButton } from "../CopyButton/CopyButton"; import { Theme } from "@mui/material/styles"; diff --git a/site/src/components/CopyButton/CopyButton.tsx b/site/src/components/CopyButton/CopyButton.tsx index 4f0760bcf1dd8..b22a8c104d443 100644 --- a/site/src/components/CopyButton/CopyButton.tsx +++ b/site/src/components/CopyButton/CopyButton.tsx @@ -3,7 +3,7 @@ import { makeStyles } from "@mui/styles"; import Tooltip from "@mui/material/Tooltip"; import Check from "@mui/icons-material/Check"; import { useClipboard } from "hooks/useClipboard"; -import { combineClasses } from "../../utils/combineClasses"; +import { combineClasses } from "utils/combineClasses"; import { FileCopyIcon } from "../Icons/FileCopyIcon"; interface CopyButtonProps { diff --git a/site/src/components/Dashboard/Navbar/NavbarView.stories.tsx b/site/src/components/Dashboard/Navbar/NavbarView.stories.tsx index a936a75657b89..189cd82d65a88 100644 --- a/site/src/components/Dashboard/Navbar/NavbarView.stories.tsx +++ b/site/src/components/Dashboard/Navbar/NavbarView.stories.tsx @@ -1,5 +1,5 @@ import type { Meta, StoryObj } from "@storybook/react"; -import { MockUser, MockUser2 } from "../../../testHelpers/entities"; +import { MockUser, MockUser2 } from "testHelpers/entities"; import { NavbarView } from "./NavbarView"; const meta: Meta = { diff --git a/site/src/components/Dashboard/Navbar/NavbarView.test.tsx b/site/src/components/Dashboard/Navbar/NavbarView.test.tsx index 89798d74106ff..f54c6ce22fbe8 100644 --- a/site/src/components/Dashboard/Navbar/NavbarView.test.tsx +++ b/site/src/components/Dashboard/Navbar/NavbarView.test.tsx @@ -1,9 +1,6 @@ import { screen } from "@testing-library/react"; -import { - MockPrimaryWorkspaceProxy, - MockUser, -} from "../../../testHelpers/entities"; -import { renderWithAuth } from "../../../testHelpers/renderHelpers"; +import { MockPrimaryWorkspaceProxy, MockUser } from "testHelpers/entities"; +import { renderWithAuth } from "testHelpers/renderHelpers"; import { Language as navLanguage, NavbarView } from "./NavbarView"; import { ProxyContextValue } from "contexts/ProxyContext"; import { action } from "@storybook/addon-actions"; diff --git a/site/src/components/Dashboard/Navbar/NavbarView.tsx b/site/src/components/Dashboard/Navbar/NavbarView.tsx index 3151be9cd8d8b..0e04a4557f3ec 100644 --- a/site/src/components/Dashboard/Navbar/NavbarView.tsx +++ b/site/src/components/Dashboard/Navbar/NavbarView.tsx @@ -8,9 +8,9 @@ import { CoderIcon } from "components/Icons/CoderIcon"; import { FC, useRef, useState } from "react"; import { NavLink, useLocation, useNavigate } from "react-router-dom"; import { colors } from "theme/colors"; -import * as TypesGen from "../../../api/typesGenerated"; -import { navHeight } from "../../../theme/constants"; -import { combineClasses } from "../../../utils/combineClasses"; +import * as TypesGen from "api/typesGenerated"; +import { navHeight } from "theme/constants"; +import { combineClasses } from "utils/combineClasses"; import { UserDropdown } from "./UserDropdown/UserDropdown"; import Box from "@mui/material/Box"; import Menu from "@mui/material/Menu"; diff --git a/site/src/components/Dashboard/Navbar/UserDropdown/UserDropdown.stories.tsx b/site/src/components/Dashboard/Navbar/UserDropdown/UserDropdown.stories.tsx index 6234326ab149b..0863173c60c11 100644 --- a/site/src/components/Dashboard/Navbar/UserDropdown/UserDropdown.stories.tsx +++ b/site/src/components/Dashboard/Navbar/UserDropdown/UserDropdown.stories.tsx @@ -1,4 +1,4 @@ -import { MockUser } from "../../../../testHelpers/entities"; +import { MockUser } from "testHelpers/entities"; import { UserDropdown } from "./UserDropdown"; import type { Meta, StoryObj } from "@storybook/react"; diff --git a/site/src/components/Dialogs/Dialog.tsx b/site/src/components/Dialogs/Dialog.tsx index 50457be167689..c1c606fd06268 100644 --- a/site/src/components/Dialogs/Dialog.tsx +++ b/site/src/components/Dialogs/Dialog.tsx @@ -2,7 +2,7 @@ import MuiDialog, { DialogProps as MuiDialogProps } from "@mui/material/Dialog"; import { makeStyles } from "@mui/styles"; import * as React from "react"; import { colors } from "theme/colors"; -import { combineClasses } from "../../utils/combineClasses"; +import { combineClasses } from "utils/combineClasses"; import { LoadingButton, LoadingButtonProps, diff --git a/site/src/components/EmptyState/EmptyState.tsx b/site/src/components/EmptyState/EmptyState.tsx index 6a673497a7c08..1988a825de92d 100644 --- a/site/src/components/EmptyState/EmptyState.tsx +++ b/site/src/components/EmptyState/EmptyState.tsx @@ -2,7 +2,7 @@ import Box from "@mui/material/Box"; import { makeStyles } from "@mui/styles"; import Typography from "@mui/material/Typography"; import { FC, ReactNode } from "react"; -import { combineClasses } from "../../utils/combineClasses"; +import { combineClasses } from "utils/combineClasses"; export interface EmptyStateProps { /** Text Message to display, placed inside Typography component */ diff --git a/site/src/components/GlobalSnackbar/utils.ts b/site/src/components/GlobalSnackbar/utils.ts index 0eab34f2a6eef..37e04050f9a71 100644 --- a/site/src/components/GlobalSnackbar/utils.ts +++ b/site/src/components/GlobalSnackbar/utils.ts @@ -1,4 +1,4 @@ -import { dispatchCustomEvent } from "../../utils/events"; +import { dispatchCustomEvent } from "utils/events"; /////////////////////////////////////////////////////////////////////////////// // Notification Types diff --git a/site/src/components/Margins/Margins.tsx b/site/src/components/Margins/Margins.tsx index 867b81a1d8330..c93531dbda5ea 100644 --- a/site/src/components/Margins/Margins.tsx +++ b/site/src/components/Margins/Margins.tsx @@ -5,7 +5,7 @@ import { containerWidth, containerWidthMedium, sidePadding, -} from "../../theme/constants"; +} from "theme/constants"; type Size = "regular" | "medium" | "small"; diff --git a/site/src/components/RequireAuth/RequireAuth.tsx b/site/src/components/RequireAuth/RequireAuth.tsx index b5e60e0e3ef27..5703844848b37 100644 --- a/site/src/components/RequireAuth/RequireAuth.tsx +++ b/site/src/components/RequireAuth/RequireAuth.tsx @@ -2,7 +2,7 @@ import axios from "axios"; import { useAuth } from "components/AuthProvider/AuthProvider"; import { FC, useEffect } from "react"; import { Outlet, Navigate, useLocation } from "react-router-dom"; -import { embedRedirect } from "../../utils/redirect"; +import { embedRedirect } from "utils/redirect"; import { FullScreenLoader } from "../Loader/FullScreenLoader"; import { DashboardProvider } from "components/Dashboard/DashboardProvider"; import { ProxyProvider } from "contexts/ProxyContext"; diff --git a/site/src/components/Resources/AppLink/AppLink.tsx b/site/src/components/Resources/AppLink/AppLink.tsx index 5e49d43816334..c6bab93e910c9 100644 --- a/site/src/components/Resources/AppLink/AppLink.tsx +++ b/site/src/components/Resources/AppLink/AppLink.tsx @@ -6,8 +6,8 @@ import ErrorOutlineIcon from "@mui/icons-material/ErrorOutline"; import { PrimaryAgentButton } from "components/Resources/AgentButton"; import { FC, useState } from "react"; import { combineClasses } from "utils/combineClasses"; -import * as TypesGen from "../../../api/typesGenerated"; -import { generateRandomString } from "../../../utils/random"; +import * as TypesGen from "api/typesGenerated"; +import { generateRandomString } from "utils/random"; import { BaseIcon } from "./BaseIcon"; import { ShareIcon } from "./ShareIcon"; import { useProxy } from "contexts/ProxyContext"; diff --git a/site/src/components/Resources/AppLink/ShareIcon.tsx b/site/src/components/Resources/AppLink/ShareIcon.tsx index bde1fa7e8d747..478509fa0932e 100644 --- a/site/src/components/Resources/AppLink/ShareIcon.tsx +++ b/site/src/components/Resources/AppLink/ShareIcon.tsx @@ -1,7 +1,7 @@ import PublicOutlinedIcon from "@mui/icons-material/PublicOutlined"; import GroupOutlinedIcon from "@mui/icons-material/GroupOutlined"; import LaunchOutlinedIcon from "@mui/icons-material/LaunchOutlined"; -import * as TypesGen from "../../../api/typesGenerated"; +import * as TypesGen from "api/typesGenerated"; import Tooltip from "@mui/material/Tooltip"; export interface ShareIconProps { diff --git a/site/src/components/Resources/ResourceAvatar.tsx b/site/src/components/Resources/ResourceAvatar.tsx index a559c9c6202d0..35aa96987518f 100644 --- a/site/src/components/Resources/ResourceAvatar.tsx +++ b/site/src/components/Resources/ResourceAvatar.tsx @@ -1,6 +1,6 @@ import { Avatar, AvatarIcon } from "components/Avatar/Avatar"; import { FC } from "react"; -import { WorkspaceResource } from "../../api/typesGenerated"; +import { WorkspaceResource } from "api/typesGenerated"; const FALLBACK_ICON = "/icon/widgets.svg"; diff --git a/site/src/components/Resources/ResourceCard.tsx b/site/src/components/Resources/ResourceCard.tsx index 44dcf881462fa..e19137ad0e551 100644 --- a/site/src/components/Resources/ResourceCard.tsx +++ b/site/src/components/Resources/ResourceCard.tsx @@ -1,6 +1,6 @@ import { makeStyles } from "@mui/styles"; import { FC, useState } from "react"; -import { WorkspaceAgent, WorkspaceResource } from "../../api/typesGenerated"; +import { WorkspaceAgent, WorkspaceResource } from "api/typesGenerated"; import { Stack } from "../Stack/Stack"; import { ResourceAvatar } from "./ResourceAvatar"; import { SensitiveValue } from "./SensitiveValue"; diff --git a/site/src/components/Resources/Resources.tsx b/site/src/components/Resources/Resources.tsx index aa1530b032df0..cfb24b565aaf2 100644 --- a/site/src/components/Resources/Resources.tsx +++ b/site/src/components/Resources/Resources.tsx @@ -5,7 +5,7 @@ import { OpenDropdown, } from "components/DropdownArrows/DropdownArrows"; import { FC, useState } from "react"; -import { WorkspaceAgent, WorkspaceResource } from "../../api/typesGenerated"; +import { WorkspaceAgent, WorkspaceResource } from "api/typesGenerated"; import { Stack } from "../Stack/Stack"; import { ResourceCard } from "./ResourceCard"; diff --git a/site/src/components/Resources/TerminalLink/TerminalLink.tsx b/site/src/components/Resources/TerminalLink/TerminalLink.tsx index 204d255b89ef4..bbf0e08a930d8 100644 --- a/site/src/components/Resources/TerminalLink/TerminalLink.tsx +++ b/site/src/components/Resources/TerminalLink/TerminalLink.tsx @@ -1,8 +1,8 @@ import Link from "@mui/material/Link"; import { SecondaryAgentButton } from "components/Resources/AgentButton"; import { FC } from "react"; -import * as TypesGen from "../../../api/typesGenerated"; -import { generateRandomString } from "../../../utils/random"; +import * as TypesGen from "api/typesGenerated"; +import { generateRandomString } from "utils/random"; export const Language = { linkText: "Terminal", diff --git a/site/src/components/SettingsLayout/SettingsLayout.tsx b/site/src/components/SettingsLayout/SettingsLayout.tsx index 3dc9c567e9241..f950588829e45 100644 --- a/site/src/components/SettingsLayout/SettingsLayout.tsx +++ b/site/src/components/SettingsLayout/SettingsLayout.tsx @@ -3,7 +3,7 @@ import { Sidebar } from "./Sidebar"; import { Stack } from "components/Stack/Stack"; import { FC, Suspense } from "react"; import { Helmet } from "react-helmet-async"; -import { pageTitle } from "../../utils/page"; +import { pageTitle } from "utils/page"; import { Margins } from "../Margins/Margins"; import { useMe } from "hooks/useMe"; import { Loader } from "components/Loader/Loader"; diff --git a/site/src/components/Stack/Stack.tsx b/site/src/components/Stack/Stack.tsx index a3dd9a536fc3f..13c3cfa46c46c 100644 --- a/site/src/components/Stack/Stack.tsx +++ b/site/src/components/Stack/Stack.tsx @@ -2,7 +2,7 @@ import { makeStyles } from "@mui/styles"; import { CSSProperties } from "@mui/styles/withStyles"; import { FC } from "react"; import { ReactNode } from "react-markdown/lib/react-markdown"; -import { combineClasses } from "../../utils/combineClasses"; +import { combineClasses } from "utils/combineClasses"; type Direction = "column" | "row"; diff --git a/site/src/components/TableEmpty/TableEmpty.tsx b/site/src/components/TableEmpty/TableEmpty.tsx index 4ce26514b16df..d08a01f969b43 100644 --- a/site/src/components/TableEmpty/TableEmpty.tsx +++ b/site/src/components/TableEmpty/TableEmpty.tsx @@ -1,10 +1,7 @@ import TableCell from "@mui/material/TableCell"; import TableRow from "@mui/material/TableRow"; import { FC } from "react"; -import { - EmptyState, - EmptyStateProps, -} from "../../components/EmptyState/EmptyState"; +import { EmptyState, EmptyStateProps } from "components/EmptyState/EmptyState"; export type TableEmptyProps = EmptyStateProps; diff --git a/site/src/components/TemplateResourcesTable/TemplateResourcesTable.tsx b/site/src/components/TemplateResourcesTable/TemplateResourcesTable.tsx index 22b1b218ded81..90562dbcbc51c 100644 --- a/site/src/components/TemplateResourcesTable/TemplateResourcesTable.tsx +++ b/site/src/components/TemplateResourcesTable/TemplateResourcesTable.tsx @@ -1,7 +1,7 @@ import { AgentRowPreview } from "components/Resources/AgentRowPreview"; import { Resources } from "components/Resources/Resources"; import { FC } from "react"; -import { WorkspaceResource } from "../../api/typesGenerated"; +import { WorkspaceResource } from "api/typesGenerated"; export interface TemplateResourcesProps { resources: WorkspaceResource[]; diff --git a/site/src/components/Typography/Typography.tsx b/site/src/components/Typography/Typography.tsx index e5d54244e4da5..7dd248df9a042 100644 --- a/site/src/components/Typography/Typography.tsx +++ b/site/src/components/Typography/Typography.tsx @@ -8,7 +8,7 @@ import MuiTypography, { TypographyProps as MuiTypographyProps, } from "@mui/material/Typography"; import * as React from "react"; -import { appendCSSString, combineClasses } from "../../utils/combineClasses"; +import { appendCSSString, combineClasses } from "utils/combineClasses"; export interface TypographyProps extends MuiTypographyProps { short?: boolean; diff --git a/site/src/components/UsersLayout/UsersLayout.tsx b/site/src/components/UsersLayout/UsersLayout.tsx index 5d64f8a24a31a..7a4d380b3e8cd 100644 --- a/site/src/components/UsersLayout/UsersLayout.tsx +++ b/site/src/components/UsersLayout/UsersLayout.tsx @@ -15,8 +15,8 @@ import { useNavigate, } from "react-router-dom"; import { combineClasses } from "utils/combineClasses"; -import { Margins } from "../../components/Margins/Margins"; -import { Stack } from "../../components/Stack/Stack"; +import { Margins } from "components/Margins/Margins"; +import { Stack } from "components/Stack/Stack"; export const UsersLayout: FC = () => { const styles = useStyles(); diff --git a/site/src/components/WorkspaceBuildLogs/WorkspaceBuildLogs.tsx b/site/src/components/WorkspaceBuildLogs/WorkspaceBuildLogs.tsx index 00082937cbd77..e1fa8463f7602 100644 --- a/site/src/components/WorkspaceBuildLogs/WorkspaceBuildLogs.tsx +++ b/site/src/components/WorkspaceBuildLogs/WorkspaceBuildLogs.tsx @@ -1,8 +1,8 @@ import { makeStyles } from "@mui/styles"; import dayjs from "dayjs"; import { ComponentProps, FC, Fragment } from "react"; -import { ProvisionerJobLog } from "../../api/typesGenerated"; -import { MONOSPACE_FONT_FAMILY } from "../../theme/constants"; +import { ProvisionerJobLog } from "api/typesGenerated"; +import { MONOSPACE_FONT_FAMILY } from "theme/constants"; import { Logs } from "./Logs"; import Box from "@mui/material/Box"; import { combineClasses } from "utils/combineClasses"; diff --git a/site/src/hooks/events.test.ts b/site/src/hooks/events.test.ts index 6187b77be7364..176dc448316ad 100644 --- a/site/src/hooks/events.test.ts +++ b/site/src/hooks/events.test.ts @@ -1,5 +1,5 @@ import { renderHook, waitFor } from "@testing-library/react"; -import { dispatchCustomEvent } from "../utils/events"; +import { dispatchCustomEvent } from "utils/events"; import { useCustomEvent } from "./events"; describe("useCustomEvent", () => { diff --git a/site/src/hooks/events.ts b/site/src/hooks/events.ts index 2d43ae102f320..4a67319a7666a 100644 --- a/site/src/hooks/events.ts +++ b/site/src/hooks/events.ts @@ -1,5 +1,5 @@ import { useEffect } from "react"; -import { CustomEventListener } from "../utils/events"; +import { CustomEventListener } from "utils/events"; /** * Handles a custom event with descriptive type information. diff --git a/site/src/pages/CliAuthPage/CliAuthPage.tsx b/site/src/pages/CliAuthPage/CliAuthPage.tsx index 1f7fe94de3856..697f682c6943c 100644 --- a/site/src/pages/CliAuthPage/CliAuthPage.tsx +++ b/site/src/pages/CliAuthPage/CliAuthPage.tsx @@ -1,7 +1,7 @@ import { useEffect, useState, FC, PropsWithChildren } from "react"; import { Helmet } from "react-helmet-async"; -import { getApiKey } from "../../api/api"; -import { pageTitle } from "../../utils/page"; +import { getApiKey } from "api/api"; +import { pageTitle } from "utils/page"; import { CliAuthPageView } from "./CliAuthPageView"; export const CliAuthenticationPage: FC> = () => { diff --git a/site/src/pages/CliAuthPage/CliAuthPageView.tsx b/site/src/pages/CliAuthPage/CliAuthPageView.tsx index ba91484b69ab8..5253ec721a66e 100644 --- a/site/src/pages/CliAuthPage/CliAuthPageView.tsx +++ b/site/src/pages/CliAuthPage/CliAuthPageView.tsx @@ -5,7 +5,7 @@ import { SignInLayout } from "components/SignInLayout/SignInLayout"; import { Welcome } from "components/Welcome/Welcome"; import { FC } from "react"; import { Link as RouterLink } from "react-router-dom"; -import { FullScreenLoader } from "../../components/Loader/FullScreenLoader"; +import { FullScreenLoader } from "components/Loader/FullScreenLoader"; export interface CliAuthPageViewProps { sessionToken: string | null; diff --git a/site/src/pages/CreateTemplatePage/VariableInput.tsx b/site/src/pages/CreateTemplatePage/VariableInput.tsx index d0bb52db80265..012e3c9efbe3e 100644 --- a/site/src/pages/CreateTemplatePage/VariableInput.tsx +++ b/site/src/pages/CreateTemplatePage/VariableInput.tsx @@ -5,7 +5,7 @@ import { makeStyles } from "@mui/styles"; import TextField from "@mui/material/TextField"; import { Stack } from "components/Stack/Stack"; import { FC } from "react"; -import { TemplateVersionVariable } from "../../api/typesGenerated"; +import { TemplateVersionVariable } from "api/typesGenerated"; const isBoolean = (variable: TemplateVersionVariable) => { return variable.type === "bool"; diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.stories.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.stories.tsx index b404757bdd782..f8b25451e846f 100644 --- a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.stories.tsx +++ b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.stories.tsx @@ -6,7 +6,7 @@ import { MockTemplateVersionParameter2, MockTemplateVersionParameter3, MockUser, -} from "../../testHelpers/entities"; +} from "testHelpers/entities"; import { CreateWorkspacePageView } from "./CreateWorkspacePageView"; const meta: Meta = { diff --git a/site/src/pages/CreateWorkspacePage/SelectedTemplate.stories.tsx b/site/src/pages/CreateWorkspacePage/SelectedTemplate.stories.tsx index 51f54b0951823..c318c611fb85e 100644 --- a/site/src/pages/CreateWorkspacePage/SelectedTemplate.stories.tsx +++ b/site/src/pages/CreateWorkspacePage/SelectedTemplate.stories.tsx @@ -1,4 +1,4 @@ -import { MockTemplate } from "../../testHelpers/entities"; +import { MockTemplate } from "testHelpers/entities"; import { SelectedTemplate } from "./SelectedTemplate"; import type { Meta, StoryObj } from "@storybook/react"; diff --git a/site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicenseCard.test.tsx b/site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicenseCard.test.tsx index 63b840bc681fb..8f8a980628d50 100644 --- a/site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicenseCard.test.tsx +++ b/site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicenseCard.test.tsx @@ -1,5 +1,5 @@ import { screen } from "@testing-library/react"; -import { render } from "../../../testHelpers/renderHelpers"; +import { render } from "testHelpers/renderHelpers"; import { LicenseCard } from "./LicenseCard"; import { MockLicenseResponse } from "testHelpers/entities"; diff --git a/site/src/pages/LoginPage/LoginPage.tsx b/site/src/pages/LoginPage/LoginPage.tsx index 3b76c57c0279e..e9c7722643157 100644 --- a/site/src/pages/LoginPage/LoginPage.tsx +++ b/site/src/pages/LoginPage/LoginPage.tsx @@ -2,7 +2,7 @@ import { useAuth } from "components/AuthProvider/AuthProvider"; import { FC } from "react"; import { Helmet } from "react-helmet-async"; import { Navigate, useLocation } from "react-router-dom"; -import { retrieveRedirect } from "../../utils/redirect"; +import { retrieveRedirect } from "utils/redirect"; import { LoginPageView } from "./LoginPageView"; export const LoginPage: FC = () => { diff --git a/site/src/pages/SetupPage/SetupPageView.tsx b/site/src/pages/SetupPage/SetupPageView.tsx index 681f367ad0fbc..4d956fa6812f2 100644 --- a/site/src/pages/SetupPage/SetupPageView.tsx +++ b/site/src/pages/SetupPage/SetupPageView.tsx @@ -14,7 +14,7 @@ import { onChangeTrimmed, } from "utils/formUtils"; import * as Yup from "yup"; -import * as TypesGen from "../../api/typesGenerated"; +import * as TypesGen from "api/typesGenerated"; export const Language = { emailLabel: "Email", diff --git a/site/src/pages/TemplatePage/TemplateFilesPage/TemplateFilesPage.tsx b/site/src/pages/TemplatePage/TemplateFilesPage/TemplateFilesPage.tsx index e52e2e5d7c673..131fa08656c5c 100644 --- a/site/src/pages/TemplatePage/TemplateFilesPage/TemplateFilesPage.tsx +++ b/site/src/pages/TemplatePage/TemplateFilesPage/TemplateFilesPage.tsx @@ -12,7 +12,7 @@ import { getTemplateVersionFiles, TemplateVersionFiles, } from "utils/templateVersion"; -import { getTemplatePageTitle } from "../utils"; +import { getTemplatePageTitle } from "utils"; const fetchTemplateFiles = async ( organizationId: string, diff --git a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx index e6ae5e642e903..ed3e843f8ee2f 100644 --- a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx +++ b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx @@ -16,7 +16,7 @@ import { getLatencyColor } from "utils/latency"; import chroma from "chroma-js"; import { colors } from "theme/colors"; import { Helmet } from "react-helmet-async"; -import { getTemplatePageTitle } from "../utils"; +import { getTemplatePageTitle } from "utils"; import { Loader } from "components/Loader/Loader"; import { DAUsResponse, diff --git a/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPage.tsx b/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPage.tsx index 7231443a16cc3..0a4f565ab1f80 100644 --- a/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPage.tsx +++ b/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPage.tsx @@ -1,7 +1,7 @@ import { useTemplateLayoutContext } from "pages/TemplatePage/TemplateLayout"; import { FC } from "react"; import { Helmet } from "react-helmet-async"; -import { getTemplatePageTitle } from "../utils"; +import { getTemplatePageTitle } from "utils"; import { TemplateSummaryPageView } from "./TemplateSummaryPageView"; import { useQuery } from "@tanstack/react-query"; import { getTemplateVersionResources } from "api/api"; diff --git a/site/src/pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx b/site/src/pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx index 458fc305bb24a..59adadc9abbd2 100644 --- a/site/src/pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx +++ b/site/src/pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx @@ -7,7 +7,7 @@ import { useTemplateLayoutContext } from "pages/TemplatePage/TemplateLayout"; import { VersionsTable } from "./VersionsTable"; import { useState } from "react"; import { Helmet } from "react-helmet-async"; -import { getTemplatePageTitle } from "../utils"; +import { getTemplatePageTitle } from "utils"; const TemplateVersionsPage = () => { const { template, permissions } = useTemplateLayoutContext(); diff --git a/site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPage.test.tsx b/site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPage.test.tsx index cc49489de9920..adf3fa3e531de 100644 --- a/site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPage.test.tsx +++ b/site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPage.test.tsx @@ -3,11 +3,11 @@ import userEvent from "@testing-library/user-event"; import * as API from "api/api"; import { UpdateTemplateMeta } from "api/typesGenerated"; import { Language as FooterFormLanguage } from "components/FormFooter/FormFooter"; -import { MockTemplate } from "../../../testHelpers/entities"; +import { MockTemplate } from "testHelpers/entities"; import { renderWithTemplateSettingsLayout, waitForLoaderToBeRemoved, -} from "../../../testHelpers/renderHelpers"; +} from "testHelpers/renderHelpers"; import { getValidationSchema } from "./TemplateSettingsForm"; import { TemplateSettingsPage } from "./TemplateSettingsPage"; diff --git a/site/src/pages/TemplateSettingsPage/TemplateSettingsLayout.tsx b/site/src/pages/TemplateSettingsPage/TemplateSettingsLayout.tsx index 5f4a825765a5b..fc348626ba6d5 100644 --- a/site/src/pages/TemplateSettingsPage/TemplateSettingsLayout.tsx +++ b/site/src/pages/TemplateSettingsPage/TemplateSettingsLayout.tsx @@ -3,7 +3,7 @@ import { Sidebar } from "./Sidebar"; import { Stack } from "components/Stack/Stack"; import { createContext, FC, Suspense, useContext } from "react"; import { Helmet } from "react-helmet-async"; -import { pageTitle } from "../../utils/page"; +import { pageTitle } from "utils/page"; import { Loader } from "components/Loader/Loader"; import { Outlet, useParams } from "react-router-dom"; import { Margins } from "components/Margins/Margins"; diff --git a/site/src/pages/TemplatesPage/TemplatesPage.tsx b/site/src/pages/TemplatesPage/TemplatesPage.tsx index 183904a9b743a..e5f2aea83ddb1 100644 --- a/site/src/pages/TemplatesPage/TemplatesPage.tsx +++ b/site/src/pages/TemplatesPage/TemplatesPage.tsx @@ -2,7 +2,7 @@ import { useOrganizationId } from "hooks/useOrganizationId"; import { usePermissions } from "hooks/usePermissions"; import { FC } from "react"; import { Helmet } from "react-helmet-async"; -import { pageTitle } from "../../utils/page"; +import { pageTitle } from "utils/page"; import { TemplatesPageView } from "./TemplatesPageView"; import { templateExamples, templates } from "api/queries/templates"; import { useQuery } from "@tanstack/react-query"; diff --git a/site/src/pages/TemplatesPage/TemplatesPageView.stories.tsx b/site/src/pages/TemplatesPage/TemplatesPageView.stories.tsx index 36f305d4a2b9e..18246eb8493dc 100644 --- a/site/src/pages/TemplatesPage/TemplatesPageView.stories.tsx +++ b/site/src/pages/TemplatesPage/TemplatesPageView.stories.tsx @@ -3,7 +3,7 @@ import { MockTemplate, MockTemplateExample, MockTemplateExample2, -} from "../../testHelpers/entities"; +} from "testHelpers/entities"; import { TemplatesPageView } from "./TemplatesPageView"; import type { Meta, StoryObj } from "@storybook/react"; diff --git a/site/src/pages/TerminalPage/TerminalPage.test.tsx b/site/src/pages/TerminalPage/TerminalPage.test.tsx index dae0cf5e85efa..d8fb9d28ddd69 100644 --- a/site/src/pages/TerminalPage/TerminalPage.test.tsx +++ b/site/src/pages/TerminalPage/TerminalPage.test.tsx @@ -11,8 +11,8 @@ import { TextDecoder, TextEncoder } from "util"; import { renderWithAuth, waitForLoaderToBeRemoved, -} from "../../testHelpers/renderHelpers"; -import { server } from "../../testHelpers/server"; +} from "testHelpers/renderHelpers"; +import { server } from "testHelpers/server"; import TerminalPage, { Language } from "./TerminalPage"; import * as API from "api/api"; diff --git a/site/src/pages/TerminalPage/TerminalPage.tsx b/site/src/pages/TerminalPage/TerminalPage.tsx index 0cc206cd51493..da022b7c3cff8 100644 --- a/site/src/pages/TerminalPage/TerminalPage.tsx +++ b/site/src/pages/TerminalPage/TerminalPage.tsx @@ -12,9 +12,9 @@ import { FitAddon } from "xterm-addon-fit"; import { WebLinksAddon } from "xterm-addon-web-links"; import { Unicode11Addon } from "xterm-addon-unicode11"; import "xterm/css/xterm.css"; -import { MONOSPACE_FONT_FAMILY } from "../../theme/constants"; -import { pageTitle } from "../../utils/page"; -import { terminalMachine } from "../../xServices/terminal/terminalXService"; +import { MONOSPACE_FONT_FAMILY } from "theme/constants"; +import { pageTitle } from "utils/page"; +import { terminalMachine } from "xServices/terminal/terminalXService"; import { useProxy } from "contexts/ProxyContext"; import Box from "@mui/material/Box"; import { useDashboard } from "components/Dashboard/DashboardProvider"; diff --git a/site/src/pages/UserSettingsPage/SSHKeysPage/SSHKeysPage.test.tsx b/site/src/pages/UserSettingsPage/SSHKeysPage/SSHKeysPage.test.tsx index 99adfa9c12b8a..d5d84ec767876 100644 --- a/site/src/pages/UserSettingsPage/SSHKeysPage/SSHKeysPage.test.tsx +++ b/site/src/pages/UserSettingsPage/SSHKeysPage/SSHKeysPage.test.tsx @@ -1,6 +1,6 @@ import { fireEvent, screen, within } from "@testing-library/react"; -import * as API from "../../../api/api"; -import { renderWithAuth } from "../../../testHelpers/renderHelpers"; +import * as API from "api/api"; +import { renderWithAuth } from "testHelpers/renderHelpers"; import { Language as SSHKeysPageLanguage, SSHKeysPage } from "./SSHKeysPage"; import { MockGitSSHKey, mockApiError } from "testHelpers/entities"; diff --git a/site/src/pages/UserSettingsPage/SecurityPage/SecurityPage.test.tsx b/site/src/pages/UserSettingsPage/SecurityPage/SecurityPage.test.tsx index 902c1e849c944..f13334b7af73f 100644 --- a/site/src/pages/UserSettingsPage/SecurityPage/SecurityPage.test.tsx +++ b/site/src/pages/UserSettingsPage/SecurityPage/SecurityPage.test.tsx @@ -1,10 +1,10 @@ import { fireEvent, screen, waitFor, within } from "@testing-library/react"; -import * as API from "../../../api/api"; +import * as API from "api/api"; import * as SecurityForm from "./SettingsSecurityForm"; import { renderWithAuth, waitForLoaderToBeRemoved, -} from "../../../testHelpers/renderHelpers"; +} from "testHelpers/renderHelpers"; import { SecurityPage } from "./SecurityPage"; import { MockAuthMethodsWithPasswordType, diff --git a/site/src/pages/UserSettingsPage/SecurityPage/SingleSignOnSection.tsx b/site/src/pages/UserSettingsPage/SecurityPage/SingleSignOnSection.tsx index 4b0cecc6ffdc6..e2f191dc59256 100644 --- a/site/src/pages/UserSettingsPage/SecurityPage/SingleSignOnSection.tsx +++ b/site/src/pages/UserSettingsPage/SecurityPage/SingleSignOnSection.tsx @@ -1,5 +1,5 @@ import { useState } from "react"; -import { Section } from "../../../components/SettingsLayout/Section"; +import { Section } from "components/SettingsLayout/Section"; import TextField from "@mui/material/TextField"; import Box from "@mui/material/Box"; import GitHubIcon from "@mui/icons-material/GitHub"; diff --git a/site/src/pages/UsersPage/UsersPage.tsx b/site/src/pages/UsersPage/UsersPage.tsx index 8cce56cdbe574..d6756d6663ef7 100644 --- a/site/src/pages/UsersPage/UsersPage.tsx +++ b/site/src/pages/UsersPage/UsersPage.tsx @@ -11,9 +11,9 @@ import { FC, ReactNode, useEffect } from "react"; import { Helmet } from "react-helmet-async"; import { useSearchParams, useNavigate } from "react-router-dom"; import { usersMachine } from "xServices/users/usersXService"; -import { ConfirmDialog } from "../../components/Dialogs/ConfirmDialog/ConfirmDialog"; +import { ConfirmDialog } from "components/Dialogs/ConfirmDialog/ConfirmDialog"; import { ResetPasswordDialog } from "./ResetPasswordDialog"; -import { pageTitle } from "../../utils/page"; +import { pageTitle } from "utils/page"; import { UsersPageView } from "./UsersPageView"; import { useStatusFilterMenu } from "./UsersFilter"; import { useFilter } from "components/Filter/filter"; diff --git a/site/src/pages/UsersPage/UsersPageView.tsx b/site/src/pages/UsersPage/UsersPageView.tsx index e3d19b3ca8503..66a87fac8a79f 100644 --- a/site/src/pages/UsersPage/UsersPageView.tsx +++ b/site/src/pages/UsersPage/UsersPageView.tsx @@ -1,7 +1,7 @@ import { PaginationWidget } from "components/PaginationWidget/PaginationWidget"; import { ComponentProps, FC } from "react"; import { PaginationMachineRef } from "xServices/pagination/paginationXService"; -import * as TypesGen from "../../api/typesGenerated"; +import * as TypesGen from "api/typesGenerated"; import { UsersTable } from "./UsersTable/UsersTable"; import { UsersFilter } from "./UsersFilter"; import { diff --git a/site/src/pages/UsersPage/UsersTable/UsersTable.tsx b/site/src/pages/UsersPage/UsersTable/UsersTable.tsx index d89e1d719c560..4a47c68d49cae 100644 --- a/site/src/pages/UsersPage/UsersTable/UsersTable.tsx +++ b/site/src/pages/UsersPage/UsersTable/UsersTable.tsx @@ -5,8 +5,8 @@ import TableContainer from "@mui/material/TableContainer"; import TableHead from "@mui/material/TableHead"; import TableRow from "@mui/material/TableRow"; import { FC } from "react"; -import * as TypesGen from "../../../api/typesGenerated"; -import { Stack } from "../../../components/Stack/Stack"; +import * as TypesGen from "api/typesGenerated"; +import { Stack } from "components/Stack/Stack"; import { UserRoleHelpTooltip } from "./UserRoleHelpTooltip"; import { UsersTableBody } from "./UsersTableBody"; diff --git a/site/src/pages/UsersPage/UsersTable/UsersTableBody.tsx b/site/src/pages/UsersPage/UsersTable/UsersTableBody.tsx index 7c68d3ba246bf..4696974f8a9f5 100644 --- a/site/src/pages/UsersPage/UsersTable/UsersTableBody.tsx +++ b/site/src/pages/UsersPage/UsersTable/UsersTableBody.tsx @@ -5,15 +5,15 @@ import TableRow from "@mui/material/TableRow"; import { ChooseOne, Cond } from "components/Conditionals/ChooseOne"; import { Pill } from "components/Pill/Pill"; import { type FC } from "react"; -import * as TypesGen from "../../../api/typesGenerated"; -import { combineClasses } from "../../../utils/combineClasses"; -import { AvatarData } from "../../../components/AvatarData/AvatarData"; -import { EmptyState } from "../../../components/EmptyState/EmptyState"; +import * as TypesGen from "api/typesGenerated"; +import { combineClasses } from "utils/combineClasses"; +import { AvatarData } from "components/AvatarData/AvatarData"; +import { EmptyState } from "components/EmptyState/EmptyState"; import { TableLoaderSkeleton, TableRowSkeleton, -} from "../../../components/TableLoader/TableLoader"; -import { TableRowMenu } from "../../../components/TableRowMenu/TableRowMenu"; +} from "components/TableLoader/TableLoader"; +import { TableRowMenu } from "components/TableRowMenu/TableRowMenu"; import { EditRolesButton } from "./EditRolesButton"; import { Stack } from "components/Stack/Stack"; import { EnterpriseBadge } from "components/DeploySettingsLayout/Badges"; diff --git a/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.test.tsx b/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.test.tsx index 832a58a43432e..7ec9d8f25595d 100644 --- a/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.test.tsx +++ b/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.test.tsx @@ -1,6 +1,6 @@ import { screen, waitFor } from "@testing-library/react"; import WS from "jest-websocket-mock"; -import { renderWithAuth } from "../../testHelpers/renderHelpers"; +import { renderWithAuth } from "testHelpers/renderHelpers"; import { WorkspaceBuildPage } from "./WorkspaceBuildPage"; import { MockWorkspace, MockWorkspaceBuild } from "testHelpers/entities"; import * as API from "api/api"; diff --git a/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPageView.stories.tsx b/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPageView.stories.tsx index 49ddbef5208b3..d07ae4f5a4ef4 100644 --- a/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPageView.stories.tsx +++ b/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPageView.stories.tsx @@ -3,7 +3,7 @@ import { MockFailedWorkspaceBuild, MockWorkspaceBuild, MockWorkspaceBuildLogs, -} from "../../testHelpers/entities"; +} from "testHelpers/entities"; import { WorkspaceBuildPageView } from "./WorkspaceBuildPageView"; const defaultBuilds = Array.from({ length: 15 }, (_, i) => ({ diff --git a/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPageView.tsx b/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPageView.tsx index 65142c781ee0c..c764a30bb67a9 100644 --- a/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPageView.tsx +++ b/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPageView.tsx @@ -1,9 +1,9 @@ import { BuildAvatar } from "components/BuildAvatar/BuildAvatar"; import { FC } from "react"; -import { ProvisionerJobLog, WorkspaceBuild } from "../../api/typesGenerated"; -import { Loader } from "../../components/Loader/Loader"; -import { Stack } from "../../components/Stack/Stack"; -import { WorkspaceBuildLogs } from "../../components/WorkspaceBuildLogs/WorkspaceBuildLogs"; +import { ProvisionerJobLog, WorkspaceBuild } from "api/typesGenerated"; +import { Loader } from "components/Loader/Loader"; +import { Stack } from "components/Stack/Stack"; +import { WorkspaceBuildLogs } from "components/WorkspaceBuildLogs/WorkspaceBuildLogs"; import { makeStyles } from "@mui/styles"; import { FullWidthPageHeader, diff --git a/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/schedule.ts b/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/schedule.ts index b419e1191cfbd..72dbfb9bffeb6 100644 --- a/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/schedule.ts +++ b/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/schedule.ts @@ -2,7 +2,7 @@ import * as cronParser from "cron-parser"; import dayjs from "dayjs"; import timezone from "dayjs/plugin/timezone"; import utc from "dayjs/plugin/utc"; -import { extractTimezone, stripTimezone } from "../../../utils/schedule"; +import { extractTimezone, stripTimezone } from "utils/schedule"; import { Autostop } from "./ttl"; import { WorkspaceScheduleFormValues } from "./WorkspaceScheduleForm"; import map from "lodash/map"; diff --git a/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsLayout.tsx b/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsLayout.tsx index 8902e9da81b7d..21e7f994e9224 100644 --- a/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsLayout.tsx +++ b/site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsLayout.tsx @@ -3,7 +3,7 @@ import { Sidebar } from "./Sidebar"; import { Stack } from "components/Stack/Stack"; import { createContext, FC, Suspense, useContext } from "react"; import { Helmet } from "react-helmet-async"; -import { pageTitle } from "../../utils/page"; +import { pageTitle } from "utils/page"; import { Loader } from "components/Loader/Loader"; import { Outlet, useParams } from "react-router-dom"; import { Margins } from "components/Margins/Margins"; diff --git a/site/src/testHelpers/handlers.ts b/site/src/testHelpers/handlers.ts index 21e580faa2458..c1deb90054929 100644 --- a/site/src/testHelpers/handlers.ts +++ b/site/src/testHelpers/handlers.ts @@ -1,6 +1,6 @@ import { rest } from "msw"; -import { CreateWorkspaceBuildRequest } from "../api/typesGenerated"; -import { permissionsToCheck } from "../xServices/auth/authXService"; +import { CreateWorkspaceBuildRequest } from "api/typesGenerated"; +import { permissionsToCheck } from "xServices/auth/authXService"; import * as M from "./entities"; import { MockGroup, MockWorkspaceQuota } from "./entities"; import fs from "fs"; diff --git a/site/src/utils/apps.ts b/site/src/utils/apps.ts index fafa17ac82959..6021f2ffebb52 100644 --- a/site/src/utils/apps.ts +++ b/site/src/utils/apps.ts @@ -1,4 +1,4 @@ -import * as TypesGen from "../api/typesGenerated"; +import * as TypesGen from "api/typesGenerated"; export const createAppLinkHref = ( protocol: string, diff --git a/site/src/utils/filters.test.ts b/site/src/utils/filters.test.ts index f5eb2d07676f5..35d261a659d2a 100644 --- a/site/src/utils/filters.test.ts +++ b/site/src/utils/filters.test.ts @@ -1,4 +1,4 @@ -import * as TypesGen from "../api/typesGenerated"; +import * as TypesGen from "api/typesGenerated"; import { queryToFilter } from "./filters"; describe("queryToFilter", () => { diff --git a/site/src/utils/filters.ts b/site/src/utils/filters.ts index e01b423ea7693..32a9831d077a4 100644 --- a/site/src/utils/filters.ts +++ b/site/src/utils/filters.ts @@ -1,4 +1,4 @@ -import * as TypesGen from "../api/typesGenerated"; +import * as TypesGen from "api/typesGenerated"; export const queryToFilter = ( query?: string, diff --git a/site/src/utils/schedule.test.ts b/site/src/utils/schedule.test.ts index 4e8d7ceac9e9a..154fc4b0e7c24 100644 --- a/site/src/utils/schedule.test.ts +++ b/site/src/utils/schedule.test.ts @@ -1,7 +1,7 @@ import dayjs from "dayjs"; import duration from "dayjs/plugin/duration"; -import { Workspace } from "../api/typesGenerated"; -import * as Mocks from "../testHelpers/entities"; +import { Workspace } from "api/typesGenerated"; +import * as Mocks from "testHelpers/entities"; import { deadlineExtensionMax, deadlineExtensionMin, diff --git a/site/src/utils/workspace.test.ts b/site/src/utils/workspace.test.ts index 25f9933a5c4dd..f7385eb850ca0 100644 --- a/site/src/utils/workspace.test.ts +++ b/site/src/utils/workspace.test.ts @@ -1,6 +1,6 @@ import dayjs from "dayjs"; -import * as TypesGen from "../api/typesGenerated"; -import * as Mocks from "../testHelpers/entities"; +import * as TypesGen from "api/typesGenerated"; +import * as Mocks from "testHelpers/entities"; import { defaultWorkspaceExtension, getDisplayVersionStatus, diff --git a/site/src/utils/workspace.tsx b/site/src/utils/workspace.tsx index baa823edb4bb2..1cc36f45688b9 100644 --- a/site/src/utils/workspace.tsx +++ b/site/src/utils/workspace.tsx @@ -4,7 +4,7 @@ import duration from "dayjs/plugin/duration"; import minMax from "dayjs/plugin/minMax"; import utc from "dayjs/plugin/utc"; import semver from "semver"; -import * as TypesGen from "../api/typesGenerated"; +import * as TypesGen from "api/typesGenerated"; import CircularProgress from "@mui/material/CircularProgress"; import ErrorIcon from "@mui/icons-material/ErrorOutline"; import StopIcon from "@mui/icons-material/StopOutlined"; diff --git a/site/src/xServices/auth/authXService.ts b/site/src/xServices/auth/authXService.ts index eb83fe3be56b5..295954402a9b8 100644 --- a/site/src/xServices/auth/authXService.ts +++ b/site/src/xServices/auth/authXService.ts @@ -1,7 +1,7 @@ import { assign, createMachine } from "xstate"; -import * as API from "../../api/api"; -import * as TypesGen from "../../api/typesGenerated"; -import { displaySuccess } from "../../components/GlobalSnackbar/utils"; +import * as API from "api/api"; +import * as TypesGen from "api/typesGenerated"; +import { displaySuccess } from "components/GlobalSnackbar/utils"; export const Language = { successProfileUpdate: "Updated settings.", diff --git a/site/src/xServices/users/usersXService.ts b/site/src/xServices/users/usersXService.ts index 1f2b904350805..f247a74a59af9 100644 --- a/site/src/xServices/users/usersXService.ts +++ b/site/src/xServices/users/usersXService.ts @@ -5,15 +5,12 @@ import { PaginationMachineRef, } from "xServices/pagination/paginationXService"; import { assign, createMachine, send, spawn } from "xstate"; -import * as API from "../../api/api"; -import { getErrorMessage } from "../../api/errors"; -import * as TypesGen from "../../api/typesGenerated"; -import { - displayError, - displaySuccess, -} from "../../components/GlobalSnackbar/utils"; -import { queryToFilter } from "../../utils/filters"; -import { generateRandomString } from "../../utils/random"; +import * as API from "api/api"; +import { getErrorMessage } from "api/errors"; +import * as TypesGen from "api/typesGenerated"; +import { displayError, displaySuccess } from "components/GlobalSnackbar/utils"; +import { queryToFilter } from "utils/filters"; +import { generateRandomString } from "utils/random"; const usersPaginationId = "usersPagination"; diff --git a/site/src/xServices/workspaceSchedule/workspaceScheduleBannerXService.ts b/site/src/xServices/workspaceSchedule/workspaceScheduleBannerXService.ts index 9bd25aa5e6aea..73905019cddda 100644 --- a/site/src/xServices/workspaceSchedule/workspaceScheduleBannerXService.ts +++ b/site/src/xServices/workspaceSchedule/workspaceScheduleBannerXService.ts @@ -8,11 +8,8 @@ import dayjs from "dayjs"; import minMax from "dayjs/plugin/minMax"; import { getDeadline, getMaxDeadline, getMinDeadline } from "utils/schedule"; import { assign, createMachine } from "xstate"; -import * as API from "../../api/api"; -import { - displayError, - displaySuccess, -} from "../../components/GlobalSnackbar/utils"; +import * as API from "api/api"; +import { displayError, displaySuccess } from "components/GlobalSnackbar/utils"; dayjs.extend(minMax); diff --git a/site/src/xServices/workspaceSchedule/workspaceScheduleXService.ts b/site/src/xServices/workspaceSchedule/workspaceScheduleXService.ts index 6056aeecdee04..9d14f790e0249 100644 --- a/site/src/xServices/workspaceSchedule/workspaceScheduleXService.ts +++ b/site/src/xServices/workspaceSchedule/workspaceScheduleXService.ts @@ -3,8 +3,8 @@ * an individual workspace's schedule. */ import { assign, createMachine } from "xstate"; -import * as API from "../../api/api"; -import * as TypesGen from "../../api/typesGenerated"; +import * as API from "api/api"; +import * as TypesGen from "api/typesGenerated"; type Permissions = Record, boolean>; From 35c02fd1f07430ad1d69f447df2167f08315b98e Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Wed, 27 Sep 2023 17:00:58 +0000 Subject: [PATCH 2/2] fix some imports --- .../pages/TemplatePage/TemplateFilesPage/TemplateFilesPage.tsx | 2 +- .../TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx | 2 +- .../TemplatePage/TemplateSummaryPage/TemplateSummaryPage.tsx | 2 +- .../TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/site/src/pages/TemplatePage/TemplateFilesPage/TemplateFilesPage.tsx b/site/src/pages/TemplatePage/TemplateFilesPage/TemplateFilesPage.tsx index 131fa08656c5c..e52e2e5d7c673 100644 --- a/site/src/pages/TemplatePage/TemplateFilesPage/TemplateFilesPage.tsx +++ b/site/src/pages/TemplatePage/TemplateFilesPage/TemplateFilesPage.tsx @@ -12,7 +12,7 @@ import { getTemplateVersionFiles, TemplateVersionFiles, } from "utils/templateVersion"; -import { getTemplatePageTitle } from "utils"; +import { getTemplatePageTitle } from "../utils"; const fetchTemplateFiles = async ( organizationId: string, diff --git a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx index ed3e843f8ee2f..e6ae5e642e903 100644 --- a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx +++ b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx @@ -16,7 +16,7 @@ import { getLatencyColor } from "utils/latency"; import chroma from "chroma-js"; import { colors } from "theme/colors"; import { Helmet } from "react-helmet-async"; -import { getTemplatePageTitle } from "utils"; +import { getTemplatePageTitle } from "../utils"; import { Loader } from "components/Loader/Loader"; import { DAUsResponse, diff --git a/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPage.tsx b/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPage.tsx index 0a4f565ab1f80..7231443a16cc3 100644 --- a/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPage.tsx +++ b/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPage.tsx @@ -1,7 +1,7 @@ import { useTemplateLayoutContext } from "pages/TemplatePage/TemplateLayout"; import { FC } from "react"; import { Helmet } from "react-helmet-async"; -import { getTemplatePageTitle } from "utils"; +import { getTemplatePageTitle } from "../utils"; import { TemplateSummaryPageView } from "./TemplateSummaryPageView"; import { useQuery } from "@tanstack/react-query"; import { getTemplateVersionResources } from "api/api"; diff --git a/site/src/pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx b/site/src/pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx index 59adadc9abbd2..458fc305bb24a 100644 --- a/site/src/pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx +++ b/site/src/pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx @@ -7,7 +7,7 @@ import { useTemplateLayoutContext } from "pages/TemplatePage/TemplateLayout"; import { VersionsTable } from "./VersionsTable"; import { useState } from "react"; import { Helmet } from "react-helmet-async"; -import { getTemplatePageTitle } from "utils"; +import { getTemplatePageTitle } from "../utils"; const TemplateVersionsPage = () => { const { template, permissions } = useTemplateLayoutContext();