@saltcorn/server 0.9.3-beta.0 → 0.9.3-beta.2

package/locales/en.json

@@ -1286,5 +1286,6 @@
 	"Install more themes »": "Install more themes »",
 	"Configure action": "Configure action",
 	"No changes detected, snapshot skipped": "No changes detected, snapshot skipped",
-	"Cannot remove module: views %s depend on it": "Cannot remove module: views %s depend on it"
+	"Cannot remove module: views %s depend on it": "Cannot remove module: views %s depend on it",
+	"The view name is part of the URL when it is shown alone.": "The view name is part of the URL when it is shown alone."
 }

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.3-beta.0",
+  "version": "0.9.3-beta.2",
   "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": "0.9.3-beta.0",
-    "@saltcorn/builder": "0.9.3-beta.0",
-    "@saltcorn/data": "0.9.3-beta.0",
-    "@saltcorn/admin-models": "0.9.3-beta.0",
-    "@saltcorn/filemanager": "0.9.3-beta.0",
-    "@saltcorn/markup": "0.9.3-beta.0",
-    "@saltcorn/sbadmin2": "0.9.3-beta.0",
+    "@saltcorn/base-plugin": "0.9.3-beta.2",
+    "@saltcorn/builder": "0.9.3-beta.2",
+    "@saltcorn/data": "0.9.3-beta.2",
+    "@saltcorn/admin-models": "0.9.3-beta.2",
+    "@saltcorn/filemanager": "0.9.3-beta.2",
+    "@saltcorn/markup": "0.9.3-beta.2",
+    "@saltcorn/sbadmin2": "0.9.3-beta.2",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/bootstrap-iconpicker.js

@@ -496,7 +496,8 @@
                             var el = $this.data('bs.popover');
                             var tip = ($.fn.bsVersion() === '3.x') ? el.tip() 
                                       : ($.fn.bsVersion() === '5.x') 
-                                      ? $(bootstrap.Popover.getInstance($this).getTipElement())
+                                      ? $(bootstrap.Popover.getInstance($this).getTipElement?.() ||
+                                           bootstrap.Popover.getInstance($this).tip)
                                       : $(el.getTipElement())
                            
                             tip.addClass('iconpicker-popover');

package/public/relation_helpers.js

