@saltcorn/server 0.6.4-beta.6 → 0.7.0-beta.1

package/public/saltcorn.css

@@ -220,3 +220,7 @@ footer.bs-mobile-nav-footer {
 .welcome-page-entity-list {
   min-height: 35vh;
 }
+
+.form-group {
+  margin-bottom: 1rem;
+}

package/public/saltcorn.js

@@ -30,16 +30,20 @@ function add_repeater(nm) {
 function apply_showif() {
   $("[data-show-if]").each(function (ix, element) {
     var e = $(element);
-    var to_show = new Function(
-      "e",
-      "return " + decodeURIComponent(e.attr("data-show-if"))
-    );
-    if (to_show(e))
-      e.show()
-        .find("input, textarea, button, select")
-        .prop("disabled", e.attr("data-disabled") || false);
-    else
-      e.hide().find("input, textarea, button, select").prop("disabled", true);
+    try {
+      var to_show = new Function(
+        "e",
+        "return " + decodeURIComponent(e.attr("data-show-if"))
+      );
+      if (to_show(e))
+        e.show()
+          .find("input, textarea, button, select")
+          .prop("disabled", e.attr("data-disabled") || false);
+      else
+        e.hide().find("input, textarea, button, select").prop("disabled", true);
+    } catch (e) {
+      console.error(e);
+    }
   });
   $("[data-calc-options]").each(function (ix, element) {
     var e = $(element);
@@ -55,8 +59,19 @@ function apply_showif() {
     //console.log(val, options, current,data)
     e.empty();
     (options || []).forEach((o) => {
-      if (current === o) e.append($("<option selected>" + o + "</option>"));
-      else e.append($("<option>" + o + "</option>"));
+      if (!(o && o.label && o.value)) {
+        if (`${current}` === `${o}`)
+          e.append($("<option selected>" + o + "</option>"));
+        else e.append($("<option>" + o + "</option>"));
+      } else {
+        e.append(
+          $(
+            `<option ${
+              `${current}` === `${o.value}` ? "selected" : ""
+            } value="${o.value}">${o.label}</option>`
+          )
+        );
+      }
     });
     e.change(function (ec) {
       e.attr("data-selected", ec.target.value);
@@ -76,12 +91,14 @@ function apply_showif() {
     });
   });
 }
-function get_form_record(e) {
+function get_form_record(e, select_labels) {
   const rec = {};
   e.closest("form")
     .find("input[name],select[name]")
     .each(function () {
-      rec[$(this).attr("name")] = $(this).val();
+      if (select_labels && $(this).prop("tagName").toLowerCase() === "select")
+        rec[$(this).attr("name")] = $(this).find("option:selected").text();
+      else rec[$(this).attr("name")] = $(this).val();
     });
   return rec;
 }
@@ -193,7 +210,7 @@ function initialize_page() {
     if ($(this).find(".editicon").length === 0) {
       var current = $(this).html();
       $(this).html(
-        `<span class="current">${current}</span><i class="editicon fas fa-edit ml-1"></i>`
+        `<span class="current">${current}</span><i class="editicon fas fa-edit ms-1"></i>`
       );
     }
   });
@@ -275,7 +292,7 @@ function initialize_page() {
     const options = parse(el.attr("locale-date-options"));
     el.text(date.toLocaleDateString(locale, options));
   });
-  $('a[data-toggle="tab"]').historyTabs();
+  $('a[data-bs-toggle="tab"].deeplink').historyTabs();
 }
 
 $(initialize_page);
@@ -423,8 +440,7 @@ function notifyAlert(note) {
   $("#alerts-area")
     .append(`<div class="alert alert-${type} alert-dismissible fade show" role="alert">
   ${txt}
-  <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-    <span aria-hidden="true">&times;</span>
+  <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close">
   </button>
 </div>`);
 }
@@ -499,8 +515,7 @@ function ajax_modal(url, opts = {}) {
       <div class="modal-content">
         <div class="modal-header">
           <h5 class="modal-title">Modal title</h5>
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-            <span aria-hidden="true">&times;</span>
+          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">            
           </button>
         </div>
         <div class="modal-body">
@@ -517,7 +532,7 @@ function ajax_modal(url, opts = {}) {
       var title = request.getResponseHeader("Page-Title");
       if (title) $("#scmodal .modal-title").html(decodeURIComponent(title));
       $("#scmodal .modal-body").html(res);
-      $("#scmodal").modal();
+      new bootstrap.Modal($("#scmodal")).show();
       initialize_page();
       (opts.onOpen || function () {})(res);
       $("#scmodal").on("hidden.bs.modal", function (e) {
@@ -624,11 +639,13 @@ function make_unique_field(
   id,
   table_id,
   field_name,
-  value,
+  elem,
   space,
   start,
-  always_append
+  always_append,
+  char_type
 ) {
+  const value = $(elem).val();
   if (!value) return;
   $.ajax(
     `/api/${table_id}?approximate=true&${encodeURIComponent(
@@ -638,12 +655,25 @@ function make_unique_field(
       type: "GET",
       success: function (res) {
         if (res.success) {
+          const gen_char = (i) => {
+            switch (char_type) {
+              case "Lowercase Letters":
+                return String.fromCharCode("a".charCodeAt(0) + i);
+                break;
+              case "Uppercase Letters":
+                return String.fromCharCode("A".charCodeAt(0) + i);
+                break;
+              default:
+                return i;
+                break;
+            }
+          };
           const vals = res.success
             .map((o) => o[field_name])
             .filter((s) => s.startsWith(value));
           if (vals.includes(value) || always_append) {
             for (let i = start || 0; i < vals.length + (start || 0) + 2; i++) {
-              const newname = `${value}${space ? " " : ""}${i}`;
+              const newname = `${value}${space ? " " : ""}${gen_char(i)}`;
               if (!vals.includes(newname)) {
                 $("#" + id).val(newname);
                 return;
@@ -721,6 +751,16 @@ function room_older(viewname, room_id, btn) {
   );
 }
 
+function fill_formula_btn_click(btn) {
+  const formula = decodeURIComponent($(btn).attr("data-formula"));
+  const rec = get_form_record($(btn), true);
+  const val = new Function(
+    `{${Object.keys(rec).join(",")}}`,
+    "return " + formula
+  )(rec);
+  $(btn).closest(".input-group").find("input").val(val);
+}
+
 /*
 https://github.com/jeffdavidgreen/bootstrap-html5-history-tabs/blob/master/bootstrap-history-tabs.js
 Copyright (c) 2015 Jeff Green

package/routes/actions.js

@@ -144,20 +144,18 @@ router.get(
             contents: table(
               tbody(
                 tr(
-                  td({ class: "pr-2" }, req.__("Actions available")),
+                  td({ class: "pe-2" }, req.__("Actions available")),
                   td(
                     actions
-                      .map((a) =>
-                        span({ class: "badge badge-primary" }, a.name)
-                      )
+                      .map((a) => span({ class: "badge bg-primary" }, a.name))
                       .join(" ")
                   )
                 ),
                 tr(
-                  td({ class: "pr-2" }, req.__("Event types")),
+                  td({ class: "pe-2" }, req.__("Event types")),
                   td(
                     Trigger.when_options
-                      .map((a) => span({ class: "badge badge-secondary" }, a))
+                      .map((a) => span({ class: "badge bg-secondary" }, a))
                       .join(" ")
                   )
                 )

package/routes/admin.js

@@ -46,7 +46,10 @@ const {
   get_process_init_time,
 } = require("@saltcorn/data/db/state");
 const { loadAllPlugins } = require("../load_plugins");
-const { create_backup, restore } = require("@saltcorn/admin-models/models/backup");
+const {
+  create_backup,
+  restore,
+} = require("@saltcorn/admin-models/models/backup");
 const fs = require("fs");
 const load_plugins = require("../load_plugins");
 const {
@@ -299,7 +302,7 @@ router.get(
                   post_btn("/admin/backup", req.__("Backup"), req.csrfToken())
                 )
               ),
-              td(p({ class: "ml-4 pt-2" }, req.__("Download a backup")))
+              td(p({ class: "ms-4 pt-2" }, req.__("Download a backup")))
             ),
             tr(td(div({ class: "my-4" }))),
             tr(
@@ -310,7 +313,7 @@ router.get(
                   req.__("Restore"),
                 ])
               ),
-              td(p({ class: "ml-4" }, req.__("Restore a backup")))
+              td(p({ class: "ms-4" }, req.__("Restore a backup")))
             )
           )
         ),
@@ -393,7 +396,7 @@ router.get(
                             )
                           : isRoot && is_latest
                           ? span(
-                              { class: "badge badge-primary ml-2" },
+                              { class: "badge bg-primary ms-2" },
                               req.__("Latest")
                             )
                           : "")

package/routes/eventlog.js

@@ -155,9 +155,9 @@ router.get(
           a(
             {
               href: "/eventlog/custom/new",
-              class: "btn btn-primary mt-1 mr-3",
+              class: "btn btn-primary mt-1 me-3",
             },
-            i({ class: "fas fa-plus-square mr-1" }),
+            i({ class: "fas fa-plus-square me-1" }),
             req.__("Create custom event")
           ),
       },

package/routes/homepage.js

@@ -50,17 +50,17 @@ const tableCard = (tables, req) => ({
   contents:
     (tables.length <= 1
       ? p(
-          { class: "mt-2 pr-2" },
+          { class: "mt-2 pe-2" },
           i(req.__("Tables organise data by fields and rows."))
         )
       : "") + tableTable(tables, req),
-  bodyClass: "py-0 pr-0",
+  bodyClass: "py-0 pe-0",
   footer: div(
     a({ href: `/table/new`, class: "btn btn-primary" }, req.__("Create table")),
     a(
       {
         href: `/table/create-from-csv`,
-        class: "btn btn-secondary ml-2",
+        class: "btn btn-secondary ms-2",
       },
       req.__("CSV upload")
     )
@@ -97,11 +97,11 @@ const viewCard = (views, req) => ({
   type: "card",
   title: link("/viewedit", req.__("Views")),
   class: "welcome-page-entity-list",
-  bodyClass: "py-0  pr-0",
+  bodyClass: "py-0  pe-0",
   contents:
     (views.length <= 1
       ? p(
-          { class: "mt-2 pr-2" },
+          { class: "mt-2 pe-2" },
           i(
             req.__(
               "Views display data from tables. A view is a view template applied to a table, with configuration."
@@ -152,7 +152,7 @@ const pageCard = (pages, req) => ({
   contents:
     (pages.length <= 1
       ? p(
-          { class: "mt-2 pr-2" },
+          { class: "mt-2 pe-2" },
           i(
             req.__(
               "Pages are the web pages of your application built with a drag-and-drop builder. They have static content, and by embedding views, dynamic content."
@@ -162,8 +162,8 @@ const pageCard = (pages, req) => ({
       : "") +
     (pages.length > 0
       ? pageTable(pages, req)
-      : div({ class: "mt-2 pr-2" }, p(req.__("No pages")))),
-  bodyClass: "py-0 pr-0",
+      : div({ class: "mt-2 pe-2" }, p(req.__("No pages")))),
+  bodyClass: "py-0 pe-0",
   footer: div(
     a(
       { href: `/pageedit/new`, class: "btn btn-primary" },
@@ -231,7 +231,7 @@ const actionsTab = async (req, triggers) => {
     { class: "pb-3" },
     triggers.length <= 1 &&
       p(
-        { class: "mt-2 pr-2" },
+        { class: "mt-2 pe-2" },
         i(req.__("Triggers run actions in response to events."))
       ),
     triggers.length == 0
@@ -262,7 +262,7 @@ const actionsTab = async (req, triggers) => {
 };
 const packTab = (req, packlist) =>
   div(
-    { class: "pb-3 pt-2 pr-4" },
+    { class: "pb-3 pt-2 pe-4" },
     p(req.__("Instead of building, get up and running in no time with packs")),
     p(
       { class: "font-italic" },
@@ -289,7 +289,7 @@ const packTab = (req, packlist) =>
 
 const helpCard = (req) =>
   div(
-    { class: "pb-3 pt-2 pr-4" },
+    { class: "pb-3 pt-2 pe-4" },
     p(req.__("Confused?")),
     p(
       req.__(
@@ -354,7 +354,7 @@ const welcome_page = async (req) => {
           {
             type: "card",
             //title: req.__("Install pack"),
-            bodyClass: "py-0 pr-0",
+            bodyClass: "py-0 pe-0",
             class: "welcome-page-entity-list",
 
             tabContents:
@@ -373,7 +373,7 @@ const welcome_page = async (req) => {
           {
             type: "card",
             //title: req.__("Learn"),
-            bodyClass: "py-0 pr-0",
+            bodyClass: "py-0 pe-0",
             class: "welcome-page-entity-list",
             tabContents:
               users.length > 4

package/routes/infoarch.js

@@ -124,7 +124,7 @@ router.get(
               href: "/site-structure/localizer/add-lang",
               class: "btn btn-primary mt-1",
             },
-            i({ class: "fas fa-plus-square mr-1" }),
+            i({ class: "fas fa-plus-square me-1" }),
             req.__("Add language")
           )
         ),

package/routes/list.js

@@ -264,6 +264,7 @@ router.get(
       width: 40,
       hozAlign: "center",
       headerSort: false,
+      clipboard: false,
       cellClick: "__delete_tabulator_row",
     });
     res.sendWrap(
@@ -305,24 +306,25 @@ router.get(
               { href: `/table/${table.id || table.name}`, text: table.name },
               { text: req.__("Data") },
             ],
-            right:
+            right: div(
+              { class: "d-flex" },
               button(
                 {
-                  class: "btn btn-sm btn-primary mr-2",
+                  class: "btn btn-sm btn-primary me-2",
                   onClick: "add_tabulator_row()",
                 },
-                i({ class: "fas fa-plus mr-1" }),
+                i({ class: "fas fa-plus me-1" }),
                 "Add row"
-              ) +
+              ),
               div(
-                { class: "dropdown d-inline" },
+                { class: "dropdown" },
                 button(
                   {
                     class: "btn btn-sm btn-outline-secondary dropdown-toggle",
                     "data-boundary": "viewport",
                     type: "button",
                     id: "btnHideCols",
-                    "data-toggle": "dropdown",
+                    "data-bs-toggle": "dropdown",
                     "aria-haspopup": "true",
                     "aria-expanded": "false",
                   },
@@ -330,7 +332,7 @@ router.get(
                 ),
                 div(
                   {
-                    class: "dropdown-menu",
+                    class: "dropdown-menu dropdown-menu-end",
                     "aria-labelledby": "btnHideCols",
                   },
                   form(
@@ -349,7 +351,8 @@ router.get(
                     )
                   )
                 )
-              ),
+              )
+            ),
           },
           {
             type: "blank",
@@ -374,6 +377,10 @@ router.get(
                   height:"100%",
                   pagination:true,
                   paginationSize:20,
+                  clipboard:true,
+                  persistence:true, 
+                  persistenceID:"table_tab_${table.name}",
+                  movableColumns: true,
                   initialSort:[
                     {column:"id", dir:"asc"},
                   ],

package/routes/menu.js

@@ -334,7 +334,7 @@ router.get(
           script: static_pre + "/iconset-fontawesome5-3-1.min.js",
         },
         {
-          script: static_pre + "/bootstrap-iconpicker.min.js",
+          script: static_pre + "/bootstrap-iconpicker.js",
         },
         {
           css: static_pre + "/bootstrap-iconpicker.min.css",

package/routes/pageedit.js

@@ -224,6 +224,7 @@ const pageBuilderData = async (req, context) => {
     roles,
     fixed_state_fields,
     next_button_label: "Done",
+    fonts: getState().fonts,
   };
 };
 

package/routes/plugins.js

@@ -209,7 +209,7 @@ const cfg_link = (req, row) => {
   if (plugin.configuration_workflow)
     return a(
       {
-        class: "btn btn-secondary btn-sm d-inline mr-1",
+        class: "btn btn-secondary btn-sm d-inline me-1",
         role: "button",
         href: `/plugins/configure/${encodeURIComponent(row.name)}`,
         title: req.__("Configure plugin"),
@@ -240,7 +240,7 @@ const info_link = (req, row) =>
  * @returns {span}
  */
 const badge = (title) =>
-  span({ class: "badge badge-secondary plugin-store" }, title);
+  span({ class: "badge bg-secondary plugin-store" }, title);
 
 /**
  *
@@ -427,7 +427,7 @@ const store_actions_dropdown = (req) =>
         class: "btn btn-outline-secondary",
         type: "button",
         id: "dropdownMenuButton",
-        "data-toggle": "dropdown",
+        "data-bs-toggle": "dropdown",
         "aria-haspopup": "true",
         "aria-expanded": "false",
       },
@@ -435,7 +435,7 @@ const store_actions_dropdown = (req) =>
     ),
     div(
       {
-        class: "dropdown-menu dropdown-menu-right",
+        class: "dropdown-menu dropdown-menu-end",
         "aria-labelledby": "dropdownMenuButton",
       },
       a(
@@ -501,13 +501,10 @@ const plugin_store_html = (items, req) => {
       {
         type: "card",
         contents: div(
-          { class: "d-flex" },
+          { class: "d-flex justify-content-between" },
           storeNavPills(req),
-          div(
-            { class: "ml-auto" },
-            search_bar("q", req.query.q || "", { stateField: "q" })
-          ),
-          div({ class: "ml-auto" }, store_actions_dropdown(req))
+          div(search_bar("q", req.query.q || "", { stateField: "q" })),
+          div(store_actions_dropdown(req))
         ),
       },
       {
@@ -602,6 +599,7 @@ router.post(
           refresh_plugin_cfg: plugin.name,
           tenant: db.getTenantSchema(),
         });
+      await sleep(500); // Allow other workers to reload this plugin
       res.redirect("/plugins");
     }
   })
@@ -736,7 +734,7 @@ router.get(
               ? a(
                   {
                     href: `/plugins/upgrade-plugin/${plugin_db.name}`,
-                    class: "btn btn-primary btn-sm ml-2",
+                    class: "btn btn-primary btn-sm ms-2",
                   },
                   req.__("Upgrade")
                 )
@@ -748,7 +746,7 @@ router.get(
               th(req.__("Plugin dependencies")),
               td(
                 mod.plugin_module.dependencies.map((d) =>
-                  span({ class: "badge badge-primary mr-1" }, d)
+                  span({ class: "badge bg-primary me-1" }, d)
                 )
               )
             )

package/routes/settings.js

@@ -31,7 +31,7 @@ const settingsCard = ({ title, icon, blurb, href }) => ({
   url: href,
   contents: {
     besides: [
-      i({ class: [icon, "fa-3x fa-fw mr-3"] }),
+      i({ class: [icon, "fa-3x fa-fw me-3"] }),
       a({ href }, h3(title)) + p(blurb),
     ],
     widths: false,

package/routes/tables.js

@@ -488,8 +488,7 @@ router.get(
  * @param {string} lbl
  * @returns {string}
  */
-const badge = (col, lbl) =>
-  `<span class="badge badge-${col}">${lbl}</span>&nbsp;`;
+const badge = (col, lbl) => `<span class="badge bg-${col}">${lbl}</span>&nbsp;`;
 
 /**
  * @param {object} f
@@ -578,7 +577,7 @@ router.get(
                 : (r.type && r.type.name) ||
                   r.type ||
                   r.typename +
-                    span({ class: "badge badge-danger ml-1" }, "Unknown type"),
+                    span({ class: "badge bg-danger ms-1" }, "Unknown type"),
           },
           {
             label: "",
@@ -1035,22 +1034,22 @@ router.get(
     const createCard = div(
       h5(req.__("Create table")),
       a(
-        { href: `/table/new`, class: "btn btn-primary mt-1 mr-3" },
-        i({ class: "fas fa-plus-square mr-1" }),
+        { href: `/table/new`, class: "btn btn-primary mt-1 me-3" },
+        i({ class: "fas fa-plus-square me-1" }),
         req.__("Create table")
       ),
       a(
         {
           href: `/table/create-from-csv`,
-          class: "btn btn-secondary mr-3 mt-1",
+          class: "btn btn-secondary me-3 mt-1",
         },
-        i({ class: "fas fa-upload mr-1" }),
+        i({ class: "fas fa-upload me-1" }),
         req.__("Create from CSV upload")
       ),
       !db.isSQLite &&
         a(
           { href: `/table/discover`, class: "btn btn-secondary mt-1" },
-          i({ class: "fas fa-map-signs mr-1" }),
+          i({ class: "fas fa-map-signs me-1" }),
           req.__("Discover tables")
         )
     );

package/routes/utils.js

@@ -100,7 +100,8 @@ const set_custom_http_headers = (res, state) => {
  * @returns {string}
  */
 const get_tenant_from_req = (req) => {
-  if (req.subdomains && req.subdomains.length > 0) return req.subdomains[0];
+  if (req.subdomains && req.subdomains.length > 0)
+    return req.subdomains[req.subdomains.length - 1];
 
   if (req.subdomains && req.subdomains.length == 0)
     return db.connectObj.default_schema;
@@ -121,8 +122,10 @@ const setTenant = (req, res, next) => {
     const other_domain = get_other_domain_tenant(req.hostname);
     if (other_domain) {
       const state = getTenant(other_domain);
-      if (!state) res.status(404).send(req.__("Subdomain not found"));
-      else {
+      if (!state) {
+        setLanguage(req, res);
+        next();
+      } else {
         db.runWithTenant(other_domain, () => {
           setLanguage(req, res, state);
           next();
@@ -130,10 +133,11 @@ const setTenant = (req, res, next) => {
       }
     } else {
       const ten = get_tenant_from_req(req);
-      //console.log("tenant", ten);
       const state = getTenant(ten);
-      if (!state) res.status(404).send(req.__("Subdomain not found"));
-      else {
+      if (!state) {
+        setLanguage(req, res);
+        next();
+      } else {
         db.runWithTenant(ten, () => {
           setLanguage(req, res, state);
           next();

package/tests/plugins.test.js

@@ -90,7 +90,7 @@ describe("Plugin Endpoints", () => {
       .expect(toInclude("testfilecontents"));
     await request(app)
       .get(
-        "/plugins/pubdeps/sbadmin2/startbootstrap-sb-admin-2/4.1.4/css/sb-admin-2.min.css"
+        "/plugins/pubdeps/sbadmin2/startbootstrap-sb-admin-2-bs5/4.1.5-beta.0/css/sb-admin-2.min.css"
       )
       .expect(toInclude("Start Bootstrap"));
 
@@ -98,6 +98,11 @@ describe("Plugin Endpoints", () => {
       .post("/plugins/delete/" + p.name)
       .set("Cookie", loginCookie)
       .expect(toRedirect("/plugins"));
+    await request(app)
+      .get(
+        "/plugins/pubdeps/sbadmin2/startbootstrap-sb-admin-2-bs5/4.1.5-beta.0/css/sb-admin-2.min.css"
+      )
+      .expect(toInclude("Start Bootstrap"));
   });
   it("should install named without config", async () => {
     const loginCookie = await getAdminLoginCookie();