Refactor enum description field layout in AddCustomProperty and EditC…

…ustomPropertyModal
open-metadata · Sep 19, 2024 · faedc98 · faedc98
1 parent 4774a3c
commit faedc98
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/...sources/ui/src/components/Settings/CustomProperty/AddCustomProperty/AddCustomProperty.tsx b/...sources/ui/src/components/Settings/CustomProperty/AddCustomProperty/AddCustomProperty.tsx
@@ -441,7 +441,7 @@ const AddCustomProperty = () => {
 
                   {fields.map((field, index) => (
                     <Row gutter={[8, 0]} key={field.key}>
-                      <Col span={22}>
+                      <Col span={23}>
                         <Row gutter={[8, 0]}>
                           <Col span={24}>
                             <Form.Item
@@ -469,6 +469,12 @@ const AddCustomProperty = () => {
                               rules={[
                                 {
                                   required: true,
+                                  message: `${t(
+                                    'message.field-text-is-required',
+                                    {
+                                      fieldText: t('label.description'),
+                                    }
+                                  )}`,
                                 },
                               ]}
                               trigger="onTextChange"
@@ -478,8 +484,9 @@ const AddCustomProperty = () => {
                           </Col>
                         </Row>
                       </Col>
-                      <Col span={2}>
+                      <Col span={1}>
                         <Button
+                          data-testid={`remove-enum-description-config-${index}`}
                           icon={<DeleteIcon width={16} />}
                           size="small"
                           type="text"

diff --git a/...rc/components/Settings/CustomProperty/EditCustomPropertyModal/EditCustomPropertyModal.tsx b/...rc/components/Settings/CustomProperty/EditCustomPropertyModal/EditCustomPropertyModal.tsx
@@ -323,6 +323,12 @@ const EditCustomPropertyModal: FC<EditCustomPropertyModalProps> = ({
                                       rules={[
                                         {
                                           required: true,
+                                          message: `${t(
+                                            'message.field-text-is-required',
+                                            {
+                                              fieldText: t('label.description'),
+                                            }
+                                          )}`,
                                         },
                                       ]}
                                       trigger="onTextChange"
@@ -335,6 +341,7 @@ const EditCustomPropertyModal: FC<EditCustomPropertyModalProps> = ({
                               {!isExisting && (
                                 <Col span={1}>
                                   <Button
+                                    data-testid={`remove-enum-description-config-${index}`}
                                     icon={<DeleteIcon width={16} />}
                                     size="small"
                                     type="text"