@saltcorn/server 1.0.0-beta.9 → 1.0.0-rc.10

package/public/saltcorn.js

@@ -190,7 +190,8 @@ function pjax_to(href, e) {
         initialize_page();
       },
       error: function (res) {
-        notifyAlert({ type: "danger", text: res.responseText });
+        if (!checkNetworkError(res))
+          notifyAlert({ type: "danger", text: res.responseText });
       },
     });
   }
@@ -224,8 +225,10 @@ function ajax_done(res, viewname) {
 function spin_action_link(e) {
   const $e = $(e);
   const width = $e.width();
+  const height = $e.height();
+
   $e.attr("data-innerhtml-prespin", $e.html());
-  $e.html('<i class="fas fa-spinner fa-spin"></i>').width(width);
+  $e.html('<i class="fas fa-spinner fa-spin"></i>').width(width).height(height);
 }
 
 function reset_spinners() {
@@ -264,7 +267,8 @@ function view_post(viewnameOrElem, route, data, onDone, sendState) {
       reset_spinners();
     })
     .fail(function (res) {
-      notifyAlert({ type: "danger", text: res.responseText });
+      if (!checkNetworkError(res))
+        notifyAlert({ type: "danger", text: res.responseText });
       reset_spinners();
     });
 }
@@ -346,16 +350,18 @@ function expand_thumbnail(img_id, filename) {
 }
 
 function ajax_modal(url, opts = {}) {
-  ensure_modal_exists_and_closed();
-  $("#scmodal").removeClass("no-submit-reload");
-  $("#scmodal").attr("data-on-close-reload-view", opts.reload_view || null);
-
-  if (opts.submitReload === false) $("#scmodal").addClass("no-submit-reload");
   $.ajax(url, {
     headers: {
       SaltcornModalRequest: "true",
     },
     success: function (res, textStatus, request) {
+      ensure_modal_exists_and_closed();
+      $("#scmodal").removeClass("no-submit-reload");
+      $("#scmodal").attr("data-on-close-reload-view", opts.reload_view || null);
+
+      if (opts.submitReload === false)
+        $("#scmodal").addClass("no-submit-reload");
+
       var title = request.getResponseHeader("Page-Title");
       var width = request.getResponseHeader("SaltcornModalWidth");
       var minwidth = request.getResponseHeader("SaltcornModalMinWidth");
@@ -388,7 +394,7 @@ function ajax_modal(url, opts = {}) {
       ? {
           error: opts.onError,
         }
-      : {}),
+      : { error: checkNetworkError }),
   });
 }
 function closeModal() {
@@ -426,6 +432,20 @@ function saveAndContinue(e, k, event) {
   )
     return;
   var form = $(e).closest("form");
+  let focusedEl = null;
+  if (!event || !event.srcElement) {
+    const el = form.find("select[sc-received-focus]")[0];
+    if (el) {
+      el.removeAttribute("sc-received-focus");
+      if (el.getAttribute("previous-val") === el.value) return;
+    }
+  } else if (
+    event.srcElement.tagName === "SELECT" &&
+    event.srcElement.getAttribute("previous-val") !== undefined
+  ) {
+    focusedEl = event.srcElement;
+  }
+
   const valres = form[0].reportValidity();
   if (!valres) return;
   submitWithEmptyAction(form[0]);
@@ -448,10 +468,12 @@ function saveAndContinue(e, k, event) {
         reloadEmbeddedEditOwnViews(form, res.id);
       }
       common_done(res, form.attr("data-viewname"));
+      if (focusedEl) focusedEl.setAttribute("previous-val", focusedEl.value);
     },
     error: function (request) {
       var ct = request.getResponseHeader("content-type") || "";
-      if (ct.startsWith && ct.startsWith("application/json")) {
+      if (checkNetworkError(request)) {
+      } else if (ct.startsWith && ct.startsWith("application/json")) {
         notifyAlert({ type: "danger", text: request.responseJSON.error });
       } else {
         $("#page-inner-content").html(request.responseText);
@@ -500,6 +522,7 @@ function applyViewConfig(e, url, k, event) {
     },
     data: JSON.stringify(cfg),
     error: function (request) {
+      checkNetworkError(request);
       window.savingViewConfig = false;
       ajax_indicate_error(e, request);
     },
@@ -578,6 +601,7 @@ function ajaxSubmitForm(e, force_no_reload) {
       else common_done(res, form.attr("data-viewname"));
     },
     error: function (request) {
+      checkNetworkError(request);
       var title = request.getResponseHeader("Page-Title");
       if (title) $("#scmodal .modal-title").html(decodeURIComponent(title));
       var body = request.responseText;
@@ -594,6 +618,9 @@ function ajax_post_json(url, data, args = {}) {
     ...args,
   });
 }
+
+let scNetworkErrorSignaled = false;
+
 function ajax_post(url, args) {
   $.ajax(url, {
     type: "POST",
@@ -603,10 +630,31 @@ function ajax_post(url, args) {
     ...(args || {}),
   })
     .done(ajax_done)
-    .fail((e) =>
-      ajax_done(e.responseJSON || { error: "Unknown error: " + e.responseText })
-    );
+    .fail((e, ...more) => {
+      if (!checkNetworkError(e))
+        return ajax_done(
+          e.responseJSON || { error: "Unknown error: " + e.responseText }
+        );
+    });
+}
+
+function checkNetworkError(e) {
+  if (e.readyState == 0 && !e.responseText && !e.responseJSON) {
+    //network error
+    if (scNetworkErrorSignaled) return true;
+    scNetworkErrorSignaled = true;
+    setTimeout(() => {
+      scNetworkErrorSignaled = false;
+    }, 1000);
+    console.error("Network error", e);
+    notifyAlert({
+      type: "danger",
+      text: "Network connection error",
+    });
+    return true;
+  }
 }
+
 function ajax_post_btn(e, reload_on_done, reload_delay) {
   var form = $(e).closest("form");
   var url = form.attr("action");
@@ -620,6 +668,7 @@ function ajax_post_btn(e, reload_on_done, reload_delay) {
     success: function () {
       if (reload_on_done) location.reload();
     },
+    error: checkNetworkError,
     complete: function () {
       if (reload_delay)
         setTimeout(function () {
@@ -641,6 +690,7 @@ function api_action_call(name, body) {
     success: function (res) {
       common_done(res.data);
     },
+    error: checkNetworkError,
   });
 }
 
@@ -840,7 +890,7 @@ function build_mobile_app(button) {
 
   if (
     params.useDocker &&
-    !cordovaBuilderAvailable &&
+    !window.cordovaBuilderAvailable &&
     !confirm(
       "Docker is selected but the Cordova builder seems not to be installed. " +
         "Do you really want to continue?"
@@ -848,6 +898,30 @@ function build_mobile_app(button) {
   ) {
     return;
   }
+  if (
+    isSbadmin2 &&
+    !confirm(
+      "It seems you are using the standard sbadmin2 layout. " +
+        "This layout is not optimized for mobile, consider using any-bootstrap-theme. " +
+        "Do you really want to continue?"
+    )
+  ) {
+    return;
+  }
+  const notSupportedPlugins = params.includedPlugins.filter(
+    (plugin) => !window.pluginsReadyForMobile.includes(plugin)
+  );
+  if (
+    notSupportedPlugins.length > 0 &&
+    !confirm(
+      `It seems that the plugins '${notSupportedPlugins.join(
+        ", "
+      )}' are not ready for mobile. Do you really want to continue?`
+    )
+  ) {
+    return;
+  }
+
   ajax_post("/admin/build-mobile-app", {
     data: params,
     success: (data) => {
@@ -919,8 +993,8 @@ function check_cordova_builder() {
   $.ajax("/admin/mobile-app/check-cordova-builder", {
     type: "GET",
     success: function (res) {
-      cordovaBuilderAvailable = !!res.installed;
-      if (cordovaBuilderAvailable) {
+      window.cordovaBuilderAvailable = !!res.installed;
+      if (window.cordovaBuilderAvailable) {
         $("#dockerBuilderStatusId").html(
           `<span>
             installed<i class="ps-2 fas fa-check text-success"></i>
@@ -1014,7 +1088,7 @@ function toggle_tbl_sync() {
 function toggle_android_platform() {
   if ($("#androidCheckboxId")[0].checked === true) {
     $("#dockerCheckboxId").attr("hidden", false);
-    $("#dockerCheckboxId").attr("checked", cordovaBuilderAvailable);
+    $("#dockerCheckboxId").attr("checked", window.cordovaBuilderAvailable);
     $("#dockerLabelId").removeClass("d-none");
   } else {
     $("#dockerCheckboxId").attr("hidden", true);

package/routes/actions.js

@@ -57,21 +57,6 @@ const {
   blocklyToolbox,
 } = require("../markup/blockly.js");
 
-/**
- * @returns {Promise<object>}
- */
-const getActions = async () => {
-  return Object.entries(getState().actions).map(([k, v]) => {
-    const hasConfig = !!v.configFields;
-    const requireRow = !!v.requireRow;
-    return {
-      name: k,
-      hasConfig,
-      requireRow,
-    };
-  });
-};
-
 /**
  * Show list of Actions (Triggers) (HTTP GET)
  * @name get
@@ -96,7 +81,7 @@ router.get(
       triggers = triggers.filter((t) => tagged_trigger_ids.has(t.id));
       filterOnTag = await Tag.findOne({ id: +req.query._tag });
     }
-    const actions = await getActions();
+    const actions = Trigger.abbreviated_actions;
     send_events_page({
       res,
       req,
@@ -156,7 +141,7 @@ const triggerForm = async (req, trigger) => {
     value: r.id,
     label: r.role,
   }));
-  const actions = await getActions();
+  const actions = Trigger.abbreviated_actions;
   const tables = await Table.find({});
   let id;
   let form_action;
@@ -168,14 +153,13 @@ const triggerForm = async (req, trigger) => {
   const hasChannel = Object.entries(getState().eventTypes)
     .filter(([k, v]) => v.hasChannel)
     .map(([k, v]) => k);
-  const allActions = actions.map((t) => t.name);
-  allActions.push("Multi-step action");
+
+  const allActions = Trigger.action_options({ notRequireRow: false });
   const table_triggers = ["Insert", "Update", "Delete", "Validate"];
   const action_options = {};
-  const actionsNotRequiringRow = actions
-    .filter((a) => !a.requireRow)
-    .map((t) => t.name);
-  actionsNotRequiringRow.push("Multi-step action");
+  const actionsNotRequiringRow = Trigger.action_options({
+    notRequireRow: true,
+  });
 
   Trigger.when_options.forEach((t) => {
     if (table_triggers.includes(t)) action_options[t] = allActions;
@@ -237,6 +221,13 @@ const triggerForm = async (req, trigger) => {
         showIf: { when_trigger: "Daily" },
         sublabel: req.__("UTC timezone"),
       },
+      {
+        name: "channel",
+        label: req.__("Time to run"),
+        input_type: "time_of_week",
+        showIf: { when_trigger: "Weekly" },
+        sublabel: req.__("UTC timezone"),
+      },
       {
         name: "channel",
         label: req.__("Channel"),
@@ -555,7 +546,10 @@ router.get(
     let trigger;
     let id = parseInt(idorname);
     if (id) trigger = await Trigger.findOne({ id });
-    else trigger = await Trigger.findOne({ name: idorname });
+    else {
+      trigger = await Trigger.findOne({ name: idorname });
+      id = trigger.id;
+    }
 
     if (!trigger) {
       req.flash("warning", req.__("Action not found"));
@@ -761,7 +755,7 @@ router.post(
       req.flash("success", req.__("Action configuration saved"));
       res.redirect(
         req.query.on_done_redirect &&
-          is_relative_url(req.query.on_done_redirect)
+          is_relative_url("/" + req.query.on_done_redirect)
           ? `/${req.query.on_done_redirect}`
           : "/actions/"
       );