@saltcorn/server 0.7.3-beta.2 → 0.7.3-beta.3

package/markup/admin.js

@@ -271,7 +271,7 @@ const send_events_page = (args) => {
  * @returns {void}
  */
 const send_admin_page = (args) => {
-  //const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
+  const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
   return send_settings_page({
     main_section: "About application",
     main_section_href: "/admin",
@@ -280,6 +280,9 @@ const send_admin_page = (args) => {
       { text: "Backup", href: "/admin/backup" },
       { text: "Email", href: "/admin/email" },
       { text: "System", href: "/admin/system" },
+      ...(isRoot
+        ? [{ text: "Mobile app", href: "/admin/build-mobile-app" }]
+        : []),
     ],
     ...args,
   });

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.7.3-beta.2",
+  "version": "0.7.3-beta.3",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.7.3-beta.2",
-    "@saltcorn/builder": "0.7.3-beta.2",
-    "@saltcorn/data": "0.7.3-beta.2",
-    "@saltcorn/admin-models": "0.7.3-beta.2",
-    "@saltcorn/markup": "0.7.3-beta.2",
-    "@saltcorn/sbadmin2": "0.7.3-beta.2",
+    "@saltcorn/base-plugin": "0.7.3-beta.3",
+    "@saltcorn/builder": "0.7.3-beta.3",
+    "@saltcorn/data": "0.7.3-beta.3",
+    "@saltcorn/admin-models": "0.7.3-beta.3",
+    "@saltcorn/markup": "0.7.3-beta.3",
+    "@saltcorn/sbadmin2": "0.7.3-beta.3",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "aws-sdk": "^2.1037.0",
@@ -48,7 +48,7 @@
     "pg": "^8.2.1",
     "pluralize": "^8.0.0",
     "qrcode": "1.5.0",
-    "resize-with-sharp-or-jimp": "0.1.3",
+    "resize-with-sharp-or-jimp": "0.1.4",
     "socket.io": "4.2.0",
     "thirty-two": "1.0.2",
     "tmp-promise": "^3.0.2",

package/public/saltcorn-common.js

@@ -583,8 +583,52 @@ function unique_field_from_rows(
   }
 }
 
+function room_older(viewname, room_id, btn) {
+  view_post(
+    viewname,
+    "fetch_older_msg",
+    { room_id, lt_msg_id: +$(btn).attr("data-lt-msg-id") },
+    (res) => {
+      if (res.prepend) $(`.msglist-${room_id}`).prepend(res.prepend);
+      if (res.new_fetch_older_lt)
+        $(btn).attr("data-lt-msg-id", res.new_fetch_older_lt);
+      if (res.remove_fetch_older) $(btn).remove();
+    }
+  );
+}
+
+function init_room(viewname, room_id) {
+  const socket = parent?.config?.server_path
+    ? io(parent.config.server_path, {
+        query: `jwt=${localStorage.getItem("auth_jwt")}`,
+        transports: ["websocket"],
+      })
+    : io({ transports: ["websocket"] });
+
+  socket.emit("join_room", [viewname, room_id]);
+  socket.on("message", (msg) => {
+    if (msg.not_for_user_id) {
+      const my_user_id = $(`.msglist-${room_id}`).attr("data-user-id");
+      if (+my_user_id === +msg.not_for_user_id) return;
+    }
+    if (msg.append) $(`.msglist-${room_id}`).append(msg.append);
+    if (msg.pls_ack_msg_id)
+      view_post(viewname, "ack_read", { room_id, id: msg.pls_ack_msg_id });
+  });
+
+  $(`form.room-${room_id}`).submit((e) => {
+    e.preventDefault();
+    var form_data = $(`form.room-${room_id}`).serialize();
+    view_post(viewname, "submit_msg_ajax", form_data, (vpres) => {
+      if (vpres.append) $(`.msglist-${room_id}`).append(vpres.append);
+      $(`form.room-${room_id}`).trigger("reset");
+    });
+  });
+}
+
 function cancel_form(form) {
   if (!form) return;
   $(form).append(`<input type="hidden" name="_cancel" value="on">`);
   $(form).submit();
 }
+

package/public/saltcorn.css

@@ -298,3 +298,8 @@ section.range-slider input[type="range"]::-moz-focus-outer {
 .btn-xs {
   padding: 0.1rem 0.4rem !important;
 }
+
+table.table-inner-grid, table.table-inner-grid th, table.table-inner-grid td {
+  border: 1px solid black;
+  border-collapse: collapse;
+}

package/public/saltcorn.js

@@ -366,42 +366,6 @@ function test_formula(tablename, stored) {
   });
 }
 
