@saltcorn/server 0.6.3 → 0.6.4-beta.1

package/locales/en.json

@@ -859,5 +859,7 @@
 	"Two-factor authentication with Time-based One-Time Password disabled": "Two-factor authentication with Time-based One-Time Password disabled",
 	"Two-factor authentication is disabled": "Two-factor authentication is disabled",
 	"Auto save": "Auto save",
-	"Save any changes immediately": "Save any changes immediately"
+	"Save any changes immediately": "Save any changes immediately",
+	"Transpose": "Transpose",
+	"Display one column per line": "Display one column per line"
 }

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.6.3",
+  "version": "0.6.4-beta.1",
   "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.3",
-    "@saltcorn/builder": "0.6.3",
-    "@saltcorn/data": "0.6.3",
+    "@saltcorn/base-plugin": "0.6.4-beta.1",
+    "@saltcorn/builder": "0.6.4-beta.1",
+    "@saltcorn/data": "0.6.4-beta.1",
     "greenlock-express": "^4.0.3",
-    "@saltcorn/markup": "0.6.3",
-    "@saltcorn/sbadmin2": "0.6.3",
+    "@saltcorn/markup": "0.6.4-beta.1",
+    "@saltcorn/sbadmin2": "0.6.4-beta.1",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "connect-flash": "^0.1.1",

package/public/saltcorn.js

@@ -506,6 +506,7 @@ function ajax_modal(url, opts = {}) {
       if (title) $("#scmodal .modal-title").html(decodeURIComponent(title));
       $("#scmodal .modal-body").html(res);
       $("#scmodal").modal();
+      initialize_page();
       (opts.onOpen || function () {})(res);
       $("#scmodal").on("hidden.bs.modal", function (e) {
         (opts.onClose || function () {})(res);
@@ -604,7 +605,33 @@ function ajax_post_btn(e, reload_on_done, reload_delay) {
 
   return false;
 }
-
+function make_unique_field(id, table_id, field_name, value) {
+  if (!value) return;
+  $.ajax(
+    `/api/${table_id}?approximate=true&${encodeURIComponent(
+      field_name
+    )}=${encodeURIComponent(value)}&fields=${encodeURIComponent(field_name)}`,
+    {
+      type: "GET",
+      success: function (res) {
+        if (res.success) {
+          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(newname)) {
+                $("#" + id).val(newname);
+                return;
+              }
+            }
+          }
+        }
+      },
+    }
+  );
+}
 function test_formula(tablename, stored) {
   var formula = $("input[name=expression]").val();
   ajax_post(`/field/test-formula`, {

package/routes/admin.js

@@ -5,7 +5,12 @@
  */
 const Router = require("express-promise-router");
 
-const { isAdmin, error_catcher, getGitRevision } = require("./utils.js");
+const {
+  isAdmin,
+  error_catcher,
+  getGitRevision,
+  setTenant,
+} = require("./utils.js");
 const Table = require("@saltcorn/data/models/table");
 const Plugin = require("@saltcorn/data/models/plugin");
 const File = require("@saltcorn/data/models/file");
@@ -518,6 +523,7 @@ router.post(
  */
 router.post(
   "/restore",
+  setTenant, // TODO why is this needed?????
   isAdmin,
   error_catcher(async (req, res) => {
     const newPath = File.get_new_path();

package/routes/api.js

@@ -28,6 +28,7 @@ const passport = require("passport");
 const {
   stateFieldsToWhere,
   readState,
+  strictParseInt,
 } = require("@saltcorn/data/plugin-helper");
 
 /**
@@ -121,9 +122,13 @@ router.get(
   "/:tableName/",
   //passport.authenticate("api-bearer", { session: false }),
   error_catcher(async (req, res, next) => {
-    const { tableName } = req.params;
-    const { fields, versioncount, ...req_query } = req.query;
-    const table = await Table.findOne({ name: tableName });
+    let { tableName } = req.params;
+    const { fields, versioncount, approximate, ...req_query } = req.query;
+    const table = await Table.findOne(
+      strictParseInt(tableName)
+        ? { id: strictParseInt(tableName) }
+        : { name: tableName }
+    );
     if (!table) {
       res.status(404).json({ error: req.__("Not found") });
       return;
@@ -152,8 +157,8 @@ router.get(
             const tbl_fields = await table.getFields();
             const qstate = await stateFieldsToWhere({
               fields: tbl_fields,
-              approximate: false,
-              state: req.query,
+              approximate: !!approximate,
+              state: req_query,
             });
             rows = await table.getRows(qstate);
           } else {

package/routes/files.js

@@ -17,7 +17,7 @@ const {
   post_btn,
   post_delete_btn,
 } = require("@saltcorn/markup");
-const { isAdmin, error_catcher } = require("./utils.js");
+const { isAdmin, error_catcher, setTenant } = require("./utils.js");
 const {
   span,
   h5,
@@ -240,6 +240,7 @@ router.post(
  */
 router.post(
   "/upload",
+  setTenant, // TODO why is this needed?????
   error_catcher(async (req, res) => {
     let jsonResp = {};
     const min_role_upload = getState().getConfig("min_role_upload", 1);

package/routes/tables.js

@@ -22,7 +22,7 @@ const {
   post_dropdown_item,
 } = require("@saltcorn/markup");
 const { recalculate_for_stored } = require("@saltcorn/data/models/expression");
-const { isAdmin, error_catcher } = require("./utils.js");
+const { isAdmin, error_catcher, setTenant } = require("./utils.js");
 const Form = require("@saltcorn/data/models/form");
 const {
   span,
@@ -352,6 +352,7 @@ router.get(
  */
 router.post(
   "/create-from-csv",
+  setTenant, // TODO why is this needed?????
   isAdmin,
   error_catcher(async (req, res) => {
     if (req.body.name && req.files && req.files.file) {
@@ -1367,6 +1368,7 @@ router.post(
  */
 router.post(
   "/upload_to_table/:name",
+  setTenant, // TODO why is this needed?????
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;

package/routes/view.js

@@ -16,6 +16,7 @@ const {
   isAdmin,
   error_catcher,
   scan_for_page_title,
+  setTenant,
 } = require("../routes/utils.js");
 const { add_edit_bar } = require("../markup/admin.js");
 const { InvalidConfiguration } = require("@saltcorn/data/utils");
@@ -144,6 +145,7 @@ router.post(
  */
 router.post(
   ["/:viewname", "/:viewname/*"],
+  setTenant,
   error_catcher(async (req, res) => {
     const { viewname } = req.params;
     const role = req.user && req.user.id ? req.user.role_id : 10;