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

package/app.js

@@ -28,6 +28,7 @@ const {
   getSessionStore,
   setTenant,
 } = require("./routes/utils.js");
+const { getAllTenants } = require("@saltcorn/admin-models/models/tenant");
 const path = require("path");
 const fileUpload = require("express-fileupload");
 const helmet = require("helmet");
@@ -84,7 +85,8 @@ const getApp = async (opts = {}) => {
   app.use(i18n.init);
   // init multitenant mode
   if (db.is_it_multi_tenant()) {
-    await init_multi_tenant(loadAllPlugins, opts.disableMigrate);
+    const tenants = await getAllTenants();
+    await init_multi_tenant(loadAllPlugins, opts.disableMigrate, tenants);
   }
   //
   // todo ability to configure session_secret Age

package/auth/routes.js

@@ -53,7 +53,7 @@ const Table = require("@saltcorn/data/models/table");
 const { InvalidConfiguration } = require("@saltcorn/data/utils");
 const Trigger = require("@saltcorn/data/models/trigger");
 const { restore_backup } = require("../markup/admin.js");
-const { restore } = require("@saltcorn/data/models/backup");
+const { restore } = require("@saltcorn/admin-models/models/backup");
 const load_plugins = require("../load_plugins");
 const fs = require("fs");
 const base32 = require("thirty-two");

package/locales/en.json

@@ -861,5 +861,9 @@
 	"Auto save": "Auto save",
 	"Save any changes immediately": "Save any changes immediately",
 	"Transpose": "Transpose",
-	"Display one column per line": "Display one column per line"
+	"Display one column per line": "Display one column per line",
+	"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"
 }

package/package.json

@@ -1,17 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.6.4-beta.1",
+  "version": "0.6.4-beta.2",
   "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.1",
-    "@saltcorn/builder": "0.6.4-beta.1",
-    "@saltcorn/data": "0.6.4-beta.1",
+    "@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.1",
-    "@saltcorn/sbadmin2": "0.6.4-beta.1",
+    "@saltcorn/markup": "0.6.4-beta.2",
+    "@saltcorn/sbadmin2": "0.6.4-beta.2",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "connect-flash": "^0.1.1",
@@ -81,7 +82,9 @@
       "@saltcorn/data/(.*)": "@saltcorn/data/dist/$1",
       "@saltcorn/types/(.*)": "@saltcorn/types/dist/$1",
       "@saltcorn/markup$": "@saltcorn/markup/dist",
