@saltcorn/server 0.6.1-beta.1 → 0.6.2-beta.0

package/routes/homepage.js

@@ -21,8 +21,8 @@ const Trigger = require("@saltcorn/data/models/trigger");
 const { fileUploadForm } = require("../markup/forms");
 
 /**
- * @param {*} tables 
- * @param {object} req 
+ * @param {*} tables
+ * @param {object} req
  * @returns {Table}
  */
 const tableTable = (tables, req) =>
@@ -38,8 +38,8 @@ const tableTable = (tables, req) =>
   );
 
 /**
- * @param {*} tables 
- * @param {object} req 
+ * @param {*} tables
+ * @param {object} req
  * @returns {object}
  */
 const tableCard = (tables, req) => ({
@@ -67,8 +67,8 @@ const tableCard = (tables, req) => ({
 });
 
 /**
- * @param {*} views 
- * @param {object} req 
+ * @param {*} views
+ * @param {object} req
  * @returns {Table}
  */
 const viewTable = (views, req) =>
@@ -88,8 +88,8 @@ const viewTable = (views, req) =>
   );
 
 /**
- * @param {*} views 
- * @param {object} req 
+ * @param {*} views
+ * @param {object} req
  * @returns {object}
  */
 const viewCard = (views, req) => ({
@@ -119,8 +119,8 @@ const viewCard = (views, req) => ({
 });
 
 /**
- * @param {*} pages 
- * @param {object} req 
+ * @param {*} pages
+ * @param {object} req
  * @returns {Table}
  */
 const pageTable = (pages, req) =>
@@ -140,8 +140,8 @@ const pageTable = (pages, req) =>
   );
 
 /**
- * @param {*} pages 
- * @param {object} req 
+ * @param {*} pages
+ * @param {object} req
  * @returns {object}
  */
 const pageCard = (pages, req) => ({
@@ -172,11 +172,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 +196,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 +213,19 @@ 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) => {
   return div(
+    { class: "pb-3" },
     triggers.length <= 1 &&
       p(
         { class: "mt-2 pr-2" },
@@ -259,14 +252,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 +327,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 +351,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",
+            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 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 »")
-                  )
-                )
-              ),
-              Users: await usersTab(req),
-            },
           },
         ],
       },
@@ -370,8 +390,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 +420,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) => {
@@ -431,8 +451,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) => {

package/routes/index.js

@@ -4,6 +4,43 @@
  * @module routes/index
  * @subcategory routes
  */
+
+/**
+ * All files in the routes module.
+ * @namespace routes_overview
+ * @property {module:routes/actions} actions
+ * @property {module:routes/admin} admin
+ * @property {module:routes/api} api
+ * @property {module:routes/config} config
+ * @property {module:routes/crashlog} crashlog
+ * @property {module:routes/delete} delete
+ * @property {module:routes/edit} edit
+ * @property {module:routes/eventlog} eventlog
+ * @property {module:routes/events} events
+ * @property {module:routes/fields} fields
+ * @property {module:routes/files} files
+ * @property {module:routes/homepage} homepage
+ * @property {module:routes/infoarch} infoarch
+ * @property {module:routes/library} library
+ * @property {module:routes/list} list
+ * @property {module:routes/menu} menu
+ * @property {module:routes/packs} packs
+ * @property {module:routes/page} page
+ * @property {module:routes/pageedit} pageedit
+ * @property {module:routes/plugins} plugins
+ * @property {module:routes/scapi} scapi
+ * @property {module:routes/search} search
+ * @property {module:routes/settings} settings
+ * @property {module:routes/tables} tables
+ * @property {module:routes/tenant} tenant
+ * @property {module:routes/utils} utils
+ * @property {module:routes/view} view
+ * @property {module:routes/viewedit} viewedit
+ * 
+ * @category server
+ * @subcategory routes
+ */
+
 const table = require("./tables");
 const field = require("./fields");
 const list = require("./list");

package/routes/tables.js

@@ -347,8 +347,8 @@ router.get(
   })
 );
 
