@saltcorn/server 0.8.7 → 0.8.8-beta.1

package/routes/menu.js

@@ -69,8 +69,8 @@ const menuForm = async (req) => {
       .filter(([k, v]) => !v.requireRow && !v.disableInBuilder)
       .map(([k, v]) => k),
   ];
-  const triggers = await Trigger.find({
-    when_trigger: { or: ["API call", "Never"] },
+  const triggers = Trigger.find({
+    when_trigger: {or: ["API call", "Never"]},
   });
   triggers.forEach((tr) => {
     actions.push(tr.name);
@@ -148,6 +148,13 @@ const menuForm = async (req) => {
         input_type: "select",
         options: roles.map((r) => ({ label: r.role, value: r.id })),
       },
+      {
+        name: "disable_on_mobile",
+        label: req.__("Disable on mobile"),
+        type: "Bool",
+        class: "item-menu",
+        required: false,
+      },
       {
         name: "url",
         label: req.__("URL"),
@@ -264,18 +271,18 @@ const menuForm = async (req) => {
         },
         attributes: {
           options: [
-            { name: "", label: "Link" },
-            { name: "btn btn-primary", label: "Primary button" },
-            { name: "btn btn-secondary", label: "Secondary button" },
-            { name: "btn btn-success", label: "Success button" },
-            { name: "btn btn-danger", label: "Danger button" },
+            { name: "", label: req.__("Link") },
+            { name: "btn btn-primary", label: req.__("Primary button") },
+            { name: "btn btn-secondary", label: req.__("Secondary button") },
+            { name: "btn btn-success", label: req.__("Success button") },
+            { name: "btn btn-danger", label: req.__("Danger button") },
             {
               name: "btn btn-outline-primary",
-              label: "Primary outline button",
+              label: req.__("Primary outline button"),
             },
             {
               name: "btn btn-outline-secondary",
-              label: "Secondary outline button",
+              label: req.__("Secondary outline button"),
             },
           ],
         },

package/routes/models.js

@@ -0,0 +1,492 @@
+/**
+ * @category server
+ * @module routes/models
+ * @subcategory routes
+ */
+
+const Router = require("express-promise-router");
+
+const { error_catcher, is_relative_url, isAdmin } = require("./utils.js");
+const Table = require("@saltcorn/data/models/table");
+const Form = require("@saltcorn/data/models/form");
+const Model = require("@saltcorn/data/models/model");
+const ModelInstance = require("@saltcorn/data/models/model_instance");
+const { getState } = require("@saltcorn/data/db/state");
+const db = require("@saltcorn/data/db");
+const moment = require("moment");
+
+const { mkTable, renderForm, post_delete_btn } = require("@saltcorn/markup");
+const {
+  span,
+  h4,
+  p,
+  a,
+  div,
+  i,
+  form,
+  label,
+  input,
+  text,
+  script,
+  domReady,
+  code,
+  iframe,
+  style,
+  pre,
+} = require("@saltcorn/markup/tags");
+
+const router = new Router();
+module.exports = router;
+
+const newModelForm = (table, req) => {
+  return new Form({
+    action: "/models/new/" + table.id,
+    fields: [
+      { name: "name", label: "Name", type: "String", required: true },
+      {
+        name: "modelpattern",
+        label: "Model pattern",
+        type: "String",
+        required: true,
+        attributes: { options: Object.keys(getState().modelpatterns) },
+      },
+    ],
+  });
+};
+
+router.get(
+  "/new/:table_id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { table_id } = req.params;
+    const table = await Table.findOne({ id: table_id });
+    res.sendWrap(req.__(`New model`), {
+      above: [
+        {
+          type: "breadcrumbs",
+          crumbs: [
+            { text: req.__("Tables"), href: "/table" },
+            { href: `/table/${table.id}`, text: table.name },
+            { text: req.__(`New model`) },
+          ],
+        },
+        {
+          type: "card",
+          class: "mt-0",
+          title: req.__(`New model`),
+          contents: renderForm(newModelForm(table, req), req.csrfToken()),
+        },
+      ],
+    });
+  })
+);
+
+router.post(
+  "/new/:table_id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { table_id } = req.params;
+    const table = await Table.findOne({ id: table_id });
+    const form = newModelForm(table, req);
+    form.validate(req.body);
+    if (form.hasErrors) {
+      res.sendWrap(req.__(`New model`), renderForm(form, req.csrfToken()));
+    } else {
+      const model = await Model.create({ ...form.values, table_id: table.id });
+      if (model.templateObj.configuration_workflow)
+        res.redirect(`/models/config/${model.id}`);
+      else res.redirect(`/models/show/${model.id}`);
+    }
+  })
+);
+
+const respondWorkflow = (model, table, wf, wfres, req, res) => {
+  const wrap = (contents, noCard, previewURL) => ({
+    above: [
+      {
+        type: "breadcrumbs",
+        crumbs: [
+          { text: req.__("Tables"), href: "/table" },
+          { href: `/table/${table.id || table.name}`, text: table.name },
+          { href: `/models/show/${model.id}`, text: model.name },
+          { text: req.__("Configuration") },
+        ],
+      },
+      {
+        type: noCard ? "container" : "card",
+        class: !noCard && "mt-0",
+        title: wfres.title,
+        titleAjaxIndicator: true,
+        contents,
+      },
+    ],
+  });
+  if (wfres.flash) req.flash(wfres.flash[0], wfres.flash[1]);
+  if (wfres.renderForm)
+    res.sendWrap(
+      {
+        title: req.__(`%s configuration`, model.name),
+        headers: [
+          {
+            script: `/static_assets/${db.connectObj.version_tag}/jquery-menu-editor.min.js`,
+          },
+          {
+            script: `/static_assets/${db.connectObj.version_tag}/iconset-fontawesome5-3-1.min.js`,
+          },
+          {
+            script: `/static_assets/${db.connectObj.version_tag}/bootstrap-iconpicker.js`,
+          },
+          {
+            css: `/static_assets/${db.connectObj.version_tag}/bootstrap-iconpicker.min.css`,
+          },
+        ],
+      },
+      wrap(
+        renderForm(wfres.renderForm, req.csrfToken()),
+        false,
+        wfres.previewURL
+      )
+    );
+  else res.redirect(wfres.redirect);
+};
+
+const get_model_workflow = (model, req) => {
+  const workflow = model.templateObj.configuration_workflow(req);
+  workflow.action = `/models/config/${model.id}`;
+  const oldOnDone = workflow.onDone || ((c) => c);
+  workflow.onDone = async (ctx) => {
+    const { id, ...configuration } = await oldOnDone(ctx);
+    await model.update({ configuration });
+
+    return {
+      redirect: `/models/show/${model.id}`,
+      flash: ["success", `Model ${this.name || ""} saved`],
+    };
+  };
+  return workflow;
+};
+
+router.get(
+  "/config/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const { step } = req.query;
+
+    const model = await Model.findOne({ id });
+    const table = await Table.findOne({ id: model.table_id });
+    const configFlow = get_model_workflow(model, req);
+    const wfres = await configFlow.run(
+      {
+        ...model.configuration,
+        id: model.id,
+        table_id: model.table_id,
+        ...(step ? { stepName: step } : {}),
+      },
+      req
+    );
+    respondWorkflow(model, table, configFlow, wfres, req, res);
+  })
+);
+
+router.post(
+  "/config/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const { step } = req.query;
+
+    const model = await Model.findOne({ id });
+    const table = await Table.findOne({ id: model.table_id });
+    if (!table) {
+      req.flash("error", `Table not found`);
+      res.redirect(`/table`);
+      return;
+    }
+    const workflow = get_model_workflow(model, req);
+    const wfres = await workflow.run(req.body, req);
+    respondWorkflow(model, table, workflow, wfres, req, res);
+  })
+);
+
+router.get(
+  "/show/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const model = await Model.findOne({ id });
+    const table = await Table.findOne({ id: model.table_id });
+    const instances = await ModelInstance.find({ model_id: model.id });
+    const metrics = model.templateObj.metrics || {};
+    const metricCols = Object.entries(metrics).map(([k, v]) => ({
+      label: k,
+      key: (inst) => inst.metric_values?.[k]?.toPrecision(6),
+    }));
+    const anyReport = instances.some((i) => !!i.report);
+    res.sendWrap(req.__(`Show model`), {
+      above: [
+        {
+          type: "breadcrumbs",
+          crumbs: [
+            { text: req.__("Tables"), href: "/table" },
+            { href: `/table/${table.id}`, text: table.name },
+            { text: model.name },
+          ],
+          after: a(
+            { href: `/models/config/${model.id}` },
+            req.__("Edit"),
+            i({ class: "ms-1 fas fa-edit" })
+          ),
+        },
+        {
+          type: "card",
+          class: "mt-0",
+          title: req.__("Model instances"),
+          contents: div(
+            mkTable(
+              [
+                { label: req.__("Name"), key: "name" },
+                {
+                  label: req.__("Trained"),
+                  key: (inst) => moment(inst.trained_on).fromNow(),
+                },
+                ...(anyReport
+                  ? [
+                      {
+                        label: req.__("Report"),
+                        key: (inst) =>
+                          inst.report
+                            ? a(
+                                { href: `/models/show-report/${inst.id}` },
+                                i({ class: "fas fa-file-alt" })
+                              )
+                            : "",
+                      },
+                    ]
+                  : []),
+                ...metricCols,
+                {
+                  label: req.__("Default"),
+                  key: (inst) =>
+                    form(
+                      {
+                        action: `/models/make-default-instance/${inst.id}`,
+                        method: "POST",
+                      },
+                      span(
+                        { class: "form-switch" },
+                        input({
+                          class: ["form-check-input"],
+                          type: "checkbox",
+                          onChange: "this.form.submit()",
+                          role: "switch",
+                          name: "enabled",
+                          ...(inst.is_default && { checked: true }),
+                        })
+                      ),
+                      input({
+                        type: "hidden",
+                        name: "_csrf",
+                        value: req.csrfToken(),
+                      })
+                    ),
+                },
+                {
+                  label: req.__("Delete"),
+                  key: (r) =>
+                    post_delete_btn(
+                      `/models/delete-instance/${encodeURIComponent(r.id)}`,
+                      req
+                    ),
+                },
+              ],
+              instances
+            ),
+            a(
+              { href: `/models/train/${model.id}`, class: "btn btn-primary" },
+              i({ class: "fas fa-graduation-cap me-1" }),
+              req.__("Train new instance")
+            )
+          ),
+        },
+      ],
+    });
+  })
+);
+const model_train_form = (model, table, req) => {
+  const hyperparameter_fields =
+    model.templateObj.hyperparameter_fields?.({
+      table,
+      ...model,
+    }) || [];
+  return new Form({
+    action: `/models/train/${model.id}`,
+    onSubmit: "press_store_button(this)",
+    fields: [
+      {
+        name: "name",
+        label: req.__("Name"),
+        type: "String",
+        required: true,
+      },
+      ...hyperparameter_fields,
+    ],
+  });
+};
+router.post(
+  "/delete/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const model = await Model.findOne({ id });
+    await model.delete();
+    req.flash("success", req.__("Model %s deleted", model.name));
+    res.redirect(`/table/${model.table_id}`);
+  })
+);
+
+router.post(
+  "/delete-instance/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const model_inst = await ModelInstance.findOne({ id });
+    await model_inst.delete();
+    req.flash("success", req.__("Model instance %s deleted", model_inst.name));
+    res.redirect(`/models/show/${model_inst.model_id}`);
+  })
+);
+
+router.get(
+  "/train/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const model = await Model.findOne({ id });
+    const table = await Table.findOne({ id: model.table_id });
+    const form = model_train_form(model, table, req);
+    res.sendWrap(req.__(`Train model`), {
+      above: [
+        {
+          type: "breadcrumbs",
+          crumbs: [
+            { text: req.__("Tables"), href: "/table" },
+            { href: `/table/${table.id}`, text: table.name },
+            { href: `/models/show/${model.id}`, text: model.name },
+            { text: req.__(`Train`) },
+          ],
+        },
+        {
+          type: "card",
+          class: "mt-0",
+          title: req.__(`New model`),
+          contents: renderForm(form, req.csrfToken()),
+        },
+      ],
+    });
+  })
+);
+router.post(
+  "/train/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const model = await Model.findOne({ id });
+    const table = Table.findOne({ id: model.table_id });
+    const form = model_train_form(model, table, req);
+    form.validate(req.body);
+    if (form.hasErrors) {
+      res.sendWrap(req.__(`Train model`), renderForm(form, req.csrfToken()));
+    } else {
+      const { name, ...hyperparameters } = form.values;
+
+      const train_res = await model.train_instance(name, hyperparameters, {});
+      if (typeof train_res === "string") {
+        res.sendWrap(req.__(`Model training error`), {
+          above: [
+            {
+              type: "breadcrumbs",
+              crumbs: [
+                { text: req.__("Tables"), href: "/table" },
+                { href: `/table/${table.id}`, text: table.name },
+                { href: `/models/show/${model.id}`, text: model.name },
+                { text: req.__(`Training error`) },
+              ],
+            },
+            {
+              type: "card",
+              class: "mt-0",
+              title: req.__(`Training error`),
+              contents: pre(train_res),
+            },
+          ],
+        });
+      } else {
+        req.flash("success", "Model trained");
+        res.redirect(`/models/show/${model.id}`);
+      }
+    }
+  })
+);
+
+router.post(
+  "/make-default-instance/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const model_instance = await ModelInstance.findOne({ id });
+    await model_instance.make_default(!req.body.enabled);
+    res.redirect(`/models/show/${model_instance.model_id}`);
+  })
+);
+
+const encode = (s) =>
+  s.replace(
+    //https://stackoverflow.com/a/57448862/19839414
+    /[&<>'"]/g,
+    (tag) =>
+      ({
+        "&": "&amp;",
+        "<": "&lt;",
+        ">": "&gt;",
+        "'": "&#39;",
+        '"': "&quot;",
+      }[tag])
+  );
+
+router.get(
+  "/show-report/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const model_instance = await ModelInstance.findOne({ id });
+    const model = await Model.findOne({ id: model_instance.model_id });
+    const table = Table.findOne({ id: model.table_id });
+    res.sendWrap(req.__(`Train model`), {
+      above: [
+        {
+          type: "breadcrumbs",
+          crumbs: [
+            { text: req.__("Tables"), href: "/table" },
+            { href: `/table/${table.id}`, text: table.name },
+            { href: `/models/show/${model.id}`, text: model.name },
+            { text: model_instance.name },
+            { text: req.__(`Report`) },
+          ],
+        },
+        {
+          type: "card",
+          class: "mt-0",
+          title: req.__(`Model training report`),
+          contents:
+            iframe({
+              id: "trainreport",
+              width: "100%",
+              height: "100vh",
+              srcdoc: encode(model_instance.report),
+            }) + style(`iframe#trainreport { height: 100vh}`),
+        },
+      ],
+    });
+  })
+);

