@saltcorn/server 0.8.0-beta.4 → 0.8.1-beta.0

package/routes/files.js

@@ -18,7 +18,11 @@ const { isAdmin, error_catcher, setTenant } = require("./utils.js");
 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 {
+  send_files_page,
+  config_fields_form,
+  save_config_from_form,
+} = require("../markup/admin");
 const fs = require("fs");
 const path = require("path");
 
@@ -58,31 +62,33 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     // todo limit select from file by 10 or 20
-    const { dir } = req.query
-    const safeDir = File.normalise(dir || "/")
+    const { dir } = req.query;
+    const safeDir = File.normalise(dir || "/");
     const rows = await File.find({ folder: dir }, { orderBy: "filename" });
     const roles = await User.get_roles();
     if (safeDir && safeDir !== "/" && safeDir !== ".") {
-      let dirname = path.dirname(safeDir)
-      if (dirname === ".") dirname = "/"
-      rows.unshift(new File({
-        filename: "..",
-        location: dirname,
-        isDirectory: true,
-        mime_super: "",
-        mime_sub: "",
-      }))
+      let dirname = path.dirname(safeDir);
+      if (dirname === ".") dirname = "/";
+      rows.unshift(
+        new File({
+          filename: "..",
+          location: dirname,
+          isDirectory: true,
+          mime_super: "",
+          mime_sub: "",
+        })
+      );
     }
     if (req.xhr) {
       for (const file of rows) {
-        file.location = file.path_to_serve
+        file.location = file.path_to_serve;
       }
-      const directories = await File.allDirectories()
+      const directories = await File.allDirectories();
       for (const file of directories) {
-        file.location = file.path_to_serve
+        file.location = file.path_to_serve;
       }
-      res.json({ files: rows, roles, directories })
-      return
+      res.json({ files: rows, roles, directories });
+      return;
     }
     send_files_page({
       res,
@@ -90,7 +96,7 @@ router.get(
       headers: [
         {
           script: `/static_assets/${db.connectObj.version_tag}/bundle.js`,
-          defer: true
+          defer: true,
         },
         {
           css: `/static_assets/${db.connectObj.version_tag}/bundle.css`,
@@ -122,7 +128,10 @@ router.get(
     const serve_path = req.params[0];
     const file = await File.findOne(serve_path);
 
-    if (file && (role <= file.min_role_read || (user_id && user_id === file.user_id))) {
+    if (
+      file &&
+      (role <= file.min_role_read || (user_id && user_id === file.user_id))
+    ) {
       res.type(file.mimetype);
       if (file.s3_store) s3storage.serveObject(file, res, true);
       else res.download(file.location, file.filename);
@@ -150,7 +159,10 @@ router.get(
     //if (typeof strictParseInt(id) !== "undefined")
     const file = await File.findOne(serve_path);
 
-    if (file && (role <= file.min_role_read || (user_id && user_id === file.user_id))) {
+    if (
+      file &&
+      (role <= file.min_role_read || (user_id && user_id === file.user_id))
+    ) {
       res.type(file.mimetype);
       const cacheability = file.min_role_read === 10 ? "public" : "private";
       res.set("Cache-Control", `${cacheability}, max-age=86400`);
@@ -178,10 +190,12 @@ router.get(
     const { width_str, height_str } = req.params;
     const serve_path = req.params[0];
 
-
     const file = await File.findOne(serve_path);
 
-    if (file && (role <= file.min_role_read || (user_id && user_id === file.user_id))) {
+    if (
+      file &&
+      (role <= file.min_role_read || (user_id && user_id === file.user_id))
+    ) {
       res.type(file.mimetype);
       const cacheability = file.min_role_read === 10 ? "public" : "private";
       res.set("Cache-Control", `${cacheability}, max-age=86400`);
@@ -189,13 +203,16 @@ router.get(
       if (file.s3_store) s3storage.serveObject(file, res, false);
       else {
         const width = strictParseInt(width_str);
-        const height = height_str && height_str !== "0"
-          ? strictParseInt(height_str) : null;
+        const height =
+          height_str && height_str !== "0" ? strictParseInt(height_str) : null;
         if (!width) {
           res.sendFile(file.location);
           return;
         }
-        const basenm = path.join(path.dirname(file.location), '_resized_' + path.basename(file.location))
+        const basenm = path.join(
+          path.dirname(file.location),
+          "_resized_" + path.basename(file.location)
+        );
         const fnm = `${basenm}_w${width}${height ? `_h${height}` : ""}`;
         if (!fs.existsSync(fnm)) {
           await resizer({
@@ -233,15 +250,14 @@ router.post(
 
     if (roleRow && file) {
       await file.set_role(role);
-
     }
 
-
-    res.redirect(file ? `/files?dir=${encodeURIComponent(file.current_folder)}` : "/files");
+    res.redirect(
+      file ? `/files?dir=${encodeURIComponent(file.current_folder)}` : "/files"
+    );
   })
 );
 
-
 router.post(
   "/move/*",
   isAdmin,
@@ -254,10 +270,12 @@ router.post(
       await file.move_to_dir(new_path);
     }
     if (req.xhr) {
-      res.json({ success: "ok" })
-      return
+      res.json({ success: "ok" });
+      return;
     }
-    res.redirect(file ? `/files?dir=${encodeURIComponent(file.current_folder)}` : "/files");
+    res.redirect(
+      file ? `/files?dir=${encodeURIComponent(file.current_folder)}` : "/files"
+    );
   })
 );
 
@@ -278,7 +296,6 @@ router.post(
     await file.rename(filename);
 
     res.redirect(`/files?dir=${encodeURIComponent(file.current_folder)}`);
-
   })
 );
 
@@ -286,7 +303,7 @@ router.post(
   "/new-folder",
   isAdmin,
   error_catcher(async (req, res) => {
-    const { name, folder } = req.body
+    const { name, folder } = req.body;
     await File.new_folder(name, folder);
 
     res.json({ success: "ok" });
@@ -303,11 +320,11 @@ router.post(
   "/upload",
   setTenant,
   error_catcher(async (req, res) => {
-    let { folder } = req.body
+    let { folder } = req.body;
     let jsonResp = {};
     const min_role_upload = getState().getConfig("min_role_upload", 1);
     const role = req.user && req.user.id ? req.user.role_id : 10;
-    let file_for_redirect
+    let file_for_redirect;
     if (role > +min_role_upload) {
       if (!req.xhr) req.flash("warning", req.__("Not authorized"));
       else jsonResp = { error: "Not authorized" };
@@ -323,7 +340,7 @@ router.post(
         folder ? File.normalise(folder) : undefined
       );
       const many = Array.isArray(f);
-      file_for_redirect = many ? f[0] : f
+      file_for_redirect = many ? f[0] : f;
       if (!req.xhr)
         req.flash(
           "success",
@@ -346,10 +363,11 @@ router.post(
         };
     }
     if (!req.xhr)
-      res.redirect(!file_for_redirect
-        ? '/files'
-        : `/files?dir=${encodeURIComponent(file_for_redirect.current_folder)}`);
-
+      res.redirect(
+        !file_for_redirect
+          ? "/files"
+          : `/files?dir=${encodeURIComponent(file_for_redirect.current_folder)}`
+      );
     else res.json(jsonResp);
   })
 );
@@ -438,7 +456,7 @@ router.post(
     const form = await storage_form(req);
     form.validate(req.body);
     if (form.hasErrors) {
-      send_admin_page({
+      send_files_page({
         res,
         req,
         active_sub: "Storage",
@@ -465,17 +483,17 @@ router.post(
  * @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",
-    });
+  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",
+  });
 };
 
 /**
@@ -484,21 +502,21 @@ const files_settings_form = async (req) => {
  * @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())],
-            },
-        });
-    })
+  "/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())],
+      },
+    });
+  })
 );
 
 /**
@@ -507,29 +525,29 @@ router.get(
  * @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" });
-        }
-    })
-);
+  "/settings",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const form = await files_settings_form(req);
+    form.validate(req.body);
+    if (form.hasErrors) {
+      send_files_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

@@ -481,7 +481,7 @@ const get_config_response = async (role_id, res, req) => {
           title: db_page.title,
           description: db_page.description,
           bodyClass: "page_" + db.sqlsanitize(homeCfg),
-        } || `${pagename} page`,
+        },
         contents
       );
     } else res.redirect(homeCfg);

package/routes/infoarch.js

@@ -113,7 +113,7 @@ router.get(
               {
                 label: req.__("Default"),
                 key: (r) =>
-                  !!r.is_default
+                  r.is_default
                     ? i({
                         class: "fas fa-check-circle text-success",
                       })

package/routes/list.js

@@ -51,7 +51,7 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     const { tableName, id } = req.params;
-    const table = await Table.findOne({ name : tableName });
+    const table = await Table.findOne({ name: tableName });
 
     const fields = await table.getFields();
     var tfields = fields.map((f) => ({ label: f.label, key: f.listKey }));
@@ -99,7 +99,7 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     const { tableName, id, _version } = req.params;
-    const table = await Table.findOne({ name : tableName });
+    const table = await Table.findOne({ name: tableName });
 
     const fields = await table.getFields();
     const row = await db.selectOne(`${db.sqlsanitize(table.name)}__history`, {
@@ -216,7 +216,7 @@ const arrangeIdFirst = (flds) => {
   const noId = flds.filter((f) => f.name !== "id");
   const id = flds.find((f) => f.name === "id");
   if (id) return [id, ...noId];
-  else return flds
+  else return flds;
 };
 
 /**
@@ -369,8 +369,9 @@ router.get(
                 })
               })   
               window.tabulator_table = new Tabulator("#jsGrid", {
-                  ajaxURL:"/api/${table.name}${table.versioned ? "?versioncount=on" : ""
-                  }",                   
+                  ajaxURL:"/api/${table.name}${
+                  table.versioned ? "?versioncount=on" : ""
+                }",                   
                   layout:"fitColumns", 
                   columns,
                   height:"100%",

package/routes/packs.js

@@ -335,8 +335,7 @@ router.post(
     const can_install = await can_install_pack(pack.pack);
 
     if (can_install.error) {
-      error = can_install.error;
-      req.flash("error", error);
+      req.flash("error", can_install.error);
       res.redirect(`/plugins`);
       return;
     } else if (can_install.warning) {

package/routes/pageedit.js

@@ -100,7 +100,7 @@ const pageBuilderData = async (req, context) => {
   const views = await View.find();
   const pages = await Page.find();
   const images = await File.find({ mime_super: "image" });
-  images.forEach(im => im.location = im.path_to_serve)
+  images.forEach((im) => (im.location = im.path_to_serve));
   const roles = await User.get_roles();
   const stateActions = getState().actions;
   const actions = [

package/routes/tag_entries.js

@@ -81,7 +81,7 @@ const formOptions = async (type, tag_id) => {
     case "triggers": {
       const ids = await tag.getTriggerIds();
       return {
-        triggers: (Trigger.find()).filter(
+        triggers: Trigger.find().filter(
           (value) => ids.indexOf(value.id) === -1
         ),
       };

package/routes/tenant.js

@@ -21,6 +21,7 @@ const {
   renderForm,
   link,
   post_delete_btn,
+  localeDateTime,
   mkTable,
 } = require("@saltcorn/markup");
 const {
@@ -384,7 +385,7 @@ router.get(
               },
               {
                 label: req.__("Created"),
-                key: (r) => text(r.created),
+                key: (r) => localeDateTime(r.created),
               },
               {
                 label: req.__("Information"),

package/routes/utils.js

@@ -218,7 +218,9 @@ const scan_for_page_title = (contents, viewname) => {
   try {
     scanstr =
       typeof contents === "string" ? contents : JSON.stringify(contents);
-  } catch {}
+  } catch {
+    //ignore
+  }
   if (scanstr.includes("<!--SCPT:")) {
     const start = scanstr.indexOf("<!--SCPT:");
     const end = scanstr.indexOf("-->", start);

package/routes/view.js

@@ -9,7 +9,7 @@ const Router = require("express-promise-router");
 const View = require("@saltcorn/data/models/view");
 const Table = require("@saltcorn/data/models/table");
 
-const { text } = require("@saltcorn/markup/tags");
+const { text, style } = require("@saltcorn/markup/tags");
 const {
   isAdmin,
   error_catcher,
@@ -62,8 +62,20 @@ router.get(
       res.redirect("/");
       return;
     }
+    const isModal = req.headers?.saltcornmodalrequest;
+
     const contents = await view.run_possibly_on_page(query, req, res);
-    const title = scan_for_page_title(contents, view.name);
+    const title =
+      isModal && view.attributes?.popup_title
+        ? view.attributes?.popup_title
+        : scan_for_page_title(contents, view.name);
+    if (isModal && view.attributes?.popup_width)
+      res.set(
+        "SaltcornModalWidth",
+        `${view.attributes?.popup_width}${
+          view.attributes?.popup_width_units || "px"
+        }`
+      );
     res.sendWrap(
       title,
       add_edit_bar({

package/routes/viewedit.js

@@ -134,6 +134,7 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
     action: addOnDoneRedirect("/viewedit/save", req),
     submitLabel: req.__("Configure") + " »",
     blurb: req.__("First, please give some basic information about the view."),
+    tabs: { tabsStyle: "Accordion" },
     fields: [
       new Field({
         label: req.__("View name"),
@@ -191,6 +192,7 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
           "Requests to render this view directly will instead show the chosen page, if any. The chosen page should embed this view. Use this to decorate the view with additional elements."
         ),
         input_type: "select",
+        tab: "View settings",
         options: [
           { value: "", label: "" },
           ...pages.map((p) => ({ value: p.name, label: p.name })),
@@ -201,6 +203,7 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
         label: req.__("Slug"),
         sublabel: req.__("Field that can be used for a prettier URL structure"),
         type: "String",
+        tab: "View settings",
         attributes: {
           calcOptions: [
             "table_name",
@@ -209,6 +212,33 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
         },
         showIf: { viewtemplate: hasTable },
       }),
+      new Field({
+        name: "popup_title",
+        label: req.__("Title"),
+        type: "String",
+        parent_field: "attributes",
+        tab: "Popup settings",
+      }),
+      {
+        name: "popup_width",
+        label: req.__("Column width"),
+        type: "Integer",
+        tab: "Popup settings",
+        parent_field: "attributes",
+        attributes: { asideNext: true },
+      },
+      {
+        name: "popup_width_units",
+        label: req.__("Units"),
+        type: "String",
+        tab: "Popup settings",
+        fieldview: "radio_group",
+        parent_field: "attributes",
+        attributes: {
+          inline: true,
+          options: ["px", "%", "vw", "em", "rem"],
+        },
+      },
       ...(isEdit
         ? [
             new Field({
@@ -396,6 +426,7 @@ router.post(
           const vt = getState().viewtemplates[v.viewtemplate];
           if (vt.initial_config) v.configuration = await vt.initial_config(v);
           else v.configuration = {};
+          //console.log(v);
           await View.create(v);
         }
         res.redirect(
@@ -503,6 +534,9 @@ router.get(
       res.redirect("/viewedit");
       return;
     }
+    (view.configuration?.columns || []).forEach((c) => {
+      c._columndef = JSON.stringify(c);
+    });
     const configFlow = await view.get_config_flow(req);
     const hasConfig =
       view.configuration && Object.keys(view.configuration).length > 0;
@@ -644,6 +678,7 @@ router.post(
 
     if (viewname && req.body) {
       const view = await View.findOne({ name: viewname });
+      req.staticFieldViewConfig = true;
       const configFlow = await view.get_config_flow(req);
       const step = await configFlow.singleStepForm(req.body, req);
       if (step?.renderForm) {

package/s3storage.js

@@ -5,7 +5,7 @@ const { getState } = require("@saltcorn/data/db/state");
 const fileUpload = require("express-fileupload");
 const { v4: uuidv4 } = require("uuid");
 const contentDisposition = require("content-disposition");
-
+const fs = require("fs");
 function createS3Client() {
   return new aws.S3({
     secretAccessKey: getState().getConfig("storage_s3_access_secret"),
@@ -46,25 +46,27 @@ module.exports = {
       s3upload(req, res, next);
     } else {
       // Use regular file upload https://www.npmjs.com/package/express-fileupload
-      const fileSizeLimit = getState().getConfig("file_upload_limit", 0);
+      const fileSizeLimit =
+        1024 * +getState().getConfig("file_upload_limit", 0);
       fileUpload({
         useTempFiles: true,
         createParentPath: true,
         tempFileDir: "/tmp/",
         // set to true - if you want to have debug
-        debug: getState().getConfig("file_upload_debug",false),
+        debug: getState().getConfig("file_upload_debug", false),
         //uriDecodeFileNames: true,
         //safeFileNames: true,
-        defCharset: 'utf8',
-        defParamCharset: 'utf8',
+        defCharset: "utf8",
+        defParamCharset: "utf8",
         // 0 - means no upload limit check
-        limits: {
-          fileSize: fileSizeLimit,
-        },
+        limits: fileSizeLimit
+          ? {
+              fileSize: fileSizeLimit,
+            }
+          : {},
         abortOnLimit: fileSizeLimit !== 0,
         // 0 - means no upload limit check
-        uploadTimeout: getState().getConfig("file_upload_timeout",0),
-
+        uploadTimeout: getState().getConfig("file_upload_timeout", 0),
       })(req, res, next);
     }
   },
@@ -146,7 +148,7 @@ module.exports = {
       // Forward the object
       s3.getObject(params)
         .on("httpHeaders", function (statusCode, headers) {
-          if (!!download)
+          if (download)
             res.set("Content-Disposition", contentDisposition(file.filename));
           res.set("Content-Length", headers["content-length"]);
           this.response.httpResponse.createUnbufferedStream().pipe(res);