@saltcorn/server 0.9.8-rc.0 → 1.0.0-beta.0

package/locales/en.json

@@ -1453,5 +1453,11 @@
 	"Each row in a card. Not supported by all themes": "Each row in a card. Not supported by all themes",
 	"Prune session interval (seconds)": "Prune session interval (seconds)",
 	"Interval in seconds to check for expred sessions in the postgres db. 0, empty or a negative number to disable": "Interval in seconds to check for expred sessions in the postgres db. 0, empty or a negative number to disable",
-	"Progressive Web Application is not enabled": "Progressive Web Application is not enabled"
+	"Progressive Web Application is not enabled": "Progressive Web Application is not enabled",
+	"Events and Trigger settings": "Events and Trigger settings",
+	"Periodic trigger timing (next event)": "Periodic trigger timing (next event)",
+	"Hourly": "Hourly",
+	"Daily": "Daily",
+	"Weekly": "Weekly",
+	"Code pages": "Code pages"
 }

package/markup/admin.js

@@ -308,7 +308,7 @@ const send_events_page = (args) => {
     sub_sections: [
       { text: "Triggers", href: "/actions" },
       { text: "Custom", href: "/eventlog/custom" },
-      { text: "Log settings", href: "/eventlog/settings" },
+      { text: "Settings", href: "/eventlog/settings" },
       { text: "Event log", href: "/eventlog" },
       ...(isRoot ? [{ text: "Crash log", href: "/crashlog" }] : []),
     ],

package/package.json

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

package/public/saltcorn.css

@@ -586,3 +586,7 @@ button.monospace-copy-btn {
   border-right: 1px #e3e6f0 !important;
   border-radius: 0 6px 6px 0;
 }
+
+.custom-file-label {
+  margin-left: 10px;
+}

package/routes/admin.js

@@ -109,6 +109,7 @@ const Crash = require("@saltcorn/data/models/crash");
 const { get_help_markup } = require("../help/index.js");
 const Docker = require("dockerode");
 const npmFetch = require("npm-registry-fetch");
+const Tag = require("@saltcorn/data/models/tag");
 
 const router = new Router();
 module.exports = router;
@@ -3226,7 +3227,8 @@ router.post(
       const userfields1 = await users1.getFields();
 
       for (const f of userfields1) {
-        if (f.name !== "email" && f.name !== "id") await f.delete();
+        if (f.name !== "email" && f.name !== "id" && f.name !== "role_id")
+          await f.delete();
       }
       await db.deleteWhere("users");
       await db.deleteWhere("_sc_roles", {
@@ -3451,7 +3453,64 @@ router.get(
         },
       ],
     });
-
+    const function_code_pages_tags = getState().getConfigCopy(
+      "function_code_pages_tags",
+      {}
+    );
+    const tags = await Tag.find();
+    const tagMarkup = div(
+      "Tags:",
+      (function_code_pages_tags[name] || []).map((tagnm) =>
+        span(
+          {
+            class: ["ms-2 badge bg-secondary"],
+          },
+          tagnm,
+          a(
+            {
+              onclick: `rm_cp_tag('${tagnm}')`,
+            },
+            i({ class: "ms-1 fas fa-lg fa-times" })
+          )
+        )
+      ),
+      span(
+        { class: "dropdown", id: `ddcodetags` },
+        span(
+          {
+            class: ["ms-2 badge", "bg-secondary", "dropdown-toggle"],
+            "data-bs-toggle": "dropdown",
+            "aria-haspopup": "true",
+            "aria-expanded": "false",
+          },
+          i({ class: "fas fa-lg fa-plus" })
+        ),
+        div(
+          { class: "dropdown-menu", "aria-labelledby": "ddcodetags" },
+          tags
+            .map((t) =>
+              a(
+                {
+                  class: "dropdown-item",
+                  onclick: `add_cp_tag('${t.name}')`,
+                },
+                t.name
+              )
+            )
+            .join("")
+        )
+      ),
+      script(`function add_cp_tag(nm) {
+        ajax_post("/admin/add-codepage-tag/${encodeURIComponent(
+          name
+        )}/"+encodeURIComponent(nm))
+      }
+      function rm_cp_tag(nm) {
+        ajax_post("/admin/rm-codepage-tag/${encodeURIComponent(
+          name
+        )}/"+encodeURIComponent(nm))
+      }`)
+    );
     send_admin_page({
       res,
       req,
@@ -3460,7 +3519,7 @@ router.get(
       contents: {
         type: "card",
         title: req.__(`%s code page`, name),
-        contents: [renderForm(form, req.csrfToken())],
+        contents: [renderForm(form, req.csrfToken()), tagMarkup],
       },
     });
   })
