@saltcorn/server 0.7.3-beta.7 → 0.7.4-beta.1

package/routes/tables.js

@@ -83,38 +83,38 @@ const tableForm = async (table, req) => {
     .map((f) => ({ value: f.id, label: f.name }));
   const form = new Form({
     action: "/table",
-    submitButtonClass: "btn-outline-primary",
-    onChange: "remove_outline(this)",
+    noSubmitButton: true,
+    onChange: "saveAndContinue(this)",
     fields: [
       ...(!table.external
         ? [
-            {
-              label: req.__("Ownership field"),
-              name: "ownership_field_id",
-              sublabel: req.__(
-                "The user referred to in this field will be the owner of the row"
-              ),
-              input_type: "select",
-              options: [
-                { value: "", label: req.__("None") },
-                ...userFields,
-                { value: "_formula", label: req.__("Formula") },
-              ],
-            },
-            {
-              name: "ownership_formula",
-              label: req.__("Ownership formula"),
-              validator: expressionValidator,
-              type: "String",
-              class: "validate-expression",
-              sublabel:
-                req.__("User is treated as owner if true. In scope: ") +
-                ["user", ...fields.map((f) => f.name)]
-                  .map((fn) => code(fn))
-                  .join(", "),
-              showIf: { ownership_field_id: "_formula" },
-            },
-          ]
+          {
+            label: req.__("Ownership field"),
+            name: "ownership_field_id",
+            sublabel: req.__(
+              "The user referred to in this field will be the owner of the row"
+            ),
+            input_type: "select",
+            options: [
+              { value: "", label: req.__("None") },
+              ...userFields,
+              { value: "_formula", label: req.__("Formula") },
+            ],
+          },
+          {
+            name: "ownership_formula",
+            label: req.__("Ownership formula"),
+            validator: expressionValidator,
+            type: "String",
+            class: "validate-expression",
+            sublabel:
+              req.__("User is treated as owner if true. In scope: ") +
+              ["user", ...fields.map((f) => f.name)]
+                .map((fn) => code(fn))
+                .join(", "),
+            showIf: { ownership_field_id: "_formula" },
+          },
+        ]
         : []),
       // description of table
       {
@@ -138,24 +138,24 @@ const tableForm = async (table, req) => {
       ...(table.external
         ? []
         : [
-            {
-              label: req.__("Minimum role to write"),
-              name: "min_role_write",
-              input_type: "select",
-              sublabel: req.__(
-                "User must have this role or higher to edit or create new rows in the table"
-              ),
-              options: roleOptions,
-            },
-            {
-              label: req.__("Version history"),
-              sublabel: req.__(
-                "Version history allows to track table data changes"
-              ),
-              name: "versioned",
-              type: "Bool",
-            },
-          ]),
+          {
+            label: req.__("Minimum role to write"),
+            name: "min_role_write",
+            input_type: "select",
+            sublabel: req.__(
+              "User must have this role or higher to edit or create new rows in the table"
+            ),
+            options: roleOptions,
+          },
+          {
+            label: req.__("Version history"),
+            sublabel: req.__(
+              "Version history allows to track table data changes"
+            ),
+            name: "versioned",
+            type: "Bool",
+          },
+        ]),
     ],
   });
   if (table) {
@@ -222,11 +222,11 @@ const discoverForm = (tables, req) => {
     blurb:
       tables.length > 0
         ? req.__(
-            "The following tables in your database can be imported into Saltcorn:"
-          )
+          "The following tables in your database can be imported into Saltcorn:"
+        )
         : req.__(
-            "There are no tables in the database that can be imported into Saltcorn."
-          ),
+          "There are no tables in the database that can be imported into Saltcorn."
+        ),
     submitLabel: req.__("Import"),
     fields: tables.map((t) => ({
       name: t.table_name,
@@ -579,11 +579,11 @@ router.get(
             key: (r) =>
               r.type === "Key"
                 ? `Key to ` +
-                  a({ href: `/table/${r.reftable_name}` }, r.reftable_name)
+                a({ href: `/table/${r.reftable_name}` }, r.reftable_name)
                 : (r.type && r.type.name) ||
-                  r.type ||
-                  r.typename +
-                    span({ class: "badge bg-danger ms-1" }, "Unknown type"),
+                r.type ||
+                r.typename +
+                span({ class: "badge bg-danger ms-1" }, "Unknown type"),
           },
           {
             label: "",
@@ -597,23 +597,23 @@ router.get(
           ...(table.external
             ? []
             : [
-                {
-                  label: req.__("Edit"),
-                  key: (r) => link(`/field/${r.id}`, req.__("Edit")),
-                },
-              ]),
+              {
+                label: req.__("Edit"),
+                key: (r) => link(`/field/${r.id}`, req.__("Edit")),
+              },
+            ]),
           ...(table.external || db.isSQLite
             ? []
             : [
-                {
-                  label: req.__("Delete"),
-                  key: (r) =>
-                    (table.name === "users" && r.name === "email") ||
+              {
+                label: req.__("Delete"),
+                key: (r) =>
+                  (table.name === "users" && r.name === "email") ||
                     r.primary_key
-                      ? ""
-                      : post_delete_btn(`/field/delete/${r.id}`, req, r.name),
-                },
-              ]),
+                    ? ""
+                    : post_delete_btn(`/field/delete/${r.id}`, req, r.name),
+              },
+            ]),
         ],
         fields,
         { hover: true }