-function init_room(viewname, room_id) {
-  const socket = io({ transports: ["websocket"] });
-  socket.emit("join_room", [viewname, room_id]);
-  socket.on("message", (msg) => {
-    if (msg.not_for_user_id) {
-      const my_user_id = $(`.msglist-${room_id}`).attr("data-user-id");
-      if (+my_user_id === +msg.not_for_user_id) return;
-    }
-    if (msg.append) $(`.msglist-${room_id}`).append(msg.append);
-    if (msg.pls_ack_msg_id)
-      view_post(viewname, "ack_read", { room_id, id: msg.pls_ack_msg_id });
-  });
-
-  $(`form.room-${room_id}`).submit((e) => {
-    e.preventDefault();
-    var form_data = $(`form.room-${room_id}`).serialize();
-    view_post(viewname, "submit_msg_ajax", form_data, (vpres) => {
-      if (vpres.append) $(`.msglist-${room_id}`).append(vpres.append);
-      $(`form.room-${room_id}`).trigger("reset");
-    });
-  });
-}
-function room_older(viewname, room_id, btn) {
-  view_post(
-    viewname,
-    "fetch_older_msg",
-    { room_id, lt_msg_id: +$(btn).attr("data-lt-msg-id") },
-    (res) => {
-      if (res.prepend) $(`.msglist-${room_id}`).prepend(res.prepend);
-      if (res.new_fetch_older_lt)
-        $(btn).attr("data-lt-msg-id", res.new_fetch_older_lt);
-      if (res.remove_fetch_older) $(btn).remove();
-    }
-  );
-}
-
 async function fill_formula_btn_click(btn, k) {
   const formula = decodeURIComponent($(btn).attr("data-formula"));
   const free_vars = JSON.parse(

package/routes/admin.js

@@ -18,7 +18,7 @@ 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 } = require("@saltcorn/markup");
+const { post_btn, renderForm, mkTable, link } = require("@saltcorn/markup");
 const {
   div,
   a,
@@ -35,6 +35,14 @@ const {
   code,
   h5,
   pre,
+  button,
+  form,
+  label,
+  input,
+  select,
+  option,
+  fieldset,
+  legend,
 } = require("@saltcorn/markup/tags");
 const db = require("@saltcorn/data/db");
 const {
@@ -136,6 +144,23 @@ const email_form = async (req) => {
   return form;
 };
 
+const app_files_table = (file, req) =>
+  mkTable(
+    [
+      {
+        label: req.__("Filename"),
+        key: (r) => div(r.filename),
+      },
+      { label: req.__("Size (KiB)"), key: "size_kb", align: "right" },
+      { label: req.__("Media type"), key: (r) => r.mimetype },
+      {
+        label: req.__("Download"),
+        key: (r) => link(`/files/download/${r.id}`, req.__("Download")),
+      },
+    ],
+    [file]
+  );
+
 /**
  * Router get /
  * @name get
@@ -503,6 +528,7 @@ router.get(
                 " ",
                 req.__("Configuration check")
               ),
+
               hr(),
 
               a(
@@ -935,6 +961,255 @@ router.get(
   })
 );
 
+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.";
+
+    send_admin_page({
+      res,
+      req,
+      active_sub: "Mobile app",
+      contents: {
+        above: [
+          {
+            type: "card",
+            title: req.__("Build mobile app"),
+            contents: form(
+              {
+                action: "/admin/build-mobile-app",
+                method: "post",
+              },
+
+              fieldset(
+                input({
+                  type: "hidden",
+                  name: "_csrf",
+                  value: req.csrfToken(),
+                }),
+                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-1 fw-bold d-flex justify-content-center",
+                      },
+                      "docker"
+                    )
+                  ),
+                  div(
+                    { class: "row" },
+                    div(
+                      { class: "col-sm-4" },
+                      select(
+                        {
+                          class: "form-control",
+                          name: "entryView",
+                          id: "entryViewInput",
+                        },
+                        views
+                          .map((view) =>
+                            option({ value: view.name }, view.name)
+                          )
+                          .join(",")
+                      )
+                    ),
+                    div(
+                      { class: "col-sm-4" },
+
+                      div(
+                        { class: "container ps-0" },
+                        div(
+                          { class: "row" },
+                          div({ class: "col-sm-8" }, "android"),
+                          div(
+                            { class: "col-sm" },
+                            input({
+                              type: "checkbox",
+                              class: "form-check-input",
+                              name: "androidPlatform",
+                              id: "androidCheckboxId",
+                            })
+                          )
+                        ),
+                        div(
+                          { class: "row" },
+                          div({ class: "col-sm-8" }, "iOS"),
+                          div(
+                            { class: "col-sm" },
+                            input({
+                              type: "checkbox",
+                              class: "form-check-input",
+                              name: "iOSPlatform",
+                              id: "iOSCheckboxId",
+                            })
+                          )
+                        )
+                      )
+                    ),
+                    div(
+                      { class: "col-sm-1 d-flex justify-content-center" },
+                      input({
+                        type: "checkbox",
+                        class: "form-check-input",
+                        name: "useDocker",
+                        id: "dockerCheckboxId",
+                      })
+                    )
+                  ),
+                  div(
+                    { class: "row pb-2" },
+                    div(
+                      { class: "col-sm-8" },
+                      label(
+                        {
+                          for: "appNameInputId",
+                          class: "form-label fw-bold",
+                        },
+                        "App file"
+                      ),
+                      input({
+                        type: "text",
+                        class: "form-control",
+                        name: "appFile",
+                        id: "appFileInputId",
+                        placeholder: "app-debug",
+                      })
+                    )
+                  ),
+                  div(
+                    { class: "row pb-3" },
+                    div(
+                      { class: "col-sm-8" },
+                      label(
+                        {
+                          for: "serverURLInputId",
+                          class: "form-label fw-bold",
+                        },
+                        "Server URL"
+                      ),
+                      input({
+                        type: "text",
+                        class: "form-control",
+                        name: "serverURL",
+                        id: "serverURLInputId",
+                        placeholder: "http://10.0.2.2:3000",
+                      })
+                    )
+                  )
+                ),
+                button(
+                  {
+                    type: "submit",
+                    onClick: `notifyAlert('${execBuildMsg}'); press_store_button(this);`,
+                    class: "btn btn-warning",
+                  },
+                  i({ class: "fas fa-hammer pe-2" }),
+
+                  "Build mobile app"
+                )
+              )
+            ),
+          },
+        ],
+      },
+    });
+  })
+);
+
+router.post(
+  "/build-mobile-app",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    let {
+      entryView,
+      androidPlatform,
+      iOSPlatform,
+      useDocker,
+      appFile,
+      serverURL,
+    } = req.body;
+    if (!androidPlatform && !iOSPlatform) {
+      req.flash(
+        "error",
+        req.__("Please select at least one platform (android or iOS).")
+      );
+      return res.redirect("/admin/system");
+    }
+    if (!androidPlatform && useDocker) {
+      req.flash("error", req.__("Only the android build supports docker."));
+      return res.redirect("/admin/system");
+    }
+    if (appFile && !appFile.endsWith(".apk")) appFile = `${appFile}.apk`;
+    const appOut = path.join(__dirname, "..", "mobile-app-out");
+    const spawnParams = ["build-app", "-v", entryView, "-c", appOut];
+    if (useDocker) spawnParams.push("-d");
+    if (androidPlatform) spawnParams.push("-p", "android");
+    if (iOSPlatform) spawnParams.push("-p", "ios");
+    if (appFile) spawnParams.push("-a", appFile);
+    if (serverURL) spawnParams.push("-s", serverURL);
+    const child = spawn("saltcorn", spawnParams, {
+      stdio: ["ignore", "pipe", process.stderr],
+      cwd: ".",
+    });
+    const childOutputs = [];
+    child.stdout.on("data", (data) => {
+      // console.log(data.toString());
+      childOutputs.push(data.toString());
+    });
+    child.on("exit", async function (code, signal) {
+      if (code === 0) {
+        const file = await File.from_existing_file(
+          appOut,
+          appFile ? appFile : "app-debug.apk",
+          req.user.id
+        );
+        res.sendWrap(req.__(`Admin`), {
+          above: [
+            {
+              type: "card",
+              title: req.__("Build Result"),
+              contents: div("The build was successfully"),
+            },
+            app_files_table(file, req),
+          ],
+        });
+      } else
+        res.sendWrap(req.__(`Admin`), {
+          above: [
+            {
+              type: "card",
+              title: req.__("Build Result"),
+              contents: div("Unable to build the app"),
+            },
+            childOutputs.join("<br/>"),
+          ],
+        });
+    });
+    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("Unable to build the app"),
+          },
+          `${message} <br/> ${stack}`,
+        ],
+      });
+    });
+  })
+);
+
 /**
  * @name post/clear-all
  * @function

package/routes/menu.js

@@ -84,7 +84,15 @@ const menuForm = async (req) => {
         input_type: "select",
         class: "menutype item-menu",
         required: true,
-        options: ["View", "Page", "Link", "Header", "Dynamic", "Search"],
+        options: [
+          "View",
+          "Page",
+          "Link",
+          "Header",
+          "Dynamic",
+          "Search",
+          "Separator",
+        ],
       },
       {
         name: "text",
@@ -92,6 +100,9 @@ const menuForm = async (req) => {
         class: "item-menu",
         input_type: "text",
         required: true,
+        showIf: {
+          type: ["View", "Page", "Link", "Header", "Dynamic", "Search"],
+        },
       },
       {
         name: "icon_btn",
@@ -271,6 +282,7 @@ const menuEditorScript = (menu_items) => `
               { 
               listOptions: sortableListOptions, 
               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)
               // Valid levels are from [0, 1, 2, 3,...N]

package/serve.js

@@ -348,7 +348,7 @@ const setupSocket = (...servers) => {
   io.use(wrap(setTenant));
   io.use(wrap(getSessionStore()));
   io.use(wrap(passport.initialize()));
-  io.use(wrap(passport.session()));
+  io.use(wrap(passport.authenticate(["jwt", "session"])));
   if (process.send && !cluster.isMaster) io.adapter(createAdapter());
   getState().setRoomEmitter((viewname, room_id, msg) => {
     io.to(`${viewname}_${room_id}`).emit("message", msg);