handle fetch error

bcgov · Aug 10, 2023 · cc9037b · cc9037b
1 parent 61e4e15
commit cc9037b
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 12 deletions.
diff --git a/client/src/components/shared/combo-table.vue b/client/src/components/shared/combo-table.vue
@@ -123,10 +123,10 @@
                 color="red darken-2"
                 variant="text"
                 @click="deleteItemConfirm"
-                >OK</v-btn
+                >Yes</v-btn
               >
               <v-btn color="primary" variant="text" @click="deleteItemCancel"
-                >Cancel</v-btn
+                >No</v-btn
               >
               <v-spacer></v-spacer>
             </v-card-actions>

diff --git a/client/src/components/shared/editor.vue b/client/src/components/shared/editor.vue
@@ -16,7 +16,7 @@
 <template>
   <div>
     <div id="nb-item-editor"></div>
-    <v-alert color="red" dense type="error" v-if="errorMessage">
+    <v-alert closable color="red" dense type="error" v-if="errorMessage">
       {{ errorMessage }}
     </v-alert>
     <v-btn color="primary" @click="setCurrentlyEditedItem">save</v-btn>

diff --git a/client/src/store/index.js b/client/src/store/index.js
@@ -51,7 +51,7 @@ export const useDefaultStore = defineStore('default', {
   }),
   actions: {
     setLocalItems(payload) {
-      this[payload.model].items = payload.items;
+      this[payload.model].items = payload?.items;
     },
     setTotalItemCount(payload) {
       this[payload.model].totalCount = payload.cnt;
@@ -111,7 +111,10 @@ export const useDefaultStore = defineStore('default', {
       };
       const url = apiUrlPrefix + '/' + payload.model + (id ? '/' + id : '');
       await setAuthorizationHeader(req, this);
-      await fetch(url, req);
+      const res = await fetch(url, req);
+      if (!res?.ok) {
+        throw `${res.status}: ${res.statusText}`;
+      }
     },
 
     async deleteItem(payload) {
@@ -120,7 +123,10 @@ export const useDefaultStore = defineStore('default', {
         method: 'DELETE',
       };
       await setAuthorizationHeader(req, this);
-      await fetch(url, req);
+      const res = await fetch(url, req);
+      if (!res?.ok) {
+        throw `${res.status}: ${res.statusText}`;
+      }
     },
 
     async fetchItems(payload) {
@@ -142,7 +148,11 @@ export const useDefaultStore = defineStore('default', {
       await setAuthorizationHeader(req, this);
       let items;
       try {
-        items = await (await fetch(url, req)).json();
+        const res = await fetch(url, req);
+        if (!res?.ok) {
+          throw `${res.status}: ${res.statusText}`;
+        }
+        items = await res.json();
       } catch (ex) {
         this.setLocalItems({model: payload.model, items: []});
         this.setTotalItemCount({model: payload.model, cnt: undefined});
@@ -155,7 +165,11 @@ export const useDefaultStore = defineStore('default', {
       }
       req = {};
       await setAuthorizationHeader(req, this);
-      let response = await (await fetch(url, req)).json();
+      const res = await fetch(url, req);
+      if (!res?.ok) {
+        throw `${res.status}: ${res.statusText}`;
+      }
+      let response = await res.json();
       this.setTotalItemCount({
         model: payload.model,
         cnt: response.count,
@@ -165,14 +179,21 @@ export const useDefaultStore = defineStore('default', {
       let url = apiUrlPrefix + '/subscriptions/services';
       let req = {};
       await setAuthorizationHeader(req, this);
-      let res = await fetch(url, req);
+      const res = await fetch(url, req);
+      if (!res?.ok) {
+        throw `${res.status}: ${res.statusText}`;
+      }
       return res.json();
     },
     async getAuthenticationStrategy() {
       let url = apiUrlPrefix + '/administrators/whoami';
       let req = {};
       await setAuthorizationHeader(req, this);
-      let res = await (await fetch(url, req)).json();
+      let res = await fetch(url, req);
+      if (!res?.ok) {
+        throw `${res.status}: ${res.statusText}`;
+      }
+      res = await res.json();
       this.setAuthnStrategy(res.authnStrategy);
     },
     async login(payload) {
@@ -188,7 +209,11 @@ export const useDefaultStore = defineStore('default', {
         },
       };
       await setAuthorizationHeader(req, this);
-      let res = await (await fetch(url, req)).json();
+      let res = await fetch(url, req);
+      if (!res?.ok) {
+        throw `${res.status}: ${res.statusText}`;
+      }
+      res = await res.json();
       this.setAccessToken(res.token);
     },
   },

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "notify-bc",
-  "version": "4.1.8",
+  "version": "4.1.9",
   "dbSchemaVersion": "0.8.0",
   "description": "A versatile notification API server",
   "keywords": [