glib-web 0.5.98 → 0.6.2

package/utils/http.js

@@ -1,209 +1,209 @@
-import Type from "./type";
-import Action from "../action";
-
-let loading = false;
-
-class HttpRequest {
-  constructor() {
-    this.controller = new AbortController();
-    this.canceled = false;
-  }
-
-  cancel() {
-    this.canceled = true;
-    this.controller.abort();
-  }
-}
-
-export default class {
-  static _extractFormData(properties, needCsrfToken) {
-    // if (properties["formDataEncoded"]) {
-    //   return properties["formData"];
-    // }
-
-    const data = properties.formData;
-    if (data instanceof FormData) {
-      return data;
-    }
-
-    const formData = new FormData();
-    var params = data || {};
-    for (const key in params) {
-      formData.append(key, params[key]);
-    }
-
-    if (needCsrfToken && !Type.isString(params["authenticity_token"])) {
-      formData.append("authenticity_token", Utils.dom.getCsrf());
-    }
-    return formData;
-  }
-
-  static load(properties, target, component) {
-    const url = new URL(properties["url"]);
-    const domainMatched = window.location.hostname == url.hostname;
-    if (Utils.settings.reactive && domainMatched) {
-      const currentUrl = window.location.href;
-      const htmlUrl = Utils.url.htmlUrl(properties["url"]);
-
-      Utils.http.execute(properties, "GET", component, (data, response) => {
-        if (htmlUrl !== currentUrl) {
-          const redirectUrl = Utils.url.htmlUrl(response.url);
-          Utils.history.pushPage(data, redirectUrl);
-        }
-
-        this.forceComponentUpdate(() => {
-          Utils.history.resetScroll();
-          window.vueApp.page = data;
-          Action.execute(properties["onOpen"], target, component);
-        });
-      });
-    } else {
-      window.location = Utils.url.htmlUrl(properties["url"]);
-    }
-  }
-
-  static analyticsHeaders(component) {
-    const pageAnalytics =
-      window.vueApp.temp.analytics || window.vueApp.page.analytics || {};
-    const featureAnalytics = pageAnalytics.feature;
-
-    const headers = {};
-    if (featureAnalytics) {
-      const componentAnalytics = component.spec.analytics || {};
-      if (componentAnalytics.disabled) {
-        return headers;
-      }
-
-      Utils.type.ifString(
-        componentAnalytics.group || featureAnalytics.group,
-        value => (headers["GApp-Analytics-Referer-Group"] = value)
-      );
-
-      Utils.type.ifString(
-        componentAnalytics.action || featureAnalytics.action,
-        value => (headers["GApp-Analytics-Referer-Action"] = value)
-      );
-
-      Utils.type.ifString(
-        componentAnalytics.segment || featureAnalytics.segment,
-        value => (headers["GApp-Analytics-Referer-Segment"] = value)
-      );
-
-      Utils.type.ifString(
-        componentAnalytics.placement,
-        value => (headers["GApp-Analytics-Referer-Placement"] = value)
-      );
-    }
-    return headers;
-  }
-
-  static reload(properties, component) {
-    const currentUrl = window.location.href;
-    const data = {
-      url: properties.url || currentUrl
-    };
-
-    Utils.http.execute(data, "GET", component, (page, response) => {
-      Utils.http.forceComponentUpdate(() => {
-        window.vueApp.page = page;
-        const redirectUrl = Utils.url.htmlUrl(response.url);
-        Utils.history.updatePage(redirectUrl);
-
-        GLib.action.execute(properties["onReload"], null, component);
-      });
-    });
-  }
-
-  static execute(properties, methodName, component, jsonHandler) {
-    this.startIndicator(component);
-
-    // `fetch()` only supports uppercase
-    const method = methodName.toUpperCase();
-    let url = Utils.url.jsonUrl(properties["url"]);
-    let body = this._extractFormData(properties, method !== "GET");
-    if (method === "GET") {
-      url = Utils.url.appendParams(url, body);
-      body = null;
-    }
-    console.log(`${method} ${url}`);
-
-    const request = new HttpRequest();
-    let response = null;
-    const vm = this;
-
-    const analyticsHeaders = this.analyticsHeaders(component);
-
-    fetch(url, {
-      method: method,
-      body: body,
-      headers: Object.assign({ Accept: "text/html" }, analyticsHeaders),
-      // Make sure to pass cookies for same origin URLs.
-      // Needed for some browsers, e.g. Edge and Android's native.
-      credentials: "same-origin",
-      signal: request.controller.signal
-    })
-      .then(res => {
-        vm.stopIndicator(component);
-
-        if (res.status >= 500) {
-          throw "Server error";
-        } else if (res.status >= 400) {
-          throw "Not accessible";
-        } else {
-          response = res;
-          return res.json();
-        }
-      })
-      .then(data => {
-        console.debug("Success", data);
-        jsonHandler(data, response);
-      })
-      .catch(error => {
-        vm.stopIndicator(component);
-        if (!request.canceled) {
-          console.error("Error:", error);
-          Utils.launch.snackbar.error(error);
-        } else {
-          console.info("Canceled");
-        }
-      });
-
-    return request;
-  }
-
-  static startIndicator(component) {
-    this._showIndicator();
-    component.$data._isBusy = true;
-  }
-
-  static stopIndicator(component) {
-    this._hideIndicator();
-    component.$data._isBusy = false;
-  }
-
-  static _showIndicator() {
-    loading = true;
-    setTimeout(() => {
-      if (loading) {
-        loading = false;
-        window.vueApp.indicator = true;
-      }
-    }, 200);
-  }
-
-  static _hideIndicator() {
-    loading = false;
-    window.vueApp.indicator = false;
-  }
-
-  // See generic.js
-  static forceComponentUpdate(handler) {
-    window.vueApp.isStale = true;
-
-    // Queue the execution so the first isStale has time to resets state before handler gets executed
-    setTimeout(() => {
-      handler();
-      window.vueApp.isStale = false;
-    }, 0);
-  }
-}
+import Type from "./type";
+import Action from "../action";
+
+let loading = false;
+
+class HttpRequest {
+  constructor() {
+    this.controller = new AbortController();
+    this.canceled = false;
+  }
+
+  cancel() {
+    this.canceled = true;
+    this.controller.abort();
+  }
+}
+
+export default class {
+  static _extractFormData(properties, needCsrfToken) {
+    // if (properties["formDataEncoded"]) {
+    //   return properties["formData"];
+    // }
+
+    const data = properties.formData;
+    if (data instanceof FormData) {
+      return data;
+    }
+
+    const formData = new FormData();
+    var params = data || {};
+    for (const key in params) {
+      formData.append(key, params[key]);
+    }
+
+    if (needCsrfToken && !Type.isString(params["authenticity_token"])) {
+      formData.append("authenticity_token", Utils.dom.getCsrf());
+    }
+    return formData;
+  }
+
+  static load(properties, target, component) {
+    const url = new URL(properties["url"]);
+    const domainMatched = window.location.hostname == url.hostname;
+    if (Utils.settings.reactive && domainMatched) {
+      const currentUrl = window.location.href;
+      const htmlUrl = Utils.url.htmlUrl(properties["url"]);
+
+      Utils.http.execute(properties, "GET", component, (data, response) => {
+        if (htmlUrl !== currentUrl) {
+          const redirectUrl = Utils.url.htmlUrl(response.url);
+          Utils.history.pushPage(data, redirectUrl);
+        }
+
+        this.forceComponentUpdate(() => {
+          Utils.history.resetScroll();
+          window.vueApp.page = data;
+          Action.execute(properties["onOpen"], target, component);
+        });
+      });
+    } else {
+      window.location = Utils.url.htmlUrl(properties["url"]);
+    }
+  }
+
+  static analyticsHeaders(component) {
+    const pageAnalytics =
+      window.vueApp.temp.analytics || window.vueApp.page.analytics || {};
+    const featureAnalytics = pageAnalytics.feature;
+
+    const headers = {};
+    if (featureAnalytics) {
+      const componentAnalytics = component.spec.analytics || {};
+      if (componentAnalytics.disabled) {
+        return headers;
+      }
+
+      Utils.type.ifString(
+        componentAnalytics.group || featureAnalytics.group,
+        value => (headers["GApp-Analytics-Referer-Group"] = value)
+      );
+
+      Utils.type.ifString(
+        componentAnalytics.action || featureAnalytics.action,
+        value => (headers["GApp-Analytics-Referer-Action"] = value)
+      );
+
+      Utils.type.ifString(
+        componentAnalytics.segment || featureAnalytics.segment,
+        value => (headers["GApp-Analytics-Referer-Segment"] = value)
+      );
+
+      Utils.type.ifString(
+        componentAnalytics.placement,
+        value => (headers["GApp-Analytics-Referer-Placement"] = value)
+      );
+    }
+    return headers;
+  }
+
+  static reload(properties, component) {
+    const currentUrl = window.location.href;
+    const data = {
+      url: properties.url || currentUrl
+    };
+
+    Utils.http.execute(data, "GET", component, (page, response) => {
+      Utils.http.forceComponentUpdate(() => {
+        window.vueApp.page = page;
+        const redirectUrl = Utils.url.htmlUrl(response.url);
+        Utils.history.updatePage(redirectUrl);
+
+        GLib.action.execute(properties["onReload"], null, component);
+      });
+    });
+  }
+
+  static execute(properties, methodName, component, jsonHandler) {
+    this.startIndicator(component);
+
+    // `fetch()` only supports uppercase
+    const method = methodName.toUpperCase();
+    let url = Utils.url.jsonUrl(properties["url"]);
+    let body = this._extractFormData(properties, method !== "GET");
+    if (method === "GET") {
+      url = Utils.url.appendParams(url, body);
+      body = null;
+    }
+    console.log(`${method} ${url}`);
+
+    const request = new HttpRequest();
+    let response = null;
+    const vm = this;
+
+    const analyticsHeaders = this.analyticsHeaders(component);
+
+    fetch(url, {
+      method: method,
+      body: body,
+      headers: Object.assign({ Accept: "text/html" }, analyticsHeaders),
+      // Make sure to pass cookies for same origin URLs.
+      // Needed for some browsers, e.g. Edge and Android's native.
+      credentials: "same-origin",
+      signal: request.controller.signal
+    })
+      .then(res => {
+        vm.stopIndicator(component);
+
+        if (res.status >= 500) {
+          throw "Server error";
+        } else if (res.status >= 400) {
+          throw "Not accessible";
+        } else {
+          response = res;
+          return res.json();
+        }
+      })
+      .then(data => {
+        console.debug("Success", data);
+        jsonHandler(data, response);
+      })
+      .catch(error => {
+        vm.stopIndicator(component);
+        if (!request.canceled) {
+          console.error("Error:", error);
+          Utils.launch.snackbar.error(error);
+        } else {
+          console.info("Canceled");
+        }
+      });
+
+    return request;
+  }
+
+  static startIndicator(component) {
+    this._showIndicator();
+    component.$data._isBusy = true;
+  }
+
+  static stopIndicator(component) {
+    this._hideIndicator();
+    component.$data._isBusy = false;
+  }
+
+  static _showIndicator() {
+    loading = true;
+    setTimeout(() => {
+      if (loading) {
+        loading = false;
+        window.vueApp.indicator = true;
+      }
+    }, 200);
+  }
+
+  static _hideIndicator() {
+    loading = false;
+    window.vueApp.indicator = false;
+  }
+
+  // See generic.js
+  static forceComponentUpdate(handler) {
+    window.vueApp.isStale = true;
+
+    // Queue the execution so the first isStale has time to resets state before handler gets executed
+    setTimeout(() => {
+      handler();
+      window.vueApp.isStale = false;
+    }, 0);
+  }
+}

