@saltcorn/server 0.8.0-beta.1 → 0.8.0-beta.3

package/routes/fields.js

@@ -66,7 +66,7 @@ const fieldForm = async (req, fkey_opts, existing_names, id, hasData) => {
   return new Form({
     action: "/field",
     validator: (vs) => {
-      if (vs.calculated && vs.type == "File")
+      if (vs.calculated && vs.type === "File")
         return req.__("Calculated fields cannot have File type");
       if (vs.calculated && vs.type.startsWith("Key to"))
         return req.__("Calculated fields cannot have Key type");
@@ -182,8 +182,8 @@ const fieldFlow = (req) =>
   new Workflow({
     action: "/field",
     onDone: async (context) => {
-      const thetype = getState().types[context.type];
-      var attributes = context.attributes || {};
+      //const thetype = getState().types[context.type];
+      const attributes = context.attributes || {};
       attributes.default = context.default;
       attributes.summary_field = context.summary_field;
       attributes.include_fts = context.include_fts;
@@ -291,6 +291,8 @@ const fieldFlow = (req) =>
         form: async (context) => {
           if (context.type === "File") {
             const roles = await User.get_roles();
+            const default_file_accept_filter = await getState().getConfig("files_accept_filter_default");
+            //console.log("default_file_accept_filter",default_file_accept_filter);
             return new Form({
               fields: [
                 {
@@ -310,6 +312,15 @@ const fieldFlow = (req) =>
                     "Deleting a row will also delete the file referenced by this field"
                   ),
                 },
+                {
+                  name: "files_accept_filter",
+                  type: "String",
+                  label: req.__("Files accept filter"),
+                  sublabel: req.__(
+                      "Specifies a filter for what file types the user can pick from the file input dialog box. Example is `.doc,audio/*,video/*,image/*`"
+                  ),
+                  default: default_file_accept_filter,
+                },
               ],
             });
           } else {
@@ -634,7 +645,7 @@ router.post(
 );
 
 /**
- * @name post/test-formula
+ * Test formula
  * @function
  * @memberof module:routes/fields~fieldsRouter
  * @function

package/routes/files.js

@@ -13,24 +13,12 @@ const s3storage = require("../s3storage");
 const resizer = require("resize-with-sharp-or-jimp");
 const db = require("@saltcorn/data/db");
 
-const {
-  mkTable,
-  renderForm,
-  link,
-  //post_btn,
-  post_delete_btn,
-} = require("@saltcorn/markup");
+const { renderForm } = require("@saltcorn/markup");
 const { isAdmin, error_catcher, setTenant } = require("./utils.js");
-const { h1, div, text, button, i, a } = require("@saltcorn/markup/tags");
-// const { csrfField } = require("./utils");
+const { h1, div, text } = require("@saltcorn/markup/tags");
 const { editRoleForm, fileUploadForm } = require("../markup/forms.js");
 const { strictParseInt } = require("@saltcorn/data/plugin-helper");
-const {
-  send_files_page,
-  config_fields_form,
-  save_config_from_form,
-} = require("../markup/admin");
-// const fsp = require("fs").promises;
+const { send_files_page, config_fields_form, save_config_from_form } = require("../markup/admin");
 const fs = require("fs");
 const path = require("path");
 
@@ -74,7 +62,6 @@ router.get(
     const safeDir = File.normalise(dir || "/")
     const rows = await File.find({ folder: dir }, { orderBy: "filename" });
     const roles = await User.get_roles();
-    //console.log(rows);
     if (safeDir && safeDir !== "/" && safeDir !== ".") {
       let dirname = path.dirname(safeDir)
       if (dirname === ".") dirname = "/"
@@ -314,7 +301,7 @@ router.post(
  */
 router.post(
   "/upload",
-  setTenant, // TODO why is this needed?????
+  setTenant,
   error_catcher(async (req, res) => {
     let { folder } = req.body
     let jsonResp = {};
@@ -395,12 +382,12 @@ router.post(
 );
 
 /**
- * Storage settings form definition
+ * S3 Storage settings form definition
  * @param {object} req request
  * @returns {Promise<Form>} form
  */
 const storage_form = async (req) => {
-  const form = await config_fields_form({
+  return await config_fields_form({
     req,
     field_names: [
       "storage_s3_enabled",
@@ -414,11 +401,10 @@ const storage_form = async (req) => {
     ],
     action: "/files/storage",
   });
-  return form;
 };
 
 /**
- * @name get/storage
+ * Show S3 Settings
  * @function
  * @memberof module:routes/admin~routes/adminRouter
  */
@@ -441,7 +427,7 @@ router.get(
 );
 
 /**
- * @name post/email
+ * Update S3 Settings
  * @function
  * @memberof module:routes/admin~routes/adminRouter
  */
@@ -472,3 +458,78 @@ router.post(
     }
   })
 );
+
+/**
+ * Files settings form definition
+ * @param {object} req request
+ * @returns {Promise<Form>} form
+ */
+const files_settings_form = async (req) => {
+    return await config_fields_form({
+        req,
+        field_names: [
+            "min_role_upload",
+            "file_accept_filter_default",
+            "file_upload_debug",
+            "file_upload_limit",
+            "file_upload_timeout",
+        ],
+        action: "/files/settings",
+    });
+};
+
+/**
+ * Show Files Settings
+ * @function
+ * @memberof module:routes/admin~routes/adminRouter
+ */
+router.get(
+    "/settings",
+    isAdmin,
+    error_catcher(async (req, res) => {
+        const form = await files_settings_form(req);
+        send_files_page({
+            res,
+            req,
+            active_sub: "Settings",
+            contents: {
+                type: "card",
+                title: req.__("Files settings"),
+                contents: [renderForm(form, req.csrfToken())],
+            },
+        });
+    })
+);
+
+/**
+ * Update Files Settings
+ * @function
+ * @memberof module:routes/admin~routes/adminRouter
+ */
+router.post(
+    "/settings",
+    isAdmin,
+    error_catcher(async (req, res) => {
+        const form = await files_settings_form(req);
+        form.validate(req.body);
+        if (form.hasErrors) {
+            send_admin_page({
+                res,
+                req,
+                active_sub: "Settings",
+                contents: {
+                    type: "card",
+                    title: req.__("Files settings"),
+                    contents: [renderForm(form, req.csrfToken())],
+                },
+            });
+        } else {
+            await save_config_from_form(form);
+
+            if (!req.xhr) {
+                req.flash("success", req.__("Files settings updated"));
+                res.redirect("/files/settings");
+            } else res.json({ success: "ok" });
+        }
+    })
+);

package/routes/homepage.js

@@ -15,7 +15,7 @@ const Page = require("@saltcorn/data/models/page");
 const { link, mkTable } = require("@saltcorn/markup");
 const { div, a, p, i } = require("@saltcorn/markup/tags");
 const Table = require("@saltcorn/data/models/table");
-const { fetch_available_packs } = require("@saltcorn/admin-models/models/pack");
+const { get_cached_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");
@@ -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 pattern 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,19 @@ const filesTab = async (req) => {
     files.length === 0
       ? p(req.__("No files"))
       : mkTable(
-        [
-          {
-            label: req.__("Filename"),
-            key: (r) => r.isDirectory ? r.filename : link(`/files/serve/${r.path_to_serve}`, 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) =>
+                r.isDirectory
+                  ? r.filename
+                  : link(`/files/serve/${r.path_to_serve}`, r.filename),
+            },
+            { label: req.__("Size (KiB)"), key: "size_kb", align: "right" },
+            { label: req.__("Media type"), key: (r) => r.mimetype },
+          ],
+          files
+        ),
     fileUploadForm(req)
   );
 };
@@ -244,30 +247,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")
@@ -350,7 +353,7 @@ const helpCard = (req) =>
  * @returns {Promise<object>}
  */
 const welcome_page = async (req) => {
-  const packs_available = await fetch_available_packs();
+  const packs_available = await get_cached_packs();
   const packlist = [
     ...(packs_available || []).slice(0, 5),
     { name: req.__("More..."), description: "" },
@@ -385,15 +388,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 +406,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),
+                  },
           },
         ],
       },
@@ -429,9 +432,12 @@ const no_views_logged_in = async (req, res) => {
     res.sendWrap(req.__("Hello"), req.__("Welcome to Saltcorn!"));
   else {
     const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
-    const latest = isRoot && (await get_latest_npm_version("@saltcorn/cli"));
+    const latest =
+      isRoot && (await get_latest_npm_version("@saltcorn/cli", 500));
     const can_update =
-      packagejson.version !== latest && !process.env.SALTCORN_DISABLE_UPGRADE;
+      packagejson.version !== latest &&
+      latest &&
+      !process.env.SALTCORN_DISABLE_UPGRADE;
     if (latest && can_update && isRoot)
       req.flash(
         "warning",
@@ -440,8 +446,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

@@ -45,11 +45,11 @@ router.get(
  * @param {object} req
  * @returns {Form}
  */
-const languageForm = (req) =>
+const languageForm = (req, hasSaveButton) =>
   new Form({
     action: "/site-structure/localizer/save-lang",
-    onChange: "saveAndContinue(this)",
-    noSubmitButton: true,
+    onChange: hasSaveButton ? undefined : "saveAndContinue(this)",
+    noSubmitButton: !hasSaveButton,
     fields: [
       {
         name: "name",
@@ -60,15 +60,18 @@ const languageForm = (req) =>
       {
         name: "locale",
         label: req.__("Locale"),
-        sublabel: req.__("Locale identifier short code, e.g. en, zh, fr, ar etc. "),
+        sublabel: req.__(
+          "Locale identifier short code, e.g. en, zh, fr, ar etc. "
+        ),
         type: "String",
         required: true,
       },
       {
         name: "is_default",
         label: req.__("Default language"),
-        sublabel:
-          req.__("Is this the default language in which the application is built?"),
+        sublabel: req.__(
+          "Is this the default language in which the application is built?"
+        ),
         type: "Bool",
       },
     ],
@@ -150,7 +153,7 @@ router.get(
       sub2_page: "New",
       contents: {
         type: "card",
-        contents: [renderForm(languageForm(req), req.csrfToken())],
+        contents: [renderForm(languageForm(req, true), req.csrfToken())],
       },
     });
   })

package/routes/menu.js

@@ -25,7 +25,6 @@ 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}
  * @const
@@ -107,7 +106,7 @@ const menuForm = async (req) => {
           "Dynamic",
           "Search",
           "Separator",
-          "Action"
+          "Action",
         ],
       },
       {
@@ -117,7 +116,15 @@ const menuForm = async (req) => {
         input_type: "text",
         required: true,
         showIf: {
-          type: ["View", "Page", "Link", "Header", "Dynamic", "Search", "Action"],
+          type: [
+            "View",
+            "Page",
+            "Link",
+            "Header",
+            "Dynamic",
+            "Search",
+            "Action",
+          ],
         },
       },
       {
@@ -244,7 +251,9 @@ const menuForm = async (req) => {
         class: "item-menu",
         type: "String",
         required: true,
-        showIf: { type: ["View", "Page", "Link", "Header", "Dynamic", "Action"] },
+        showIf: {
+          type: ["View", "Page", "Link", "Header", "Dynamic", "Action"],
+        },
         attributes: {
           options: [
             { name: "", label: "Link" },
@@ -266,7 +275,9 @@ const menuForm = async (req) => {
       {
         name: "location",
         label: req.__("Location"),
-        showIf: { type: ["View", "Page", "Link", "Header", "Dynamic", "Action"] },
+        showIf: {
+          type: ["View", "Page", "Link", "Header", "Dynamic", "Action"],
+        },
         sublabel: req.__("Not all themes support all locations"),
         class: "item-menu",
         type: "String",
@@ -440,15 +451,14 @@ router.post(
     const state = getState();
     const menu_items = state.getConfig("menu_items");
     let menu_item;
-    const search = items =>
+    const search = (items) =>
       items
         .filter((item) => role <= +item.min_role)
-        .forEach(item => {
+        .forEach((item) => {
           if (item.type === "Action" && item.action_name === name)
             menu_item = item;
-          else if (item.subitems)
-            search(item.subitems);
-        })
+          else if (item.subitems) search(item.subitems);
+        });
     search(menu_items);
     if (menu_item)
       try {
@@ -456,12 +466,12 @@ router.post(
           col: menu_item,
           referrer: req.get("Referrer"),
           req,
+          res,
         });
         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/page.js

@@ -8,7 +8,11 @@ const Router = require("express-promise-router");
 
 const Page = require("@saltcorn/data/models/page");
 const { getState } = require("@saltcorn/data/db/state");
-const { error_catcher, scan_for_page_title, isAdmin } = require("../routes/utils.js");
+const {
+  error_catcher,
+  scan_for_page_title,
+  isAdmin,
+} = require("../routes/utils.js");
 const { add_edit_bar } = require("../markup/admin.js");
 const { traverseSync } = require("@saltcorn/data/models/layout");
 const { run_action_column } = require("@saltcorn/data/plugin-helper");
@@ -105,6 +109,7 @@ router.post(
             col,
             referrer: req.get("Referrer"),
             req,
+            res,
           });
           res.json({ success: "ok", ...(result || {}) });
         } catch (e) {