@saltcorn/server 0.7.3-beta.7 → 0.7.4-beta.1

package/routes/api.js

@@ -112,6 +112,13 @@ function accessAllowed(req, user, trigger) {
   return role <= trigger.min_role;
 }
 
+const getFlashes = (req) =>
+  ["error", "success", "danger", "warning", "information"]
+    .map((type) => {
+      return { type, msg: req.flash(type) };
+    })
+    .filter((a) => a.msg && a.msg.length && a.msg.length > 0);
+
 router.post(
   "/viewQuery/:viewName/:queryName",
   error_catcher(async (req, res, next) => {
@@ -134,7 +141,7 @@ router.post(
           if (queries[queryName]) {
             const { args } = req.body;
             const resp = await queries[queryName](...args, true);
-            res.json({ success: resp });
+            res.json({ success: resp, alerts: getFlashes(req) });
           } else {
             res.status(404).json({ error: req.__("Not found") });
           }
@@ -235,6 +242,7 @@ router.get(
             rows = await table.getJoinedRows(joinOpts);
           } else if (req_query && req_query !== {}) {
             const tbl_fields = await table.getFields();
+            readState(req_query, tbl_fields, req);
             const qstate = await stateFieldsToWhere({
               fields: tbl_fields,
               approximate: !!approximate,

package/routes/eventlog.js

@@ -73,8 +73,9 @@ const logSettingsForm = async (req) => {
       fields.push({
         name: w + "_channel",
         label: w + " channel",
-        sublabel:
-          req.__("Channels to create events for. Separate by comma; leave blank for all"),
+        sublabel: req.__(
+          "Channels to create events for. Separate by comma; leave blank for all"
+        ),
         type: "String",
         showIf: { [w]: true },
       });
@@ -82,8 +83,8 @@ const logSettingsForm = async (req) => {
   return new Form({
     action: "/eventlog/settings",
     blurb: req.__("Which events should be logged?"),
-    submitButtonClass: "btn-outline-primary",
-    onChange: "remove_outline(this)",
+    noSubmitButton: true,
+    onChange: "saveAndContinue(this)",
     fields,
   });
 };
@@ -169,23 +170,23 @@ router.get(
  * @returns {Form}
  */
 const customEventForm = async (req) => {
-    return new Form({
-        action: "/eventlog/custom/new",
-        submitButtonClass: "btn-outline-primary",
-        onChange: "remove_outline(this)",
-        fields: [
-            {
-                name: "name",
-                label: req.__("Event Name"),
-                type: "String",
-            },
-            {
-                name: "hasChannel",
-                label: req.__("Has channels?"),
-                type: "Bool",
-            },
-        ],
-    });
+  return new Form({
+    action: "/eventlog/custom/new",
+    submitButtonClass: "btn-outline-primary",
+    onChange: "remove_outline(this)",
+    fields: [
+      {
+        name: "name",
+        label: req.__("Event Name"),
+        type: "String",
+      },
+      {
+        name: "hasChannel",
+        label: req.__("Has channels?"),
+        type: "Bool",
+      },
+    ],
+  });
 };
 /**
  * @name get/custom/new
@@ -297,7 +298,8 @@ router.post(
     } else {
       await getState().setConfig("event_log_settings", form.values);
 
-      res.redirect(`/eventlog/settings`);
+      if (!req.xhr) res.redirect(`/eventlog/settings`);
+      else res.json({ success: "ok" });
     }
   })
 );

package/routes/fields.js

@@ -348,13 +348,12 @@ const fieldFlow = (req) =>
                 // todo sublabel
                 input_type: "custom_html",
                 attributes: {
-                  html: `<button type="button" id="test_formula_btn" onclick="test_formula('${
-                    table.name
-                  }', ${JSON.stringify(
-                    context.stored
-                  )})" class="btn btn-outline-secondary">${req.__(
-                    "Test"
-                  )}</button>
+                  html: `<button type="button" id="test_formula_btn" onclick="test_formula('${table.name
+                    }', ${JSON.stringify(
+                      context.stored
+                    )})" class="btn btn-outline-secondary">${req.__(
+                      "Test"
+                    )}</button>
                   <div id="test_formula_output"></div>`,
                 },
               }),
@@ -633,8 +632,7 @@ router.post(
         result = f(rows[0]);
       }
       res.send(
-        `Result of running on row with id=${
-          rows[0].id
+        `Result of running on row with id=${rows[0].id
         } is: <pre>${JSON.stringify(result)}</pre>`
       );
     } catch (e) {
@@ -788,22 +786,22 @@ router.post(
       field.type === "Key"
         ? getState().keyFieldviews
         : field.type === "File"
-        ? getState().fileviews
-        : field.type.fieldviews;
+          ? getState().fileviews
+          : field.type.fieldviews;
     if (!field.type || !fieldviews) {
       res.send("");
       return;
     }
     const fv = fieldviews[fieldview];
     if (!fv && field.type === "Key" && fieldview === "select")
-      res.send("<select disabled></select>");
+      res.send(`<input readonly class="form-control form-select"></input>`);
     else if (!fv) res.send("");
     else if (fv.isEdit || fv.isFilter)
       res.send(
         fv.run(
           field.name,
           undefined,
-          { disabled: true, ...configuration, ...(field.attributes || {}) },
+          { readonly: true, ...configuration, ...(field.attributes || {}) },
           "",
           false,
           field

package/routes/files.js

@@ -378,9 +378,6 @@ const storage_form = async (req) => {
     ],
     action: "/files/storage",
   });
-  form.submitButtonClass = "btn-outline-primary";
-  form.submitLabel = req.__("Save");
-  form.onChange = "remove_outline(this)";
   return form;
 };
 
@@ -431,8 +428,11 @@ router.post(
       });
     } else {
       await save_config_from_form(form);
-      req.flash("success", req.__("Storage settings updated"));
-      res.redirect("/files/storage");
+
+      if (!req.xhr) {
+        req.flash("success", req.__("Storage settings updated"));
+        res.redirect("/files/storage");
+      } else res.json({ success: "ok" });
     }
   })
 );

package/routes/homepage.js

@@ -54,9 +54,9 @@ const tableCard = (tables, req) => ({
   contents:
     (tables.length <= 1
       ? p(
-          { class: "mt-2 pe-2" },
-          i(req.__("Tables organise data by fields and rows."))
-        )
+        { class: "mt-2 pe-2" },
+        i(req.__("Tables organise data by fields and rows."))
+      )
       : "") + tableTable(tables, req),
   bodyClass: "py-0 pe-0",
   footer: div(
@@ -107,13 +107,13 @@ const viewCard = (views, req) => ({
   contents:
     (views.length <= 1
       ? p(
-          { class: "mt-2 pe-2" },
-          i(
-            req.__(
-              "Views display data from tables. A view is a view template applied to a table, with configuration."
-            )
+        { class: "mt-2 pe-2" },
+        i(
+          req.__(
+            "Views display data from tables. A view is a view pattern applied to a table, with configuration."
           )
         )
+      )
       : "") +
     (views.length > 0 ? viewTable(views, req) : p(req.__("No views"))),
 
@@ -160,13 +160,13 @@ const pageCard = (pages, req) => ({
   contents:
     (pages.length <= 1
       ? p(
-          { class: "mt-2 pe-2" },
-          i(
-            req.__(
-              "Pages are the web pages of your application built with a drag-and-drop builder. They have static content, and by embedding views, dynamic content."
-            )
+        { class: "mt-2 pe-2" },
+        i(
+          req.__(
+            "Pages are the web pages of your application built with a drag-and-drop builder. They have static content, and by embedding views, dynamic content."
           )
         )
+      )
       : "") +
     (pages.length > 0
       ? pageTable(pages, req)
@@ -191,16 +191,16 @@ const filesTab = async (req) => {
     files.length === 0
       ? p(req.__("No files"))
       : mkTable(
-          [
-            {
-              label: req.__("Filename"),
-              key: (r) => link(`/files/serve/${r.id}`, r.filename),
-            },
-            { label: req.__("Size (KiB)"), key: "size_kb", align: "right" },
-            { label: req.__("Media type"), key: (r) => r.mimetype },
-          ],
-          files
-        ),
+        [
+          {
+            label: req.__("Filename"),
+            key: (r) => link(`/files/serve/${r.id}`, r.filename),
+          },
+          { label: req.__("Size (KiB)"), key: "size_kb", align: "right" },
+          { label: req.__("Media type"), key: (r) => r.mimetype },
+        ],
+        files
+      ),
     fileUploadForm(req)
   );
 };
@@ -244,30 +244,30 @@ const actionsTab = async (req, triggers) => {
   return div(
     { class: "pb-3" },
     triggers.length <= 1 &&
-      p(
-        { class: "mt-2 pe-2" },
-        i(req.__("Triggers run actions in response to events."))
-      ),
+    p(
+      { class: "mt-2 pe-2" },
+      i(req.__("Triggers run actions in response to events."))
+    ),
     triggers.length === 0
       ? p(req.__("No triggers"))
       : mkTable(
-          [
-            { label: req.__("Name"), key: "name" },
-            { label: req.__("Action"), key: "action" },
-            {
-              label: req.__("Table or Channel"),
-              key: (r) => r.table_name || r.channel,
-            },
-            {
-              label: req.__("When"),
-              key: (a) =>
-                a.when_trigger === "API call"
-                  ? `API: ${base_url}api/action/${a.name}`
-                  : a.when_trigger,
-            },
-          ],
-          triggers
-        ),
+        [
+          { label: req.__("Name"), key: "name" },
+          { label: req.__("Action"), key: "action" },
+          {
+            label: req.__("Table or Channel"),
+            key: (r) => r.table_name || r.channel,
+          },
+          {
+            label: req.__("When"),
+            key: (a) =>
+              a.when_trigger === "API call"
+                ? `API: ${base_url}api/action/${a.name}`
+                : a.when_trigger,
+          },
+        ],
+        triggers
+      ),
     a(
       { href: "/actions/new", class: "btn btn-secondary my-3" },
       req.__("Add trigger")
@@ -385,15 +385,15 @@ const welcome_page = async (req) => {
             tabContents:
               triggers.length > 0
                 ? {
-                    Triggers: await actionsTab(req, triggers),
-                    Files: await filesTab(req),
-                    Packs: packTab(req, packlist),
-                  }
+                  Triggers: await actionsTab(req, triggers),
+                  Files: await filesTab(req),
+                  Packs: packTab(req, packlist),
+                }
                 : {
-                    Packs: packTab(req, packlist),
-                    Triggers: await actionsTab(req, triggers),
-                    Files: await filesTab(req),
-                  },
+                  Packs: packTab(req, packlist),
+                  Triggers: await actionsTab(req, triggers),
+                  Files: await filesTab(req),
+                },
           },
           {
             type: "card",
@@ -403,13 +403,13 @@ const welcome_page = async (req) => {
             tabContents:
               users.length > 4
                 ? {
-                    Users: await usersTab(req, users, roleMap),
-                    Help: helpCard(req),
-                  }
+                  Users: await usersTab(req, users, roleMap),
+                  Help: helpCard(req),
+                }
                 : {
-                    Help: helpCard(req),
-                    Users: await usersTab(req, users, roleMap),
-                  },
+                  Help: helpCard(req),
+                  Users: await usersTab(req, users, roleMap),
+                },
           },
         ],
       },
@@ -440,8 +440,8 @@ const no_views_logged_in = async (req, res) => {
           packagejson.version,
           latest
         ) +
-          " " +
-          a({ href: "/admin/system" }, req.__("Upgrade here"))
+        " " +
+        a({ href: "/admin/system" }, req.__("Upgrade here"))
       );
 
     res.sendWrap(req.__("Hello"), await welcome_page(req));

package/routes/infoarch.js

@@ -48,8 +48,8 @@ router.get(
 const languageForm = (req) =>
   new Form({
     action: "/site-structure/localizer/save-lang",
-    submitButtonClass: "btn-outline-primary",
-    onChange: "remove_outline(this)",
+    onChange: "saveAndContinue(this)",
+    noSubmitButton: true,
     fields: [
       {
         name: "name",
@@ -270,7 +270,10 @@ router.post(
         ...cfgLangs,
         [lang.locale]: lang,
       });
-      res.redirect(`/site-structure/localizer/edit/${lang.locale}`);
+
+      if (!req.xhr)
+        res.redirect(`/site-structure/localizer/edit/${lang.locale}`);
+      else res.json({ success: "ok" });
     }
   })
 );

package/routes/menu.js

@@ -22,6 +22,9 @@ const { renderForm } = require("@saltcorn/markup");
 const { script, domReady, div, ul } = require("@saltcorn/markup/tags");
 const { send_infoarch_page } = require("../markup/admin.js");
 const Table = require("@saltcorn/data/models/table");
+const Trigger = require("@saltcorn/data/models/trigger");
+const { run_action_column } = require("@saltcorn/data/plugin-helper");
+
 
 /**
  * @type {object}
@@ -61,6 +64,18 @@ const menuForm = async (req) => {
         dynSectionFieldOptions[table.name].push(field.name);
     }
   }
+  const stateActions = getState().actions;
+  const actions = [
+    ...Object.entries(stateActions)
+      .filter(([k, v]) => !v.requireRow && !v.disableInBuilder)
+      .map(([k, v]) => k),
+  ];
+  const triggers = await Trigger.find({
+    when_trigger: { or: ["API call", "Never"] },
+  });
+  triggers.forEach((tr) => {
+    actions.push(tr.name);
+  });
 
   return new Form({
     action: "/menu/",
@@ -92,6 +107,7 @@ const menuForm = async (req) => {
           "Dynamic",
           "Search",
           "Separator",
+          "Action"
         ],
       },
       {
@@ -101,7 +117,7 @@ const menuForm = async (req) => {
         input_type: "text",
         required: true,
         showIf: {
-          type: ["View", "Page", "Link", "Header", "Dynamic", "Search"],
+          type: ["View", "Page", "Link", "Header", "Dynamic", "Search", "Action"],
         },
       },
       {
@@ -111,7 +127,7 @@ const menuForm = async (req) => {
         attributes: {
           html: `<button type="button" id="myEditor_icon" class="btn btn-outline-secondary"></button>`,
         },
-        showIf: { type: ["View", "Page", "Link", "Header"] },
+        showIf: { type: ["View", "Page", "Link", "Header", "Action"] },
       },
       {
         name: "icon",
@@ -149,6 +165,17 @@ const menuForm = async (req) => {
         attributes: { options: views.map((r) => r.select_option) },
         showIf: { type: "View" },
       },
+      {
+        name: "action_name",
+        label: req.__("Action"),
+        type: "String",
+        class: "item-menu",
+        required: true,
+        attributes: {
+          options: actions,
+        },
+        showIf: { type: "Action" },
+      },
       {
         name: "dyn_table",
         label: req.__("Table"),
@@ -217,7 +244,7 @@ const menuForm = async (req) => {
         class: "item-menu",
         type: "String",
         required: true,
-        showIf: { type: ["View", "Page", "Link", "Header", "Dynamic"] },
+        showIf: { type: ["View", "Page", "Link", "Header", "Dynamic", "Action"] },
         attributes: {
           options: [
             { name: "", label: "Link" },
@@ -239,7 +266,7 @@ const menuForm = async (req) => {
       {
         name: "location",
         label: req.__("Location"),
-        showIf: { type: ["View", "Page", "Link", "Header", "Dynamic"] },
+        showIf: { type: ["View", "Page", "Link", "Header", "Dynamic", "Action"] },
         sublabel: req.__("Not all themes support all locations"),
         class: "item-menu",
         type: "String",
@@ -404,3 +431,37 @@ router.post(
     res.json({ success: true });
   })
 );
+
+router.post(
+  "/runaction/:name",
+  error_catcher(async (req, res) => {
+    const { name } = req.params;
+    const role = (req.user || {}).role_id || 10;
+    const state = getState();
+    const menu_items = state.getConfig("menu_items");
+    let menu_item;
+    const search = items =>
+      items
+        .filter((item) => role <= +item.min_role)
+        .forEach(item => {
+          if (item.type === "Action" && item.action_name === name)
+            menu_item = item;
+          else if (item.subitems)
+            search(item.subitems);
+        })
+    search(menu_items);
+    if (menu_item)
+      try {
+        const result = await run_action_column({
+          col: menu_item,
+          referrer: req.get("Referrer"),
+          req,
+        });
+        res.json({ success: "ok", ...(result || {}) });
+      } catch (e) {
+        res.status(400).json({ error: e.message || e });
+      }
+
+    else res.status(404).json({ error: "Action not found" });
+  })
+);

package/routes/packs.js

@@ -116,7 +116,7 @@ router.get(
           type: "breadcrumbs",
           crumbs: [
             { text: req.__("Settings") },
-            { text: req.__("Plugins"), href: "/plugins" },
+            { text: req.__("Modules"), href: "/plugins" },
             { text: req.__("Create pack") },
           ],
         },
@@ -184,7 +184,7 @@ router.post(
           type: "breadcrumbs",
           crumbs: [
             { text: req.__("Settings") },
-            { text: req.__("Plugins"), href: "/plugins" },
+            { text: req.__("Modules"), href: "/plugins" },
             { text: req.__("Create pack") },
           ],
         },
@@ -242,7 +242,7 @@ router.get(
           type: "breadcrumbs",
           crumbs: [
             { text: req.__("Settings") },
-            { text: req.__("Plugins"), href: "/plugins" },
+            { text: req.__("Modules"), href: "/plugins" },
             { text: req.__("Install pack") },
           ],
         },
@@ -293,7 +293,7 @@ router.post(
             type: "breadcrumbs",
             crumbs: [
               { text: req.__("Settings") },
-              { text: req.__("Plugins"), href: "/plugins" },
+              { text: req.__("Modules"), href: "/plugins" },
               { text: req.__("Install pack") },
             ],
           },

package/routes/page.js

@@ -36,6 +36,8 @@ router.get(
   "/:pagename",
   error_catcher(async (req, res) => {
     const { pagename } = req.params;
+    const state = getState();
+    state.log(3, `Route /page/${pagename} user=${req.user?.id}`);
 
     const role = req.user && req.user.id ? req.user.role_id : 10;
     const db_page = await Page.findOne({ name: pagename });
@@ -56,10 +58,12 @@ router.get(
           contents,
         })
       );
-    } else
+    } else {
+      state.log(2, `Page $pagename} not found or not authorized`);
       res
         .status(404)
         .sendWrap(`${pagename} page`, req.__("Page %s not found", pagename));
+    }
   })
 );
 

package/routes/pageedit.js

@@ -90,6 +90,13 @@ const page_dropdown = (page, req) =>
       '<i class="far fa-copy"></i>&nbsp;' + req.__("Duplicate"),
       req
     ),
+    a(
+      {
+        class: "dropdown-item",
+        href: `javascript:ajax_modal('/admin/snapshot-restore/page/${page.name}')`,
+      },
+      '<i class="fas fa-undo-alt"></i>&nbsp;' + req.__("Restore")
+    ),
     div({ class: "dropdown-divider" }),
     post_dropdown_item(
       `/pageedit/delete/${page.id}`,
@@ -180,7 +187,8 @@ const pageBuilderData = async (req, context) => {
   const fixed_state_fields = {};
   for (const view of views) {
     fixed_state_fields[view.name] = [];
-    const table = Table.findOne({ id: view.table_id });
+    const table = Table.findOne(view.table_id || view.exttable_name);
+    
     const fs = await view.get_state_fields();
     for (const frec of fs) {
       const f = new Field(frec);