@saltcorn/server 1.4.0-beta.0 → 1.4.0-beta.10

package/routes/actions.js

@@ -12,7 +12,11 @@ const {
   addOnDoneRedirect,
   is_relative_url,
 } = require("./utils.js");
-const { ppVal, jsIdentifierValidator } = require("@saltcorn/data/utils");
+const {
+  ppVal,
+  escapeHtml,
+  jsIdentifierValidator,
+} = require("@saltcorn/data/utils");
 const { getState } = require("@saltcorn/data/db/state");
 const Trigger = require("@saltcorn/data/models/trigger");
 const FieldRepeat = require("@saltcorn/data/models/fieldrepeat");
@@ -67,6 +71,7 @@ const {
   li,
   h2,
   h4,
+  p,
 } = require("@saltcorn/markup/tags");
 const Table = require("@saltcorn/data/models/table");
 const { getActionConfigFields } = require("@saltcorn/data/plugin-helper");
@@ -101,7 +106,17 @@ router.get(
       triggers = triggers.filter((t) => tagged_trigger_ids.has(t.id));
       filterOnTag = await Tag.findOne({ id: +req.query._tag });
     }
-    const actions = Trigger.abbreviated_actions;
+    const blurb =
+      p(
+        req.__(
+          `There currently no triggers, but you can create one by clicking the button below. Triggers are actions that are run in response to some event which can be periodic, caused by a database table change, a button click or some other external event.`
+        )
+      ) +
+      p(
+        req.__(
+          `A trigger is defined by a condition (when the trigger will run), an action (which is supplied by a module) and the configuration for that action.`
+        )
+      );
     send_events_page({
       res,
       req,
@@ -110,39 +125,20 @@ router.get(
         above: [
           {
             type: "card",
-            title: req.__("Triggers"),
+            class: "card-max-full-screen",
+            title: req.__("Triggers")+
+          `<a href="javascript:ajax_modal('/admin/help/Triggers')"><i class="fas fa-question-circle ms-1"></i></a>`,
             contents: div(
-              await getTriggerList(triggers, req, { filterOnTag }),
-              a(
-                {
-                  href: "/actions/new",
-                  class: "btn btn-primary",
-                },
-                req.__("Create trigger")
-              )
+              triggers.length
+                ? await getTriggerList(triggers, req, { filterOnTag })
+                : blurb
             ),
-          },
-          {
-            type: "card",
-            contents: table(
-              tbody(
-                tr(
-                  td({ class: "pe-2" }, req.__("Actions available")),
-                  td(
-                    actions
-                      .map((a) => span({ class: "badge bg-primary" }, a.name))
-                      .join("&nbsp;")
-                  )
-                ),
-                tr(
-                  td({ class: "pe-2" }, req.__("Event types")),
-                  td(
-                    Trigger.when_options
-                      .map((a) => span({ class: "badge bg-secondary" }, a))
-                      .join("&nbsp;")
-                  )
-                )
-              )
+            footer: a(
+              {
+                href: "/actions/new",
+                class: "btn btn-primary",
+              },
+              req.__("Create trigger")
             ),
           },
         ],
@@ -424,7 +420,7 @@ router.get(
       sub2_page: "Edit",
       contents: {
         type: "card",
-        title: req.__("Edit trigger %s", id),
+        title: req.__("Edit trigger %s", trigger.name || trigger.id),
         titleAjaxIndicator: true,
         contents: renderForm(form, req.csrfToken()),
       },
@@ -557,7 +553,7 @@ const getWorkflowConfig = async (req, id, table, trigger) => {
   trigCfgForm.values = trigger.configuration;
   let copilot_form = "";
 
-  if (getState().functions.copilot_generate_workflow) {
+  if (getState().functions.copilot_generate_workflow && !steps.length) {
     copilot_form = renderForm(
       new Form({
         action: `/actions/gen-copilot/${id}`,
@@ -745,6 +741,7 @@ const getWorkflowStepForm = async (
     action: addOnDoneRedirect(`/actions/stepedit/${trigger.id}`, req),
     onChange: step_id ? "saveAndContinueIfValid(this)" : undefined,
     submitLabel: step_id ? req.__("Done") : undefined,
+    onSubmit: "press_store_button(this)",
     additionalButtons: step_id
       ? [
           {
@@ -914,7 +911,8 @@ router.get(
     let trigger;
     let id = parseInt(idorname);
     if (id) trigger = await Trigger.findOne({ id });
-    else {
+
+    if (!trigger) {
       trigger = await Trigger.findOne({ name: idorname });
       id = trigger.id;
     }
@@ -1705,7 +1703,11 @@ router.get(
                     : null,
                   tr(
                     th("Context"),
-                    td(pre(text(JSON.stringify(trace.context, null, 2))))
+                    td(
+                      pre(
+                        text(escapeHtml(JSON.stringify(trace.context, null, 2)))
+                      )
+                    )
                   )
                 )
               )
@@ -1753,7 +1755,11 @@ router.get(
                     : null,
                   tr(
                     th("Context"),
-                    td(pre(text(JSON.stringify(run.context, null, 2))))
+                    td(
+                      pre(
+                        text(escapeHtml(JSON.stringify(run.context, null, 2)))
+                      )
+                    )
                   )
                 )
               ) + post_delete_btn("/actions/delete-run/" + run.id, req),
@@ -1822,6 +1828,34 @@ router.get(
   })
 );
 
+const workflowRunPromiseHandler = (promise, run, req) => {
+  promise
+    .then(async (runres) => {
+      const retDirs = await run.popReturnDirectives();
+      const emitData = {
+        ...runres,
+        ...retDirs,
+        page_load_tag: req.headers["page-load-tag"],
+      };
+      getState().emitDynamicUpdate(db.getTenantSchema(), emitData);
+      if (
+        !emitData.resume_workflow &&
+        !emitData.popup?.startsWith?.("/actions/fill-workflow-form/")
+      )
+        getState().emitDynamicUpdate(db.getTenantSchema(), {
+          eval_js: "reset_spinners()",
+          page_load_tag: req.headers["page-load-tag"],
+        });
+    })
+    .catch((e) => {
+      console.error(e);
+      getState().emitDynamicUpdate(db.getTenantSchema(), {
+        error: e.message,
+        page_load_tag: req.headers["page-load-tag"],
+      });
+    });
+};
+
 router.post(
   "/fill-workflow-form/:id",
   error_catcher(async (req, res) => {
@@ -1849,20 +1883,30 @@ router.post(
       const title = "Fill form";
       res.sendWrap(title, renderForm(form, req.csrfToken()));
     } else {
+      const run_async =
+        getState().getConfig("enable_dynamic_updates") &&
+        req.headers["page-load-tag"] &&
+        req.xhr;
       await run.provide_form_input(form.values);
-      const runres = await run.run({
+      const promise = run.run({
         user: req.user,
         trace: trigger.configuration?.save_traces,
         interactive: true,
       });
-      if (req.xhr) {
-        const retDirs = await run.popReturnDirectives();
-
-        //if (runres?.popup) retDirs.popup = runres.popup;
-        res.json({ success: "ok", ...runres, ...retDirs });
+      if (run_async) {
+        workflowRunPromiseHandler(promise, run, req);
+        res.json({ success: "ok" });
       } else {
-        if (run.context.goto) res.redirect(run.context.goto);
-        else res.redirect("/");
+        const runres = await promise;
+        if (req.xhr) {
+          const retDirs = await run.popReturnDirectives();
+
+          //if (runres?.popup) retDirs.popup = runres.popup;
+          res.json({ success: "ok", ...runres, ...retDirs });
+        } else {
+          if (run.context.goto) res.redirect(run.context.goto);
+          else res.redirect("/");
+        }
       }
     }
   })
@@ -1884,25 +1928,35 @@ router.post(
       return;
     }
     const trigger = await Trigger.findOne({ id: run.trigger_id });
-    const runResult = await run.run({
+    const run_async =
+      getState().getConfig("enable_dynamic_updates") &&
+      req.headers["page-load-tag"] &&
+      req.xhr;
+    const promise = run.run({
       user: req.user,
       interactive: true,
       trace: trigger.configuration?.save_traces,
     });
-    if (req.xhr) {
-      if (
-        runResult &&
-        typeof runResult === "object" &&
-        Object.keys(runResult).length
-      ) {
-        res.json({ success: "ok", ...runResult });
-        return;
-      }
-      const retDirs = await run.popReturnDirectives();
-      res.json({ success: "ok", ...retDirs });
+    if (run_async) {
+      workflowRunPromiseHandler(promise, run, req);
+      res.json({ success: "ok" });
     } else {
-      if (run.context.goto) res.redirect(run.context.goto);
-      else res.redirect("/");
+      const runResult = await promise;
+      if (req.xhr) {
+        if (
+          runResult &&
+          typeof runResult === "object" &&
+          Object.keys(runResult).length
+        ) {
+          res.json({ success: "ok", ...runResult });
+          return;
+        }
+        const retDirs = await run.popReturnDirectives();
+        res.json({ success: "ok", ...retDirs });
+      } else {
+        if (run.context.goto) res.redirect(run.context.goto);
+        else res.redirect("/");
+      }
     }
   })
 );

package/routes/admin.js

@@ -4197,7 +4197,8 @@ router.post(
       await db.deleteWhere("_sc_model_instances");
       await db.deleteWhere("_sc_models");
 
-      const tables = await Table.find();
+      //in revers order of creation in case any provided tables depend on real tables
+      const tables = await Table.find({}, { orderBy: "id", orderDesc: true });
 
       for (const table of tables) {
         await db.deleteWhere("_sc_triggers", {
@@ -4449,7 +4450,7 @@ router.get(
             "Only functions declared as <code>function name(...) {...}</code> or <code>async function name(...) {...}</code> will be available in formulae and code actions. Declare a constant <code>k</code> as <code>globalThis.k = ...</code> In scope: " +
             a(
               {
-                href: "/admin/jsdoc/classes/_saltcorn_data.models.Table-1.html",
+                href: "/admin/jsdoc/classes/_saltcorn_data.models_table.Table.html",
                 target: "_blank",
               },
               "Table"

package/routes/api.js

@@ -343,15 +343,15 @@ router.get(
         return res.status(400).send({ error: "Invalid limit parameter" });
       }
     if (typeof offset !== "undefined")
-      if (isNaN(offset) || !validateNumberMin(offset, 1)) {
+      if (isNaN(offset) || !validateNumberMin(offset, 0)) {
         getState().log(3, `API get ${tableName} Invalid offset parameter`);
         return res.status(400).send({ error: "Invalid offset parameter" });
       }
-    const table = Table.findOne(
-      strictParseInt(tableName)
-        ? { id: strictParseInt(tableName) }
-        : { name: tableName }
+    const strictIntId = strictParseInt(tableName);
+    let table = Table.findOne(
+      strictIntId ? { id: strictParseInt(tableName) } : { name: tableName }
     );
+    if (strictIntId && !table) table = Table.findOne({ name: tableName });
     if (!table) {
       getState().log(3, `API get ${tableName} table not found`);
       getState().log(

package/routes/common_lists.js

@@ -210,6 +210,13 @@ const view_dropdown = (view, req, on_done_redirect_str = "") =>
         },
         '<i class="fas fa-undo-alt"></i>&nbsp;' + req.__("Restore")
       ),
+        a(
+      {
+        class: "dropdown-item",
+        href: `/registry-editor?etype=view&ename=${encodeURIComponent(view.name)}`,
+      },
+      '<i class="fas fa-cog"></i>&nbsp;' + req.__("Registry editor")
+    ),
     view.id && div({ class: "dropdown-divider" }),
     view.id &&
       post_dropdown_item(

package/routes/delete.js

@@ -8,7 +8,7 @@ const Router = require("express-promise-router");
 
 const { error_catcher, is_relative_url } = require("./utils.js");
 const Table = require("@saltcorn/data/models/table");
-
+const { readState } = require("@saltcorn/data/plugin-helper");
 /**
  * @type {object}
  * @const
@@ -36,11 +36,18 @@ router.post(
     const table = Table.findOne({ name: tableName });
     const role = req.user && req.user.id ? req.user.role_id : 100;
     const where = { [table.pk_name]: id };
-
+    const resultCollector = {};
+    let success = false;
     try {
-      if (role <= table.min_role_write)
-        await table.deleteRows(where, req.user || { role_id: 100 });
-      else if (
+      if (role <= table.min_role_write) {
+        await table.deleteRows(
+          where,
+          req.user || { role_id: 100 },
+          false,
+          resultCollector
+        );
+        success = true;
+      } else if (
         (table.ownership_field_id || table.ownership_formula) &&
         req.user
       ) {
@@ -48,6 +55,59 @@ router.post(
           { id },
           { forUser: req.user, forPublic: !req.user }
         );
+        if (row && table.is_owner(req.user, row)) {
+          await table.deleteRows(
+            where,
+            req.user || { role_id: 100 },
+            false,
+            resultCollector
+          );
+          success = true;
+        } else req.flash("error", req.__("Not authorized"));
+      } else
+        req.flash(
+          "error",
+          req.__("Not allowed to write to table %s", table.name)
+        );
+    } catch (e) {
+      console.error(e);
+      req.flash("error", e.message);
+    }
+    if (req.xhr) {
+      res.json({ success, ...resultCollector });
+    } else
+      res.redirect(
+        (is_relative_url(redirect) && redirect) || `/list/${table.name}`
+      );
+  })
+);
+router.post(
+  "/:tableName",
+  error_catcher(async (req, res) => {
+    const { tableName } = req.params;
+    const { redirect, ...restQuery } = req.query;
+    // todo check that works after where change
+    const table = Table.findOne({ name: tableName });
+    const role = req.user && req.user.id ? req.user.role_id : 100;
+    const query = {};
+    table.fields.forEach((f) => {
+      if (typeof restQuery[f.name] !== "undefined")
+        query[f.name] = restQuery[f.name];
+    });
+    const where = readState(query, table.fields, req);
+    console.log({ where, restQuery });
+
+    try {
+      if (role <= table.min_role_write)
+        await table.deleteRows(where, req.user || { role_id: 100 });
+      else if (
+        (table.ownership_field_id || table.ownership_formula) &&
+        req.user
+      ) {
+        const row = await table.getRow(where, {
+          forUser: req.user,
+          forPublic: !req.user,
+        });
         if (row && table.is_owner(req.user, row))
           await table.deleteRows(where, req.user || { role_id: 100 });
         else req.flash("error", req.__("Not authorized"));

package/routes/eventlog.js

@@ -222,7 +222,8 @@ router.get(
       //sub2_page: "Events to log",
       contents: {
         type: "card",
-        title: req.__("Custom Events"),
+        title: req.__("Custom Events")+
+          `<a href="javascript:ajax_modal('/admin/help/Custom%20events?')"><i class="fas fa-question-circle ms-1"></i></a>`,
         contents:
           mkTable(
             [

package/routes/homepage.js

@@ -25,6 +25,7 @@ const Trigger = require("@saltcorn/data/models/trigger");
 const { fileUploadForm } = require("../markup/forms");
 const { get_base_url, sendHtmlFile, getEligiblePage } = require("./utils.js");
 const semver = require("semver");
+const { add_results_to_contents } = require("../markup/admin.js");
 
 /**
  * Tables List
@@ -554,10 +555,17 @@ const no_views_logged_in = async (req, res) => {
  */
 const get_config_response = async (role_id, res, req) => {
   const state = getState();
-  const maintenanceModeEnabled = state.getConfig("maintenance_mode_enabled", false);
+  const maintenanceModeEnabled = state.getConfig(
+    "maintenance_mode_enabled",
+    false
+  );
   const maintenanceModePage = state.getConfig("maintenance_mode_page", "");
 
-  if(maintenanceModeEnabled && (!req.user || req.user.role_id > 1) && maintenanceModePage) {
+  if (
+    maintenanceModeEnabled &&
+    (!req.user || req.user.role_id > 1) &&
+    maintenanceModePage
+  ) {
     const db_page = await Page.findOne({ name: maintenanceModePage });
     if (db_page) {
       res.sendWrap(
@@ -583,6 +591,21 @@ const get_config_response = async (role_id, res, req) => {
     no_menu,
     requestFluidLayout
   ) => {
+    const resultCollector = {};
+
+    await Trigger.runTableTriggers(
+      "PageLoad",
+      null,
+      {
+        text: "Homepage loaded",
+        type: "home",
+        query: req.query,
+      },
+      resultCollector,
+      req.user,
+      { req }
+    );
+
     if (contents.html_file) await sendHtmlFile(req, res, contents.html_file);
     else
       res.sendWrap(
@@ -593,7 +616,7 @@ const get_config_response = async (role_id, res, req) => {
           no_menu,
           requestFluidLayout,
         },
-        contents
+        add_results_to_contents(contents, resultCollector)
       );
   };
   const modernCfg = getState().getConfig("home_page_by_role", false);

package/routes/page.js

@@ -19,10 +19,11 @@ const {
   getRandomPage,
 } = require("../routes/utils.js");
 const { isTest } = require("@saltcorn/data/utils");
-const { add_edit_bar } = require("../markup/admin.js");
+const { add_edit_bar, add_results_to_contents } = require("../markup/admin.js");
 const { traverseSync } = require("@saltcorn/data/models/layout");
 const { run_action_column } = require("@saltcorn/data/plugin-helper");
 const db = require("@saltcorn/data/db");
+const Crash = require("@saltcorn/data/models/crash");
 
 /**
  * @type {object}
@@ -53,13 +54,22 @@ const runPage = async (page, req, res, tic) => {
     const tock = new Date();
     const ms = tock.getTime() - tic.getTime();
 
-    if (!isTest()) {
-      Trigger.emitEvent("PageLoad", null, req.user, {
-        text: req.__("Page '%s' was loaded", page.name),
-        type: "page",
-        name: page.name,
-        render_time: ms,
-      });
+    const resultCollector = {};
+    if (!isTest() && !req.xhr) {
+      await Trigger.runTableTriggers(
+        "PageLoad",
+        null,
+        {
+          text: req.__("Page '%s' was loaded", page.name),
+          type: "page",
+          name: page.name,
+          render_time: ms,
+          query: req.query,
+        },
+        resultCollector,
+        req.user,
+        { req }
+      );
     }
     if (contents.html_file) await sendHtmlFile(req, res, contents.html_file);
     else
@@ -71,15 +81,18 @@ const runPage = async (page, req, res, tic) => {
           no_menu: page.attributes?.no_menu,
           requestFluidLayout: page.attributes?.request_fluid_layout,
         } || `${page.name} page`,
-        req.smr
-          ? contents
-          : add_edit_bar({
-              role,
-              title: page.name,
-              what: req.__("Page"),
-              url: `/pageedit/edit/${encodeURIComponent(page.name)}`,
-              contents,
-            })
+        add_results_to_contents(
+          req.smr
+            ? contents
+            : add_edit_bar({
+                role,
+                title: page.name,
+                what: req.__("Page"),
+                url: `/pageedit/edit/${encodeURIComponent(page.name)}?on_done_redirect=${encodeURIComponent(req.originalUrl.replace("/", ""))}`,
+                contents,
+              }),
+          resultCollector
+        )
       );
   } else {
     getState().log(2, `Page ${page.name} not authorized`);
@@ -149,7 +162,10 @@ router.get(
   "/:pagename",
   error_catcher(async (req, res) => {
     const state = getState();
-    const maintenanceModeEnabled = state.getConfig("maintenance_mode_enabled", false);
+    const maintenanceModeEnabled = state.getConfig(
+      "maintenance_mode_enabled",
+      false
+    );
     const maintenanceModePage = state.getConfig("maintenance_mode_page", "");
 
     if (
@@ -196,7 +212,10 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     const state = getState();
-    const maintenanceModeEnabled = state.getConfig("maintenance_mode_enabled", false);
+    const maintenanceModeEnabled = state.getConfig(
+      "maintenance_mode_enabled",
+      false
+    );
     if (maintenanceModeEnabled && (!req.user || req.user.role_id > 1)) {
       res.status(503).json({ error: "in maintenance mode" });
       return;
@@ -217,7 +236,10 @@ router.post(
   "/:pagename/action/:rndid",
   error_catcher(async (req, res) => {
     const state = getState();
-    const maintenanceModeEnabled = state.getConfig("maintenance_mode_enabled", false);
+    const maintenanceModeEnabled = state.getConfig(
+      "maintenance_mode_enabled",
+      false
+    );
     if (maintenanceModeEnabled && (!req.user || req.user.role_id > 1)) {
       res.status(503).json({ error: "in maintenance mode" });
       return;
@@ -246,6 +268,7 @@ router.post(
           res.json({ success: "ok", ...(result || {}) });
         } catch (e) {
           getState().log(2, e?.stack);
+          await Crash.create(e, req);
           res.status(400).json({ error: e.message || e });
         }
       } else res.status(404).json({ error: "Action not found" });

package/routes/pageedit.js

@@ -119,6 +119,10 @@ const pagePropertiesForm = async (req, isNew) => {
         sublabel: req.__("User role required to access page"),
         input_type: "select",
         options: roles.map((r) => ({ value: r.id, label: r.role })),
+        help: {
+          topic: "Role to access",
+          context: {},
+        },
       },
       ...(htmlOptions.length > 0
         ? [

package/routes/tables.js

@@ -787,7 +787,8 @@ router.get(
     let id = parseInt(idorname);
     let table;
     if (id) [table] = await Table.find({ id });
-    else {
+    
+    if (!table) {
       [table] = await Table.find({ name: idorname });
     }
 
@@ -1565,7 +1566,7 @@ router.get(
         },
         {
           type: "card",
-          class: "mt-0",
+          class: "mt-0 card-max-full-screen",
           title: cardHeaderTabs([
             { label: req.__("Your tables"), href: "/table", active: true },
             {
@@ -1573,7 +1574,8 @@ router.get(
               href: "/table/relationship-diagram",
             },
           ]),
-          contents: mainCard + createCard,
+          footer: createCard,
+          contents: mainCard,
         },
       ],
     });

package/routes/tenant.js

@@ -501,6 +501,7 @@ const tenant_settings_form = (req) =>
       "tenants_install_git",
       "tenants_set_npm_modules",
       "tenants_unsafe_plugins",
+      "tenants_crash_log",
     ],
     action: "/tenant/settings",
     submitLabel: req.__("Save"),