@@ -3496,7 +3555,50 @@ router.post(
     res.json({ goto: `/admin/dev` });
   })
 );
+router.post(
+  "/add-codepage-tag/:cpname/:tagnm",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { cpname, tagnm } = req.params;
+    const function_code_pages_tags = getState().getConfigCopy(
+      "function_code_pages_tags",
+      {}
+    );
+
+    function_code_pages_tags[cpname] = [
+      ...(function_code_pages_tags[cpname] || []),
+      tagnm,
+    ];
+    await getState().setConfig(
+      "function_code_pages_tags",
+      function_code_pages_tags
+    );
+
+    res.json({ reload_page: true });
+  })
+);
+router.post(
+  "/rm-codepage-tag/:cpname/:tagnm",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { cpname, tagnm } = req.params;
+    const function_code_pages_tags = getState().getConfigCopy(
+      "function_code_pages_tags",
+      {}
+    );
+
+    function_code_pages_tags[cpname] = (
+      function_code_pages_tags[cpname] || []
+    ).filter((t) => t != tagnm);
 
+    await getState().setConfig(
+      "function_code_pages_tags",
+      function_code_pages_tags
+    );
+
+    res.json({ reload_page: true });
+  })
+);
 /**
  * Notifications
  */

package/routes/api.js

