fix(ui): refactor add and remove Related Terms tab message to showcas…

…e actual request result
datahub-project · Nov 29, 2023 · d33ab31 · d33ab31
1 parent 4dd6738
commit d33ab31
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/AddRelatedTermsModal.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/AddRelatedTermsModal.tsx
@@ -34,6 +34,7 @@ function AddRelatedTermsModal(props: Props) {
     const [AddRelatedTerms] = useAddRelatedTermsMutation();
 
     function addTerms() {
+        message.loading({ content: 'Adding...' });
         AddRelatedTerms({
             variables: {
                 input: {
@@ -43,19 +44,19 @@ function AddRelatedTermsModal(props: Props) {
                 },
             },
         })
-            .catch((e) => {
-                message.destroy();
-                message.error({ content: `Failed to move: \n ${e.message || ''}`, duration: 3 });
-            })
-            .finally(() => {
-                message.loading({ content: 'Adding...', duration: 2 });
+            .then(() => {
                 setTimeout(() => {
+                    refetch();
+                    message.destroy();
                     message.success({
                         content: 'Added Related Terms!',
                         duration: 2,
                     });
-                    refetch();
                 }, 2000);
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error({ content: `Failed to move: \n ${e.message || ''}`, duration: 3 });
             });
         onClose();
     }

diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/useRemoveRelatedTerms.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/useRemoveRelatedTerms.tsx
@@ -12,6 +12,9 @@ function useRemoveRelatedTerms(termUrn: string, relationshipType: TermRelationsh
     const [removeRelatedTerms] = useRemoveRelatedTermsMutation();
 
     function handleRemoveRelatedTerms() {
+        message.loading({
+            content: 'Removing...',
+        });
         removeRelatedTerms({
             variables: {
                 input: {
@@ -21,22 +24,19 @@ function useRemoveRelatedTerms(termUrn: string, relationshipType: TermRelationsh
                 },
             },
         })
-            .catch((e) => {
-                message.destroy();
-                message.error({ content: `Failed to remove: \n ${e.message || ''}`, duration: 3 });
-            })
-            .finally(() => {
-                message.loading({
-                    content: 'Removing...',
-                    duration: 2,
-                });
+            .then(() => {
                 setTimeout(() => {
                     refetch();
+                    message.destroy();
                     message.success({
                         content: `Removed Glossary Term!`,
                         duration: 2,
                     });
                 }, 2000);
+            })
+            .catch((e) => {
+                message.destroy();
+                message.error({ content: `Failed to remove: \n ${e.message || ''}`, duration: 3 });
             });
     }