-/** 
-* Create Table from CSV file (post)
+/**
+ * Create Table from CSV file (post)
  * @name post/create-from-csv
  * @function
  * @memberof module:routes/tables~tablesRouter
@@ -396,7 +396,7 @@ router.post(
   })
 );
 
-/** 
+/**
  * Show Relational Diagram (get)
  * @name get/relationship-diagram
  * @function
@@ -489,16 +489,16 @@ router.get(
 );
 
 /**
- * @param {string} col 
- * @param {string} lbl 
+ * @param {string} col
+ * @param {string} lbl
  * @returns {string}
  */
 const badge = (col, lbl) =>
   `<span class="badge badge-${col}">${lbl}</span>&nbsp;`;
 
 /**
- * @param {object} f 
- * @param {object} req 
+ * @param {object} f
+ * @param {object} req
  * @returns {string}
  */
 const typeBadges = (f, req) => {
@@ -512,7 +512,7 @@ const typeBadges = (f, req) => {
 };
 
 /**
- * @param {object} f 
+ * @param {object} f
  * @returns {string}
  */
 const attribBadges = (f) => {
@@ -526,7 +526,7 @@ const attribBadges = (f) => {
   return s;
 };
 
-/** 
+/**
  * Table Constructor (GET Handler)
  * @name get/:idorname
  * @function
@@ -762,6 +762,7 @@ router.get(
             ),
             // rename table doesnt supported for sqlite
             !db.isSQLite &&
+              table.name !== "users" &&
               a(
                 {
                   class: "dropdown-item",
@@ -782,12 +783,13 @@ router.get(
               req,
               true
             ),
-            post_dropdown_item(
-              `/table/forget-table/${table.id}`,
-              '<i class="fas fa-recycle"></i>&nbsp;' + req.__("Forget table"),
-              req,
-              true
-            ),
+            table.name !== "users" &&
+              post_dropdown_item(
+                `/table/forget-table/${table.id}`,
+                '<i class="fas fa-recycle"></i>&nbsp;' + req.__("Forget table"),
+                req,
+                true
+              ),
           ])
         )
     );
@@ -833,7 +835,7 @@ router.get(
   })
 );
 
-/** 
+/**
  * @name post
  * @function
  * @memberof module:routes/tables~tablesRouter
@@ -906,7 +908,7 @@ router.post(
   })
 );
 
-/** 
+/**
  * Delete Table Route Handler definition
  * /delete:/id, where id is table id in _sc_tables
  * @name post/delete/:id
@@ -1084,7 +1086,7 @@ router.get(
   })
 );
 
-/** 
+/**
  * Download CSV file
  * @name get/download/:name
  * @function
@@ -1190,7 +1192,7 @@ const constraintForm = (req, table_id, fields) =>
       type: "Bool",
     })),
   });
- 
+
 /**
  * Add constraint GET handler
  * ${base_url}/table/add-constraint/:id

package/routes/tenant.js

@@ -34,7 +34,7 @@ const {
 } = require("@saltcorn/markup/tags");
 const db = require("@saltcorn/data/db");
 const url = require("url");
-const { loadAllPlugins } = require("../load_plugins");
+const { loadAllPlugins, loadAndSaveNewPlugin } = require("../load_plugins");
 const { setTenant, isAdmin, error_catcher } = require("./utils.js");
 const User = require("@saltcorn/data/models/user");
 const File = require("@saltcorn/data/models/file");
@@ -139,31 +139,37 @@ router.get(
           "You are trying to create a tenant while connecting via an IP address rather than a domain. This will probably not work."
         )
       );
+    let create_tenant_warning = "";
     if (getState().getConfig("create_tenant_warning"))
-      req.flash(
-        "warning",
-        h4(req.__("Warning")) +
-          p(
+      create_tenant_warning = div(
+        {
+          class: "alert alert-warning alert-dismissible fade show mt-5",
+          role: "alert",
+        },
+        h4(req.__("Warning")),
+        p(
+          req.__(
+            "Hosting on this site is provided for free and with no guarantee of availability or security of your application. "
+          ) +
+            " " +
             req.__(
-              "Hosting on this site is provided for free and with no guarantee of availability or security of your application. "
+              "This facility is intended solely for you to evaluate the suitability of Saltcorn. "
             ) +
-              " " +
-              req.__(
-                "This facility is intended solely for you to evaluate the suitability of Saltcorn. "
-              ) +
-              " " +
-              req.__(
-                "If you would like to store private information that needs to be secure, please use self-hosted Saltcorn. "
-              ) +
-              " " +
-              req.__(
-                'See <a href="https://github.com/saltcorn/saltcorn">GitHub repository</a> for instructions<p>'
-              )
-          )
+            " " +
+            req.__(
+              "If you would like to store private information that needs to be secure, please use self-hosted Saltcorn. "
+            ) +
+            " " +
+            req.__(
+              'See <a href="https://github.com/saltcorn/saltcorn">GitHub repository</a> for instructions<p>'
+            )
+        )
       );
+
     res.sendWrap(
       req.__("Create application"),
-      renderForm(tenant_form(req), req.csrfToken()) +
+      create_tenant_warning +
+        renderForm(tenant_form(req), req.csrfToken()) +
         p(
           { class: "mt-2" },
           req.__("To login to a previously created application, go to: "),
@@ -245,7 +251,19 @@ router.post(
         );
       } else {
         const newurl = getNewURL(req, subdomain);
-        await create_tenant(subdomain, loadAllPlugins, newurl);
+        await create_tenant(
+          subdomain,
+          loadAllPlugins,
+          newurl,
+          false,
+          loadAndSaveNewPlugin
+        );
+        let new_url_create = newurl;
+        const hasTemplate = getState().getConfig("tenant_template");
+        if (hasTemplate) {
+          new_url_create += "auth/create_first_user";
+        }
+
         res.sendWrap(
           req.__("Create application"),
           div(
@@ -253,14 +271,25 @@ router.post(
 
             div(
               { class: "my-3", style: "font-size: 22px" },
-              a({ href: newurl, class: "new-tenant-link" }, newurl)
+              a(
+                { href: new_url_create, class: "new-tenant-link" },
+                new_url_create
+              )
             ),
             p(
               req.__(
                 "Please click the above link now to create the first user."
               ) +
                 " " +
-                req.__("Use this link to revisit your application at any time.")
+                hasTemplate
+                ? req.__(
+                    'Use this link: <a href="%s">%s</a> to revisit your application at any time.',
+                    newurl,
+                    newurl
+                  )
+                : req.__(
+                    "Use this link to revisit your application at any time."
+                  )
             )
           )
         );
@@ -339,13 +368,17 @@ router.get(
 );
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {Form}
  */
 const tenant_settings_form = (req) =>
   config_fields_form({
     req,
-    field_names: ["role_to_create_tenant", "create_tenant_warning"],
+    field_names: [
+      "role_to_create_tenant",
+      "create_tenant_warning",
+      "tenant_template",
+    ],
     action: "/tenant/settings",
     submitLabel: req.__("Save"),
   });

package/routes/utils.js

@@ -4,8 +4,8 @@
  * @subcategory routes
  */
 
-const { sqlsanitize } = require("@saltcorn/data/db/internal.js");
 const db = require("@saltcorn/data/db");
+const { sqlsanitize } = db;
 const {
   getState,
   getTenant,

package/routes/view.js

@@ -68,7 +68,7 @@ router.get(
         what: req.__("View"),
         url: `/viewedit/edit/${encodeURIComponent(view.name)}`,
         contents,
-        req
+        req,
       })
     );
   })
@@ -92,18 +92,18 @@ router.post(
       res.send("");
       return;
     }
-    let query = {};
+    let query = req.body || {};
     let row;
     let table;
     const sfs = await view.get_state_fields();
     for (const sf of sfs) {
-      if (sf.required) {
+      if (sf.required && !query[sf.name]) {
         if (!row) {
           if (!table)
             table = await Table.findOne(view.table_id || view.exttable_name);
           row = await table.getRow({});
         }
-        if(row) query[sf.name] = row[sf.name];
+        if (row) query[sf.name] = row[sf.name];
       }
     }
     const contents = await view.run(query, { req, res });