@@ -380,8 +380,11 @@ router.all(
             else if (req.headers?.scgotourl)
               res.redirect(req.headers?.scgotourl);
             else {
-              if (trigger.configuration?._raw_output) res.json({ resp });
-              else res.json({ success: true, data: resp });
+              if (trigger.configuration?._raw_output) res.json(resp);
+              else if (resp?.error) {
+                const { error, ...rest } = resp;
+                res.json({ success: false, error, data: rest });
+              } else res.json({ success: true, data: resp });
             }
           } catch (e) {
             Crash.create(e, req);

package/routes/eventlog.js

@@ -50,8 +50,41 @@ const EventLog = require("@saltcorn/data/models/eventlog");
  * @param {object} req
  * @returns {Promise<Form>}
  */
+
 const logSettingsForm = async (req) => {
-  const fields = [];
+  const hoursFuture = (nhrs) => {
+    const t = new Date();
+    t.setHours(t.getHours() + nhrs);
+    return t;
+  };
+  const fields = [
+    {
+      input_type: "section_header",
+      label: req.__("Periodic trigger timing (next event)"),
+    },
+    {
+      name: "next_hourly_event",
+      label: req.__("Hourly"),
+      input_type: "date",
+      attributes: { minDate: new Date(), maxDate: hoursFuture(2) },
+    },
+    {
+      name: "next_daily_event",
+      label: req.__("Daily"),
+      input_type: "date",
+      attributes: { minDate: new Date(), maxDate: hoursFuture(48) },
+    },
+    {
+      name: "next_weekly_event",
+      label: req.__("Weekly"),
+      input_type: "date",
+      attributes: { minDate: new Date(), maxDate: hoursFuture(24 * 7 * 2) },
+    },
+    {
+      input_type: "section_header",
+      label: req.__("Which events should be logged?"),
+    },
+  ];
   for (const w of Trigger.when_options) {
     fields.push({
       name: w,
@@ -82,7 +115,6 @@ const logSettingsForm = async (req) => {
   }
   return new Form({
     action: "/eventlog/settings",
-    blurb: req.__("Which events should be logged?"),
     noSubmitButton: true,
     onChange: "saveAndContinue(this)",
     fields,
@@ -101,15 +133,25 @@ router.get(
   error_catcher(async (req, res) => {
     const form = await logSettingsForm(req);
     form.values = getState().getConfig("event_log_settings", {});
+    form.values.next_hourly_event = getState().getConfig(
+      "next_hourly_event",
+      {}
+    );
+    form.values.next_daily_event = getState().getConfig("next_daily_event", {});
+    form.values.next_weekly_event = getState().getConfig(
+      "next_weekly_event",
+      {}
+    );
+
     send_events_page({
       res,
       req,
-      active_sub: "Log settings",
+      active_sub: "Settings",
       //sub2_page: "Events to log",
       contents: {
         type: "card",
         titleAjaxIndicator: true,
-        title: req.__("Events to log"),
+        title: req.__("Events and Trigger settings"),
         contents: renderForm(form, req.csrfToken()),
       },
     });
@@ -289,7 +331,7 @@ router.post(
       send_events_page({
         res,
         req,
-        active_sub: "Log settings",
+        active_sub: "Settings",
         //sub2_page: "Events to log",
         contents: {
           type: "card",
@@ -298,6 +340,14 @@ router.post(
         },
       });
     } else {
+      for (const tm of ["hourly", "daily", "weekly"]) {
+        const k = `next_${tm}_event`;
+        if (form.values[k]) {
+          await getState().setConfig(k, form.values[k]);
+          delete form.values[k];
+        }
+      }
+
       await getState().setConfig("event_log_settings", form.values);
 
       if (!req.xhr) res.redirect(`/eventlog/settings`);

package/routes/tags.js

@@ -1,4 +1,4 @@
-const { a, text, i } = require("@saltcorn/markup/tags");
+const { a, text, i, div } = require("@saltcorn/markup/tags");
 
 const Tag = require("@saltcorn/data/models/tag");
 const Router = require("express-promise-router");
@@ -171,6 +171,13 @@ router.get(
     const viewsDomId = "viewsListId";
     const pagesDomId = "pagesDomId";
     const triggersDomId = "triggerDomId";
+    const function_code_pages_tags = getState().getConfigCopy(
+      "function_code_pages_tags",
+      {}
+    );
+    const code_pages = Object.entries(function_code_pages_tags)
+      .filter(([nm, tags]) => (tags || []).includes(tag.name))
+      .map(([nm, tags]) => nm);
     res.sendWrap(req.__("%s Tag", tag.name), {
       above: [
         {
@@ -270,6 +277,20 @@ router.get(
             ),
           ],
         },
+        {
+          type: "card",
+          title: req.__("Code pages") + ` (${code_pages.length})`,
+
+          contents: code_pages.map((cp) =>
+            a(
+              {
+                class: "me-2",
+                href: `/admin/edit-codepage/${encodeURIComponent(cp)}`,
+              },
+              cp
+            )
+          ),
+        },
         {
           type: "card",
           contents: [

package/routes/utils.js

@@ -239,8 +239,14 @@ const setTenant = (req, res, next) => {
       }
     }
   } else {
-    setLanguage(req, res);
-    getState().log(5, `${req.method} ${req.originalUrl}`);
+    const state = getState();
+    setLanguage(req, res, state);
+    state.log(
+      5,
+      `${req.method} ${req.originalUrl}${
+        state.getConfig("log_ip_address", false) ? ` IP=${req.ip}` : ""
+      }`
+    );
     next();
   }
 };

package/tests/admin.test.js

@@ -18,6 +18,11 @@ const fs = require("fs").promises;
 const File = require("@saltcorn/data/models/file");
 const User = require("@saltcorn/data/models/user");
 const EventLog = require("@saltcorn/data/models/eventlog");
+const {
+  create_backup,
+  restore,
+  auto_backup_now,
+} = require("@saltcorn/admin-models/models/backup");
 
 jest.setTimeout(30000);
 
@@ -615,6 +620,11 @@ describe("server logs viewer", () => {
  */
 describe("clear all page", () => {
   itShouldRedirectUnauthToLogin("/admin/clear-all");
+  let backup_fnm;
+  it("backs up before clear all", async () => {
+    backup_fnm = await create_backup();
+  });
+
   it("show page", async () => {
     const app = await getApp({ disableCsrf: true });
     const loginCookie = await getAdminLoginCookie();
@@ -639,4 +649,11 @@ describe("clear all page", () => {
       .send("plugins=on")
       .expect(toRedirect("/auth/create_first_user"));
   });
+  it("restores backup after clear all", async () => {
+    const restore_res = await restore(backup_fnm, (p) => {}, true);
+    await fs.unlink(backup_fnm);
+
+    if (restore_res) console.log("rr", restore_res);
+    expect(!!restore_res).toBe(false);
+  });
 });

package/tests/api.test.js

@@ -376,6 +376,34 @@ describe("API action", () => {
       `,
       },
     });
+    await Trigger.create({
+      action: "run_js_code",
+      when_trigger: "API call",
+      name: "apicallraw",
+      min_role: 100,
+      configuration: {
+        code: `return {studio: 54}`,
+        _raw_output: true,
+      },
+    });
+    await Trigger.create({
+      action: "run_js_code",
+      when_trigger: "API call",
+      name: "apicallerror",
+      min_role: 100,
+      configuration: {
+        code: `return {error: "bad"}`,
+      },
+    });
+    await Trigger.create({
+      action: "run_js_code",
+      when_trigger: "API call",
+      name: "apicallundef",
+      min_role: 100,
+      configuration: {
+        code: `return;`,
+      },
+    });
   });
   it("should POST to trigger", async () => {
     const app = await getApp({ disableCsrf: true });
@@ -386,12 +414,44 @@ describe("API action", () => {
       })
       .set("Content-Type", "application/json")
       .set("Accept", "application/json")
-      .expect(succeedJsonWithWholeBody((resp) => resp?.data?.studio === 54));
+      .expect(
+        succeedJsonWithWholeBody(
+          (resp) => resp?.data?.studio === 54 && resp.success === true
+        )
+      );
     const table = Table.findOne({ name: "triggercounter" });
     const counts = await table.getRows({});
     expect(counts.map((c) => c.thing)).toContain("inthebody");
     expect(counts.map((c) => c.thing)).not.toContain("no body");
   });
+  it("should POST to raw trigger", async () => {
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .post("/api/action/apicallraw")
+      .set("Content-Type", "application/json")
+      .set("Accept", "application/json")
+      .expect(succeedJsonWithWholeBody((resp) => resp?.studio === 54));
+  });
+  it("should POST to raw trigger", async () => {
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .post("/api/action/apicallerror")
+      .set("Content-Type", "application/json")
+      .set("Accept", "application/json")
+      .expect(
+        succeedJsonWithWholeBody(
+          (resp) => resp?.error === "bad" && resp.success === false
+        )
+      );
+  });
+  it("should POST to undefiend trigger", async () => {
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .post("/api/action/apicallundef")
+      .set("Content-Type", "application/json")
+      .set("Accept", "application/json")
+      .expect(succeedJsonWithWholeBody((resp) => resp.success === true));
+  });
   it("should GET with query to trigger", async () => {
     const app = await getApp({ disableCsrf: true });
     await request(app)

package/tests/files.test.js

@@ -187,7 +187,7 @@ describe("files admin", () => {
     const app = await getApp({ disableCsrf: true });
     const loginCookie = await getAdminLoginCookie();
     const checkFiles = (files, expecteds) =>
-      files.length === expecteds.length &&
+      files.length >= expecteds.length &&
       expecteds.every(({ filename, location }) =>
         files.find(
           (file) => file.filename === filename && file.location === location