package/utils/launch.js

@@ -1,135 +1,135 @@
-import Vue from "vue";
-import Dialog from "../nav/dialog";
-import Sheet from "../nav/sheet";
-import Snackbar from "../nav/snackbar";
-import Vuetify from "vuetify";
-
-export default class {
-  static dialog(properties, target) {
-    if (!this.stack) {
-      this.stack = [];
-    }
-
-    // https://css-tricks.com/creating-vue-js-component-instances-programmatically/
-    const DialogClass = Vue.extend(Dialog);
-    const instance = new DialogClass({
-      vuetify: new Vuetify({
-        theme: {
-          themes: Utils.settings.themes
-        }
-      }),
-      propsData: {
-        spec: properties,
-        stack: this.stack,
-        target: target,
-        vueApp: window.vueApp
-      }
-    });
-    // instance.stack = this.stack;
-
-    const placeholder = document.body.appendChild(
-      document.createElement("div")
-    );
-    instance.$mount(placeholder);
-  }
-
-  static closeDialog(properties, target, component) {
-    if (!this.stack) {
-      this.stack = [];
-    }
-
-    Utils.type.ifObject(this.stack.last(), dialog => {
-      dialog.close();
-    });
-
-    Utils.type.ifObject(properties["onClose"], it => {
-      Action.execute(it, target, component);
-    });
-  }
-
-  static get sheet() {
-    return LaunchSheet;
-  }
-
-  static get snackbar() {
-    return LaunchSnackbar;
-  }
-
-  static alert(message, target) {
-    const properties = {
-      message: message
-    };
-    const spec = Object.assign({}, properties, {
-      buttons: [
-        {
-          text: "OK",
-          onClick: properties.onClose
-        }
-      ]
-    });
-    this.dialog(spec, target);
-  }
-}
-
-class LaunchSheet {
-  static open(properties) {
-    const SheetClass = Vue.extend(Sheet);
-    const instance = new SheetClass({
-      vuetify: new Vuetify({
-        theme: {
-          themes: Utils.settings.themes
-        }
-      }),
-      propsData: { spec: properties }
-    });
-    const placeholder = document.body.appendChild(
-      document.createElement("div")
-    );
-    instance.$mount(placeholder);
-    // instance.show = true
-    return instance;
-  }
-
-  static confirm(properties, onConfirm) {
-    const spec = Object.assign({}, properties, {
-      buttons: [
-        {
-          text: "Confirm",
-          onClickFunction: onConfirm
-        }
-      ]
-    });
-    this.open(spec);
-  }
-
-  static alert(message, buttons) {
-    const spec = { message: message, buttons: buttons };
-    this.open(spec);
-  }
-}
-
-class LaunchSnackbar {
-  static open(properties) {
-    const SnackbarClass = Vue.extend(Snackbar);
-    const instance = new SnackbarClass({
-      vuetify: window.vueApp.vuetify,
-      propsData: { spec: properties, vueApp: window.vueApp }
-    });
-
-    const placeholder = document.body.appendChild(
-      document.createElement("div")
-    );
-    instance.$mount(placeholder);
-    instance.show = true;
-    return instance;
-  }
-
-  static error(message) {
-    this.open({ message: message, styleClasses: ["error"] });
-  }
-
-  static indicator(message) {
-    const instance = this.open({ message: message, timeout: -1 });
-    instance.indicator = true;
-  }
-}
+import Vue from "vue";
+import Dialog from "../nav/dialog";
+import Sheet from "../nav/sheet";
+import Snackbar from "../nav/snackbar";
+import Vuetify from "vuetify";
+
+export default class {
+  static dialog(properties, target) {
+    if (!this.stack) {
+      this.stack = [];
+    }
+
+    // https://css-tricks.com/creating-vue-js-component-instances-programmatically/
+    const DialogClass = Vue.extend(Dialog);
+    const instance = new DialogClass({
+      vuetify: new Vuetify({
+        theme: {
+          themes: Utils.settings.themes
+        }
+      }),
+      propsData: {
+        spec: properties,
+        stack: this.stack,
+        target: target,
+        vueApp: window.vueApp
+      }
+    });
+    // instance.stack = this.stack;
+
+    const placeholder = document.body.appendChild(
+      document.createElement("div")
+    );
+    instance.$mount(placeholder);
+  }
+
+  static closeDialog(properties, target, component) {
+    if (!this.stack) {
+      this.stack = [];
+    }
+
+    Utils.type.ifObject(this.stack.last(), dialog => {
+      dialog.close();
+    });
+
+    Utils.type.ifObject(properties["onClose"], it => {
+      Action.execute(it, target, component);
+    });
+  }
+
+  static get sheet() {
+    return LaunchSheet;
+  }
+
+  static get snackbar() {
+    return LaunchSnackbar;
+  }
+
+  static alert(message, target) {
+    const properties = {
+      message: message
+    };
+    const spec = Object.assign({}, properties, {
+      buttons: [
+        {
+          text: "OK",
+          onClick: properties.onClose
+        }
+      ]
+    });
+    this.dialog(spec, target);
+  }
+}
+
+class LaunchSheet {
+  static open(properties) {
+    const SheetClass = Vue.extend(Sheet);
+    const instance = new SheetClass({
+      vuetify: new Vuetify({
+        theme: {
+          themes: Utils.settings.themes
+        }
+      }),
+      propsData: { spec: properties }
+    });
+    const placeholder = document.body.appendChild(
+      document.createElement("div")
+    );
+    instance.$mount(placeholder);
+    // instance.show = true
+    return instance;
+  }
+
+  static confirm(properties, onConfirm) {
+    const spec = Object.assign({}, properties, {
+      buttons: [
+        {
+          text: "Confirm",
+          onClickFunction: onConfirm
+        }
+      ]
+    });
+    this.open(spec);
+  }
+
+  static alert(message, buttons) {
+    const spec = { message: message, buttons: buttons };
+    this.open(spec);
+  }
+}
+
+class LaunchSnackbar {
+  static open(properties) {
+    const SnackbarClass = Vue.extend(Snackbar);
+    const instance = new SnackbarClass({
+      vuetify: window.vueApp.vuetify,
+      propsData: { spec: properties, vueApp: window.vueApp }
+    });
+
+    const placeholder = document.body.appendChild(
+      document.createElement("div")
+    );
+    instance.$mount(placeholder);
+    instance.show = true;
+    return instance;
+  }
+
+  static error(message) {
+    this.open({ message: message, styleClasses: ["error"] });
+  }
+
+  static indicator(message) {
+    const instance = this.open({ message: message, timeout: -1 });
+    instance.indicator = true;
+  }
+}