The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
GDGT-2580 Replace deprecated FormErrorMessage component (#77497)
Egor Grushin12835e188979
diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModalView.tsx b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModalView.tsxindex 96593b0abf3..8e0bb84b6e4 100644--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModalView.tsx+++ b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModalView.tsx@@ -4,13 +4,13 @@ import * as Yup from "yup";import { Alert } from "metabase/common/components/Alert";import { ExternalLink } from "metabase/common/components/ExternalLink/ExternalLink";-import { FormErrorMessage } from "metabase/common/components/FormErrorMessage";import { FormFooter } from "metabase/common/components/FormFooter";import { Link } from "metabase/common/components/Link/Link";import { useDocsUrl } from "metabase/common/hooks";import CS from "metabase/css/core/index.css";import {Form,+ FormErrorMessage,FormProvider,FormSelect,FormSubmitButton,@@ -131,7 +131,7 @@ export const ImpersonationModalView = ({<ImpersonationWarning database={database} /><FormFooter hasTopBorder>- <FormErrorMessage inline />+ <FormErrorMessage /><Button type="button" onClick={onCancel}>{t`Cancel`}</Button><FormSubmitButtonlabel={t`Save`}diff --git a/frontend/src/metabase/actions/components/ActionForm/ActionForm.tsx b/frontend/src/metabase/actions/components/ActionForm/ActionForm.tsxindex 9b67d1b13b9..9a77dd5cbc1 100644--- a/frontend/src/metabase/actions/components/ActionForm/ActionForm.tsx+++ b/frontend/src/metabase/actions/components/ActionForm/ActionForm.tsx@@ -7,8 +7,12 @@ import {getSubmitButtonColor,getSubmitButtonLabel,} from "metabase/actions/utils";-import { FormErrorMessage } from "metabase/common/components/FormErrorMessage";-import { Form, FormProvider, FormSubmitButton } from "metabase/forms";+import {+ Form,+ FormErrorMessage,+ FormProvider,+ FormSubmitButton,+} from "metabase/forms";import { Button, Flex } from "metabase/ui";import type {ActionFormInitialValues,@@ -90,7 +94,7 @@ function ActionForm({/></Flex>- <FormErrorMessage />+ <FormErrorMessage mt="md" /></Form></FormProvider>);diff --git a/frontend/src/metabase/actions/containers/ActionCreator/CreateActionForm/CreateActionForm.tsx b/frontend/src/metabase/actions/containers/ActionCreator/CreateActionForm/CreateActionForm.tsxindex c528db01c68..a300ca2936e 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/CreateActionForm/CreateActionForm.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/CreateActionForm/CreateActionForm.tsx@@ -4,10 +4,10 @@ import * as Yup from "yup";import { FormModelPicker } from "metabase/actions/containers/ActionCreator/FormModelPicker";import type { CreateQueryActionParams } from "metabase/actions/types";-import { FormErrorMessage } from "metabase/common/components/FormErrorMessage";import { FormFooter } from "metabase/common/components/FormFooter";import {Form,+ FormErrorMessage,FormProvider,FormSubmitButton,FormTextInput,@@ -77,7 +77,7 @@ function CreateActionForm({/><FormModelPicker name="model_id" title={t`Model it's saved in`} /><FormFooter>- <FormErrorMessage inline />+ <FormErrorMessage />{!!onCancel && (<Button type="button" onClick={onCancel}>{t`Cancel`}</Button>)}diff --git a/frontend/src/metabase/auth/components/ForgotPasswordForm/ForgotPasswordForm.tsx b/frontend/src/metabase/auth/components/ForgotPasswordForm/ForgotPasswordForm.tsxindex a67c8e5d14a..1d555b0fd49 100644--- a/frontend/src/metabase/auth/components/ForgotPasswordForm/ForgotPasswordForm.tsx+++ b/frontend/src/metabase/auth/components/ForgotPasswordForm/ForgotPasswordForm.tsx@@ -2,9 +2,9 @@ import { useCallback, useMemo } from "react";import { t } from "ttag";import * as Yup from "yup";-import { FormErrorMessage } from "metabase/common/components/FormErrorMessage";import {Form,+ FormErrorMessage,FormProvider,FormSubmitButton,FormTextInput,diff --git a/frontend/src/metabase/auth/components/ResetPasswordForm/ResetPasswordForm.tsx b/frontend/src/metabase/auth/components/ResetPasswordForm/ResetPasswordForm.tsxindex 0ec4a80178d..44032a9e485 100644--- a/frontend/src/metabase/auth/components/ResetPasswordForm/ResetPasswordForm.tsx+++ b/frontend/src/metabase/auth/components/ResetPasswordForm/ResetPasswordForm.tsx@@ -3,9 +3,9 @@ import { t } from "ttag";import _ from "underscore";import * as Yup from "yup";-import { FormErrorMessage } from "metabase/common/components/FormErrorMessage";import {Form,+ FormErrorMessage,FormProvider,FormSubmitButton,FormTextInput,diff --git a/frontend/src/metabase/common/collections/components/CreateCollectionForm/CreateCollectionForm.tsx b/frontend/src/metabase/common/collections/components/CreateCollectionForm/CreateCollectionForm.tsxindex 66cfd556ce8..f08e8e365e6 100644--- a/frontend/src/metabase/common/collections/components/CreateCollectionForm/CreateCollectionForm.tsx+++ b/frontend/src/metabase/common/collections/components/CreateCollectionForm/CreateCollectionForm.tsx@@ -5,7 +5,6 @@ import * as Yup from "yup";import { skipToken, useGetCollectionQuery } from "metabase/api";import FormCollectionPicker from "metabase/common/collections/containers/FormCollectionPicker";import { useInitialCollectionId } from "metabase/common/collections/hooks";-import { FormErrorMessage } from "metabase/common/components/FormErrorMessage";import { FormFooter } from "metabase/common/components/FormFooter";import type {EntityPickerOptions,@@ -14,6 +13,7 @@ import type {} from "metabase/common/components/Pickers";import {Form,+ FormErrorMessage,FormProvider,FormSubmitButton,FormTextInput,@@ -162,7 +162,7 @@ function CreateCollectionForm({<FormAuthorityLevelField />)}<FormFooter mt="lg">- <FormErrorMessage inline />+ <FormErrorMessage /><Flex style={{ flexShrink: 1 }} justify="flex-end" gap="sm">{!!onCancel && (<Button type="button" onClick={onCancel}>{t`Cancel`}</Button>diff --git a/frontend/src/metabase/common/components/FormErrorMessage/FormErrorMessage.styled.tsx b/frontend/src/metabase/common/components/FormErrorMessage/FormErrorMessage.styled.tsxdeleted file mode 100644index db8db922aba..00000000000--- a/frontend/src/metabase/common/components/FormErrorMessage/FormErrorMessage.styled.tsx+++ /dev/null@@ -1,11 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--interface ErrorMessageRootProps {- inline?: boolean;-}--export const ErrorMessageRoot = styled.div<ErrorMessageRootProps>`- color: var(--mb-color-feedback-negative);- margin-top: ${(props) => !props.inline && "1rem"};-`;diff --git a/frontend/src/metabase/common/components/FormErrorMessage/FormErrorMessage.tsx b/frontend/src/metabase/common/components/FormErrorMessage/FormErrorMessage.tsxdeleted file mode 100644index 0c03106f408..00000000000--- a/frontend/src/metabase/common/components/FormErrorMessage/FormErrorMessage.tsx+++ /dev/null@@ -1,32 +0,0 @@-import type { HTMLAttributes, Ref } from "react";-import { forwardRef } from "react";--import { useFormErrorMessage } from "metabase/forms";--import { ErrorMessageRoot } from "./FormErrorMessage.styled";--export interface FormErrorMessageProps extends Omit<- HTMLAttributes<HTMLDivElement>,- "children"-> {- inline?: boolean;-}--/**- * @deprecated: use FormErrorMessage from "metabase/forms"- */-export const FormErrorMessage = forwardRef(function FormErrorMessage(- { inline, ...props }: FormErrorMessageProps,- ref: Ref<HTMLDivElement>,-) {- const message = useFormErrorMessage();- if (!message) {- return null;- }-- return (- <ErrorMessageRoot {...props} ref={ref} inline={inline}>- {message}- </ErrorMessageRoot>- );-});diff --git a/frontend/src/metabase/common/components/FormErrorMessage/index.ts b/frontend/src/metabase/common/components/FormErrorMessage/index.tsdeleted file mode 100644index c6f2edd4f53..00000000000--- a/frontend/src/metabase/common/components/FormErrorMessage/index.ts+++ /dev/null@@ -1 +0,0 @@-export { FormErrorMessage } from "./FormErrorMessage";diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/SnippetForm.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/SnippetForm.tsxindex 4fab0e3a487..b15619598a7 100644--- a/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/SnippetForm.tsx+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/SnippetForm.tsx@@ -4,10 +4,10 @@ import * as Yup from "yup";import { useListCollectionsQuery } from "metabase/api";import FormCollectionPicker from "metabase/common/collections/containers/FormCollectionPicker";-import { FormErrorMessage } from "metabase/common/components/FormErrorMessage";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import {Form,+ FormErrorMessage,FormProvider,FormSubmitButton,FormTextInput,@@ -129,7 +129,7 @@ function SnippetFormInner({{t`Archive`}</Button>)}- <FormErrorMessage inline />+ <FormErrorMessage /></Flex><Flex align="center" justify="center" gap="sm">{!!onCancel && (diff --git a/frontend/src/metabase/timelines/common/components/TimelineForm/TimelineForm.tsx b/frontend/src/metabase/timelines/common/components/TimelineForm/TimelineForm.tsxindex 27082ded00f..37d75fc5672 100644--- a/frontend/src/metabase/timelines/common/components/TimelineForm/TimelineForm.tsx+++ b/frontend/src/metabase/timelines/common/components/TimelineForm/TimelineForm.tsx@@ -2,10 +2,10 @@ import { useMemo } from "react";import { t } from "ttag";import * as Yup from "yup";-import { FormErrorMessage } from "metabase/common/components/FormErrorMessage";import { getTimelineIcons } from "metabase/common/utils/timelines";import {Form,+ FormErrorMessage,FormProvider,FormSubmitButton,FormTextInput,@@ -66,7 +66,7 @@ const TimelineForm = ({/><IconField name="icon" title={t`Default icon`} options={icons} /><TimelineFormFooter>- <FormErrorMessage inline />+ <FormErrorMessage />{!isNew && (<FormArchiveButton onClick={onArchive}>{t`Archive timeline and all events`}