@saltcorn/server 0.6.1-beta.3 → 0.6.2-beta.2

package/routes/files.js

@@ -8,6 +8,7 @@ const Router = require("express-promise-router");
 const File = require("@saltcorn/data/models/file");
 const User = require("@saltcorn/data/models/user");
 const { getState } = require("@saltcorn/data/db/state");
+const s3storage = require("../s3storage");
 
 const {
   mkTable,
@@ -16,7 +17,7 @@ const {
   post_btn,
   post_delete_btn,
 } = require("@saltcorn/markup");
-const { setTenant, isAdmin, error_catcher } = require("./utils.js");
+const { isAdmin, error_catcher } = require("./utils.js");
 const {
   span,
   h5,
@@ -37,6 +38,11 @@ const {
 const { csrfField } = require("./utils");
 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");
 
 /**
  * @type {object}
@@ -49,9 +55,9 @@ const router = new Router();
 module.exports = router;
 
 /**
- * @param {*} file 
- * @param {*} roles 
- * @param {*} req 
+ * @param {*} file
+ * @param {*} roles
+ * @param {*} req
  * @returns {Form}
  */
 const editFileRoleForm = (file, roles, req) =>
@@ -70,61 +76,53 @@ const editFileRoleForm = (file, roles, req) =>
  */
 router.get(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const rows = await File.find({}, { orderBy: "filename" });
     const roles = await User.get_roles();
-    res.sendWrap("Files", {
-      above: [
-        {
-          type: "breadcrumbs",
-          crumbs: [
-            { text: req.__("Settings"), href: "/settings" },
-            { text: req.__("Files") },
-          ],
-        },
-        {
-          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),
-          ],
-        },
-      ],
+    send_files_page({
+      res,
+      req,
+      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),
+        ],
+      },
     });
   })
 );
