address nits

elastic · Nov 17, 2020 · 8e1ce3d · 8e1ce3d
1 parent 02ab502
commit 8e1ce3d
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/tag_management_page.tsx b/x-pack/plugins/saved_objects_tagging/public/management/tag_management_page.tsx
@@ -163,8 +163,6 @@ export const TagManagementPage: FC<TagManagementPageParams> = ({
       if (confirmed) {
         await tagClient.delete(tag.id);
 
-        fetchTags();
-
         notifications.toasts.addSuccess({
           title: i18n.translate('xpack.savedObjectsTagging.notifications.deleteTagSuccessTitle', {
             defaultMessage: 'Deleted "{name}" tag',
@@ -173,6 +171,8 @@ export const TagManagementPage: FC<TagManagementPageParams> = ({
             },
           }),
         });
+
+        await fetchTags();
       }
     },
     [overlays, notifications, fetchTags, tagClient]
@@ -182,17 +182,18 @@ export const TagManagementPage: FC<TagManagementPageParams> = ({
     async (action: TagBulkAction) => {
       try {
         await action.execute(selectedTags.map(({ id }) => id));
-        if (action.refreshAfterExecute) {
-          await fetchTags();
-        }
       } catch (e) {
         notifications.toasts.addError(e, {
           title: i18n.translate('xpack.savedObjectsTagging.notifications.bulkActionError', {
             defaultMessage: 'An error occurred',
           }),
         });
+      } finally {
+        setLoading(false);
+      }
+      if (action.refreshAfterExecute) {
+        await fetchTags();
       }
-      setLoading(false);
     },
     [selectedTags, fetchTags, notifications]
   );