Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b15bfa4

Browse files
BrunoQuaresmaBrunoQuaresma
authored
chore(site): move components close to where they are used (#9552)
* Move AppLink * Move AuditLogRow * Move UserDropdown * Move BuildsTable * Remove CodeBlock * Move CreateUserForm * Move DeploymentBanner * Move ResetPassworDialog * Move EditRolesButton * Move EnterpriseSnackbar * Move GitAuth * Move LicenseBanner * Move Logs * Move MultiTextField * Move Navbar * Remove PasswordField * Move RuntimeErrorState * Remove Section * Move SectionAction * Move ServiceBanner * Move SettingsAccountForm * Move LicenseCard * Move SettingsSecurityForm * Move SignInForm * Remove TabPanel and TabSidebar * Move TemplateStats and TemplateVariableField * Move TemplateEditor * Move TerminalLink * Move SSH Button * Move many tooltips * Move UsersTable * Move VersionsTable * Move VSCodeDesktopButton * Remove WarningAlert * Move Workspace * Move WorkspaceActions * Move WorkspaceBuildProgress * Move WorkspaceDeletedBanner * Move WorkspaceScheduleForm * Move WorkspaceSection * Move WorkspaceStats * Fix imports * Flat CreateUserForm * Flat GitAuth * Transform WorkspaceSection into ChartSection * Flat AccountForm * Flat ConfirmDeleteDialog * Flat ResetPasswordDialog * Flat BuildsTable
1 parent 75139d1 commit b15bfa4

File tree

193 files changed

+289
-1007
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

193 files changed

+289
-1007
lines changed

‎site/e2e/global.setup.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { test, expect } from "@playwright/test"
22
import * as constants from "./constants"
33
import { STORAGE_STATE } from "./playwright.config"
4-
import { Language } from "../src/components/CreateUserForm/CreateUserForm"
4+
import { Language } from "../src/pages/CreateUserPage/CreateUserForm"
55

66
test("create first user", async ({ page }) => {
77
await page.goto("/", { waitUntil: "domcontentloaded" })

‎site/src/AppRouter.tsx

+2-5
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const WorkspaceProxyPage = lazy(
4343
import("./pages/UserSettingsPage/WorkspaceProxyPage/WorkspaceProxyPage"),
4444
)
4545
const CreateUserPage = lazy(
46-
() => import("./pages/UsersPage/CreateUserPage/CreateUserPage"),
46+
() => import("./pages/CreateUserPage/CreateUserPage"),
4747
)
4848
const WorkspaceBuildPage = lazy(
4949
() => import("./pages/WorkspaceBuildPage/WorkspaceBuildPage"),
@@ -120,10 +120,7 @@ const TemplateVersionPage = lazy(
120120
() => import("./pages/TemplateVersionPage/TemplateVersionPage"),
121121
)
122122
const TemplateVersionEditorPage = lazy(
123-
() =>
124-
import(
125-
"./pages/TemplateVersionPage/TemplateVersionEditorPage/TemplateVersionEditorPage"
126-
),
123+
() => import("./pages/TemplateVersionEditorPage/TemplateVersionEditorPage"),
127124
)
128125
const StarterTemplatesPage = lazy(
129126
() => import("./pages/StarterTemplatesPage/StarterTemplatesPage"),

‎site/src/components/BuildsTable/BuildAvatar.tsx renamed to ‎site/src/components/BuildAvatar/BuildAvatar.tsx

File renamed without changes.

‎site/src/components/CodeBlock/CodeBlock.stories.tsx

-25
This file was deleted.

‎site/src/components/CodeBlock/CodeBlock.test.tsx

-15
This file was deleted.

‎site/src/components/CodeBlock/CodeBlock.tsx

-59
This file was deleted.

‎site/src/components/DAUChart/DAUChart.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
HelpTooltip,
2020
HelpTooltipTitle,
2121
HelpTooltipText,
22-
} from "components/Tooltips/HelpTooltip"
22+
} from "components/HelpTooltip/HelpTooltip"
2323
import dayjs from "dayjs"
2424
import { FC } from "react"
2525
import { Bar } from "react-chartjs-2"

‎site/src/components/Dashboard/DashboardLayout.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import { makeStyles } from "@mui/styles"
22
import { useMachine } from "@xstate/react"
3-
import { DeploymentBanner } from "components/DeploymentBanner/DeploymentBanner"
4-
import { LicenseBanner } from "components/LicenseBanner/LicenseBanner"
3+
import { DeploymentBanner } from "./DeploymentBanner/DeploymentBanner"
4+
import { LicenseBanner } from "components/Dashboard/LicenseBanner/LicenseBanner"
55
import { Loader } from "components/Loader/Loader"
6-
import { ServiceBanner } from "components/ServiceBanner/ServiceBanner"
6+
import { ServiceBanner } from "components/Dashboard/ServiceBanner/ServiceBanner"
77
import { usePermissions } from "hooks/usePermissions"
88
import { FC, Suspense } from "react"
99
import { Outlet } from "react-router-dom"
1010
import { dashboardContentBottomPadding } from "theme/constants"
1111
import { updateCheckMachine } from "xServices/updateCheck/updateCheckXService"
12-
import { Navbar } from "../Navbar/Navbar"
12+
import { Navbar } from "./Navbar/Navbar"
1313
import Snackbar from "@mui/material/Snackbar"
1414
import Link from "@mui/material/Link"
1515
import Box, { BoxProps } from "@mui/material/Box"

‎site/src/components/DeploymentBanner/DeploymentBanner.tsx renamed to ‎site/src/components/Dashboard/DeploymentBanner/DeploymentBanner.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useMachine } from "@xstate/react"
22
import { usePermissions } from "hooks/usePermissions"
33
import { DeploymentBannerView } from "./DeploymentBannerView"
4-
import { deploymentStatsMachine } from "../../xServices/deploymentStats/deploymentStatsMachine"
4+
import { deploymentStatsMachine } from "xServices/deploymentStats/deploymentStatsMachine"
55

66
export const DeploymentBanner: React.FC = () => {
77
const permissions = usePermissions()

‎site/src/components/DeploymentBanner/DeploymentBannerView.stories.tsx renamed to ‎site/src/components/Dashboard/DeploymentBanner/DeploymentBannerView.stories.tsx

File renamed without changes.

‎site/src/components/DeploymentBanner/DeploymentBannerView.tsx renamed to ‎site/src/components/Dashboard/DeploymentBanner/DeploymentBannerView.tsx

File renamed without changes.

‎site/src/components/LicenseBanner/LicenseBanner.tsx renamed to ‎site/src/components/Dashboard/LicenseBanner/LicenseBanner.tsx

File renamed without changes.

‎site/src/components/LicenseBanner/LicenseBannerView.stories.tsx renamed to ‎site/src/components/Dashboard/LicenseBanner/LicenseBannerView.stories.tsx

File renamed without changes.

‎site/src/components/LicenseBanner/LicenseBannerView.tsx renamed to ‎site/src/components/Dashboard/LicenseBanner/LicenseBannerView.tsx

File renamed without changes.

‎site/src/components/Navbar/Navbar.test.tsx renamed to ‎site/src/components/Dashboard/Navbar/Navbar.test.tsx

File renamed without changes.

‎site/src/components/Navbar/Navbar.tsx renamed to ‎site/src/components/Dashboard/Navbar/Navbar.tsx

File renamed without changes.

‎site/src/components/Navbar/NavbarView.stories.tsx renamed to ‎site/src/components/Dashboard/Navbar/NavbarView.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Story } from "@storybook/react"
2-
import { MockUser, MockUser2 } from "../../testHelpers/entities"
2+
import { MockUser, MockUser2 } from "../../../testHelpers/entities"
33
import { NavbarView, NavbarViewProps } from "./NavbarView"
44

55
export default {

‎site/src/components/Navbar/NavbarView.test.tsx renamed to ‎site/src/components/Dashboard/Navbar/NavbarView.test.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import {
33
MockPrimaryWorkspaceProxy,
44
MockUser,
55
MockUser2,
6-
} from "../../testHelpers/entities"
7-
import { renderWithAuth } from "../../testHelpers/renderHelpers"
6+
} from "../../../testHelpers/entities"
7+
import { renderWithAuth } from "../../../testHelpers/renderHelpers"
88
import { Language as navLanguage, NavbarView } from "./NavbarView"
99
import { ProxyContextValue } from "contexts/ProxyContext"
1010
import { action } from "@storybook/addon-actions"

‎site/src/components/Navbar/NavbarView.tsx renamed to ‎site/src/components/Dashboard/Navbar/NavbarView.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import { CoderIcon } from "components/Icons/CoderIcon"
88
import { FC, useRef, useState } from "react"
99
import { NavLink, useLocation, useNavigate } from "react-router-dom"
1010
import { colors } from "theme/colors"
11-
import * as TypesGen from "../../api/typesGenerated"
12-
import { navHeight } from "../../theme/constants"
13-
import { combineClasses } from "../../utils/combineClasses"
14-
import { UserDropdown } from "../UserDropdown/UserDropdown"
11+
import * as TypesGen from "../../../api/typesGenerated"
12+
import { navHeight } from "../../../theme/constants"
13+
import { combineClasses } from "../../../utils/combineClasses"
14+
import { UserDropdown } from "./UserDropdown/UserDropdown"
1515
import Box from "@mui/material/Box"
1616
import Menu from "@mui/material/Menu"
1717
import Button from "@mui/material/Button"

‎site/src/components/BorderedMenu/BorderedMenu.tsx renamed to ‎site/src/components/Dashboard/Navbar/UserDropdown/BorderedMenu/BorderedMenu.tsx

File renamed without changes.

‎site/src/components/BorderedMenuRow/BorderedMenuRow.tsx renamed to ‎site/src/components/Dashboard/Navbar/UserDropdown/BorderedMenu/BorderedMenuRow.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { makeStyles } from "@mui/styles"
33
import CheckIcon from "@mui/icons-material/Check"
44
import { FC } from "react"
55
import { NavLink } from "react-router-dom"
6-
import { ellipsizeText } from "../../utils/ellipsizeText"
7-
import { Typography } from "../Typography/Typography"
6+
import { ellipsizeText } from "../../../../../utils/ellipsizeText"
7+
import { Typography } from "../../../../Typography/Typography"
88

99
type BorderedMenuRowVariant = "narrow" | "wide"
1010

‎site/src/components/UserDropdown/UserDropdown.stories.tsx renamed to ‎site/src/components/Dashboard/Navbar/UserDropdown/UserDropdown.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Box from "@mui/material/Box"
22
import { Story } from "@storybook/react"
3-
import { MockUser } from "../../testHelpers/entities"
3+
import { MockUser } from "../../../../testHelpers/entities"
44
import { UserDropdown, UserDropdownProps } from "./UserDropdown"
55

66
export default {

‎site/src/components/UserDropdown/UserDropdown.test.tsx renamed to ‎site/src/components/Dashboard/Navbar/UserDropdown/UserDropdown.test.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { fireEvent, screen } from "@testing-library/react"
2-
import { MockSupportLinks, MockUser } from "../../testHelpers/entities"
3-
import { render } from "../../testHelpers/renderHelpers"
4-
import { Language } from "../UserDropdownContent/UserDropdownContent"
2+
import { MockSupportLinks, MockUser } from "../../../../testHelpers/entities"
3+
import { render } from "../../../../testHelpers/renderHelpers"
4+
import { Language } from "./UserDropdownContent/UserDropdownContent"
55
import { UserDropdown, UserDropdownProps } from "./UserDropdown"
66

77
const renderAndClick = async (props: Partial<UserDropdownProps> = {}) => {

‎site/src/components/UserDropdown/UserDropdown.tsx renamed to ‎site/src/components/Dashboard/Navbar/UserDropdown/UserDropdown.tsx

+9-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@ import MenuItem from "@mui/material/MenuItem"
33
import { makeStyles } from "@mui/styles"
44
import { useState, FC, PropsWithChildren, MouseEvent } from "react"
55
import { colors } from "theme/colors"
6-
import * as TypesGen from "../../api/typesGenerated"
7-
import { navHeight } from "../../theme/constants"
8-
import { BorderedMenu } from "../BorderedMenu/BorderedMenu"
9-
import { CloseDropdown, OpenDropdown } from "../DropdownArrows/DropdownArrows"
10-
import { UserAvatar } from "../UserAvatar/UserAvatar"
11-
import { UserDropdownContent } from "../UserDropdownContent/UserDropdownContent"
6+
import * as TypesGen from "../../../../api/typesGenerated"
7+
import { navHeight } from "../../../../theme/constants"
8+
import { BorderedMenu } from "./BorderedMenu/BorderedMenu"
9+
import {
10+
CloseDropdown,
11+
OpenDropdown,
12+
} from "../../../DropdownArrows/DropdownArrows"
13+
import { UserAvatar } from "../../../UserAvatar/UserAvatar"
14+
import { UserDropdownContent } from "./UserDropdownContent/UserDropdownContent"
1215
import { BUTTON_SM_HEIGHT } from "theme/theme"
1316

1417
export interface UserDropdownProps {

‎site/src/components/UserDropdownContent/UserDropdownContent.stories.tsx renamed to ‎site/src/components/Dashboard/Navbar/UserDropdown/UserDropdownContent/UserDropdownContent.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Story } from "@storybook/react"
2-
import { MockUser } from "../../testHelpers/entities"
2+
import { MockUser } from "../../../../../testHelpers/entities"
33
import {
44
UserDropdownContent,
55
UserDropdownContentProps,

‎site/src/components/UserDropdownContent/UserDropdownContent.test.tsx renamed to ‎site/src/components/Dashboard/Navbar/UserDropdown/UserDropdownContent/UserDropdownContent.test.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import {
33
MockBuildInfo,
44
MockSupportLinks,
55
MockUser,
6-
} from "../../testHelpers/entities"
7-
import { render } from "../../testHelpers/renderHelpers"
6+
} from "../../../../../testHelpers/entities"
7+
import { render } from "../../../../../testHelpers/renderHelpers"
88
import { Language, UserDropdownContent } from "./UserDropdownContent"
99

1010
describe("UserDropdownContent", () => {

‎site/src/components/UserDropdownContent/UserDropdownContent.tsx renamed to ‎site/src/components/Dashboard/Navbar/UserDropdown/UserDropdownContent/UserDropdownContent.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import LaunchIcon from "@mui/icons-material/LaunchOutlined"
88
import { Stack } from "components/Stack/Stack"
99
import { FC } from "react"
1010
import { Link } from "react-router-dom"
11-
import * as TypesGen from "../../api/typesGenerated"
11+
import * as TypesGen from "../../../../../api/typesGenerated"
1212
import DocsIcon from "@mui/icons-material/MenuBook"
1313
import LogoutIcon from "@mui/icons-material/ExitToAppOutlined"
1414
import { combineClasses } from "utils/combineClasses"

‎site/src/components/ServiceBanner/ServiceBanner.tsx renamed to ‎site/src/components/Dashboard/ServiceBanner/ServiceBanner.tsx

File renamed without changes.

‎site/src/components/ServiceBanner/ServiceBannerView.stories.tsx renamed to ‎site/src/components/Dashboard/ServiceBanner/ServiceBannerView.stories.tsx

File renamed without changes.

‎site/src/components/ServiceBanner/ServiceBannerView.tsx renamed to ‎site/src/components/Dashboard/ServiceBanner/ServiceBannerView.tsx

File renamed without changes.

‎site/src/components/ErrorBoundary/ErrorBoundary.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, ReactNode, PropsWithChildren } from "react"
2-
import { RuntimeErrorState } from "../RuntimeErrorState/RuntimeErrorState"
2+
import { RuntimeErrorState } from "./RuntimeErrorState/RuntimeErrorState"
33

44
type ErrorBoundaryProps = PropsWithChildren<unknown>
55

‎site/src/components/RuntimeErrorState/RuntimeErrorState.stories.tsx renamed to ‎site/src/components/ErrorBoundary/RuntimeErrorState/RuntimeErrorState.stories.tsx

File renamed without changes.

‎site/src/components/RuntimeErrorState/RuntimeErrorState.tsx renamed to ‎site/src/components/ErrorBoundary/RuntimeErrorState/RuntimeErrorState.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { FullScreenLoader } from "components/Loader/FullScreenLoader"
99
import { Stack } from "components/Stack/Stack"
1010
import { FC, useEffect, useState } from "react"
1111
import { Helmet } from "react-helmet-async"
12-
import { Margins } from "../Margins/Margins"
12+
import { Margins } from "../../Margins/Margins"
1313

1414
const fetchDynamicallyImportedModuleError =
1515
"Failed to fetch dynamically imported module"

‎site/src/components/EnterpriseSnackbar/EnterpriseSnackbar.stories.tsx renamed to ‎site/src/components/GlobalSnackbar/EnterpriseSnackbar/EnterpriseSnackbar.stories.tsx

File renamed without changes.

‎site/src/components/EnterpriseSnackbar/EnterpriseSnackbar.tsx renamed to ‎site/src/components/GlobalSnackbar/EnterpriseSnackbar/EnterpriseSnackbar.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import Snackbar, {
55
import { makeStyles } from "@mui/styles"
66
import CloseIcon from "@mui/icons-material/Close"
77
import { FC } from "react"
8-
import { combineClasses } from "../../utils/combineClasses"
8+
import { combineClasses } from "../../../utils/combineClasses"
99

1010
type EnterpriseSnackbarVariant = "error" | "info" | "success"
1111

‎site/src/components/GlobalSnackbar/GlobalSnackbar.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { makeStyles } from "@mui/styles"
22
import { useCallback, useState, FC } from "react"
33
import { useCustomEvent } from "../../hooks/events"
44
import { CustomEventListener } from "../../utils/events"
5-
import { EnterpriseSnackbar } from "../EnterpriseSnackbar/EnterpriseSnackbar"
5+
import { EnterpriseSnackbar } from "./EnterpriseSnackbar/EnterpriseSnackbar"
66
import { ErrorIcon } from "../Icons/ErrorIcon"
77
import { Typography } from "../Typography/Typography"
88
import {

‎site/src/components/Tooltips/HelpTooltip/HelpTooltip.stories.tsx renamed to ‎site/src/components/HelpTooltip/HelpTooltip.stories.tsx

File renamed without changes.

‎site/src/components/Tooltips/HelpTooltip/HelpTooltip.tsx renamed to ‎site/src/components/HelpTooltip/HelpTooltip.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
PropsWithChildren,
1313
} from "react"
1414
import { combineClasses } from "utils/combineClasses"
15-
import { Stack } from "../../Stack/Stack"
15+
import { Stack } from "components/Stack/Stack"
1616
import Box, { BoxProps } from "@mui/material/Box"
1717

1818
type Icon = typeof HelpIcon

‎site/src/components/Tooltips/HelpTooltip/index.ts renamed to ‎site/src/components/HelpTooltip/index.ts

File renamed without changes.

‎site/src/components/PasswordField/PasswordField.test.tsx

-13
This file was deleted.

‎site/src/components/PasswordField/PasswordField.tsx

-52
This file was deleted.

0 commit comments

Comments
 (0)