@saltcorn/server 0.7.4 → 0.8.0-beta.1

package/routes/fields.js

@@ -25,7 +25,10 @@ const db = require("@saltcorn/data/db");
 
 const { isAdmin, error_catcher } = require("./utils.js");
 const expressionBlurb = require("../markup/expression_blurb");
-const { readState, add_free_variables_to_joinfields } = require("@saltcorn/data/plugin-helper");
+const {
+  readState,
+  add_free_variables_to_joinfields,
+} = require("@saltcorn/data/plugin-helper");
 const { wizardCardTitle } = require("../markup/forms.js");
 const FieldRepeat = require("@saltcorn/data/models/fieldrepeat");
 const { applyAsync } = require("@saltcorn/data/utils");
@@ -185,6 +188,7 @@ const fieldFlow = (req) =>
       attributes.summary_field = context.summary_field;
       attributes.include_fts = context.include_fts;
       attributes.on_delete_cascade = context.on_delete_cascade;
+      attributes.on_delete = context.on_delete;
       const {
         table_id,
         name,
@@ -350,12 +354,13 @@ 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>`,
                 },
               }),
@@ -400,13 +405,32 @@ const fieldFlow = (req) =>
                 type: "Bool",
                 showIf: { summary_field: textfields },
               }),
-              new Field({
+              /*new Field({
                 name: "on_delete_cascade",
                 label: req.__("On delete cascade"),
                 type: "Bool",
                 sublabel: req.__(
                   "If the parent row is deleted, automatically delete the child rows."
                 ),
+              }),*/
+              new Field({
+                name: "on_delete",
+                label: req.__("On delete"),
+                input_type: "select",
+                options: ["Fail", "Cascade", "Set null"],
+                required: true,
+                attributes: {
+                  explainers: {
+                    Fail: "Prevent any deletion of parent rows",
+                    Cascade:
+                      "If the parent row is deleted, automatically delete the child rows.",
+                    "Set null":
+                      "If the parent row is deleted, set key fields on child rows to null",
+                  },
+                },
+                sublabel: req.__(
+                  "If the parent row is deleted, do this to the child rows."
+                ),
               }),
             ],
           });
@@ -622,12 +646,18 @@ router.post(
     const { formula, tablename, stored } = req.body;
     const table = await Table.findOne({ name: tablename });
     const fields = await table.getFields();
-    const freeVars = freeVariables(formula)
-    const joinFields = {}
-    if (stored)
-      add_free_variables_to_joinfields(freeVars, joinFields, fields)
-    const rows = await table.getJoinedRows({ joinFields, orderBy: "RANDOM()", limit: 1 });
-    if (rows.length < 1) return "No rows in table";
+    const freeVars = freeVariables(formula);
+    const joinFields = {};
+    if (stored) add_free_variables_to_joinfields(freeVars, joinFields, fields);
+    const rows = await table.getJoinedRows({
+      joinFields,
+      orderBy: "RANDOM()",
+      limit: 1,
+    });
+    if (rows.length < 1) {
+      res.send("No rows in table");
+      return;
+    }
     let result;
     try {
       if (stored) {
@@ -638,7 +668,8 @@ 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) {
@@ -668,10 +699,9 @@ router.post(
     const fields = await table.getFields();
     let row = { ...req.body };
     if (!row || Object.keys(row).length === 0) {
-      const { id } = req.query
-      if (id) row = await table.getRow({ id })
-    } else
-      readState(row, fields);
+      const { id } = req.query;
+      if (id) row = await table.getRow({ id });
+    } else readState(row, fields);
 
     if (fieldName.includes(".")) {
       //join field
@@ -691,12 +721,18 @@ router.post(
         const refRow = await reftable.getRow(q);
         let fv;
         if (targetField.type === "Key") {
-          fv = getState().keyFieldviews[fieldview]
+          fv = getState().keyFieldviews[fieldview];
           if (!fv) {
-            const reftable2 = Table.findOne({ name: targetField.reftable_name })
-            const refRow2 = await reftable2.getRow({ [reftable2.pk_name]: refRow[kpath[1]] })
+            const reftable2 = Table.findOne({
+              name: targetField.reftable_name,
+            });
+            const refRow2 = await reftable2.getRow({
+              [reftable2.pk_name]: refRow[kpath[1]],
+            });
             if (refRow2) {
-              res.send(text(`${refRow2[targetField.attributes.summary_field]}`));
+              res.send(
+                text(`${refRow2[targetField.attributes.summary_field]}`)
+              );
             } else {
               res.send("");
             }
@@ -708,7 +744,6 @@ router.post(
             fv =
               targetField.type.fieldviews.show ||
               targetField.type.fieldviews.as_text;
-
         }
 
         const configuration = req.query;
@@ -753,7 +788,7 @@ router.post(
     let result;
     try {
       if (!field.calculated) {
-        result = row[field.name]
+        result = row[field.name];
       } else if (field.stored) {
         const f = get_async_expression_function(formula, fields);
         result = await f(row);
@@ -762,8 +797,7 @@ router.post(
         result = f(row);
       }
       const fv = field.type.fieldviews[fieldview];
-      if (!fv)
-        res.send(text(result));
+      if (!fv) res.send(text(result));
       else res.send(fv.run(result));
     } catch (e) {
       return res.status(400).send(`Error: ${e.message}`);
@@ -816,8 +850,8 @@ 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;

package/routes/files.js

@@ -11,6 +11,7 @@ const User = require("@saltcorn/data/models/user");
 const { getState } = require("@saltcorn/data/db/state");
 const s3storage = require("../s3storage");
 const resizer = require("resize-with-sharp-or-jimp");
+const db = require("@saltcorn/data/db");
 
 const {
   mkTable,
@@ -20,7 +21,7 @@ const {
   post_delete_btn,
 } = require("@saltcorn/markup");
 const { isAdmin, error_catcher, setTenant } = require("./utils.js");
-const { h1, div, text } = require("@saltcorn/markup/tags");
+const { h1, div, text, button, i, a } = require("@saltcorn/markup/tags");
 // const { csrfField } = require("./utils");
 const { editRoleForm, fileUploadForm } = require("../markup/forms.js");
 const { strictParseInt } = require("@saltcorn/data/plugin-helper");
@@ -31,6 +32,7 @@ const {
 } = require("../markup/admin");
 // const fsp = require("fs").promises;
 const fs = require("fs");
+const path = require("path");
 
 /**
  * @type {object}
@@ -51,7 +53,7 @@ module.exports = router;
  */
 const editFileRoleForm = (file, roles, req) =>
   editRoleForm({
-    url: `/files/setrole/${file.id}`,
+    url: `/files/setrole/${file.path_to_serve}`,
     current_role: file.min_role_read,
     roles,
     req,
@@ -68,49 +70,51 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     // todo limit select from file by 10 or 20
-    const rows = await File.find({}, { orderBy: "filename" });
+    const { dir } = req.query
+    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 = "/"
+      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
+      }
+      const directories = await File.allDirectories()
+      for (const file of directories) {
+        file.location = file.path_to_serve
+      }
+      res.json({ files: rows, roles, directories })
+      return
+    }
     send_files_page({
       res,
       req,
+      headers: [
+        {
+          script: `/static_assets/${db.connectObj.version_tag}/bundle.js`,
+          defer: true
+        },
+        {
+          css: `/static_assets/${db.connectObj.version_tag}/bundle.css`,
+        },
+      ],
       active_sub: "Files",
       contents: {
         type: "card",
         contents: [
-          mkTable(
-            [
-              {
-                label: req.__("Filename"),
-                key: (r) =>
-                  div(
-                    { "data-inline-edit-dest-url": `/files/setname/${r.id}` },
-                    r.filename
-                  ),
-              },
-              { label: req.__("Size (KiB)"), key: "size_kb", align: "right" },
-              { label: req.__("Media type"), key: (r) => r.mimetype },
-              {
-                label: req.__("Role to access"),
-                key: (r) => editFileRoleForm(r, roles, req),
-              },
-              {
-                label: req.__("Link"),
-                key: (r) => link(`/files/serve/${r.id}`, req.__("Link")),
-              },
-              {
-                label: req.__("Download"),
-                key: (r) => link(`/files/download/${r.id}`, req.__("Download")),
-              },
-              {
-                label: req.__("Delete"),
-                key: (r) =>
-                  post_delete_btn(`/files/delete/${r.id}`, req, r.filename),
-              },
-            ],
-            rows,
-            { hover: true }
-          ),
-          fileUploadForm(req),
+          div({ id: "saltcorn-file-manager" }),
+          fileUploadForm(req, safeDir),
         ],
       },
     });
@@ -124,19 +128,21 @@ router.get(
  * @function
  */
 router.get(
-  "/download/:id",
+  "/download/*",
   error_catcher(async (req, res) => {
     const role = req.user && req.user.id ? req.user.role_id : 10;
     const user_id = req.user && req.user.id;
-    const { id } = req.params;
-    const file = await File.findOne({ id });
-    if (role <= file.min_role_read || (user_id && user_id === file.user_id)) {
+    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))) {
       res.type(file.mimetype);
       if (file.s3_store) s3storage.serveObject(file, res, true);
       else res.download(file.location, file.filename);
     } else {
-      req.flash("warning", req.__("Not authorized"));
-      res.redirect("/");
+      res
+        .status(404)
+        .sendWrap(req.__("Not found"), h1(req.__("File not found")));
     }
   })
 );
@@ -148,31 +154,25 @@ router.get(
  * @function
  */
 router.get(
-  "/serve/:id",
+  "/serve/*",
   error_catcher(async (req, res) => {
     const role = req.user && req.user.id ? req.user.role_id : 10;
     const user_id = req.user && req.user.id;
-    const { id } = req.params;
-    let file;
-    if (typeof strictParseInt(id) !== "undefined")
-      file = await File.findOne({ id });
-    else file = await File.findOne({ filename: id });
+    const serve_path = req.params[0];
+    //let file;
+    //if (typeof strictParseInt(id) !== "undefined")
+    const file = await File.findOne(serve_path);
 
-    if (!file) {
-      res
-        .status(404)
-        .sendWrap(req.__("Not found"), h1(req.__("File not found")));
-      return;
-    }
-    if (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`);
       if (file.s3_store) s3storage.serveObject(file, res, false);
       else res.sendFile(file.location);
     } else {
-      req.flash("warning", req.__("Not authorized"));
-      res.redirect("/");
+      res
+        .status(404)
+        .sendWrap(req.__("Not found"), h1(req.__("File not found")));
     }
   })
 );
