@saltcorn/server 0.9.5-beta.2 → 0.9.5-beta.21

package/routes/admin.js

@@ -107,6 +107,7 @@ const { getSafeSaltcornCmd } = require("@saltcorn/data/utils");
 const stream = require("stream");
 const Crash = require("@saltcorn/data/models/crash");
 const { get_help_markup } = require("../help/index.js");
+const Docker = require("dockerode");
 
 const router = new Router();
 module.exports = router;
@@ -273,6 +274,8 @@ router.get(
     const aBackupFilePrefixForm = backupFilePrefixForm(req);
     aBackupFilePrefixForm.values.backup_file_prefix =
       getState().getConfig("backup_file_prefix");
+    aBackupFilePrefixForm.values.backup_history =
+      getState().getConfig("backup_history");
     //
     const backupForm = autoBackupForm(req);
     backupForm.values.auto_backup_frequency = getState().getConfig(
@@ -281,9 +284,23 @@ router.get(
     backupForm.values.auto_backup_destination = getState().getConfig(
       "auto_backup_destination"
     );
+    backupForm.values.auto_backup_tenants = getState().getConfig(
+      "auto_backup_tenants"
+    );
     backupForm.values.auto_backup_directory = getState().getConfig(
       "auto_backup_directory"
     );
+    backupForm.values.auto_backup_username = getState().getConfig(
+      "auto_backup_username"
+    );
+    backupForm.values.auto_backup_server =
+      getState().getConfig("auto_backup_server");
+    backupForm.values.auto_backup_password = getState().getConfig(
+      "auto_backup_password"
+    );
+    backupForm.values.auto_backup_port =
+      getState().getConfig("auto_backup_port");
+
     backupForm.values.auto_backup_expire_days = getState().getConfig(
       "auto_backup_expire_days"
     );
@@ -673,6 +690,13 @@ const backupFilePrefixForm = (req) =>
         sublabel: req.__("Backup file prefix"),
         default: "sc-backup-",
       },
+      {
+        type: "Bool",
+        label: req.__("History"),
+        name: "backup_history",
+        sublabel: req.__("Include table history in backup"),
+        default: true,
+      },
     ],
   });
 
@@ -681,8 +705,10 @@ const backupFilePrefixForm = (req) =>
  * @param {object} req
  * @returns {Form} form
  */
-const autoBackupForm = (req) =>
-  new Form({
+const autoBackupForm = (req) => {
+  const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
+
+  return new Form({
     action: "/admin/set-auto-backup",
     onChange: `saveAndContinue(this);$('#btnBackupNow').prop('disabled', $('#inputauto_backup_frequency').val()==='Never');`,
     noSubmitButton: true,
@@ -708,7 +734,47 @@ const autoBackupForm = (req) =>
         name: "auto_backup_destination",
         required: true,
         showIf: { auto_backup_frequency: ["Daily", "Weekly"] },
-        attributes: { options: ["Saltcorn files", "Local directory"] },
+        attributes: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+          options: ["Saltcorn files", "Local directory", "SFTP server"],
+        },
+      },
+      {
+        type: "String",
+        label: req.__("Server host"),
+        name: "auto_backup_server",
+        showIf: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+          auto_backup_destination: "SFTP server",
+        },
+      },
+      {
+        type: "String",
+        label: req.__("Username"),
+        name: "auto_backup_username",
+        showIf: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+          auto_backup_destination: "SFTP server",
+        },
+      },
+      {
+        type: "String",
+        label: req.__("Password"),
+        fieldview: "password",
+        name: "auto_backup_password",
+        showIf: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+          auto_backup_destination: "SFTP server",
+        },
+      },
+      {
+        type: "Integer",
+        label: req.__("Port"),
+        name: "auto_backup_port",
+        showIf: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+          auto_backup_destination: "SFTP server",
+        },
       },
       {
         type: "String",
@@ -720,6 +786,19 @@ const autoBackupForm = (req) =>
           //auto_backup_destination: "Local directory",
         },
       },
