@saltcorn/server 1.1.0-beta.1 → 1.1.0-beta.11

package/auth/roleadmin.js

@@ -56,7 +56,11 @@ const editRoleLayoutForm = (role, layouts, layout_by_role, req) => {
     },
     csrfField(req),
     select(
-      { name: "layout", onchange: "form.submit()" },
+      {
+        name: "layout",
+        onchange: "form.submit()",
+        class: "form-select form-select-sm w-unset d-inline",
+      },
       layouts.map((layout, ix) =>
         option(
           {
@@ -88,7 +92,11 @@ const editRole2FAPolicyForm = (role, twofa_policy_by_role, req) =>
     },
     csrfField(req),
     select(
-      { name: "policy", onchange: "form.submit()" },
+      {
+        name: "policy",
+        onchange: "form.submit()",
+        class: "form-select form-select-sm w-unset d-inline",
+      },
       ["Optional", "Disabled", "Mandatory"].map((p) =>
         option({ selected: twofa_policy_by_role[role.id] === p }, p)
       )

package/locales/en.json

@@ -1493,5 +1493,6 @@
 	"You must be logged in to share": "You must be logged in to share",
 	"Fluid layout": "Fluid layout",
 	"Request fluid layout from theme for a wider display for this page": "Request fluid layout from theme for a wider display for this page",
-	"Location of view to create new row": "Location of view to create new row"
+	"Location of view to create new row": "Location of view to create new row",
+	"Default locale": "Default locale"
 }

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.1.0-beta.1",
+  "version": "1.1.0-beta.11",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
     "@aws-sdk/client-s3": "^3.451.0",
-    "@saltcorn/base-plugin": "1.1.0-beta.1",
-    "@saltcorn/builder": "1.1.0-beta.1",
-    "@saltcorn/data": "1.1.0-beta.1",
-    "@saltcorn/admin-models": "1.1.0-beta.1",
-    "@saltcorn/filemanager": "1.1.0-beta.1",
-    "@saltcorn/markup": "1.1.0-beta.1",
-    "@saltcorn/plugins-loader": "1.1.0-beta.1",
-    "@saltcorn/sbadmin2": "1.1.0-beta.1",
+    "@saltcorn/base-plugin": "1.1.0-beta.11",
+    "@saltcorn/builder": "1.1.0-beta.11",
+    "@saltcorn/data": "1.1.0-beta.11",
+    "@saltcorn/admin-models": "1.1.0-beta.11",
+    "@saltcorn/filemanager": "1.1.0-beta.11",
+    "@saltcorn/markup": "1.1.0-beta.11",
+    "@saltcorn/plugins-loader": "1.1.0-beta.11",
+    "@saltcorn/sbadmin2": "1.1.0-beta.11",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/codemirror.css

@@ -348,3 +348,36 @@ div.CodeMirror-dragcursors {
 
 /* Help users use markselection to safely style text background */
 span.CodeMirror-selectedtext { background: none; }
+
+/* Port of TextMate's Blackboard theme */
+
+.cm-s-blackboard.CodeMirror { background: #0C1021; color: #F8F8F8; }
+.cm-s-blackboard div.CodeMirror-selected { background: #253B76; }
+.cm-s-blackboard .CodeMirror-line::selection, .cm-s-blackboard .CodeMirror-line > span::selection, .cm-s-blackboard .CodeMirror-line > span > span::selection { background: rgba(37, 59, 118, .99); }
+.cm-s-blackboard .CodeMirror-line::-moz-selection, .cm-s-blackboard .CodeMirror-line > span::-moz-selection, .cm-s-blackboard .CodeMirror-line > span > span::-moz-selection { background: rgba(37, 59, 118, .99); }
+.cm-s-blackboard .CodeMirror-gutters { background: #0C1021; border-right: 0; }
+.cm-s-blackboard .CodeMirror-guttermarker { color: #FBDE2D; }
+.cm-s-blackboard .CodeMirror-guttermarker-subtle { color: #888; }
+.cm-s-blackboard .CodeMirror-linenumber { color: #888; }
+.cm-s-blackboard .CodeMirror-cursor { border-left: 1px solid #A7A7A7; }
+
+.cm-s-blackboard .cm-keyword { color: #FBDE2D; }
+.cm-s-blackboard .cm-atom { color: #D8FA3C; }
+.cm-s-blackboard .cm-number { color: #D8FA3C; }
+.cm-s-blackboard .cm-def { color: #8DA6CE; }
+.cm-s-blackboard .cm-variable { color: #FF6400; }
+.cm-s-blackboard .cm-operator { color: #FBDE2D; }
+.cm-s-blackboard .cm-comment { color: #AEAEAE; }
+.cm-s-blackboard .cm-string { color: #61CE3C; }
+.cm-s-blackboard .cm-string-2 { color: #61CE3C; }
+.cm-s-blackboard .cm-meta { color: #D8FA3C; }
+.cm-s-blackboard .cm-builtin { color: #8DA6CE; }
+.cm-s-blackboard .cm-tag { color: #8DA6CE; }
+.cm-s-blackboard .cm-attribute { color: #8DA6CE; }
+.cm-s-blackboard .cm-header { color: #FF6400; }
+.cm-s-blackboard .cm-hr { color: #AEAEAE; }
+.cm-s-blackboard .cm-link { color: #8DA6CE; }
+.cm-s-blackboard .cm-error { background: #9D1E15; color: #F8F8F8; }
+
+.cm-s-blackboard .CodeMirror-activeline-background { background: #3C3636; }
+.cm-s-blackboard .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }

package/public/gridedit.js

@@ -28,7 +28,7 @@ function flatpickerEditor(cell, onRendered, success, cancel, editorParams) {
     enableTime: !dayOnly,
     dateFormat: dayOnly ? "Y-m-d" : "Z",
     time_24hr: true,
-    locale: "en", // global variable with locale 'en', 'fr', ...
+    locale: window._sc_locale || "en",
     defaultDate,
     onClose: function (selectedDates, dateStr, instance) {
       evt = window.event;

package/public/saltcorn-common.js

@@ -1064,11 +1064,12 @@ function initialize_page() {
         codes.forEach((el) => {
           //console.log($(el).attr("mode"), el);
           if ($(el).hasClass("codemirror-enabled")) return;
-
-          const cm = CodeMirror.fromTextArea(el, {
+          const cmOpts = {
             lineNumbers: true,
             mode: $(el).attr("mode"),
-          });
+          };
+          if (_sc_lightmode === "dark") cmOpts.theme = "blackboard";
+          const cm = CodeMirror.fromTextArea(el, cmOpts);
           $(el).addClass("codemirror-enabled");
           cm.on(
             "change",
@@ -1550,7 +1551,7 @@ async function common_done(res, viewnameOrElem, isWeb = true) {
     });
   }
   if (res.eval_js) await handle(res.eval_js, eval_it);
-  else if (res.goto) {
+  if (res.goto) {
     if (!isWeb) {
       const next = new URL(res.goto, "http://localhost");
       const pathname = next.pathname;

package/public/saltcorn.css

@@ -85,18 +85,15 @@ div[data-inline-edit-dest-url]:hover .editicon {
   border-left: none;
   border-color: #95a5a6;
   padding-left: 0.3rem;
-  background-color: #ffffff;
 }
 
 .search-bar input[type="search"] {
   border-color: #95a5a6;
   padding-left: 0.3rem;
-  background-color: #ffffff;
 }
 
 .search-bar button.search-bar {
   border-color: #95a5a6;
-  background-color: #ffffff;
   border-left: 1px solid #95a5a6 !important;
   border-top: 1px solid #95a5a6 !important;
   border-bottom: 1px solid #95a5a6 !important;
@@ -358,7 +355,7 @@ table.table-inner-grid td {
 }
 
 .w-unset {
-  width: unset;
+  width: unset !important;
 }
 
 .preview-text {

package/routes/admin.js

@@ -155,6 +155,7 @@ admin_config_route({
   field_names: [
     "site_name",
     "timezone",
+    "default_locale",
     "base_url",
     ...(getConfigFile() ? ["multitenancy_enabled"] : []),
     { section_header: "Logo image" },
@@ -534,6 +535,7 @@ router.get(
       {},
       { orderBy: "created", orderDesc: true, fields: ["id", "created", "hash"] }
     );
+    const locale = getState().getConfig("default_locale", "en");
     send_admin_page({
       res,
       req,
@@ -555,9 +557,11 @@ router.get(
                             )}`,
                             target: "_blank",
                           },
-                          `${localeDateTime(snap.created)} (${moment(
-                            snap.created
-                          ).fromNow()})`
+                          `${localeDateTime(
+                            snap.created,
+                            {},
+                            locale
+                          )} (${moment(snap.created).fromNow()})`
                         )
                       )
                     )
@@ -595,6 +599,7 @@ router.get(
   error_catcher(async (req, res) => {
     const { type, name } = req.params;
     const snaps = await Snapshot.entity_history(type, name);
+    const locale = getState().getConfig("default_locale", "en");
     res.set("Page-Title", `Restore ${text(name)}`);
     res.send(
       mkTable(
@@ -602,7 +607,9 @@ router.get(
           {
             label: req.__("When"),
             key: (r) =>
-              `${localeDateTime(r.created)} (${moment(r.created).fromNow()})`,
+              `${localeDateTime(r.created, {}, locale)} (${moment(
+                r.created
+              ).fromNow()})`,
           },
 
           {
@@ -1741,8 +1748,8 @@ router.post(
 
       let altname = await tenant_letsencrypt_name(subdomain);
 
-      if (!altname || domain) {
-        req.json({ error: "Set Base URL for both tenant and root first." });
+      if (!altname || !domain) {
+        res.json({ error: "Set Base URL for both tenant and root first." });
         return;
       }
 
@@ -1759,13 +1766,14 @@ router.post(
 
         await greenlock.sites.add({
           subject: altname,
+          altnames: [altname],
         });
         // letsencrypt
         const tenant_letsencrypt_sites = getState().getConfig(
           "tenant_letsencrypt_sites",
           []
         );
-        await getState().setConfig(tenant_letsencrypt_sites, [
+        await getState().setConfig("tenant_letsencrypt_sites", [
           altname,
           ...tenant_letsencrypt_sites,
         ]);
@@ -1775,12 +1783,10 @@ router.post(
           notify: "Certificate added, please restart server",
         });
       } catch (e) {
-        req.flash("error", e.message);
-        res.redirect("/useradmin/ssl");
+        res.json({ error: e.message });
       }
     } else {
-      req.flash("error", req.__("Not possible for tenant"));
-      res.redirect("/useradmin/ssl");
+      res.json({ error: req.__("Not possible for tenant") });
     }
   })
 );
@@ -1849,7 +1855,7 @@ router.post(
           "tenant_letsencrypt_sites",
           []
         );
-        await getState().setConfig(tenant_letsencrypt_sites, [
+        await getState().setConfig("tenant_letsencrypt_sites", [
           ...altnames,
           ...tenant_letsencrypt_sites,
         ]);

package/routes/eventlog.js

@@ -424,6 +424,7 @@ router.get(
   error_catcher(async (req, res) => {
     const { id } = req.params;
     const ev = await EventLog.findOneWithUser(id);
+    const locale = getState().getConfig("default_locale", "en");
     send_events_page({
       res,
       req,
@@ -435,7 +436,10 @@ router.get(
           table(
             { class: "table eventlog" },
             tbody(
-              tr(th(req.__("When")), td(localeDateTime(ev.occur_at))),
+              tr(
+                th(req.__("When")),
+                td(localeDateTime(ev.occur_at, {}, locale))
+              ),
               tr(th(req.__("Type")), td(ev.event_type)),
               tr(th(req.__("Channel")), td(ev.channel)),
               tr(th(req.__("User")), td(ev.email))

package/routes/homepage.js

@@ -549,7 +549,14 @@ const no_views_logged_in = async (req, res) => {
  * @returns {Promise<boolean>}
  */
 const get_config_response = async (role_id, res, req) => {
-  const wrap = async (contents, homeCfg, title, description, no_menu) => {
+  const wrap = async (
+    contents,
+    homeCfg,
+    title,
+    description,
+    no_menu,
+    requestFluidLayout
+  ) => {
     if (contents.html_file) await sendHtmlFile(req, res, contents.html_file);
     else
       res.sendWrap(
@@ -558,6 +565,7 @@ const get_config_response = async (role_id, res, req) => {
           description: description || "",
           bodyClass: "page_" + db.sqlsanitize(homeCfg),
           no_menu,
+          requestFluidLayout,
         },
         contents
       );
@@ -578,7 +586,8 @@ const get_config_response = async (role_id, res, req) => {
         homeCfg,
         db_page.title,
         db_page.description,
-        db_page.attributes?.no_menu
+        db_page.attributes?.no_menu,
+        db_page.attributes?.request_fluid_layout
       );
     else {
       const group = PageGroup.findOne({ name: homeCfg });
@@ -592,7 +601,8 @@ const get_config_response = async (role_id, res, req) => {
               homeCfg,
               eligible.title,
               eligible.description,
-              eligible.attributes?.no_menu
+              eligible.attributes?.no_menu,
+              eligible.attributes?.request_fluid_layout
             );
         } else wrap(req.__("%s has no eligible page", group.name), homeCfg);
       } else res.redirect(homeCfg);

package/routes/list.js

@@ -26,6 +26,7 @@ const {
 const Table = require("@saltcorn/data/models/table");
 const { isAdmin, error_catcher } = require("./utils");
 const moment = require("moment");
+const { getState } = require("@saltcorn/data/db/state");
 
 /**
  * @type {object}
@@ -270,6 +271,7 @@ router.get(
     res.sendWrap(
       {
         title: req.__(`%s data table`, table.name),
+        requestFluidLayout: true,
         headers: [
           //jsgrid - grid editor external component
           {
@@ -426,7 +428,13 @@ router.get(
               ),
               div({ id: "jsGridNotify" }),
 
-              div({ id: "jsGrid" })
+              div({
+                id: "jsGrid",
+                class:
+                  getState().getLightDarkMode(req.user) === "dark"
+                    ? "table-dark"
+                    : undefined,
+              })
             ),
           },
         ],

package/routes/tenant.js

@@ -58,6 +58,7 @@ const {
   save_config_from_form,
 } = require("../markup/admin.js");
 const { getConfig } = require("@saltcorn/data/models/config");
+const path = require("path");
 //const {quote} = require("@saltcorn/db-common");
 // todo add button backup / restore for particular tenant (available in admin tenants screens)
 //const {
@@ -318,7 +319,53 @@ router.post(
         if (hasTemplate) {
           new_url_create += "auth/create_first_user";
         }
-
+        const letsencrypt = getState().getConfig("letsencrypt", false);
+        if (letsencrypt) {
+          let altname = await tenant_letsencrypt_name(subdomain);
+          const tenant_letsencrypt_sites = getState().getConfig(
+            "tenant_letsencrypt_sites",
+            []
+          );
+          const has_cert = tenant_letsencrypt_sites.includes(altname);
+          if (!has_cert) {
+            const file_store = db.connectObj.file_store;
+            const admin_users = await User.find(
+              { role_id: 1 },
+              { orderBy: "id" }
+            );
+            // greenlock logic
+            const Greenlock = require("greenlock");
+            const greenlock = Greenlock.create({
+              packageRoot: path.resolve(__dirname, ".."),
+              configDir: path.join(file_store, "greenlock.d"),
+              maintainerEmail: admin_users[0].email,
+            });
+
+            await greenlock.sites.add({
+              subject: altname,
+              altnames: [altname],
+            });
+            // letsencrypt
+            const tenant_letsencrypt_sites = getState().getConfig(
+              "tenant_letsencrypt_sites",
+              []
+            );
+            await getState().setConfig("tenant_letsencrypt_sites", [
+              altname,
+              ...tenant_letsencrypt_sites,
+            ]);
+            if (req.user?.role_id === 1) {
+              req.flash(
+                "success",
+                req.__(
+                  "Tenant created. Certificate will be acquired on first visit."
+                )
+              );
+              res.redirect("/tenant/list");
+              return;
+            }
+          }
+        }
         res.sendWrap(
           req.__("Create application"),
           div(
@@ -374,6 +421,7 @@ router.get(
       return;
     }
     const tens = await db.select("_sc_tenants");
+    const locale = getState().getConfig("default_locale", "en");
     send_infoarch_page({
       res,
       req,
@@ -400,7 +448,8 @@ router.get(
               },
               {
                 label: req.__("Created"),
-                key: (r) => (r.created ? localeDateTime(r.created) : ""),
+                key: (r) =>
+                  r.created ? localeDateTime(r.created, {}, locale) : "",
               },
               {
                 label: req.__("Information"),
@@ -628,7 +677,7 @@ router.get(
       []
     );
     const has_cert = tenant_letsencrypt_sites.includes(altname);
-    
+
     // get list of files
     let files;
     await db.runWithTenant(subdomain, async () => {

package/tests/plugin_install.test.js

@@ -161,10 +161,10 @@ describe("Stable versioning install", () => {
       name: "@christianhugoch/empty_sc_test_plugin",
     });
     expect(dbPlugin).not.toBe(null);
-    expect(dbPlugin.version).toBe("0.0.1");
+    expect(dbPlugin.version).toBe("0.1.0");
   });
 
-  it("installs a fixed version", async () => {
+  it("installs and upgrades a fixed version", async () => {
     const loadAndSaveNewPlugin = load_plugins.loadAndSaveNewPlugin;
     await loadAndSaveNewPlugin(
       new Plugin({
@@ -178,7 +178,7 @@ describe("Stable versioning install", () => {
       name: "@christianhugoch/empty_sc_test_plugin",
     });
     expect(dbPlugin).not.toBe(null);
-    expect(dbPlugin.version).toBe("0.0.1");
+    expect(dbPlugin.version).toBe("0.1.0");
   });
 
   it("installs and downgrades a fixed version", async () => {
@@ -188,7 +188,7 @@ describe("Stable versioning install", () => {
         name: "@christianhugoch/empty_sc_test_plugin",
         location: "@christianhugoch/empty_sc_test_plugin",
         source: "npm",
-        version: "0.0.6",
+        version: "0.2.0",
       }),
       true
     );
@@ -196,7 +196,7 @@ describe("Stable versioning install", () => {
       name: "@christianhugoch/empty_sc_test_plugin",
     });
     expect(dbPlugin).not.toBe(null);
-    expect(dbPlugin.version).toBe("0.0.1");
+    expect(dbPlugin.version).toBe("0.1.0");
   });
 });
 
@@ -245,7 +245,7 @@ describe("Stable versioning upgrade", () => {
     expect(newPlugin.version).toBe("0.0.3");
   });
 
-  it("upgrades to latest with downgrade", async () => {
+  it("upgrades to latest with downgrade to supported", async () => {
     const loadAndSaveNewPlugin = load_plugins.loadAndSaveNewPlugin;
     await loadAndSaveNewPlugin(
       new Plugin({
@@ -276,7 +276,7 @@ describe("Stable versioning upgrade", () => {
       name: "@christianhugoch/empty_sc_test_plugin",
     });
     expect(newPlugin).not.toBe(null);
-    expect(newPlugin.version).toBe("0.0.1");
+    expect(newPlugin.version).toBe("0.1.0");
   });
 
   it("upgrades to fixed version", async () => {
@@ -313,7 +313,7 @@ describe("Stable versioning upgrade", () => {
     expect(newPlugin.version).toBe("0.0.3");
   });
 
-  it("upgrades to fixed version with downgrade", async () => {
+  it("upgrades to fixed version with downgrade to supported", async () => {
     const loadAndSaveNewPlugin = load_plugins.loadAndSaveNewPlugin;
     await loadAndSaveNewPlugin(
       new Plugin({
@@ -336,7 +336,7 @@ describe("Stable versioning upgrade", () => {
         name: "@christianhugoch/empty_sc_test_plugin",
         location: "@christianhugoch/empty_sc_test_plugin",
         source: "npm",
-        version: "0.0.6",
+        version: "0.2.0",
       }),
       true
     );
@@ -344,6 +344,6 @@ describe("Stable versioning upgrade", () => {
       name: "@christianhugoch/empty_sc_test_plugin",
     });
     expect(newPlugin).not.toBe(null);
-    expect(newPlugin.version).toBe("0.0.1");
+    expect(newPlugin.version).toBe("0.1.0");
   });
 });

package/tests/plugins.test.js

@@ -365,7 +365,7 @@ describe("Upgrade plugin to supported version", () => {
     expect(upgradedPlugin.version).toBe("0.0.3");
   });
 
-  it("upgrades to the most current fixed version", async () => {
+  it("upgrades to latest as fixed version", async () => {
     const oldPlugin = await setupPluginVersion(
       "@christianhugoch/empty_sc_test_plugin_two",
       "0.0.1"
@@ -389,7 +389,7 @@ describe("Upgrade plugin to supported version", () => {
     expect(upgradedPlugin.version).toBe("0.0.3");
   });
 
-  it("upgrades with a downgrade of the latest version", async () => {
+  it("upgrades with a downgrade of latest", async () => {
     const oldPlugin = await setupPluginVersion(
       "@christianhugoch/empty_sc_test_plugin",
       "0.0.1"
@@ -404,10 +404,10 @@ describe("Upgrade plugin to supported version", () => {
     const upgradedPlugin = await Plugin.findOne({
       name: "@christianhugoch/empty_sc_test_plugin",
     });
-    expect(upgradedPlugin.version).toBe("0.0.1");
+    expect(upgradedPlugin.version).toBe("0.1.0");
   });
 
-  it("upgrades with a downgrade of the most current fixed version", async () => {
+  it("upgrades with a downgrade of latest as fixed version", async () => {
     const oldPlugin = await setupPluginVersion(
       "@christianhugoch/empty_sc_test_plugin",
       "0.0.1"
@@ -421,13 +421,13 @@ describe("Upgrade plugin to supported version", () => {
           "@christianhugoch/empty_sc_test_plugin"
         )}`
       )
-      .send("version=0.1.0")
+      .send("version=0.2.0")
       .set("Cookie", loginCookie)
       .expect(toRedirect("/plugins"));
     const upgradedPlugin = await Plugin.findOne({
       name: "@christianhugoch/empty_sc_test_plugin",
     });
-    expect(upgradedPlugin.version).toBe("0.0.1");
+    expect(upgradedPlugin.version).toBe("0.1.0");
   });
 });
 

package/wrapper.js

@@ -193,7 +193,9 @@ const get_headers = (req, version_tag, description, extras = []) => {
         state.logLevel
       }, _sc_globalCsrf = "${req.csrfToken()}", _sc_version_tag = "${version_tag}"${
         locale ? `, _sc_locale = "${locale}"` : ""
-      };</script>`,
+      }, _sc_lightmode = ${JSON.stringify(
+        state.getLightDarkMode?.(req.user) || "light"
+      )};</script>`,
     },
     { css: `/static_assets/${version_tag}/saltcorn.css` },
     { script: `/static_assets/${version_tag}/saltcorn-common.js` },