-      "@saltcorn/markup/(.*)": "@saltcorn/markup/dist/$1"
+      "@saltcorn/markup/(.*)": "@saltcorn/markup/dist/$1",
+      "@saltcorn/server/(.*)": "@saltcorn/server/dist/$1",
+      "@saltcorn/admin-models/(.*)": "@saltcorn/admin-models/dist/$1"
     }
   },
   "publishConfig": {

package/public/saltcorn.js

@@ -228,13 +228,15 @@ function initialize_page() {
   });
   if (codes.length > 0)
     enable_codemirror(() => {
-      codes.forEach((el) => {
-        console.log($(el).attr("mode"), el);
-        CodeMirror.fromTextArea(el, {
-          lineNumbers: true,
-          mode: $(el).attr("mode"),
+      setTimeout(() => {
+        codes.forEach((el) => {
+          //console.log($(el).attr("mode"), el);
+          CodeMirror.fromTextArea(el, {
+            lineNumbers: true,
+            mode: $(el).attr("mode"),
+          });
         });
-      });
+      }, 100);
     });
   const locale =
     navigator.userLanguage ||
@@ -482,7 +484,7 @@ function press_store_button(clicked) {
 
 function ajax_modal(url, opts = {}) {
   if ($("#scmodal").length === 0) {
-    $("body").append(`<div id="scmodal", class="modal" tabindex="-1">
+    $("body").append(`<div id="scmodal", class="modal">
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
@@ -515,7 +517,7 @@ function ajax_modal(url, opts = {}) {
   });
 }
 
-function saveAndContinue(e) {
+function saveAndContinue(e, k) {
   var form = $(e).closest("form");
   var url = form.attr("action");
   var form_data = form.serialize();
@@ -536,6 +538,9 @@ function saveAndContinue(e) {
       $("#page-inner-content").html(request.responseText);
       initialize_page();
     },
+    complete: function () {
+      if (k) k();
+    },
   });
 
   return false;

package/restart_watcher.js

@@ -8,7 +8,7 @@ const { spawnSync } = require("child_process");
 const watch = require("node-watch");
 const Plugin = require("@saltcorn/data/models/plugin");
 const db = require("@saltcorn/data/db");
-const { eachTenant } = require("@saltcorn/data/models/tenant");
+const { eachTenant } = require("@saltcorn/admin-models/models/tenant");
 
 /**
  * packages that should trigger a server re-start

package/routes/admin.js

@@ -17,7 +17,7 @@ const File = require("@saltcorn/data/models/file");
 const { spawn } = require("child_process");
 const User = require("@saltcorn/data/models/user");
 const path = require("path");
-const { getAllTenants } = require("@saltcorn/data/models/tenant");
+const { getAllTenants } = require("@saltcorn/admin-models/models/tenant");
 const { post_btn, renderForm } = require("@saltcorn/markup");
 const {
   div,
@@ -46,7 +46,7 @@ const {
   get_process_init_time,
 } = require("@saltcorn/data/db/state");
 const { loadAllPlugins } = require("../load_plugins");
-const { create_backup, restore } = require("@saltcorn/data/models/backup");
+const { create_backup, restore } = require("@saltcorn/admin-models/models/backup");
 const fs = require("fs");
 const load_plugins = require("../load_plugins");
 const {

package/routes/fields.js

@@ -27,6 +27,7 @@ const expressionBlurb = require("../markup/expression_blurb");
 const { readState } = require("@saltcorn/data/plugin-helper");
 const { wizardCardTitle } = require("../markup/forms.js");
 const FieldRepeat = require("@saltcorn/data/models/fieldrepeat");
+const { applyAsync } = require("@saltcorn/data/utils");
 
 /**
  * @type {object}
@@ -624,10 +625,38 @@ router.post(
     const { tableName, fieldName, fieldview } = req.params;
     const table = await Table.findOne({ name: tableName });
     const fields = await table.getFields();
-    const field = fields.find((f) => f.name === fieldName);
-    const formula = field.expression;
     const row = { ...req.body };
     readState(row, fields);
+
+    if (fieldName.includes(".")) {
+      //join field
+      const kpath = fieldName.split(".");
+
+      if (kpath.length === 2 && row[kpath[0]]) {
+        const field = fields.find((f) => f.name === kpath[0]);
+        const reftable = await Table.findOne({ name: field.reftable_name });
+        const targetField = (await reftable.getFields()).find(
+          (f) => f.name === kpath[1]
+        );
+        const fv = targetField.type.fieldviews[fieldview];
+        const q = { [reftable.pk_name]: row[kpath[0]] };
+        const refRow = await reftable.getRow(q);
+        const configuration = req.query;
+        let configFields = [];
+        if (fv.configFields)
+          configFields = await applyAsync(fv.configFields, targetField);
+        readState(configuration, configFields);
+        res.send(fv.run(refRow[kpath[1]], req, configuration));
+        return;
+      }
+      res.send("");
+      return;
+    }
+
+    const field = fields.find((f) => f.name === fieldName);
+
+    const formula = field.expression;
+
     let result;
     try {
       if (field.stored) {

package/routes/homepage.js

@@ -13,7 +13,7 @@ const Page = require("@saltcorn/data/models/page");
 const { link, renderForm, mkTable, post_btn } = require("@saltcorn/markup");
 const { ul, li, div, small, a, h5, p, i } = require("@saltcorn/markup/tags");
 const Table = require("@saltcorn/data/models/table");
-const { fetch_available_packs } = require("@saltcorn/data/models/pack");
+const { fetch_available_packs } = require("@saltcorn/admin-models/models/pack");
 const { restore_backup } = require("../markup/admin");
 const { get_latest_npm_version } = require("@saltcorn/data/models/config");
 const packagejson = require("../package.json");

package/routes/packs.js

@@ -30,7 +30,7 @@ const {
   fetch_pack_by_name,
   can_install_pack,
   uninstall_pack,
-} = require("@saltcorn/data/models/pack");
+} = require("@saltcorn/admin-models/models/pack");
 const { h5, pre, code, p, text, text_attr } = require("@saltcorn/markup/tags");
 const Library = require("@saltcorn/data/models/library");
 const Trigger = require("@saltcorn/data/models/trigger");

package/routes/pageedit.js

@@ -17,7 +17,7 @@ const Form = require("@saltcorn/data/models/form");
 const File = require("@saltcorn/data/models/file");
 const Trigger = require("@saltcorn/data/models/trigger");
 const { getViews, traverseSync } = require("@saltcorn/data/models/layout");
-const { add_to_menu } = require("@saltcorn/data/models/pack");
+const { add_to_menu } = require("@saltcorn/admin-models/models/pack");
 const db = require("@saltcorn/data/db");
 
 const { isAdmin, error_catcher } = require("./utils.js");

package/routes/plugins.js

@@ -18,7 +18,7 @@ const { getState } = require("@saltcorn/data/db/state");
 const Form = require("@saltcorn/data/models/form");
 const Field = require("@saltcorn/data/models/field");
 const Plugin = require("@saltcorn/data/models/plugin");
-const { fetch_available_packs } = require("@saltcorn/data/models/pack");
+const { fetch_available_packs } = require("@saltcorn/admin-models/models/pack");
 const { getConfig, setConfig } = require("@saltcorn/data/models/config");
 const db = require("@saltcorn/data/db");
 const {

package/routes/scapi.js

@@ -16,7 +16,7 @@ const Page = require("@saltcorn/data/models/page");
 const File = require("@saltcorn/data/models/file");
 const Trigger = require("@saltcorn/data/models/trigger");
 const Role = require("@saltcorn/data/models/role");
-const Tenant = require("@saltcorn/data/models/tenant");
+const Tenant = require("@saltcorn/admin-models/models/tenant");
 const Plugin = require("@saltcorn/data/models/plugin");
 const Config = require("@saltcorn/data/models/config");
 const passport = require("passport");

package/routes/tenant.js

@@ -6,12 +6,15 @@
 
 const Router = require("express-promise-router");
 const Form = require("@saltcorn/data/models/form");
-const { getState, create_tenant } = require("@saltcorn/data/db/state");
+const { getState, add_tenant } = require("@saltcorn/data/db/state");
+const { create_tenant } = require("@saltcorn/admin-models/models/tenant");
 const {
   getAllTenants,
   domain_sanitize,
   deleteTenant,
-} = require("@saltcorn/data/models/tenant");
+  switchToTenant,
+  insertTenant,
+} = require("@saltcorn/admin-models/models/tenant");
 const {
   renderForm,
   link,
@@ -45,6 +48,10 @@ const {
   save_config_from_form,
 } = require("../markup/admin.js");
 const { getConfig } = require("@saltcorn/data/models/config");
+const {
+  create_backup,
+  restore,
+} = require("@saltcorn/admin-models/models/backup");
 
 /**
  * @type {object}
@@ -249,13 +256,16 @@ router.post(
         );
       } else {
         const newurl = getNewURL(req, subdomain);
-        await create_tenant(
-          subdomain,
-          loadAllPlugins,
-          newurl,
-          false,
-          loadAndSaveNewPlugin
-        );
+        const tenant_template = getState().getConfig("tenant_template");
+        await switchToTenant(await insertTenant(subdomain), newurl);
+        add_tenant(subdomain);
+        await create_tenant({
+          t: subdomain,
+          plugin_loader: loadAllPlugins,
+          noSignalOrDB: false,
+          loadAndSaveNewPlugin: loadAndSaveNewPlugin,
+          tenant_template,
+        });
         let new_url_create = newurl;
         const hasTemplate = getState().getConfig("tenant_template");
         if (hasTemplate) {

package/routes/viewedit.js

@@ -39,7 +39,7 @@ const Workflow = require("@saltcorn/data/models/workflow");
 const User = require("@saltcorn/data/models/user");
 const Page = require("@saltcorn/data/models/page");
 
-const { add_to_menu } = require("@saltcorn/data/models/pack");
+const { add_to_menu } = require("@saltcorn/admin-models/models/pack");
 const { editRoleForm } = require("../markup/forms.js");
 
 /**

package/serve.js

@@ -11,9 +11,10 @@ const db = require("@saltcorn/data/db");
 const {
   getState,
   init_multi_tenant,
-  create_tenant,
   restart_tenant,
+  add_tenant,
 } = require("@saltcorn/data/db/state");
+const { create_tenant } = require("@saltcorn/admin-models/models/tenant");
 
 const path = require("path");
 
@@ -38,7 +39,10 @@ const {
   getRelevantPackages,
   getPluginDirectories,
 } = require("./restart_watcher");
-const { spawnSync } = require("child_process");
+const {
+  eachTenant,
+  getAllTenants,
+} = require("@saltcorn/admin-models/models/tenant");
 
 // helpful https://gist.github.com/jpoehls/2232358
 /**
@@ -72,7 +76,8 @@ const initMaster = async ({ disableMigrate }, useClusterAdaptor = true) => {
   // switch on sql logging - but it was initiated before???
   if (getState().getConfig("log_sql", false)) db.set_sql_logging();
   if (db.is_it_multi_tenant()) {
-    await init_multi_tenant(loadAllPlugins, disableMigrate);
+    const tenants = await getAllTenants();
+    await init_multi_tenant(loadAllPlugins, disableMigrate, tenants);
   }
   if (useClusterAdaptor) setupPrimary();
 };
@@ -95,7 +100,14 @@ const workerDispatchMsg = ({ tenant, ...msg }) => {
   }
   if (msg.refresh) getState()[`refresh_${msg.refresh}`](true);
   if (msg.createTenant) {
-    create_tenant(msg.createTenant, loadAllPlugins, "", true);
+    const tenant_template = getState().getConfig("tenant_template");
+    add_tenant(msg.createTenant);
+    create_tenant({
+      t: msg.createTenant,
+      plugin_loader: loadAllPlugins,
+      noSignalOrDB: true,
+      tenant_template,
+    });
     db.runWithTenant(msg.createTenant, async () => {
       getState().refresh(true);
     });
@@ -117,29 +129,28 @@ const workerDispatchMsg = ({ tenant, ...msg }) => {
  * @param {number} opts.pid
  * @returns {function}
  */
-const onMessageFromWorker = (
-  masterState,
-  { port, watchReaper, disableScheduler, pid }
-) => (msg) => {
-  //console.log("worker msg", typeof msg, msg);
-  if (msg === "Start" && !masterState.started) {
-    masterState.started = true;
-    runScheduler({ port, watchReaper, disableScheduler });
-    require("./systemd")({ port });
-    return true;
-  } else if (msg === "RestartServer") {
-    process.exit(0);
-    return true;
-  } else if (msg.tenant || msg.createTenant) {
-    ///ie from saltcorn
-    //broadcast
-    Object.entries(cluster.workers).forEach(([wpid, w]) => {
-      if (wpid !== pid) w.send(msg);
-    });
-    workerDispatchMsg(msg); //also master
-    return true;
-  }
-};
+const onMessageFromWorker =
+  (masterState, { port, watchReaper, disableScheduler, pid }) =>
+  (msg) => {
+    //console.log("worker msg", typeof msg, msg);
+    if (msg === "Start" && !masterState.started) {
+      masterState.started = true;
+      runScheduler({ port, watchReaper, disableScheduler, eachTenant });
+      require("./systemd")({ port });
+      return true;
+    } else if (msg === "RestartServer") {
+      process.exit(0);
+      return true;
+    } else if (msg.tenant || msg.createTenant) {
+      ///ie from saltcorn
+      //broadcast
+      Object.entries(cluster.workers).forEach(([wpid, w]) => {
+        if (wpid !== pid) w.send(msg);
+      });
+      workerDispatchMsg(msg); //also master
+      return true;
+    }
+  };
 
 module.exports =
   /**