Skip to content

Commit 3151bef

Browse files
code-ashercode-asher
authored
chore: un-nest components (#1090)
Closes #936.
1 parent 98e46cd commit 3151bef

File tree

75 files changed

+71
-71
lines changed

Some content is hidden

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

75 files changed

+71
-71
lines changed

‎site/src/AppRouter.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React from "react"
22
import { Route, Routes } from "react-router-dom"
33
import { AuthAndFrame } from "./components/AuthAndFrame/AuthAndFrame"
4-
import { RequireAuth } from "./components/Page/RequireAuth"
5-
import { PreferencesLayout } from "./components/Preferences/Layout"
4+
import { PreferencesLayout } from "./components/PreferencesLayout/PreferencesLayout"
5+
import { RequireAuth } from "./components/RequireAuth/RequireAuth"
66
import { IndexPage } from "./pages"
77
import { NotFoundPage } from "./pages/404Page/404Page"
88
import { CliAuthenticationPage } from "./pages/CliAuthPage/CliAuthPage"

‎site/src/app.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import React from "react"
44
import { BrowserRouter as Router } from "react-router-dom"
55
import { SWRConfig } from "swr"
66
import { AppRouter } from "./AppRouter"
7-
import { GlobalSnackbar } from "./components/Snackbar/GlobalSnackbar"
7+
import { GlobalSnackbar } from "./components/GlobalSnackbar/GlobalSnackbar"
88
import { light } from "./theme"
99
import "./theme/globalFonts"
1010
import { XServiceProvider } from "./xServices/StateContext"

‎site/src/components/AuthAndFrame/AuthAndFrame.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from "react"
2+
import { Footer } from "../Footer/Footer"
23
import { Navbar } from "../Navbar/Navbar"
3-
import { Footer } from "../Page/Footer"
4-
import { RequireAuth } from "../Page/RequireAuth"
4+
import { RequireAuth } from "../RequireAuth/RequireAuth"
55

66
interface AuthAndFrameProps {
77
children: JSX.Element

‎site/src/components/SignIn/CliAuthToken.stories.tsx renamed to ‎site/src/components/CliAuthToken/CliAuthToken.stories.tsx

File renamed without changes.

‎site/src/components/SignIn/CliAuthToken.test.tsx renamed to ‎site/src/components/CliAuthToken/CliAuthToken.test.tsx

File renamed without changes.

‎site/src/components/SignIn/CliAuthToken.tsx renamed to ‎site/src/components/CliAuthToken/CliAuthToken.tsx

File renamed without changes.

‎site/src/components/CodeExample/CodeExample.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { makeStyles } from "@material-ui/core/styles"
22
import React from "react"
33
import { MONOSPACE_FONT_FAMILY } from "../../theme/constants"
4-
import { CopyButton } from "../Button/CopyButton"
4+
import { CopyButton } from "../CopyButton/CopyButton"
55

66
export interface CodeExampleProps {
77
code: string

‎site/src/components/Button/CopyButton.tsx renamed to ‎site/src/components/CopyButton/CopyButton.tsx

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

‎site/src/components/Page/Footer.test.tsx renamed to ‎site/src/components/Footer/Footer.test.tsx

File renamed without changes.

‎site/src/components/Page/Footer.tsx renamed to ‎site/src/components/Footer/Footer.tsx

File renamed without changes.

‎site/src/components/Form/FormCloseButton.stories.tsx renamed to ‎site/src/components/FormCloseButton/FormCloseButton.stories.tsx

File renamed without changes.

‎site/src/components/Form/FormCloseButton.test.tsx renamed to ‎site/src/components/FormCloseButton/FormCloseButton.test.tsx

File renamed without changes.

‎site/src/components/Form/FormCloseButton.tsx renamed to ‎site/src/components/FormCloseButton/FormCloseButton.tsx

File renamed without changes.

‎site/src/components/Form/FormDropdownField.tsx renamed to ‎site/src/components/FormDropdownField/FormDropdownField.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@ import MenuItem from "@material-ui/core/MenuItem"
33
import { makeStyles } from "@material-ui/core/styles"
44
import Typography from "@material-ui/core/Typography"
55
import React from "react"
6-
import { FormTextField, FormTextFieldProps } from "./FormTextField"
6+
import { FormTextField, FormTextFieldProps } from "../FormTextField/FormTextField"
77

8-
export interface DropdownItem {
8+
export interface FormDropdownItem {
99
value: string
1010
name: string
1111
description?: string
1212
}
1313

1414
export interface FormDropdownFieldProps<T> extends FormTextFieldProps<T> {
15-
items: DropdownItem[]
15+
items: FormDropdownItem[]
1616
}
1717

1818
export const FormDropdownField = <T,>({ items, ...props }: FormDropdownFieldProps<T>): React.ReactElement => {
1919
const styles = useStyles()
2020
return (
2121
<FormTextField select {...props}>
22-
{items.map((item: DropdownItem) => (
22+
{items.map((item: FormDropdownItem) => (
2323
<MenuItem key={item.value} value={item.value}>
2424
<Box alignItems="center" display="flex">
2525
<Box ml={1}>

‎site/src/components/Form/FormSection.tsx renamed to ‎site/src/components/FormSection/FormSection.tsx

File renamed without changes.

‎site/src/components/Form/FormTextField.test.tsx renamed to ‎site/src/components/FormTextField/FormTextField.test.tsx

File renamed without changes.

‎site/src/components/Form/FormTextField.tsx renamed to ‎site/src/components/FormTextField/FormTextField.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import TextField, { TextFieldProps } from "@material-ui/core/TextField"
22
import { FormikContextType } from "formik"
33
import React from "react"
4-
import { PasswordField } from "./PasswordField"
4+
import { PasswordField } from "../PasswordField/PasswordField"
55

66
/**
77
* FormFieldProps are required props for creating form fields using a factory.

‎site/src/components/Form/FormTitle.tsx renamed to ‎site/src/components/FormTitle/FormTitle.tsx

File renamed without changes.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import { makeStyles } from "@material-ui/core/styles"
22
import React, { useCallback, useState } from "react"
33
import { useCustomEvent } from "../../hooks/events"
44
import { CustomEventListener } from "../../util/events"
5+
import { EnterpriseSnackbar } from "../EnterpriseSnackbar/EnterpriseSnackbar"
56
import { ErrorIcon } from "../Icons/ErrorIcon"
67
import { Typography } from "../Typography/Typography"
7-
import { EnterpriseSnackbar } from "./EnterpriseSnackbar"
88
import {
99
AdditionalMessage,
1010
isNotificationList,

‎site/src/components/Snackbar/utils.test.ts renamed to ‎site/src/components/GlobalSnackbar/utils.test.ts

File renamed without changes.

‎site/src/components/Snackbar/utils.ts renamed to ‎site/src/components/GlobalSnackbar/utils.ts

File renamed without changes.

‎site/src/components/Header/Header.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Box from "@material-ui/core/Box"
22
import { makeStyles } from "@material-ui/core/styles"
33
import Typography from "@material-ui/core/Typography"
44
import React from "react"
5-
import { HeaderButton } from "./HeaderButton"
5+
import { HeaderButton } from "../HeaderButton/HeaderButton"
66

77
export interface HeaderAction {
88
readonly text: string

‎site/src/components/Header/HeaderButton.tsx renamed to ‎site/src/components/HeaderButton/HeaderButton.tsx

File renamed without changes.

‎site/src/components/Button/LoadingButton.stories.tsx renamed to ‎site/src/components/LoadingButton/LoadingButton.stories.tsx

File renamed without changes.

‎site/src/components/Button/LoadingButton.test.tsx renamed to ‎site/src/components/LoadingButton/LoadingButton.test.tsx

File renamed without changes.

‎site/src/components/Button/LoadingButton.tsx renamed to ‎site/src/components/LoadingButton/LoadingButton.tsx

File renamed without changes.

‎site/src/components/Navbar/Navbar.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useActor } from "@xstate/react"
22
import React, { useContext } from "react"
33
import { XServiceContext } from "../../xServices/StateContext"
4-
import { NavbarView } from "./NavbarView/NavbarView"
4+
import { NavbarView } from "../NavbarView/NavbarView"
55

66
export const Navbar: React.FC = () => {
77
const xServices = useContext(XServiceContext)

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

File renamed without changes.

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { screen } from "@testing-library/react"
22
import React from "react"
3-
import { render } from "../../../testHelpers"
4-
import { MockUser } from "../../../testHelpers/entities"
3+
import { render } from "../../testHelpers"
4+
import { MockUser } from "../../testHelpers/entities"
55
import { NavbarView } from "./NavbarView"
66

77
describe("NavbarView", () => {

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import ListItem from "@material-ui/core/ListItem"
33
import { fade, makeStyles } from "@material-ui/core/styles"
44
import React from "react"
55
import { NavLink } from "react-router-dom"
6-
import { UserResponse } from "../../../api/types"
7-
import { navHeight } from "../../../theme/constants"
8-
import { AdminDropdown } from "../../AdminDropdown/AdminDropdown"
9-
import { Logo } from "../../Icons/Logo"
6+
import { UserResponse } from "../../api/types"
7+
import { navHeight } from "../../theme/constants"
8+
import { AdminDropdown } from "../AdminDropdown/AdminDropdown"
9+
import { Logo } from "../Icons/Logo"
1010
import { UserDropdown } from "../UserDropdown/UsersDropdown"
1111

1212
export interface NavbarViewProps {

‎site/src/components/Form/PasswordField.test.tsx renamed to ‎site/src/components/PasswordField/PasswordField.test.tsx

File renamed without changes.

‎site/src/components/Form/PasswordField.tsx renamed to ‎site/src/components/PasswordField/PasswordField.tsx

File renamed without changes.

‎site/src/components/Preferences/AccountForm.tsx renamed to ‎site/src/components/PreferencesAccountForm/PreferencesAccountForm.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import TextField from "@material-ui/core/TextField"
33
import { FormikContextType, FormikErrors, useFormik } from "formik"
44
import React from "react"
55
import * as Yup from "yup"
6-
import { getFormHelpers, onChangeTrimmed } from "../Form/utils"
6+
import { getFormHelpers, onChangeTrimmed } from "../../util/formUtils"
7+
import { LoadingButton } from "../LoadingButton/LoadingButton"
78
import { Stack } from "../Stack/Stack"
8-
import { LoadingButton } from "./../Button/LoadingButton"
99

1010
interface AccountFormValues {
1111
name: string

‎site/src/components/Preferences/Layout.tsx renamed to ‎site/src/components/PreferencesLayout/PreferencesLayout.tsx

File renamed without changes.

‎site/src/components/Page/RequireAuth.tsx renamed to ‎site/src/components/RequireAuth/RequireAuth.tsx

File renamed without changes.

‎site/src/components/Section/SectionView.stories.tsx renamed to ‎site/src/components/Section/Section.stories.tsx

File renamed without changes.

‎site/src/components/Section/Section.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { makeStyles } from "@material-ui/core/styles"
22
import { fade } from "@material-ui/core/styles/colorManipulator"
33
import Typography from "@material-ui/core/Typography"
44
import React from "react"
5-
import { SectionAction } from "./Action"
5+
import { SectionAction } from "../SectionAction/SectionAction"
66

77
type SectionLayout = "fixed" | "fluid"
88

‎site/src/components/Section/Action.tsx renamed to ‎site/src/components/SectionAction/SectionAction.tsx

File renamed without changes.

‎site/src/components/SignIn/SignInForm.stories.tsx renamed to ‎site/src/components/SignInForm/SignInForm.stories.tsx

File renamed without changes.

‎site/src/components/SignIn/SignInForm.tsx renamed to ‎site/src/components/SignInForm/SignInForm.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import TextField from "@material-ui/core/TextField"
44
import { FormikContextType, useFormik } from "formik"
55
import React from "react"
66
import * as Yup from "yup"
7-
import { getFormHelpers, onChangeTrimmed } from "../Form/utils"
8-
import { LoadingButton } from "./../Button/LoadingButton"
9-
import { Welcome } from "./Welcome"
7+
import { getFormHelpers, onChangeTrimmed } from "../../util/formUtils"
8+
import { Welcome } from "../Welcome/Welcome"
9+
import { LoadingButton } from "./../LoadingButton/LoadingButton"
1010

1111
/**
1212
* BuiltInAuthFormValues describes a form using built-in (email/password)

‎site/src/components/Button/SplitButton.test.tsx renamed to ‎site/src/components/SplitButton/SplitButton.test.tsx

File renamed without changes.

‎site/src/components/Button/SplitButton.tsx renamed to ‎site/src/components/SplitButton/SplitButton.tsx

File renamed without changes.

‎site/src/components/TabPanel/TabPanel.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { makeStyles } from "@material-ui/core/styles"
22
import { fade } from "@material-ui/core/styles/colorManipulator"
33
import React from "react"
4-
import { TabSidebar, TabSidebarItem } from "./TabSidebar"
4+
import { TabSidebar, TabSidebarItem } from "../TabSidebar/TabSidebar"
55

66
export type AdminMenuItemCallback = (menuItem: string) => void
77

‎site/src/components/TabPanel/TabSidebar.stories.tsx renamed to ‎site/src/components/TabSidebar/TabSidebar.stories.tsx

File renamed without changes.

‎site/src/components/TabPanel/TabSidebar.tsx renamed to ‎site/src/components/TabSidebar/TabSidebar.tsx

File renamed without changes.

‎site/src/components/Table/Table.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import TableCell from "@material-ui/core/TableCell"
55
import TableHead from "@material-ui/core/TableHead"
66
import TableRow from "@material-ui/core/TableRow"
77
import React from "react"
8-
import { TableHeaders } from "./TableHeaders"
9-
import { TableTitle } from "./TableTitle"
8+
import { TableHeaders } from "../TableHeaders/TableHeaders"
9+
import { TableTitle } from "../TableTitle/TableTitle"
1010

1111
export interface Column<T> {
1212
/**

‎site/src/components/Table/TableHeaders.tsx renamed to ‎site/src/components/TableHeaders/TableHeaders.tsx

File renamed without changes.

‎site/src/components/Table/TableTitle.tsx renamed to ‎site/src/components/TableTitle/TableTitle.tsx

File renamed without changes.

‎site/src/components/User/UserAvatar.tsx renamed to ‎site/src/components/UserAvatar/UserAvatar.tsx

File renamed without changes.

‎site/src/components/Table/Cells/UserCell.stories.tsx renamed to ‎site/src/components/UserCell/UserCell.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ComponentMeta, Story } from "@storybook/react"
22
import React from "react"
3-
import { MockUser, MockUserAgent } from "../../../testHelpers"
3+
import { MockUser, MockUserAgent } from "../../testHelpers"
44
import { UserCell, UserCellProps } from "./UserCell"
55

66
export default {

‎site/src/components/Table/Cells/UserCell.test.tsx renamed to ‎site/src/components/UserCell/UserCell.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { fireEvent, render, screen } from "@testing-library/react"
22
import React from "react"
3-
import { MockUser, MockUserAgent, WrapperComponent } from "../../../testHelpers"
3+
import { MockUser, MockUserAgent, WrapperComponent } from "../../testHelpers"
44
import { UserCell, UserCellProps } from "./UserCell"
55

66
namespace Helpers {

‎site/src/components/Table/Cells/UserCell.tsx renamed to ‎site/src/components/UserCell/UserCell.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Link from "@material-ui/core/Link"
33
import { makeStyles } from "@material-ui/core/styles"
44
import Typography from "@material-ui/core/Typography"
55
import React from "react"
6-
import { UserAvatar, UserAvatarProps } from "../../User/UserAvatar"
6+
import { UserAvatar, UserAvatarProps } from "../UserAvatar/UserAvatar"
77

88
export interface UserCellProps {
99
Avatar: UserAvatarProps

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

File renamed without changes.

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

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

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

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import { fade, makeStyles } from "@material-ui/core/styles"
77
import AccountIcon from "@material-ui/icons/AccountCircleOutlined"
88
import React, { useState } from "react"
99
import { Link } from "react-router-dom"
10-
import { UserResponse } from "../../../api/types"
11-
import { BorderedMenu } from "../../BorderedMenu/BorderedMenu"
12-
import { CloseDropdown, OpenDropdown } from "../../DropdownArrows/DropdownArrows"
13-
import { DocsIcon } from "../../Icons/DocsIcon"
14-
import { LogoutIcon } from "../../Icons/LogoutIcon"
15-
import { UserAvatar } from "../../User/UserAvatar"
16-
import { UserProfileCard } from "../../User/UserProfileCard"
10+
import { UserResponse } from "../../api/types"
11+
import { BorderedMenu } from "../BorderedMenu/BorderedMenu"
12+
import { CloseDropdown, OpenDropdown } from "../DropdownArrows/DropdownArrows"
13+
import { DocsIcon } from "../Icons/DocsIcon"
14+
import { LogoutIcon } from "../Icons/LogoutIcon"
15+
import { UserAvatar } from "../UserAvatar/UserAvatar"
16+
import { UserProfileCard } from "../UserProfileCard/UserProfileCard"
1717

1818
export const Language = {
1919
accountLabel: "Account",

‎site/src/components/User/UserProfileCard.tsx renamed to ‎site/src/components/UserProfileCard/UserProfileCard.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { makeStyles } from "@material-ui/core/styles"
22
import Typography from "@material-ui/core/Typography"
33
import React from "react"
44
import { UserResponse } from "../../api/types"
5-
import { UserAvatar } from "./UserAvatar"
5+
import { UserAvatar } from "../UserAvatar/UserAvatar"
66

77
interface UserProfileCardProps {
88
user: UserResponse

‎site/src/components/UsersTable/UsersTable.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React from "react"
22
import { UserResponse } from "../../api/types"
3-
import { Column, Table } from "../../components/Table/Table"
43
import { EmptyState } from "../EmptyState/EmptyState"
5-
import { UserCell } from "../Table/Cells/UserCell"
4+
import { Column, Table } from "../Table/Table"
5+
import { UserCell } from "../UserCell/UserCell"
66

77
const Language = {
88
pageTitle: "Users",

‎site/src/components/SignIn/Welcome.tsx renamed to ‎site/src/components/Welcome/Welcome.tsx

File renamed without changes.

‎site/src/components/Workspace/Workspace.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import CloudCircleIcon from "@material-ui/icons/CloudCircle"
66
import React from "react"
77
import { Link } from "react-router-dom"
88
import * as Types from "../../api/types"
9+
import { WorkspaceSchedule } from "../WorkspaceSchedule/WorkspaceSchedule"
10+
import { WorkspaceSection } from "../WorkspaceSection/WorkspaceSection"
911
import * as Constants from "./constants"
10-
import { WorkspaceSchedule } from "./WorkspaceSchedule"
11-
import { WorkspaceSection } from "./WorkspaceSection"
1212

1313
export interface WorkspaceProps {
1414
organization: Types.Organization

‎site/src/components/Workspace/WorkspaceSchedule.stories.tsx renamed to ‎site/src/components/WorkspaceSchedule/WorkspaceSchedule.stories.tsx

File renamed without changes.

‎site/src/components/Workspace/WorkspaceSchedule.tsx renamed to ‎site/src/components/WorkspaceSchedule/WorkspaceSchedule.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Typography from "@material-ui/core/Typography"
33
import cronstrue from "cronstrue"
44
import React from "react"
55
import { extractTimezone, stripTimezone } from "../../util/schedule"
6-
import { WorkspaceSection } from "./WorkspaceSection"
6+
import { WorkspaceSection } from "../WorkspaceSection/WorkspaceSection"
77

88
const Language = {
99
autoStartLabel: (schedule: string): string => {

‎site/src/components/Workspace/WorkspaceSection.tsx renamed to ‎site/src/components/WorkspaceSection/WorkspaceSection.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Paper from "@material-ui/core/Paper"
22
import { makeStyles } from "@material-ui/core/styles"
33
import Typography from "@material-ui/core/Typography"
44
import React from "react"
5-
import { CardPadding, CardRadius } from "./constants"
5+
import { CardPadding, CardRadius } from "../Workspace/constants"
66

77
export interface WorkspaceSectionProps {
88
title: string

‎site/src/forms/CreateTemplateForm.tsx

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import { FormikContextType, useFormik } from "formik"
44
import React from "react"
55
import * as Yup from "yup"
66
import { CreateTemplateRequest, Organization, Provisioner, Template } from "../api/types"
7-
import { LoadingButton } from "../components/Button/LoadingButton"
8-
import { FormCloseButton } from "../components/Form/FormCloseButton"
9-
import { DropdownItem, FormDropdownField } from "../components/Form/FormDropdownField"
10-
import { FormSection } from "../components/Form/FormSection"
11-
import { FormTextField } from "../components/Form/FormTextField"
12-
import { FormTitle } from "../components/Form/FormTitle"
7+
import { FormCloseButton } from "../components/FormCloseButton/FormCloseButton"
8+
import { FormDropdownField, FormDropdownItem } from "../components/FormDropdownField/FormDropdownField"
9+
import { FormSection } from "../components/FormSection/FormSection"
10+
import { FormTextField } from "../components/FormTextField/FormTextField"
11+
import { FormTitle } from "../components/FormTitle/FormTitle"
12+
import { LoadingButton } from "../components/LoadingButton/LoadingButton"
1313

1414
export interface CreateTemplateFormProps {
1515
provisioners: Provisioner[]
@@ -45,14 +45,14 @@ export const CreateTemplateForm: React.FC<CreateTemplateFormProps> = ({
4545
},
4646
})
4747

48-
const organizationDropDownItems: DropdownItem[] = organizations.map((org) => {
48+
const organizationDropDownItems: FormDropdownItem[] = organizations.map((org) => {
4949
return {
5050
value: org.name,
5151
name: org.name,
5252
}
5353
})
5454

55-
const provisionerDropDownItems: DropdownItem[] = provisioners.map((provisioner) => {
55+
const provisionerDropDownItems: FormDropdownItem[] = provisioners.map((provisioner) => {
5656
return {
5757
value: provisioner.id,
5858
name: provisioner.name,

‎site/src/forms/CreateWorkspaceForm.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import { FormikContextType, useFormik } from "formik"
44
import React from "react"
55
import * as Yup from "yup"
66
import { CreateWorkspaceRequest, Template, Workspace } from "../api/types"
7-
import { LoadingButton } from "../components/Button/LoadingButton"
8-
import { FormCloseButton } from "../components/Form/FormCloseButton"
9-
import { FormSection } from "../components/Form/FormSection"
10-
import { FormTextField } from "../components/Form/FormTextField"
11-
import { FormTitle } from "../components/Form/FormTitle"
7+
import { FormCloseButton } from "../components/FormCloseButton/FormCloseButton"
8+
import { FormSection } from "../components/FormSection/FormSection"
9+
import { FormTextField } from "../components/FormTextField/FormTextField"
10+
import { FormTitle } from "../components/FormTitle/FormTitle"
11+
import { LoadingButton } from "../components/LoadingButton/LoadingButton"
1212

1313
export interface CreateWorkspaceForm {
1414
template: Template

‎site/src/pages/CliAuthPage/CliAuthPage.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { makeStyles } from "@material-ui/core/styles"
22
import { useActor } from "@xstate/react"
33
import React, { useContext, useEffect, useState } from "react"
44
import { getApiKey } from "../../api"
5+
import { CliAuthToken } from "../../components/CliAuthToken/CliAuthToken"
56
import { FullScreenLoader } from "../../components/Loader/FullScreenLoader"
6-
import { CliAuthToken } from "../../components/SignIn/CliAuthToken"
77
import { XServiceContext } from "../../xServices/StateContext"
88

99
export const CliAuthenticationPage: React.FC = () => {

‎site/src/pages/LoginPage/LoginPage.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { act, screen } from "@testing-library/react"
22
import userEvent from "@testing-library/user-event"
33
import { rest } from "msw"
44
import React from "react"
5-
import { Language } from "../../components/SignIn/SignInForm"
5+
import { Language } from "../../components/SignInForm/SignInForm"
66
import { history, render } from "../../testHelpers"
77
import { server } from "../../testHelpers/server"
88
import { LoginPage } from "./LoginPage"

‎site/src/pages/LoginPage/LoginPage.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { makeStyles } from "@material-ui/core/styles"
22
import { useActor } from "@xstate/react"
33
import React, { useContext } from "react"
44
import { Navigate, useLocation } from "react-router-dom"
5-
import { Footer } from "../../components/Page/Footer"
6-
import { SignInForm } from "../../components/SignIn/SignInForm"
5+
import { Footer } from "../../components/Footer/Footer"
6+
import { SignInForm } from "../../components/SignInForm/SignInForm"
77
import { retrieveRedirect } from "../../util/redirect"
88
import { XServiceContext } from "../../xServices/StateContext"
99

‎site/src/pages/PreferencesPages/AccountPage/AccountPage.test.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { fireEvent, screen, waitFor } from "@testing-library/react"
22
import React from "react"
33
import * as API from "../../../api"
4-
import * as AccountForm from "../../../components/Preferences/AccountForm"
5-
import { GlobalSnackbar } from "../../../components/Snackbar/GlobalSnackbar"
4+
import { GlobalSnackbar } from "../../../components/GlobalSnackbar/GlobalSnackbar"
5+
import * as AccountForm from "../../../components/PreferencesAccountForm/PreferencesAccountForm"
66
import { renderWithAuth } from "../../../testHelpers"
77
import * as AuthXService from "../../../xServices/auth/authXService"
88
import { AccountPage, Language } from "./AccountPage"

‎site/src/pages/PreferencesPages/AccountPage/AccountPage.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useActor } from "@xstate/react"
22
import React, { useContext } from "react"
33
import { isApiError, mapApiErrorToFieldErrors } from "../../../api/errors"
4-
import { AccountForm } from "../../../components/Preferences/AccountForm"
4+
import { AccountForm } from "../../../components/PreferencesAccountForm/PreferencesAccountForm"
55
import { Section } from "../../../components/Section/Section"
66
import { XServiceContext } from "../../../xServices/StateContext"
77

0 commit comments

Comments
 (0)