@saltcorn/server 1.3.0-beta.9 → 1.3.1-beta.0

package/routes/actions.js

@@ -1234,23 +1234,26 @@ router.get(
         { orderBy: "RANDOM()", forUser: req.user, forPublic: !req.user }
       );
     }
-    let runres;
 
-    try {
-      runres = await trigger.runWithoutRow({
-        console: fakeConsole,
-        table,
-        row,
-        req,
-        interactive: true,
-        ...(row || {}),
-        Table,
-        user: req.user,
-      });
-    } catch (e) {
-      console.error(e);
-      fakeConsole.error(e.message);
-    }
+    const runres = await db.withTransaction(
+      async () => {
+        return await trigger.runWithoutRow({
+          console: fakeConsole,
+          table,
+          row,
+          req,
+          interactive: true,
+          ...(row || {}),
+          Table,
+          user: req.user,
+        });
+      },
+      (e) => {
+        console.error(e);
+        fakeConsole.error(e.message);
+      }
+    );
+
     if (output.length === 0) {
       req.flash(
         "success",

package/routes/admin.js

@@ -2360,6 +2360,7 @@ router.get(
     const images = (await File.find({ mime_super: "image" })).filter((image) =>
       image.filename?.endsWith(".png")
     );
+    const files = await File.find({ folder: "/" });
     const keystoreFiles = await File.find({ folder: "keystore_files" });
     const provisioningFiles = await File.find({ folder: "provisioning_files" });
     const withSyncInfo = await Table.find({ has_sync_info: true });
@@ -2377,6 +2378,7 @@ router.get(
     const xcodebuildVersion = xcodeCheckRes.version;
     const layout = getState().getLayout(req.user);
     const isSbadmin2 = layout === getState().layouts.sbadmin2;
+    const pushEnabled = getState().getConfig("enable_push_notify", false);
     send_admin_page({
       res,
       req,
@@ -3245,7 +3247,50 @@ router.get(
                             placeholder: "",
                           })
                         )
-                      )
+                      ),
+                      // google-services.json file
+                      pushEnabled
+                        ? div(
+                            { class: "row pb-3" },
+                            div(
+                              { class: "col-sm-8" },
+                              label(
+                                {
+                                  for: "googleServicesInputId",
+                                  class: "form-label fw-bold",
+                                },
+                                req.__("Google Services File"),
+                                a(
+                                  {
+                                    href: "javascript:ajax_modal('/admin/help/Google Services File?')",
+                                  },
+                                  i({ class: "fas fa-question-circle ps-1" })
+                                )
+                              ),
+                              select(
+                                {
+                                  class: "form-select",
+                                  name: "googleServicesFile",
+                                  id: "googleServicesInputId",
+                                },
+                                [
+                                  option({ value: "" }, ""),
+                                  ...files.map((file) =>
+                                    option(
+                                      {
+                                        value: file.location,
+                                        selected:
+                                          builderSettings.googleServicesFile ===
+                                          file.location,
+                                      },
+                                      file.filename
+                                    )
+                                  ),
+                                ].join("")
+                              )
+                            )
+                          )
+                        : ""
                     )
                   ),
                   div(
@@ -3685,6 +3730,7 @@ router.post(
       keystoreFile,
       keystoreAlias,
       keystorePassword,
+      googleServicesFile,
     } = req.body || {};
     const receiveShareTriggers = Trigger.find({
       when_trigger: "ReceiveMobileShareData",
@@ -3825,6 +3871,8 @@ router.post(
       spawnParams.push("--androidKeyStoreAlias", keystoreAlias);
     if (keystorePassword)
       spawnParams.push("--androidKeystorePassword", keystorePassword);
+    if (googleServicesFile)
+      spawnParams.push("--googleServicesFile", googleServicesFile);
 
     // if builDir exists, remove it
     if (
@@ -4501,6 +4549,35 @@ admin_config_route({
       name: "pwa_icons",
       showIf: { pwa_enabled: true },
     },
+    { section_header: "Push Notifications" },
+    "enable_push_notify",
+    {
+      name: "push_notification_icon",
+      showIf: { enable_push_notify: true },
+    },
+    {
+      name: "push_notification_badge",
+      showIf: { enable_push_notify: true },
+    },
+    { section_header: "Web push" },
+    {
+      name: "vapid_public_key",
+      showIf: { enable_push_notify: true },
+    },
+    {
+      name: "vapid_private_key",
+      showIf: { enable_push_notify: true },
+    },
+    {
+      name: "vapid_email",
+      showIf: { enable_push_notify: true },
+    },
+    { section_header: "Native Android" },
+    {
+      name: "firebase_json_key",
+      showIf: { enable_push_notify: true },
+      help: { topic: "Firebas JSON key" },
+    },
   ],
   response(form, req, res) {
     send_admin_page({
@@ -4511,7 +4588,40 @@ admin_config_route({
         type: "card",
         title: req.__("Notification settings"),
         titleAjaxIndicator: true,
-        contents: [renderForm(form, req.csrfToken())],
+        contents: [
+          renderForm(form, req.csrfToken()) +
+            button(
+              {
+                id: "generate-vapid-keys-btn",
+                class: "btn btn-primary d-none",
+                onclick:
+                  "if (confirm('Are you sure? The old keys will be lost, and existing subscriptions will be deleted.')) ajax_post_btn('/notifications/generate-vapid-keys', true)",
+              },
+              "Generate VAPID keys"
+            ) +
+            script(
+              domReady(`
+  const fn = () => {
+    const pushEnabled = document.getElementById("inputenable_push_notify");
+    const generateBtn = document.getElementById("generate-vapid-keys-btn");
+    if (pushEnabled && pushEnabled.checked) {
+      generateBtn.classList.remove("d-none");
+      generateBtn.classList.add("d-inline");
+    }
+    else {
+      generateBtn.classList.remove("d-inline");
+      generateBtn.classList.add("d-none");
+    }
+  };
+  setTimeout(fn, 0);
+  const mainForm = document.querySelector("form[action='/admin/notifications']");
+  if (mainForm) {
+    mainForm.addEventListener("change", (e) => {
+      fn();
+    });
+  }`)
+            ),
+        ],
       },
     });
   },

package/routes/api.js

@@ -391,8 +391,8 @@ router.get(
               aggregations: {
                 _versions: {
                   table: table.name + "__history",
-                  ref: "id",
-                  field: "id",
+                  ref: table.pk_name,
+                  field: table.pk_name,
                   aggregate: "count",
                 },
               },

package/routes/fields.js

@@ -251,6 +251,7 @@ const fieldFlow = (req) =>
       attributes.include_fts = context.include_fts;
       attributes.on_delete_cascade = context.on_delete_cascade;
       attributes.on_delete = context.on_delete;
+      attributes.fkey_error_msg = context.fkey_error_msg;
       attributes.unique_error_msg = context.unique_error_msg;
       if (context.protected) attributes.min_role_write = context.min_role_write;
       else attributes.min_role_write = undefined;
@@ -307,7 +308,7 @@ const fieldFlow = (req) =>
       try {
         await db.withTransaction(async () => {
           if (context.id) {
-            const field = await Field.findOne({ id: context.id });          
+            const field = await Field.findOne({ id: context.id });
             await field.update(fldRow);
             Trigger.emitEvent(
               "AppChange",
@@ -628,7 +629,7 @@ const fieldFlow = (req) =>
                 type: "String",
                 class: "validate-expression",
                 fieldview: "textarea",
-                attributes: { rows: 2 },
+                attributes: { rows: 2, unsafe: true },
                 validator: expressionValidator,
                 showIf: { expression_type: "JavaScript expression" },
               }),
@@ -723,6 +724,15 @@ const fieldFlow = (req) =>
                   "If the parent row is deleted, do this to the child rows."
                 ),
               }),
+              new Field({
+                name: "fkey_error_msg",
+                label: req.__("Error message"),
+                type: "String",
+                sublabel: req.__(
+                  "Shown to the user if foreign key constraint is violated"
+                ),
+                showIf: { on_delete: "Fail" },
+              }),
             ],
           });
         },
@@ -1417,7 +1427,13 @@ router.post(
       return;
     }
 
-    const field = table.getField(fieldName);
+    let field = table.getField(fieldName);
+    if (!field && fieldName.split(".").length === 3) {
+      const [inboundTableName, inboundKey, refField] = fieldName.split(".");
+      const inboundTable = Table.findOne(inboundTableName);
+      field = inboundTable.getField(refField);
+    }
+
     if (!field) {
       res.send(req.query?.accept == "json" ? "[]" : "");
       return;

package/routes/list.js

@@ -65,7 +65,7 @@ router.get(
 
     const fields = table.getFields();
     var tfields = fields.map((f) => ({ label: f.label, key: f.listKey }));
-
+    const pk_name = table.pk_name;
     tfields.push({
       label: req.__("Version"),
       key: (r) => r._version,
@@ -82,7 +82,7 @@ router.get(
       label: req.__("Restore"),
       key: (r) =>
         post_btn(
-          `/list/_restore/${table.name}/${r.id}/${r._version}`,
+          `/list/_restore/${table.name}/${r[pk_name]}/${r._version}`,
           req.__("Restore"),
           req.csrfToken()
         ),
@@ -281,6 +281,7 @@ router.get(
         field: "_versions",
         title: "Versions",
         formatter: "__versionsFormatter",
+        formatterParams: { pk_name: table.pk_name },
       });
     }
     jsfields.push({

package/routes/models.js

@@ -219,6 +219,7 @@ router.get(
     const table = await Table.findOne({ id: model.table_id });
     const instances = await ModelInstance.find({ model_id: model.id });
     const metrics = model.templateObj.metrics || {};
+    const rendered = await model.templateObj.renderModel?.({ table, ...model });
     const metricCols = Object.entries(metrics).map(([k, v]) => ({
       label: k,
       key: (inst) => inst.metric_values?.[k]?.toPrecision(6),
@@ -239,6 +240,16 @@ router.get(
             i({ class: "ms-1 fas fa-edit" })
           ),
         },
+        ...(rendered
+          ? [
+              {
+                type: "card",
+                class: "mt-0 mb-3",
+                title: req.__("Model configuration"),
+                contents: div(rendered),
+              },
+            ]
+          : []),
         {
           type: "card",
           class: "mt-0",

package/routes/notifications.js

@@ -32,14 +32,23 @@ router.use(
   })
 );
 
-const notificationSettingsForm = () =>
-  new Form({
+const notificationSettingsForm = () => {
+  const fields = [{ name: "notify_email", label: "Email", type: "Bool" }];
+  if (getState().getConfig("enable_push_notify", false))
+    fields.push({
+      name: "notify_push",
+      label: "Push",
+      type: "Bool",
+    });
+
+  return new Form({
     action: `/notifications/settings`,
     noSubmitButton: true,
     onChange: `saveAndContinue(this)`,
     labelCols: 4,
-    fields: [{ name: "notify_email", label: "Email", type: "Bool" }],
+    fields,
   });
+};
 
 router.get(
   "/",
@@ -67,7 +76,10 @@ router.get(
 
     const form = notificationSettingsForm();
     const user = await User.findOne({ id: req.user?.id });
-    form.values = { notify_email: user?._attributes?.notify_email };
+    form.values = {
+      notify_email: user?._attributes?.notify_email,
+      notify_push: user?._attributes?.notify_push,
+    };
     const notifyCards = nots.length
       ? nots.map((not) => ({
           type: "card",
@@ -185,6 +197,16 @@ router.post(
     form.validate(req.body || {});
     const _attributes = { ...user._attributes, ...form.values };
     await user.update({ _attributes });
+    const pushEnabled = !!_attributes.notify_push;
+    const allSubs = getState().getConfig("push_notification_subscriptions", {});
+    const newSubs = { ...allSubs };
+    if (!pushEnabled && newSubs[req.user.id]) {
+      delete newSubs[req.user.id];
+      await getState().setConfig("push_notification_subscriptions", newSubs);
+    } else if (pushEnabled && !newSubs[req.user.id]) {
+      newSubs[req.user.id] = [];
+      await getState().setConfig("push_notification_subscriptions", newSubs);
+    }
     res.json({ success: "ok" });
   })
 );
@@ -248,6 +270,176 @@ router.post(
   })
 );
 
+router.post(
+  "/subscribe",
+  loggedIn,
+  error_catcher(async (req, res) => {
+    const enabled = getState().getConfig("enable_push_notify", false);
+    if (!enabled) {
+      res.status(403).json({
+        error: req.__("Notifications are not enabled on this server"),
+      });
+    } else {
+      const user = req.user;
+      const allSubs = getState().getConfig(
+        "push_notification_subscriptions",
+        {}
+      );
+      const userSubs = allSubs[user.id] || [];
+      const existingSub = userSubs.find(
+        (s) =>
+          s.endpoint === req.body.endpoint &&
+          s.keys.p256dh === req.body.keys.p256dh &&
+          s.keys.auth === req.body.keys.auth
+      );
+      if (existingSub) {
+        res.json({
+          success: "ok",
+          message: req.__("Already subscribed to notifications"),
+        });
+      } else {
+        userSubs.push({
+          type: "web-push",
+          endpoint: req.body.endpoint,
+          keys: {
+            auth: req.body.keys.auth,
+            p256dh: req.body.keys.p256dh,
+          },
+        });
+        await getState().setConfig("push_notification_subscriptions", {
+          ...allSubs,
+          [user.id]: userSubs,
+        });
+        res.json({
+          success: "ok",
+          message: req.__("Subscribed to notifications"),
+        });
+      }
+    }
+  })
+);
+
+router.post(
+  "/fcm-token",
+  loggedIn,
+  error_catcher(async (req, res) => {
+    const enabled = getState().getConfig("enable_push_notify", false);
+    if (!enabled) {
+      res.status(403).json({
+        error: req.__("Notifications are not enabled on this server"),
+      });
+    } else {
+      const { token, deviceId } = req.body || {};
+      if (!token) {
+        res.status(400).json({
+          error: req.__("FCM token is required"),
+        });
+        return;
+      }
+      const user = req.user;
+      const allSubs = getState().getConfig(
+        "push_notification_subscriptions",
+        {}
+      );
+      let userSubs = allSubs[user.id] || [];
+      const existingSub = userSubs.find(
+        (s) =>
+          s.type === "fcm-push" && s.token === token && s.deviceId === deviceId
+      );
+      if (existingSub) {
+        res.json({
+          success: "ok",
+          message: req.__("FCM token already uploaded"),
+        });
+      } else {
+        userSubs = userSubs.filter(
+          (s) => s.type !== "fcm-push" || s.deviceId !== deviceId
+        );
+        userSubs.push({
+          type: "fcm-push",
+          token: token,
+          deviceId: deviceId,
+        });
+        await getState().setConfig("push_notification_subscriptions", {
+          ...allSubs,
+          [user.id]: userSubs,
+        });
+        res.json({
+          success: "ok",
+          message: req.__("FCM token uploaded"),
+        });
+      }
+    }
+  })
+);
+
+router.post(
+  "/remove-subscription",
+  loggedIn,
+  error_catcher(async (req, res) => {
+    const enabled = getState().getConfig("enable_push_notify", false);
+    if (!enabled) {
+      res.status(403).json({
+        error: req.__("Notifications are not enabled on this server"),
+      });
+    } else {
+      const { subscription } = req.body;
+      const user = req.user;
+      const oldSubs = getState().getConfig(
+        "push_notification_subscriptions",
+        {}
+      );
+      let userSubs = oldSubs[user.id];
+      if (userSubs) {
+        userSubs = userSubs.filter(
+          (s) =>
+            s.endpoint !== subscription.endpoint ||
+            s.keys.p256dh !== subscription.keys.p256dh ||
+            s.keys.auth !== subscription.keys.auth
+        );
+        await getState().setConfig("push_notification_subscriptions", {
+          ...oldSubs,
+          [user.id]: userSubs,
+        });
+      }
+      res.json({
+        success: "ok",
+        message: req.__("Unsubscribed from notifications"),
+      });
+    }
+  })
+);
+
+router.post(
+  "/generate-vapid-keys",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const enabled = getState().getConfig("enable_push_notify", false);
+    if (!enabled) {
+      res.status(403).json({
+        error: req.__("Notifications are not enabled on this server"),
+      });
+    } else {
+      const webPush = require("web-push");
+      const vapidKeys = webPush.generateVAPIDKeys();
+      await getState().setConfig("vapid_public_key", vapidKeys.publicKey);
+      await getState().setConfig("vapid_private_key", vapidKeys.privateKey);
+      const allSubs = getState().setConfig(
+        "push_notification_subscriptions",
+        {}
+      );
+      const newSubs = {};
+      for (const k of Object.keys(allSubs)) {
+        newSubs[k] = [];
+      }
+      await getState().setConfig("push_notification_subscriptions", newSubs);
+      res.json({
+        success: "ok",
+      });
+    }
+  })
+);
+
 router.get(
   "/manifest.json{:opt_cache_bust}",
   error_catcher(async (req, res) => {

package/routes/pageedit.js

@@ -183,6 +183,9 @@ const pageBuilderData = async (req, context) => {
   triggers.forEach((tr) => {
     actions.push(tr.name);
   });
+  const triggerActions = Trigger.trigger_actions({
+    apiNeverTriggers: true,
+  });
   const actionConfigForms = {};
   for (const name of actions) {
     const action = stateActions[name];
@@ -247,6 +250,7 @@ const pageBuilderData = async (req, context) => {
     page_groups,
     actions: actionsNotRequiringRow,
     builtInActions: ["GoBack"],
+    triggerActions,
     library,
     min_role: context.min_role,
     actionConfigForms,

package/routes/plugins.js

@@ -1230,9 +1230,7 @@ router.get(
     const mod = await load_plugins.requirePlugin(plugin_db);
     const store_items = await get_store_items();
     const store_item = store_items.find((item) => item.name === name);
-    const update_permitted =
-      db.getTenantSchema() === db.connectObj.default_schema &&
-      plugin_db.source === "npm";
+    const update_permitted = plugin_db.source === "npm";
 
     let latest =
       update_permitted &&

package/routes/search.js

@@ -71,6 +71,14 @@ const searchConfigForm = (tables, views, req) => {
     input_type: "select",
     options: ["Cards", "Tabs"],
   });
+  fields.push({
+    name: "search_disable_fts",
+    label: req.__("Disable full-text search"),
+    type: "Bool",
+    sublabel: req.__(
+      "Use LIKE instead of tsvector. Use to match against phrase in the middle of a word."
+    ),
+  });
   const blurb1 = req.__(
     `Choose views for <a href="/search">search results</a> for each table.<br/>Set to blank to omit table from global search.`
   );
@@ -112,6 +120,10 @@ router.get(
       "search_results_decoration",
       "Cards"
     );
+    form.values.search_disable_fts = getState().getConfig(
+      "search_disable_fts",
+      true
+    );
     send_infoarch_page({
       res,
       req,
@@ -154,6 +166,10 @@ router.post(
         "search_results_decoration",
         result.success.search_results_decoration || "Cards"
       );
+      await getState().setConfig(
+        "search_disable_fts",
+        result.success.search_disable_fts || false
+      );
       await getState().setConfig("search_use_websearch", +dbversion >= 11.0);
       delete result.success.search_table_description;
       delete result.success.search_results_decoration;
@@ -235,7 +251,9 @@ const runSearch = async ({ q, _page, table }, req, res) => {
       viewName === "search_table_description" ||
       tableName === "search_table_description" ||
       viewName === "search_results_decoration" ||
-      tableName === "search_results_decoration"
+      tableName === "search_results_decoration" ||
+      viewName === "search_disable_fts" ||
+      tableName === "search_disable_fts"
     )
       continue;
     tablesConfigured += 1;
@@ -367,7 +385,10 @@ router.get(
   "/",
   error_catcher(async (req, res, next) => {
     const state = getState();
-    const maintenanceModeEnabled = state.getConfig("maintenance_mode_enabled", false);
+    const maintenanceModeEnabled = state.getConfig(
+      "maintenance_mode_enabled",
+      false
+    );
 
     if (maintenanceModeEnabled && (!req.user || req.user.role_id > 1)) {
       res.status(503).send("Page Unavailable: in maintenance mode");

package/routes/tables.js

@@ -748,6 +748,7 @@ const attribBadges = (f) => {
           "summary_field",
           "importance",
           "on_delete_cascade",
+          "fkey_error_msg",
           "on_delete",
           "unique_error_msg",
           "ref",

package/routes/tenant.js

@@ -435,7 +435,10 @@ router.get(
               {
                 label: req.__("Subdomain"),
                 key: (r) =>
-                  link(getNewURL(req, r.subdomain, get_cfg_tenant_base_url(req)), text(r.subdomain)),
+                  link(
+                    getNewURL(req, r.subdomain, get_cfg_tenant_base_url(req)),
+                    text(r.subdomain)
+                  ),
               },
               {
                 label: req.__("Description"),
@@ -909,6 +912,7 @@ router.post(
     const { sub } = req.params;
     // todo warning before deletion
     await deleteTenant(sub);
+    await User.destroy_all_tenant_sessions(sub);
     res.redirect(`/tenant/list`);
   })
 );