@@ -622,17 +622,17 @@ router.get(
         tableHtml,
         inbound_refs.length > 0
           ? req.__("Inbound keys: ") +
-            inbound_refs.map((tnm) => link(`/table/${tnm}`, tnm)).join(", ") +
-            "<br>"
+          inbound_refs.map((tnm) => link(`/table/${tnm}`, tnm)).join(", ") +
+          "<br>"
           : "",
         !table.external &&
-          a(
-            {
-              href: `/field/new/${table.id}`,
-              class: "btn btn-primary add-field mt-2",
-            },
-            req.__("Add field")
-          ),
+        a(
+          {
+            href: `/field/new/${table.id}`,
+            class: "btn btn-primary add-field mt-2",
+          },
+          req.__("Add field")
+        ),
       ];
     }
     var viewCard;
@@ -645,7 +645,7 @@ router.get(
         viewCardContents = mkTable(
           [
             { label: req.__("Name"), key: "name" },
-            { label: req.__("Template"), key: "viewtemplate" },
+            { label: req.__("Pattern"), key: "viewtemplate" },
             {
               label: req.__("Run"),
               key: (r) =>
@@ -704,8 +704,8 @@ router.get(
               table.name === "users"
                 ? `/useradmin/`
                 : fields.length === 1
-                ? `javascript:;` // Fix problem with edition of table with only one column ID / Primary Key
-                : `/list/${table.name}`,
+                  ? `javascript:;` // Fix problem with edition of table with only one column ID / Primary Key
+                  : `/list/${table.name}`,
           },
           i({ class: "fas fa-2x fa-edit" }),
           "<br/>",
@@ -725,74 +725,74 @@ router.get(
         )
       ),
       !table.external &&
-        div(
-          { class: "mx-auto" },
-          form(
-            {
-              method: "post",
-              action: `/table/upload_to_table/${table.name}`,
-              encType: "multipart/form-data",
-            },
-            input({ type: "hidden", name: "_csrf", value: req.csrfToken() }),
-            label(
-              { class: "btn-link", for: "upload_to_table" },
-              i({ class: "fas fa-2x fa-upload" }),
-              "<br/>",
-              req.__("Upload CSV")
-            ),
-            input({
-              id: "upload_to_table",
-              name: "file",
-              type: "file",
-              accept: "text/csv,.csv",
-              onchange: "this.form.submit();",
-            })
-          )
-        ),
+      div(
+        { class: "mx-auto" },
+        form(
+          {
+            method: "post",
+            action: `/table/upload_to_table/${table.name}`,
+            encType: "multipart/form-data",
+          },
+          input({ type: "hidden", name: "_csrf", value: req.csrfToken() }),
+          label(
+            { class: "btn-link", for: "upload_to_table" },
+            i({ class: "fas fa-2x fa-upload" }),
+            "<br/>",
+            req.__("Upload CSV")
+          ),
+          input({
+            id: "upload_to_table",
+            name: "file",
+            type: "file",
+            accept: "text/csv,.csv",
+            onchange: "this.form.submit();",
+          })
+        )
+      ),
       // only if table is not external
       !table.external &&
-        div(
-          { class: "mx-auto" },
-          settingsDropdown(`dataMenuButton`, [
-            a(
-              {
-                class: "dropdown-item",
-                href: `/table/constraints/${table.id}`,
-              },
-              '<i class="fas fa-ban"></i>&nbsp;' + req.__("Constraints")
-            ),
-            // rename table doesnt supported for sqlite
-            !db.isSQLite &&
-              table.name !== "users" &&
-              a(
-                {
-                  class: "dropdown-item",
-                  href: `/table/rename/${table.id}`,
-                },
-                '<i class="fas fa-edit"></i>&nbsp;' + req.__("Rename table")
-              ),
-            post_dropdown_item(
-              `/table/recalc-stored/${table.name}`,
-              '<i class="fas fa-sync"></i>&nbsp;' +
-                req.__("Recalculate stored fields"),
-              req
-            ),
-            post_dropdown_item(
-              `/table/delete-all-rows/${table.name}`,
-              '<i class="far fa-trash-alt"></i>&nbsp;' +
-                req.__("Delete all rows"),
-              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
-              ),
-          ])
-        )
+      div(
+        { class: "mx-auto" },
+        settingsDropdown(`dataMenuButton`, [
+          a(
+            {
+              class: "dropdown-item",
+              href: `/table/constraints/${table.id}`,
+            },
+            '<i class="fas fa-ban"></i>&nbsp;' + req.__("Constraints")
+          ),
+          // rename table doesnt supported for sqlite
+          !db.isSQLite &&
+          table.name !== "users" &&
+          a(
+            {
+              class: "dropdown-item",
+              href: `/table/rename/${table.id}`,
+            },
+            '<i class="fas fa-edit"></i>&nbsp;' + req.__("Rename table")
+          ),
+          post_dropdown_item(
+            `/table/recalc-stored/${table.name}`,
+            '<i class="fas fa-sync"></i>&nbsp;' +
+            req.__("Recalculate stored fields"),
+            req
+          ),
+          post_dropdown_item(
+            `/table/delete-all-rows/${table.name}`,
+            '<i class="far fa-trash-alt"></i>&nbsp;' +
+            req.__("Delete all rows"),
+            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
+          ),
+        ])
+      )
     );
     // add table form
     if (table.ownership_formula && !table.ownership_field_id)
@@ -815,12 +815,12 @@ router.get(
         },
         ...(fields.length > 0
           ? [
-              {
-                type: "card",
-                title: req.__("Table data"),
-                contents: dataCard,
-              },
-            ]
+            {
+              type: "card",
+              title: req.__("Table data"),
+              contents: dataCard,
+            },
+          ]
           : []),
         ...(viewCard ? [viewCard] : []),
         {
@@ -910,7 +910,8 @@ router.post(
         );
       else if (!hasError) req.flash("success", req.__("Table saved"));
 
-      res.redirect(`/table/${id}`);
+      if (!req.xhr) res.redirect(`/table/${id}`);
+      else res.json({ success: "ok" });
     }
   })
 );
