Added method for error handling which could be reused in other applic…

…ations
MerginMaps · Dec 18, 2024 · 7d6b336 · 7d6b336
1 parent df13893
commit 7d6b336
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/web-app/packages/lib/src/modules/project/projectApi.ts b/web-app/packages/lib/src/modules/project/projectApi.ts
@@ -184,7 +184,8 @@ export const ProjectApi = {
       `/v2/projects/${id}/collaborators/${userId}`,
       data,
       {
-        ...(withRetry ? getDefaultRetryOptions() : {})
+        ...(withRetry ? getDefaultRetryOptions() : {}),
+        validateStatus
       }
     )
   },
@@ -207,7 +208,8 @@ export const ProjectApi = {
     return ProjectModule.httpService.delete(
       `/v2/projects/${id}/collaborators/${userId}`,
       {
-        ...(withRetry ? getDefaultRetryOptions() : {})
+        ...(withRetry ? getDefaultRetryOptions() : {}),
+        validateStatus
       }
     )
   },

diff --git a/web-app/packages/lib/src/modules/project/store.ts b/web-app/packages/lib/src/modules/project/store.ts
@@ -41,7 +41,6 @@ import {
   SaveProjectSettings,
   ErrorCodes,
   ProjectAccessDetail,
-  UpdateProjectAccessParams,
   ProjectVersionFileChange,
   ProjectVersionListItem,
   UpdateProjectPayload,
@@ -757,8 +756,8 @@ export const useProjectStore = defineStore('projectModule', {
     async removeProjectAccess(
       item: Pick<ProjectAccessDetail, 'id' | 'username'>
     ) {
-      const notificationStore = useNotificationStore()
       this.accessLoading = true
+      const notificationStore = useNotificationStore()
       try {
         const response = await ProjectApi.removeProjectAccess(
           this.project.id,
@@ -786,7 +785,6 @@ export const useProjectStore = defineStore('projectModule', {
       userId: number
       data: UpdateProjectPayload
     }) {
-      const notificationStore = useNotificationStore()
       this.accessLoading = true
       try {
         const response = await ProjectApi.updateProjectAccess(
@@ -801,15 +799,20 @@ export const useProjectStore = defineStore('projectModule', {
           return access
         })
         this.project.access = response.data
-      } catch {
-        notificationStore.error({
-          text: `Failed to update project access`
-        })
+      } catch (err) {
+        this.handleProjectAccessError(err, 'Failed to update project access')
       } finally {
         this.accessLoading = false
       }
     },
 
+    handleProjectAccessError(err: unknown, defaultMessage: string) {
+      const notificationStore = useNotificationStore()
+      notificationStore.error({
+        text: getErrorMessage(err, defaultMessage)
+      })
+    },
+
     async updatePublicFlag(payload: {
       projectId: string
       data: UpdatePublicFlagParams