@saltcorn/server 0.7.2-beta.3 → 0.7.2-beta.6

package/public/saltcorn.js

@@ -1,365 +1,14 @@
-//https://stackoverflow.com/a/698386
-jQuery.fn.swapWith = function (to) {
-  return this.each(function () {
-    var copy_to = $(to).clone(true);
-    var copy_from = $(this).clone(true);
-    $(to).replaceWith(copy_from);
-    $(this).replaceWith(copy_to);
-  });
-};
-
-//avoids hiding in overflow:hidden
-function init_bs5_dropdowns() {
-  $("body").on(
-    "show.bs.dropdown",
-    "table [data-bs-toggle=dropdown]",
-    function () {
-      let target;
-      if (!$("#page-inner-content").length) target = $("body");
-      else target = $("#page-inner-content");
-      let dropdown = bootstrap.Dropdown.getInstance(this);
-      $(dropdown._menu).insertAfter(target);
-    }
-  );
-}
 function sortby(k, desc) {
   set_state_fields({ _sortby: k, _sortdesc: desc ? "on" : { unset: true } });
 }
 function gopage(n, pagesize, extra = {}) {
   set_state_fields({ ...extra, _page: n, _pagesize: pagesize });
 }
-function add_repeater(nm) {
-  var es = $("div.form-repeat.repeat-" + nm);
-  var e = es.first();
-  var newix = es.length;
-  var newe = $(e).clone();
-  newe.find("[name]").each(function (ix, element) {
-    var newnm = (element.name || "").replace("_0", "_" + newix);
-    var newid = (element.id || "").replace("_0", "_" + newix);
-    $(element).attr("name", newnm).attr("id", newid);
-  });
-  newe.appendTo($("div.repeats-" + nm));
-}
-// "e.closest('.form-namespace').find('.coltype').val()==='Field';"
-function apply_showif() {
-  $("[data-show-if]").each(function (ix, element) {
-    var e = $(element);
-    try {
-      var to_show = new Function(
-        "e",
-        "return " + decodeURIComponent(e.attr("data-show-if"))
-      );
-      if (to_show(e))
-        e.show()
-          .find("input, textarea, button, select")
-          .prop("disabled", e.attr("data-disabled") || false);
-      else
-        e.hide().find("input, textarea, button, select").prop("disabled", true);
-    } catch (e) {
-      console.error(e);
-    }
-  });
-  $("[data-calc-options]").each(function (ix, element) {
-    var e = $(element);
-    var data = JSON.parse(decodeURIComponent(e.attr("data-calc-options")));
-
-    var val = e
-      .closest(".form-namespace")
-      .find(`[data-fieldname=${data[0]}]`)
-      .val();
-
-    var options = data[1][val];
-    var current = e.attr("data-selected");
-    //console.log({ val, options, current, data });
-    e.empty();
-    (options || []).forEach((o) => {
-      if (
-        !(o && typeof o.label !== "undefined" && typeof o.value !== "undefined")
-      ) {
-        if (`${current}` === `${o}`)
-          e.append($("<option selected>" + o + "</option>"));
-        else e.append($("<option>" + o + "</option>"));
-      } else {
-        e.append(
-          $(
-            `<option ${
-              `${current}` === `${o.value}` ? "selected" : ""
-            } value="${o.value}">${o.label}</option>`
-          )
-        );
-      }
-    });
-    e.change(function (ec) {
-      e.attr("data-selected", ec.target.value);
-    });
-  });
-  $("[data-source-url]").each(function (ix, element) {
-    const e = $(element);
-    const rec = get_form_record(e);
-    ajax_post_json(e.attr("data-source-url"), rec, {
-      success: (data) => {
-        e.html(data);
-      },
-      error: (err) => {
-        console.error(err);
-        e.html("");
-      },
-    });
-  });
-}
-function get_form_record(e, select_labels) {
-  const rec = {};
-  e.closest("form")
-    .find("input[name],select[name]")
-    .each(function () {
-      if (select_labels && $(this).prop("tagName").toLowerCase() === "select")
-        rec[$(this).attr("name")] = $(this).find("option:selected").text();
-      else if ($(this).prop("type") === "checkbox")
-        rec[$(this).attr("name")] = $(this).prop("checked");
-      else rec[$(this).attr("name")] = $(this).val();
-    });
-  return rec;
-}
-function showIfFormulaInputs(e, fml) {
-  const rec = get_form_record(e);
-  return new Function(`{${Object.keys(rec).join(",")}}`, "return " + fml)(rec);
-}
-
-function rep_del(e) {
-  var myrep = $(e).closest(".form-repeat");
-  var ix = myrep.index();
-  var parent = myrep.parent();
-  parent.children().each(function (childix, element) {
-    if (childix > ix) {
-      reindex(element, childix, childix - 1);
-    }
-  });
-  myrep.remove();
-}
-
-function reindex(element, oldix, newix) {
-  $(element).html(
-    $(element)
-      .html()
-      .split("_" + oldix)
-      .join("_" + newix)
-  );
-}
-
-function get_form_subset_record(e) {
-  const rec = {};
-  e.find("input[name],select[name]").each(function () {
-    rec[$(this).attr("name")] = $(this).val();
-  });
-  return rec;
-}
-
-function apply_form_subset_record(e, vals) {
-  e.find("input[name],select[name]").each(function () {
-    var name = $(this).attr("name");
-    if (vals[name]) $(this).val(vals[name]);
-  });
-}
-
-function reindex_form_record(vals, oldix, newix) {
-  const rec = {};
-  Object.keys(vals).forEach((k) => {
-    const newkey = k.split("_" + oldix).join("_" + newix);
-    rec[newkey] = vals[k];
-  });
-  return rec;
-}
-
-function rep_up(e) {
-  var myrep = $(e).closest(".form-repeat");
-  var theform = $(e).closest("form");
-  var ix = myrep.index();
-  var parent = myrep.parent();
-  if (ix > 0) {
-    var swap_with = parent.children(".form-repeat").eq(ix - 1);
-    var vals1 = reindex_form_record(get_form_subset_record(myrep), ix, ix - 1);
-    var vals2 = reindex_form_record(
-      get_form_subset_record(swap_with),
-      ix - 1,
-      ix
-    );
-    reindex(myrep, ix, ix - 1);
-    reindex(swap_with, ix - 1, ix);
-    $(myrep).swapWith(swap_with);
-    apply_form_subset_record(theform, vals2);
-    apply_form_subset_record(theform, vals1);
-  }
-}
-
-function rep_down(e) {
-  var myrep = $(e).closest(".form-repeat");
-  var theform = $(e).closest("form");
-  var ix = myrep.index();
-  var parent = myrep.parent();
-  var nchildren = parent.children(".form-repeat").length;
-  if (ix < nchildren - 1) {
-    var swap_with = parent.children(".form-repeat").eq(ix + 1);
-    var vals1 = reindex_form_record(get_form_subset_record(myrep), ix, ix + 1);
-    var vals2 = reindex_form_record(
-      get_form_subset_record(swap_with),
-      ix + 1,
-      ix
-    );
-    reindex(myrep, ix, ix + 1);
-    reindex(swap_with, ix + 1, ix);
-    $(myrep).swapWith(swap_with);
-    apply_form_subset_record(theform, vals2);
-    apply_form_subset_record(theform, vals1);
-  }
-}
 
