fix error handling for organization export, fixes ST-426

solidtime-io · Sep 12, 2024 · ac85e77 · ac85e77
1 parent 9189910
commit ac85e77
Showing 1 changed file with 20 additions and 17 deletions.
diff --git a/resources/js/Pages/Teams/Partials/ExportData.vue b/resources/js/Pages/Teams/Partials/ExportData.vue
@@ -25,24 +25,27 @@ async function exportData() {
     loading.value = true;
     const organizationId = getCurrentOrganizationId();
     if (organizationId) {
-        const response = await handleApiRequestNotifications(
-            () =>
-                api.exportOrganization(
-                    {},
-                    {
-                        params: {
-                            organization: organizationId,
-                        },
-                    }
-                ),
-            'Organization data exported successfully.',
-            'Exporting organization data failed.'
-        );
-        if (response) {
-            showResultModal.value = true;
+        try {
+            const response = await handleApiRequestNotifications(
+                () =>
+                    api.exportOrganization(
+                        {},
+                        {
+                            params: {
+                                organization: organizationId,
+                            },
+                        }
+                    ),
+                'Organization data exported successfully.',
+                'Exporting organization data failed.'
+            );
+            if (response) {
+                showResultModal.value = true;
+                exportResponse.value = response;
+                window.open(response.download_url, '_self')?.focus();
+            }
+        } finally {
             loading.value = false;
-            exportResponse.value = response;
-            window.open(response.download_url, '_self')?.focus();
         }
     }
 }