@saltcorn/server 1.1.3-beta.0 → 1.1.3-beta.10

package/routes/infoarch.js

@@ -90,6 +90,7 @@ router.post(
       else
         req.flash("success", req.__("No changes detected, snapshot skipped"));
     } catch (e) {
+      console.error(e);
       req.flash("error", e.message);
     }
     res.json({ reload_page: true });

package/routes/list.js

@@ -190,7 +190,7 @@ const typeToGridType = (t, field) => {
   if (field.calculated) {
     jsgField.editor = false;
   }
-  if (field.primary_key) {
+  if (field.primary_key && !field?.attributes?.NonSerial) {
     jsgField.editor = false;
   }
   return jsgField;
@@ -221,8 +221,8 @@ jsGrid.fields.versions = VersionsField;
 // end of versionsField
 
 const arrangeIdFirst = (flds) => {
-  const noId = flds.filter((f) => f.name !== "id");
-  const id = flds.find((f) => f.name === "id");
+  const noId = flds.filter((f) => !f.primary_key);
+  const id = flds.find((f) => f.primary_key);
   if (id) return [id, ...noId];
   else return flds;
 };
@@ -282,7 +282,7 @@ router.get(
       cellClick: "__delete_tabulator_row",
     });
     const isDark = getState().getLightDarkMode(req.user) === "dark";
-    const pkNm = table.pk_name
+    const pkNm = table.pk_name;
     res.sendWrap(
       {
         title: req.__(`%s data table`, table.name),
@@ -407,8 +407,8 @@ router.get(
                   ajaxURL:"/api/${encodeURIComponent(
                     table.name
                   )}?tabulator_pagination_format=true${
-                  table.versioned ? "&versioncount=on" : ""
-                }",                   
+                    table.versioned ? "&versioncount=on" : ""
+                  }",                   
                   layout:"fitColumns", 
                   columns,
                   height:"100%",
@@ -427,10 +427,14 @@ router.get(
               });
               window.tabulator_table.on("cellEdited", function(cell){
                 const row = cell.getRow().getData()
+                const fieldName = cell.getColumn().getField()
+                let ident = (row.${pkNm}||"");
+                if(fieldName === "${pkNm}")
+                  ident = "";
                 ajax_indicator(true);
                 $.ajax({
                   type: "POST",
-                  url: "/api/${table.name}/" + (row.${pkNm}||""),
+                  url: "/api/${table.name}/" + ident,
                   data: row,
                   headers: {
                     "CSRF-Token": _sc_globalCsrf,

package/routes/menu.js

@@ -615,6 +615,7 @@ router.post(
         });
         res.json({ success: "ok", ...(result || {}) });
       } catch (e) {
+        console.error(e);
         res.status(400).json({ error: e.message || e });
       }
     else res.status(404).json({ error: "Action not found" });

package/routes/page.js

@@ -78,10 +78,14 @@ const runPage = async (page, req, res, tic) => {
       );
   } else {
     getState().log(2, `Page ${page.name} not authorized`);
+    if (!req.user) {
+      res.redirect(`/auth/login?dest=${encodeURIComponent(req.originalUrl)}`);
+      return;
+    }
     res
       .status(404)
       .sendWrap(
-        req.__("Internal Error"),
+        req.__("Page not found"),
         req.__("Page %s not found", page.name)
       );
   }
@@ -123,6 +127,10 @@ const runPageGroup = async (pageGroup, req, res, tic) => {
     }
   } else {
     getState().log(2, `Pagegroup ${pageGroup.name} not authorized`);
+    if (!req.user) {
+      res.redirect(`/auth/login?dest=${encodeURIComponent(req.originalUrl)}`);
+      return;
+    }
     res
       .status(404)
       .sendWrap(

package/routes/page_groupedit.js

@@ -628,6 +628,7 @@ router.post(
           );
           res.redirect(`/page_groupedit/${group.name}`);
         } catch (e) {
+          console.error(e);
           req.flash("error", e.message);
           res.redirect(`/page_groupedit/${group.name}`);
         }

package/routes/pageedit.js

@@ -189,6 +189,7 @@ const pageBuilderData = async (req, context) => {
     if (action && action.configFields) {
       actionConfigForms[name] = await getActionConfigFields(action, null, {
         mode: "page",
+        req,
       });
     }
   }

package/routes/plugins.js

@@ -1489,6 +1489,7 @@ router.post(
         for (const msg of msgs) req.flash("warning", msg);
         res.redirect(`/plugins`);
       } catch (e) {
+        console.error(e);
         req.flash("error", `${e.message}`);
         const form = pluginForm(req, plugin);
         res.sendWrap(req.__(`Edit Module`), renderForm(form, req.csrfToken()));
@@ -1595,6 +1596,7 @@ router.post(
         req.__
       );
     } catch (e) {
+      console.error(e);
       req.flash(
         "error",
         e.message || req.__("Error installing module %s", plugin.name)

package/routes/registry.js

@@ -145,6 +145,7 @@ router.get(
             name: "regval",
             label: "",
             input_type: "code",
+            class: "enlarge-in-card",
             attributes: { mode: "application/json" },
           },
         ],
@@ -319,13 +320,16 @@ router.get(
             ),
           },
           {
-            type: "card",
-            title: cfg_link
-              ? `Registry editor: ${cfg_link}`
-              : ename && etype
-              ? `Registry editor: ${ename} ${etype}`
-              : "Registry editor",
-            contents: edContents,
+            type: "container",
+            contents: {
+              type: "card",
+              title: cfg_link
+                ? `Registry editor: ${cfg_link}`
+                : ename && etype
+                  ? `Registry editor: ${ename} ${etype}`
+                  : "Registry editor",
+              contents: edContents,
+            },
           },
         ],
       },

