@saltcorn/server 0.7.4 → 0.8.0-beta.1

package/routes/admin.js

@@ -97,13 +97,6 @@ const { getConfigFile } = require("@saltcorn/data/db/connect");
 const os = require("os");
 const Page = require("@saltcorn/data/models/page");
 
-/**
- * @type {object}
- * @const
- * @namespace routes/adminRouter
- * @category server
- * @subcategory routes
- */
 const router = new Router();
 module.exports = router;
 
@@ -123,9 +116,6 @@ const site_id_form = (req) =>
       "base_url",
       "page_custom_css",
       "page_custom_html",
-      "development_mode",
-      "log_sql",
-      "log_level",
       "plugins_store_endpoint",
       "packs_store_endpoint",
       ...(getConfigFile() ? ["multitenancy_enabled"] : []),
@@ -139,7 +129,7 @@ const site_id_form = (req) =>
  * @returns {Promise<Form>} form
  */
 const email_form = async (req) => {
-  const form = await config_fields_form({
+  return await config_fields_form({
     req,
     field_names: [
       "smtp_host",
@@ -151,10 +141,9 @@ const email_form = async (req) => {
     ],
     action: "/admin/email",
   });
-  return form;
 };
 
-const app_files_table = (files, req) =>
+const app_files_table = (files, buildDirName, req) =>
   mkTable(
     [
       {
@@ -163,9 +152,21 @@ const app_files_table = (files, req) =>
       },
       { label: req.__("Size (KiB)"), key: "size_kb", align: "right" },
       { label: req.__("Media type"), key: (r) => r.mimetype },
+      {
+        label: req.__("Open"),
+        key: (r) =>
+          link(
+            `/files/serve/mobile_app/${buildDirName}/${r.filename}`,
+            req.__("Open")
+          ),
+      },
       {
         label: req.__("Download"),
-        key: (r) => link(`/files/download/${r.id}`, req.__("Download")),
+        key: (r) =>
+          link(
+            `/files/download/mobile_app/${buildDirName}/${r.filename}`,
+            req.__("Download")
+          ),
       },
     ],
     files
@@ -734,6 +735,7 @@ router.post(
       await auto_backup_now();
       req.flash("success", req.__("Backup successful"));
     } catch (e) {
+      getState().log(1, e);
       req.flash("error", e.message);
     }
     res.json({ reload_page: true });
@@ -873,12 +875,40 @@ router.get(
                   ),
                   tr(th(req.__("Node.js version")), td(process.version)),
                   tr(
-                    th(req.__("Database")),
+                    th(req.__("Database type")),
                     td(db.isSQLite ? "SQLite " : "PostgreSQL ", dbversion)
                   ),
+                  (isRoot?
+                    tr(
+                        th(req.__("Database host")),
+                        td(db.connectObj.host)
+                    )
+                  : ""),
+                  (isRoot?
+                    tr(
+                        th(req.__("Database port")),
+                        td(db.connectObj.port)
+                    )
+                  : ""),
+                  (isRoot?
+                    tr(
+                        th(req.__("Database name")),
+                        td(db.connectObj.database)
+                    )
+                  : ""),
+                  (isRoot?
+                     tr(
+                        th(req.__("Database user")),
+                        td(db.connectObj.user)
+                     )
+                  : ""),
+                  tr(
+                      th(req.__("Database schema")),
+                      td(db.getTenantSchema())
+                  ),
                   tr(
-                    th(req.__("Process uptime")),
-                    td(moment(get_process_init_time()).fromNow(true))
+                     th(req.__("Process uptime")),
+                     td(moment(get_process_init_time()).fromNow(true))
                   )
                 )
               ),
@@ -1275,10 +1305,11 @@ const buildDialogScript = () => {
   
   function handleMessages() {
     notifyAlert("This is still under development and might run longer.")
-    ${getState().getConfig("apple_team_id") &&
+    ${
+      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."
@@ -1288,7 +1319,9 @@ const buildDialogScript = () => {
   }
   </script>`;
 };
-
+/**
+ * Build mobile app
+ */
 router.get(
   "/build-mobile-app",
   isAdmin,
@@ -1481,8 +1514,9 @@ router.get(
                 ),
                 button(
                   {
-                    type: "submit",
-                    onClick: `handleMessages(); press_store_button(this);`,
+                    id: "buildMobileAppBtnId",
+                    type: "button",
+                    onClick: `build_mobile_app(this);`,
                     class: "btn btn-warning",
                   },
                   i({ class: "fas fa-hammer pe-2" }),
@@ -1498,6 +1532,57 @@ router.get(
   })
 );
 
+const checkFiles = async (outDir, fileNames) => {
+  const rootFolder = await File.rootFolder();
+  const mobile_app_dir = path.join(rootFolder.location, "mobile_app", outDir);
+  const entries = fs.readdirSync(mobile_app_dir);
+  return fileNames.some((fileName) => entries.indexOf(fileName) >= 0);
+};
+
+// check if a build has finished (poll service)
+router.get(
+  "/build-mobile-app/finished",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { build_dir } = req.query;
+    res.json({
+      finished: await checkFiles(build_dir, ["logs.txt", "error_logs.txt"]),
+    });
+  })
+);
+
+router.get(
+  "/build-mobile-app/result",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { build_dir_name } = req.query;
+    const rootFolder = await File.rootFolder();
+    const buildDir = path.join(
+      rootFolder.location,
+      "mobile_app",
+      build_dir_name
+    );
+    const files = await Promise.all(
+      fs
+        .readdirSync(buildDir)
+        .map(async (outFile) => await File.from_file_on_disk(outFile, buildDir))
+    );
+    const resultMsg = files.find((file) => file.filename === "logs.txt")
+      ? req.__("The build was successfully")
+      : req.__("Unable to build the app");
+    res.sendWrap(req.__(`Admin`), {
+      above: [
+        {
+          type: "card",
+          title: req.__("Build Result"),
+          contents: div(resultMsg),
+        },
+        files.length > 0 ? app_files_table(files, build_dir_name, req) : "",
+      ],
+    });
+  })
+);
+
 router.post(
   "/build-mobile-app",
   isAdmin,
@@ -1512,24 +1597,27 @@ router.post(
       serverURL,
     } = req.body;
     if (!androidPlatform && !iOSPlatform) {
-      req.flash(
-        "error",
-        req.__("Please select at least one platform (android or iOS).")
-      );
-      return res.redirect("/admin/build-mobile-app");
+      return res.json({
+        error: req.__("Please select at least one platform (android or iOS)."),
+      });
     }
     if (!androidPlatform && useDocker) {
-      req.flash("error", req.__("Only the android build supports docker."));
-      return res.redirect("/admin/build-mobile-app");
+      return res.json({
+        error: req.__("Only the android build supports docker."),
+      });
     }
     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");
+      return res.json({
+        error: req.__("Please enter a valid server URL."),
+      });
     }
-    const appOut = path.join(__dirname, "..", "mobile-app-out");
+    const outDirName = `build_${new Date().valueOf()}`;
+    const rootFolder = await File.rootFolder();
+    const buildDir = path.join(rootFolder.location, "mobile_app", outDirName);
+    await File.new_folder(outDirName, "/mobile_app");
     const spawnParams = [
       "build-app",
       "-e",
@@ -1537,7 +1625,7 @@ router.post(
       "-t",
       entryPointType,
       "-c",
-      appOut,
+      buildDir,
       "-b",
       `${os.userInfo().homedir}/mobile_app_build`,
     ];
@@ -1558,6 +1646,9 @@ router.post(
     ) {
       spawnParams.push("--tenantAppName", db.getTenantSchema());
     }
+    // end http call, return the out directory name
+    // the gui polls for results
+    res.json({ build_dir_name: outDirName });
     const child = spawn("saltcorn", spawnParams, {
       stdio: ["ignore", "pipe", "pipe"],
       cwd: ".",
@@ -1572,60 +1663,37 @@ router.post(
       childOutputs.push(data.toString());
     });
     child.on("exit", async function (exitCode, signal) {
-      if (exitCode === 0) {
-        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: [
-            {
-              type: "card",
-              title: req.__("Build Result"),
-              contents: div(req.__("The build was successfully")),
-            },
-            files.length > 0 ? app_files_table(files, req) : "",
-          ],
-        });
-      } else
-        res.sendWrap(req.__(`Admin`), {
-          above: [
-            {
-              type: "card",
-              title: req.__("Build Result"),
-              contents: div(
-                req.__("Unable to build the app:"),
-                pre(code(childOutputs.join("<br/>")))
-              ),
-            },
-          ],
-        });
+      const logFile = exitCode === 0 ? "logs.txt" : "error_logs.txt";
+      fs.writeFile(
+        path.join(buildDir, logFile),
+        childOutputs.join("\n"),
+        (error) => {
+          if (error) {
+            console.log(`unable to write '${logFile}' to '${buildDir}'`);
+            console.log(error);
+          }
+        }
+      );
     });
     child.on("error", function (msg) {
       const message = msg.message ? msg.message : msg.code;
       const stack = msg.stack ? msg.stack : "";
-      res.sendWrap(req.__(`Admin`), {
-        above: [
-          {
-            type: "card",
-            title: req.__("Build Result"),
-            contents: div(
-              p(req.__("Unable to build the app:")),
-              pre(code(message)),
-              pre(code(stack))
-            ),
-          },
-        ],
-      });
+      fs.writeFile(
+        path.join(buildDir, "error_logs.txt"),
+        [message, stack].join("\n"),
+        (error) => {
+          if (error) {
+            console.log(`unable to write '${logFile}' to '${buildDir}'`);
+            console.log(error);
+          }
+        }
+      );
     });
   })
 );
 
 /**
+ * Clear all
  * @name post/clear-all
  * @function
  * @memberof module:routes/admin~routes/adminRouter
@@ -1744,3 +1812,85 @@ router.post(
     }
   })
 );
+
+/**
+ * Developer settings form
+ * @param {object} req request
+ * @returns {Promise<Form>} form
+ */
+const dev_form = async (req) => {
+    return await config_fields_form({
+        req,
+        field_names: [
+            "development_mode",
+            "log_sql",
+            "log_level",
+        ],
+        action: "/admin/dev",
+    });
+};
+/**
+ * Developer Mode page
+ * @name get/dev
+ * @function
+ * @memberof module:routes/admin~routes/adminRouter
+ */
+router.get(
+    "/dev",
+    isAdmin,
+    error_catcher(async (req, res) => {
+        const form = await dev_form(req);
+        send_admin_page({
+            res,
+            req,
+            active_sub: "Development",
+            contents: {
+                type: "card",
+                title: req.__("Development settings"),
+                contents: [
+                    renderForm(form, req.csrfToken())/*,
+                    a(
+                        {
+                            id: "testemail",
+                            href: "/admin/send-test-email",
+                            class: "btn btn-primary",
+                        },
+                        req.__("Send test email")
+                    ),*/
+                ],
+            },
+        });
+    })
+);
+
+/**
+ * Development mode
+ * @name post/email
+ * @function
+ * @memberof module:routes/admin~routes/adminRouter
+ */
+router.post(
+    "/dev",
+    isAdmin,
+    error_catcher(async (req, res) => {
+        const form = await dev_form(req);
+        form.validate(req.body);
+        if (form.hasErrors) {
+            send_admin_page({
+                res,
+                req,
+                active_sub: "Development",
+                contents: {
+                    type: "card",
+                    title: req.__("Development settings"),
+                    contents: [renderForm(form, req.csrfToken())],
+                },
+            });
+        } else {
+            await save_config_from_form(form);
+            req.flash("success", req.__("Development mode settings updated"));
+            if (!req.xhr) res.redirect("/admin/dev");
+            else res.json({ success: "ok" });
+        }
+    })
+);

package/routes/api.js

@@ -124,8 +124,17 @@ router.post(
   error_catcher(async (req, res, next) => {
     let { viewName, queryName } = req.params;
     const view = await View.findOne({ name: viewName });
+    const db = require("@saltcorn/data/db");
     if (!view) {
-      res.status(404).json({ error: req.__("Not found") });
+      res.status(404).json({ 
+        error: req.__("View %s not found", viewName),
+        view: viewName,
+        queryName: queryName,
+        smr: req.smr,
+        smrHeader: req.headers["x-saltcorn-client"],
+        schema: db.getTenantSchema(),
+        userTenant: req.user?.tenant,
+      });
       return;
     }
     await passport.authenticate(
@@ -143,7 +152,15 @@ router.post(
             const resp = await queries[queryName](...args, true);
             res.json({ success: resp, alerts: getFlashes(req) });
           } else {
-            res.status(404).json({ error: req.__("Not found") });
+            res.status(404).json({ 
+              error: req.__("Query %s not found", queryName),
+              view: viewName,
+              queryName: queryName,
+              smr: req.smr,
+              smrHeader: req.headers["x-saltcorn-client"],
+              schema: db.getTenantSchema(),
+              userTenant: req.user?.tenant,
+            });
           }
         } else {
           res.status(401).json({ error: req.__("Not authorized") });