@saltcorn/server 0.6.4-beta.2 → 0.6.4-beta.3

package/auth/resetpw.js

@@ -8,9 +8,9 @@ const { getMailTransport } = require("@saltcorn/data/models/email");
 const { get_base_url } = require("../routes/utils");
 
 /**
- * @param {string} link 
- * @param {object} user 
- * @param {object} req 
+ * @param {string} link
+ * @param {object} user
+ * @param {object} req
  * @returns {void}
  */
 const generate_email = (link, user, req) => ({
@@ -48,8 +48,8 @@ ${req.__(
 });
 
 /**
- * @param {object} user 
- * @param {object} req 
+ * @param {object} user
+ * @param {object} req
  * @returns {Promise<void>}
  */
 const send_reset_email = async (user, req) => {
@@ -59,8 +59,8 @@ const send_reset_email = async (user, req) => {
 };
 
 /**
- * @param {object} user 
- * @param {object} req 
+ * @param {object} user
+ * @param {object} req
  * @returns {Promise<string>}
  */
 const get_reset_link = async (user, req) => {

package/locales/en.json

@@ -865,5 +865,7 @@
 	"Vertical column width": "Vertical column width",
 	"Vertical width units": "Vertical width units",
 	"Save before going back": "Save before going back",
-	"Reload after going back": "Reload after going back"
+	"Reload after going back": "Reload after going back",
+	"2FA policy": "2FA policy",
+	"Steps to go back": "Steps to go back"
 }

package/package.json

@@ -1,23 +1,24 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.6.4-beta.2",
+  "version": "0.6.4-beta.3",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.6.4-beta.2",
-    "@saltcorn/builder": "0.6.4-beta.2",
-    "@saltcorn/data": "0.6.4-beta.2",
-    "@saltcorn/admin-models": "0.6.4-beta.2",
-    "greenlock-express": "^4.0.3",
-    "@saltcorn/markup": "0.6.4-beta.2",
-    "@saltcorn/sbadmin2": "0.6.4-beta.2",
+    "@saltcorn/base-plugin": "0.6.4-beta.3",
+    "@saltcorn/builder": "0.6.4-beta.3",
+    "@saltcorn/data": "0.6.4-beta.3",
+    "@saltcorn/admin-models": "0.6.4-beta.3",
+    "@saltcorn/markup": "0.6.4-beta.3",
+    "@saltcorn/sbadmin2": "0.6.4-beta.3",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
+    "aws-sdk": "^2.1037.0",
     "connect-flash": "^0.1.1",
     "connect-pg-simple": "^6.1.0",
     "connect-sqlite3": "^0.9.11",
+    "content-disposition": "^0.5.3",
     "contractis": "^0.1.0",
     "cookie-parser": "^1.4.4",
     "cookie-session": "^1.4.0",
@@ -29,10 +30,13 @@
     "express-rate-limit": "^5.1.3",
     "express-session": "^1.17.1",
     "greenlock": "^4.0.4",
+    "greenlock-express": "^4.0.3",
     "helmet": "^3.23.3",
     "i18n": "^0.13.2",
     "live-plugin-manager": "^0.16.0",
     "moment": "^2.27.0",
+    "multer": "^1.4.3",
+    "multer-s3": "^2.10.0",
     "node-fetch": "2.6.2",
     "node-watch": "^0.7.2",
     "notp": "2.0.3",
@@ -44,13 +48,9 @@
     "pluralize": "^8.0.0",
     "qrcode": "1.5.0",
     "socket.io": "4.2.0",
-    "tmp-promise": "^3.0.2",
     "thirty-two": "1.0.2",
-    "multer-s3": "^2.10.0",
-    "multer": "^1.4.3",
-    "aws-sdk": "^2.1037.0",
-    "uuid": "^8.2.0",
-    "content-disposition": "^0.5.3"
+    "tmp-promise": "^3.0.2",
+    "uuid": "^8.2.0"
   },
   "optionalDependencies": {
     "sd-notify": "^2.8.0"

package/public/gridedit.js

@@ -1,228 +1,169 @@
-/**
- * jsgrid_controller
- * @param table_name -
- * @param vc -
- * @param keyfields -
- * @returns {{deleteItem: (function(*): *), loadData: (function(*=): *), updateItem: (function(*=): *), insertItem: (function(*=): *)}}
- */
-
-function jsgrid_controller(table_name, vc, keyfields) {
-  var url = "/api/" + table_name + "/";
-  //
-  var fixKeys = function (item) {
-    keyfields.forEach((kf) => {
-      if (kf.type === "Integer") item[kf.name] = +item[kf.name];
-    });
-    return item;
+function showHideCol(nm, e) {
+  if (e && e.checked) window.tabulator_table.showColumn(nm);
+  else window.tabulator_table.hideColumn(nm);
+}
+
+function lookupIntToString(cell, formatterParams, onRendered) {
+  const val = `${cell.getValue()}`;
+  const res = formatterParams.values[val];
+  return res;
+}
+
+function flatpickerEditor(cell, onRendered, success, cancel) {
+  var input = $("<input type='text'/>");
+
+  input.flatpickr({
+    enableTime: true,
+    dateFormat: "Y-m-d H:i",
+    time_24hr: true,
+    locale: "en", // global variable with locale 'en', 'fr', ...
+    defaultDate: cell.getValue(),
+    onClose: function (selectedDates, dateStr, instance) {
+      evt = window.event;
+      var isEscape = false;
+      if ("key" in evt) {
+        isEscape = evt.key === "Escape" || evt.key === "Esc";
+      } else {
+        isEscape = evt.keyCode === 27;
+      }
+      if (isEscape) {
+        // user hit escape
+        cancel();
+      } else {
+        success(dateStr);
+      }
+    },
+  });
+
+  input.css({
+    border: "1px",
+    background: "transparent",
+    padding: "4px",
+    width: "100%",
+    "box-sizing": "border-box",
+  });
+
+  input.val(cell.getValue());
+
+  var inputBlur = function (e) {
+    if (e.target !== input[0]) {
+      if ($(e.target).closest(".flatpicker-input").length === 0) {
+        $(document).off("mousedown", inputBlur);
+      }
+    }
   };
-  var errorHandler = function (prom) {
-    return function (request) {
-      var errtxt =
-        request.responseJSON && request.responseJSON.error
-          ? request.responseJSON.error
-          : request.responseText;
-      $("#jsGridNotify").html(`<div class="alert alert-danger" role="alert">
+
+  $(document).on("mousedown", inputBlur);
+
+  onRendered(function () {
+    input.focus();
+  });
+
+  return input[0];
+}
+
+function isoDateTimeFormatter(cell, formatterParams, onRendered) {
+  const val = cell.getValue();
+  if (!val) return "";
+
+  return new Date(val).toLocaleString(window.detected_locale || "en");
+}
+function colorFormatter(cell, formatterParams, onRendered) {
+  const val = cell.getValue();
+  if (!val) return "";
+
+  return $(
+    `<div style="height: 15px; width: 30px; background-color: ${val}"></div>`
+  )[0];
+}
+
+function jsonFormatter(cell, formatterParams, onRendered) {
+  const val = cell.getValue();
+  if (val === null) return "";
+  return JSON.stringify(val, null, 1);
+}
+
+function versionsFormatter(cell, formatterParams, onRendered) {
+  const value = cell.getValue();
+  const row = cell.getRow().getData();
+  return $(`<a href="/list/_versions/${window.tabulator_table_name}/${row.id}">
+    ${value || 0}&nbsp;<i class="fa-sm fas fa-list"></i></a>`)[0];
+}
+function colorEditor(cell, onRendered, success, cancel) {
+  const editor = document.createElement("input");
+
+  editor.setAttribute("type", "color");
+  editor.value = cell.getValue();
+  //when the value has been set, trigger the cell to update
+  function successFunc() {
+    const val = editor.value;
+    success(val);
+  }
+
+  editor.addEventListener("change", successFunc);
+  editor.addEventListener("blur", successFunc);
+
+  //return the editor element
+  return editor;
+}
+
+function jsonEditor(cell, onRendered, success, cancel) {
+  const editor = document.createElement("textarea");
+
+  editor.value = JSON.stringify(cell.getValue());
+  //when the value has been set, trigger the cell to update
+  function successFunc() {
+    const val = editor.value;
+    try {
+      success(JSON.parse(val));
+    } catch (e) {
+      if (e) tabulator_show_error(e.message);
+      cancel();
+    }
+  }
+
+  editor.addEventListener("change", successFunc);
+  editor.addEventListener("blur", successFunc);
+
+  //return the editor element
+  return editor;
+}
+function add_tabulator_row() {
+  window.tabulator_table.addRow({}, true);
+}
+
+function delete_tabulator_row(e, cell) {
+  const row = cell.getRow().getData();
+  if (!row.id) {
+    cell.getRow().delete();
+    return;
+  }
+  $.ajax({
+    type: "DELETE",
+    url: `/api/${window.tabulator_table_name}/${row.id}`,
+    data: row, // to process primary keys different from id
+    headers: {
+      "CSRF-Token": _sc_globalCsrf,
+    },
+    success: () => cell.getRow().delete(),
+    error: tabulator_error_handler,
+  });
+}
+
+function tabulator_error_handler(request) {
+  let errtxt =
+    request.responseJSON && request.responseJSON.error
+      ? request.responseJSON.error
+      : request.responseText;
+  if (errtxt) {
+    tabulator_show_error(errtxt);
+  }
+}
+function tabulator_show_error(errtxt) {
+  $("#jsGridNotify").html(`<div class="alert alert-danger" role="alert">
     ${errtxt}
     <button type="button" class="close" data-dismiss="alert" aria-label="Close">
     <span aria-hidden="true">&times;</span>
   </button>
   </div>`);
-      if (prom) prom.reject(errtxt);
-    };
-  };
-  return {
-    // load of data
-    loadData: function (filter) {
-      var data = $.Deferred();
-      $.ajax({
-        type: "GET",
-        url: url + (vc ? "?versioncount=on" : ""),
-        data: filter,
-        error: errorHandler(data),
-      }).done(function (resp) {
-        data.resolve(resp.success);
-      });
-      return data.promise();
-    },
-    // insert row
-    insertItem: function (item) {
-      var data = $.Deferred();
-      $.ajax({
-        type: "POST",
-        url: url,
-        data: item,
-        headers: {
-          "CSRF-Token": _sc_globalCsrf,
-        },
-        error: errorHandler(data),
-      }).done(function (resp) {
-        item._versions = 1;
-        if (resp.success) {
-          item.id = resp.success;
-          data.resolve(fixKeys(item));
-        } else {
-          data.resolve();
-        }
-      });
-      return data.promise();
-    },
-    // update row
-    updateItem: function (item) {
-      var data = $.Deferred();
-      $.ajax({
-        type: "POST",
-        url: url + item.id,
-        data: item,
-        headers: {
-          "CSRF-Token": _sc_globalCsrf,
-        },
-        error: errorHandler(data),
-      }).done(function (resp) {
-        if (item._versions) item._versions = +item._versions + 1;
-        data.resolve(fixKeys(item));
-      });
-      return data.promise();
-    },
-    // delete row
-    deleteItem: function (item) {
-      return $.ajax({
-        type: "DELETE",
-        url: url + item.id,
-        data: item, // to process primary keys different from id
-        headers: {
-          "CSRF-Token": _sc_globalCsrf,
-        },
-        error: errorHandler(),
-      });
-    },
-  };
-}
-function DecimalField(config) {
-  jsGrid.fields.number.call(this, config);
 }
-DecimalField.prototype = new jsGrid.fields.number({
-  filterValue: function () {
-    return this.filterControl.val()
-      ? parseFloat(this.filterControl.val() || 0, 10)
-      : undefined;
-  },
-
-  insertValue: function () {
-    return this.insertControl.val()
-      ? parseFloat(this.insertControl.val() || 0, 10)
-      : undefined;
-  },
-
-  editValue: function () {
-    return this.editControl.val()
-      ? parseFloat(this.editControl.val() || 0, 10)
-      : undefined;
-  },
-});
-
-jsGrid.fields.decimal = jsGrid.DecimalField = DecimalField;
-
-var ColorField = function (config) {
-  jsGrid.Field.call(this, config);
-};
-
-ColorField.prototype = new jsGrid.Field({
-  itemTemplate: function (value) {
-    return $("<div>").css({
-      display: "inline-block",
-      background: value,
-      width: "50px",
-      height: "20px",
-    });
-  },
-
-  insertTemplate: function (value) {
-    var insertPicker = (this._insertPicker = $("<input>").attr(
-      "type",
-      "color"
-    ));
-
-    return insertPicker;
-  },
-
-  editTemplate: function (value) {
-    var editPicker = (this._editPicker = $("<input>")
-      .attr("type", "color")
-      .val(value));
-
-    return editPicker;
-  },
-
-  insertValue: function () {
-    return this._insertPicker.val();
-  },
-
-  editValue: function () {
-    return this._editPicker.val();
-  },
-});
-
-jsGrid.fields.color = ColorField;
-
-var DateField = function (config) {
-  jsGrid.Field.call(this, config);
-};
-
-DateField.prototype = new jsGrid.Field({
-  itemTemplate: function (value) {
-    var v = typeof value === "string" && value !== "" ? new Date(value) : value;
-    return v && v.toLocaleString ? v.toLocaleString() : v;
-  },
-
-  insertTemplate: function (value) {
-    var insertPicker = (this._insertPicker = $("<input>").attr("type", "text"));
-    setTimeout(function () {
-      flatpickr(insertPicker, {
-        enableTime: true,
-        dateFormat: "Z",
-        altInput: true,
-        altFormat: "Y-m-d h:i K",
-      });
-    });
-    return insertPicker;
-  },
-
-  editTemplate: function (value) {
-    var editPicker = (this._editPicker = $("<input>")
-      .attr("type", "text")
-      .val(value));
-    setTimeout(function () {
-      flatpickr(editPicker, {
-        enableTime: true,
-        dateFormat: "Z",
-        altInput: true,
-        altFormat: "Y-m-d h:i K",
-      });
-    });
-    return editPicker;
-  },
-
-  insertValue: function () {
-    return this._insertPicker.val();
-  },
-
-  editValue: function () {
-    return this._editPicker.val();
-  },
-});
-
-jsGrid.fields.date = DateField;
-
-var HtmlField = function (config) {
-  jsGrid.Field.call(this, config);
-};
-HtmlField.prototype = new jsGrid.Field({
-  align: "left",
-  itemTemplate: function (value, item) {
-    if (value) {
-      //return +value+1;
-      return value;
-    } else return "";
-  },
-});
-jsGrid.fields.html = HtmlField;

package/public/saltcorn.js

@@ -177,6 +177,14 @@ function rep_down(e) {
     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() {
   $("form").change(apply_showif);
   apply_showif();
@@ -247,6 +255,7 @@ function initialize_page() {
     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);
@@ -266,6 +275,7 @@ function initialize_page() {
     const options = parse(el.attr("locale-date-options"));
     el.text(date.toLocaleDateString(locale, options));
   });
+  $('a[data-toggle="tab"]').historyTabs();
 }
 
 $(initialize_page);
@@ -610,7 +620,15 @@ function ajax_post_btn(e, reload_on_done, reload_delay) {
 
   return false;
 }
-function make_unique_field(id, table_id, field_name, value) {
+function make_unique_field(
+  id,
+  table_id,
+  field_name,
+  value,
+  space,
+  start,
+  always_append
+) {
   if (!value) return;
   $.ajax(
     `/api/${table_id}?approximate=true&${encodeURIComponent(
@@ -623,9 +641,9 @@ function make_unique_field(id, table_id, field_name, value) {
           const vals = res.success
             .map((o) => o[field_name])
             .filter((s) => s.startsWith(value));
-          if (vals.includes(value)) {
-            for (let i = 1; i < vals.length + 1; i++) {
-              const newname = `${value} ${i}`;
+          if (vals.includes(value) || always_append) {
+            for (let i = start || 0; i < vals.length + (start || 0) + 2; i++) {
+              const newname = `${value}${space ? " " : ""}${i}`;
               if (!vals.includes(newname)) {
                 $("#" + id).val(newname);
                 return;
@@ -702,6 +720,51 @@ function room_older(viewname, room_id, btn) {
     }
   );
 }
-function showHideCol(nm, e) {
-  $("#jsGrid").jsGrid("fieldOption", nm, "visible", e.checked);
-}
+
+/*
+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);