Merge pull request #463 from nyaruka/modax-errors

ericnewcomer · web-flow · commit 6f89aea3c663 · 2024-11-08T13:54:03.000-08:00
Reject responses that aren't 200s
diff --git a/src/dialog/Modax.ts b/src/dialog/Modax.ts
@@ -278,8 +278,8 @@ export class Modax extends RapidElement {
     // this.cancelToken = CancelToken.source();
     this.fetching = true;
     this.body = this.getLoading();
-    getUrl(this.endpoint, null, this.getHeaders()).then(
-      (response: WebResponse) => {
+    getUrl(this.endpoint, null, this.getHeaders())
+      .then((response: WebResponse) => {
         // if it's a full page, breakout of the modal
         if (response.body.indexOf('<!DOCTYPE HTML>') == 0) {
           this.open = false;
@@ -294,8 +294,12 @@ export class Modax extends RapidElement {
             });
           });
         }
-      }
-    );
+      })
+      .catch((error) => {
+        this.fetching = false;
+        this.open = false;
+        this.fireCustomEvent(CustomEventType.Error, { error });
+      });
   }
 
   public submit(extra = {}): void {
diff --git a/src/interfaces.ts b/src/interfaces.ts
@@ -279,5 +279,6 @@ export enum CustomEventType {
   DragStart = 'temba-drag-start',
   DragStop = 'temba-drag-stop',
   Resized = 'temba-resized',
-  DetailsChanged = 'temba-details-changed'
+  DetailsChanged = 'temba-details-changed',
+  Error = 'temba-error'
 }
diff --git a/src/list/ContentMenu.ts b/src/list/ContentMenu.ts
@@ -129,6 +129,11 @@ export class ContentMenu extends RapidElement {
           });
         })
         .catch((error: any) => {
+          this.fireCustomEvent(CustomEventType.Loaded, {
+            buttons: this.buttons,
+            items: this.items
+          });
+
           console.error(error);
         });
     }
diff --git a/src/list/TembaList.ts b/src/list/TembaList.ts
@@ -308,7 +308,7 @@ export class TembaList extends RapidElement {
         this.items = newItems;
       }
     } catch (error) {
-      // console.error(error);
+      this.paused = true;
     }
   }
 
@@ -332,7 +332,6 @@ export class TembaList extends RapidElement {
 
       try {
         const page = await fetchResultsPage(endpoint, controller);
-
         // sanitize our options if necessary
         if (this.sanitizeOption) {
           page.results.forEach(this.sanitizeOption);
@@ -350,10 +349,10 @@ export class TembaList extends RapidElement {
       } catch (error) {
         // aborted
         this.reset();
-        console.log(error);
+        this.paused = true;
+        this.loading = false;
         return;
       }
-
       this.nextPage = nextPage;
     }
     this.pages = pages;
diff --git a/src/list/TembaMenu.ts b/src/list/TembaMenu.ts
@@ -772,8 +772,8 @@ export class TembaMenu extends ResizeElement {
   private loadItems(item: MenuItem, event: MouseEvent = null) {
     if (item && item.endpoint) {
       item.loading = true;
-      this.httpComplete = fetchResults(item.endpoint).then(
-        (items: MenuItem[]) => {
+      this.httpComplete = fetchResults(item.endpoint)
+        .then((items: MenuItem[]) => {
           items.forEach((newItem) => {
             if (!newItem.items) {
               const prevItem = (item.items || []).find(
@@ -811,8 +811,10 @@ export class TembaMenu extends ResizeElement {
 
           this.requestUpdate('root');
           this.scrollSelectedIntoView();
-        }
-      );
+        })
+        .catch((error) => {
+          this.fireCustomEvent(CustomEventType.Error, { error });
+        });
     }
   }
 
diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -123,6 +123,11 @@ export const getUrl = (
 
     fetch(url, options)
       .then((response) => {
+        if (response.status < 200 || response.status >= 300) {
+          reject(response);
+          return;
+        }
+
         response.text().then((body: string) => {
           let json = {};
           try {
@@ -177,7 +182,9 @@ export const fetchResultsPage = (
           next: response.json.next
         });
       })
-      .catch((error) => reject(error));
+      .catch((error) => {
+        return reject(error);
+      });
   });
 };
 
@@ -326,7 +333,6 @@ export const postFormData = (
         }
       })
       .catch((err) => {
-        console.error(err);
         reject(err);
       });
   });

Original file line number	Diff line number	Diff line change
`@@ -279,5 +279,6 @@ export enum CustomEventType {`
`279`	`279`	`DragStart = 'temba-drag-start',`
`280`	`280`	`DragStop = 'temba-drag-stop',`
`281`	`281`	`Resized = 'temba-resized',`
`282`		`- DetailsChanged = 'temba-details-changed'`
	`282`	`+ DetailsChanged = 'temba-details-changed',`
	`283`	`+ Error = 'temba-error'`
`283`	`284`	`}`
Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ export class TembaList extends RapidElement {`
`308`	`308`	`this.items = newItems;`
`309`	`309`	`}`
`310`	`310`	`} catch (error) {`
`311`		`- // console.error(error);`
	`311`	`+ this.paused = true;`
`312`	`312`	`}`
`313`	`313`	`}`
`314`	`314`
`@@ -332,7 +332,6 @@ export class TembaList extends RapidElement {`
`332`	`332`
`333`	`333`	`try {`
`334`	`334`	`const page = await fetchResultsPage(endpoint, controller);`
`335`		`-`
`336`	`335`	`// sanitize our options if necessary`
`337`	`336`	`if (this.sanitizeOption) {`
`338`	`337`	`page.results.forEach(this.sanitizeOption);`
`@@ -350,10 +349,10 @@ export class TembaList extends RapidElement {`
`350`	`349`	`} catch (error) {`
`351`	`350`	`// aborted`
`352`	`351`	`this.reset();`
`353`		`- console.log(error);`
	`352`	`+ this.paused = true;`
	`353`	`+ this.loading = false;`
`354`	`354`	`return;`
`355`	`355`	`}`
`356`		`-`
`357`	`356`	`this.nextPage = nextPage;`
`358`	`357`	`}`
`359`	`358`	`this.pages = pages;`