@saltcorn/server 1.1.0-beta.8 → 1.1.0

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}
@@ -267,9 +268,11 @@ router.get(
       clipboard: false,
       cellClick: "__delete_tabulator_row",
     });
+    const isDark = getState().getLightDarkMode(req.user) === "dark";
     res.sendWrap(
       {
         title: req.__(`%s data table`, table.name),
+        requestFluidLayout: true,
         headers: [
           //jsgrid - grid editor external component
           {
@@ -295,6 +298,13 @@ router.get(
           {
             css: `/static_assets/${db.connectObj.version_tag}/flatpickr.min.css`,
           },
+          ...(isDark
+            ? [
+                {
+                  css: `/static_assets/${db.connectObj.version_tag}/flatpickr-dark.css`,
+                },
+              ]
+            : []),
         ],
       },
       {
@@ -426,7 +436,13 @@ router.get(
               ),
               div({ id: "jsGridNotify" }),
 
-              div({ id: "jsGrid" })
+              div({
+                id: "jsGrid",
+                class:
+                  getState().getLightDarkMode(req.user) === "dark"
+                    ? "table-dark"
+                    : undefined,
+              })
             ),
           },
         ],

package/routes/plugins.js

@@ -57,7 +57,11 @@ const fs = require("fs");
 const path = require("path");
 const { get_latest_npm_version } = require("@saltcorn/data/models/config");
 const { flash_restart } = require("../markup/admin.js");
-const { sleep, removeNonWordChars } = require("@saltcorn/data/utils");
+const {
+  sleep,
+  removeNonWordChars,
+  getFetchProxyOptions,
+} = require("@saltcorn/data/utils");
 const { loadAllPlugins } = require("../load_plugins");
 const npmFetch = require("npm-registry-fetch");
 const PluginInstaller = require("@saltcorn/plugins-loader/plugin_installer");
@@ -609,7 +613,8 @@ router.get(
     } else {
       try {
         const pkgInfo = await npmFetch.json(
-          `https://registry.npmjs.org/${plugin.location}`
+          `https://registry.npmjs.org/${plugin.location}`,
+          getFetchProxyOptions()
         );
         if (!pkgInfo?.versions)
           throw new Error(req.__("Unable to fetch versions"));

package/routes/registry.js

@@ -7,6 +7,7 @@ const {
   domReady,
   a,
   div,
+  h4,
   i,
   text,
   button,
@@ -40,6 +41,7 @@ const {
   install_pack,
 } = require("@saltcorn/admin-models/models/pack");
 const Trigger = require("@saltcorn/data/models/trigger");
+const { getState } = require("@saltcorn/data/db/state");
 /**
  * @type {object}
  * @const
@@ -79,7 +81,17 @@ router.get(
       {},
       { orderBy: "name", nocase: true }
     );
-    let tables, views, pages, triggers;
+    const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
+
+    const all_configs_obj = await getState().getAllConfigOrDefaults();
+    const all_configs = Object.entries(all_configs_obj)
+      .map(([name, v]) => ({
+        ...v,
+        name,
+      }))
+      .filter((c) => isRoot || !c.root_only);
+
+    let tables, views, pages, triggers, configs;
     if (q) {
       const qlower = q.toLowerCase();
       const includesQ = (s) => s.toLowerCase().includes(qlower);
@@ -100,11 +112,13 @@ router.get(
         const pack = await trigger_pack(t);
         return includesQ(JSON.stringify(pack));
       });
+      configs = all_configs.filter((c) => includesQ(JSON.stringify(c)));
     } else {
       tables = all_tables;
       views = all_views;
       pages = all_pages;
       triggers = all_triggers;
+      configs = all_configs;
     }
     const li_link = (etype1, ename1) =>
       li(
@@ -124,7 +138,7 @@ router.get(
         action: `/registry-editor?etype=${etype}&ename=${encodeURIComponent(
           ename
         )}${qlink}`,
-
+        formStyle: "vert",
         values: { regval: JSON.stringify(jsonVal, null, 2) },
         fields: [
           {
@@ -177,6 +191,14 @@ router.get(
         const ppack = await page_pack(all_pages.find((v) => v.name === ename));
         edContents = renderForm(mkForm(ppack), req.csrfToken());
         break;
+      case "config":
+        const config = all_configs.find((t) => t.name === ename);
+        edContents =
+          h4(config.label) +
+          (config.blurb || "") +
+          (config.sublabel || "") +
+          renderForm(mkForm(config.value), req.csrfToken());
+        break;
       case "trigger":
         const trigger = all_triggers.find((t) => t.name === ename);
         const trpack = await trigger_pack(trigger);
@@ -282,6 +304,16 @@ router.get(
                       triggers.map((t) => li_link("trigger", t.name))
                     )
                   )
+                ),
+                li(
+                  details(
+                    { open: q || etype === "CONFIG" }, //
+                    summary("Configuration"),
+                    ul(
+                      { class: "ps-3" },
+                      configs.map((t) => li_link("config", t.name))
+                    )
+                  )
                 )
               )
             ),
@@ -309,7 +341,14 @@ router.post(
     const qlink = q ? `&q=${encodeURIComponent(q)}` : "";
 
     const entVal = JSON.parse(req.body.regval);
-    let pack = { plugins: [], tables: [], views: [], pages: [], triggers: [] };
+    let pack = {
+      plugins: [],
+      tables: [],
+      views: [],
+      pages: [],
+      triggers: [],
+      config: {},
+    };
 
     switch (etype) {
       case "table":
@@ -324,6 +363,9 @@ router.post(
       case "trigger":
         pack.triggers = [entVal];
         break;
+      case "config":
+        pack.config[ename] = entVal;
+        break;
     }
     await install_pack(pack);
     res.redirect(

package/routes/tables.js

@@ -56,7 +56,7 @@ const {
 } = require("@saltcorn/data/models/discovery");
 const { getState } = require("@saltcorn/data/db/state");
 const { cardHeaderTabs } = require("@saltcorn/markup/layout_utils");
-const { tablesList, viewsList } = require("./common_lists");
+const { tablesList, viewsList, getTriggerList } = require("./common_lists");
 const {
   InvalidConfiguration,
   removeAllWhiteSpace,
@@ -757,6 +757,8 @@ router.get(
     const triggers = table.id ? Trigger.find({ table_id: table.id }) : [];
     triggers.sort(comparingCaseInsensitive("name"));
     let fieldCard;
+    const nPrimaryKeys = fields.filter((f) => f.primary_key).length;
+
     if (fields.length === 0) {
       fieldCard = [
         h4(req.__(`No fields defined in %s table`, table.name)),
@@ -818,28 +820,25 @@ router.get(
         { hover: true }
       );
       fieldCard = [
+        nPrimaryKeys > 1 &&
+          div(
+            { class: "alert alert-danger", role: "alert" },
+            i({ class: "fas fa-exclamation-triangle" }),
+            "This table has composite primary keys which is not supported in Saltcorn. A procedure to introduce a single autoincrementing primary key is available.",
+            post_btn(
+              `/table/repair-composite-primary/${table.id}`,
+              "Add autoincrementing primary key",
+              req.csrfToken(),
+              { btnClass: "btn-danger" }
+            )
+          ),
+
         tableHtml,
         inbound_refs.length > 0
           ? req.__("Inbound keys: ") +
             inbound_refs.map((tnm) => link(`/table/${tnm}`, tnm)).join(", ") +
             "<br>"
           : "",
-        triggers.length
-          ? req.__("Table triggers: ") +
-            triggers
-              .map((t) =>
-                link(
-                  `/actions/configure/${
-                    t.id
-                  }?on_done_redirect=${encodeURIComponent(
-                    `table/${table.name}`
-                  )}`,
-                  t.name
-                )
-              )
-              .join(", ") +
-            "<br>"
-          : "",
         !table.external &&
           !table.provider_name &&
           a(
@@ -851,7 +850,8 @@ router.get(
           ),
       ];
     }
-    var viewCard;
+    let viewCard;
+    let triggerCard = "";
     if (fields.length > 0) {
       const views = await View.find(
         table.id ? { table_id: table.id } : { exttable_name: table.name }
@@ -884,6 +884,25 @@ router.get(
             req.__("Create view")
           ),
       };
+
+      triggerCard = {
+        type: "card",
+        id: "table-triggers",
+        title: req.__("Triggers on table"),
+        contents:
+          (triggers.length
+            ? await getTriggerList(triggers, req)
+            : p("Triggers run actions in response to events on this table")) +
+          a(
+            {
+              href: `/actions/new?table=${encodeURIComponent(
+                table.name
+              )}&on_done_redirect=${encodeURIComponent(`table/${table.name}`)}`,
+              class: "btn btn-primary",
+            },
+            req.__("Create trigger")
+          ),
+      };
     }
     const models = await Model.find({ table_id: table.id });
     const modelCard = div(
@@ -1078,6 +1097,7 @@ router.get(
             ]
           : []),
         ...(viewCard ? [viewCard] : []),
+        ...(triggerCard ? [triggerCard] : []),
         {
           type: "card",
           title: req.__("Edit table properties"),
@@ -1111,7 +1131,7 @@ router.post(
     const v = req.body;
     if (typeof v.id === "undefined" && typeof v.external === "undefined") {
       // insert
-      v.name = v.name.trim()
+      v.name = v.name.trim();
       const { name, ...rest } = v;
       const alltables = await Table.find({});
       const existing_tables = [
@@ -1162,6 +1182,7 @@ router.post(
       let notify = "";
       if (!rest.versioned) rest.versioned = false;
       if (!rest.has_sync_info) rest.has_sync_info = false;
+      rest.is_user_group = !!rest.is_user_group;
       if (rest.ownership_field_id === "_formula") {
         rest.ownership_field_id = null;
         const fmlValidRes = expressionValidator(rest.ownership_formula);
@@ -1922,7 +1943,7 @@ router.post(
     const table = Table.findOne({ name });
 
     try {
-      await table.deleteRows({}, req.user);
+      await table.deleteRows({}, req.user, true);
       req.flash("success", req.__("Deleted all rows"));
     } catch (e) {
       req.flash("error", e.message);
@@ -2074,3 +2095,20 @@ router.post(
     respondWorkflow(table, workflow, wfres, req, res);
   })
 );
+
+router.post(
+  "/repair-composite-primary/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+
+    const table = Table.findOne({ id });
+    if (!table) {
+      req.flash("error", `Table not found`);
+      res.redirect(`/table`);
+      return;
+    }
+    await table.repairCompositePrimary();
+    res.redirect(`/table/${table.id}`);
+  })
+);

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"),
@@ -444,6 +493,7 @@ const tenant_settings_form = (req) =>
       "tenant_template",
       "tenant_baseurl",
       "tenant_create_unauth_redirect",
+      "tenant_inherit_cfgs",
       { section_header: req.__("Tenant application capabilities") },
       "tenants_install_git",
       "tenants_set_npm_modules",
@@ -628,7 +678,7 @@ router.get(
       []
     );
     const has_cert = tenant_letsencrypt_sites.includes(altname);
-    
+
     // get list of files
     let files;
     await db.runWithTenant(subdomain, async () => {

package/routes/viewedit.js

@@ -151,14 +151,6 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
           "The view name is part of the URL when it is shown alone."
         ),
       }),
-      new Field({
-        label: req.__("Description"),
-        name: "description",
-        type: "String",
-        sublabel: req.__(
-          "Description allows you to give more information about the view."
-        ),
-      }),
       new Field({
         label: req.__("View pattern"),
         name: "viewtemplate",
@@ -200,6 +192,14 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
         required: true,
         options: roles.map((r) => ({ value: r.id, label: r.role })),
       }),
+      new Field({
+        label: req.__("Description"),
+        name: "description",
+        type: "String",
+        sublabel: req.__(
+          "Description allows you to give more information about the view."
+        ),
+      }),
       new Field({
         name: "page_title",
         label: req.__("Page title"),

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` },