+      {
+        type: "String",
+        label: req.__("Retain local directory"),
+        name: "auto_backup_retain_local_directory",
+        sublabel: req.__(
+          "Retain a local backup copy in this directory (optional)"
+        ),
+        showIf: {
+          auto_backup_frequency: ["Daily", "Weekly"],
+          auto_backup_destination: "SFTP server",
+          //auto_backup_destination: "Local directory",
+        },
+      },
       {
         type: "Integer",
         label: req.__("Expiration in days"),
@@ -732,6 +811,19 @@ const autoBackupForm = (req) =>
           auto_backup_destination: "Local directory",
         },
       },
+      ...(isRoot
+        ? [
+            {
+              type: "Bool",
+              label: req.__("All tenants"),
+              sublabel: req.__("Also backup all tenants"),
+              name: "auto_backup_tenants",
+              showIf: {
+                auto_backup_frequency: ["Daily", "Weekly"],
+              },
+            },
+          ]
+        : []),
       {
         type: "Bool",
         label: req.__("Include Event Logs"),
@@ -743,6 +835,7 @@ const autoBackupForm = (req) =>
       },
     ],
   });
+};
 
 /**
  * Snapshot Form
@@ -1104,6 +1197,28 @@ router.post(
   })
 );
 
+const pullCordovaBuilder = (req, res) => {
+  const child = spawn("docker", ["pull", "saltcorn/cordova-builder"], {
+    stdio: ["ignore", "pipe", "pipe"],
+  });
+  return new Promise((resolve, reject) => {
+    child.stdout.on("data", (data) => {
+      res.write(data);
+    });
+    child.stderr?.on("data", (data) => {
+      res.write(data);
+    });
+    child.on("exit", function (code, signal) {
+      resolve(code);
+    });
+    child.on("error", (msg) => {
+      const message = msg.message ? msg.message : msg.code;
+      res.write(req.__("Error: ") + message + "\n");
+      resolve(msg.code);
+    });
+  });
+};
+
 /**
  * Do Upgrade
  * @name post/upgrade
@@ -1132,7 +1247,14 @@ router.post(
       child.stderr?.on("data", (data) => {
         res.write(data);
       });
-      child.on("exit", function (code, signal) {
+      child.on("exit", async function (code, signal) {
+        if (code === 0) {
+          res.write(
+            req.__("Pulling the cordova-builder docker image...") + "\n"
+          );
+          const pullCode = await pullCordovaBuilder(req, res);
+          res.write(req.__("Pull done with code %s", pullCode) + "\n");
+        }
         res.end(
           req.__(
             `Upgrade done (if it was available) with code ${code}.\n\nPress the BACK button in your browser, then RELOAD the page.`
@@ -1481,8 +1603,9 @@ router.get(
     });
   })
 );
-const buildDialogScript = () => {
+const buildDialogScript = (cordovaBuilderAvailable) => {
   return `<script>
+  var cordovaBuilderAvailable = ${cordovaBuilderAvailable};
   function showEntrySelect(type) {
     for( const currentType of ["view", "page", "pagegroup"]) {
       const tab = $('#' + currentType + 'NavLinkID');
@@ -1505,20 +1628,20 @@ const buildDialogScript = () => {
   
   function handleMessages() {
     notifyAlert("Building the app, please wait.", true)
-    ${
-      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>`;
 };
+
+const imageAvailable = async () => {
+  try {
+    const image = new Docker().getImage("saltcorn/cordova-builder");
+    await image.inspect();
+    return true;
+  } catch (e) {
+    return false;
+  }
+};
+
 /**
  * Build mobile app
  */
@@ -1538,13 +1661,14 @@ router.get(
     );
     const builderSettings =
       getState().getConfig("mobile_builder_settings") || {};