@@ -169,6 +169,10 @@ var relationHelpers = (() => {
    */
   const RelationsFinder = function (tablesCache, allViews, maxDepth) {
     this.maxDepth = +maxDepth;
+    if (isNaN(this.maxDepth)) {
+      console.log(`maxDepth '${maxDepth}' is not a number, set to 6`);
+      this.maxDepth = 6;
+    }
     this.allViews = allViews;
     const { tableIdCache, tableNameCache, fieldCache } = tablesCache;
     this.tableIdCache = tableIdCache;
@@ -303,8 +307,8 @@ var relationHelpers = (() => {
     const searcher = (current, path, level, visited) => {
       if (level > this.maxDepth) return;
       const visitedFkCopy = new Set(visited);
-      const fks = current.foreign_keys.filter((f) => !visitedFkCopy.has(f.id));
-      for (const fk of fks) {
+      for (const fk of current.foreign_keys) {
+        if (visitedFkCopy.has(fk.id)) continue;
         visitedFkCopy.add(fk.id);
         const target = this.tableNameCache[fk.reftable_name];
         if (!target)
@@ -315,10 +319,8 @@ var relationHelpers = (() => {
       }
 
       const visitedInboundCopy = new Set(visited);
-      const inbounds = (this.fieldCache[current.name] || []).filter(
-        (f) => !visitedInboundCopy.has(f.id)
-      );
-      for (const inbound of inbounds) {
+      for (const inbound of this.fieldCache[current.name] || []) {
+        if (visitedInboundCopy.has(inbound.id)) continue;
         visitedInboundCopy.add(inbound.id);
         const target = this.tableIdCache[inbound.table_id];
         if (!target)

package/routes/actions.js

@@ -162,6 +162,7 @@ const triggerForm = async (req, trigger) => {
         label: req.__("Name"),
         type: "String",
         required: true,
+        attributes: { autofocus: true },
         sublabel: req.__("Name of action"),
       },
       {
@@ -380,11 +381,15 @@ router.post(
  * @memberof module:routes/actions~actionsRouter
  */
 router.get(
-  "/configure/:id",
+  "/configure/:idorname",
   isAdmin,
   error_catcher(async (req, res) => {
-    const { id } = req.params;
-    const trigger = await Trigger.findOne({ id });
+    const { idorname } = req.params;
+    let trigger;
+    let id = parseInt(idorname);
+    if (id) trigger = await Trigger.findOne({ id });
+    else trigger = await Trigger.findOne({ name: idorname });
+
     if (!trigger) {
       req.flash("warning", req.__("Action not found"));
       res.redirect(`/actions/`);
@@ -396,11 +401,16 @@ router.get(
       ? Table.findOne({ id: trigger.table_id })
       : null;
 
-    const subtitle = span(
-      { class: "ms-3" },
-      trigger.action,
-      table ? ` on ` + a({ href: `/table/${table.name}` }, table.name) : ""
-    ) + a({href: `/actions/testrun/${id}`, class: "ms-2" }, req.__("Test run")+" »");
+    const subtitle =
+      span(
+        { class: "ms-3" },
+        trigger.action,
+        table ? ` on ` + a({ href: `/table/${table.name}` }, table.name) : ""
+      ) +
+      a(
+        { href: `/actions/testrun/${id}`, class: "ms-2" },
+        req.__("Test run") + " »"
+      );
     if (!action) {
       req.flash("warning", req.__("Action not found"));
       res.redirect(`/actions/`);
@@ -618,7 +628,7 @@ router.get(
     let table, row;
     if (trigger.table_id) {
       table = Table.findOne({ id: trigger.table_id });
-      row = await table.getRow({}, {orderBy: "RANDOM()"});
+      row = await table.getRow({}, { orderBy: "RANDOM()" });
     }
     let runres;
 
@@ -666,7 +676,10 @@ router.get(
               "« " + req.__("back to actions")
             ),
             a(
-              { href: `/actions/configure/${trigger.id}`, class: "mt-4 btn btn-primary me-1" },
+              {
+                href: `/actions/configure/${trigger.id}`,
+                class: "mt-4 btn btn-primary me-1",
+              },
               req.__("Configure action")
             ),
             a(

package/routes/fields.js

@@ -82,7 +82,8 @@ const fieldForm = async (req, fkey_opts, existing_names, id, hasData) => {
         label: req.__("Label"),
         name: "label",
         sublabel: req.__("Name of the field"),
-        input_type: "text",
+        type: "String",
+        attributes: { autofocus: true },
         validator(s) {
           if (!s || s === "") return req.__("Missing label");
           if (!id && existing_names.includes(Field.labelToName(s)))
@@ -96,15 +97,6 @@ const fieldForm = async (req, fkey_opts, existing_names, id, hasData) => {
           }
         },
       }),
-      // description
-      new Field({
-        label: req.__("Description"),
-        name: "description",
-        sublabel: req.__(
-          "Description allows to give more information about field"
-        ),
-        input_type: "text",
-      }),
       new Field({
         label: req.__("Type"),
         name: "type",
@@ -120,6 +112,16 @@ const fieldForm = async (req, fkey_opts, existing_names, id, hasData) => {
           !getState().getConfig("development_mode", false) &&
           (hasData || db.isSQLite),
       }),
+      // description
+      new Field({
+        label: req.__("Description"),
+        name: "description",
+        sublabel: req.__(
+          "Description allows to give more information about field"
+        ),
+        input_type: "text",
+      }),
+
       new Field({
         label: req.__("Calculated"),
         name: "calculated",

package/routes/menu.js

@@ -109,68 +109,6 @@ const menuForm = async (req) => {
           "Action",
         ],
       },
-      {
-        name: "text",
-        label: req.__("Text label"),
-        class: "item-menu",
-        input_type: "text",
-        required: true,
-        showIf: {
-          type: [
-            "View",
-            "Page",
-            "Link",
-            "Header",
-            "Dynamic",
-            "Search",
-            "Action",
-          ],
-        },
-      },
-      {
-        name: "icon_btn",
-        label: req.__("Icon"),
-        input_type: "custom_html",
-        attributes: {
-          html: `<button type="button" id="myEditor_icon" class="btn btn-outline-secondary"></button>`,
-        },
-        showIf: { type: ["View", "Page", "Link", "Header", "Action"] },
-      },
-      {
-        name: "icon",
-        class: "item-menu",
-        input_type: "hidden",
-      },
-      {
-        name: "min_role",
-        label: req.__("Minimum role"),
-        class: "item-menu",
-        input_type: "select",
-        options: roles.map((r) => ({ label: r.role, value: r.id })),
-      },
-      {
-        name: "disable_on_mobile",
-        label: req.__("Disable on mobile"),
-        type: "Bool",
-        class: "item-menu",
-        required: false,
-      },
-      {
-        name: "target_blank",
-        label: req.__("Open in new tab"),
-        type: "Bool",
-        required: false,
-        class: "item-menu",
-        showIf: { type: ["View", "Page", "Link"] },
-      },
-      {
-        name: "in_modal",
-        label: req.__("Open in popup modal?"),
-        type: "Bool",
-        required: false,
-        class: "item-menu",
-        showIf: { type: ["View", "Page", "Link"] },
-      },
       {
         name: "url",
         label: req.__("URL"),
@@ -196,7 +134,7 @@ const menuForm = async (req) => {
       },
       {
         name: "viewname",
-        label: req.__("Views"),
+        label: req.__("View"),
         type: "String",
         class: "item-menu",
         required: true,
@@ -275,6 +213,68 @@ const menuForm = async (req) => {
         required: true,
         showIf: { type: "Dynamic" },
       },
+      {
+        name: "text",
+        label: req.__("Text label"),
+        class: "item-menu",
+        input_type: "text",
+        required: true,
+        showIf: {
+          type: [
+            "View",
+            "Page",
+            "Link",
+            "Header",
+            "Dynamic",
+            "Search",
+            "Action",
+          ],
+        },
+      },
+      {
+        name: "icon_btn",
+        label: req.__("Icon"),
+        input_type: "custom_html",
+        attributes: {
+          html: `<button type="button" id="myEditor_icon" class="btn btn-outline-secondary"></button>`,
+        },
+        showIf: { type: ["View", "Page", "Link", "Header", "Action"] },
+      },
+      {
+        name: "icon",
+        class: "item-menu",
+        input_type: "hidden",
+      },
+      {
+        name: "min_role",
+        label: req.__("Minimum role"),
+        class: "item-menu",
+        input_type: "select",
+        options: roles.map((r) => ({ label: r.role, value: r.id })),
+      },
+      {
+        name: "disable_on_mobile",
+        label: req.__("Disable on mobile"),
+        type: "Bool",
+        class: "item-menu",
+        required: false,
+      },
+      {
+        name: "target_blank",
+        label: req.__("Open in new tab"),
+        type: "Bool",
+        required: false,
+        class: "item-menu",
+        showIf: { type: ["View", "Page", "Link"] },
+      },
+      {
+        name: "in_modal",
+        label: req.__("Open in popup modal?"),
+        type: "Bool",
+        required: false,
+        class: "item-menu",
+        showIf: { type: ["View", "Page", "Link"] },
+      },
       {
         name: "style",
         label: req.__("Style"),

package/routes/pageedit.js

@@ -89,6 +89,7 @@ const pagePropertiesForm = async (req, isNew) => {
         },
         sublabel: req.__("A short name that will be in your URL"),
         type: "String",
+        attributes: { autofocus: true },
       }),
       new Field({
         label: req.__("Title"),

package/routes/tables.js

@@ -162,9 +162,7 @@ const tableForm = async (table, req) => {
             },
             {
               label: req.__("Version history"),
-              sublabel: req.__(
-                "Track table data changes over time"
-              ),
+              sublabel: req.__("Track table data changes over time"),
               name: "versioned",
               type: "Bool",
             },
@@ -225,8 +223,9 @@ router.get(
                 {
                   label: req.__("Table name"),
                   name: "name",
-                  input_type: "text",
+                  type: "String",
                   required: true,
+                  attributes: { autofocus: true },
                 },
                 ...(table_provider_names.length
                   ? [
@@ -236,7 +235,7 @@ router.get(
                         input_type: "select",
                         options: [
                           // Due to packages/saltcorn-markup/helpers.ts#L45 (select_options replaces label if o.value === "")
-                          {label:req.__("Database table"), value:'-'},
+                          { label: req.__("Database table"), value: "-" },
                           ...table_provider_names,
                         ],
                         required: true,
@@ -1065,10 +1064,7 @@ router.post(
       } else if (db.sqlsanitize(name) === "") {
         req.flash("error", req.__(`Invalid table name %s`, name));
         res.redirect(`/table/new`);
-      } else if (
-        rest.provider_name &&
-        rest.provider_name !== "-"
-      ) {
+      } else if (rest.provider_name && rest.provider_name !== "-") {
         const table = await Table.create(name, rest);
         res.redirect(`/table/provider-cfg/${table.id}`);
       } else {

package/routes/viewedit.js

@@ -131,8 +131,9 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
         label: req.__("View name"),
         name: "name",
         type: "String",
+        attributes: { autofocus: true },
         sublabel: req.__(
-          "The view name will appear as the title of pop-ups showing this view, and in the URL when it is shown alone."
+          "The view name is part of the URL when it is shown alone."
         ),
       }),
       new Field({

package/tests/plugins.test.js

@@ -233,7 +233,7 @@ describe("Pack Endpoints", () => {
       .send(
         "pack=les%22%3A+%5B%5D%2C+%22views%22%3A+%5B%5D%2C+%22plugins%22%3A+%5B%5D%2C+%22pages%22%3A+%5B%5D+%7D"
       )
-      .expect(toInclude("alert-danger"));
+      .expect(toInclude("Unexpected token l in JSON at position 0"));
   });
   it("should install named", async () => {
     const loginCookie = await getAdminLoginCookie();