-function reload_on_init() {
-  localStorage.setItem("reload_on_init", true);
-}
 if (localStorage.getItem("reload_on_init")) {
   localStorage.removeItem("reload_on_init");
   location.reload();
 }
-function initialize_page() {
-  $(".blur-on-enter-keypress").bind("keyup", function (e) {
-    if (e.keyCode === 13) e.target.blur();
-  });
-  $("form").change(apply_showif);
-  apply_showif();
-  apply_showif();
-  $("[data-inline-edit-dest-url]").each(function () {
-    if ($(this).find(".editicon").length === 0) {
-      var current = $(this).html();
-      $(this).html(
-        `<span class="current">${current}</span><i class="editicon fas fa-edit ms-1"></i>`
-      );
-    }
-  });
-  $("[data-inline-edit-dest-url]").click(function () {
-    var url = $(this).attr("data-inline-edit-dest-url");
-    var current = $(this).children("span.current").html();
-    $(this).replaceWith(
-      `<form method="post" action="${url}" >
-      <input type="hidden" name="_csrf" value="${_sc_globalCsrf}">
-      <input type="text" name="value" value="${current}">
-      <button type="submit" class="btn btn-sm btn-primary">OK</button>
-      </form>`
-    );
-  });
-  function setExplainer(that) {
-    var id = $(that).attr("id") + "_explainer";
-
-    var explainers = JSON.parse(
-      decodeURIComponent($(that).attr("data-explainers"))
-    );
-    var currentVal = explainers[$(that).val()];
-    $("#" + id).html(`<strong>${$(that).val()}</strong>: ${currentVal}`);
-    if (currentVal) $("#" + id).show();
-    else $("#" + id).hide();
-  }
-  $("[data-explainers]").each(function () {
-    var id = $(this).attr("id") + "_explainer";
-    if ($("#" + id).length === 0) {
-      $(this).after(`<div class="alert alert-info my-2" id="${id}"></div>`);
-      setExplainer(this);
-    }
-  });
-  $("[data-explainers]").change(function () {
-    setExplainer(this);
-  });
-
-  const codes = [];
-  $("textarea.to-code").each(function () {
-    codes.push(this);
-  });
-  if (codes.length > 0)
-    enable_codemirror(() => {
-      setTimeout(() => {
-        codes.forEach((el) => {
-          //console.log($(el).attr("mode"), el);
-          CodeMirror.fromTextArea(el, {
-            lineNumbers: true,
-            mode: $(el).attr("mode"),
-          });
-        });
-      }, 100);
-    });
-  const locale =
-    navigator.userLanguage ||
-    (navigator.languages &&
-      navigator.languages.length &&
-      navigator.languages[0]) ||
-    navigator.language ||
-    navigator.browserLanguage ||
-    navigator.systemLanguage ||
-    "en";
-  window.detected_locale = locale;
-  const parse = (s) => JSON.parse(decodeURIComponent(s));
-  $("time[locale-time-options]").each(function () {
-    var el = $(this);
-    var date = new Date(el.attr("datetime"));
-    const options = parse(el.attr("locale-time-options"));
-    el.text(date.toLocaleTimeString(locale, options));
-  });
-  $("time[locale-options]").each(function () {
-    var el = $(this);
-    var date = new Date(el.attr("datetime"));
-    const options = parse(el.attr("locale-options"));
-    el.text(date.toLocaleString(locale, options));
-  });
-  $("time[locale-date-options]").each(function () {
-    var el = $(this);
-    var date = new Date(el.attr("datetime"));
-    const options = parse(el.attr("locale-date-options"));
-    el.text(date.toLocaleDateString(locale, options));
-  });
-  $('a[data-bs-toggle="tab"].deeplink').historyTabs();
-  init_bs5_dropdowns();
-
-  // Initialize Sliders - https://stackoverflow.com/a/31083391
-  var sliderSections = document.getElementsByClassName("range-slider");
-  for (var x = 0; x < sliderSections.length; x++) {
-    var sliders = sliderSections[x].getElementsByTagName("input");
-    for (var y = 0; y < sliders.length; y++) {
-      if (sliders[y].type === "range") {
-        sliders[y].oninput = function () {
-          // Get slider values
-          var parent = this.parentNode;
-          var slides = parent.getElementsByTagName("input");
-          var slide1 = parseFloat(slides[0].value);
-          var slide2 = parseFloat(slides[1].value);
-          // Neither slider will clip the other, so make sure we determine which is larger
-          if (slide1 > slide2) {
-            var tmp = slide2;
-            slide2 = slide1;
-            slide1 = tmp;
-          }
-
-          var displayElement = parent.getElementsByClassName("rangeValues")[0];
-          displayElement.innerHTML = slide1 + " - " + slide2;
-        };
-        // Manually trigger event first time to display values
-        sliders[y].oninput();
-      }
-    }
-  }
-}
-
-$(initialize_page);
-
-function enable_codemirror(f) {
-  $("<link/>", {
-    rel: "stylesheet",
-    type: "text/css",
-    href: `/static_assets/${_sc_version_tag}/codemirror.css`,
-  }).appendTo("head");
-  $.ajax({
-    url: `/static_assets/${_sc_version_tag}/codemirror.min.js`,
-    dataType: "script",
-    cache: true,
-    success: f,
-  });
-}
 
 //https://stackoverflow.com/a/6021027
 function updateQueryStringParameter(uri1, key, value) {
@@ -474,23 +123,6 @@ function href_to(href) {
 function clear_state() {
   pjax_to(window.location.href.split("?")[0]);
 }
-function tristateClick(nm) {
-  var current = $(`button#trib${nm}`).html();
-  switch (current) {
-    case "?":
-      $(`button#trib${nm}`).html("T");
-      $(`input#input${nm}`).val("on");
-      break;
-    case "T":
-      $(`button#trib${nm}`).html("F");
-      $(`input#input${nm}`).val("off");
-      break;
-    default:
-      $(`button#trib${nm}`).html("?");
-      $(`input#input${nm}`).val("?");
-      break;
-  }
-}
 
 function ajax_done(res) {
   common_done(res);
@@ -619,43 +251,17 @@ function applyViewConfig(e, url) {
   return false;
 }
 
-const repeaterCopyValuesToForm = (form, editor) => {
-  const vs = JSON.parse(editor.getString());
-  const allNames = new Set([]);
-  const setVal = (k, ix, v) => {
-    const $e = form.find(`input[name="${k}_${ix}"]`);
-    if ($e.length) $e.val(v);
-    else
-      form.append(
-        `<input type="hidden" name="${k}_${ix}" value="${v}"></input>`
-      );
-  };
-  vs.forEach((v, ix) => {
-    Object.entries(v).forEach(([k, v]) => {
-      //console.log(ix, k, typeof v, v)
-      allNames.add(k);
-      if (typeof v === "boolean") setVal(k, ix, v ? "on" : "");
-      else setVal(k, ix, v);
-    });
-  });
-  //delete
-  [...allNames].forEach((k) => {
-    for (let ix = vs.length; ix < vs.length + 20; ix++) {
-      $(`input[name=${k}_${ix}]`).remove();
-    }
-  });
-};
-
 function ajaxSubmitForm(e) {
   var form = $(e).closest("form");
   var url = form.attr("action");
-  var form_data = form.serialize();
   $.ajax(url, {
     type: "POST",
     headers: {
       "CSRF-Token": _sc_globalCsrf,
     },
-    data: form_data,
+    data: new FormData(form[0]),
+    processData: false,
+    contentType: false,
     success: function () {
       var no_reload = $("#scmodal").hasClass("no-submit-reload");
       $("#scmodal").modal("hide");
@@ -754,26 +360,6 @@ function test_formula(tablename, stored) {
     },
   });
 }
-function align_dropdown(id) {
-  setTimeout(() => {
-    if ($("#dm" + id).hasClass("show")) {
-      var inputWidth = $("#search-input-group-" + id).outerWidth();
-      $("#dm" + id).css("width", inputWidth);
-      var d0pos = $("#search-input-group-" + id).offset();
-      $("#dm" + id).offset({ left: d0pos.left });
-      $(document).on("click", "#dm" + id, function (e) {
-        e.stopPropagation();
-      });
-    }
-  }, 0);
-}
-
-function remove_outline(form) {
-  $(form)
-    .find("button[type=submit]")
-    .removeClass("btn-outline-primary")
-    .addClass("btn-primary");
-}
 
 function init_room(viewname, room_id) {
   const socket = io({ transports: ["websocket"] });
@@ -843,25 +429,6 @@ async function fill_formula_btn_click(btn, k) {
   if (k) k();
 }
 
-const columnSummary = (col) => {
-  if (!col) return "Unknown";
-  switch (col.type) {
-    case "Field":
-      return `Field ${col.field_name} ${col.fieldview || ""}`;
-    case "Link":
-      return `Link ${col.link_text}`;
-    case "JoinField":
-      return `Join ${col.join_field}`;
-    case "ViewLink":
-      return `View link ${col.view_label || col.view.split(":")[1] || ""}`;
-    case "Action":
-      return `Action ${col.action_label || col.action_name}`;
-    case "Aggregation":
-      return `${col.stat} ${col.agg_field} ${col.agg_relation}`;
-    default:
-      return "Unknown";
-  }
-};
 
 /*
 https://github.com/jeffdavidgreen/bootstrap-html5-history-tabs/blob/master/bootstrap-history-tabs.js

package/routes/admin.js

@@ -23,9 +23,6 @@ const {
   div,
   a,
   hr,
-  form,
-  input,
-  label,
   i,
   h4,
   table,
@@ -33,7 +30,6 @@ const {
   td,
   th,
   tr,
-  button,
   span,
   p,
   code,
@@ -45,7 +41,7 @@ const {
   getState,
   restart_tenant,
   getTenant,
-  get_other_domain_tenant,
+  //get_other_domain_tenant,
   get_process_init_time,
 } = require("@saltcorn/data/db/state");
 const { loadAllPlugins } = require("../load_plugins");
@@ -61,7 +57,7 @@ const load_plugins = require("../load_plugins");
 const {
   restore_backup,
   send_admin_page,
-  send_files_page,
+  //send_files_page,
   config_fields_form,
   save_config_from_form,
   flash_restart_if_required,
@@ -90,8 +86,9 @@ const router = new Router();
 module.exports = router;
 
 /**
- * @param {object} req
- * @returns {Promise<Form>}
+ * Site identity form
+ * @param {object} req -http request
+ * @returns {Promise<Form>} form
  */
 const site_id_form = (req) =>
   config_fields_form({
@@ -106,13 +103,15 @@ const site_id_form = (req) =>
       "page_custom_html",
       "development_mode",
       "log_sql",
+      "plugins_store_endpoint",
+      "packs_store_endpoint",
       ...(getConfigFile() ? ["multitenancy_enabled"] : []),
     ],
     action: "/admin",
     submitLabel: req.__("Save"),
   });
 /**
- * Email settings form definition
+ * Email settings form
  * @param {object} req request
  * @returns {Promise<Form>} form
  */
@@ -137,6 +136,7 @@ const email_form = async (req) => {
 };
 
 /**
+ * Router get /
  * @name get
  * @function
  * @memberof module:routes/admin~routes/adminRouter
@@ -145,7 +145,6 @@ router.get(
   "/",
   isAdmin,
   error_catcher(async (req, res) => {
-    const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
     const form = await site_id_form(req);
     send_admin_page({
       res,
@@ -527,6 +526,9 @@ router.post(
     }
   })
 );
+/**
+ * /check-for-updates
+ */
 router.post(
   "/check-for-upgrade",
   isAdmin,
@@ -548,8 +550,8 @@ router.post(
     const fileName = await create_backup();
     res.type("application/zip");
     res.attachment(fileName);
-    var file = fs.createReadStream(fileName);
-    file.on("end", function () {
+      const file = fs.createReadStream(fileName);
+      file.on("end", function () {
       fs.unlink(fileName, function () {});
     });
     file.pipe(res);
@@ -579,8 +581,9 @@ router.post(
 );
 
 /**
+ * Clear All Form
  * @param {object} req
- * @returns {Form}
+ * @returns {Form} form
  */
 const clearAllForm = (req) =>
   new Form({
@@ -694,6 +697,7 @@ router.post(
       try {
         const file_store = db.connectObj.file_store;
         const admin_users = await User.find({ role_id: 1 }, { orderBy: "id" });
+        // greenlock logic
         const Greenlock = require("greenlock");
         const greenlock = Greenlock.create({
           packageRoot: path.resolve(__dirname, ".."),
@@ -709,6 +713,7 @@ router.post(
           subject: domain,
           altnames,
         });
+        // letsencrypt
         await getState().setConfig("letsencrypt", true);
         req.flash(
           "success",
@@ -758,7 +763,9 @@ router.get(
     });
   })
 );
-
+/**
+ * /confiuration-check
+ */
 router.get(
   "/configuration-check",
   isAdmin,
@@ -863,6 +870,7 @@ router.post(
     if (form.values.plugins) {
       const ps = await Plugin.find();
       for (const p of ps) {
+        // todo configurable list of mandatory plugins
         if (!["base", "sbadmin2"].includes(p.name)) await p.delete();
       }
       await getState().refresh_plugins();
@@ -902,6 +910,8 @@ router.post(
         req.logout();
         req.session = null;
       }
+      // todo make configurable - redirect to create first user
+      // redirect to create first user
       res.redirect(`/auth/create_first_user`);
     } else {
       req.flash(