+    const dockerAvailable = await imageAvailable();
     send_admin_page({
       res,
       req,
       active_sub: "Mobile app",
       headers: [
         {
-          headerTag: buildDialogScript(),
+          headerTag: buildDialogScript(dockerAvailable),
         },
       ],
       contents: {
@@ -2165,6 +2289,80 @@ router.get(
                         )
                       )
                     )
+                  ),
+                  div(
+                    { class: "row pb-3 pt-3" },
+                    div(
+                      { class: "col-sm-8" },
+                      label(
+                        {
+                          for: "splashPageInputId",
+                          class: "form-label fw-bold",
+                        },
+                        req.__("Apple Team ID")
+                      ),
+                      input({
+                        type: "text",
+                        class: "form-control",
+                        name: "appleTeamId",
+                        id: "appleTeamIdInputId",
+                        value:
+                          builderSettings.appleTeamId ||
+                          getState().getConfig("apple_team_id") ||
+                          "",
+                        placeholder: req.__("Please enter your Apple Team ID"),
+                      })
+                    )
+                  ),
+                  div(
+                    { class: "row pb-3 pt-2" },
+                    div(
+                      label(
+                        { class: "form-label fw-bold" },
+                        req.__("Cordova builder") +
+                          a(
+                            {
+                              href: "javascript:ajax_modal('/admin/help/Cordova Builder?')",
+                            },
+                            i({ class: "fas fa-question-circle ps-1" })
+                          )
+                      )
+                    ),
+                    div(
+                      { class: "col-sm-4" },
+                      div(
+                        {
+                          id: "dockerBuilderStatusId",
+                          class: "",
+                        },
+                        dockerAvailable
+                          ? span(
+                              req.__("installed"),
+                              i({ class: "ps-2 fas fa-check text-success" })
+                            )
+                          : span(
+                              req.__("not available"),
+                              i({ class: "ps-2 fas fa-times text-danger" })
+                            )
+                      )
+                    ),
+                    div(
+                      { class: "col-sm-4" },
+                      button(
+                        {
+                          id: "pullCordovaBtnId",
+                          type: "button",
+                          onClick: `pull_cordova_builder(this);`,
+                          class: "btn btn-warning",
+                        },
+                        req.__("pull")
+                      ),
+                      span(
+                        { role: "button", onClick: "check_cordova_builder()" },
+                        span({ class: "ps-3" }, req.__("refresh")),
+                        i({ class: "ps-2 fas fa-undo" })
+                      )
+                    )
                   )
                 ),
                 button(
@@ -2275,6 +2473,7 @@ router.post(
       allowOfflineMode,
       synchedTables,
       includedPlugins,
+      appleTeamId,
     } = req.body;
     if (!includedPlugins) includedPlugins = [];
     if (!synchedTables) synchedTables = [];
@@ -2317,10 +2516,9 @@ router.post(
     if (androidPlatform) spawnParams.push("-p", "android");
     if (iOSPlatform) {
       spawnParams.push("-p", "ios");
-      const teamId = getState().getConfig("apple_team_id");
-      if (!teamId || teamId === "null") {
+      if (!appleTeamId || appleTeamId === "null")
         spawnParams.push("--buildForEmulator");
-      }
+      else spawnParams.push("--appleTeamId", appleTeamId);
     }
     if (appName) spawnParams.push("--appName", appName);
     if (appVersion) spawnParams.push("--appVersion", appVersion);
@@ -2365,6 +2563,7 @@ router.post(
       synchedTables: synchedTables,
       includedPlugins: includedPlugins,
       excludedPlugins,
+      appleTeamId,
     });
     // end http call, return the out directory name
     // the gui polls for results
@@ -2419,6 +2618,48 @@ router.post(
   })
 );
 