package/routes/page.js

@@ -7,6 +7,7 @@
 const Router = require("express-promise-router");
 
 const Page = require("@saltcorn/data/models/page");
+const Trigger = require("@saltcorn/data/models/trigger");
 const { getState } = require("@saltcorn/data/db/state");
 const {
   error_catcher,
@@ -40,18 +41,21 @@ router.get(
     const { pagename } = req.params;
     const state = getState();
     state.log(3, `Route /page/${pagename} user=${req.user?.id}`);
-    const tic = state.logLevel >= 5 ? new Date() : null;
+    const tic = new Date();
 
     const role = req.user && req.user.id ? req.user.role_id : 100;
     const db_page = await Page.findOne({ name: pagename });
     if (db_page && role <= db_page.min_role) {
       const contents = await db_page.run(req.query, { res, req });
       const title = scan_for_page_title(contents, db_page.title);
-      if (tic) {
-        const tock = new Date();
-        const ms = tock.getTime() - tic.getTime();
-        state.log(5, `Page ${pagename} rendered in ${ms} ms`);
-      }
+      const tock = new Date();
+      const ms = tock.getTime() - tic.getTime();
+      Trigger.emitEvent("PageLoad", null, req.user, {
+        text: req.__("Page '%s' was loaded", pagename),
+        type: "page",
+        name: pagename,
+        render_time: ms,
+      });
       res.sendWrap(
         {
           title,