package/routes/tables.js

@@ -77,6 +77,8 @@ const { EOL } = require("os");
 
 const path = require("path");
 const Tag = require("@saltcorn/data/models/tag");
+const { initial_config_all_fields } = require("@saltcorn/data/plugin-helper");
+const { save_menu_items } = require("@saltcorn/data/models/config");
 /**
  * @type {object}
  * @const
@@ -813,9 +815,6 @@ router.get(
     let fieldCard;
     const primaryKeys = fields.filter((f) => f.primary_key);
     const nPrimaryKeys = primaryKeys.length;
-    const nonSerialPKS = primaryKeys.some(
-      (f) => f.attributes?.NonSerial && f.type?.name === "Integer"
-    );
 
     if (fields.length === 0) {
       fieldCard = [
@@ -879,7 +878,7 @@ router.get(
         { hover: true }
       );
       fieldCard = [
-        (nPrimaryKeys !== 1 || nonSerialPKS) &&
+        nPrimaryKeys !== 1 &&
           !table.external &&
           !table.provider_name &&
           div(
@@ -930,7 +929,19 @@ router.get(
           p(req.__("Views define how table rows are displayed to the user"))
         );
       }
-      if (user_can_edit_views)
+      if (user_can_edit_views) {
+        let create_basic_link = "";
+        if (views.length === 0) {
+          create_basic_link = post_btn(
+            `/table/create-basic-views/${table.id}`,
+            "Create basic views",
+            req.csrfToken(),
+            {
+              btnClass: "btn-outline-secondary",
+              formClass: "d-inline me-2",
+            }
+          );
+        }
         viewCard = {
           type: "card",
           id: "table-views",
@@ -947,8 +958,10 @@ router.get(
                 class: "btn btn-primary",
               },
               req.__("Create view")
-            ),
+            ) +
+            create_basic_link,
         };
+      }
       if (user_can_edit_triggers)
         triggerCard = {
           type: "card",
@@ -2206,6 +2219,7 @@ router.post(
       await table.deleteRows({}, req.user, true);
       req.flash("success", req.__("Deleted all rows"));
     } catch (e) {
+      console.error(e)
       req.flash("error", e.message);
     }
 
@@ -2387,3 +2401,82 @@ router.post(
     res.redirect(`/table/${table.id}`);
   })
 );
+
+router.post(
+  "/create-basic-views/:id",
+  isAdminOrHasConfigMinRole("min_role_edit_tables"),
+  isAdminOrHasConfigMinRole("min_role_edit_views"),
+  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;
+    }
+    const initial_view = async (table, viewtemplate) => {
+      const configuration = await initial_config_all_fields(
+        viewtemplate === "Edit"
+      )({ table_id: table.id });
+      //console.log(configuration);
+      const name = `${viewtemplate} ${table.name}`;
+      const view = await View.create({
+        name,
+        configuration,
+        viewtemplate,
+        table_id: table.id,
+        min_role: 100,
+      });
+      return view;
+    };
+    const list = await initial_view(table, "List");
+    const edit = await initial_view(table, "Edit");
+    const show = await initial_view(table, "Show");
+    await View.update(
+      {
+        configuration: {
+          ...list.configuration,
+          columns: [
+            ...list.configuration.columns,
+            {
+              type: "ViewLink",
+              view: `Own:Show ${table.name}`,
+              view_name: `Show ${table.name}`,
+              link_style: "",
+              view_label: "Show",
+              header_label: "Show",
+            },
+            {
+              type: "ViewLink",
+              view: `Own:Edit ${table.name}`,
+              view_name: `Edit ${table.name}`,
+              link_style: "",
+              view_label: "Edit",
+              header_label: "Edit",
+            },
+            {
+              type: "Action",
+              action_name: "Delete",
+              action_style: "btn-primary",
+            },
+          ],
+          view_to_create: `Edit ${table.name}`,
+        },
+      },
+      list.id
+    );
+    await View.update(
+      {
+        configuration: {
+          ...edit.configuration,
+          view_when_done: `List ${table.name}`,
+          destination_type: "View",
+        },
+      },
+      edit.id
+    );
+
+    res.redirect(`/table/${table.id}`);
+  })
+);

package/routes/utils.js

@@ -89,8 +89,8 @@ function isAdmin(req, res, next) {
       req.user && req.user.pending_user
         ? "/auth/twofa/login/totp"
         : req.user
-        ? "/"
-        : `/auth/login?dest=${encodeURIComponent(req.originalUrl)}`
+          ? "/"
+          : `/auth/login?dest=${encodeURIComponent(req.originalUrl)}`
     );
   }
 }
@@ -115,8 +115,8 @@ const isAdminOrHasConfigMinRole = (cfg) => (req, res, next) => {
       req.user && req.user.pending_user
         ? "/auth/twofa/login/totp"
         : req.user
-        ? "/"
-        : `/auth/login?dest=${encodeURIComponent(req.originalUrl)}`
+          ? "/"
+          : `/auth/login?dest=${encodeURIComponent(req.originalUrl)}`
     );
   }
 };
@@ -164,7 +164,7 @@ const set_custom_http_headers = (res, req, state) => {
         validateHeaderName(k);
         validateHeaderValue(k, val);
         res.header(k, val);
-      } catch (e) {
+      } catch (e) {      
         Crash.create(e, { url: "/", headers: {} });
       }
     }
@@ -342,6 +342,10 @@ const getSessionStore = (pruneInterval) => {
       sameSite: "strict",
     });
   } else*/