+router.post(
+  "/mobile-app/pull-cordova-builder",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const state = getState();
+    const child = spawn(
+      "docker",
+      ["image", "pull", "saltcorn/cordova-builder:latest"],
+      {
+        stdio: ["ignore", "pipe", "pipe"],
+        cwd: ".",
+      }
+    );
+    child.stdout.on("data", (data) => {
+      state.log(5, data.toString());
+    });
+    child.stderr.on("data", (data) => {
+      state.log(1, data.toString());
+    });
+    child.on("exit", (exitCode, signal) => {
+      state.log(
+        2,
+        `"pull cordova-builder exit with code: ${exitCode} and signal: ${signal}`
+      );
+    });
+    child.on("error", (msg) => {
+      state.log(1, `pull cordova-builder error: ${msg}`);
+    });
+
+    res.json({});
+  })
+);
+
+router.get(
+  "/mobile-app/check-cordova-builder",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const installed = await imageAvailable();
+    res.json({ installed });
+  })
+);
+
 /**
  * Do Clear All
  * @function
@@ -2628,6 +2869,7 @@ admin_config_route({
     });
   },
   response(form, req, res) {
+    const code_pages = getState().getConfig("function_code_pages", {});
     send_admin_page({
       res,
       req,
@@ -2654,11 +2896,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/api.js

@@ -373,7 +373,10 @@ router.all(
               res.redirect(resp.goto);
             else if (req.headers?.scgotourl)
               res.redirect(req.headers?.scgotourl);
-            else res.json({ success: true, data: resp });
+            else {
+              if (trigger.configuration?._raw_output) res.json({ resp });
+              else res.json({ success: true, data: resp });
+            }
           } catch (e) {
             Crash.create(e, req);
             res.status(400).json({ success: false, error: e.message });

package/routes/common_lists.js

@@ -226,7 +226,7 @@ const tagsDropdown = (tags, altHeader) =>
     { class: "dropdown" },
     div(
       {
-        class: "link-style",
+        class: "link-style text-nowrap",
         "data-boundary": "viewport",
         type: "button",
         id: "tagsselector",

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 ||
@@ -994,13 +997,15 @@ router.post(
         if (oldRow) {
           const value = oldRow[kpath[kpath.length - 1]];
           //TODO run fieldview
-          res.send(
-            typeof value === "string"
-              ? value
-              : value?.toString
-              ? value.toString()
-              : `${value}`
-          );
+          if (value === null || typeof value === "undefined") res.send("");
+          else
+            res.send(
+              typeof value === "string"
+                ? value
+                : value?.toString
+                ? value.toString()
+                : `${value}`
+            );
           return;
         }
       }

package/routes/homepage.js

@@ -547,7 +547,7 @@ const no_views_logged_in = async (req, res) => {
  * @returns {Promise<boolean>}
  */
 const get_config_response = async (role_id, res, req) => {
-  const wrap = async (contents, homeCfg, title, description) => {
+  const wrap = async (contents, homeCfg, title, description, no_menu) => {
     if (contents.html_file) await sendHtmlFile(req, res, contents.html_file);
     else
       res.sendWrap(
@@ -555,6 +555,7 @@ const get_config_response = async (role_id, res, req) => {
           title: title || "",
           description: description || "",
           bodyClass: "page_" + db.sqlsanitize(homeCfg),
+          no_menu,
         },
         contents
       );
@@ -574,7 +575,8 @@ const get_config_response = async (role_id, res, req) => {
         await db_page.run(req.query, { res, req }),
         homeCfg,
         db_page.title,
-        db_page.description
+        db_page.description,
+        db_page.attributes?.no_menu
       );
     else {
       const group = PageGroup.findOne({ name: homeCfg });
@@ -587,7 +589,8 @@ const get_config_response = async (role_id, res, req) => {
               await eligible.run(req.query, { res, req }),
               homeCfg,
               eligible.title,
-              eligible.description
+              eligible.description,
+              eligible.attributes?.no_menu
             );
         } else wrap(req.__("%s has no eligible page", group.name), homeCfg);
       } else res.redirect(homeCfg);

package/routes/menu.js

@@ -19,7 +19,7 @@ const { save_menu_items } = require("@saltcorn/data/models/config");
 const db = require("@saltcorn/data/db");
 
 const { renderForm } = require("@saltcorn/markup");
-const { script, domReady, div, ul } = require("@saltcorn/markup/tags");
+const { script, domReady, div, ul, i } = require("@saltcorn/markup/tags");
 const { send_infoarch_page } = require("../markup/admin.js");
 const Table = require("@saltcorn/data/models/table");
 const Trigger = require("@saltcorn/data/models/trigger");
@@ -368,7 +368,7 @@ const menuEditorScript = (menu_items) => `
               iconPicker: iconPickerOptions,
               getLabelText: (item) => item?.text || item?.type,
               labelEdit: 'Edit&nbsp;<i class="fas fa-edit clickable"></i>',
-              maxLevel: 1 // (Optional) Default is -1 (no level limit)
+              maxLevel: 2 // (Optional) Default is -1 (no level limit)
               // Valid levels are from [0, 1, 2, 3,...N]
               });
   editor.setForm($('#menuForm'));
@@ -446,7 +446,16 @@ router.get(
           above: [
             {
               besides: [
-                div(ul({ id: "myEditor", class: "sortableLists list-group" })),
+                div(
+                  ul({ id: "myEditor", class: "sortableLists list-group" }),
+                  div(
+                    i(
+                      req.__(
+                        "Some themes support only one level of menu nesting."
+                      )
+                    )
+                  )
+                ),
                 div(
                   renderForm(form, req.csrfToken()),
                   script(domReady(menuEditorScript(menu_items)))