From c50390da80e38a2ed49fae2243c47334b069e6a7 Mon Sep 17 00:00:00 2001
From: Ashish Gupta <ashish@getcollate.io>
Date: Mon, 27 Mar 2023 12:57:59 +0530
Subject: [PATCH] Make the modal not closable on outside click (#10748)

Co-authored-by: Chirag Madlani <12962843+chirag-madlani@users.noreply.github.com>
---
 .../ui/src/components/AddDataQualityTest/EditTestCaseModal.tsx  | 1 +
 .../ui/src/components/BotDetails/AuthMechanismForm.tsx          | 1 +
 .../ui/src/components/EntityLineage/AddPipeLineModal.tsx        | 1 +
 .../ui/src/components/EntityLineage/EntityLineage.component.tsx | 1 +
 .../ui/src/components/EntityLineage/LineageConfigModal.tsx      | 1 +
 .../ui/src/components/Explore/AdvanceSearchModal.component.tsx  | 1 +
 .../components/GlobalSearchProvider/GlobalSearchProvider.tsx    | 2 +-
 .../Glossary/ExportGlossaryModal/ExportGlossaryModal.tsx        | 1 +
 .../Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx      | 1 +
 .../Modals/AnnouncementModal/AddAnnouncementModal.tsx           | 1 +
 .../Modals/AnnouncementModal/EditAnnouncementModal.tsx          | 1 +
 .../components/Modals/ConfirmationModal/ConfirmationModal.tsx   | 1 +
 .../DeployIngestionLoaderModal/DeployIngestionLoaderModal.tsx   | 1 +
 .../components/Modals/EntityDeleteModal/EntityDeleteModal.tsx   | 1 +
 .../main/resources/ui/src/components/Modals/FormModal/index.tsx | 1 +
 .../KillIngestionPipelineModal/KillIngestionPipelineModal.tsx   | 1 +
 .../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor.tsx  | 1 +
 .../components/Modals/RelatedTermsModal/RelatedTermsModal.tsx   | 1 +
 .../components/Modals/ReviewerModal/ReviewerModal.component.tsx | 1 +
 .../ui/src/components/Modals/SchemaModal/SchemaModal.tsx        | 2 +-
 .../ui/src/components/Modals/TourEndModal/TourEndModal.tsx      | 1 +
 .../resources/ui/src/components/Modals/WhatsNewModal/index.tsx  | 1 +
 .../resources/ui/src/components/TeamDetails/TeamDetailsV1.tsx   | 1 +
 .../resources/ui/src/components/TeamDetails/TeamHierarchy.tsx   | 1 +
 .../main/resources/ui/src/components/UserList/UserListV1.tsx    | 1 +
 .../resources/ui/src/components/Users/ChangePasswordForm.tsx    | 1 +
 .../ui/src/components/common/DeleteWidget/DeleteWidgetModal.tsx | 1 +
 .../ui/src/components/common/entityPageInfo/FollowersModal.tsx  | 1 +
 .../common/entityPageInfo/ManageButton/ManageButton.tsx         | 1 +
 .../ElasticSearchReIndexModal.component.tsx                     | 1 +
 .../PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.tsx      | 1 +
 .../src/pages/RolesPage/AddAttributeModal/AddAttributeModal.tsx | 1 +
 .../ui/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 +
 .../src/main/resources/ui/src/pages/teams/AddUsersModalV1.tsx   | 1 +
 36 files changed, 36 insertions(+), 2 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 d1560bbcfcb..6b54af01107 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
@@ -227,6 +227,7 @@ const EditTestCaseModal: React.FC<EditTestCaseModalProps> = ({
       }}
       closable={false}
       confirmLoading={isLoadingOnSave}
+      maskClosable={false}
       okText={t('label.submit')}
       open={visible}
       title={`${t('label.edit')} ${testCase?.name}`}
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 8009ef7fd26..6af568cf467 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
@@ -680,6 +680,7 @@ const AuthMechanismForm: FC<Props> = ({
           destroyOnClose
           closable={false}
           confirmLoading={isLoading}
+          maskClosable={false}
           okText={t('label.confirm')}
           title={t('message.are-you-sure')}
           visible={isConfirmationModalOpen}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/AddPipeLineModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/AddPipeLineModal.tsx
index 681be2c49db..30bb19c04de 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/AddPipeLineModal.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/AddPipeLineModal.tsx
@@ -66,6 +66,7 @@ const AddPipeLineModal = ({
           {t('label.save')}
         </Button>,
       ]}
+      maskClosable={false}
       title={isUndefined(selectedPipelineId) ? 'Add Pipeline' : 'Edit Pipeline'}
       visible={showAddPipelineModal}
       onCancel={onModalCancel}>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/EntityLineage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/EntityLineage.component.tsx
index 9931e5691ce..5b93eedbd15 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/EntityLineage.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/EntityLineage.component.tsx
@@ -1692,6 +1692,7 @@ const EntityLineageComponent: FunctionComponent<EntityLineageProp> = ({
       <EntityLineageSidebar newAddedNode={newAddedNode} show={isEditMode} />
       {showDeleteModal && (
         <Modal
+          maskClosable={false}
           okText={getLoadingStatusValue(
             t('label.confirm'),
             deletionState.loading,
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/LineageConfigModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/LineageConfigModal.tsx
index ac0cb10b563..734d710ae82 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/LineageConfigModal.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/LineageConfigModal.tsx
@@ -53,6 +53,7 @@ const LineageConfigModal: React.FC<LineageConfigModalProps> = ({
 
   return (
     <Modal
+      maskClosable={false}
       title={t('label.lineage-config')}
       visible={visible}
       onCancel={onCancel}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/AdvanceSearchModal.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/AdvanceSearchModal.component.tsx
index a8aac87e152..3eb3d975fe1 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/AdvanceSearchModal.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/AdvanceSearchModal.component.tsx
@@ -49,6 +49,7 @@ export const AdvancedSearchModal: FunctionComponent<Props> = ({
           </div>
         </Space>
       }
+      maskClosable={false}
       okText={t('label.submit')}
       open={visible}
       title={t('label.advanced-entity', {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchProvider.tsx b/openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchProvider.tsx
index b8cf442fb0d..59fc39e2bdd 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchProvider.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchProvider.tsx
@@ -92,13 +92,13 @@ const GlobalSearchProvider: FC<Props> = ({ children }: Props) => {
       <Modal
         closable
         destroyOnClose
-        maskClosable
         bodyStyle={{
           padding: '20px',
           height: searchValue ? '314px' : '85px',
         }}
         closeIcon={<></>}
         footer={null}
+        maskClosable={false}
         open={visible}
         transitionName=""
         width={650}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/ExportGlossaryModal/ExportGlossaryModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/ExportGlossaryModal/ExportGlossaryModal.tsx
index e1ff1c6d4c7..2dcc2938aed 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/ExportGlossaryModal/ExportGlossaryModal.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/ExportGlossaryModal/ExportGlossaryModal.tsx
@@ -76,6 +76,7 @@ const ExportGlossaryModal: FC<Props> = ({
       cancelText={t('label.cancel')}
       closable={false}
       data-testid="export-glossary-modal"
+      maskClosable={false}
       okText={t('label.export')}
       open={isModalOpen}
       title={t('label.export-glossary-terms')}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx
index 5bce6f7f7d0..611bdc17fa5 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx
@@ -397,6 +397,7 @@ const GlossaryTermTab = ({
           closable={false}
           confirmLoading={isTableLoading}
           data-testid="confirmation-modal"
+          maskClosable={false}
           okText={t('label.confirm')}
           open={isModalOpen}
           title={t('label.move-the-entity', {
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 0935e910cc9..d9022e7ed49 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
@@ -96,6 +96,7 @@ const AddAnnouncementModal: FC<Props> = ({
       closable={false}
       confirmLoading={isLoading}
       data-testid="add-announcement"
+      maskClosable={false}
       okButtonProps={{
         id: 'announcement-submit',
         form: 'announcement-form',
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 61857198c9b..9313e54fe11 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
@@ -76,6 +76,7 @@ const EditAnnouncementModal: FC<Props> = ({
       className="announcement-modal"
       closable={false}
       data-testid="edit-announcement"
+      maskClosable={false}
       okButtonProps={{
         form: 'announcement-form',
         type: 'primary',
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/ConfirmationModal/ConfirmationModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/ConfirmationModal/ConfirmationModal.tsx
index 07bbfc2745c..5952f132fe8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/ConfirmationModal/ConfirmationModal.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/ConfirmationModal/ConfirmationModal.tsx
@@ -70,6 +70,7 @@ const ConfirmationModal = ({
           </Button>
         </div>
       }
+      maskClosable={false}
       open={visible}
       title={
         <Typography.Text
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/DeployIngestionLoaderModal/DeployIngestionLoaderModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/DeployIngestionLoaderModal/DeployIngestionLoaderModal.tsx
index 85452a44183..674fb4d9b47 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/DeployIngestionLoaderModal/DeployIngestionLoaderModal.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/DeployIngestionLoaderModal/DeployIngestionLoaderModal.tsx
@@ -40,6 +40,7 @@ const DeployIngestionLoaderModal = ({
       closable={false}
       data-testid="deploy-modal"
       footer={null}
+      maskClosable={false}
       open={visible}>
       <div className="p-y-lg d-flex flex-col" data-testid="body-text">
         <div className={classNames('ingestion-content relative', className)}>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/EntityDeleteModal/EntityDeleteModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/EntityDeleteModal/EntityDeleteModal.tsx
index 569bde9773a..698e6e1ce9c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/EntityDeleteModal/EntityDeleteModal.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/EntityDeleteModal/EntityDeleteModal.tsx
@@ -70,6 +70,7 @@ const EntityDeleteModal = ({
           </Button>
         </div>
       }
+      maskClosable={false}
       open={visible}
       title={
         <Typography.Text data-testid="modal-header">
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/FormModal/index.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/FormModal/index.tsx
index b923d087f9e..eec45abbaa1 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/FormModal/index.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/FormModal/index.tsx
@@ -65,6 +65,7 @@ const FormModal = ({
           </Button>
         </Space>
       }
+      maskClosable={false}
       open={visible}
       title={
         <Typography.Text strong data-testid="header">
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/KillIngestionPipelineModal/KillIngestionPipelineModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/KillIngestionPipelineModal/KillIngestionPipelineModal.tsx
index 44cbf525f24..9dbd2bba3de 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/KillIngestionPipelineModal/KillIngestionPipelineModal.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/KillIngestionPipelineModal/KillIngestionPipelineModal.tsx
@@ -60,6 +60,7 @@ const KillIngestionModal: FC<KillIngestionModalProps> = ({
       closable={false}
       confirmLoading={isLoading}
       data-testid="kill-modal"
+      maskClosable={false}
       okText="Confirm"
       title={`${t('label.kill')} ${pipelinName} ?`}
       visible={isModalOpen}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor.tsx
index 869ee8dee78..bf018aa2adc 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor.tsx
@@ -75,6 +75,7 @@ export const ModalWithMarkdownEditor: FunctionComponent<ModalWithMarkdownEditorP
             {isLoading ? <Loader size="small" type="white" /> : t('label.save')}
           </Button>,
         ]}
+        maskClosable={false}
         open={visible}
         title={<Typography.Text data-testid="header">{header}</Typography.Text>}
         width="90%"
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/RelatedTermsModal/RelatedTermsModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/RelatedTermsModal/RelatedTermsModal.tsx
index 84497c539fb..34eebd4716c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/RelatedTermsModal/RelatedTermsModal.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/RelatedTermsModal/RelatedTermsModal.tsx
@@ -123,6 +123,7 @@ const RelatedTermsModal = ({
           </Button>
         </div>
       }
+      maskClosable={false}
       open={visible}
       title={
         <Typography.Text strong data-testid="header">
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/ReviewerModal/ReviewerModal.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/ReviewerModal/ReviewerModal.component.tsx
index 2b1f7654d07..573eab6abca 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/ReviewerModal/ReviewerModal.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/ReviewerModal/ReviewerModal.component.tsx
@@ -148,6 +148,7 @@ const ReviewerModal = ({
           </Button>
         </div>
       }
+      maskClosable={false}
       open={visible}
       title={
         <Typography.Text strong data-testid="header">
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.tsx
index 78d519b52d7..1ace22c06bd 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.tsx
@@ -31,7 +31,6 @@ const SchemaModal: FC<SchemaModalProp> = ({
     <Modal
       centered
       destroyOnClose
-      maskClosable
       className={classNames('schema-modal', className)}
       closeIcon={
         <CloseIcon
@@ -41,6 +40,7 @@ const SchemaModal: FC<SchemaModalProp> = ({
       }
       data-testid="schema-modal"
       footer={null}
+      maskClosable={false}
       open={visible}
       title={
         <Typography.Text strong data-testid="schema-modal-header">
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/TourEndModal/TourEndModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/TourEndModal/TourEndModal.tsx
index 9d5e79f8f99..eb2395428a8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/TourEndModal/TourEndModal.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/TourEndModal/TourEndModal.tsx
@@ -31,6 +31,7 @@ const TourEndModal = ({ onSave, visible }: TourEndModalProps) => {
           {t('label.explore-now')}
         </Button>
       }
+      maskClosable={false}
       open={visible}>
       <Row className="text-center" gutter={[16, 16]}>
         <Col className="mt-4" span={24}>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/WhatsNewModal/index.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/WhatsNewModal/index.tsx
index ebb4f360b3a..c02b7c638b1 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/WhatsNewModal/index.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/WhatsNewModal/index.tsx
@@ -75,6 +75,7 @@ export const WhatsNewModal: FunctionComponent<WhatsNewModalProps> = ({
       }
       data-testid="whats-new-dialog"
       footer={null}
+      maskClosable={false}
       open={visible}
       title={
         <Typography.Text strong data-testid="whats-new-header">
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 177747756c1..5e718a5d473 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
@@ -1340,6 +1340,7 @@ const TeamDetailsV1 = ({
           centered
           closable={false}
           confirmLoading={isModalLoading}
+          maskClosable={false}
           okText={t('label.confirm')}
           open={!isUndefined(selectedEntity.record)}
           title={`${t('label.remove-entity', {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamHierarchy.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamHierarchy.tsx
index 27b6f43eaaf..53be487b97d 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamHierarchy.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamHierarchy.tsx
@@ -192,6 +192,7 @@ const TeamHierarchy: FC<TeamHierarchyProps> = ({
         closable={false}
         confirmLoading={isTableLoading}
         data-testid="confirmation-modal"
+        maskClosable={false}
         okText={t('label.confirm')}
         open={isModalOpen}
         title={t('label.move-the-entity', { entity: t('label.team') })}
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 8fe921ddbc0..6f58f505323 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
@@ -309,6 +309,7 @@ const UserListV1: FC<UserListV1Props> = ({
         className="reactive-modal"
         closable={false}
         confirmLoading={isLoading}
+        maskClosable={false}
         okText={t('label.restore')}
         open={showReactiveModal}
         title={t('label.restore-entity', {
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 b00330141bd..daade7fb376 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
@@ -42,6 +42,7 @@ const ChangePasswordForm: React.FC<ChangePasswordForm> = ({
       centered
       closable={false}
       confirmLoading={isLoading}
+      maskClosable={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 0a92b235988..90a9e337545 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
@@ -237,6 +237,7 @@ const DeleteWidgetModal = ({
       confirmLoading={isLoading}
       data-testid="delete-modal"
       footer={Footer()}
+      maskClosable={false}
       okText={t('label.delete')}
       open={visible}
       title={`${t('label.delete')} ${entityName}`}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/FollowersModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/FollowersModal.tsx
index a8024959b75..f8b37222d6d 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/FollowersModal.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/FollowersModal.tsx
@@ -61,6 +61,7 @@ const FollowersModal = ({
       centered
       destroyOnClose
       data-testid="modal-container"
+      maskClosable={false}
       open={visible}
       title={
         <Typography.Text strong data-testid="header">
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/ManageButton/ManageButton.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/ManageButton/ManageButton.tsx
index aec9f1bf1ba..4982866dcfe 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/ManageButton/ManageButton.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/ManageButton/ManageButton.tsx
@@ -255,6 +255,7 @@ const ManageButton: FC<Props> = ({
         }}
         className="reactive-modal"
         closable={false}
+        maskClosable={false}
         okText={t('label.restore')}
         open={showReactiveModal}
         title={t('label.restore-entity', {
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ElasticSearchIndexPage/ElasticSearchReIndexModal.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ElasticSearchIndexPage/ElasticSearchReIndexModal.component.tsx
index f66d12fe1b5..cebf48b4e43 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/ElasticSearchIndexPage/ElasticSearchReIndexModal.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/ElasticSearchIndexPage/ElasticSearchReIndexModal.component.tsx
@@ -42,6 +42,7 @@ const ReIndexAllModal = ({
       centered
       closable={false}
       confirmLoading={confirmLoading}
+      maskClosable={false}
       okButtonProps={{
         form: 're-index-form',
         type: 'primary',
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 02e40879150..18b75567a84 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
@@ -543,6 +543,7 @@ const PoliciesDetailPage = () => {
           centered
           closable={false}
           confirmLoading={isloadingOnSave}
+          maskClosable={false}
           okText={t('label.confirm')}
           open={!isUndefined(selectedEntity.record)}
           title={`${t('label.remove-entity', {
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/AddAttributeModal/AddAttributeModal.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/AddAttributeModal/AddAttributeModal.tsx
index 10a39c0c281..2bb50af730d 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/AddAttributeModal/AddAttributeModal.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/AddAttributeModal/AddAttributeModal.tsx
@@ -130,6 +130,7 @@ const AddAttributeModal: FC<Props> = ({
       closable={false}
       confirmLoading={isModalLoading}
       data-testid="modal-container"
+      maskClosable={false}
       okText="Submit"
       open={isOpen}
       title={
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 c6b72f4a7d0..f37b08a7a7c 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
@@ -359,6 +359,7 @@ const RolesDetailPage = () => {
           centered
           closable={false}
           confirmLoading={isLoadingOnSave}
+          maskClosable={false}
           okText={t('label.confirm')}
           open={!isUndefined(selectedEntity.record)}
           title={`${t('label.remove-entity', {
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 32d10811c50..9041efc61de 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
@@ -49,6 +49,7 @@ const CommentModal: FC<CommentModalProps> = ({
       closable={false}
       confirmLoading={isLoading}
       data-testid="comment-modal"
+      maskClosable={false}
       okButtonProps={{
         disabled: !comment,
         className: 'ant-btn-primary-custom',
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 f3be556c760..20d18e82487 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
@@ -104,6 +104,7 @@ const AddTeamForm: React.FC<AddTeamFormType> = ({
       centered
       closable={false}
       confirmLoading={isLoading}
+      maskClosable={false}
       okButtonProps={{
         form: 'add-team-form',
         type: 'primary',
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/teams/AddUsersModalV1.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/teams/AddUsersModalV1.tsx
index ffdaab101b8..247a07aa714 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/teams/AddUsersModalV1.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/teams/AddUsersModalV1.tsx
@@ -179,6 +179,7 @@ const AddUsersModalV1 = ({
   return (
     <Modal
       data-testid="modal-container"
+      maskClosable={false}
       okButtonProps={{
         id: 'save-button',
       }}