From 6f777fd3a764e266b99f893dc001096473b7b110 Mon Sep 17 00:00:00 2001 From: Bruno Quaresma Date: Tue, 17 Jan 2023 23:00:34 +0000 Subject: [PATCH] refactor: Form page loaders --- .../src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx | 4 ++-- site/src/pages/GroupsPage/SettingsGroupPageView.tsx | 4 ++-- .../src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx index 00766e0888298..7cb9cb880f0f2 100644 --- a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx +++ b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx @@ -13,8 +13,8 @@ import * as Yup from "yup" import { AlertBanner } from "components/AlertBanner/AlertBanner" import { makeStyles } from "@material-ui/core/styles" import { FullPageHorizontalForm } from "components/FullPageForm/FullPageHorizontalForm" -import { FullScreenLoader } from "components/Loader/FullScreenLoader" import { SelectedTemplate } from "./SelectedTemplate" +import { Loader } from "components/Loader/Loader" export enum CreateWorkspaceErrors { GET_TEMPLATES_ERROR = "getTemplatesError", @@ -101,7 +101,7 @@ export const CreateWorkspacePageView: FC< ) if (isLoading) { - return + return } if (props.hasTemplateErrors) { diff --git a/site/src/pages/GroupsPage/SettingsGroupPageView.tsx b/site/src/pages/GroupsPage/SettingsGroupPageView.tsx index 32ccc2f78dd56..d1305713a0ccb 100644 --- a/site/src/pages/GroupsPage/SettingsGroupPageView.tsx +++ b/site/src/pages/GroupsPage/SettingsGroupPageView.tsx @@ -10,7 +10,7 @@ import { ChooseOne, Cond } from "components/Conditionals/ChooseOne" import { OpenDropdown } from "components/DropdownArrows/DropdownArrows" import { FormFooter } from "components/FormFooter/FormFooter" import { FullPageForm } from "components/FullPageForm/FullPageForm" -import { FullScreenLoader } from "components/Loader/FullScreenLoader" +import { Loader } from "components/Loader/Loader" import { Margins } from "components/Margins/Margins" import { useFormik } from "formik" import { useRef, useState, FC } from "react" @@ -164,7 +164,7 @@ export const SettingsGroupPageView: FC = ({ return ( - + diff --git a/site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx b/site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx index a709f58a64ddc..883cbfea8402f 100644 --- a/site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx +++ b/site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx @@ -2,6 +2,7 @@ import { makeStyles } from "@material-ui/core/styles" import { useMachine } from "@xstate/react" import { AlertBanner } from "components/AlertBanner/AlertBanner" import { ConfirmDialog } from "components/Dialogs/ConfirmDialog/ConfirmDialog" +import { Loader } from "components/Loader/Loader" import { Margins } from "components/Margins/Margins" import dayjs from "dayjs" import { scheduleToAutoStart } from "pages/WorkspaceSchedulePage/schedule" @@ -11,7 +12,6 @@ import { useTranslation } from "react-i18next" import { Navigate, useNavigate, useParams } from "react-router-dom" import { scheduleChanged } from "util/schedule" import * as TypesGen from "../../api/typesGenerated" -import { FullScreenLoader } from "../../components/Loader/FullScreenLoader" import { WorkspaceScheduleForm } from "../../components/WorkspaceScheduleForm/WorkspaceScheduleForm" import { firstOrItem } from "../../util/array" import { workspaceSchedule } from "../../xServices/workspaceSchedule/workspaceScheduleXService" @@ -63,7 +63,7 @@ export const WorkspaceSchedulePage: FC = () => { } if (scheduleState.hasTag("loading") || !template) { - return + return } if (scheduleState.matches("error")) {