Improve metadata toast

Flagsmith · Jun 5, 2024 · f15418e · f15418e
1 parent a26faf1
commit f15418e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/frontend/web/components/ErrorMessage.js b/frontend/web/components/ErrorMessage.js
@@ -14,6 +14,7 @@ export default class ErrorMessage extends PureComponent {
     }`
     const error =
       this.props.error?.data?.metadata?.find((item) =>
+        // eslint-disable-next-line no-prototype-builtins
         item.hasOwnProperty('non_field_errors'),
       )?.non_field_errors[0] ||
       this.props.error?.data ||

diff --git a/frontend/web/components/metadata/AddMetadataToEntity.tsx b/frontend/web/components/metadata/AddMetadataToEntity.tsx
@@ -271,8 +271,12 @@ const AddMetadataToEntity: FC<AddMetadataToEntityType> = ({
                     project: parseInt(`${projectId}`),
                   },
                   id: entityId,
-                }).then(() => {
-                  toast('Environment Metadata Updated')
+                }).then((res) => {
+                  if (res?.error) {
+                    toast(res?.error?.data.metadata[0], 'danger')
+                  } else {
+                    toast('Environment Metadata Updated')
+                  }
                 })
               }}
             >

diff --git a/frontend/web/components/metadata/MetadataPage.tsx b/frontend/web/components/metadata/MetadataPage.tsx
@@ -96,7 +96,8 @@ const MetadataPage: FC<MetadataPageType> = ({ organisationId, projectId }) => {
         </div>
       ),
       destructive: true,
-      onYes: () => deleteMetadata({ id }),
+      onYes: () =>
+        deleteMetadata({ id }).then(() => toast('Metadata Field Deleted')),
       title: 'Delete Metadata Field',
       yesText: 'Confirm',
     })

diff --git a/frontend/web/components/pages/EnvironmentSettingsPage.js b/frontend/web/components/pages/EnvironmentSettingsPage.js
@@ -7,7 +7,6 @@ import CreateWebhookModal from 'components/modals/CreateWebhook'
 import ConfirmRemoveWebhook from 'components/modals/ConfirmRemoveWebhook'
 import ConfirmToggleEnvFeature from 'components/modals/ConfirmToggleEnvFeature'
 import EditPermissions from 'components/EditPermissions'
-import ServerSideSDKKeys from 'components/ServerSideSDKKeys'
 import Tabs from 'components/base/forms/Tabs'
 import TabItem from 'components/base/forms/TabItem'
 import JSONReference from 'components/JSONReference'
@@ -25,6 +24,7 @@ import { enableFeatureVersioning } from 'common/services/useEnableFeatureVersion
 import AddMetadataToEntity from 'components/metadata/AddMetadataToEntity'
 import { getSupportedContentType } from 'common/services/useSupportedContentType'
 import EnvironmentVersioningListener from 'components/EnvironmentVersioningListener'
+import MetadataTitle from 'components/metadata/MetadataTitle'
 
 const showDisabledFlagOptions = [
   { label: 'Inherit from Project', value: null },