@saltcorn/server 0.7.3-beta.6 → 0.7.4-beta.0

package/routes/admin.js

@@ -18,7 +18,13 @@ const { spawn } = require("child_process");
 const User = require("@saltcorn/data/models/user");
 const path = require("path");
 const { getAllTenants } = require("@saltcorn/admin-models/models/tenant");
-const { post_btn, renderForm, mkTable, link } = require("@saltcorn/markup");
+const {
+  post_btn,
+  renderForm,
+  mkTable,
+  link,
+  localeDateTime,
+} = require("@saltcorn/markup");
 const {
   div,
   a,
@@ -42,10 +48,11 @@ const {
   select,
   option,
   fieldset,
-  legend,
   ul,
   li,
   ol,
+  script,
+  domReady,
 } = require("@saltcorn/markup/tags");
 const db = require("@saltcorn/data/db");
 const {
@@ -61,6 +68,7 @@ const {
   restore,
   auto_backup_now,
 } = require("@saltcorn/admin-models/models/backup");
+const Snapshot = require("@saltcorn/admin-models/models/snapshot");
 const {
   runConfigurationCheck,
 } = require("@saltcorn/admin-models/models/config-check");
@@ -86,6 +94,8 @@ const {
 const moment = require("moment");
 const View = require("@saltcorn/data/models/view");
 const { getConfigFile } = require("@saltcorn/data/db/connect");
+const os = require("os");
+const Page = require("@saltcorn/data/models/page");
 
 /**
  * @type {object}
@@ -115,6 +125,7 @@ const site_id_form = (req) =>
       "page_custom_html",
       "development_mode",
       "log_sql",
+      "log_level",
       "plugins_store_endpoint",
       "packs_store_endpoint",
       ...(getConfigFile() ? ["multitenancy_enabled"] : []),
@@ -140,10 +151,6 @@ const email_form = async (req) => {
     ],
     action: "/admin/email",
   });
-  form.submitButtonClass = "btn-outline-primary";
-  form.submitLabel = req.__("Save");
-  form.onChange =
-    "remove_outline(this);$('#testemail').attr('href','#').removeClass('btn-primary').addClass('btn-outline-primary')";
   return form;
 };
 
@@ -214,8 +221,10 @@ router.post(
       flash_restart_if_required(form, req);
       await save_config_from_form(form);
 
-      req.flash("success", req.__("Site identity settings updated"));
-      res.redirect("/admin");
+      if (!req.xhr) {
+        req.flash("success", req.__("Site identity settings updated"));
+        res.redirect("/admin");
+      } else res.json({ success: "ok" });
     }
   })
 );
@@ -308,7 +317,8 @@ router.post(
     } else {
       await save_config_from_form(form);
       req.flash("success", req.__("Email settings updated"));
-      res.redirect("/admin/email");
+      if (!req.xhr) res.redirect("/admin/email");
+      else res.json({ success: "ok" });
     }
   })
 );
@@ -335,6 +345,9 @@ router.get(
     backupForm.values.auto_backup_expire_days = getState().getConfig(
       "auto_backup_expire_days"
     );
+    const aSnapshotForm = snapshotForm(req);
+    aSnapshotForm.values.snapshots_enabled =
+      getState().getConfig("snapshots_enabled");
     const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
 
     send_admin_page({
@@ -378,10 +391,31 @@ router.get(
                   a(
                     { href: "/admin/auto-backup-list" },
                     "Restore/download automated backups »"
+                  ),
+                  script(
+                    domReady(
+                      `$('#btnBackupNow').prop('disabled', $('#inputauto_backup_frequency').val()==='Never');`
+                    )
                   )
                 ),
               }
             : { type: "blank", contents: "" },
+          {
+            type: "card",
+            title: req.__("Snapshots"),
+            contents: div(
+              p(
+                i(
+                  "Snapshots store your application structure and definition, without the table data. Individual views and pages can be restored from snapshots from the <a href='/viewedit'>view</a> or <a href='/pageedit'>pages</a> overviews (\"Restore\" from individual page or view dropdowns)."
+                )
+              ),
+              renderForm(aSnapshotForm, req.csrfToken()),
+              a(
+                { href: "/admin/snapshot-list" },
+                "List/download snapshots &raquo;"
+              )
+            ),
+          },
         ],
       },
     });
@@ -457,6 +491,103 @@ router.get(
   })
 );
 
+router.get(
+  "/snapshot-list",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const snaps = await Snapshot.find();
+    send_admin_page({
+      res,
+      req,
+      active_sub: "Backup",
+      contents: {
+        above: [
+          {
+            type: "card",
+            title: req.__("Download snapshots"),
+            contents: div(
+              ul(
+                snaps.map((snap) =>
+                  li(
+                    a(
+                      {
+                        href: `/admin/snapshot-download/${encodeURIComponent(
+                          snap.id
+                        )}`,
+                        target: "_blank",
+                      },
+                      `${localeDateTime(snap.created)} (${moment(
+                        snap.created
+                      ).fromNow()})`
+                    )
+                  )
+                )
+              )
+            ),
+          },
+        ],
+      },
+    });
+  })
+);
+
+router.get(
+  "/snapshot-download/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const snap = await Snapshot.findOne({ id });
+    res.send(snap.pack);
+  })
+);
+
+router.get(
+  "/snapshot-restore/:type/:name",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { type, name } = req.params;
+    const snaps = await Snapshot.entity_history(type, name);
+    res.send(
+      mkTable(
+        [
+          {
+            label: "When",
+            key: (r) =>
+              `${localeDateTime(r.created)} (${moment(r.created).fromNow()})`,
+          },
+
+          {
+            label: req.__("Restore"),
+            key: (r) =>
+              post_btn(
+                `/admin/snapshot-restore/${type}/${name}/${r.id}`,
+                req.__("Restore"),
+                req.csrfToken()
+              ),
+          },
+        ],
+        snaps
+      )
+    );
+  })
+);
+
+router.post(
+  "/snapshot-restore/:type/:name/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { type, name, id } = req.params;
+    const snap = await Snapshot.findOne({ id });
+    await snap.restore_entity(type, name);
+    req.flash(
+      "success",
+      `${type} ${name} restored to snapshot saved ${moment(
+        snap.created
+      ).fromNow()}`
+    );
+    res.redirect(`/${type}edit`);
+  })
+);
 router.get(
   "/auto-backup-download/:filename",
   isAdmin,
@@ -483,9 +614,8 @@ router.get(
 const autoBackupForm = (req) =>
   new Form({
     action: "/admin/set-auto-backup",
-    submitButtonClass: "btn-outline-primary",
-    onChange: "remove_outline(this)",
-    submitLabel: "Save settings",
+    onChange: `saveAndContinue(this);$('#btnBackupNow').prop('disabled', $('#inputauto_backup_frequency').val()==='Never');`,
+    noSubmitButton: true,
     additionalButtons: [
       {
         label: "Backup now",
@@ -534,6 +664,43 @@ const autoBackupForm = (req) =>
     ],
   });
 
+const snapshotForm = (req) =>
+  new Form({
+    action: "/admin/set-snapshot",
+    onChange: `saveAndContinue(this);`,
+    noSubmitButton: true,
+    additionalButtons: [
+      {
+        label: "Snapshot now",
+        id: "btnSnapNow",
+        class: "btn btn-outline-secondary",
+        onclick: "ajax_post('/admin/snapshot-now')",
+      },
+    ],
+    fields: [
+      {
+        type: "Bool",
+        label: req.__("Periodic snapshots enabled"),
+        name: "snapshots_enabled",
+        sublabel: req.__(
+          "Snapshot will be made every hour if there are changes"
+        ),
+      },
+    ],
+  });
+router.post(
+  "/set-snapshot",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const form = await snapshotForm(req);
+    form.validate(req.body);
+
+    await save_config_from_form(form);
+    req.flash("success", req.__("Snapshot settings updated"));
+    if (!req.xhr) res.redirect("/admin/backup");
+    else res.json({ success: "ok" });
+  })
+);
 router.post(
   "/set-auto-backup",
   isAdmin,
@@ -554,7 +721,8 @@ router.post(
     } else {
       await save_config_from_form(form);
       req.flash("success", req.__("Backup settings updated"));
-      res.redirect("/admin/backup");
+      if (!req.xhr) res.redirect("/admin/backup");
+      else res.json({ success: "ok" });
     }
   })
 );
@@ -572,6 +740,22 @@ router.post(
   })
 );
 
+router.post(
+  "/snapshot-now",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    try {
+      const taken = await Snapshot.take_if_changed();
+      if (taken) req.flash("success", req.__("Snapshot successful"));
+      else
+        req.flash("success", req.__("No changes detected, snapshot skipped"));
+    } catch (e) {
+      req.flash("error", e.message);
+    }
+    res.json({ reload_page: true });
+  })
+);
+
 /**
  * @name get/system
  * @function
@@ -1057,12 +1241,39 @@ router.get(
   })
 );
 
+const dialogScript = `<script>
+function swapEntryInputs(activeTab, activeInput, disabledTab, disabledInput) {
+  activeTab.addClass("active");
+  activeInput.removeClass("d-none");
+  activeInput.addClass("d-block");
+  activeInput.attr("name", "entryPoint");
+  disabledTab.removeClass("active");
+  disabledInput.removeClass("d-block");
+  disabledInput.addClass("d-none");
+  disabledInput.removeAttr("name");
+}
+
+function showEntrySelect(type) {
+  const viewNavLin = $("#viewNavLinkID");
+  const pageNavLink = $("#pageNavLinkID");
+  const viewInp = $("#viewInputID");
+  const pageInp = $("#pageInputID");
+  if (type === "page") {
+    swapEntryInputs(pageNavLink, pageInp, viewNavLin, viewInp);
+  }
+  else if (type === "view") {
+    swapEntryInputs(viewNavLin, viewInp, pageNavLink, pageInp);
+  }
+  $("#entryPointTypeID").attr("value", type);
+}  
+</script>`;
+
 router.get(
   "/build-mobile-app",
   isAdmin,
   error_catcher(async (req, res) => {
-    const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
     const views = await View.find();
+    const pages = await Page.find();
     const execBuildMsg =
       "This is still under development and might run longer.";
 
@@ -1070,6 +1281,11 @@ router.get(
       res,
       req,
       active_sub: "Mobile app",
+      headers: [
+        {
+          headerTag: dialogScript,
+        },
+      ],
       contents: {
         above: [
           {
@@ -1087,11 +1303,17 @@ router.get(
                   name: "_csrf",
                   value: req.csrfToken(),
                 }),
+                input({
+                  type: "hidden",
+                  name: "entryPointType",
+                  value: "view",
+                  id: "entryPointTypeID",
+                }),
                 div(
                   { class: "container ps-2" },
                   div(
                     { class: "row pb-2" },
-                    div({ class: "col-sm-4 fw-bold" }, "Entry view"),
+                    div({ class: "col-sm-4 fw-bold" }, "Entry point"),
                     div({ class: "col-sm-4 fw-bold" }, "Platform"),
                     div(
                       {
@@ -1104,17 +1326,54 @@ router.get(
                     { class: "row" },
                     div(
                       { class: "col-sm-4" },
+                      // 'view/page' tabs
+                      ul(
+                        { class: "nav nav-pills" },
+                        li(
+                          {
+                            class: "nav-item",
+                            onClick: "showEntrySelect('view')",
+                          },
+                          div(
+                            { class: "nav-link active", id: "viewNavLinkID" },
+                            "View"
+                          )
+                        ),
+                        li(
+                          {
+                            class: "nav-item",
+                            onClick: "showEntrySelect('page')",
+                          },
+                          div(
+                            { class: "nav-link", id: "pageNavLinkID" },
+                            "Page"
+                          )
+                        )
+                      ),
+                      // select entry-view
                       select(
                         {
                           class: "form-control",
-                          name: "entryView",
-                          id: "entryViewInput",
+                          name: "entryPoint",
+                          id: "viewInputID",
                         },
                         views
                           .map((view) =>
                             option({ value: view.name }, view.name)
                           )
                           .join(",")
+                      ),
+                      // select entry-page
+                      select(
+                        {
+                          class: "form-control d-none",
+                          id: "pageInputID",
+                        },
+                        pages
+                          .map((page) =>
+                            option({ value: page.name }, page.name)
+                          )
+                          .join(",")
                       )
                     ),
                     div(
@@ -1196,7 +1455,7 @@ router.get(
                         class: "form-control",
                         name: "serverURL",
                         id: "serverURLInputId",
-                        placeholder: "http://10.0.2.2:3000",
+                        placeholder: getState().getConfig("base_url") || "",
                       })
                     )
                   )
@@ -1225,7 +1484,8 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     let {
-      entryView,
+      entryPoint,
+      entryPointType,
       androidPlatform,
       iOSPlatform,
       useDocker,
@@ -1244,15 +1504,24 @@ router.post(
       return res.redirect("/admin/build-mobile-app");
     }
     if (appFile && !appFile.endsWith(".apk")) appFile = `${appFile}.apk`;
+    if (!serverURL || serverURL.length == 0) {
+      serverURL = getState().getConfig("base_url") || "";
+    }
+    if (!serverURL.startsWith("http")) {
+      req.flash("error", req.__("Please enter a valid server URL."));
+      return res.redirect("/admin/build-mobile-app");
+    }
     const appOut = path.join(__dirname, "..", "mobile-app-out");
     const spawnParams = [
       "build-app",
-      "-v",
-      entryView,
+      "-e",
+      entryPoint,
+      "-t",
+      entryPointType,
       "-c",
       appOut,
       "-b",
-      "/tmp/mobile_app_build",
+      `${os.userInfo().homedir}/mobile_app_build`,
     ];
     if (useDocker) spawnParams.push("-d");
     if (androidPlatform) spawnParams.push("-p", "android");
@@ -1260,7 +1529,7 @@ router.post(
     if (appFile) spawnParams.push("-a", appFile);
     if (serverURL) spawnParams.push("-s", serverURL);
     const child = spawn("saltcorn", spawnParams, {
-      stdio: ["ignore", "pipe", process.stderr],
+      stdio: ["ignore", "pipe", "pipe"],
       cwd: ".",
     });
     const childOutputs = [];
@@ -1268,6 +1537,10 @@ router.post(
       // console.log(data.toString());
       childOutputs.push(data.toString());
     });
+    child.stderr.on("data", (data) => {
+      // console.log(data.toString());
+      childOutputs.push(data.toString());
+    });
     child.on("exit", async function (exitCode, signal) {
       if (exitCode === 0) {
         const file = await File.from_existing_file(

package/routes/api.js

@@ -112,6 +112,13 @@ function accessAllowed(req, user, trigger) {
   return role <= trigger.min_role;
 }
 
+const getFlashes = (req) =>
+  ["error", "success", "danger", "warning", "information"]
+    .map((type) => {
+      return { type, msg: req.flash(type) };
+    })
+    .filter((a) => a.msg && a.msg.length && a.msg.length > 0);
+
 router.post(
   "/viewQuery/:viewName/:queryName",
   error_catcher(async (req, res, next) => {
@@ -134,7 +141,7 @@ router.post(
           if (queries[queryName]) {
             const { args } = req.body;
             const resp = await queries[queryName](...args, true);
-            res.json({ success: resp });
+            res.json({ success: resp, alerts: getFlashes(req) });
           } else {
             res.status(404).json({ error: req.__("Not found") });
           }
@@ -235,6 +242,7 @@ router.get(
             rows = await table.getJoinedRows(joinOpts);
           } else if (req_query && req_query !== {}) {
             const tbl_fields = await table.getFields();
+            readState(req_query, tbl_fields, req);
             const qstate = await stateFieldsToWhere({
               fields: tbl_fields,
               approximate: !!approximate,

package/routes/eventlog.js

@@ -73,8 +73,9 @@ const logSettingsForm = async (req) => {
       fields.push({
         name: w + "_channel",
         label: w + " channel",
-        sublabel:
-          req.__("Channels to create events for. Separate by comma; leave blank for all"),
+        sublabel: req.__(
+          "Channels to create events for. Separate by comma; leave blank for all"
+        ),
         type: "String",
         showIf: { [w]: true },
       });
@@ -82,8 +83,8 @@ const logSettingsForm = async (req) => {
   return new Form({
     action: "/eventlog/settings",
     blurb: req.__("Which events should be logged?"),
-    submitButtonClass: "btn-outline-primary",
-    onChange: "remove_outline(this)",
+    noSubmitButton: true,
+    onChange: "saveAndContinue(this)",
     fields,
   });
 };
@@ -169,23 +170,23 @@ router.get(
  * @returns {Form}
  */
 const customEventForm = async (req) => {
-    return new Form({
-        action: "/eventlog/custom/new",
-        submitButtonClass: "btn-outline-primary",
-        onChange: "remove_outline(this)",
-        fields: [
-            {
-                name: "name",
-                label: req.__("Event Name"),
-                type: "String",
-            },
-            {
-                name: "hasChannel",
-                label: req.__("Has channels?"),
-                type: "Bool",
-            },
-        ],
-    });
+  return new Form({
+    action: "/eventlog/custom/new",
+    submitButtonClass: "btn-outline-primary",
+    onChange: "remove_outline(this)",
+    fields: [
+      {
+        name: "name",
+        label: req.__("Event Name"),
+        type: "String",
+      },
+      {
+        name: "hasChannel",
+        label: req.__("Has channels?"),
+        type: "Bool",
+      },
+    ],
+  });
 };
 /**
  * @name get/custom/new
@@ -297,7 +298,8 @@ router.post(
     } else {
       await getState().setConfig("event_log_settings", form.values);
 
-      res.redirect(`/eventlog/settings`);
+      if (!req.xhr) res.redirect(`/eventlog/settings`);
+      else res.json({ success: "ok" });
     }
   })
 );

package/routes/files.js

@@ -378,9 +378,6 @@ const storage_form = async (req) => {
     ],
     action: "/files/storage",
   });
-  form.submitButtonClass = "btn-outline-primary";
-  form.submitLabel = req.__("Save");
-  form.onChange = "remove_outline(this)";
   return form;
 };
 
@@ -431,8 +428,11 @@ router.post(
       });
     } else {
       await save_config_from_form(form);
-      req.flash("success", req.__("Storage settings updated"));
-      res.redirect("/files/storage");
+
+      if (!req.xhr) {
+        req.flash("success", req.__("Storage settings updated"));
+        res.redirect("/files/storage");
+      } else res.json({ success: "ok" });
     }
   })
 );

package/routes/infoarch.js

@@ -48,8 +48,8 @@ router.get(
 const languageForm = (req) =>
   new Form({
     action: "/site-structure/localizer/save-lang",
-    submitButtonClass: "btn-outline-primary",
-    onChange: "remove_outline(this)",
+    onChange: "saveAndContinue(this)",
+    noSubmitButton: true,
     fields: [
       {
         name: "name",
@@ -270,7 +270,10 @@ router.post(
         ...cfgLangs,
         [lang.locale]: lang,
       });
-      res.redirect(`/site-structure/localizer/edit/${lang.locale}`);
+
+      if (!req.xhr)
+        res.redirect(`/site-structure/localizer/edit/${lang.locale}`);
+      else res.json({ success: "ok" });
     }
   })
 );

package/routes/page.js

@@ -36,6 +36,8 @@ router.get(
   "/:pagename",
   error_catcher(async (req, res) => {
     const { pagename } = req.params;
+    const state = getState();
+    state.log(3, `Route /page/${pagename} user=${req.user?.id}`);
 
     const role = req.user && req.user.id ? req.user.role_id : 10;
     const db_page = await Page.findOne({ name: pagename });
@@ -56,10 +58,12 @@ router.get(
           contents,
         })
       );
-    } else
+    } else {
+      state.log(2, `Page $pagename} not found or not authorized`);
       res
         .status(404)
         .sendWrap(`${pagename} page`, req.__("Page %s not found", pagename));
+    }
   })
 );