@@ -1013,39 +1014,39 @@ router.get(
     const mainCard =
       rows.length > 0
         ? mkTable(
-            [
-              {
-                label: req.__("Name"),
-                key: (r) => link(`/table/${r.id || r.name}`, text(r.name)),
-              },
-              {
-                label: "",
-                key: (r) => tableBadges(r, req),
-              },
-              {
-                label: req.__("Access Read/Write"),
-                key: (t) =>
-                  t.external
-                    ? `${getRole(t.min_role_read)} (read only)`
-                    : `${getRole(t.min_role_read)}/${getRole(
-                        t.min_role_write
-                      )}`,
-              },
-              {
-                label: req.__("Delete"),
-                key: (r) =>
-                  r.name === "users" || r.external
-                    ? ""
-                    : post_delete_btn(`/table/delete/${r.id}`, req, r.name),
-              },
-            ],
-            rows,
-            { hover: true }
-          )
+          [
+            {
+              label: req.__("Name"),
+              key: (r) => link(`/table/${r.id || r.name}`, text(r.name)),
+            },
+            {
+              label: "",
+              key: (r) => tableBadges(r, req),
+            },
+            {
+              label: req.__("Access Read/Write"),
+              key: (t) =>
+                t.external
+                  ? `${getRole(t.min_role_read)} (read only)`
+                  : `${getRole(t.min_role_read)}/${getRole(
+                    t.min_role_write
+                  )}`,
+            },
+            {
+              label: req.__("Delete"),
+              key: (r) =>
+                r.name === "users" || r.external
+                  ? ""
+                  : post_delete_btn(`/table/delete/${r.id}`, req, r.name),
+            },
+          ],
+          rows,
+          { hover: true }
+        )
         : div(
-            h4(req.__("No tables defined")),
-            p(req.__("Tables hold collections of similar data"))
-          );
+          h4(req.__("No tables defined")),
+          p(req.__("Tables hold collections of similar data"))
+        );
     const createCard = div(
       h5(req.__("Create table")),
       a(
@@ -1062,11 +1063,11 @@ router.get(
         req.__("Create from CSV upload")
       ),
       !db.isSQLite &&
-        a(
-          { href: `/table/discover`, class: "btn btn-secondary mt-1" },
-          i({ class: "fas fa-map-signs me-1" }),
-          req.__("Discover tables")
-        )
+      a(
+        { href: `/table/discover`, class: "btn btn-secondary mt-1" },
+        i({ class: "fas fa-map-signs me-1" }),
+        req.__("Discover tables")
+      )
     );
     res.sendWrap(req.__("Tables"), {
       above: [

package/routes/tenant.js

@@ -161,32 +161,32 @@ router.get(
           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>'
-            )
+          " " +
+          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 +
-        renderForm(tenant_form(req), req.csrfToken()) +
-        p(
-          { class: "mt-2" },
-          req.__("To login to a previously created application, go to: "),
-          code(`${req.protocol}://`) +
-            i(req.__("Application name")) +
-            code("." + req.hostname)
-        )
+      renderForm(tenant_form(req), req.csrfToken()) +
+      p(
+        { class: "mt-2" },
+        req.__("To login to a previously created application, go to: "),
+        code(`${req.protocol}://`) +
+        i(req.__("Application name")) +
+        code("." + req.hostname)
+      )
     );
   })
 );
