[ONL-6386] Removing finally block in EcWithAbortableFetch (#1079)

* [ONL-6386] Removing finally block in EcWithAbortableFetch * 1.9.7 Co-authored-by: Jose Calvente <[email protected]>
Ebury · Mar 3, 2022 · acd732f · acd732f · vercel · Mar 3, 2022
1 parent 5273603
commit acd732f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ebury/chameleon-components",
-  "version": "1.9.6",
+  "version": "1.9.7",
   "main": "src/main.js",
   "sideEffects": false,
   "author": "Ebury Team (http://labs.ebury.rocks/)",

diff --git a/src/hocs/ec-with-abortable-fetch/__snapshots__/ec-with-abortable-fetch.spec.js.snap b/src/hocs/ec-with-abortable-fetch/__snapshots__/ec-with-abortable-fetch.spec.js.snap
@@ -254,7 +254,7 @@ exports[`EcWithAbortableFetch should stop fetching and keep the state intact if
 Object {
   "data": null,
   "error": null,
-  "loading": false,
+  "loading": true,
 }
 `;
 

diff --git a/src/hocs/ec-with-abortable-fetch/ec-with-abortable-fetch.js b/src/hocs/ec-with-abortable-fetch/ec-with-abortable-fetch.js
@@ -56,14 +56,15 @@ const withAbortableFetch = (Component, {
       this.fetchAbortController = new global.AbortController();
       try {
         this.fetchedData = await this.dataSource.fetch(fetchArgs, this.fetchAbortController.signal);
+        this.isFetching = false;
+        this.fetchAbortController = null;
       } catch (err) {
         if (err && err.name !== 'AbortError') {
           this.$emit('error', err);
           this.fetchError = err;
+          this.isFetching = false;
+          this.fetchAbortController = null;
         }
-      } finally {
-        this.fetchAbortController = null;
-        this.isFetching = false;
       }
     },
   },