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

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(
@@ -673,6 +676,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,
+      },
     ],
   });
 
@@ -1104,6 +1114,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 +1164,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 +1520,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');
@@ -1519,6 +1559,17 @@ const buildDialogScript = () => {
   }
   </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 +1589,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 +2217,56 @@ router.get(
                         )
                       )
                     )
+                  ),
+                  div(
+                    { class: "row pb-3 pt-3" },
+                    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(
@@ -2419,6 +2521,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
@@ -2511,6 +2655,8 @@ router.post(
       await getState().refresh();
     }
     if (form.values.users) {
+      await db.deleteWhere("_sc_notifications");
+
       const users1 = Table.findOne({ name: "users" });
       const userfields1 = await users1.getFields();
 

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

@@ -994,13 +994,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/pageedit.js

@@ -196,7 +196,7 @@ const pageBuilderData = async (req, context) => {
       f.required = false;
       if (f.type && f.type.name === "Bool") f.fieldview = "tristate";
 
-      await f.fill_fkey_options(true);
+      //await f.fill_fkey_options(true);
       fixed_state_fields[view.name].push(f);
       if (table.name === "users" && f.primary_key)
         fixed_state_fields[view.name].push(

package/routes/plugins.js

@@ -57,6 +57,7 @@ const { flash_restart } = require("../markup/admin.js");
 const { sleep, removeNonWordChars } = require("@saltcorn/data/utils");
 const { loadAllPlugins } = require("../load_plugins");
 const npmFetch = require("npm-registry-fetch");
+const PluginInstaller = require("@saltcorn/plugins-loader/plugin_installer");
 
 /**
  * @type {object}
@@ -1178,6 +1179,7 @@ router.post(
       getState().getConfig("development_mode", false)
     ) {
       await plugin.delete();
+      await new PluginInstaller(plugin).remove();
       req.flash("success", req.__(`Module %s removed.`, plugin.name));
     } else {
       req.flash(
@@ -1241,7 +1243,12 @@ router.post(
       res.redirect(`/plugins`);
       return;
     }
-    await load_plugins.loadAndSaveNewPlugin(plugin, forceReInstall);
+    const msgs = await load_plugins.loadAndSaveNewPlugin(
+      plugin,
+      forceReInstall,
+      undefined,
+      req.__
+    );
     const plugin_module = getState().plugins[name];
     await sleep(1000); // Allow other workers to load this plugin
     await getState().refresh_views();
@@ -1255,9 +1262,11 @@ router.post(
           plugin_db.name
         )
       );
+      if (msgs?.length > 0) req.flash("warning", msgs.join("<br>"));
       res.redirect(`/plugins/configure/${plugin_db.name}`);
     } else {
       req.flash("success", req.__(`Module %s installed`, plugin.name));
+      if (msgs?.length > 0) req.flash("warning", msgs.join("<br>"));
       res.redirect(`/plugins`);
     }
   })

package/routes/tables.js

@@ -167,6 +167,10 @@ const tableForm = async (table, req) => {
               label: req.__("Version history"),
               sublabel: req.__("Track table data changes over time"),
               name: "versioned",
+              attributes: {
+                onChange:
+                  "if(!this.checked && !confirm('Are you sure? This will delete all history')) {this.checked = true; return false}",
+              },
               type: "Bool",
             },
             ...(table.name === "users"

package/serve.js

@@ -105,7 +105,7 @@ const initMaster = async ({ disableMigrate }, useClusterAdaptor = true) => {
   // migrate database
   if (!disableMigrate) await migrate(db.connectObj.default_schema, true);
   // load all plugins
-  await loadAllPlugins();
+  await loadAllPlugins(true);
   // switch on sql logging - but it was initiated before???
   if (getState().getConfig("log_sql", false)) db.set_sql_logging();
   if (db.is_it_multi_tenant()) {

package/tests/page.test.js

@@ -30,7 +30,17 @@ const prepHtmlFiles = async () => {
     const html = `<html><head><title>Landing page</title></head><body><h1>${content}</h1></body></html>`;
     if (!existsSync(scFolder)) await File.new_folder(folder);
     if (!existsSync(join(scFolder, name))) {
-      return await File.from_contents(name, "text/html", html, 1, 1, folder);
+      const file = await File.from_contents(
+        name,
+        "text/html",
+        html,
+        1,
+        1,
+        folder
+      );
+      file.location = File.absPathToServePath(file.location);
+
+      return file;
     } else {
       const file = await File.from_file_on_disk(name, scFolder);
       fs.writeFileSync(file.location, html);