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

package/auth/admin.js

@@ -7,20 +7,12 @@
 // todo refactor to few modules + rename to be in sync with router url
 const Router = require("express-promise-router");
 const { contract, is } = require("contractis");
-
 const db = require("@saltcorn/data/db");
 const User = require("@saltcorn/data/models/user");
 const View = require("@saltcorn/data/models/view");
 const Field = require("@saltcorn/data/models/field");
 const Form = require("@saltcorn/data/models/form");
-const {
-  mkTable,
-  renderForm,
-  link,
-  post_btn,
-  settingsDropdown,
-  post_dropdown_item,
-} = require("@saltcorn/markup");
+const { mkTable, renderForm, link, post_btn, settingsDropdown, post_dropdown_item } = require("@saltcorn/markup");
 const { isAdmin, error_catcher } = require("../routes/utils");
 const { send_reset_email } = require("./resetpw");
 const { getState } = require("@saltcorn/data/db/state");
@@ -35,16 +27,7 @@ const {
   is_hsts_tld,
 } = require("../markup/admin");
 const { send_verification_email } = require("@saltcorn/data/models/email");
-const {
-  expressionValidator,
-} = require("@saltcorn/data/models/expression");
-/**
- * @type {object}
- * @const
- * @namespace auth/adminRouter
- * @category server
- * @subcategory auth
- */
+const { expressionValidator } = require("@saltcorn/data/models/expression");
 const router = new Router();
 module.exports = router;
 
@@ -357,6 +340,7 @@ const permissions_settings_form = async (req) =>
         field_names: [
             "min_role_upload",
             "min_role_apikeygen",
+//hidden            "exttables_min_role_read",
         ],
         action: "/useradmin/permissions",
         submitLabel: req.__("Save"),

package/locales/en.json

@@ -1046,6 +1046,14 @@
 	"<p>You have views with a role to access lower than the table role to read, \n      with no table ownership. In the next version of Saltcorn, this may cause a\n      denial of access. Users will need to have table read access to any data displayed.</p> \n      Views potentially affected: %s": "<p>You have views with a role to access lower than the table role to read, \n      with no table ownership. In the next version of Saltcorn, this may cause a\n      denial of access. Users will need to have table read access to any data displayed.</p> \n      Views potentially affected: %s",
 	"If the parent row is deleted, do this to the child rows.": "If the parent row is deleted, do this to the child rows.",
 	"On delete": "On delete",
-	"Database name": "Database name",
-	"Database schema": "Database schema"
+	"Permissions": "Permissions",
+	"Permissions settings": "Permissions settings",
+	"Files accept filter ": "Files accept filter ",
+	"Specifies a filter for what file types the user can pick from the file input dialog box. Example is `.doc,audio/*,video/*,image/*`": "Specifies a filter for what file types the user can pick from the file input dialog box. Example is `.doc,audio/*,video/*,image/*`",
+	"Permissions settings updated": "Permissions settings updated",
+	"Upload file(s)": "Upload file(s)",
+	"Specifies a filter for what file types the user can pick from the file input dialog box. Example is `text/csv,audio/*,video/*,image/*`": "Specifies a filter for what file types the user can pick from the file input dialog box. Example is `text/csv,audio/*,video/*,image/*`",
+	"Default Files accept filter": "Default Files accept filter",
+	"Specifies a default filter for what file types the user can pick from the file input dialog box. Example is `.doc, text/csv,audio/*,video/*,image/*`": "Specifies a default filter for what file types the user can pick from the file input dialog box. Example is `.doc, text/csv,audio/*,video/*,image/*`",
+	"Destination page": "Destination page"
 }

package/locales/it.json

@@ -484,5 +484,5 @@
 	"Table access": "Table access",
 	"HTTP": "HTTP",
 	"Rights": "Rights",
-	"Table access": "Table access"
+	"Permissions": "Permissions"
 }

package/locales/ru.json

@@ -919,5 +919,29 @@
 	"File not found": "Файл не найден",
 	"Permissions settings": "Настройки разрешений",
 	"Permissions": "Разрешения",
-	"Permissions settings updated": "Настройки разрешений обновлены"
+	"Permissions settings updated": "Настройки разрешений обновлены",
+	"Upload file(s)": "Upload file(s)",
+	"Split paste": "Split paste",
+	"Separate paste content into separate inputs": "Separate paste content into separate inputs",
+	"Preview": "Preview",
+	"Create new row": "Create new row",
+	"Descending?": "Descending?",
+	"Only include rows where this formula is true. ": "Only include rows where this formula is true. ",
+	"Use %s to access current user ID": "Use %s to access current user ID",
+	"Formula value": "Formula value",
+	"Units": "Units",
+	"%s view - %s on %s": "%s view - %s on %s",
+	"Password Repeat": "Password Repeat",
+	"Remember me": "Remember me",
+	"Files accept filter ": "Files accept filter ",
+	"Specifies a filter for what file types the user can pick from the file input dialog box. Example is `text/csv,audio/*,video/*,image/*`": "Specifies a filter for what file types the user can pick from the file input dialog box. Example is `text/csv,audio/*,video/*,image/*`",
+	"Home Page by Role": "Home Page by Role",
+	"Files accept filter": "Files accept filter",
+	"Specify how to create a new row": "Specify how to create a new row",
+	"Cascade delete to file": "Cascade delete to file",
+	"Deleting a row will also delete the file referenced by this field": "Deleting a row will also delete the file referenced by this field",
+	"Specifies a filter for what file types the user can pick from the file input dialog box. Example is `.doc,audio/*,video/*,image/*`": "Specifies a filter for what file types the user can pick from the file input dialog box. Example is `.doc,audio/*,video/*,image/*`",
+	"Default Files accept filter": "Default Files accept filter",
+	"Specifies a default filter for what file types the user can pick from the file input dialog box. Example is `.doc, text/csv,audio/*,video/*,image/*`": "Specifies a default filter for what file types the user can pick from the file input dialog box. Example is `.doc, text/csv,audio/*,video/*,image/*`",
+	"No file found": "No file found"
 }