+  if (!db.connectObj.session_secret)
+    console.warn(
+      "WARNING: Session secret not set, degrading functionality. Set session_secret in the config file"
+    );
   let sameSite = getState().getConfig("cookie_samesite", "None").toLowerCase();
   if (sameSite === "unset") sameSite = undefined;
   if (db.isSQLite) {
@@ -431,8 +435,8 @@ const admin_config_route = ({
           action: super_path + path,
         })
       : typeof get_form === "function"
-      ? await get_form(req)
-      : get_form;
+        ? await get_form(req)
+        : get_form;
 
   router.get(
     path,
@@ -500,6 +504,7 @@ const sendHtmlFile = async (req, res, file) => {
         .sendWrap(req.__("An error occurred"), req.__("File not found"));
     }
   } catch (e) {
+    console.error(e)
     return res
       .status(404)
       .sendWrap(

package/routes/viewedit.js

@@ -132,7 +132,10 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
   const isEdit =
     values && values.id && !getState().getConfig("development_mode", false);
   const hasTable = Object.entries(getState().viewtemplates)
-    .filter(([k, v]) => !v.tableless)
+    .filter(([k, v]) => !v.tableless && !v.table_optional)
+    .map(([k, v]) => k);
+  const tableOptional = Object.entries(getState().viewtemplates)
+    .filter(([k, v]) => v.table_optional)
     .map(([k, v]) => k);
   const slugOptions = await Table.allSlugOptions();
   const viewpatternOptions = Object.values(getState().viewtemplates)
@@ -186,6 +189,23 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
             : { nosuchvar: true }
           : { viewtemplate: hasTable },
       }),
+      ...(tableOptional.length
+        ? [
+            new Field({
+              label: req.__("Table"),
+              name: "table_name",
+              input_type: "select",
+              sublabel: req.__("Display data from this table"),
+              options: [{ value: "", label: "Table not set" }, ...tableOptions],
+              disabled: isEdit,
+              showIf: isEdit
+                ? tableOptional.includes(values.viewtemplate)
+                  ? undefined
+                  : { nosuchvar: true }
+                : { viewtemplate: tableOptional },
+            }),
+          ]
+        : []),
       new Field({
         name: "min_role",
         label: req.__("Minimum role"),

package/tests/viewedit.test.js

@@ -207,6 +207,7 @@ describe("viewedit new List", () => {
       .post("/viewedit/config/mybooklist")
       .send("contextEnc=" + ctx)
       .send("stepName=Options")
+      .send("_row_click_type=Nothing")
       .set("Cookie", loginCookie)
       .expect(toRedirect("/viewedit"));
   });
@@ -330,6 +331,7 @@ describe("viewedit new List with one field", () => {
       .post("/viewedit/config/mybooklist1")
       .send("contextEnc=" + ctx)
       .send("stepName=Options")
+      .send("_row_click_type=Nothing")
       .set("Cookie", loginCookie)
       .expect(toRedirect("/viewedit"));
   });