coder · BrunoQuaresma · Sep 6, 2023 · Sep 6, 2023 · Sep 6, 2023 · Sep 6, 2023
@@ -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/components/CreateUserForm/CreateUserForm"
+import { Language } from "../src/pages/CreateUserPage/CreateUserForm"
 
 test("create first user", async ({ page }) => {
   await page.goto("/", { waitUntil: "domcontentloaded" })

@@ -43,7 +43,7 @@ const WorkspaceProxyPage = lazy(
     import("./pages/UserSettingsPage/WorkspaceProxyPage/WorkspaceProxyPage"),
 )
 const CreateUserPage = lazy(
-  () => import("./pages/UsersPage/CreateUserPage/CreateUserPage"),
+  () => import("./pages/CreateUserPage/CreateUserPage"),
 )
 const WorkspaceBuildPage = lazy(
   () => import("./pages/WorkspaceBuildPage/WorkspaceBuildPage"),
@@ -120,10 +120,7 @@ const TemplateVersionPage = lazy(
   () => import("./pages/TemplateVersionPage/TemplateVersionPage"),
 )
 const TemplateVersionEditorPage = lazy(
-  () =>
-    import(
-      "./pages/TemplateVersionPage/TemplateVersionEditorPage/TemplateVersionEditorPage"
-    ),
+  () => import("./pages/TemplateVersionEditorPage/TemplateVersionEditorPage"),
 )
 const StarterTemplatesPage = lazy(
   () => import("./pages/StarterTemplatesPage/StarterTemplatesPage"),

@@ -19,7 +19,7 @@ import {
   HelpTooltip,
   HelpTooltipTitle,
   HelpTooltipText,
-} from "components/Tooltips/HelpTooltip"
+} from "components/HelpTooltip/HelpTooltip"
 import dayjs from "dayjs"
 import { FC } from "react"
 import { Bar } from "react-chartjs-2"

@@ -1,15 +1,15 @@
 import { makeStyles } from "@mui/styles"
 import { useMachine } from "@xstate/react"
-import { DeploymentBanner } from "components/DeploymentBanner/DeploymentBanner"
-import { LicenseBanner } from "components/LicenseBanner/LicenseBanner"
+import { DeploymentBanner } from "./DeploymentBanner/DeploymentBanner"
+import { LicenseBanner } from "components/Dashboard/LicenseBanner/LicenseBanner"
 import { Loader } from "components/Loader/Loader"
-import { ServiceBanner } from "components/ServiceBanner/ServiceBanner"
+import { ServiceBanner } from "components/Dashboard/ServiceBanner/ServiceBanner"
 import { usePermissions } from "hooks/usePermissions"
 import { FC, Suspense } from "react"
 import { Outlet } from "react-router-dom"
 import { dashboardContentBottomPadding } from "theme/constants"
 import { updateCheckMachine } from "xServices/updateCheck/updateCheckXService"
-import { Navbar } from "../Navbar/Navbar"
+import { Navbar } from "./Navbar/Navbar"
 import Snackbar from "@mui/material/Snackbar"
 import Link from "@mui/material/Link"
 import Box, { BoxProps } from "@mui/material/Box"

@@ -1,7 +1,7 @@
 import { useMachine } from "@xstate/react"
 import { usePermissions } from "hooks/usePermissions"
 import { DeploymentBannerView } from "./DeploymentBannerView"
-import { deploymentStatsMachine } from "../../xServices/deploymentStats/deploymentStatsMachine"
+import { deploymentStatsMachine } from "xServices/deploymentStats/deploymentStatsMachine"
 
 export const DeploymentBanner: React.FC = () => {
   const permissions = usePermissions()

@@ -1,5 +1,5 @@
 import { Story } from "@storybook/react"
-import { MockUser, MockUser2 } from "../../testHelpers/entities"
+import { MockUser, MockUser2 } from "../../../testHelpers/entities"
 import { NavbarView, NavbarViewProps } from "./NavbarView"
 
 export default {

@@ -3,8 +3,8 @@ import {
   MockPrimaryWorkspaceProxy,
   MockUser,
   MockUser2,
-} from "../../testHelpers/entities"
-import { renderWithAuth } from "../../testHelpers/renderHelpers"
+} 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"

@@ -8,10 +8,10 @@ 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 { UserDropdown } from "../UserDropdown/UserDropdown"
+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"
 import Button from "@mui/material/Button"

@@ -3,8 +3,8 @@ import { makeStyles } from "@mui/styles"
 import CheckIcon from "@mui/icons-material/Check"
 import { FC } from "react"
 import { NavLink } from "react-router-dom"
-import { ellipsizeText } from "../../utils/ellipsizeText"
-import { Typography } from "../Typography/Typography"
+import { ellipsizeText } from "../../../../../utils/ellipsizeText"
+import { Typography } from "../../../../Typography/Typography"
 
 type BorderedMenuRowVariant = "narrow" | "wide"
 

@@ -1,6 +1,6 @@
 import Box from "@mui/material/Box"
 import { Story } from "@storybook/react"
-import { MockUser } from "../../testHelpers/entities"
+import { MockUser } from "../../../../testHelpers/entities"
 import { UserDropdown, UserDropdownProps } from "./UserDropdown"
 
 export default {

@@ -1,7 +1,7 @@
 import { fireEvent, screen } from "@testing-library/react"
-import { MockSupportLinks, MockUser } from "../../testHelpers/entities"
-import { render } from "../../testHelpers/renderHelpers"
-import { Language } from "../UserDropdownContent/UserDropdownContent"
+import { MockSupportLinks, MockUser } from "../../../../testHelpers/entities"
+import { render } from "../../../../testHelpers/renderHelpers"
+import { Language } from "./UserDropdownContent/UserDropdownContent"
 import { UserDropdown, UserDropdownProps } from "./UserDropdown"
 
 const renderAndClick = async (props: Partial<UserDropdownProps> = {}) => {

@@ -3,12 +3,15 @@ import MenuItem from "@mui/material/MenuItem"
 import { makeStyles } from "@mui/styles"
 import { useState, FC, PropsWithChildren, MouseEvent } from "react"
 import { colors } from "theme/colors"
-import * as TypesGen from "../../api/typesGenerated"
-import { navHeight } from "../../theme/constants"
-import { BorderedMenu } from "../BorderedMenu/BorderedMenu"
-import { CloseDropdown, OpenDropdown } from "../DropdownArrows/DropdownArrows"
-import { UserAvatar } from "../UserAvatar/UserAvatar"
-import { UserDropdownContent } from "../UserDropdownContent/UserDropdownContent"
+import * as TypesGen from "../../../../api/typesGenerated"
+import { navHeight } from "../../../../theme/constants"
+import { BorderedMenu } from "./BorderedMenu/BorderedMenu"
+import {
+  CloseDropdown,
+  OpenDropdown,
+} from "../../../DropdownArrows/DropdownArrows"
+import { UserAvatar } from "../../../UserAvatar/UserAvatar"
+import { UserDropdownContent } from "./UserDropdownContent/UserDropdownContent"
 import { BUTTON_SM_HEIGHT } from "theme/theme"
 
 export interface UserDropdownProps {

@@ -1,5 +1,5 @@
 import { Story } from "@storybook/react"
-import { MockUser } from "../../testHelpers/entities"
+import { MockUser } from "../../../../../testHelpers/entities"
 import {
   UserDropdownContent,
   UserDropdownContentProps,

@@ -3,8 +3,8 @@ import {
   MockBuildInfo,
   MockSupportLinks,
   MockUser,
-} from "../../testHelpers/entities"
-import { render } from "../../testHelpers/renderHelpers"
+} from "../../../../../testHelpers/entities"
+import { render } from "../../../../../testHelpers/renderHelpers"
 import { Language, UserDropdownContent } from "./UserDropdownContent"
 
 describe("UserDropdownContent", () => {

@@ -8,7 +8,7 @@ import LaunchIcon from "@mui/icons-material/LaunchOutlined"
 import { Stack } from "components/Stack/Stack"
 import { FC } from "react"
 import { Link } from "react-router-dom"
-import * as TypesGen from "../../api/typesGenerated"
+import * as TypesGen from "../../../../../api/typesGenerated"
 import DocsIcon from "@mui/icons-material/MenuBook"
 import LogoutIcon from "@mui/icons-material/ExitToAppOutlined"
 import { combineClasses } from "utils/combineClasses"

@@ -1,5 +1,5 @@
 import { Component, ReactNode, PropsWithChildren } from "react"
-import { RuntimeErrorState } from "../RuntimeErrorState/RuntimeErrorState"
+import { RuntimeErrorState } from "./RuntimeErrorState/RuntimeErrorState"
 
 type ErrorBoundaryProps = PropsWithChildren<unknown>
 

@@ -9,7 +9,7 @@ import { FullScreenLoader } from "components/Loader/FullScreenLoader"
 import { Stack } from "components/Stack/Stack"
 import { FC, useEffect, useState } from "react"
 import { Helmet } from "react-helmet-async"
-import { Margins } from "../Margins/Margins"
+import { Margins } from "../../Margins/Margins"
 
 const fetchDynamicallyImportedModuleError =
   "Failed to fetch dynamically imported module"

@@ -5,7 +5,7 @@ import Snackbar, {
 import { makeStyles } from "@mui/styles"
 import CloseIcon from "@mui/icons-material/Close"
 import { FC } from "react"
-import { combineClasses } from "../../utils/combineClasses"
+import { combineClasses } from "../../../utils/combineClasses"
 
 type EnterpriseSnackbarVariant = "error" | "info" | "success"
 

@@ -2,7 +2,7 @@ import { makeStyles } from "@mui/styles"
 import { useCallback, useState, FC } from "react"
 import { useCustomEvent } from "../../hooks/events"
 import { CustomEventListener } from "../../utils/events"
-import { EnterpriseSnackbar } from "../EnterpriseSnackbar/EnterpriseSnackbar"
+import { EnterpriseSnackbar } from "./EnterpriseSnackbar/EnterpriseSnackbar"
 import { ErrorIcon } from "../Icons/ErrorIcon"
 import { Typography } from "../Typography/Typography"
 import {

@@ -12,7 +12,7 @@ import {
   PropsWithChildren,
 } from "react"
 import { combineClasses } from "utils/combineClasses"
-import { Stack } from "../../Stack/Stack"
+import { Stack } from "components/Stack/Stack"
 import Box, { BoxProps } from "@mui/material/Box"
 
 type Icon = typeof HelpIcon