package/markup/admin.js

@@ -7,7 +7,6 @@
 
 const {
   div,
-  //hr,
   form,
   input,
   label,
@@ -18,16 +17,8 @@ const {
   li,
 } = require("@saltcorn/markup/tags");
 const db = require("@saltcorn/data/db");
-const {
-  //getConfig,
-  //setConfig,
-  //getAllConfigOrDefaults,
-  //deleteConfig,
-  configTypes,
-  isFixedConfig,
-} = require("@saltcorn/data/models/config");
+const { configTypes, isFixedConfig } = require("@saltcorn/data/models/config");
 const { getState } = require("@saltcorn/data/db/state");
-
 const Form = require("@saltcorn/data/models/form");
 const Table = require("@saltcorn/data/models/table");
 const View = require("@saltcorn/data/models/view");
@@ -245,6 +236,7 @@ const send_files_page = (args) => {
     sub_sections: [
       { text: "Files", href: "/files" },
       { text: "Storage", href: "/files/storage" },
+      { text: "Settings", href: "/files/settings" },
     ],
     ...args,
   });
@@ -369,7 +361,7 @@ const config_fields_form = async ({
 
   for (const name of field_names) {
     values[name] = state.getConfig(name);
-    //console.log(`config field name: %s`,name);
+    // console.log(`config field name: %s`,name);
     if (configTypes[name].root_only && tenant !== db.connectObj.default_schema)
       continue;
     const isView = (configTypes[name].type || "").startsWith("View ");

package/markup/forms.js

@@ -11,13 +11,11 @@ const {
   text,
   label,
   input,
-  div,
-  i,
-  h5,
 } = require("@saltcorn/markup/tags");
 const { csrfField } = require("../routes/utils");
 
 /**
+ * Edit Role form (for admin)
  * @param {object} opts
  * @param {string} opts.url
  * @param {Role} opts.current_role
@@ -47,30 +45,36 @@ const editRoleForm = ({ url, current_role, roles, req }) =>
   );
 
 /**
- * @param {object} req 
+ * File upload form (for admin)
+ * @param {object} req
+ * @param folder
  * @returns {Form}
  */
-const fileUploadForm = (req, folder) =>
-  form(
-    {
-      action: "/files/upload",
-      method: "post",
-      encType: "multipart/form-data",
-    },
-    csrfField(req),
-    label(req.__("Upload file ")),
-    input({
-      name: "file",
-      class: "form-control ms-1 w-unset d-inline",
-      type: "file",
-      onchange: "form.submit()",
-      multiple: true,
-    }),
-    folder && input({ type: "hidden", name: "folder", value: folder })
-  );
+const fileUploadForm = (req, folder
+    ) => {
+    const frm = form(
+        {
+            action: "/files/upload",
+            method: "post",
+            enctype: "multipart/form-data",
+        },
+        csrfField(req),
+        label(req.__("Upload file(s)")),
+        input({
+            name: "file",
+            class: "form-control ms-1 w-unset d-inline",
+            type: "file",
+            onchange: "form.submit()",
+            multiple: true,
+        }),
+        folder && input({type: "hidden", name: "folder", value: folder})
+    );
+    return frm;
+};
 
 /**
- * @param {string} wizardTitle 
+ * Get Wizard Card Title
+ * @param {string} wizardTitle
  * @param {*} wf 
  * @param {object} wfres 
  * @returns {string}

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.8.0-beta.1",
+  "version": "0.8.0-beta.3",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.8.0-beta.1",
-    "@saltcorn/builder": "0.8.0-beta.1",
-    "@saltcorn/data": "0.8.0-beta.1",
-    "@saltcorn/admin-models": "0.8.0-beta.1",
-    "@saltcorn/filemanager": "0.8.0-beta.1",
-    "@saltcorn/markup": "0.8.0-beta.1",
-    "@saltcorn/sbadmin2": "0.8.0-beta.1",
+    "@saltcorn/base-plugin": "0.8.0-beta.3",
+    "@saltcorn/builder": "0.8.0-beta.3",
+    "@saltcorn/data": "0.8.0-beta.3",
+    "@saltcorn/admin-models": "0.8.0-beta.3",
+    "@saltcorn/filemanager": "0.8.0-beta.3",
+    "@saltcorn/markup": "0.8.0-beta.3",
+    "@saltcorn/sbadmin2": "0.8.0-beta.3",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "aws-sdk": "^2.1037.0",

package/public/saltcorn.js

@@ -201,12 +201,12 @@ function view_post(viewname, route, data, onDone) {
       notifyAlert({ type: "danger", text: res.responseText });
     });
 }
-var logged_errors = [];
+let logged_errors = [];
 function globalErrorCatcher(message, source, lineno, colno, error) {
   if (error && error.preventDefault) error.preventDefault();
   if (logged_errors.includes(message)) return;
   logged_errors.push(message);
-  var data = { message, stack: (error && error.stack) || "" };
+  const data = { message, stack: (error && error.stack) || "" };
   $.ajax("/crashlog/", {
     dataType: "json",
     type: "POST",

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