@saltcorn/server 0.7.4-beta.3 → 0.8.0-beta.0

package/routes/tag_entries.js

@@ -1,9 +1,6 @@
 const {
-  a,
   div,
-  text,
   button,
-  i,
   form,
   select,
   option,
@@ -81,10 +78,10 @@ const formOptions = async (type, tag_id) => {
         ),
       };
     }
-    case "trigger": {
+    case "triggers": {
       const ids = await tag.getTriggerIds();
       return {
-        trigger: (await Trigger.find()).filter(
+        triggers: (Trigger.find()).filter(
           (value) => ids.indexOf(value.id) === -1
         ),
       };
@@ -101,7 +98,7 @@ router.get(
       above: [
         {
           type: "breadcrumbs",
-          crumbs: [{ text: `Tag entry` }],
+          crumbs: [{ text: req.__(`Tag entry`) }],
         },
         {
           type: "card",
@@ -120,15 +117,19 @@ router.get(
 
 const idField = (entryType) => {
   switch (entryType) {
-    case "tables": {
+    case "tables":
+    case "table": {
       return "table_id";
     }
-    case "views": {
+    case "views":
+    case "view": {
       return "view_id";
     }
-    case "pages": {
+    case "pages":
+    case "page": {
       return "page_id";
     }
+    case "triggers":
     case "trigger": {
       return "trigger_id";
     }
@@ -136,6 +137,7 @@ const idField = (entryType) => {
   return null;
 };
 
+// add multiple objects to one tag
 router.post(
   "/add/:entry_type/:tag_id",
   isAdmin,
@@ -155,6 +157,24 @@ router.post(
   })
 );
 
+// add one object to multiple tags
+router.post(
+  "/add/multiple_tags/:entry_type/:object_id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    let { entry_type, object_id } = req.params;
+    let { tag_ids } = req.body;
+    object_id = parseInt(object_id);
+    tag_ids = tag_ids.map((id) => parseInt(id));
+    const tags = (await Tag.find()).filter((tag) => tag_ids.includes(tag.id));
+    const fieldName = idField(entry_type);
+    for (const tag of tags) {
+      await tag.addEntry({ [fieldName]: object_id });
+    }
+    res.json({ tags });
+  })
+);
+
 router.post(
   "/remove/:entry_type/:entry_id/:tag_id",
   isAdmin,
@@ -168,6 +188,7 @@ router.post(
     } else {
       await TagEntry.update(entry.id, { [fieldName]: null });
     }
-    res.redirect(`/tag/${tag_id}?show_list=${entry_type}`);
+    if (!req.xhr) res.redirect(`/tag/${tag_id}?show_list=${entry_type}`);
+    else res.json({ okay: true });
   })
 );

package/routes/tags.js

@@ -35,30 +35,34 @@ router.get(
       res,
       req,
       active_sub: "Tags",
-      contents: [
-        mkTable(
-          [
-            {
-              label: req.__("Tagname"),
-              key: (r) =>
-                link(`/tag/${r.id || r.name}?show_list=tables`, text(r.name)),
-            },
+      contents: {
+        type: "card",
+        title: req.__("Tags"),
+        contents: [
+          mkTable(
+            [
+              {
+                label: req.__("Tagname"),
+                key: (r) =>
+                  link(`/tag/${r.id || r.name}?show_list=tables`, text(r.name)),
+              },
+              {
+                label: req.__("Delete"),
+                key: (r) => post_delete_btn(`/tag/delete/${r.id}`, req, r.name),
+              },
+            ],
+            rows,
+            {}
+          ),
+          a(
             {
-              label: req.__("Delete"),
-              key: (r) => post_delete_btn(`/tag/delete/${r.id}`, req, r.name),
+              href: `/tag/new`,
+              class: "btn btn-primary",
             },
-          ],
-          rows,
-          {}
-        ),
-        a(
-          {
-            href: `/tag/new`,
-            class: "btn btn-primary",
-          },
-          req.__("Create tag")
-        ),
-      ],
+            req.__("Create tag")
+          ),
+        ],
+      },
     });
   })
 );
@@ -124,18 +128,18 @@ router.get(
     const views = await tag.getViews();
     await setTableRefs(views);
     const pages = await tag.getPages();
-    const trigger = await tag.getTrigger();
+    const triggers = await tag.getTriggers();
     const roles = await User.get_roles();
 
     const tablesDomId = "tablesListId";
     const viewsDomId = "viewsListId";
     const pagesDomId = "pagesDomId";
-    const triggerDomId = "triggerDomId";
+    const triggersDomId = "triggerDomId";
     res.sendWrap(req.__("%s Tag", tag.name), {
       above: [
         {
           type: "breadcrumbs",
-          crumbs: [{ text: `Tag: ${tag.name}` }],
+          crumbs: [{ text: req.__(`Tag: %s`, tag.name) }],
         },
         {
           type: "card",
@@ -207,19 +211,19 @@ router.get(
           type: "card",
           bodyId: "collapseTriggerCard",
           title: headerWithCollapser(
-            req.__("Trigger"),
-            triggerDomId,
-            isShowList(show_list, "trigger")
+            req.__("Triggers"),
+            triggersDomId,
+            isShowList(show_list, "triggers")
           ),
           contents: [
-            getTriggerList(trigger, req, {
+            getTriggerList(triggers, req, {
               tagId: tag.id,
-              domId: triggerDomId,
-              showList: isShowList(show_list, "trigger"),
+              domId: triggersDomId,
+              showList: isShowList(show_list, "triggers"),
             }),
             a(
               {
-                href: `/tag-entries/add/trigger/${tag.id}`,
+                href: `/tag-entries/add/triggers/${tag.id}`,
                 class: "btn btn-primary",
               },
               req.__("Add triggers")

package/routes/tenant.js

@@ -8,13 +8,14 @@
 const Router = require("express-promise-router");
 const Form = require("@saltcorn/data/models/form");
 const { getState, add_tenant } = require("@saltcorn/data/db/state");
-const { create_tenant } = require("@saltcorn/admin-models/models/tenant");
 const {
+  create_tenant,
   getAllTenants,
   domain_sanitize,
   deleteTenant,
   switchToTenant,
   insertTenant,
+  Tenant,
 } = require("@saltcorn/admin-models/models/tenant");
 const {
   renderForm,
@@ -24,7 +25,6 @@ const {
 } = require("@saltcorn/markup");
 const {
   div,
-  nbsp,
   p,
   a,
   h4,
@@ -87,6 +87,11 @@ const tenant_form = (req) =>
         input_type: "text",
         postText: text(req.hostname),
       },
+      {
+        name: "description",
+        label: req.__("Description"),
+        input_type: "text",
+      },
     ],
   });
 
@@ -148,37 +153,49 @@ 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 = "";
-    // todo add custom create tenant  warning message
-    if (getState().getConfig("create_tenant_warning"))
-      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.__(
-            "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>'
-          )
-        )
-      );
+    let create_tenant_warning_text = "";
+    if (getState().getConfig("create_tenant_warning")) {
+        create_tenant_warning_text = getState().getConfig("create_tenant_warning_text");
+        if (create_tenant_warning_text && create_tenant_warning_text.length > 0)
+            create_tenant_warning_text = div(
+                {
+                    class: "alert alert-warning alert-dismissible fade show mt-5",
+                    role: "alert",
+                },
+                h4(req.__("Warning")),
+                p( create_tenant_warning_text
+                )
+            );
+        else
+            create_tenant_warning_text = 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.__(
+                        "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>'
+                    )
+                )
+            );
+    }
 
     res.sendWrap(
       req.__("Create application"),
-      create_tenant_warning +
+      create_tenant_warning_text +
       renderForm(tenant_form(req), req.csrfToken()) +
       p(
         { class: "mt-2" },
@@ -246,6 +263,8 @@ router.post(
     else {
       // normalize domain name
       const subdomain = domain_sanitize(valres.success.subdomain);
+      // get description
+      const description = valres.success.description;
       // get list of tenants
       const allTens = await getAllTenants();
       if (allTens.includes(subdomain) || !subdomain) {
@@ -258,9 +277,15 @@ router.post(
           renderForm(form, req.csrfToken())
         );
       } else {
+        // tenant url
         const newurl = getNewURL(req, subdomain);
+        // tenant template
         const tenant_template = getState().getConfig("tenant_template");
-        await switchToTenant(await insertTenant(subdomain), newurl);
+        // tenant creator
+        const user_email = req.user && req.user.email;
+        // switch to tenant
+        await switchToTenant(await insertTenant(subdomain, user_email, description, tenant_template), newurl);
+        // add tenant to global state
         add_tenant(subdomain);
         await create_tenant({
           t: subdomain,
@@ -348,6 +373,15 @@ router.get(
               {
                 label: req.__("Description"),
                 key: (r) => text(r.description),
+                //blurb: req.__("Specify some description for tenant if need"),
+              },
+              {
+                label: req.__("Creator email"),
+                key: (r) => text(r.email),
+              },
+              {
+                label: req.__("Created"),
+                key: (r) => text(r.created),
               },
               {
                 label: req.__("Information"),
@@ -387,6 +421,7 @@ const tenant_settings_form = (req) =>
     field_names: [
       "role_to_create_tenant",
       "create_tenant_warning",
+      "create_tenant_warning_text",
       "tenant_template",
     ],
     action: "/tenant/settings",
@@ -468,8 +503,19 @@ router.post(
 const get_tenant_info = async (subdomain) => {
   const saneDomain = domain_sanitize(subdomain);
 
+  let info = {};
+
+  // get tenant row
+  const ten = await Tenant.findOne({ subdomain: saneDomain });
+  if (ten) {
+      info.description = ten.description;
+      info.created = ten.created;
+  }
+
+
+  // get data from tenant schema
   return await db.runWithTenant(saneDomain, async () => {
-    let info = {};
+
     // TBD fix the first user issue because not always firt user by id is creator of tenant
     const firstUser = await User.find({}, { orderBy: "id", limit: 1 });
     if (firstUser && firstUser.length > 0) {
@@ -497,7 +543,11 @@ const get_tenant_info = async (subdomain) => {
     info.nconfigs = await db.count("_sc_config");
     // plugins count
     info.nplugins = await db.count("_sc_plugins");
-    // TBD decide Do we need count tenants, table constraints, migrations
+    // migration count
+    info.nmigrations = await db.count("_sc_migrations");
+    // library count
+    info.nlibrary = await db.count("_sc_library");
+    // TBD decide Do we need count tenants, table constraints
     // base url
     info.base_url = await getConfig("base_url");
     return info;
@@ -525,6 +575,7 @@ router.get(
       return;
     }
     const { subdomain } = req.params;
+    // get tenant info
     const info = await get_tenant_info(subdomain);
     // get list of files
     let files;
@@ -545,7 +596,7 @@ router.get(
             contents: [
               table(
                 tr(
-                  th(req.__("E-mail")),
+                  th(req.__("First user E-mail")),
                   td(
                     a(
                       { href: "mailto:" + info.first_user_email },
@@ -616,8 +667,13 @@ router.get(
                       label: req.__("Base URL"),
                       type: "String",
                     },
+                    {
+                      name: "description",
+                      label: req.__("Description"),
+                      type: "String",
+                    },
                   ],
-                  values: { base_url: info.base_url },
+                  values: { base_url: info.base_url, description: info.description },
                 }),
                 req.csrfToken()
               ),
@@ -673,6 +729,12 @@ router.post(
     const { base_url } = req.body;
     const saneDomain = domain_sanitize(subdomain);
 
+    // save description
+    const { description } = req.body;
+    await Tenant.update( saneDomain, {description: description});
+
+
+
     await db.runWithTenant(saneDomain, async () => {
       await getState().setConfig("base_url", base_url);
     });
@@ -701,7 +763,7 @@ router.post(
       return;
     }
     const { sub } = req.params;
-
+    // todo warning before deletion
     await deleteTenant(sub);
     res.redirect(`/tenant/list`);
   })

package/routes/utils.js

@@ -20,6 +20,8 @@ const { validateHeaderName, validateHeaderValue } = require("http");
 const Crash = require("@saltcorn/data/models/crash");
 
 /**
+ * Checks that user logged or not.
+ * If not shows than shows flash and redirects to login
  * @param {object} req
  * @param {object} res
  * @param {function} next
@@ -35,6 +37,8 @@ function loggedIn(req, res, next) {
 }
 
 /**
+ * Checks that user has admin role or not.
+ * If user hasn't admin role shows flash and redirects user to login or totp
  * @param {object} req
  * @param {object} res
  * @param {function} next
@@ -60,6 +64,7 @@ function isAdmin(req, res, next) {
 }
 
 /**
+ * Sets language for HTTP Request / HTTP Responce
  * @param {object} req
  * @param {object} res
  * @param {string} state
@@ -73,6 +78,7 @@ const setLanguage = (req, res, state) => {
 };
 
 /**
+ * Sets Custom HTTP headers using data from "custom_http_headers" config variable
  * @param {object} res
  * @param {string} state
  * @returns {void}
@@ -96,6 +102,7 @@ const set_custom_http_headers = (res, state) => {
 };
 
 /**
+ * Tries to recognize tenant from HTTP Request
  * @param {object} req
  * @returns {string}
  */
@@ -113,37 +120,62 @@ const get_tenant_from_req = (req) => {
 };
 
 /**
+ * middleware to extract the tenant domain and call runWithtenant()
  * @param {object} req
  * @param {object} res
  * @param {function} next
  */
 const setTenant = (req, res, next) => {
   if (db.is_it_multi_tenant()) {
-    const other_domain = get_other_domain_tenant(req.hostname);
-    if (other_domain) {
-      const state = getTenant(other_domain);
-      if (!state) {
-        setLanguage(req, res);
-        next();
-      } else {
-        db.runWithTenant(other_domain, () => {
-          setLanguage(req, res, state);
-          state.log(5, `${req.method} ${req.originalUrl}`);
+    // for a saltcorn mobile request use 'req.user.tenant'
+    if (req.smr) {
+      if (
+        req.user?.tenant &&
+        req.user.tenant !== db.connectObj.default_schema
+      ) {
+        const state = getTenant(req.user.tenant);
+        if (!state) {
+          setLanguage(req, res);
           next();
-        });
+        } else {
+          db.runWithTenant(req.user.tenant, () => {
+            setLanguage(req, res, state);
+            state.log(5, `${req.method} ${req.originalUrl}`);
+            next();
+          });
+        }
       }
-    } else {
-      const ten = get_tenant_from_req(req);
-      const state = getTenant(ten);
-      if (!state) {
+      else {
         setLanguage(req, res);
         next();
+      }
+    } else {
+      const other_domain = get_other_domain_tenant(req.hostname);
+      if (other_domain) {
+        const state = getTenant(other_domain);
+        if (!state) {
+          setLanguage(req, res);
+          next();
+        } else {
+          db.runWithTenant(other_domain, () => {
+            setLanguage(req, res, state);
+            state.log(5, `${req.method} ${req.originalUrl}`);
+            next();
+          });
+        }
       } else {
-        db.runWithTenant(ten, () => {
-          setLanguage(req, res, state);
-          state.log(5, `${req.method} ${req.originalUrl}`);
+        const ten = get_tenant_from_req(req);
+        const state = getTenant(ten);
+        if (!state) {
+          setLanguage(req, res);
           next();
-        });
+        } else {
+          db.runWithTenant(ten, () => {
+            setLanguage(req, res, state);
+            state.log(5, `${req.method} ${req.originalUrl}`);
+            next();
+          });
+        }
       }
     }
   } else {
@@ -154,6 +186,7 @@ const setTenant = (req, res, next) => {
 };
 
 /**
+ * Injects hidden input "_csrf" for CSRF token
  * @param {object} req
  * @returns {input}
  */
@@ -165,6 +198,7 @@ const csrfField = (req) =>
   });
 
 /**
+ * Errors catcher
  * @param {function} fn
  * @returns {function}
  */
@@ -173,6 +207,7 @@ const error_catcher = (fn) => (request, response, next) => {
 };
 
 /**
+ * Scans for page title from contents
  * @param {string|object} contents
  * @param {string} viewname
  * @returns {string}
@@ -193,11 +228,13 @@ const scan_for_page_title = (contents, viewname) => {
 };
 
 /**
+ * Gets gir revision
  * @returns {string}
  */
 const getGitRevision = () => db.connectObj.git_commit;
 
 /**
+ * Gets session store
  * @returns {session|cookieSession}
  */
 const getSessionStore = () => {
@@ -232,6 +269,20 @@ const getSessionStore = () => {
   }
 };
 
+/**
+ * appends 'req.query.on_done_redirect' to 'oldPath' if it exists
+ * @param {string} oldPath path without 'on_done_redirect'
+ * @param {any} req express request
+ * @returns a new string with or without on_done_redirect=...
+ */
+const addOnDoneRedirect = (oldPath, req) => {
+  const separator = oldPath.indexOf("?") > -1 ? "&" : "?";
+  if (req.query.on_done_redirect) {
+    return `${oldPath}${separator}on_done_redirect=${req.query.on_done_redirect}`;
+  }
+  return oldPath;
+};
+
 module.exports = {
   sqlsanitize,
   csrfField,
@@ -243,5 +294,6 @@ module.exports = {
   getGitRevision,
   getSessionStore,
   setTenant,
-  get_tenant_from_req
+  get_tenant_from_req,
+  addOnDoneRedirect,
 };

package/routes/view.js

@@ -8,7 +8,6 @@ const Router = require("express-promise-router");
 
 const View = require("@saltcorn/data/models/view");
 const Table = require("@saltcorn/data/models/table");
-const Page = require("@saltcorn/data/models/page");
 
 const { div, text, i, a } = require("@saltcorn/markup/tags");
 const { renderForm, link } = require("@saltcorn/markup");