Skip to content

chore: replace old ErrorSummary component #4417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 7, 2022
Merged

chore: replace old ErrorSummary component #4417

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad763b8
replaced error summary
Kira-Pilot Oct 7, 2022
56c7866
fixed tests
Kira-Pilot Oct 7, 2022
04c8300
positioning caret
Kira-Pilot Oct 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
replaced error summary
  • Loading branch information
@Kira-Pilot
Kira-Pilot committed Oct 7, 2022
commit ad763b8305485f2b3bba59f6d2c842666de427f2
61 changes: 0 additions & 61 deletions site/src/components/ErrorSummary/ErrorSummary.stories.tsx
View file
Open in desktop

This file was deleted.

81 changes: 0 additions & 81 deletions site/src/components/ErrorSummary/ErrorSummary.test.tsx
View file
Open in desktop

This file was deleted.

129 changes: 0 additions & 129 deletions site/src/components/ErrorSummary/ErrorSummary.tsx
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions site/src/components/Resources/Resources.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import TableRow from "@material-ui/core/TableRow"
import { Skeleton } from "@material-ui/lab"
import useTheme from "@material-ui/styles/useTheme"
import { CloseDropdown, OpenDropdown } from "components/DropdownArrows/DropdownArrows"
import { ErrorSummary } from "components/ErrorSummary/ErrorSummary"
import { PortForwardButton } from "components/PortForwardButton/PortForwardButton"
import { TableCellDataPrimary } from "components/TableCellData/TableCellData"
import { FC, useState } from "react"
Expand All @@ -25,6 +24,7 @@ import { AgentOutdatedTooltip } from "../Tooltips/AgentOutdatedTooltip"
import { ResourcesHelpTooltip } from "../Tooltips/ResourcesHelpTooltip"
import { ResourceAgentLatency } from "./ResourceAgentLatency"
import { ResourceAvatarData } from "./ResourceAvatarData"
import { AlertBanner } from "components/AlertBanner/AlertBanner"

const Language = {
resources: "Resources",
Expand Down Expand Up @@ -68,7 +68,7 @@ export const Resources: FC<React.PropsWithChildren<ResourcesProps>> = ({
<Stack direction="column" spacing={1}>
<div aria-label={Language.resources} className={styles.wrapper}>
{getResourcesError ? (
<ErrorSummary error={getResourcesError} />
<AlertBanner severity="error" error={getResourcesError} />
) : (
<TableContainer className={styles.tableContainer}>
<Table>
Expand Down
6 changes: 4 additions & 2 deletions site/src/components/SettingsAccountForm/SettingsAccountForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import TextField from "@material-ui/core/TextField"
import { ErrorSummary } from "components/ErrorSummary/ErrorSummary"
import { FormikContextType, FormikTouched, useFormik } from "formik"
import { FC } from "react"
import * as Yup from "yup"
import { getFormHelpers, nameValidator, onChangeTrimmed } from "../../util/formUtils"
import { LoadingButton } from "../LoadingButton/LoadingButton"
import { Stack } from "../Stack/Stack"
import { AlertBanner } from "components/AlertBanner/AlertBanner"

export interface AccountFormValues {
username: string
Expand Down Expand Up @@ -53,7 +53,9 @@ export const AccountForm: FC<React.PropsWithChildren<AccountFormProps>> = ({
<>
<form onSubmit={form.handleSubmit}>
<Stack>
{updateProfileError ? <ErrorSummary error={updateProfileError} /> : <></>}
{Boolean(updateProfileError) && (
<AlertBanner severity="error" error={updateProfileError} />
)}
<TextField
disabled
fullWidth
Expand Down
6 changes: 4 additions & 2 deletions site/src/components/SettingsSecurityForm/SettingsSecurityForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import TextField from "@material-ui/core/TextField"
import { ErrorSummary } from "components/ErrorSummary/ErrorSummary"
import { FormikContextType, FormikTouched, useFormik } from "formik"
import React from "react"
import * as Yup from "yup"
import { getFormHelpers, onChangeTrimmed } from "../../util/formUtils"
import { LoadingButton } from "../LoadingButton/LoadingButton"
import { Stack } from "../Stack/Stack"
import { AlertBanner } from "components/AlertBanner/AlertBanner"

interface SecurityFormValues {
old_password: string
Expand Down Expand Up @@ -68,7 +68,9 @@ export const SecurityForm: React.FC<SecurityFormProps> = ({
<>
<form onSubmit={form.handleSubmit}>
<Stack>
{updateSecurityError ? <ErrorSummary error={updateSecurityError} /> : <></>}
{Boolean(updateSecurityError) && (
<AlertBanner severity="error" error={updateSecurityError} />
)}
<TextField
{...getFieldHelpers("old_password")}
onChange={onChangeTrimmed(form)}
Expand Down
20 changes: 11 additions & 9 deletions site/src/components/SignInForm/SignInForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { makeStyles } from "@material-ui/core/styles"
import TextField from "@material-ui/core/TextField"
import GitHubIcon from "@material-ui/icons/GitHub"
import KeyIcon from "@material-ui/icons/VpnKey"
import { ErrorSummary } from "components/ErrorSummary/ErrorSummary"
import { Stack } from "components/Stack/Stack"
import { FormikContextType, FormikTouched, useFormik } from "formik"
import { FC } from "react"
Expand All @@ -14,6 +13,7 @@ import { AuthMethods } from "../../api/typesGenerated"
import { getFormHelpers, onChangeTrimmed } from "../../util/formUtils"
import { Welcome } from "../Welcome/Welcome"
import { LoadingButton } from "./../LoadingButton/LoadingButton"
import { AlertBanner } from "components/AlertBanner/AlertBanner"

/**
* BuiltInAuthFormValues describes a form using built-in (email/password)
Expand Down Expand Up @@ -120,14 +120,16 @@ export const SignInForm: FC<React.PropsWithChildren<SignInFormProps>> = ({
<Welcome />
<form onSubmit={form.handleSubmit}>
<Stack>
{Object.keys(loginErrors).map((errorKey: string) =>
loginErrors[errorKey as LoginErrors] ? (
<ErrorSummary
key={errorKey}
error={loginErrors[errorKey as LoginErrors]}
defaultMessage={Language.errorMessages[errorKey as LoginErrors]}
/>
) : null,
{Object.keys(loginErrors).map(
(errorKey: string) =>
Boolean(loginErrors[errorKey as LoginErrors]) && (
<AlertBanner
key={errorKey}
severity="error"
error={loginErrors[errorKey as LoginErrors]}
text={Language.errorMessages[errorKey as LoginErrors]}
/>
),
)}
<TextField
{...getFieldHelpers("email")}
Expand Down
Loading