glib-web 2.6.5 → 2.6.6

package/action.js

@@ -132,9 +132,9 @@ export default class Action {
     const name = spec.action;
     if (TypeUtils.isString(name)) {
       if (name.startsWith("component/")) {
-        this.executeLocal(name, spec, component);
+        return this.executeLocal(name, spec, component);
       } else {
-        this.executeGlobal(name, spec, component, params);
+        return this.executeGlobal(name, spec, component, params);
       }
     } else {
       console.warn(`Invalid action: "${name}"`);
@@ -151,7 +151,7 @@ export default class Action {
   }
 
   static executeGlobal(name, spec, component, params) {
-    this._executeInternal(name, spec, component, params, actions);
+    return this._executeInternal(name, spec, component, params, actions);
   }
 
   static _executeInternal(name, spec, component, params, registry) {
@@ -163,13 +163,10 @@ export default class Action {
       if (!logDisabled) {
         console.debug(`Executing "${actionName}"`);
       }
-      action.execute(spec, component, params);
+      return action.execute(spec, component, params);
     } catch (e) {
-      GLib.settings.errorHandler(
-        new Error(
-          `Failed executing command "${actionName}". Error: ${e.message}`
-        )
-      );
+      GLib.settings.errorHandler(e);
+      return null;
     }
   }
 
@@ -195,7 +192,7 @@ export default class Action {
   }
 
   static executeCustom(name, spec, component, params) {
-    this._executeInternal(name, spec, component, params, customActions);
+    return this._executeInternal(name, spec, component, params, customActions);
   }
 }
 

package/actions/http/get.js

@@ -1,19 +1,34 @@
 export default class {
-  execute(properties, controller) {
+  execute(spec, component) {
+    return new Promise(resolve => {
+      GLib.http.execute(
+        spec,
+        "GET",
+        component,
+        (page, response) => {
+          this.handleSuccess(page, spec, component);
+          resolve({ page: page, response: response });
+        },
+        (error, response) => {
+          resolve({ error: error, response: response });
+        }
+      );
+    });
+  }
+
+  handleSuccess(page, spec, component) {
     const currentUrl = window.location.href;
 
-    GLib.http.execute(properties, "GET", controller, (page, response) => {
-      Utils.type.ifString(properties.historyUrl, historyUrl => {
-        const cleanUrl = Utils.url.htmlUrl(historyUrl);
-        if (cleanUrl !== currentUrl) {
-          const data = Object.assign({}, window.vueApp.page, {
-            replayGetResponse: page.onResponse
-          });
+    Utils.type.ifString(spec.historyUrl, historyUrl => {
+      const cleanUrl = Utils.url.htmlUrl(historyUrl);
+      if (cleanUrl !== currentUrl) {
+        const data = Object.assign({}, window.vueApp.page, {
+          replayGetResponse: page.onResponse
+        });
 
-          Utils.history.pushPage(data, cleanUrl);
-        }
-      });
-      GLib.action.handleResponse(page, controller);
+        Utils.history.pushPage(data, cleanUrl);
+      }
     });
+    GLib.action.handleResponse(page, component);
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glib-web",
-  "version": "2.6.5",
+  "version": "2.6.6",
   "description": "",
   "main": "index.js",
   "scripts": {

package/utils/http.js

@@ -149,7 +149,7 @@ export default class {
     });
   }
 
-  static execute(properties, methodName, component, jsonHandler) {
+  static execute(properties, methodName, component, jsonHandler, errorHandler) {
     this.startIndicator(component);
 
     // `fetch()` only supports uppercase
@@ -185,12 +185,12 @@ export default class {
       .then(res => {
         vm.stopIndicator(component);
 
+        response = res;
         if (res.status >= 500) {
           throw "Server error";
         } else if (res.status >= 400) {
           throw "Not accessible";
         } else {
-          response = res;
           return res.json();
         }
       })
@@ -200,9 +200,17 @@ export default class {
       })
       .catch(error => {
         vm.stopIndicator(component);
+
         if (!request.canceled) {
-          console.error("Error:", error);
-          Utils.launch.snackbar.error(error, component);
+          const message = error.toString();
+
+          console.error("Error:", message);
+
+          if (errorHandler) {
+            errorHandler(error, response);
+          } else {
+            Utils.launch.snackbar.error(message, component);
+          }
         } else {
           console.info("Canceled");
         }