From ecee66fce98549e02c466c1e16c1445d77cba7eb Mon Sep 17 00:00:00 2001
From: Aniket Katkar <51777795+aniketkatkar97@users.noreply.github.com>
Date: Mon, 7 Nov 2022 23:07:31 +0530
Subject: [PATCH] Fixed wrong field names showing in the validation messages
 for add and edit announcement modal. (#8564)

---
 .../Modals/AnnouncementModal/AddAnnouncementModal.tsx         | 3 +++
 .../Modals/AnnouncementModal/EditAnnouncementModal.tsx        | 3 +++
 .../src/main/resources/ui/src/utils/AnnouncementsUtils.ts     | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/AddAnnouncementModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/AddAnnouncementModal.tsx
index 022a3250434..cce703409e0 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/AddAnnouncementModal.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/AddAnnouncementModal.tsx
@@ -114,6 +114,7 @@ const AddAnnouncementModal: FC<Props> = ({
         onFinish={handleCreateAnnouncement}>
         <Form.Item
           label="Title:"
+          messageVariables={{ fieldName: 'title' }}
           name="title"
           rules={[
             {
@@ -132,6 +133,7 @@ const AddAnnouncementModal: FC<Props> = ({
         <Space className="announcement-date-space" size={16}>
           <Form.Item
             label={`Start Date: (${getTimeZone()})`}
+            messageVariables={{ fieldName: 'startDate' }}
             name="startDate"
             rules={[
               {
@@ -146,6 +148,7 @@ const AddAnnouncementModal: FC<Props> = ({
           </Form.Item>
           <Form.Item
             label={`End Date: (${getTimeZone()})`}
+            messageVariables={{ fieldName: 'endtDate' }}
             name="endtDate"
             rules={[
               {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/EditAnnouncementModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/EditAnnouncementModal.tsx
index a11160739ab..835bb81a8e1 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/EditAnnouncementModal.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/EditAnnouncementModal.tsx
@@ -96,6 +96,7 @@ const EditAnnouncementModal: FC<Props> = ({
         onFinish={handleConfirm}>
         <Form.Item
           label="Title:"
+          messageVariables={{ fieldName: 'title' }}
           name="title"
           rules={[
             {
@@ -114,6 +115,7 @@ const EditAnnouncementModal: FC<Props> = ({
         <Space className="announcement-date-space" size={16}>
           <Form.Item
             label={`Start Date: (${getTimeZone()})`}
+            messageVariables={{ fieldName: 'startDate' }}
             name="startDate"
             rules={[
               {
@@ -128,6 +130,7 @@ const EditAnnouncementModal: FC<Props> = ({
           </Form.Item>
           <Form.Item
             label={`End Date: (${getTimeZone()})`}
+            messageVariables={{ fieldName: 'endDate' }}
             name="endDate"
             rules={[
               {
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/AnnouncementsUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/AnnouncementsUtils.ts
index cc764cfbe78..cd43d69c8f2 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/AnnouncementsUtils.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/AnnouncementsUtils.ts
@@ -9,9 +9,9 @@ export const ANNOUNCEMENT_ENTITIES = [
 ];
 
 export const validateMessages = {
-  required: '${name} is required!',
+  required: '${fieldName} is required!',
   string: {
-    range: '${name} must be between ${min} and ${max} character.',
+    range: '${fieldName} must be between ${min} and ${max} character.',
   },
 };