@saltcorn/server 0.8.6-beta.9 → 0.8.7-beta.0

package/routes/api.js

@@ -194,7 +194,7 @@ router.get(
   //passport.authenticate("api-bearer", { session: false }),
   error_catcher(async (req, res, next) => {
     let { tableName, fieldName } = req.params;
-    const table = await Table.findOne(
+    const table = Table.findOne(
       strictParseInt(tableName)
         ? { id: strictParseInt(tableName) }
         : { name: tableName }
@@ -249,7 +249,7 @@ router.get(
   error_catcher(async (req, res, next) => {
     let { tableName } = req.params;
     const { fields, versioncount, approximate, ...req_query } = req.query;
-    const table = await Table.findOne(
+    const table = Table.findOne(
       strictParseInt(tableName)
         ? { id: strictParseInt(tableName) }
         : { name: tableName }
@@ -377,7 +377,7 @@ router.post(
   "/:tableName/",
   error_catcher(async (req, res, next) => {
     const { tableName } = req.params;
-    const table = await Table.findOne({ name: tableName });
+    const table = Table.findOne({ name: tableName });
     if (!table) {
       getState().log(3, `API POST ${tableName} not found`);
       res.status(404).json({ error: req.__("Not found") });
@@ -454,7 +454,7 @@ router.post(
   "/:tableName/:id",
   error_catcher(async (req, res, next) => {
     const { tableName, id } = req.params;
-    const table = await Table.findOne({ name: tableName });
+    const table = Table.findOne({ name: tableName });
     if (!table) {
       getState().log(3, `API POST ${tableName} not found`);
       res.status(404).json({ error: req.__("Not found") });
@@ -507,7 +507,7 @@ router.delete(
   // in case of primary key different from id - id will be string "undefined"
   error_catcher(async (req, res, next) => {
     const { tableName, id } = req.params;
-    const table = await Table.findOne({ name: tableName });
+    const table = Table.findOne({ name: tableName });
     if (!table) {
       getState().log(3, `API DELETE ${tableName} not found`);
       res.status(404).json({ error: req.__("Not found") });
@@ -521,7 +521,7 @@ router.delete(
           try {
             if (id === "undefined") {
               const pk_name = table.pk_name;
-              //const fields = await table.getFields();
+              //const fields = table.getFields();
               const row = req.body;
               //readState(row, fields);
               await table.deleteRows(

package/routes/delete.js

@@ -33,7 +33,7 @@ router.post(
     const { tableName, id } = req.params;
     const { redirect } = req.query;
     // todo check that works after where change
-    const table = await Table.findOne({ name: tableName });
+    const table = Table.findOne({ name: tableName });
     const role = req.user && req.user.id ? req.user.role_id : 100;
     try {
       if (role <= table.min_role_write)

package/routes/edit.js

@@ -31,7 +31,7 @@ router.post(
     const { tableName, id, field_name } = req.params;
     const { redirect } = req.query;
     // todo check that works after where change
-    const table = await Table.findOne({ name: tableName });
+    const table = Table.findOne({ name: tableName });
 
     const row = await table.getRow(
       { [table.pk_name]: id },

package/routes/fields.js

@@ -267,7 +267,7 @@ const fieldFlow = (req) =>
           const tables = await Table.find({});
           const table = tables.find((t) => t.id === context.table_id);
           const nrows = await table.countRows({});
-          const existing_fields = await table.getFields();
+          const existing_fields = table.getFields();
           const existingNames = existing_fields.map((f) => f.name);
           const fkey_opts = ["File", ...tables.map((t) => `Key to ${t.name}`)];
           const form = await fieldForm(
@@ -358,8 +358,8 @@ const fieldFlow = (req) =>
         name: req.__("Expression"),
         onlyWhen: (context) => context.calculated,
         form: async (context) => {
-          const table = await Table.findOne({ id: context.table_id });
-          const fields = await table.getFields();
+          const table = Table.findOne({ id: context.table_id });
+          const fields = table.getFields();
           return new Form({
             blurb: expressionBlurb(context.type, context.stored, fields, req),
             fields: [
@@ -397,8 +397,8 @@ const fieldFlow = (req) =>
           context.type !== "File" && new Field(context).is_fkey,
         form: async (context) => {
           const fld = new Field(context);
-          const table = await Table.findOne({ name: fld.reftable_name });
-          const fields = await table.getFields();
+          const table = Table.findOne({ name: fld.reftable_name });
+          const fields = table.getFields();
           const orderedFields = [
             ...fields.filter((f) => !f.primary_key),
             ...fields.filter((f) => f.primary_key),
@@ -471,10 +471,11 @@ const fieldFlow = (req) =>
       },
       {
         name: req.__("Default"),
-        onlyWhen: async (context) => context.required && !context.calculated,
+        onlyWhen: async (context) =>
+          context.required && !context.calculated && !context.primary_key,
 
         form: async (context) => {
-          const table = await Table.findOne({ id: context.table_id });
+          const table = Table.findOne({ id: context.table_id });
           const nrows = await table.countRows();
           const formfield = new Field({
             name: "default",
@@ -532,7 +533,7 @@ router.get(
       res.redirect(`/table`);
       return;
     }
-    const table = await Table.findOne({ id: field.table_id });
+    const table = Table.findOne({ id: field.table_id });
     if (!field.type) {
       req.flash("danger", req.__(`Type %s not found`, field.typename));
       res.redirect(`/table/${field.table_id}`);
@@ -579,7 +580,7 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     const { table_id } = req.params;
-    const table = await Table.findOne({ id: table_id });
+    const table = Table.findOne({ id: table_id });
     const wf = fieldFlow(req);
     const wfres = await wf.run({ table_id: +table_id }, req);
     res.sendWrap(req.__(`New field`), {
@@ -643,7 +644,7 @@ router.post(
     const wf = fieldFlow(req);
     const wfres = await wf.run(req.body, req);
     if (wfres.renderForm) {
-      const table = await Table.findOne({ id: wfres.context.table_id });
+      const table = Table.findOne({ id: wfres.context.table_id });
       res.sendWrap(req.__(`Field attributes`), {
         above: [
           {
@@ -690,8 +691,8 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     const { formula, tablename, stored } = req.body;
-    const table = await Table.findOne({ name: tablename });
-    const fields = await table.getFields();
+    const table = Table.findOne({ name: tablename });
+    const fields = table.getFields();
     const freeVars = freeVariables(formula);
     const joinFields = {};
     if (stored) add_free_variables_to_joinfields(freeVars, joinFields, fields);
@@ -736,10 +737,10 @@ router.post(
   "/show-calculated/:tableName/:fieldName/:fieldview",
   error_catcher(async (req, res) => {
     const { tableName, fieldName, fieldview } = req.params;
-    const table = await Table.findOne({ name: tableName });
+    const table = Table.findOne({ name: tableName });
     const role = req.user && req.user.id ? req.user.role_id : 100;
 
-    const fields = await table.getFields();
+    const fields = table.getFields();
     let row = { ...req.body };
     if (row && Object.keys(row).length > 0) readState(row, fields);
 
@@ -764,7 +765,7 @@ router.post(
       for (const { ref } of Object.values(joinFields)) {
         if (row[ref]) {
           const field = fields.find((f) => f.name === ref);
-          const reftable = await Table.findOne({ name: field.reftable_name });
+          const reftable = Table.findOne({ name: field.reftable_name });
           const refFields = await reftable.getFields();
 
           const joinFields = {};
@@ -798,7 +799,7 @@ router.post(
       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 reftable = Table.findOne({ name: field.reftable_name });
         const refFields = await reftable.getFields();
         const targetField = refFields.find((f) => f.name === kpath[1]);
         //console.log({ kpath, fieldview, targetField });
@@ -859,7 +860,7 @@ router.post(
           const ofields = await oldTable.getFields();
           const field = ofields.find((f) => f.name === ref);
           if (field.is_fkey) {
-            const reftable = await Table.findOne({ name: field.reftable_name });
+            const reftable = Table.findOne({ name: field.reftable_name });
             if (!oldRow[ref]) break;
             if (role > reftable.min_role_read) {
               res.status(401).send("");
@@ -915,8 +916,8 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     const { tableName, fieldName, fieldview } = req.params;
-    const table = await Table.findOne({ name: tableName });
-    const fields = await table.getFields();
+    const table = Table.findOne({ name: tableName });
+    const fields = table.getFields();
     let field, row, value;
     if (fieldName.includes(".")) {
       const [refNm, targetNm] = fieldName.split(".");
@@ -925,7 +926,7 @@ router.post(
         res.send("");
         return;
       }
-      const reftable = await Table.findOne({ name: ref.reftable_name });
+      const reftable = Table.findOne({ name: ref.reftable_name });
       if (!reftable) {
         res.send("");
         return;
@@ -1004,7 +1005,7 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     const { tableName } = req.params;
-    const {
+    let {
       field_name,
       fieldview,
       type,
@@ -1012,7 +1013,14 @@ router.post(
       join_fieldview,
       _columndef,
     } = req.body;
-    const table = await Table.findOne({ name: tableName });
+    const table = Table.findOne({ name: tableName });
+    if (typeof type !== "string") {
+      try {
+        type = JSON.parse(_columndef).type;
+      } catch {
+        //ignore
+      }
+    }
     const fieldName = type == "Field" ? field_name : join_field;
     const fv_name = type == "Field" ? fieldview : join_fieldview;
     if (!fieldName) {

package/routes/list.js

@@ -51,9 +51,9 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     const { tableName, id } = req.params;
-    const table = await Table.findOne({ name: tableName });
+    const table = Table.findOne({ name: tableName });
 
-    const fields = await table.getFields();
+    const fields = table.getFields();
     var tfields = fields.map((f) => ({ label: f.label, key: f.listKey }));
 
     tfields.push({
@@ -99,9 +99,9 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     const { tableName, id, _version } = req.params;
-    const table = await Table.findOne({ name: tableName });
+    const table = Table.findOne({ name: tableName });
 
-    const fields = await table.getFields();
+    const fields = table.getFields();
     const row = await db.selectOne(`${db.sqlsanitize(table.name)}__history`, {
       id,
       _version,
@@ -231,13 +231,13 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     const { tname } = req.params;
-    const table = await Table.findOne({ name: tname });
+    const table = Table.findOne({ name: tname });
     if (!table) {
       req.flash("error", req.__("Table %s not found", text(tname)));
       res.redirect(`/table`);
       return;
     }
-    const fields = await table.getFields();
+    const fields = table.getFields();
     for (const f of fields) {
       if (f.type === "File") f.attributes = { select_file_where: {} };
       await f.fill_fkey_options();

package/routes/menu.js

@@ -51,7 +51,7 @@ const menuForm = async (req) => {
   for (const table of tables) {
     dynOrderFieldOptions[table.name] = [""];
     dynSectionFieldOptions[table.name] = [""];
-    const fields = await table.getFields();
+    const fields = table.getFields();
     for (const field of fields) {
       dynOrderFieldOptions[table.name].push(field.name);
       if (

package/routes/plugins.js

@@ -669,11 +669,10 @@ router.post(
       const instore = await Plugin.store_plugins_available();
       const store_plugin = instore.find((p) => p.name === plugin.name);
       if (store_plugin && store_plugin.has_auth) flash_restart(req);
-      process.send &&
-        process.send({
-          refresh_plugin_cfg: plugin.name,
-          tenant: db.getTenantSchema(),
-        });
+      getState().processSend({
+        refresh_plugin_cfg: plugin.name,
+        tenant: db.getTenantSchema(),
+      });
       if (module.layout) await sleep(500); // Allow other workers to reload this plugin
       res.redirect("/plugins");
     }
@@ -700,11 +699,10 @@ router.post(
         };
         await plugin.upsert();
         await load_plugins.loadPlugin(plugin);
-        process.send &&
-          process.send({
-            refresh_plugin_cfg: plugin.name,
-            tenant: db.getTenantSchema(),
-          });
+        getState().processSend({
+          refresh_plugin_cfg: plugin.name,
+          tenant: db.getTenantSchema(),
+        });
         res.json({ success: "ok" });
       }
     }
@@ -955,8 +953,10 @@ router.get(
       }
       req.flash("success", req.__(`Modules up-to-date`));
       await restart_tenant(loadAllPlugins);
-      process.send &&
-        process.send({ restart_tenant: true, tenant: db.getTenantSchema() });
+      getState().processSend({
+        restart_tenant: true,
+        tenant: db.getTenantSchema(),
+      });
     }
     res.redirect(`/plugins`);
   })

package/routes/tables.js

@@ -11,6 +11,7 @@ const Table = require("@saltcorn/data/models/table");
 const File = require("@saltcorn/data/models/file");
 const View = require("@saltcorn/data/models/view");
 const User = require("@saltcorn/data/models/user");
+const Trigger = require("@saltcorn/data/models/trigger");
 const {
   mkTable,
   renderForm,
@@ -72,7 +73,7 @@ module.exports = router;
  * @returns {Promise<Form>}
  */
 const tableForm = async (table, req) => {
-  const fields = await table.getFields();
+  const fields = table.getFields();
   const roleOptions = (await User.get_roles()).map((r) => ({
     value: r.id,
     label: r.role,
@@ -433,7 +434,7 @@ router.get(
     const tables = await Table.find_with_external({}, { orderBy: "name" });
     const edges = [];
     for (const table of tables) {
-      const fields = await table.getFields();
+      const fields = table.getFields();
       for (const field of fields) {
         if (field.reftable_name)
           edges.push({
@@ -563,9 +564,9 @@ router.get(
     const { idorname } = req.params;
     let id = parseInt(idorname);
     let table;
-    if (id) table = Table.findOne({ id });
+    if (id) [table] = await Table.find({ id });
     else {
-      table = Table.findOne({ name: idorname });
+      [table] = await Table.find({ name: idorname });
     }
 
     if (!table) {
@@ -574,11 +575,12 @@ router.get(
       return;
     }
     const nrows = await table.countRows();
-    const fields = await table.getFields();
+    const fields = table.getFields();
     const { child_relations } = await table.get_child_relations();
     const inbound_refs = [
       ...new Set(child_relations.map(({ table }) => table.name)),
     ];
+    const triggers = table.id ? Trigger.find({ table_id: table.id }) : [];
     let fieldCard;
     if (fields.length === 0) {
       fieldCard = [
@@ -647,6 +649,13 @@ router.get(
             inbound_refs.map((tnm) => link(`/table/${tnm}`, tnm)).join(", ") +
             "<br>"
           : "",
+        triggers.length
+          ? req.__("Table triggers: ") +
+            triggers
+              .map((t) => link(`/actions/configure/${t.id}`, t.name))
+              .join(", ") +
+            "<br>"
+          : "",
         !table.external &&
           a(
             {
@@ -911,12 +920,10 @@ router.post(
         rest.provider_name !== "Database table"
       ) {
         const table = await Table.create(name, rest);
-        await sleep(500); // Allow other workers to load this view
         res.redirect(`/table/provider-cfg/${table.id}`);
       } else {
         delete rest.provider_name;
         const table = await Table.create(name, rest);
-        await sleep(500); // Allow other workers to load this view
         req.flash("success", req.__(`Table %s created`, name));
         res.redirect(`/table/${table.id}`);
       }
@@ -924,7 +931,7 @@ router.post(
       // todo check that works after where change
       // todo findOne can be have parameter for external table here
       //we can only save min role
-      const table = await Table.findOne({ name: v.name });
+      const table = Table.findOne({ name: v.name });
       if (table) {
         const exttables_min_role_read = getState().getConfigCopy(
           "exttables_min_role_read",
@@ -942,7 +949,7 @@ router.post(
       }
     } else {
       const { id, _csrf, ...rest } = v;
-      const table = await Table.findOne({ id: parseInt(id) });
+      const table = Table.findOne({ id: parseInt(id) });
       const old_versioned = table.versioned;
       let hasError = false;
       let notify = "";
@@ -994,7 +1001,7 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
-    const t = await Table.findOne({ id });
+    const t = Table.findOne({ id });
     if (!t) {
       req.flash("error", `Table not found`);
       res.redirect(`/table`);
@@ -1020,7 +1027,7 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
-    const t = await Table.findOne({ id });
+    const t = Table.findOne({ id });
     if (!t) {
       req.flash("error", `Table not found`);
       res.redirect(`/table`);
@@ -1126,7 +1133,7 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;
-    const table = await Table.findOne({ name });
+    const table = Table.findOne({ name });
     const rows = await table.getRows();
     res.setHeader("Content-Type", "text/csv");
     res.setHeader("Content-Disposition", `attachment; filename="${name}.csv"`);
@@ -1155,7 +1162,7 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
-    const table = await Table.findOne({ id });
+    const table = Table.findOne({ id });
     if (!table) {
       req.flash("error", `Table not found`);
       res.redirect(`/table`);
@@ -1295,13 +1302,13 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     const { id, type } = req.params;
-    const table = await Table.findOne({ id });
+    const table = Table.findOne({ id });
     if (!table) {
       req.flash("error", `Table not found`);
       res.redirect(`/table`);
       return;
     }
-    const fields = await table.getFields();
+    const fields = table.getFields();
     const form = constraintForm(req, table.id, fields, type);
     res.sendWrap(req.__(`Add constraint to %s`, table.name), {
       above: [
@@ -1339,13 +1346,13 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     const { id, type } = req.params;
-    const table = await Table.findOne({ id });
+    const table = Table.findOne({ id });
     if (!table) {
       req.flash("error", `Table not found`);
       res.redirect(`/table`);
       return;
     }
-    const fields = await table.getFields();
+    const fields = table.getFields();
     const form = constraintForm(req, table.id, fields, type);
     form.validate(req.body);
     if (form.hasErrors) req.flash("error", req.__("An error occurred"));
@@ -1397,7 +1404,7 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
-    const table = await Table.findOne({ id });
+    const table = Table.findOne({ id });
 
     const form = renameForm(table.id, req);
     res.sendWrap(req.__(`Rename table %s`, table.name), {
@@ -1434,7 +1441,7 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
-    const table = await Table.findOne({ id });
+    const table = Table.findOne({ id });
     const form = renameForm(table.id, req);
 
     form.validate(req.body);
@@ -1560,7 +1567,7 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;
-    const table = await Table.findOne({ name });
+    const table = Table.findOne({ name });
     if (!req.files || !req.files.file) {
       req.flash("error", "Missing file");
       res.redirect(`/table/${table.id}`);
@@ -1579,7 +1586,7 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     const { name, filename } = req.params;
-    const table = await Table.findOne({ name });
+    const table = Table.findOne({ name });
     const f = await File.findOne(filename);
     await previewCSV({ newPath: f.location, table, res, req, full: true });
   })
@@ -1590,7 +1597,7 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     const { name, filename } = req.params;
-    const table = await Table.findOne({ name });
+    const table = Table.findOne({ name });
     const f = await File.findOne(filename);
 
     try {
@@ -1619,7 +1626,7 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;
-    const table = await Table.findOne({ name });
+    const table = Table.findOne({ name });
 
     try {
       await table.deleteRows({});
@@ -1644,7 +1651,7 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;
-    const table = await Table.findOne({ name });
+    const table = Table.findOne({ name });
     if (!table) {
       req.flash("error", `Table not found: ${text(name)}`);
       res.redirect(`/table`);
@@ -1737,7 +1744,7 @@ router.get(
     const { id } = req.params;
     const { step } = req.query;
 
-    const table = await Table.findOne({ id });
+    const table = Table.findOne({ id });
     if (!table) {
       req.flash("error", `Table not found`);
       res.redirect(`/table`);
@@ -1763,7 +1770,7 @@ router.post(
     const { id } = req.params;
     const { step } = req.query;
 
-    const table = await Table.findOne({ id });
+    const table = Table.findOne({ id });
     if (!table) {
       req.flash("error", `Table not found`);
       res.redirect(`/table`);

package/routes/view.js

@@ -117,7 +117,7 @@ router.post(
   error_catcher(async (req, res) => {
     const { viewname } = req.params;
 
-    const view = await View.findOne({ name: viewname });
+    const [view] = await View.find({ name: viewname });
     if (!view) {
       res.send("");
       return;
@@ -131,7 +131,7 @@ router.post(
         if (!row) {
           if (!table)
             // todo check after where change
-            table = await Table.findOne(
+            table = Table.findOne(
               view.table_id
                 ? { id: view.table_id }
                 : { name: view.exttable_name }

package/routes/viewedit.js

@@ -449,18 +449,18 @@ router.post(
 
         const v = result.success;
         if (v.table_name) {
-          const table = await Table.findOne({ name: v.table_name });
+          const table = Table.findOne({ name: v.table_name });
           if (table && table.id) {
             v.table_id = table.id;
           } else if (table && table.external) v.exttable_name = v.table_name;
         }
         if (v.table_id) {
-          const table = await Table.findOne({ id: v.table_id });
+          const table = Table.findOne({ id: v.table_id });
           const slugOptions = await table.slug_options();
           const slug = slugOptions.find((so) => so.label === v.slug);
           v.slug = slug || null;
         }
-        //const table = await Table.findOne({ name: v.table_name });
+        //const table = Table.findOne({ name: v.table_name });
         delete v.table_name;
         if (req.body.id) {
           await View.update(v, +req.body.id);
@@ -470,7 +470,6 @@ router.post(
           else v.configuration = {};
           //console.log(v);
           await View.create(v);
-          await sleep(500); // Allow other workers to load this view
         }
         res.redirect(
           addOnDoneRedirect(
@@ -583,7 +582,7 @@ router.get(
   error_catcher(async (req, res) => {
     const { name } = req.params;
     const { step } = req.query;
-    const view = await View.findOne({ name });
+    const [view] = await View.find({ name });
     if (!view) {
       req.flash("error", `View not found: ${text(name)}`);
       res.redirect("/viewedit");

package/s3storage.js

@@ -1,3 +1,4 @@
+require("aws-sdk/lib/maintenance_mode_message").suppress = true;
 const aws = require("aws-sdk");
 const multer = require("multer");
 const multerS3 = require("multer-s3");