@saltcorn/server 0.9.5-beta.11 → 0.9.5-beta.13

package/locales/en.json

@@ -1391,5 +1391,8 @@
 	"refresh": "refresh",
 	"installed": "installed",
 	"Include table history in backup": "Include table history in backup",
-	"The plugin was corrupted and had to be repaired. We recommend restarting your server.": "The plugin was corrupted and had to be repaired. We recommend restarting your server."
-}
+	"The plugin was corrupted and had to be repaired. We recommend restarting your server.": "The plugin was corrupted and had to be repaired. We recommend restarting your server.",
+	"%s code page": "%s code page",
+	"Constants and function code": "Constants and function code",
+	"Delete code page": "Delete code page"
+}

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.5-beta.11",
+  "version": "0.9.5-beta.13",
   "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.5-beta.11",
-    "@saltcorn/builder": "0.9.5-beta.11",
-    "@saltcorn/data": "0.9.5-beta.11",
-    "@saltcorn/admin-models": "0.9.5-beta.11",
-    "@saltcorn/filemanager": "0.9.5-beta.11",
-    "@saltcorn/markup": "0.9.5-beta.11",
-    "@saltcorn/plugins-loader": "0.9.5-beta.11",
-    "@saltcorn/sbadmin2": "0.9.5-beta.11",
+    "@saltcorn/base-plugin": "0.9.5-beta.13",
+    "@saltcorn/builder": "0.9.5-beta.13",
+    "@saltcorn/data": "0.9.5-beta.13",
+    "@saltcorn/admin-models": "0.9.5-beta.13",
+    "@saltcorn/filemanager": "0.9.5-beta.13",
+    "@saltcorn/markup": "0.9.5-beta.13",
+    "@saltcorn/plugins-loader": "0.9.5-beta.13",
+    "@saltcorn/sbadmin2": "0.9.5-beta.13",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn-common.js

@@ -159,10 +159,18 @@ function apply_showif() {
       decodeURIComponent(e.attr("data-fetch-options"))
     );
     if (window._sc_loglevel > 4) console.log("dynwhere", dynwhere);
-    const kvToQs = ([k, v]) => {
+    const kvToQs = ([k, v], is_or) => {
       return k === "or" && Array.isArray(v)
-        ? v.map((v1) => Object.entries(v1).map(kvToQs).join("&")).join("&")
-        : `${k}=${v[0] === "$" ? rec[v.substring(1)] : v}`;
+        ? v
+            .map((v1) =>
+              Object.entries(v1)
+                .map((kv) => kvToQs(kv, true))
+                .join("&")
+            )
+            .join("&")
+        : `${k}=${v[0] === "$" ? rec[v.substring(1)] : v}${
+            is_or ? "&_or_field=" + k : ""
+          }`;
     };
     const qss = Object.entries(dynwhere.whereParsed).map(kvToQs);
     if (dynwhere.dereference) {

package/routes/actions.js

@@ -662,6 +662,7 @@ router.get(
         onChange: "saveAndContinue(this)",
         submitLabel: req.__("Done"),
         fields: cfgFields,
+        ...(action.configFormOptions || {}),
       });
       // populate form values
       form.values = trigger.configuration;

package/routes/admin.js

@@ -2772,6 +2772,7 @@ admin_config_route({
     });
   },
   response(form, req, res) {
+    const code_pages = getState().getConfig("function_code_pages", {});
     send_admin_page({
       res,
       req,
@@ -2798,11 +2799,138 @@ admin_config_route({
               ),
             ],
           },
+          {
+            type: "card",
+            title: req.__("Constants and function code"),
+            contents: [
+              div(
+                Object.keys(code_pages)
+                  .map((k) =>
+                    a(
+                      {
+                        href: `/admin/edit-codepage/${encodeURIComponent(k)}`,
+                        class: "",
+                      },
+                      k
+                    )
+                  )
+                  .join(" | "),
+                button(
+                  {
+                    class: "btn btn-secondary btn-sm d-block mt-2",
+                    onclick: `location.href='/admin/edit-codepage/'+prompt('Name of the new page')`,
+                  },
+                  i({ class: "fas fa-plus me-1" }),
+                  "Add page"
+                )
+              ),
+            ],
+          },
         ],
       },
     });
   },
 });
+
+router.get(
+  "/edit-codepage/:name",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { name } = req.params;
+    const code_pages = getState().getConfig("function_code_pages", {});
+    const existing = code_pages[name] || "";
+    const form = new Form({
+      action: `/admin/edit-codepage/${encodeURIComponent(name)}`,
+      onChange: "saveAndContinue(this)",
+      values: { code: existing },
+      noSubmitButton: true,
+      labelCols: 0,
+      additionalButtons: [
+        {
+          label: req.__("Delete code page"),
+          class: "btn btn-outline-danger btn-sm",
+          onclick: `if(confirm('Are you sure you would like to delete this code page?'))ajax_post('/admin/delete-codepage/${encodeURIComponent(
+            name
+          )}')`,
+        },
+      ],
+      fields: [
+        {
+          name: "code",
+          form_name: "code",
+          label: "Code",
+          sublabel:
+            "Only functions declared as <code>function name(...) {...}</code> or <code>async function name(...) {...}</code> will be available in formulae and code actions. Declare a constant <code>k</code> as <code>globalThis.k = ...</code> In scope: " +
+            a(
+              {
+                href: "https://saltcorn.github.io/saltcorn/classes/_saltcorn_data.models.Table-1.html",
+                target: "_blank",
+              },
+              "Table"
+            ),
+          input_type: "code",
+          attributes: { mode: "text/javascript" },
+          class: "validate-statements",
+          validator(s) {
+            try {
+              let AsyncFunction = Object.getPrototypeOf(
+                async function () {}
+              ).constructor;
+              AsyncFunction(s);
+              return true;
+            } catch (e) {
+              return e.message;
+            }
+          },
+        },
+      ],
+    });
+
+    send_admin_page({
+      res,
+      req,
+      active_sub: "Development",
+      sub2_page: req.__(`%s code page`, name),
+      contents: {
+        type: "card",
+        title: req.__(`%s code page`, name),
+        contents: [renderForm(form, req.csrfToken())],
+      },
+    });
+  })
+);
+
+router.post(
+  "/edit-codepage/:name",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { name } = req.params;
+    const code_pages = getState().getConfigCopy("function_code_pages", {});
+
+    const code = req.body.code;
+    await getState().setConfig("function_code_pages", {
+      ...code_pages,
+      [name]: code,
+    });
+    await getState().refresh_codepages();
+
+    res.json({ success: true });
+  })
+);
+router.post(
+  "/delete-codepage/:name",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { name } = req.params;
+    const code_pages = getState().getConfigCopy("function_code_pages", {});
+    delete code_pages[name];
+    await getState().setConfig("function_code_pages", code_pages);
+    await getState().refresh_codepages();
+
+    res.json({ goto: `/admin/dev` });
+  })
+);
+
 /**
  * Notifications
  */

package/routes/fields.js

@@ -955,8 +955,11 @@ router.post(
             }
             return;
           }
+        }
+        if (targetField.type === "File") {
+          fv = getState().fileviews[fieldview];
         } else {
-          fv = targetField.type.fieldviews[fieldview];
+          fv = targetField.type?.fieldviews?.[fieldview];
           if (!fv)
             fv =
               targetField.type.fieldviews.show ||