@saltcorn/server 0.7.4-beta.3 → 0.8.0-beta.0

package/public/saltcorn.css

@@ -299,7 +299,9 @@ section.range-slider input[type="range"]::-moz-focus-outer {
   padding: 0.1rem 0.4rem !important;
 }
 
-table.table-inner-grid, table.table-inner-grid th, table.table-inner-grid td {
+table.table-inner-grid,
+table.table-inner-grid th,
+table.table-inner-grid td {
   border: 1px solid black;
   border-collapse: collapse;
 }
@@ -307,18 +309,18 @@ table.table-inner-grid, table.table-inner-grid th, table.table-inner-grid td {
 /* https://codepen.io/pezmotion/pen/RQERdm */
 
 .editStarRating {
-	direction: rtl;
-	unicode-bidi: bidi-override;
-	color: #ddd;
+  direction: rtl;
+  unicode-bidi: bidi-override;
+  color: #ddd;
 }
 .editStarRating input {
-	display: none;
+  display: none;
 }
 .editStarRating label:hover,
 .editStarRating label:hover ~ label,
 .editStarRating input:checked + label,
 .editStarRating input:checked + label ~ label {
-	color: #ffc107; 
+  color: #ffc107;
 }
 
 .CodeMirror {
@@ -326,12 +328,12 @@ table.table-inner-grid, table.table-inner-grid th, table.table-inner-grid td {
 }
 
 /* copied from bootstrap and adjusted to show the arrow on the left */
-.card .card-header-left-collapse[data-bs-toggle=collapse] {
+.card .card-header-left-collapse[data-bs-toggle="collapse"] {
   text-decoration: none;
   position: relative;
   padding: 0.75rem 3.25rem 0.75rem 1.25rem;
 }
-.card .card-header-left-collapse[data-bs-toggle=collapse]::before {
+.card .card-header-left-collapse[data-bs-toggle="collapse"]::before {
   position: absolute;
   left: 0;
   top: 0;
@@ -341,9 +343,24 @@ table.table-inner-grid, table.table-inner-grid th, table.table-inner-grid td {
   font-family: "Font Awesome 5 Free";
   color: #d1d3e2;
 }
-.card .card-header-left-collapse[data-bs-toggle=collapse].collapsed {
+.card .card-header-left-collapse[data-bs-toggle="collapse"].collapsed {
   border-radius: 0.35rem;
 }
-.card .card-header-left-collapse[data-bs-toggle=collapse].collapsed::before {
+.card .card-header-left-collapse[data-bs-toggle="collapse"].collapsed::before {
   content: "\f105";
 }
+
+.d-inline-maybe {
+  display: inline;
+}
+
+.w-unset {
+  width: unset;
+}
+
+.preview-text {
+  transform: rotate(-30deg);
+  z-index: 11;
+  margin-left: 30px;
+  margin-top: -5px;
+}

package/public/saltcorn.js

@@ -1,8 +1,18 @@
-function sortby(k, desc) {
-  set_state_fields({ _sortby: k, _sortdesc: desc ? "on" : { unset: true } });
+function sortby(k, desc, viewIdentifier) {
+  set_state_fields({
+    [viewIdentifier ? `_${viewIdentifier}_sortby` : "_sortby"]: k,
+    [viewIdentifier ? `_${viewIdentifier}_sortdesc` : "_sortdesc"]: desc
+      ? "on"
+      : { unset: true },
+  });
 }
-function gopage(n, pagesize, extra = {}) {
-  set_state_fields({ ...extra, _page: n, _pagesize: pagesize });
+function gopage(n, pagesize, viewIdentifier, extra = {}) {
+  const cfg = {
+    ...extra,
+    [viewIdentifier ? `_${viewIdentifier}_page` : "_page"]: n,
+    [viewIdentifier ? `_${viewIdentifier}_pagesize` : "_pagesize"]: pagesize,
+  };
+  set_state_fields(cfg);
 }
 
 if (localStorage.getItem("reload_on_init")) {
@@ -77,8 +87,21 @@ function check_state_field(that) {
   pjax_to(dest.replace("&&", "&").replace("?&", "?"));
 }
 
+function invalidate_pagings(href) {
+  let newhref = href;
+  const queryObj = Object.fromEntries(new URL(newhref).searchParams.entries());
+  const toRemove = Object.keys(queryObj).filter((val) => is_paging_param(val));
+  for (const k of toRemove) {
+    newhref = removeQueryStringParameter(newhref, k);
+  }
+  return newhref;
+}
+
 function set_state_fields(kvs) {
-  var newhref = get_current_state_url();
+  let newhref = get_current_state_url();
+  if (Object.keys(kvs).some((k) => !is_paging_param(k))) {
+    newhref = invalidate_pagings(newhref);
+  }
   Object.entries(kvs).forEach((kv) => {
     if (kv[1].unset && kv[1].unset === true)
       newhref = removeQueryStringParameter(newhref, kv[0]);
@@ -94,14 +117,15 @@ let loadPage = true;
 $(function () {
   $(window).bind("popstate", function (event) {
     const ensure_no_final_hash = (s) => (s.endsWith("#") ? s.slice(0, -1) : s);
-    if (loadPage)
-      window.location.assign(ensure_no_final_hash(window.location.href));
+    const newUrl = ensure_no_final_hash(window.location.href);
+    if (loadPage && newUrl !== window.location.href)
+      window.location.assign(newUrl);
   });
 });
 
 function pjax_to(href) {
   let $modal = $("#scmodal");
-  const inModal = $modal.length && $modal.hasClass("show")
+  const inModal = $modal.length && $modal.hasClass("show");
   let $dest = inModal ? $("#scmodal .modal-body") : $("#page-inner-content");
 
   if (!$dest.length) window.location.href = href;
@@ -126,7 +150,7 @@ function pjax_to(href) {
       },
       error: function (res) {
         notifyAlert({ type: "danger", text: res.responseText });
-      }
+      },
     });
   }
 }
@@ -135,21 +159,19 @@ function href_to(href) {
   window.location.href = href;
 }
 function clear_state(omit_fields_str) {
-  let newUrl = get_current_state_url().split("?")[0]
-  const hash = get_current_state_url().split("#")[1]
+  let newUrl = get_current_state_url().split("?")[0];
+  const hash = get_current_state_url().split("#")[1];
   if (omit_fields_str) {
-    const omit_fields = omit_fields_str.split(',').map(s => s.trim())
-    let qs = (get_current_state_url().split("?")[1] || "").split("#")[0]
+    const omit_fields = omit_fields_str.split(",").map((s) => s.trim());
+    let qs = (get_current_state_url().split("?")[1] || "").split("#")[0];
     let params = new URLSearchParams(qs);
-    newUrl = newUrl + '?'
-    omit_fields.forEach(f => {
+    newUrl = newUrl + "?";
+    omit_fields.forEach((f) => {
       if (params.get(f))
         newUrl = updateQueryStringParameter(newUrl, f, params.get(f));
-    })
-
+    });
   }
-  if (hash)
-    newUrl += '#' + hash;
+  if (hash) newUrl += "#" + hash;
 
   pjax_to(newUrl);
 }
@@ -170,12 +192,14 @@ function view_post(viewname, route, data, onDone) {
         ? "application/x-www-form-urlencoded"
         : "application/json",
     data: typeof data === "string" ? data : JSON.stringify(data),
-  }).done(function (res) {
-    if (onDone) onDone(res);
-    ajax_done(res);
-  }).fail(function (res) {
-    notifyAlert({ type: "danger", text: res.responseText });
-  });
+  })
+    .done(function (res) {
+      if (onDone) onDone(res);
+      ajax_done(res);
+    })
+    .fail(function (res) {
+      notifyAlert({ type: "danger", text: res.responseText });
+    });
 }
 var logged_errors = [];
 function globalErrorCatcher(message, source, lineno, colno, error) {
@@ -254,6 +278,8 @@ function ajax_modal(url, opts = {}) {
 
 function saveAndContinue(e, k) {
   var form = $(e).closest("form");
+  const valres = form[0].reportValidity()
+  if (!valres) return;
   submitWithEmptyAction(form[0]);
   var url = form.attr("action");
   var form_data = form.serialize();
@@ -300,12 +326,47 @@ function applyViewConfig(e, url, k) {
     error: function (request) { },
     success: function (res) {
       k && k(res);
+      !k && updateViewPreview();
     },
   });
 
   return false;
 }
 
+function updateViewPreview() {
+  const $preview = $("#viewcfg-preview[data-preview-url]");
+  if ($preview.length > 0) {
+    const url = $preview.attr("data-preview-url");
+    $preview.css({ opacity: 0.5 });
+    $.ajax(url, {
+      type: "POST",
+      headers: {
+        "CSRF-Token": _sc_globalCsrf,
+      },
+
+      error: function (request) { },
+      success: function (res) {
+        $preview.css({ opacity: 1.0 });
+
+        //disable elements in preview
+        $preview.html(res);
+        $preview.find("a").attr("href", "#");
+        $preview
+          .find("[onclick], button, a, input, select")
+          .attr("onclick", "return false");
+
+        $preview.find("textarea").attr("disabled", true);
+        $preview.find("input").attr("readonly", true);
+
+        //disable functions preview migght try to call
+        set_state_field = () => { }
+        set_state_fields = () => { }
+
+      },
+    });
+  }
+}
+
 function ajaxSubmitForm(e) {
   var form = $(e).closest("form");
   var url = form.attr("action");
@@ -317,10 +378,11 @@ function ajaxSubmitForm(e) {
     data: new FormData(form[0]),
     processData: false,
     contentType: false,
-    success: function () {
+    success: function (res) {
       var no_reload = $("#scmodal").hasClass("no-submit-reload");
       $("#scmodal").modal("hide");
       if (!no_reload) location.reload();
+      else common_done(res);
     },
     error: function (request) {
       var title = request.getResponseHeader("Page-Title");
@@ -420,6 +482,17 @@ function test_formula(tablename, stored) {
   });
 }
 
+function create_new_folder(folder) {
+  const name = window.prompt("Name of the new folder");
+  if (name)
+    ajax_post(`/files/new-folder`, {
+      data: { name, folder },
+      success: (data) => {
+        location.reload();
+      },
+    });
+}
+
 async function fill_formula_btn_click(btn, k) {
   const formula = decodeURIComponent($(btn).attr("data-formula"));
   const free_vars = JSON.parse(
@@ -444,61 +517,135 @@ async function fill_formula_btn_click(btn, k) {
       }
     }
   }
-  const val = new Function(
-    `{${Object.keys(rec).join(",")}}`,
-    "return " + formula
-  )(rec);
-  $(btn).closest(".input-group").find("input").val(val);
-  if (k) k();
-}
-
-/*
-https://github.com/jeffdavidgreen/bootstrap-html5-history-tabs/blob/master/bootstrap-history-tabs.js
-Copyright (c) 2015 Jeff Green
-*/
-
-+(function ($) {
-  "use strict";
-  $.fn.historyTabs = function () {
-    var that = this;
-    window.addEventListener("popstate", function (event) {
-      if (event.state) {
-        $(that)
-          .filter('[href="' + event.state.url + '"]')
-          .tab("show");
-      }
+  try {
+    const val = new Function(
+      `{${Object.keys(rec).join(",")}}`,
+      "return " + formula
+    )(rec);
+    $(btn).closest(".input-group").find("input").val(val);
+    if (k) k();
+  } catch (e) {
+    notifyAlert({
+      type: "danger",
+      text: `Error evaluating fill formula: ${e.message}`,
     });
-    return this.each(function (index, element) {
-      $(element).on("show.bs.tab", function () {
-        var stateObject = { url: $(this).attr("href") };
-
-        if (window.location.hash && stateObject.url !== window.location.hash) {
-          window.history.pushState(
-            stateObject,
-            document.title,
-            window.location.pathname +
-            window.location.search +
-            $(this).attr("href")
-          );
+    console.error(e);
+  }
+}
+
+function removeSpinner(elementId, orginalHtml) {
+  $(`#${elementId}`).html(orginalHtml);
+}
+
+function poll_mobile_build_finished(outDirName, pollCount, orginalBtnHtml) {
+  $.ajax("/admin/build-mobile-app/finished", {
+    type: "GET",
+    data: { build_dir: outDirName },
+    success: function (res) {
+      if (!res.finished) {
+        if (pollCount >= 50) {
+          removeSpinner("buildMobileAppBtnId", orginalBtnHtml);
+          notifyAlert({
+            type: "danger",
+            text: "unable to get the build results",
+          });
         } else {
-          window.history.replaceState(
-            stateObject,
-            document.title,
-            window.location.pathname +
-            window.location.search +
-            $(this).attr("href")
-          );
+          setTimeout(() => {
+            poll_mobile_build_finished(outDirName, ++pollCount, orginalBtnHtml);
+          }, 5000);
         }
-      });
-      if (!window.location.hash && $(element).is(".active")) {
-        // Shows the first element if there are no query parameters.
-        $(element).tab("show");
-      } else if ($(this).attr("href") === window.location.hash) {
-        $(element).tab("show");
+      } else {
+        href_to(
+          `build-mobile-app/result?build_dir_name=${encodeURIComponent(
+            outDirName
+          )}`
+        );
       }
+    },
+  });
+}
+
+function build_mobile_app(button) {
+  const form = $(button).closest("form");
+  const params = {};
+  form.serializeArray().forEach((item) => {
+    params[item.name] = item.value;
+  });
+  ajax_post("/admin/build-mobile-app", {
+    data: params,
+    success: (data) => {
+      if (data.build_dir_name) {
+        handleMessages();
+        const orginalBtnHtml = $("#buildMobileAppBtnId").html();
+        press_store_button(button);
+        poll_mobile_build_finished(data.build_dir_name, 0, orginalBtnHtml);
+      }
+    },
+  });
+}
+
+(() => {
+  const e = document.querySelector("[data-sidebar-toggler]");
+  let closed = localStorage.getItem("sidebarClosed") === "true";
+  if (e) {
+    if (closed) {
+      e.dispatchEvent(new Event("click"));
+    }
+    e.addEventListener("click", () => {
+      closed = !closed;
+      localStorage.setItem("sidebarClosed", `${closed}`);
     });
-  };
-})(jQuery);
+  }
+})()
+
+
+  /*
+  https://github.com/jeffdavidgreen/bootstrap-html5-history-tabs/blob/master/bootstrap-history-tabs.js
+  Copyright (c) 2015 Jeff Green
+  */
+
+  + (function ($) {
+    "use strict";
+    $.fn.historyTabs = function () {
+      var that = this;
+      window.addEventListener("popstate", function (event) {
+        if (event.state) {
+          $(that)
+            .filter('[href="' + event.state.url + '"]')
+            .tab("show");
+        }
+      });
+      return this.each(function (index, element) {
+        $(element).on("show.bs.tab", function () {
+          var stateObject = { url: $(this).attr("href") };
+
+          if (window.location.hash && stateObject.url !== window.location.hash) {
+            window.history.pushState(
+              stateObject,
+              document.title,
+              window.location.pathname +
+              window.location.search +
+              $(this).attr("href")
+            );
+          } else {
+            window.history.replaceState(
+              stateObject,
+              document.title,
+              window.location.pathname +
+              window.location.search +
+              $(this).attr("href")
+            );
+          }
+        });
+        if (!window.location.hash && $(element).is(".active")) {
+          // Shows the first element if there are no query parameters.
+          $(element).tab("show");
+        } else if ($(this).attr("href") === window.location.hash) {
+          $(element).tab("show");
+        }
+      });
+    };
+  })(jQuery);
 
 // Copyright (c) 2011 Marcus Ekwall, http://writeless.se/
 // https://github.com/mekwall/jquery-throttle

package/restart_watcher.js

@@ -23,6 +23,7 @@ const relevantPackages = [
   "saltcorn-sbadmin2",
   "server",
   "sqlite",
+  "filemanager"
 ];
 
 /**

package/routes/actions.js

@@ -5,7 +5,12 @@
  * @subcategory routes
  */
 const Router = require("express-promise-router");
-const { isAdmin, error_catcher, get_base_url } = require("./utils.js");
+const {
+  isAdmin,
+  error_catcher,
+  get_base_url,
+  addOnDoneRedirect,
+} = require("./utils.js");
 const { getState } = require("@saltcorn/data/db/state");
 const Trigger = require("@saltcorn/data/models/trigger");
 const { getTriggerList } = require("./common_lists");
@@ -87,7 +92,6 @@ router.get(
   error_catcher(async (req, res) => {
     const triggers = await Trigger.findAllWithTableName();
     const actions = await getActions();
-    const base_url = get_base_url(req);
     send_events_page({
       res,
       req,
@@ -149,6 +153,7 @@ const triggerForm = async (req, trigger) => {
     id = trigger.id;
     form_action = `/actions/edit/${id}`;
   } else form_action = "/actions/new";
+  form_action = addOnDoneRedirect(form_action, req);
   const hasChannel = Object.entries(getState().eventTypes)
     .filter(([k, v]) => v.hasChannel)
     .map(([k, v]) => k);
@@ -323,7 +328,7 @@ router.post(
         const tr = await Trigger.create(form.values);
         id = tr.id;
       }
-      res.redirect(`/actions/configure/${id}`);
+      res.redirect(addOnDoneRedirect(`/actions/configure/${id}`, req));
     }
   })
 );
@@ -382,6 +387,11 @@ router.get(
   error_catcher(async (req, res) => {
     const { id } = req.params;
     const trigger = await Trigger.findOne({ id });
+    if (!trigger) {
+      req.flash("warning", req.__("Action not found"));
+      res.redirect(`/actions/`);
+      return
+    }
     const action = getState().actions[trigger.action];
     if (!action) {
       req.flash("warning", req.__("Action not found"));
@@ -389,7 +399,7 @@ router.get(
     } else if (trigger.action === "blocks") {
       const locale = req.getLocale();
       const form = new Form({
-        action: `/actions/configure/${id}`,
+        action: addOnDoneRedirect(`/actions/configure/${id}`, req),
         fields: action.configFields,
         noSubmitButton: true,
         id: "blocklyForm",
@@ -464,7 +474,7 @@ router.get(
       const cfgFields = await getActionConfigFields(action, table);
       // create form
       const form = new Form({
-        action: `/actions/configure/${id}`,
+        action: addOnDoneRedirect(`/actions/configure/${id}`, req),
         fields: cfgFields,
       });
       // populate form values
@@ -522,7 +532,11 @@ router.post(
     } else {
       await Trigger.update(trigger.id, { configuration: form.values });
       req.flash("success", "Action configuration saved");
-      res.redirect(`/actions/`);
+      res.redirect(
+        req.query.on_done_redirect
+          ? `/${req.query.on_done_redirect}`
+          : "/actions/"
+      );
     }
   })
 );