@saltcorn/server 0.7.3-beta.7 → 0.7.4-beta.1

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");
@@ -87,6 +95,7 @@ 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}
@@ -116,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"] : []),
@@ -141,14 +151,10 @@ 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;
 };
 
-const app_files_table = (file, req) =>
+const app_files_table = (files, req) =>
   mkTable(
     [
       {
@@ -162,7 +168,7 @@ const app_files_table = (file, req) =>
         key: (r) => link(`/files/download/${r.id}`, req.__("Download")),
       },
     ],
-    [file]
+    files
   );
 
 /**
@@ -215,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" });
     }
   })
 );
@@ -309,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" });
     }
   })
 );
@@ -336,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({
@@ -353,7 +365,7 @@ router.get(
                   post_btn(
                     "/admin/backup",
                     i({ class: "fas fa-download me-2" }) +
-                      req.__("Download a backup"),
+                    req.__("Download a backup"),
                     req.csrfToken(),
                     {
                       btnClass: "btn-outline-primary",
@@ -372,17 +384,38 @@ router.get(
           },
           isRoot
             ? {
-                type: "card",
-                title: req.__("Automated backup"),
-                contents: div(
-                  renderForm(backupForm, req.csrfToken()),
-                  a(
-                    { href: "/admin/auto-backup-list" },
-                    "Restore/download automated backups »"
-                  )
+              type: "card",
+              title: req.__("Automated backup"),
+              contents: div(
+                renderForm(backupForm, req.csrfToken()),
+                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;"
+              )
+            ),
+          },
         ],
       },
     });
@@ -458,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,
@@ -484,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",
@@ -535,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,
@@ -555,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" });
     }
   })
 );
@@ -573,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
@@ -648,47 +831,47 @@ router.get(
                     th(req.__("Saltcorn version")),
                     td(
                       packagejson.version +
-                        (isRoot && can_update
-                          ? post_btn(
-                              "/admin/upgrade",
-                              req.__("Upgrade"),
-                              req.csrfToken(),
-                              {
-                                btnClass: "btn-primary btn-sm",
-                                formClass: "d-inline",
-                              }
-                            )
-                          : isRoot && is_latest
+                      (isRoot && can_update
+                        ? post_btn(
+                          "/admin/upgrade",
+                          req.__("Upgrade"),
+                          req.csrfToken(),
+                          {
+                            btnClass: "btn-primary btn-sm",
+                            formClass: "d-inline",
+                          }
+                        )
+                        : isRoot && is_latest
                           ? span(
-                              { class: "badge bg-primary ms-2" },
-                              req.__("Latest")
-                            ) +
-                            post_btn(
-                              "/admin/check-for-upgrade",
-                              req.__("Check for updates"),
-                              req.csrfToken(),
-                              {
-                                btnClass: "btn-primary btn-sm px-1 py-0",
-                                formClass: "d-inline",
-                              }
-                            )
+                            { class: "badge bg-primary ms-2" },
+                            req.__("Latest")
+                          ) +
+                          post_btn(
+                            "/admin/check-for-upgrade",
+                            req.__("Check for updates"),
+                            req.csrfToken(),
+                            {
+                              btnClass: "btn-primary btn-sm px-1 py-0",
+                              formClass: "d-inline",
+                            }
+                          )
                           : "")
                     )
                   ),
                   git_commit &&
-                    tr(
-                      th(req.__("git commit")),
-                      td(
-                        a(
-                          {
-                            href:
-                              "https://github.com/saltcorn/saltcorn/commit/" +
-                              git_commit,
-                          },
-                          git_commit.substring(0, 6)
-                        )
+                  tr(
+                    th(req.__("git commit")),
+                    td(
+                      a(
+                        {
+                          href:
+                            "https://github.com/saltcorn/saltcorn/commit/" +
+                            git_commit,
+                        },
+                        git_commit.substring(0, 6)
                       )
-                    ),
+                    )
+                  ),
                   tr(th(req.__("Node.js version")), td(process.version)),
                   tr(
                     th(req.__("Database")),
@@ -798,7 +981,7 @@ router.post(
     res.attachment(fileName);
     const file = fs.createReadStream(fileName);
     file.on("end", function () {
-      fs.unlink(fileName, function () {});
+      fs.unlink(fileName, function () { });
     });
     file.pipe(res);
   })
@@ -821,7 +1004,7 @@ router.post(
     );
     if (err) req.flash("error", err);
     else req.flash("success", req.__("Successfully restored backup"));
-    fs.unlink(newPath, function () {});
+    fs.unlink(newPath, function () { });
     res.redirect(`/admin`);
   })
 );
@@ -896,7 +1079,7 @@ const clearAllForm = (req) =>
       {
         type: "Bool",
         name: "plugins",
-        label: req.__("Plugins"),
+        label: req.__("Modules"),
         default: true,
       },
     ],
@@ -966,8 +1149,8 @@ router.post(
           req.__(
             "LetsEncrypt SSL enabled. Restart for changes to take effect."
           ) +
-            " " +
-            a({ href: "/admin/system" }, req.__("Restart here"))
+          " " +
+          a({ href: "/admin/system" }, req.__("Restart here"))
         );
         res.redirect("/useradmin/ssl");
       } catch (e) {
@@ -1038,13 +1221,13 @@ router.get(
           contents: div(
             pass
               ? div(
-                  { class: "alert alert-success", role: "alert" },
-                  i({ class: "fas fa-check-circle fa-lg me-2" }),
-                  h5(
-                    { class: "d-inline" },
-                    req.__("No errors detected during configuration check")
-                  )
+                { class: "alert alert-success", role: "alert" },
+                i({ class: "fas fa-check-circle fa-lg me-2" }),
+                h5(
+                  { class: "d-inline" },
+                  req.__("No errors detected during configuration check")
                 )
+              )
               : errors.map(mkError)
           ),
         },
@@ -1058,19 +1241,66 @@ router.get(
   })
 );
 
+const buildDialogScript = () => {
+  return `<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);
+  }
+  
+  function handleMessages() {
+    notifyAlert("This is still under development and might run longer.")
+    ${
+      getState().getConfig("apple_team_id") &&
+      getState().getConfig("apple_team_id") !== "null"
+        ? ""
+        : `  
+    if ($("#iOSCheckboxId")[0].checked) {
+      notifyAlert(
+        "No 'Apple Team ID' is configured, I will try to build a project for the iOS simulator."
+      );
+    }`
+    }
+  }
+  </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 execBuildMsg =
-      "This is still under development and might run longer.";
+    const pages = await Page.find();
 
     send_admin_page({
       res,
       req,
       active_sub: "Mobile app",
+      headers: [
+        {
+          headerTag: buildDialogScript(),
+        },
+      ],
       contents: {
         above: [
           {
@@ -1088,34 +1318,77 @@ 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" }, "Platform"),
+                    div({ class: "col-sm-4 fw-bold" }, req.__("Entry point")),
+                    div({ class: "col-sm-4 fw-bold" }, req.__("Platform")),
                     div(
                       {
                         class: "col-sm-1 fw-bold d-flex justify-content-center",
                       },
-                      "docker"
+                      req.__("docker")
                     )
                   ),
                   div(
                     { 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" },
+                            req.__("View")
+                          )
+                        ),
+                        li(
+                          {
+                            class: "nav-item",
+                            onClick: "showEntrySelect('page')",
+                          },
+                          div(
+                            { class: "nav-link", id: "pageNavLinkID" },
+                            req.__("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(
@@ -1125,7 +1398,7 @@ router.get(
                         { class: "container ps-0" },
                         div(
                           { class: "row" },
-                          div({ class: "col-sm-8" }, "android"),
+                          div({ class: "col-sm-8" }, req.__("android")),
                           div(
                             { class: "col-sm" },
                             input({
@@ -1138,7 +1411,7 @@ router.get(
                         ),
                         div(
                           { class: "row" },
-                          div({ class: "col-sm-8" }, "iOS"),
+                          div({ class: "col-sm-8" }, req.__("iOS")),
                           div(
                             { class: "col-sm" },
                             input({
@@ -1170,7 +1443,7 @@ router.get(
                           for: "appNameInputId",
                           class: "form-label fw-bold",
                         },
-                        "App file"
+                        req.__("App file")
                       ),
                       input({
                         type: "text",
@@ -1190,14 +1463,14 @@ router.get(
                           for: "serverURLInputId",
                           class: "form-label fw-bold",
                         },
-                        "Server URL"
+                        req.__("Server URL")
                       ),
                       input({
                         type: "text",
                         class: "form-control",
                         name: "serverURL",
                         id: "serverURLInputId",
-                        placeholder: "http://10.0.2.2:3000",
+                        placeholder: getState().getConfig("base_url") || "",
                       })
                     )
                   )
@@ -1205,12 +1478,12 @@ router.get(
                 button(
                   {
                     type: "submit",
-                    onClick: `notifyAlert('${execBuildMsg}'); press_store_button(this);`,
+                    onClick: `handleMessages(); press_store_button(this);`,
                     class: "btn btn-warning",
                   },
                   i({ class: "fas fa-hammer pe-2" }),
 
-                  "Build mobile app"
+                  req.__("Build mobile app")
                 )
               )
             ),
@@ -1226,7 +1499,8 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     let {
-      entryView,
+      entryPoint,
+      entryPointType,
       androidPlatform,
       iOSPlatform,
       useDocker,
@@ -1244,12 +1518,20 @@ router.post(
       req.flash("error", req.__("Only the android build supports docker."));
       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",
@@ -1257,7 +1539,13 @@ router.post(
     ];
     if (useDocker) spawnParams.push("-d");
     if (androidPlatform) spawnParams.push("-p", "android");
-    if (iOSPlatform) spawnParams.push("-p", "ios");
+    if (iOSPlatform) {
+      spawnParams.push("-p", "ios");
+      const teamId = getState().getConfig("apple_team_id");
+      if (!teamId || teamId === "null") {
+        spawnParams.push("--buildForEmulator");
+      }
+    }
     if (appFile) spawnParams.push("-a", appFile);
     if (serverURL) spawnParams.push("-s", serverURL);
     const child = spawn("saltcorn", spawnParams, {
@@ -1275,10 +1563,13 @@ router.post(
     });
     child.on("exit", async function (exitCode, signal) {
       if (exitCode === 0) {
-        const file = await File.from_existing_file(
-          appOut,
-          appFile ? appFile : "app-debug.apk",
-          req.user.id
+        const files = await Promise.all(
+          fs
+            .readdirSync(appOut)
+            .map(
+              async (outFile) =>
+                await File.from_existing_file(appOut, outFile, req.user.id)
+            )
         );
         res.sendWrap(req.__(`Admin`), {
           above: [
@@ -1287,7 +1578,7 @@ router.post(
               title: req.__("Build Result"),
               contents: div("The build was successfully"),
             },
-            app_files_table(file, req),
+            files.length > 0 ? app_files_table(files, req) : "",
           ],
         });
       } else