@saltcorn/server 0.7.4-beta.0 → 0.7.4-beta.1

package/routes/admin.js

@@ -154,7 +154,7 @@ const email_form = async (req) => {
   return form;
 };
 
-const app_files_table = (file, req) =>
+const app_files_table = (files, req) =>
   mkTable(
     [
       {
@@ -168,7 +168,7 @@ const app_files_table = (file, req) =>
         key: (r) => link(`/files/download/${r.id}`, req.__("Download")),
       },
     ],
-    [file]
+    files
   );
 
 /**
@@ -365,7 +365,7 @@ router.get(
                   post_btn(
                     "/admin/backup",
                     i({ class: "fas fa-download me-2" }) +
-                      req.__("Download a backup"),
+                    req.__("Download a backup"),
                     req.csrfToken(),
                     {
                       btnClass: "btn-outline-primary",
@@ -384,21 +384,21 @@ router.get(
           },
           isRoot
             ? {
-                type: "card",
-                title: req.__("Automated backup"),
-                contents: div(
-                  renderForm(backupForm, req.csrfToken()),
-                  a(
-                    { href: "/admin/auto-backup-list" },
-                    "Restore/download automated backups »"
-                  ),
-                  script(
-                    domReady(
-                      `$('#btnBackupNow').prop('disabled', $('#inputauto_backup_frequency').val()==='Never');`
-                    )
-                  )
+              type: "card",
+              title: req.__("Automated backup"),
+              contents: div(
+                renderForm(backupForm, req.csrfToken()),
+                a(
+                  { href: "/admin/auto-backup-list" },
+                  "Restore/download automated backups »"
                 ),
-              }
+                script(
+                  domReady(
+                    `$('#btnBackupNow').prop('disabled', $('#inputauto_backup_frequency').val()==='Never');`
+                  )
+                )
+              ),
+            }
             : { type: "blank", contents: "" },
           {
             type: "card",
@@ -831,47 +831,47 @@ router.get(
                     th(req.__("Saltcorn version")),
                     td(
                       packagejson.version +
-                        (isRoot && can_update
-                          ? post_btn(
-                              "/admin/upgrade",
-                              req.__("Upgrade"),
-                              req.csrfToken(),
-                              {
-                                btnClass: "btn-primary btn-sm",
-                                formClass: "d-inline",
-                              }
-                            )
-                          : isRoot && is_latest
+                      (isRoot && can_update
+                        ? post_btn(
+                          "/admin/upgrade",
+                          req.__("Upgrade"),
+                          req.csrfToken(),
+                          {
+                            btnClass: "btn-primary btn-sm",
+                            formClass: "d-inline",
+                          }
+                        )
+                        : isRoot && is_latest
                           ? span(
-                              { class: "badge bg-primary ms-2" },
-                              req.__("Latest")
-                            ) +
-                            post_btn(
-                              "/admin/check-for-upgrade",
-                              req.__("Check for updates"),
-                              req.csrfToken(),
-                              {
-                                btnClass: "btn-primary btn-sm px-1 py-0",
-                                formClass: "d-inline",
-                              }
-                            )
+                            { class: "badge bg-primary ms-2" },
+                            req.__("Latest")
+                          ) +
+                          post_btn(
+                            "/admin/check-for-upgrade",
+                            req.__("Check for updates"),
+                            req.csrfToken(),
+                            {
+                              btnClass: "btn-primary btn-sm px-1 py-0",
+                              formClass: "d-inline",
+                            }
+                          )
                           : "")
                     )
                   ),
                   git_commit &&
-                    tr(
-                      th(req.__("git commit")),
-                      td(
-                        a(
-                          {
-                            href:
-                              "https://github.com/saltcorn/saltcorn/commit/" +
-                              git_commit,
-                          },
-                          git_commit.substring(0, 6)
-                        )
+                  tr(
+                    th(req.__("git commit")),
+                    td(
+                      a(
+                        {
+                          href:
+                            "https://github.com/saltcorn/saltcorn/commit/" +
+                            git_commit,
+                        },
+                        git_commit.substring(0, 6)
                       )
-                    ),
+                    )
+                  ),
                   tr(th(req.__("Node.js version")), td(process.version)),
                   tr(
                     th(req.__("Database")),
@@ -981,7 +981,7 @@ router.post(
     res.attachment(fileName);
     const file = fs.createReadStream(fileName);
     file.on("end", function () {
-      fs.unlink(fileName, function () {});
+      fs.unlink(fileName, function () { });
     });
     file.pipe(res);
   })
@@ -1004,7 +1004,7 @@ router.post(
     );
     if (err) req.flash("error", err);
     else req.flash("success", req.__("Successfully restored backup"));
-    fs.unlink(newPath, function () {});
+    fs.unlink(newPath, function () { });
     res.redirect(`/admin`);
   })
 );
@@ -1079,7 +1079,7 @@ const clearAllForm = (req) =>
       {
         type: "Bool",
         name: "plugins",
-        label: req.__("Plugins"),
+        label: req.__("Modules"),
         default: true,
       },
     ],
@@ -1149,8 +1149,8 @@ router.post(
           req.__(
             "LetsEncrypt SSL enabled. Restart for changes to take effect."
           ) +
-            " " +
-            a({ href: "/admin/system" }, req.__("Restart here"))
+          " " +
+          a({ href: "/admin/system" }, req.__("Restart here"))
         );
         res.redirect("/useradmin/ssl");
       } catch (e) {
@@ -1221,13 +1221,13 @@ router.get(
           contents: div(
             pass
               ? div(
-                  { class: "alert alert-success", role: "alert" },
-                  i({ class: "fas fa-check-circle fa-lg me-2" }),
-                  h5(
-                    { class: "d-inline" },
-                    req.__("No errors detected during configuration check")
-                  )
+                { class: "alert alert-success", role: "alert" },
+                i({ class: "fas fa-check-circle fa-lg me-2" }),
+                h5(
+                  { class: "d-inline" },
+                  req.__("No errors detected during configuration check")
                 )
+              )
               : errors.map(mkError)
           ),
         },
@@ -1241,32 +1241,49 @@ router.get(
   })
 );
 
-const dialogScript = `<script>
-function swapEntryInputs(activeTab, activeInput, disabledTab, disabledInput) {
-  activeTab.addClass("active");
-  activeInput.removeClass("d-none");
-  activeInput.addClass("d-block");
-  activeInput.attr("name", "entryPoint");
-  disabledTab.removeClass("active");
-  disabledInput.removeClass("d-block");
-  disabledInput.addClass("d-none");
-  disabledInput.removeAttr("name");
-}
-
-function showEntrySelect(type) {
-  const viewNavLin = $("#viewNavLinkID");
-  const pageNavLink = $("#pageNavLinkID");
-  const viewInp = $("#viewInputID");
-  const pageInp = $("#pageInputID");
-  if (type === "page") {
-    swapEntryInputs(pageNavLink, pageInp, viewNavLin, viewInp);
+const buildDialogScript = () => {
+  return `<script>
+  function swapEntryInputs(activeTab, activeInput, disabledTab, disabledInput) {
+    activeTab.addClass("active");
+    activeInput.removeClass("d-none");
+    activeInput.addClass("d-block");
+    activeInput.attr("name", "entryPoint");
+    disabledTab.removeClass("active");
+    disabledInput.removeClass("d-block");
+    disabledInput.addClass("d-none");
+    disabledInput.removeAttr("name");
   }
-  else if (type === "view") {
-    swapEntryInputs(viewNavLin, viewInp, pageNavLink, pageInp);
+  
+  function showEntrySelect(type) {
+    const viewNavLin = $("#viewNavLinkID");
+    const pageNavLink = $("#pageNavLinkID");
+    const viewInp = $("#viewInputID");
+    const pageInp = $("#pageInputID");
+    if (type === "page") {
+      swapEntryInputs(pageNavLink, pageInp, viewNavLin, viewInp);
+    }
+    else if (type === "view") {
+      swapEntryInputs(viewNavLin, viewInp, pageNavLink, pageInp);
+    }
+    $("#entryPointTypeID").attr("value", type);
+  }
+  
+  function handleMessages() {
+    notifyAlert("This is still under development and might run longer.")
+    ${
+      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."
+      );
+    }`
+    }
   }
-  $("#entryPointTypeID").attr("value", type);
-}  
-</script>`;
+  </script>`;
+};
 
 router.get(
   "/build-mobile-app",
@@ -1274,8 +1291,6 @@ router.get(
   error_catcher(async (req, res) => {
     const views = await View.find();
     const pages = await Page.find();
-    const execBuildMsg =
-      "This is still under development and might run longer.";
 
     send_admin_page({
       res,
@@ -1283,7 +1298,7 @@ router.get(
       active_sub: "Mobile app",
       headers: [
         {
-          headerTag: dialogScript,
+          headerTag: buildDialogScript(),
         },
       ],
       contents: {
@@ -1313,13 +1328,13 @@ router.get(
                   { class: "container ps-2" },
                   div(
                     { class: "row pb-2" },
-                    div({ class: "col-sm-4 fw-bold" }, "Entry point"),
-                    div({ class: "col-sm-4 fw-bold" }, "Platform"),
+                    div({ class: "col-sm-4 fw-bold" }, req.__("Entry point")),
+                    div({ class: "col-sm-4 fw-bold" }, req.__("Platform")),
                     div(
                       {
                         class: "col-sm-1 fw-bold d-flex justify-content-center",
                       },
-                      "docker"
+                      req.__("docker")
                     )
                   ),
                   div(
@@ -1336,7 +1351,7 @@ router.get(
                           },
                           div(
                             { class: "nav-link active", id: "viewNavLinkID" },
-                            "View"
+                            req.__("View")
                           )
                         ),
                         li(
@@ -1346,7 +1361,7 @@ router.get(
                           },
                           div(
                             { class: "nav-link", id: "pageNavLinkID" },
-                            "Page"
+                            req.__("Page")
                           )
                         )
                       ),
@@ -1383,7 +1398,7 @@ router.get(
                         { class: "container ps-0" },
                         div(
                           { class: "row" },
-                          div({ class: "col-sm-8" }, "android"),
+                          div({ class: "col-sm-8" }, req.__("android")),
                           div(
                             { class: "col-sm" },
                             input({
@@ -1396,7 +1411,7 @@ router.get(
                         ),
                         div(
                           { class: "row" },
-                          div({ class: "col-sm-8" }, "iOS"),
+                          div({ class: "col-sm-8" }, req.__("iOS")),
                           div(
                             { class: "col-sm" },
                             input({
@@ -1428,7 +1443,7 @@ router.get(
                           for: "appNameInputId",
                           class: "form-label fw-bold",
                         },
-                        "App file"
+                        req.__("App file")
                       ),
                       input({
                         type: "text",
@@ -1448,7 +1463,7 @@ router.get(
                           for: "serverURLInputId",
                           class: "form-label fw-bold",
                         },
-                        "Server URL"
+                        req.__("Server URL")
                       ),
                       input({
                         type: "text",
@@ -1463,12 +1478,12 @@ router.get(
                 button(
                   {
                     type: "submit",
-                    onClick: `notifyAlert('${execBuildMsg}'); press_store_button(this);`,
+                    onClick: `handleMessages(); press_store_button(this);`,
                     class: "btn btn-warning",
                   },
                   i({ class: "fas fa-hammer pe-2" }),
 
-                  "Build mobile app"
+                  req.__("Build mobile app")
                 )
               )
             ),
@@ -1503,7 +1518,6 @@ router.post(
       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`;
     if (!serverURL || serverURL.length == 0) {
       serverURL = getState().getConfig("base_url") || "";
     }
@@ -1525,7 +1539,13 @@ router.post(
     ];
     if (useDocker) spawnParams.push("-d");
     if (androidPlatform) spawnParams.push("-p", "android");
-    if (iOSPlatform) spawnParams.push("-p", "ios");
+    if (iOSPlatform) {
+      spawnParams.push("-p", "ios");
+      const teamId = getState().getConfig("apple_team_id");
+      if (!teamId || teamId === "null") {
+        spawnParams.push("--buildForEmulator");
+      }
+    }
     if (appFile) spawnParams.push("-a", appFile);
     if (serverURL) spawnParams.push("-s", serverURL);
     const child = spawn("saltcorn", spawnParams, {
@@ -1543,10 +1563,13 @@ router.post(
     });
     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
+        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: [
@@ -1555,7 +1578,7 @@ router.post(
               title: req.__("Build Result"),
               contents: div("The build was successfully"),
             },
-            app_files_table(file, req),
+            files.length > 0 ? app_files_table(files, req) : "",
           ],
         });
       } else

package/routes/fields.js

@@ -348,13 +348,12 @@ const fieldFlow = (req) =>
                 // todo sublabel
                 input_type: "custom_html",
                 attributes: {
-                  html: `<button type="button" id="test_formula_btn" onclick="test_formula('${
-                    table.name
-                  }', ${JSON.stringify(
-                    context.stored
-                  )})" class="btn btn-outline-secondary">${req.__(
-                    "Test"
-                  )}</button>
+                  html: `<button type="button" id="test_formula_btn" onclick="test_formula('${table.name
+                    }', ${JSON.stringify(
+                      context.stored
+                    )})" class="btn btn-outline-secondary">${req.__(
+                      "Test"
+                    )}</button>
                   <div id="test_formula_output"></div>`,
                 },
               }),
@@ -633,8 +632,7 @@ router.post(
         result = f(rows[0]);
       }
       res.send(
-        `Result of running on row with id=${
-          rows[0].id
+        `Result of running on row with id=${rows[0].id
         } is: <pre>${JSON.stringify(result)}</pre>`
       );
     } catch (e) {
@@ -788,22 +786,22 @@ router.post(
       field.type === "Key"
         ? getState().keyFieldviews
         : field.type === "File"
-        ? getState().fileviews
-        : field.type.fieldviews;
+          ? getState().fileviews
+          : field.type.fieldviews;
     if (!field.type || !fieldviews) {
       res.send("");
       return;
     }
     const fv = fieldviews[fieldview];
     if (!fv && field.type === "Key" && fieldview === "select")
-      res.send("<select disabled></select>");
+      res.send(`<input readonly class="form-control form-select"></input>`);
     else if (!fv) res.send("");
     else if (fv.isEdit || fv.isFilter)
       res.send(
         fv.run(
           field.name,
           undefined,
-          { disabled: true, ...configuration, ...(field.attributes || {}) },
+          { readonly: true, ...configuration, ...(field.attributes || {}) },
           "",
           false,
           field

package/routes/homepage.js

@@ -54,9 +54,9 @@ const tableCard = (tables, req) => ({
   contents:
     (tables.length <= 1
       ? p(
-          { class: "mt-2 pe-2" },
-          i(req.__("Tables organise data by fields and rows."))
-        )
+        { class: "mt-2 pe-2" },
+        i(req.__("Tables organise data by fields and rows."))
+      )
       : "") + tableTable(tables, req),
   bodyClass: "py-0 pe-0",
   footer: div(
@@ -107,13 +107,13 @@ const viewCard = (views, req) => ({
   contents:
     (views.length <= 1
       ? p(
-          { class: "mt-2 pe-2" },
-          i(
-            req.__(
-              "Views display data from tables. A view is a view template applied to a table, with configuration."
-            )
+        { class: "mt-2 pe-2" },
+        i(
+          req.__(
+            "Views display data from tables. A view is a view pattern applied to a table, with configuration."
           )
         )
+      )
       : "") +
     (views.length > 0 ? viewTable(views, req) : p(req.__("No views"))),
 
@@ -160,13 +160,13 @@ const pageCard = (pages, req) => ({
   contents:
     (pages.length <= 1
       ? p(
-          { class: "mt-2 pe-2" },
-          i(
-            req.__(
-              "Pages are the web pages of your application built with a drag-and-drop builder. They have static content, and by embedding views, dynamic content."
-            )
+        { class: "mt-2 pe-2" },
+        i(
+          req.__(
+            "Pages are the web pages of your application built with a drag-and-drop builder. They have static content, and by embedding views, dynamic content."
           )
         )
+      )
       : "") +
     (pages.length > 0
       ? pageTable(pages, req)
@@ -191,16 +191,16 @@ const filesTab = async (req) => {
     files.length === 0
       ? p(req.__("No files"))
       : mkTable(
-          [
-            {
-              label: req.__("Filename"),
-              key: (r) => link(`/files/serve/${r.id}`, r.filename),
-            },
-            { label: req.__("Size (KiB)"), key: "size_kb", align: "right" },
-            { label: req.__("Media type"), key: (r) => r.mimetype },
-          ],
-          files
-        ),
+        [
+          {
+            label: req.__("Filename"),
+            key: (r) => link(`/files/serve/${r.id}`, r.filename),
+          },
+          { label: req.__("Size (KiB)"), key: "size_kb", align: "right" },
+          { label: req.__("Media type"), key: (r) => r.mimetype },
+        ],
+        files
+      ),
     fileUploadForm(req)
   );
 };
@@ -244,30 +244,30 @@ const actionsTab = async (req, triggers) => {
   return div(
     { class: "pb-3" },
     triggers.length <= 1 &&
-      p(
-        { class: "mt-2 pe-2" },
-        i(req.__("Triggers run actions in response to events."))
-      ),
+    p(
+      { class: "mt-2 pe-2" },
+      i(req.__("Triggers run actions in response to events."))
+    ),
     triggers.length === 0
       ? p(req.__("No triggers"))
       : mkTable(
-          [
-            { label: req.__("Name"), key: "name" },
-            { label: req.__("Action"), key: "action" },
-            {
-              label: req.__("Table or Channel"),
-              key: (r) => r.table_name || r.channel,
-            },
-            {
-              label: req.__("When"),
-              key: (a) =>
-                a.when_trigger === "API call"
-                  ? `API: ${base_url}api/action/${a.name}`
-                  : a.when_trigger,
-            },
-          ],
-          triggers
-        ),
+        [
+          { label: req.__("Name"), key: "name" },
+          { label: req.__("Action"), key: "action" },
+          {
+            label: req.__("Table or Channel"),
+            key: (r) => r.table_name || r.channel,
+          },
+          {
+            label: req.__("When"),
+            key: (a) =>
+              a.when_trigger === "API call"
+                ? `API: ${base_url}api/action/${a.name}`
+                : a.when_trigger,
+          },
+        ],
+        triggers
+      ),
     a(
       { href: "/actions/new", class: "btn btn-secondary my-3" },
       req.__("Add trigger")
@@ -385,15 +385,15 @@ const welcome_page = async (req) => {
             tabContents:
               triggers.length > 0
                 ? {
-                    Triggers: await actionsTab(req, triggers),
-                    Files: await filesTab(req),
-                    Packs: packTab(req, packlist),
-                  }
+                  Triggers: await actionsTab(req, triggers),
+                  Files: await filesTab(req),
+                  Packs: packTab(req, packlist),
+                }
                 : {
-                    Packs: packTab(req, packlist),
-                    Triggers: await actionsTab(req, triggers),
-                    Files: await filesTab(req),
-                  },
+                  Packs: packTab(req, packlist),
+                  Triggers: await actionsTab(req, triggers),
+                  Files: await filesTab(req),
+                },
           },
           {
             type: "card",
@@ -403,13 +403,13 @@ const welcome_page = async (req) => {
             tabContents:
               users.length > 4
                 ? {
-                    Users: await usersTab(req, users, roleMap),
-                    Help: helpCard(req),
-                  }
+                  Users: await usersTab(req, users, roleMap),
+                  Help: helpCard(req),
+                }
                 : {
-                    Help: helpCard(req),
-                    Users: await usersTab(req, users, roleMap),
-                  },
+                  Help: helpCard(req),
+                  Users: await usersTab(req, users, roleMap),
+                },
           },
         ],
       },
@@ -440,8 +440,8 @@ const no_views_logged_in = async (req, res) => {
           packagejson.version,
           latest
         ) +
-          " " +
-          a({ href: "/admin/system" }, req.__("Upgrade here"))
+        " " +
+        a({ href: "/admin/system" }, req.__("Upgrade here"))
       );
 
     res.sendWrap(req.__("Hello"), await welcome_page(req));