From 5865466094727a72f70ba0ff7948de0fa8b77e9b Mon Sep 17 00:00:00 2001
From: Ashish Gupta <ashish@getcollate.io>
Date: Tue, 28 Feb 2023 15:31:23 +0530
Subject: [PATCH] Make generated fields required in filters and destination
 (#10356)

---
 .../ui/src/locale/languages/en-us.json        |  1 +
 .../src/pages/AddAlertPage/AddAlertPage.tsx   | 29 +++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json
index 37319c1b404..197f71349b6 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json
@@ -545,6 +545,7 @@
     "please-enter-value": "Please enter {{name}} value",
     "please-password-type-first": "Please type password first",
     "please-select": "Please Select",
+    "please-select-entity": "Please Select a {{entity}}",
     "plus-symbol": "+",
     "policy": "Policy",
     "policy-lowercase": "policy",
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AddAlertPage/AddAlertPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AddAlertPage/AddAlertPage.tsx
index 38d0b6da033..b29075f21c7 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/AddAlertPage/AddAlertPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/AddAlertPage/AddAlertPage.tsx
@@ -640,7 +640,20 @@ const AddAlertPage = () => {
                                 )}
                                 <div className="d-flex gap-1">
                                   <div className="flex-1">
-                                    <Form.Item key={key} name={[name, 'name']}>
+                                    <Form.Item
+                                      key={key}
+                                      name={[name, 'name']}
+                                      rules={[
+                                        {
+                                          required: true,
+                                          message: t(
+                                            'label.please-select-entity',
+                                            {
+                                              entity: t('label.condition'),
+                                            }
+                                          ),
+                                        },
+                                      ]}>
                                       <Select
                                         options={functions}
                                         placeholder={t('label.select-field', {
@@ -734,9 +747,19 @@ const AddAlertPage = () => {
                                 <div className="d-flex" style={{ gap: '10px' }}>
                                   <div className="flex-1">
                                     <Form.Item
-                                      required
                                       key={key}
-                                      name={[name, 'alertActionType']}>
+                                      name={[name, 'alertActionType']}
+                                      rules={[
+                                        {
+                                          required: true,
+                                          message: t(
+                                            'label.please-select-entity',
+                                            {
+                                              entity: t('label.source'),
+                                            }
+                                          ),
+                                        },
+                                      ]}>
                                       <Select
                                         data-testid="alert-action-type"
                                         disabled={