catch error in promise

VCityTeam · Aug 22, 2023 · 5c283c6 · 5c283c6
1 parent dd75156
commit 5c283c6
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 12 deletions.
diff --git a/packages/browser/src/Widget/Server/Document/Core/ViewModel/DocumentProvider.js b/packages/browser/src/Widget/Server/Document/Core/ViewModel/DocumentProvider.js
@@ -65,7 +65,12 @@ export class DocumentProvider extends EventSender {
    */
   async refreshDocumentList() {
     const previousDocument = this.getDisplayedDocument();
-    this.allDocuments = await this.service.fetchDocuments();
+    this.allDocuments = await this.service
+      .fetchDocuments()
+      .catch((error) => console.log(error));
+
+    if (!this.allDocuments) return;
+
     this.filteredDocuments = this.allDocuments.slice();
 
     for (const filter of this.filters) {
@@ -85,11 +90,11 @@ export class DocumentProvider extends EventSender {
     } else {
       this.displayedDocumentIndex = undefined;
     }
-    await this.sendEvent(
+    this.sendEvent(
       DocumentProvider.EVENT_FILTERED_DOCS_UPDATED,
       this.getFilteredDocuments()
     );
-    await this.sendEvent(
+    this.sendEvent(
       DocumentProvider.EVENT_DISPLAYED_DOC_CHANGED,
       this.getDisplayedDocument()
     );

diff --git a/packages/browser/src/Widget/Server/Document/GuidedTour/GuidedTour.js b/packages/browser/src/Widget/Server/Document/GuidedTour/GuidedTour.js
@@ -86,9 +86,12 @@ export class GuidedTour extends EventSender {
    * Get all available guided tour from the database
    */
   startGuidedTourMode() {
-    this.guidedTourController.getGuidedTours().then(() => {
-      this.previewTour();
-    });
+    this.guidedTourController
+      .getGuidedTours()
+      .then(() => {
+        this.previewTour();
+      })
+      .catch((error) => console.log(error));
   }
 
   /**

diff --git a/packages/browser/src/Widget/Server/Document/GuidedTour/GuidedTourController.js b/packages/browser/src/Widget/Server/Document/GuidedTour/GuidedTourController.js
@@ -60,12 +60,19 @@ export class GuidedTourController {
   /**
    * Get all guided tour from a database
    */
-  async getGuidedTours() {
-    const req = await this.requestService.request('GET', this.url, {
-      authenticate: false,
+  getGuidedTours() {
+    return new Promise((resolve, reject) => {
+      const req = this.requestService
+        .request('GET', this.url, {
+          authenticate: false,
+        })
+        .then(() => {
+          this.guidedTours = JSON.parse(req.responseText);
+          if (!this.guidedTours.length) reject('NO GUIDED TOUR ON SERVER');
+          resolve();
+        })
+        .catch(reject);
     });
-    this.guidedTours = JSON.parse(req.responseText);
-    if (!this.guidedTours.length) console.warn('NO GUIDED TOUR ON SERVER');
   }
 
   /**

diff --git a/packages/shared/src/EventSender.js b/packages/shared/src/EventSender.js
@@ -79,7 +79,7 @@ class EventSender {
    * @param {string} event The event to fire. Must be first registered.
    * @param {*} data The optional data to pass as parameter.
    */
-  async sendEvent(event, data = null) {
+  sendEvent(event, data = null) {
     const listeners = this.eventListeners[event];
     if (listeners) {
       for (const action of listeners) {