coder · aslilac · Sep 28, 2023 · Sep 27, 2023 · Sep 27, 2023 · Kira-Pilot
diff --git 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
@@ -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
@@ -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
@@ -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<typeof NavbarView> = {

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<PropsWithChildren<unknown>> = () => {

diff --git 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
@@ -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
@@ -6,7 +6,7 @@ import {
   MockTemplateVersionParameter2,
   MockTemplateVersionParameter3,
   MockUser,
-} from "../../testHelpers/entities";
+} from "testHelpers/entities";
 import { CreateWorkspacePageView } from "./CreateWorkspacePageView";
 
 const meta: Meta<typeof CreateWorkspacePageView> = {

diff --git 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
@@ -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
@@ -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
@@ -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/.../src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPage.test.tsx b/.../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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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";