@saltcorn/server 0.8.0-beta.2 → 0.8.0-beta.4

package/routes/admin.js

@@ -366,7 +366,7 @@ router.get(
                   post_btn(
                     "/admin/backup",
                     i({ class: "fas fa-download me-2" }) +
-                    req.__("Download a backup"),
+                      req.__("Download a backup"),
                     req.csrfToken(),
                     {
                       btnClass: "btn-outline-primary",
@@ -385,21 +385,21 @@ router.get(
           },
           isRoot
             ? {
-              type: "card",
-              title: req.__("Automated backup"),
-              contents: div(
-                renderForm(backupForm, req.csrfToken()),
-                a(
-                  { href: "/admin/auto-backup-list" },
-                  req.__("Restore/download automated backups »")
-                ),
-                script(
-                  domReady(
-                    `$('#btnBackupNow').prop('disabled', $('#inputauto_backup_frequency').val()==='Never');`
+                type: "card",
+                title: req.__("Automated backup"),
+                contents: div(
+                  renderForm(backupForm, req.csrfToken()),
+                  a(
+                    { href: "/admin/auto-backup-list" },
+                    req.__("Restore/download automated backups »")
+                  ),
+                  script(
+                    domReady(
+                      `$('#btnBackupNow').prop('disabled', $('#inputauto_backup_frequency').val()==='Never');`
+                    )
                   )
-                )
-              ),
-            }
+                ),
+              }
             : { type: "blank", contents: "" },
           {
             type: "card",
@@ -407,7 +407,9 @@ router.get(
             contents: div(
               p(
                 i(
-                  req.__("Snapshots store your application structure and definition, without the table data. Individual views and pages can be restored from snapshots from the <a href='/viewedit'>view</a> or <a href='/pageedit'>pages</a> overviews (\"Restore\" from individual page or view dropdowns).")
+                  req.__(
+                    "Snapshots store your application structure and definition, without the table data. Individual views and pages can be restored from snapshots from the <a href='/viewedit'>view</a> or <a href='/pageedit'>pages</a> overviews (\"Restore\" from individual page or view dropdowns)."
+                  )
                 )
               ),
               renderForm(aSnapshotForm, req.csrfToken()),
@@ -475,12 +477,17 @@ router.get(
               ol(
                 li(req.__("Download one of the backups above")),
                 li(
-                  a({ href: "/admin/clear-all" }, req.__("Clear this application")),
+                  a(
+                    { href: "/admin/clear-all" },
+                    req.__("Clear this application")
+                  ),
                   " ",
                   req.__("(tick all boxes)")
                 ),
                 li(
-                  req.__("When prompted to create the first user, click the link to restore a backup")
+                  req.__(
+                    "When prompted to create the first user, click the link to restore a backup"
+                  )
                 ),
                 li(req.__("Select the downloaded backup file"))
               )
@@ -768,7 +775,8 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     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", 1000));
     const is_latest = packagejson.version === latest;
     const git_commit = getGitRevision();
     const can_update =
@@ -832,83 +840,71 @@ router.get(
                     th(req.__("Saltcorn version")),
                     td(
                       packagejson.version +
-                      (isRoot && can_update
-                        ? post_btn(
-                          "/admin/upgrade",
-                          req.__("Upgrade"),
-                          req.csrfToken(),
-                          {
-                            btnClass: "btn-primary btn-sm",
-                            formClass: "d-inline",
-                          }
-                        )
-                        : isRoot && is_latest
+                        (isRoot && can_update
+                          ? post_btn(
+                              "/admin/upgrade",
+                              req.__("Upgrade"),
+                              req.csrfToken(),
+                              {
+                                btnClass: "btn-primary btn-sm",
+                                formClass: "d-inline",
+                              }
+                            )
+                          : isRoot && is_latest
                           ? span(
-                            { class: "badge bg-primary ms-2" },
-                            req.__("Latest")
-                          ) +
-                          post_btn(
-                            "/admin/check-for-upgrade",
-                            req.__("Check for updates"),
-                            req.csrfToken(),
-                            {
-                              btnClass: "btn-primary btn-sm px-1 py-0",
-                              formClass: "d-inline",
-                            }
-                          )
+                              { class: "badge bg-primary ms-2" },
+                              req.__("Latest")
+                            ) +
+                            post_btn(
+                              "/admin/check-for-upgrade",
+                              req.__("Check for updates"),
+                              req.csrfToken(),
+                              {
+                                btnClass: "btn-primary btn-sm px-1 py-0",
+                                formClass: "d-inline",
+                              }
+                            )
                           : "")
                     )
                   ),
                   git_commit &&
-                  tr(
-                    th(req.__("git commit")),
-                    td(
-                      a(
-                        {
-                          href:
-                            "https://github.com/saltcorn/saltcorn/commit/" +
-                            git_commit,
-                        },
-                        git_commit.substring(0, 6)
+                    tr(
+                      th(req.__("git commit")),
+                      td(
+                        a(
+                          {
+                            href:
+                              "https://github.com/saltcorn/saltcorn/commit/" +
+                              git_commit,
+                          },
+                          git_commit.substring(0, 6)
+                        )
                       )
-                    )
-                  ),
+                    ),
                   tr(th(req.__("Node.js version")), td(process.version)),
                   tr(
                     th(req.__("Database type")),
                     td(db.isSQLite ? "SQLite " : "PostgreSQL ", dbversion)
                   ),
-                  (isRoot?
-                    tr(
-                        th(req.__("Database host")),
-                        td(db.connectObj.host)
-                    )
-                  : ""),
-                  (isRoot?
-                    tr(
-                        th(req.__("Database port")),
-                        td(db.connectObj.port)
-                    )
-                  : ""),
-                  (isRoot?
-                    tr(
+                  isRoot
+                    ? tr(th(req.__("Database host")), td(db.connectObj.host))
+                    : "",
+                  isRoot
+                    ? tr(th(req.__("Database port")), td(db.connectObj.port))
+                    : "",
+                  isRoot
+                    ? tr(
                         th(req.__("Database name")),
                         td(db.connectObj.database)
-                    )
-                  : ""),
-                  (isRoot?
-                     tr(
-                        th(req.__("Database user")),
-                        td(db.connectObj.user)
-                     )
-                  : ""),
-                  tr(
-                      th(req.__("Database schema")),
-                      td(db.getTenantSchema())
-                  ),
+                      )
+                    : "",
+                  isRoot
+                    ? tr(th(req.__("Database user")), td(db.connectObj.user))
+                    : "",
+                  tr(th(req.__("Database schema")), td(db.getTenantSchema())),
                   tr(
-                     th(req.__("Process uptime")),
-                     td(moment(get_process_init_time()).fromNow(true))
+                    th(req.__("Process uptime")),
+                    td(moment(get_process_init_time()).fromNow(true))
                   )
                 )
               ),
@@ -974,7 +970,9 @@ router.post(
       });
       child.on("exit", function (code, signal) {
         res.end(
-          req.__(`Upgrade done (if it was available) with code ${code}.\n\nPress the BACK button in your browser, then RELOAD the page.`)
+          req.__(
+            `Upgrade done (if it was available) with code ${code}.\n\nPress the BACK button in your browser, then RELOAD the page.`
+          )
         );
         setTimeout(() => {
           if (process.send) process.send("RestartServer");
@@ -1178,8 +1176,8 @@ router.post(
           req.__(
             "LetsEncrypt SSL enabled. Restart for changes to take effect."
           ) +
-          " " +
-          a({ href: "/admin/system" }, req.__("Restart here"))
+            " " +
+            a({ href: "/admin/system" }, req.__("Restart here"))
         );
         res.redirect("/useradmin/ssl");
       } catch (e) {
@@ -1255,13 +1253,13 @@ router.get(
           contents: div(
             pass
               ? div(
-                { class: "alert alert-success", role: "alert" },
-                i({ class: "fas fa-check-circle fa-lg me-2" }),
-                h5(
-                  { class: "d-inline" },
-                  req.__("No errors detected during configuration check")
+                  { class: "alert alert-success", role: "alert" },
+                  i({ class: "fas fa-check-circle fa-lg me-2" }),
+                  h5(
+                    { class: "d-inline" },
+                    req.__("No errors detected during configuration check")
+                  )
                 )
-              )
               : errors.map(mkError),
             (warnings || []).map(mkWarning)
           ),
@@ -1819,15 +1817,11 @@ router.post(
  * @returns {Promise<Form>} form
  */
 const dev_form = async (req) => {
-    return await config_fields_form({
-        req,
-        field_names: [
-            "development_mode",
-            "log_sql",
-            "log_level",
-        ],
-        action: "/admin/dev",
-    });
+  return await config_fields_form({
+    req,
+    field_names: ["development_mode", "log_sql", "log_level"],
+    action: "/admin/dev",
+  });
 };
 /**
  * Developer Mode page
@@ -1836,19 +1830,19 @@ const dev_form = async (req) => {
  * @memberof module:routes/admin~routes/adminRouter
  */
 router.get(
-    "/dev",
-    isAdmin,
-    error_catcher(async (req, res) => {
-        const form = await dev_form(req);
-        send_admin_page({
-            res,
-            req,
-            active_sub: "Development",
-            contents: {
-                type: "card",
-                title: req.__("Development settings"),
-                contents: [
-                    renderForm(form, req.csrfToken())/*,
+  "/dev",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const form = await dev_form(req);
+    send_admin_page({
+      res,
+      req,
+      active_sub: "Development",
+      contents: {
+        type: "card",
+        title: req.__("Development settings"),
+        contents: [
+          renderForm(form, req.csrfToken()) /*,
                     a(
                         {
                             id: "testemail",
@@ -1856,11 +1850,11 @@ router.get(
                             class: "btn btn-primary",
                         },
                         req.__("Send test email")
-                    ),*/
-                ],
-            },
-        });
-    })
+                    ),*/,
+        ],
+      },
+    });
+  })
 );
 
 /**
@@ -1870,27 +1864,27 @@ router.get(
  * @memberof module:routes/admin~routes/adminRouter
  */
 router.post(
-    "/dev",
-    isAdmin,
-    error_catcher(async (req, res) => {
-        const form = await dev_form(req);
-        form.validate(req.body);
-        if (form.hasErrors) {
-            send_admin_page({
-                res,
-                req,
-                active_sub: "Development",
-                contents: {
-                    type: "card",
-                    title: req.__("Development settings"),
-                    contents: [renderForm(form, req.csrfToken())],
-                },
-            });
-        } else {
-            await save_config_from_form(form);
-            req.flash("success", req.__("Development mode settings updated"));
-            if (!req.xhr) res.redirect("/admin/dev");
-            else res.json({ success: "ok" });
-        }
-    })
-);
+  "/dev",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const form = await dev_form(req);
+    form.validate(req.body);
+    if (form.hasErrors) {
+      send_admin_page({
+        res,
+        req,
+        active_sub: "Development",
+        contents: {
+          type: "card",
+          title: req.__("Development settings"),
+          contents: [renderForm(form, req.csrfToken())],
+        },
+      });
+    } else {
+      await save_config_from_form(form);
+      req.flash("success", req.__("Development mode settings updated"));
+      if (!req.xhr) res.redirect("/admin/dev");
+      else res.json({ success: "ok" });
+    }
+  })
+);

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" });
+        }
+    })
+);