@@ -294,13 +294,13 @@ router.post(
                 " " +
                 hasTemplate
                 ? req.__(
-                    'Use this link: <a href="%s">%s</a> to revisit your application at any time.',
-                    newurl,
-                    newurl
-                  )
+                  '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."
-                  )
+                  "Use this link to revisit your application at any time."
+                )
             )
           )
         );
@@ -452,8 +452,10 @@ router.post(
     } else {
       await save_config_from_form(form);
 
-      req.flash("success", req.__("Tenant settings updated"));
-      res.redirect("/tenant/settings");
+      if (!req.xhr) {
+        req.flash("success", req.__("Tenant settings updated"));
+        res.redirect("/tenant/settings");
+      } else res.json({ success: "ok" });
     }
   })
 );
@@ -584,7 +586,7 @@ router.get(
                   td(a({ href: info.base_url + "actions" }, info.nactions))
                 ),
                 tr(
-                  th(req.__("Plugins")),
+                  th(req.__("Modules")),
                   td(a({ href: info.base_url + "plugins" }, info.nplugins))
                 ),
                 tr(

package/routes/utils.js

@@ -128,6 +128,7 @@ const setTenant = (req, res, next) => {
       } else {
         db.runWithTenant(other_domain, () => {
           setLanguage(req, res, state);
+          state.log(5, `${req.method} ${req.originalUrl}`);
           next();
         });
       }
@@ -140,12 +141,14 @@ const setTenant = (req, res, next) => {
       } else {
         db.runWithTenant(ten, () => {
           setLanguage(req, res, state);
+          state.log(5, `${req.method} ${req.originalUrl}`);
           next();
         });
       }
     }
   } else {
     setLanguage(req, res);
+    getState().log(5, `${req.method} ${req.originalUrl}`);
     next();
   }
 };
@@ -240,4 +243,5 @@ module.exports = {
   getGitRevision,
   getSessionStore,
   setTenant,
+  get_tenant_from_req
 };