@@ -184,23 +184,17 @@ router.get(
  * @function
  */
 router.get(
-  "/resize/:id/:width_str/:height_str?",
+  "/resize/:width_str/:height_str/*",
   error_catcher(async (req, res) => {
     const role = req.user && req.user.id ? req.user.role_id : 10;
     const user_id = req.user && req.user.id;
-    const { id, width_str, height_str } = req.params;
-    let file;
-    if (typeof strictParseInt(id) !== "undefined")
-      file = await File.findOne({ id });
-    else file = await File.findOne({ filename: id });
+    const { width_str, height_str } = req.params;
+    const serve_path = req.params[0];
 
-    if (!file) {
-      res
-        .status(404)
-        .sendWrap(req.__("Not found"), h1(req.__("File not found")));
-      return;
-    }
-    if (role <= file.min_role_read || (user_id && user_id === file.user_id)) {
+
+    const file = await File.findOne(serve_path);
+
+    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`);
@@ -208,12 +202,14 @@ router.get(
       if (file.s3_store) s3storage.serveObject(file, res, false);
       else {
         const width = strictParseInt(width_str);
-        const height = height_str ? strictParseInt(height_str) : null;
+        const height = height_str && height_str !== "0"
+          ? strictParseInt(height_str) : null;
         if (!width) {
           res.sendFile(file.location);
           return;
         }
-        const fnm = `${file.location}_w${width}${height ? `_h${height}` : ""}`;
+        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({
             fromFileName: file.location,
@@ -225,8 +221,9 @@ router.get(
         res.sendFile(fnm);
       }
     } else {
-      req.flash("warning", req.__("Not authorized"));
-      res.redirect("/");
+      res
+        .status(404)
+        .sendWrap(req.__("Not found"), h1(req.__("File not found")));
     }
   })
 );
@@ -238,23 +235,42 @@ router.get(
  * @function
  */
 router.post(
-  "/setrole/:id",
+  "/setrole/*",
   isAdmin,
   error_catcher(async (req, res) => {
-    const { id } = req.params;
+    const serve_path = req.params[0];
+    const file = await File.findOne(serve_path);
     const role = req.body.role;
-    await File.update(+id, { min_role_read: role });
-    const file = await File.findOne({ id });
     const roles = await User.get_roles();
     const roleRow = roles.find((r) => r.id === +role);
-    if (roleRow && file)
-      req.flash(
-        "success",
-        req.__(`Minimum role for %s updated to %s`, file.filename, roleRow.role)
-      );
-    else req.flash("success", req.__(`Minimum role updated`));
 
-    res.redirect("/files");
+    if (roleRow && file) {
+      await file.set_role(role);
+
+    }
+
+
+    res.redirect(file ? `/files?dir=${encodeURIComponent(file.current_folder)}` : "/files");
+  })
+);
+
+
+router.post(
+  "/move/*",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const serve_path = req.params[0];
+    const file = await File.findOne(serve_path);
+    const new_path = req.body.new_path;
+
+    if (file) {
+      await file.move_to_dir(new_path);
+    }
+    if (req.xhr) {
+      res.json({ success: "ok" })
+      return
+    }
+    res.redirect(file ? `/files?dir=${encodeURIComponent(file.current_folder)}` : "/files");
   })
 );
 
@@ -265,14 +281,28 @@ router.post(
  * @function
  */
 router.post(
-  "/setname/:id",
+  "/setname/*",
   isAdmin,
   error_catcher(async (req, res) => {
-    const { id } = req.params;
+    const serve_path = req.params[0];
     const filename = req.body.value;
-    await File.update(+id, { filename });
 
-    res.redirect("/files");
+    const file = await File.findOne(serve_path);
+    await file.rename(filename);
+
+    res.redirect(`/files?dir=${encodeURIComponent(file.current_folder)}`);
+
+  })
+);
+
+router.post(
+  "/new-folder",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { name, folder } = req.body
+    await File.new_folder(name, folder);
+
+    res.json({ success: "ok" });
   })
 );
 
@@ -286,9 +316,11 @@ router.post(
   "/upload",
   setTenant, // TODO why is this needed?????
   error_catcher(async (req, res) => {
+    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
     if (role > +min_role_upload) {
       if (!req.xhr) req.flash("warning", req.__("Not authorized"));
       else jsonResp = { error: "Not authorized" };
@@ -300,9 +332,11 @@ router.post(
       const f = await File.from_req_files(
         req.files.file,
         req.user.id,
-        +min_role_read
+        +min_role_read,
+        folder ? File.normalise(folder) : undefined
       );
       const many = Array.isArray(f);
+      file_for_redirect = many ? f[0] : f
       if (!req.xhr)
         req.flash(
           "success",
@@ -317,14 +351,18 @@ router.post(
         jsonResp = {
           success: {
             filename: many ? f.map((fl) => fl.filename) : f.filename,
-            id: many ? f.map((fl) => fl.id) : f.id,
+            location: many ? f.map((fl) => fl.path_to_serve) : f.path_to_serve,
             url: many
-              ? f.map((fl) => `/files/serve/${fl.id}`)
-              : `/files/serve/${f.id}`,
+              ? f.map((fl) => `/files/serve/${fl.path_to_serve}`)
+              : `/files/serve/${f.path_to_serve}`,
           },
         };
     }
-    if (!req.xhr) res.redirect("/files");
+    if (!req.xhr)
+      res.redirect(!file_for_redirect
+        ? '/files'
+        : `/files?dir=${encodeURIComponent(file_for_redirect.current_folder)}`);
+
     else res.json(jsonResp);
   })
 );
@@ -336,11 +374,11 @@ router.post(
  * @function
  */
 router.post(
-  "/delete/:id",
+  "/delete/*",
   isAdmin,
   error_catcher(async (req, res) => {
-    const { id } = req.params;
-    const f = await File.findOne({ id });
+    const serve_path = req.params[0];
+    const f = await File.findOne(serve_path);
     if (!f) {
       req.flash("error", "File not found");
       res.redirect("/files");
@@ -351,10 +389,8 @@ router.post(
     );
     if (result && result.error) {
       req.flash("error", result.error);
-    } else {
-      req.flash("success", req.__(`File %s deleted`, text(f.filename)));
     }
-    res.redirect(`/files`);
+    res.redirect(`/files?dir=${encodeURIComponent(f.current_folder)}`);
   })
 );
 

package/routes/homepage.js

@@ -194,7 +194,7 @@ const filesTab = async (req) => {
         [
           {
             label: req.__("Filename"),
-            key: (r) => link(`/files/serve/${r.id}`, r.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 },
@@ -352,7 +352,7 @@ const helpCard = (req) =>
 const welcome_page = async (req) => {
   const packs_available = await fetch_available_packs();
   const packlist = [
-    ...packs_available.slice(0, 5),
+    ...(packs_available || []).slice(0, 5),
     { name: req.__("More..."), description: "" },
   ];
   const tables = await Table.find({}, { cached: true });

package/routes/infoarch.js

@@ -60,7 +60,7 @@ const languageForm = (req) =>
       {
         name: "locale",
         label: req.__("Locale"),
-        sublabel: "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,
       },
@@ -68,7 +68,7 @@ const languageForm = (req) =>
         name: "is_default",
         label: req.__("Default language"),
         sublabel:
-          "Is this the default language in which the application is built?",
+          req.__("Is this the default language in which the application is built?"),
         type: "Bool",
       },
     ],