@@ -137,7 +135,6 @@ router.get(
  */
 router.get(
   "/download/:id",
-  setTenant,
   error_catcher(async (req, res) => {
     const role = req.isAuthenticated() ? req.user.role_id : 10;
     const user_id = req.user && req.user.id;
@@ -145,7 +142,8 @@ router.get(
     const file = await File.findOne({ id });
     if (role <= file.min_role_read || (user_id && user_id === file.user_id)) {
       res.type(file.mimetype);
-      res.download(file.location, file.filename);
+      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("/");
@@ -161,7 +159,6 @@ router.get(
  */
 router.get(
   "/serve/:id",
-  setTenant,
   error_catcher(async (req, res) => {
     const role = req.isAuthenticated() ? req.user.role_id : 10;
     const user_id = req.user && req.user.id;
@@ -181,7 +178,8 @@ router.get(
       res.type(file.mimetype);
       const cacheability = file.min_role_read === 10 ? "public" : "private";
       res.set("Cache-Control", `${cacheability}, max-age=86400`);
-      res.sendFile(file.location);
+      if (file.s3_store) s3storage.serveObject(file, res, false);
+      else res.sendFile(file.location);
     } else {
       req.flash("warning", req.__("Not authorized"));
       res.redirect("/");
@@ -197,7 +195,6 @@ router.get(
  */
 router.post(
   "/setrole/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -225,7 +222,6 @@ router.post(
  */
 router.post(
   "/setname/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -244,7 +240,6 @@ router.post(
  */
 router.post(
   "/upload",
-  setTenant,
   error_catcher(async (req, res) => {
     let jsonResp = {};
     const min_role_upload = getState().getConfig("min_role_upload", 1);
@@ -297,12 +292,18 @@ router.post(
  */
 router.post(
   "/delete/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
     const f = await File.findOne({ id });
-    const result = await f.delete();
+    if (!f) {
+      req.flash("error", "File not found");
+      res.redirect("/files");
+      return;
+    }
+    const result = await f.delete(
+      f.s3_store ? s3storage.unlinkObject : undefined
+    );
     if (result && result.error) {
       req.flash("error", result.error);
     } else {
@@ -311,3 +312,82 @@ router.post(
     res.redirect(`/files`);
   })
 );
+
+/**
+ * Storage settings form definition
+ * @param {object} req request
+ * @returns {Promise<Form>} form
+ */
+const storage_form = async (req) => {
+  const form = await config_fields_form({
+    req,
+    field_names: [
+      "storage_s3_enabled",
+      "storage_s3_bucket",
+      "storage_s3_path_prefix",
+      "storage_s3_endpoint",
+      "storage_s3_region",
+      "storage_s3_access_key",
+      "storage_s3_access_secret",
+      "storage_s3_secure",
+    ],
+    action: "/files/storage",
+  });
+  form.submitButtonClass = "btn-outline-primary";
+  form.submitLabel = req.__("Save");
+  form.onChange = "remove_outline(this)";
+  return form;
+};
+
+/**
+ * @name get/storage
+ * @function
+ * @memberof module:routes/admin~routes/adminRouter
+ */
+router.get(
+  "/storage",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const form = await storage_form(req);
+    send_files_page({
+      res,
+      req,
+      active_sub: "Storage",
+      contents: {
+        type: "card",
+        title: req.__("Storage settings"),
+        contents: [renderForm(form, req.csrfToken())],
+      },
+    });
+  })
+);
+
+/**
+ * @name post/email
+ * @function
+ * @memberof module:routes/admin~routes/adminRouter
+ */
+router.post(
+  "/storage",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const form = await storage_form(req);
+    form.validate(req.body);
+    if (form.hasErrors) {
+      send_admin_page({
+        res,
+        req,
+        active_sub: "Storage",
+        contents: {
+          type: "card",
+          title: req.__("Storage settings"),
+          contents: [renderForm(form, req.csrfToken())],
+        },
+      });
+    } else {
+      await save_config_from_form(form);
+      req.flash("success", req.__("Storage settings updated"));
+      res.redirect("/files/storage");
+    }
+  })
+);

package/routes/homepage.js

@@ -19,10 +19,11 @@ const { get_latest_npm_version } = require("@saltcorn/data/models/config");
 const packagejson = require("../package.json");
 const Trigger = require("@saltcorn/data/models/trigger");
 const { fileUploadForm } = require("../markup/forms");
+const { get_base_url } = require("./utils.js");
 
 /**
- * @param {*} tables 
- * @param {object} req 
+ * @param {*} tables
+ * @param {object} req
  * @returns {Table}
  */
 const tableTable = (tables, req) =>
@@ -38,8 +39,8 @@ const tableTable = (tables, req) =>
   );
 
 /**
- * @param {*} tables 
- * @param {object} req 
+ * @param {*} tables
+ * @param {object} req
  * @returns {object}
  */
 const tableCard = (tables, req) => ({
@@ -67,8 +68,8 @@ const tableCard = (tables, req) => ({
 });
 
 /**
- * @param {*} views 
- * @param {object} req 
+ * @param {*} views
+ * @param {object} req
  * @returns {Table}
  */
 const viewTable = (views, req) =>
@@ -88,8 +89,8 @@ const viewTable = (views, req) =>
   );
 
 /**
- * @param {*} views 
- * @param {object} req 
+ * @param {*} views
+ * @param {object} req
  * @returns {object}
  */
 const viewCard = (views, req) => ({
@@ -119,8 +120,8 @@ const viewCard = (views, req) => ({
 });
 
 /**
- * @param {*} pages 
- * @param {object} req 
+ * @param {*} pages
+ * @param {object} req
  * @returns {Table}
  */
 const pageTable = (pages, req) =>
@@ -140,8 +141,8 @@ const pageTable = (pages, req) =>
   );
 
 /**
- * @param {*} pages 
- * @param {object} req 
+ * @param {*} pages
+ * @param {object} req
  * @returns {object}
  */
 const pageCard = (pages, req) => ({
@@ -172,11 +173,11 @@ const pageCard = (pages, req) => ({
 });
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {Promise<div>}
  */
 const filesTab = async (req) => {
-  const files = await File.find({}, { orderBy: "filename" });
+  const files = await File.find({}, { orderBy: "filename", cached: true });
   return div(
     files.length == 0
       ? p(req.__("No files"))
@@ -196,16 +197,10 @@ const filesTab = async (req) => {
 };
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {Promise<div>}
  */
-const usersTab = async (req) => {
-  const users = await User.find({}, { orderBy: "id" });
-  const roles = await User.get_roles();
-  var roleMap = {};
-  roles.forEach((r) => {
-    roleMap[r.id] = r.role;
-  });
+const usersTab = async (req, users, roleMap) => {
   return div(
     mkTable(
       [
@@ -219,20 +214,21 @@ const usersTab = async (req) => {
       users
     ),
     a(
-      { href: `/useradmin/new`, class: "btn btn-secondary" },
+      { href: `/useradmin/new`, class: "btn btn-secondary my-3" },
       req.__("Create user")
     )
   );
 };
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {Promise<div>}
  */
-const actionsTab = async (req) => {
-  const triggers = await Trigger.findAllWithTableName();
+const actionsTab = async (req, triggers) => {
+  const base_url = get_base_url(req);
 
   return div(
+    { class: "pb-3" },
     triggers.length <= 1 &&
       p(
         { class: "mt-2 pr-2" },
@@ -259,14 +255,73 @@ const actionsTab = async (req) => {
           triggers
         ),
     a(
-      { href: "/actions/new", class: "btn btn-secondary btn-smj" },
+      { href: "/actions/new", class: "btn btn-secondary my-3" },
       req.__("Add trigger")
     )
   );
 };
+const packTab = (req, packlist) =>
+  div(
+    { class: "pb-3 pt-2 pr-4" },
+    p(req.__("Instead of building, get up and running in no time with packs")),
+    p(
+      { class: "font-italic" },
+      req.__(
+        "Packs are collections of tables, views and plugins that give you a full application which you can then edit to suit your needs."
+      )
+    ),
+    mkTable(
+      [
+        { label: req.__("Name"), key: "name" },
+        {
+          label: req.__("Description"),
+          key: "description",
+        },
+      ],
+      packlist,
+      { noHeader: true }
+    ),
+    a(
+      { href: `/plugins?set=packs`, class: "btn btn-primary" },
+      req.__("Go to pack store »")
+    )
+  );
+
+const helpCard = (req) =>
+  div(
+    { class: "pb-3 pt-2 pr-4" },
+    p(req.__("Confused?")),
+    p(
+      req.__(
+        "The Wiki contains the documentation and tutorials on installing and using Saltcorn"
+      )
+    ),
+    a(
+      {
+        href: `https://wiki.saltcorn.com/`,
+        class: "btn btn-primary",
+      },
+      req.__("Go to Wiki »")
+    ),
+    p(req.__("The YouTube channel has some video tutorials")),
+    a(
+      {
+        href: `https://www.youtube.com/channel/UCBOpAcH8ep7ESbuocxcq0KQ`,
+        class: "btn btn-secondary",
+      },
+      req.__("Go to YouTube »")
+    ),
+    div(
+      { class: "mt-3" },
+      a(
+        { href: `https://blog.saltcorn.com/` },
+        req.__("What's new? Read the blog »")
+      )
+    )
+  );
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {Promise<object>}
  */
 const welcome_page = async (req) => {
@@ -275,10 +330,16 @@ const welcome_page = async (req) => {
     ...packs_available.slice(0, 5),
     { name: req.__("More..."), description: "" },
   ];
-  const tables = await Table.find({}, { orderBy: "name" });
-  const views = await View.find({});
-  const pages = await Page.find({});
-
+  const tables = await Table.find({}, { cached: true });
+  const views = await View.find({}, { cached: true });
+  const pages = await Page.find({}, { cached: true });
+  const triggers = await Trigger.findAllWithTableName();
+  const users = await User.find({}, { orderBy: "id" });
+  const roles = await User.get_roles();
+  let roleMap = {};
+  roles.forEach((r) => {
+    roleMap[r.id] = r.role;
+  });
   return {
     above: [
       {
@@ -293,75 +354,37 @@ const welcome_page = async (req) => {
           {
             type: "card",
             //title: req.__("Install pack"),
-            tabContents: {
-              Packs: div(
-                p(
-                  req.__(
-                    "Instead of building, get up and running in no time with packs"
-                  )
-                ),
-                p(
-                  { class: "font-italic" },
-                  req.__(
-                    "Packs are collections of tables, views and plugins that give you a full application which you can then edit to suit your needs."
-                  )
-                ),
-                mkTable(
-                  [
-                    { label: req.__("Name"), key: "name" },
-                    {
-                      label: req.__("Description"),
-                      key: "description",
-                    },
-                  ],
-                  packlist,
-                  { noHeader: true }
-                ),
-                a(
-                  { href: `/plugins?set=packs`, class: "btn btn-primary" },
-                  req.__("Go to pack store »")
-                )
-              ),
-              Triggers: await actionsTab(req),
-              Files: await filesTab(req),
-            },
+            bodyClass: "py-0 pr-0",
+            class: "welcome-page-entity-list",
+
+            tabContents:
+              triggers.length > 0
+                ? {
+                    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),
+                  },
           },
           {
             type: "card",
             //title: req.__("Learn"),
-            tabContents: {
-              Help: div(
-                p(req.__("Confused?")),
-                p(
-                  req.__(
-                    "The Wiki contains the documentation and tutorials on installing and using Saltcorn"
-                  )
-                ),
-                a(
-                  {
-                    href: `https://wiki.saltcorn.com/`,
-                    class: "btn btn-primary",
-                  },
-                  req.__("Go to Wiki »")
-                ),
-                p(req.__("The YouTube channel has some video tutorials")),
-                a(
-                  {
-                    href: `https://www.youtube.com/channel/UCBOpAcH8ep7ESbuocxcq0KQ`,
-                    class: "btn btn-secondary",
+            bodyClass: "py-0 pr-0",
+            class: "welcome-page-entity-list",
+            tabContents:
+              users.length > 4
+                ? {
+                    Users: await usersTab(req, users, roleMap),
+                    Help: helpCard(req),
+                  }
+                : {
+                    Help: helpCard(req),
+                    Users: await usersTab(req, users, roleMap),
                   },
-                  req.__("Go to YouTube »")
-                ),
-                div(
-                  { class: "mt-3" },
-                  a(
-                    { href: `https://blog.saltcorn.com/` },
-                    req.__("What's new? Read the blog »")
-                  )
-                )
-              ),
-              Users: await usersTab(req),
-            },
           },
         ],
       },
@@ -370,8 +393,8 @@ const welcome_page = async (req) => {
 };
 
 /**
- * @param {object} req 
- * @param {object} res 
+ * @param {object} req
+ * @param {object} res
  * @returns {Promise<void>}
  */
 const no_views_logged_in = async (req, res) => {
@@ -400,9 +423,9 @@ const no_views_logged_in = async (req, res) => {
 };
 
 /**
- * @param {number} role_id 
- * @param {object} res 
- * @param {object} req 
+ * @param {number} role_id
+ * @param {object} res
+ * @param {object} req
  * @returns {Promise<boolean>}
  */
 const get_config_response = async (role_id, res, req) => {
@@ -420,8 +443,11 @@ const get_config_response = async (role_id, res, req) => {
       const contents = await db_page.run(req.query, { res, req });
 
       res.sendWrap(
-        { title: db_page.title, description: db_page.description } ||
-          `${pagename} page`,
+        {
+          title: db_page.title,
+          description: db_page.description,
+          bodyClass: "page_" + db.sqlsanitize(homeCfg),
+        } || `${pagename} page`,
         contents
       );
     } else res.redirect(homeCfg);
@@ -431,8 +457,8 @@ const get_config_response = async (role_id, res, req) => {
 
 /**
  * Function assigned to 'module.exports'.
- * @param {object} req 
- * @param {object} res 
+ * @param {object} req
+ * @param {object} res
  * @returns {Promise<void>}
  */
 module.exports = async (req, res) => {