refactor: replace legacy ErrorMessage.js with messages/ErrorMessage.tsx

frontend/common/utils/utils.tsx

@@ -19,7 +19,7 @@ import {
 import flagsmith from '@flagsmith/flagsmith'
 import { ReactNode } from 'react'
 import _ from 'lodash'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import WarningMessage from 'components/WarningMessage'
 import Constants from 'common/constants'
 import { defaultFlags } from 'common/stores/default-flags'

frontend/web/components/EditIdentity.tsx

@@ -2,7 +2,7 @@ import React, { FC, useEffect, useRef, useState } from 'react'
 import { Identity } from 'common/types/responses'
 import { useUpdateIdentityMutation } from 'common/services/useIdentity'
 import Button from './base/forms/Button'
-import ErrorMessage from './ErrorMessage'
+import ErrorMessage from './messages/ErrorMessage'
 import GhostInput from './base/forms/GhostInput'
 
 type EditIdentityType = {

frontend/web/components/NewVersionWarning.tsx

@@ -1,7 +1,7 @@
 import { FC, useMemo } from 'react'
 import { useGetFeatureVersionsQuery } from 'common/services/useFeatureVersion'
 import moment from 'moment'
-import ErrorMessage from './ErrorMessage'
+import ErrorMessage from './messages/ErrorMessage'
 
 type NewVersionWarningType = {
   date: string

frontend/web/components/SamlForm.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import data from 'common/data/base/_data'
-import ErrorMessage from './ErrorMessage'
+import ErrorMessage from './messages/ErrorMessage'
 import ConfigProvider from 'common/providers/ConfigProvider'
 import Icon from './Icon'
 import ModalHR from './modals/ModalHR'

frontend/web/components/SimpleTwoFactor/index.js

@@ -1,7 +1,7 @@
 import propTypes from 'prop-types'
 import React, { Component } from 'react'
 import QRCode from 'qrcode.react'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 
 export default class TheComponent extends Component {
   static displayName = 'TheComponent'

frontend/web/components/SimpleTwoFactor/prompt.js

@@ -1,6 +1,6 @@
 import propTypes from 'prop-types'
 import React, { PureComponent } from 'react'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 
 export default class TheComponent extends PureComponent {
   static displayName = 'TheComponent'

frontend/web/components/UsersGroups.tsx

@@ -7,7 +7,7 @@ import { sortBy } from 'lodash'
 import { GroupUser, UserGroupSummary } from 'common/types/responses'
 import Switch from './Switch'
 import PanelSearch from './PanelSearch'
-import ErrorMessage from './ErrorMessage'
+import ErrorMessage from './messages/ErrorMessage'
 
 type UsersGroupsType = {
   user: GroupUser

frontend/web/components/import-export/FeatureImport.tsx

@@ -19,7 +19,7 @@ import {
 import FeatureRow from 'components/feature-summary/FeatureRow'
 import Button from 'components/base/forms/Button'
 import { useCreateFlagsmithProjectImportMutation } from 'common/services/useFlagsmithProjectImport'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import InfoMessage from 'components/InfoMessage'
 import WarningMessage from 'components/WarningMessage'
 import FeatureListStore from 'common/stores/feature-list-store'

frontend/web/components/modals/ChangeEmailAddress.tsx

@@ -6,7 +6,7 @@ import Utils from 'common/utils/utils'
 import InputGroup from 'components/base/forms/InputGroup'
 import Button from 'components/base/forms/Button'
 import ModalHR from './ModalHR'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 
 type ChangeEmailAddressType = {
   onComplete?: () => void

frontend/web/components/modals/ConfirmDeleteAccount.tsx

@@ -6,7 +6,7 @@ import { useDeleteAccountMutation } from 'common/services/useAccount'
 import InputGroup from 'components/base/forms/InputGroup'
 import ModalHR from './ModalHR'
 import AppActions from 'common/dispatcher/app-actions'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 
 type ConfirmDeleteAccountType = {
   lastUserOrganisations: Organisation[]

frontend/web/components/modals/ConfirmDeleteRole.tsx

@@ -3,7 +3,7 @@ import Button from 'components/base/forms/Button'
 import Utils from 'common/utils/utils'
 import { useDeleteRoleMutation } from 'common/services/useRole'
 import ModalHR from './ModalHR'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import { Role } from 'common/types/responses'
 
 type ConfirmDeleteRoleType = {

frontend/web/components/modals/CreateAuditLogWebhook.tsx

@@ -2,7 +2,7 @@ import React, { useState, useRef, FormEvent, ChangeEvent } from 'react'
 import Constants from 'common/constants'
 import ConfigProvider from 'common/providers/ConfigProvider'
 import Highlight from 'components/Highlight'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import TestWebhook from 'components/TestWebhook'
 import ViewDocs from 'components/ViewDocs'
 import Button from 'components/base/forms/Button'

frontend/web/components/modals/CreateEditIntegrationModal.tsx

@@ -2,7 +2,7 @@ import React, { FC, FormEvent, useEffect, useState } from 'react'
 import EnvironmentSelect from 'components/EnvironmentSelect'
 import MyGitHubRepositoriesComponent from 'components/MyGitHubRepositoriesComponent'
 import _data from 'common/data/base/_data'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import Button from 'components/base/forms/Button'
 import classNames from 'classnames'
 import { getStore } from 'common/store'

frontend/web/components/modals/CreateMetadataField.tsx

@@ -26,7 +26,7 @@ import {
   MetadataFieldModelField,
   isRequiredFor,
 } from 'common/types/responses'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 
 type CreateMetadataFieldType = {
   id?: string

frontend/web/components/modals/CreateProject.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import Button from 'components/base/forms/Button'
 import { setInterceptClose } from './base/ModalDefault'
 import PlanBasedAccess from 'components/PlanBasedAccess'

frontend/web/components/modals/CreateSAML.tsx

@@ -12,7 +12,7 @@ import {
 import { useCreateSamlAttributeMappingMutation } from 'common/services/useSamlAttributeMapping'
 import Button from 'components/base/forms/Button'
 import { Req } from 'common/types/requests'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import { getStore } from 'common/store'
 import XMLUpload from 'components/XMLUpload'
 import { IonIcon } from '@ionic/react'

frontend/web/components/modals/CreateTrait.tsx

@@ -9,7 +9,7 @@ import React, {
 import Highlight from 'components/Highlight'
 import Constants from 'common/constants'
 import Format from 'common/utils/format'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import ModalHR from './ModalHR'
 import IdentityProvider from 'common/providers/IdentityProvider'
 import _ from 'lodash'

frontend/web/components/modals/CreateUser.tsx

@@ -1,6 +1,6 @@
 import React, { FC, useEffect, useState } from 'react'
 import ChipInput from 'components/ChipInput'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import Button from 'components/base/forms/Button'
 import { useCreateIdentitiesMutation } from 'common/services/useIdentity'
 import Utils from 'common/utils/utils'

frontend/web/components/modals/CreateWebhook.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react'
 import Constants from 'common/constants'
 import ConfigProvider from 'common/providers/ConfigProvider'
 import Highlight from 'components/Highlight'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import TestWebhook from 'components/TestWebhook'
 import ViewDocs from 'components/ViewDocs'
 

frontend/web/components/modals/CreateWebhook.tsx

@@ -2,7 +2,7 @@ import Constants from 'common/constants'
 import { useGetEnvironmentQuery } from 'common/services/useEnvironment'
 import { Webhook } from 'common/types/responses'
 import Utils from 'common/utils/utils'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import Highlight from 'components/Highlight'
 import TestWebhook from 'components/TestWebhook'
 import ViewDocs from 'components/ViewDocs'

frontend/web/components/modals/ForgotPasswordModal.tsx

@@ -3,7 +3,7 @@ import { FC, FormEvent, useState } from 'react'
 import InputGroup from 'components/base/forms/InputGroup'
 import Utils from 'common/utils/utils'
 import Project from 'common/project'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import Button from 'components/base/forms/Button'
 import ModalHR from './ModalHR'
 

frontend/web/components/modals/InviteUsers.tsx

@@ -10,7 +10,7 @@ import InputGroup from 'components/base/forms/InputGroup'
 import OrganisationProvider from 'common/providers/OrganisationProvider'
 import Utils from 'common/utils/utils'
 import _ from 'lodash'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import AccountStore from 'common/stores/account-store'
 import { close as closeIcon } from 'ionicons/icons'
 import { MultiValueProps } from 'react-select/lib/components/MultiValue'

frontend/web/components/modals/create-feature/index.js

@@ -14,7 +14,7 @@ import ChangeRequestModal from 'components/modals/ChangeRequestModal'
 import classNames from 'classnames'
 import InfoMessage from 'components/InfoMessage'
 import JSONReference from 'components/JSONReference'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import Permission from 'common/providers/Permission'
 import IdentitySelect from 'components/IdentitySelect'
 import {

frontend/web/components/modals/create-feature/tabs/CreateFeature.tsx

@@ -2,7 +2,7 @@ import React, { FC, useCallback, useEffect, useState } from 'react'
 import { FeatureState, ProjectFlag } from 'common/types/responses'
 import FeatureValue from './FeatureValue'
 import FeatureSettings from './FeatureSettings'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import WarningMessage from 'components/WarningMessage'
 import { useHasPermission } from 'common/providers/Permission'
 import { ProjectPermission } from 'common/types/permissions.types'

frontend/web/components/modals/create-feature/tabs/FeatureValue.tsx

@@ -4,7 +4,7 @@ import ValueEditor from 'components/ValueEditor'
 import Constants from 'common/constants'
 import { VariationOptions } from 'components/mv/VariationOptions'
 import { AddVariationButton } from 'components/mv/AddVariationButton'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import WarningMessage from 'components/WarningMessage'
 import Tooltip from 'components/Tooltip'
 import Icon from 'components/Icon'

frontend/web/components/mv/VariationOptions.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import ValueEditor from 'components/ValueEditor'
 import InfoMessage from 'components/InfoMessage'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import { VariationValueInput } from './VariationValueInput'
 import Utils from 'common/utils/utils'
 import { FlagsmithValue, MultivariateOption } from 'common/types/responses'

frontend/web/components/pages/AccountSettingsPage.js

@@ -1,7 +1,7 @@
 // import propTypes from 'prop-types';
 import React, { Component, ReactNode } from 'react'
 import Button from 'components/base/forms/Button'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import _data from 'common/data/base/_data'
 import ConfigProvider from 'common/providers/ConfigProvider'
 import TwoFactor from 'components/TwoFactor'

frontend/web/components/pages/AuditLogItemPage.tsx

@@ -1,6 +1,6 @@
 import React, { FC } from 'react'
 import { useGetAuditLogItemQuery } from 'common/services/useAuditLogItem'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import Breadcrumb from 'components/Breadcrumb'
 import PageTitle from 'components/PageTitle'
 import Panel from 'components/base/grid/Panel'

frontend/web/components/pages/BrokenPage.tsx

@@ -1,5 +1,5 @@
 import { FC, useEffect } from 'react'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 
 type BrokenPageType = {}
 

frontend/web/components/pages/ChangeRequestDetailPage.tsx

@@ -40,7 +40,7 @@ import MyGroupsSelect from 'components/MyGroupsSelect'
 import Panel from 'components/base/grid/Panel'
 import DiffChangeRequest from 'components/diff/DiffChangeRequest'
 import JSONReference from 'components/JSONReference'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import ConfigProvider from 'common/providers/ConfigProvider'
 import { useHistory } from 'react-router-dom'
 import { openPublishChangeRequestConfirm } from 'components/PublishChangeRequestModal'

frontend/web/components/pages/CreateEnvironmentPage.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useRef, useState } from 'react'
 import ConfigProvider from 'common/providers/ConfigProvider'
 import Permission from 'common/providers/Permission'
 import Constants from 'common/constants'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import PageTitle from 'components/PageTitle'
 import CondensedRow from 'components/CondensedRow'
 import AddMetadataToEntity from 'components/metadata/AddMetadataToEntity'

frontend/web/components/pages/FeatureHistoryDetailPage.tsx

@@ -12,7 +12,7 @@ import { Environment } from 'common/types/responses'
 import PageTitle from 'components/PageTitle'
 import FeatureVersion from 'components/FeatureVersion'
 import moment from 'moment'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import Tabs from 'components/navigation/TabMenu/Tabs'
 import TabItem from 'components/navigation/TabMenu/TabItem'
 import Breadcrumb from 'components/Breadcrumb'

frontend/web/components/pages/HomePage.tsx

@@ -6,7 +6,7 @@ import Card from 'components/Card'
 import NavIconSmall from 'components/svg/NavIconSmall'
 import ConfigProvider from 'common/providers/ConfigProvider'
 import Constants from 'common/constants'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import Button from 'components/base/forms/Button'
 import PasswordRequirements from 'components/PasswordRequirements'
 import { informationCircleOutline } from 'ionicons/icons'

frontend/web/components/pages/PasswordResetPage.js

@@ -1,6 +1,6 @@
 import React, { Component } from 'react'
 import Constants from 'common/constants'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import { withRouter } from 'react-router-dom'
 const PasswordResetPage = class extends Component {
   static displayName = 'PasswordResetPage'

frontend/web/components/pages/UsersAndPermissionsPage.tsx

@@ -26,7 +26,7 @@ import { useGetRolesQuery } from 'common/services/useRole'
 import AppActions from 'common/dispatcher/app-actions'
 import { RouterChildContext, useHistory } from 'react-router-dom'
 import Input from 'components/base/forms/Input'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import PanelSearch from 'components/PanelSearch'
 import moment from 'moment'
 import sortBy from 'lodash/sortBy'

frontend/web/components/pages/admin-dashboard/AdminDashboardPage.tsx

@@ -11,7 +11,7 @@ import { useGetAdminDashboardMetricsQuery } from 'common/services/useAdminDashbo
 import Button from 'components/base/forms/Button'
 import Tabs from 'components/navigation/TabMenu/Tabs'
 import TabItem from 'components/navigation/TabMenu/TabItem'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 
 const AdminDashboardPage: FC = () => {
   const [days, setDays] = useState<30 | 60 | 90>(30)

frontend/web/components/segments/Rule/components/RuleConditionRow.tsx

@@ -8,7 +8,7 @@ import {
 } from 'common/types/responses'
 import find from 'lodash/find'
 import Button from 'components/base/forms/Button'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import RuleConditionPropertySelect from './RuleConditionPropertySelect'
 import RuleConditionValueInput from './RuleConditionValueInput'
 import { useRuleOperator, useRuleContext } from 'components/segments/Rule/hooks'

frontend/web/components/tags/CreateEditTag.tsx

@@ -13,7 +13,7 @@ import InputGroup from 'components/base/forms/InputGroup'
 import Button from 'components/base/forms/Button'
 import Tag from './Tag'
 import InlineModal from 'components/InlineModal'
-import ErrorMessage from 'components/ErrorMessage'
+import ErrorMessage from 'components/messages/ErrorMessage'
 import Switch from 'components/Switch'
 import Icon from 'components/Icon'
 import { ProjectPermission } from 'common/types/permissions.types'