From ced5909bc5e60bf1415ac6d62bfc92ee13ea8955 Mon Sep 17 00:00:00 2001
From: Ashish Gupta <ashish@getcollate.io>
Date: Tue, 18 Oct 2022 18:03:07 +0530
Subject: [PATCH] fix the missing close icon from modal (#8112)

---
 .../src/components/AddDataQualityTest/EditTestCaseModal.tsx   | 1 +
 .../ui/src/components/BotDetails/AuthMechanismForm.tsx        | 1 +
 .../Modals/AnnouncementModal/AddAnnouncementModal.tsx         | 1 +
 .../Modals/AnnouncementModal/EditAnnouncementModal.tsx        | 1 +
 .../TableProfiler/Component/ProfilerSettingsModal.tsx         | 1 +
 .../resources/ui/src/components/TeamDetails/TeamDetailsV1.tsx | 1 +
 .../main/resources/ui/src/components/UserList/UserListV1.tsx  | 1 +
 .../resources/ui/src/components/Users/ChangePasswordForm.tsx  | 1 +
 .../src/components/common/DeleteWidget/DeleteWidgetModal.tsx  | 1 +
 .../elastic-re-index-modal.component.tsx                      | 1 +
 .../PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.tsx    | 1 +
 .../src/pages/RolesPage/RolesDetailPage/RolesDetailPage.tsx   | 1 +
 .../resources/ui/src/pages/TasksPage/shared/CommentModal.tsx  | 1 +
 .../src/main/resources/ui/src/pages/teams/AddTeamForm.tsx     | 1 +
 openmetadata-ui/src/main/resources/ui/src/styles/modal.less   | 4 ----
 15 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/EditTestCaseModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/EditTestCaseModal.tsx
index 5cafd999722..4748c9bc848 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/EditTestCaseModal.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/EditTestCaseModal.tsx
@@ -203,6 +203,7 @@ const EditTestCaseModal: React.FC<EditTestCaseModalProps> = ({
         form.resetFields();
         onCancel();
       }}
+      closable={false}
       okText="Submit"
       title={`Edit ${testCase?.name}`}
       visible={visible}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/AuthMechanismForm.tsx b/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/AuthMechanismForm.tsx
index e331092913e..62f919c8c1a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/AuthMechanismForm.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/AuthMechanismForm.tsx
@@ -639,6 +639,7 @@ const AuthMechanismForm: FC<Props> = ({
         <Modal
           centered
           destroyOnClose
+          closable={false}
           okText="Confirm"
           title="Are you sure?"
           visible={isConfirmationModalOpen}
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 ab52bc0c7ba..022a3250434 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
@@ -93,6 +93,7 @@ const AddAnnouncementModal: FC<Props> = ({
     <Modal
       centered
       className="announcement-modal"
+      closable={false}
       confirmLoading={isLoading}
       data-testid="add-announcement"
       okButtonProps={{
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 b24bc5d4179..a11160739ab 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
@@ -75,6 +75,7 @@ const EditAnnouncementModal: FC<Props> = ({
     <Modal
       centered
       className="announcement-modal"
+      closable={false}
       data-testid="edit-announcement"
       okButtonProps={{
         form: 'announcement-form',
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ProfilerSettingsModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ProfilerSettingsModal.tsx
index 329f0943227..aedfb1dca42 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ProfilerSettingsModal.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ProfilerSettingsModal.tsx
@@ -183,6 +183,7 @@ const ProfilerSettingsModal: React.FC<ProfilerSettingsModalProps> = ({
       cancelButtonProps={{
         type: 'link',
       }}
+      closable={false}
       data-testid="profiler-settings-modal"
       maskClosable={false}
       okText="Save"
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamDetailsV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamDetailsV1.tsx
index 3950bc94b4b..1239d5a2625 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamDetailsV1.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamDetailsV1.tsx
@@ -1167,6 +1167,7 @@ const TeamDetailsV1 = ({
       {selectedEntity && (
         <Modal
           centered
+          closable={false}
           okText="Confirm"
           title={`Remove ${getEntityName(
             selectedEntity.record
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/UserList/UserListV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/UserList/UserListV1.tsx
index 385576f9b8b..a8d203ac504 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/UserList/UserListV1.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/UserList/UserListV1.tsx
@@ -289,6 +289,7 @@ const UserListV1: FC<UserListV1Props> = ({
           type: 'link',
         }}
         className="reactive-modal"
+        closable={false}
         okText="Restore"
         title="restore User"
         visible={showReactiveModal}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/ChangePasswordForm.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Users/ChangePasswordForm.tsx
index a16553b70a1..d3d294f7c9a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Users/ChangePasswordForm.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Users/ChangePasswordForm.tsx
@@ -23,6 +23,7 @@ const ChangePasswordForm: React.FC<ChangePasswordForm> = ({
   return (
     <Modal
       centered
+      closable={false}
       okButtonProps={{
         form: 'change-password-form',
         type: 'primary',
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/DeleteWidget/DeleteWidgetModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/DeleteWidget/DeleteWidgetModal.tsx
index e1f6fc8032b..3ef3b428903 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/DeleteWidget/DeleteWidgetModal.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/DeleteWidget/DeleteWidgetModal.tsx
@@ -218,6 +218,7 @@ const DeleteWidgetModal = ({
 
   return (
     <Modal
+      closable={false}
       data-testid="delete-modal"
       footer={Footer()}
       okText="Delete"
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ElasticSearchIndexPage/elastic-re-index-modal.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ElasticSearchIndexPage/elastic-re-index-modal.component.tsx
index 108c3840b58..3748290060f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/ElasticSearchIndexPage/elastic-re-index-modal.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/ElasticSearchIndexPage/elastic-re-index-modal.component.tsx
@@ -40,6 +40,7 @@ const ReIndexAllModal = ({
   return (
     <Modal
       centered
+      closable={false}
       confirmLoading={confirmLoading}
       okButtonProps={{
         form: 're-index-form',
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.tsx
index 94256ea6af2..1e28951dd42 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.tsx
@@ -616,6 +616,7 @@ const PoliciesDetailPage = () => {
       {selectedEntity && (
         <Modal
           centered
+          closable={false}
           okText="Confirm"
           title={`Remove ${getEntityName(
             selectedEntity.record
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPage.tsx
index e7994eb08d3..66d103e605a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPage.tsx
@@ -440,6 +440,7 @@ const RolesDetailPage = () => {
       {selectedEntity && (
         <Modal
           centered
+          closable={false}
           okText="Confirm"
           title={`Remove ${getEntityName(
             selectedEntity.record
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/shared/CommentModal.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/shared/CommentModal.tsx
index 918c85cc54d..0965ae22d52 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/shared/CommentModal.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/shared/CommentModal.tsx
@@ -41,6 +41,7 @@ const CommentModal: FC<CommentModalProps> = ({
         type: 'link',
         className: 'ant-btn-link-custom',
       }}
+      closable={false}
       data-testid="comment-modal"
       okButtonProps={{
         disabled: !comment,
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/teams/AddTeamForm.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/teams/AddTeamForm.tsx
index 02b435a3833..ca01e5ad1c1 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/teams/AddTeamForm.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/teams/AddTeamForm.tsx
@@ -76,6 +76,7 @@ const AddTeamForm: React.FC<AddTeamFormType> = ({
   return (
     <Modal
       centered
+      closable={false}
       okButtonProps={{
         form: 'add-team-form',
         type: 'primary',
diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/modal.less b/openmetadata-ui/src/main/resources/ui/src/styles/modal.less
index b353ea76819..bd37c57ceea 100644
--- a/openmetadata-ui/src/main/resources/ui/src/styles/modal.less
+++ b/openmetadata-ui/src/main/resources/ui/src/styles/modal.less
@@ -14,10 +14,6 @@
   border-top: 1px solid #dde3ea;
 }
 
-.ant-modal-close {
-  display: none;
-}
-
 .ant-modal-footer .ant-btn-default {
   border: none;
   color: #7147e8;