@saltcorn/server 0.7.3-beta.1 → 0.7.3-beta.6

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,17 @@ const {
   code,
   h5,
   pre,
+  button,
+  form,
+  label,
+  input,
+  select,
+  option,
+  fieldset,
+  legend,
+  ul,
+  li,
+  ol,
 } = require("@saltcorn/markup/tags");
 const db = require("@saltcorn/data/db");
 const {
@@ -136,6 +147,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
@@ -345,7 +373,13 @@ router.get(
             ? {
                 type: "card",
                 title: req.__("Automated backup"),
-                contents: div(renderForm(backupForm, req.csrfToken())),
+                contents: div(
+                  renderForm(backupForm, req.csrfToken()),
+                  a(
+                    { href: "/admin/auto-backup-list" },
+                    "Restore/download automated backups »"
+                  )
+                ),
               }
             : { type: "blank", contents: "" },
         ],
@@ -354,6 +388,93 @@ router.get(
   })
 );
 
+/**
+ * @name get/backup
+ * @function
+ * @memberof module:routes/admin~routes/adminRouter
+ */
+router.get(
+  "/auto-backup-list",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
+    if (!isRoot) {
+      res.redirect("/admin/backup");
+      return;
+    }
+    const auto_backup_directory = getState().getConfig("auto_backup_directory");
+    const fileNms = await fs.promises.readdir(auto_backup_directory);
+    const backupFiles = fileNms.filter(
+      (fnm) => fnm.startsWith("sc-backup") && fnm.endsWith(".zip")
+    );
+    send_admin_page({
+      res,
+      req,
+      active_sub: "Backup",
+      contents: {
+        above: [
+          {
+            type: "card",
+            title: req.__("Download automated backup"),
+            contents: div(
+              ul(
+                backupFiles.map((fnm) =>
+                  li(
+                    a(
+                      {
+                        href: `/admin/auto-backup-download/${encodeURIComponent(
+                          fnm
+                        )}`,
+                      },
+                      fnm
+                    )
+                  )
+                )
+              )
+            ),
+          },
+          {
+            type: "card",
+            title: req.__("Restoring automated backup"),
+            contents: div(
+              ol(
+                li("Download one of the backups above"),
+                li(
+                  a({ href: "/admin/clear-all" }, "Clear this application"),
+                  " ",
+                  "(tick all boxes)"
+                ),
+                li(
+                  "When prompted to create the first user, click the link to restore a backup"
+                ),
+                li("Select the downloaded backup file")
+              )
+            ),
+          },
+        ],
+      },
+    });
+  })
+);
+
+router.get(
+  "/auto-backup-download/:filename",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { filename } = req.params;
+    const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
+    if (
+      !isRoot ||
+      !(filename.startsWith("sc-backup") && filename.endsWith(".zip"))
+    ) {
+      res.redirect("/admin/backup");
+      return;
+    }
+    const auto_backup_directory = getState().getConfig("auto_backup_directory");
+    res.download(path.join(auto_backup_directory, filename), filename);
+  })
+);
+
 /**
  * Auto backup Form
  * @param {object} req
@@ -503,6 +624,7 @@ router.get(
                 " ",
                 req.__("Configuration check")
               ),
+
               hr(),
 
               a(
@@ -935,6 +1057,268 @@ 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/build-mobile-app");
+    }
+    if (!androidPlatform && useDocker) {
+      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`;
+    const appOut = path.join(__dirname, "..", "mobile-app-out");
+    const spawnParams = [
+      "build-app",
+      "-v",
+      entryView,
+      "-c",
+      appOut,
+      "-b",
+      "/tmp/mobile_app_build",
+    ];
+    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 (exitCode, signal) {
+      if (exitCode === 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:",
+                pre(code(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(
+              p("Unable to build the app:"),
+              pre(code(message)),
+              pre(code(stack))
+            ),
+          },
+        ],
+      });
+    });
+  })
+);
+
 /**
  * @name post/clear-all
  * @function

package/routes/fields.js

@@ -488,6 +488,7 @@ router.get(
         },
         {
           type: "card",
+          class: "mt-0",
           title: wizardCardTitle(field.label, wf, wfres),
           contents: renderForm(wfres.renderForm, req.csrfToken()),
         },
@@ -524,6 +525,7 @@ router.get(
         },
         {
           type: "card",
+          class: "mt-0",
           title: wizardCardTitle(req.__(`New field`), wf, wfres),
           contents: renderForm(wfres.renderForm, req.csrfToken()),
         },
@@ -589,6 +591,7 @@ router.post(
           },
           {
             type: "card",
+            class: "mt-0",
             title: wizardCardTitle(
               wfres.context.label || req.__("New field"),
               wf,

package/routes/files.js

@@ -184,11 +184,11 @@ router.get(
  * @function
  */
 router.get(
-  "/resize/:id/:width_str",
+  "/resize/:id/:width_str/:height_str?",
   error_catcher(async (req, res) => {
     const role = req.user && req.user.id ? req.user.role_id : 10;
     const user_id = req.user && req.user.id;
-    const { id, width_str } = req.params;
+    const { id, width_str, height_str } = req.params;
     let file;
     if (typeof strictParseInt(id) !== "undefined")
       file = await File.findOne({ id });
@@ -208,15 +208,17 @@ router.get(
       if (file.s3_store) s3storage.serveObject(file, res, false);
       else {
         const width = strictParseInt(width_str);
+        const height = height_str ? strictParseInt(height_str) : null;
         if (!width) {
           res.sendFile(file.location);
           return;
         }
-        const fnm = `${file.location}_w${width}`;
+        const fnm = `${file.location}_w${width}${height ? `_h${height}` : ""}`;
         if (!fs.existsSync(fnm)) {
           await resizer({
             fromFileName: file.location,
             width,
+            height,
             toFileName: fnm,
           });
         }

package/routes/homepage.js

@@ -49,7 +49,7 @@ const tableTable = (tables, req) =>
  */
 const tableCard = (tables, req) => ({
   type: "card",
-  class: "welcome-page-entity-list",
+  class: "welcome-page-entity-list mt-1",
   title: link("/table", req.__("Tables")),
   contents:
     (tables.length <= 1
@@ -102,7 +102,7 @@ const viewTable = (views, req) =>
 const viewCard = (views, req) => ({
   type: "card",
   title: link("/viewedit", req.__("Views")),
-  class: "welcome-page-entity-list",
+  class: "welcome-page-entity-list mt-1",
   bodyClass: "py-0  pe-0",
   contents:
     (views.length <= 1
@@ -156,7 +156,7 @@ const pageTable = (pages, req) =>
 const pageCard = (pages, req) => ({
   type: "card",
   title: link("/pageedit", req.__("Pages")),
-  class: "welcome-page-entity-list",
+  class: "welcome-page-entity-list mt-1",
   contents:
     (pages.length <= 1
       ? p(
@@ -369,9 +369,9 @@ const welcome_page = async (req) => {
     above: [
       {
         besides: [
-          pageCard(pages, req),
-          viewCard(views, req),
           tableCard(tables, req),
+          viewCard(views, req),
+          pageCard(pages, req),
         ],
       },
       {
@@ -380,7 +380,7 @@ const welcome_page = async (req) => {
             type: "card",
             //title: req.__("Install pack"),
             bodyClass: "py-0 pe-0",
-            class: "welcome-page-entity-list",
+            class: "welcome-page-entity-list mt-2",
 
             tabContents:
               triggers.length > 0
@@ -399,7 +399,7 @@ const welcome_page = async (req) => {
             type: "card",
             //title: req.__("Learn"),
             bodyClass: "py-0 pe-0",
-            class: "welcome-page-entity-list",
+            class: "welcome-page-entity-list mt-2",
             tabContents:
               users.length > 4
                 ? {

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/routes/pageedit.js

@@ -326,6 +326,7 @@ router.get(
         {
           type: "card",
           title: req.__("Your pages"),
+          class: "mt-0",
           contents: getPageList(pages, roles, req),
         },
         {

package/routes/plugins.js

@@ -506,6 +506,7 @@ const plugin_store_html = (items, req) => {
       },
       {
         type: "card",
+        class: "mt-0",
         contents: div(
           { class: "d-flex justify-content-between" },
           storeNavPills(req),

package/routes/tables.js

@@ -448,6 +448,7 @@ router.get(
           },
           {
             type: "card",
+            class: "mt-0",
             title: cardHeaderTabs([
               { label: req.__("Your tables"), href: "/table" },
               {
@@ -636,7 +637,9 @@ router.get(
     }
     var viewCard;
     if (fields.length > 0) {
-      const views = await View.find({ table_id: table.id });
+      const views = await View.find(
+        table.external ? { exttable_name: table.name } : { table_id: table.id }
+      );
       var viewCardContents;
       if (views.length > 0) {
         viewCardContents = mkTable(
@@ -801,15 +804,12 @@ router.get(
           type: "breadcrumbs",
           crumbs: [
             { text: req.__("Tables"), href: "/table" },
-            { text: table.name },
+            { text: span({ class: "fw-bold text-body" }, table.name) },
           ],
         },
-        {
-          type: "pageHeader",
-          title: req.__(`%s table`, table.name),
-        },
         {
           type: "card",
+          class: "mt-0",
           title: req.__("Fields"),
           contents: fieldCard,
         },
@@ -1076,6 +1076,7 @@ router.get(
         },
         {
           type: "card",
+          class: "mt-0",
           title: cardHeaderTabs([
             { label: req.__("Your tables"), href: "/table", active: true },
             {

package/routes/viewedit.js

@@ -197,6 +197,7 @@ router.get(
         },
         {
           type: "card",
+          class: "mt-0",
           title: req.__("Your views"),
           contents: [
             viewMarkup,
@@ -378,6 +379,7 @@ router.get(
         },
         {
           type: "card",
+          class: "mt-0",
           title: req.__(`Edit %s view`, viewname),
           contents: renderForm(form, req.csrfToken()),
         },
@@ -415,6 +417,7 @@ router.get(
         },
         {
           type: "card",
+          class: "mt-0",
           title: req.__(`Create view`),
           contents: renderForm(form, req.csrfToken()),
         },
@@ -452,6 +455,7 @@ router.post(
           },
           {
             type: "card",
+            class: "mt-0",
             title: req.__(`Edit view`),
             contents: renderForm(form, req.csrfToken()),
           },
@@ -527,6 +531,7 @@ const respondWorkflow = (view, wf, wfres, req, res) => {
       },
       {
         type: noCard ? "container" : "card",
+        class: !noCard && "mt-0",
         title: wfres.title,
         contents,
       },

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);