@saltcorn/server 0.9.5-beta.16 → 0.9.5-beta.18

package/auth/routes.js

@@ -238,13 +238,7 @@ const loginWithJwt = async (email, password, saltcornApp, res, req) => {
         const token = jwt.sign(
           {
             sub: email,
-            user: {
-              id: user.id,
-              email: user.email,
-              role_id: user.role_id,
-              language: user.language ? user.language : "en",
-              disabled: user.disabled,
-            },
+            user: user.session_object,
             iss: "saltcorn@saltcorn",
             aud: "saltcorn-mobile-app",
             iat: now.valueOf(),

package/locales/en.json

@@ -1399,5 +1399,8 @@
 	"Configure theme": "Configure theme",
 	"Remove all user specific theme settings": "Remove all user specific theme settings",
 	"Configure %s Plugin for %s": "Configure %s Plugin for %s",
-	"The current theme has no user specific settings": "The current theme has no user specific settings"
-}
+	"The current theme has no user specific settings": "The current theme has no user specific settings",
+	"Some themes support only one level of menu nesting.": "Some themes support only one level of menu nesting.",
+	"Apple Team ID": "Apple Team ID",
+	"Please enter your Apple Team ID": "Please enter your Apple Team ID"
+}

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.5-beta.16",
+  "version": "0.9.5-beta.18",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
     "@aws-sdk/client-s3": "^3.451.0",
-    "@saltcorn/base-plugin": "0.9.5-beta.16",
-    "@saltcorn/builder": "0.9.5-beta.16",
-    "@saltcorn/data": "0.9.5-beta.16",
-    "@saltcorn/admin-models": "0.9.5-beta.16",
-    "@saltcorn/filemanager": "0.9.5-beta.16",
-    "@saltcorn/markup": "0.9.5-beta.16",
-    "@saltcorn/plugins-loader": "0.9.5-beta.16",
-    "@saltcorn/sbadmin2": "0.9.5-beta.16",
+    "@saltcorn/base-plugin": "0.9.5-beta.18",
+    "@saltcorn/builder": "0.9.5-beta.18",
+    "@saltcorn/data": "0.9.5-beta.18",
+    "@saltcorn/admin-models": "0.9.5-beta.18",
+    "@saltcorn/filemanager": "0.9.5-beta.18",
+    "@saltcorn/markup": "0.9.5-beta.18",
+    "@saltcorn/plugins-loader": "0.9.5-beta.18",
+    "@saltcorn/sbadmin2": "0.9.5-beta.18",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn-common.js

@@ -751,23 +751,58 @@ function initialize_page() {
       </form>`
       );
   });
-  $("[mobile-img-path]").each(async function () {
-    if (parent.loadEncodedFile) {
-      const fileId = $(this).attr("mobile-img-path");
-      const base64Encoded = await parent.loadEncodedFile(fileId);
-      this.src = base64Encoded;
-    }
-  });
-  $("[mobile-bg-img-path]").each(async function () {
-    if (parent.loadEncodedFile) {
-      const fileId = $(this).attr("mobile-bg-img-path");
-      if (fileId) {
+  if (!isNode) {
+    $("[mobile-img-path]").each(async function () {
+      if (parent.loadEncodedFile) {
+        const fileId = $(this).attr("mobile-img-path");
         const base64Encoded = await parent.loadEncodedFile(fileId);
-        this.style.backgroundImage = `url("${base64Encoded}")`;
+        this.src = base64Encoded;
       }
-    }
-  });
+    });
 
+    $("[mobile-bg-img-path]").each(async function () {
+      if (parent.loadEncodedFile) {
+        const fileId = $(this).attr("mobile-bg-img-path");
+        if (fileId) {
+          const base64Encoded = await parent.loadEncodedFile(fileId);
+          this.style.backgroundImage = `url("${base64Encoded}")`;
+        }
+      }
+    });
+
+    $("a").each(function () {
+      let path = $(this).attr("href") || "";
+      if (path.startsWith("http")) {
+        const url = new URL(path);
+        path = `${url.pathname}${url.search}`;
+      }
+      if (path.startsWith("/view/")) {
+        const jThis = $(this);
+        const skip = jThis.attr("skip-mobile-adjust");
+        if (!skip) {
+          jThis.attr("href", `javascript:execLink('${path}')`);
+          if (jThis.find("i,img").length === 0 && !jThis.css("color")) {
+            jThis.css(
+              "color",
+              "rgba(var(--bs-link-color-rgb),var(--bs-link-opacity,1))"
+            );
+          }
+        }
+      }
+    });
+
+    $("img").each(async function () {
+      if (parent.loadEncodedFile) {
+        const jThis = $(this);
+        const src = jThis.attr("src");
+        if (src?.startsWith("/files/serve/")) {
+          const fileId = src.replace("/files/serve/", "");
+          const base64Encoded = await parent.loadEncodedFile(fileId);
+          this.src = base64Encoded;
+        }
+      }
+    });
+  }
   function setExplainer(that) {
     var id = $(that).attr("id") + "_explainer";
 
@@ -1206,6 +1241,7 @@ async function common_done(res, viewname, isWeb = true) {
           form.append(
             `<input type="hidden" name="id" value="${res.set_fields[k]}">`
           );
+          reloadEmbeddedEditOwnViews(form, res.set_fields[k]);
           return;
         }
         if (input.attr("type") === "checkbox")
@@ -1270,6 +1306,28 @@ async function common_done(res, viewname, isWeb = true) {
   }
 }
 
+function reloadEmbeddedEditOwnViews(form, id) {
+  form.find("div[sc-load-on-assign-id]").each(function () {
+    const $e = $(this);
+    const viewname = $e.attr("sc-load-on-assign-id");
+    const newUrl = `/view/${viewname}?id=${id}`;
+    $.ajax(newUrl, {
+      headers: {
+        pjaxpageload: "true",
+        localizedstate: "true", //no admin bar
+      },
+      success: function (res, textStatus, request) {
+        const newE = `<div class="d-inline" data-sc-embed-viewname="${viewname}" data-sc-view-source="${newUrl}">${res}</div>`;
+        $e.replaceWith(newE);
+        initialize_page();
+      },
+      error: function (res) {
+        notifyAlert({ type: "danger", text: res.responseText });
+      },
+    });
+  });
+}
+
 const repeaterCopyValuesToForm = (form, editor, noTriggerChange) => {
   const vs = JSON.parse(editor.getString());
 
@@ -1562,3 +1620,55 @@ function set_readonly_select(e) {
   const option = options.find((o) => o.value == e.target.value);
   if (option) $disp.val(option.label);
 }
+
+function close_saltcorn_modal() {
+  $("#scmodal").off("hidden.bs.modal");
+  var myModalEl = document.getElementById("scmodal");
+  if (!myModalEl) return;
+  var modal = bootstrap.Modal.getInstance(myModalEl);
+  if (modal) {
+    if (modal.hide) modal.hide();
+    if (modal.dispose) modal.dispose();
+  }
+}
+
+function reload_embedded_view(viewname, new_query_string) {
+  const isNode = getIsNode();
+  const updater = ($e, res) => {
+    $e.html(res);
+    initialize_page();
+  };
+  if (window._sc_loglevel > 4)
+    console.log(
+      "reload_embedded_view",
+      viewname,
+      "found",
+      $(`[data-sc-embed-viewname="${viewname}"]`).length
+    );
+  $(`[data-sc-embed-viewname="${viewname}"]`).each(function () {
+    const $e = $(this);
+    let url = $e.attr("data-sc-local-state") || $e.attr("data-sc-view-source");
+    if (!url) return;
+    if (new_query_string) {
+      url = url.split("?")[0] + "?" + new_query_string;
+    }
+    if (isNode) {
+      $.ajax(url, {
+        headers: {
+          pjaxpageload: "true",
+          localizedstate: "true", //no admin bar
+        },
+        success: function (res, textStatus, request) {
+          updater($e, res);
+        },
+        error: function (res) {
+          notifyAlert({ type: "danger", text: res.responseText });
+        },
+      });
+    } else {
+      runUrl(url).then((html) => {
+        updater($e, html);
+      });
+    }
+  });
+}

package/public/saltcorn.css

@@ -502,3 +502,7 @@ tr[onclick] {
 .editStarRating i.fa-star {
   color: unset;
 }
+
+.modal-header {
+  justify-content: space-between;
+}

package/public/saltcorn.js

@@ -154,37 +154,6 @@ $(function () {
   });
 });
 
-function reload_embedded_view(viewname, new_query_string) {
-  if (window._sc_loglevel > 4)
-    console.log(
-      "reload_embedded_view",
-      viewname,
-      "found",
-      $(`[data-sc-embed-viewname="${viewname}"]`).length
-    );
-  $(`[data-sc-embed-viewname="${viewname}"]`).each(function () {
-    const $e = $(this);
-    let url = $e.attr("data-sc-local-state") || $e.attr("data-sc-view-source");
-    if (!url) return;
-    if (new_query_string) {
-      url = url.split("?")[0] + "?" + new_query_string;
-    }
-    $.ajax(url, {
-      headers: {
-        pjaxpageload: "true",
-        localizedstate: "true", //no admin bar
-      },
-      success: function (res, textStatus, request) {
-        $e.html(res);
-        initialize_page();
-      },
-      error: function (res) {
-        notifyAlert({ type: "danger", text: res.responseText });
-      },
-    });
-  });
-}
-
 function pjax_to(href, e) {
   let $modal = $("#scmodal");
   const inModal = $modal.length && $modal.hasClass("show");
@@ -323,17 +292,6 @@ function globalErrorCatcher(message, source, lineno, colno, error) {
   });
 }
 
-function close_saltcorn_modal() {
-  $("#scmodal").off("hidden.bs.modal");
-  var myModalEl = document.getElementById("scmodal");
-  if (!myModalEl) return;
-  var modal = bootstrap.Modal.getInstance(myModalEl);
-  if (modal) {
-    if (modal.hide) modal.hide();
-    if (modal.dispose) modal.dispose();
-  }
-}
-
 function ensure_modal_exists_and_closed() {
   if ($("#scmodal").length === 0) {
     $("body").append(`<div id="scmodal" class="modal">
@@ -478,6 +436,7 @@ function saveAndContinue(e, k, event) {
         form.append(
           `<input type="hidden" class="form-control  " name="id" value="${res.id}">`
         );
+        reloadEmbeddedEditOwnViews(form, res.id);
       }
       common_done(res, form.attr("data-viewname"));
     },
@@ -974,6 +933,10 @@ function join_field_clicked(e, fieldPath) {
   apply_showif();
 }
 
+function execLink(path) {
+  window.location.href = `${location.origin}${path}`;
+}
+
 (() => {
   const e = document.querySelector("[data-sidebar-toggler]");
   let closed = localStorage.getItem("sidebarClosed") === "true";

package/routes/admin.js

@@ -1545,17 +1545,6 @@ const buildDialogScript = (cordovaBuilderAvailable) => {
   
   function handleMessages() {
     notifyAlert("Building the app, please wait.", true)
-    ${
-      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."
-      );
-    }`
-    }
   }
   </script>`;
 };
@@ -2220,6 +2209,30 @@ router.get(
                   ),
                   div(
                     { class: "row pb-3 pt-3" },
+                    div(
+                      { class: "col-sm-8" },
+                      label(
+                        {
+                          for: "splashPageInputId",
+                          class: "form-label fw-bold",
+                        },
+                        req.__("Apple Team ID")
+                      ),
+                      input({
+                        type: "text",
+                        class: "form-control",
+                        name: "appleTeamId",
+                        id: "appleTeamIdInputId",
+                        value:
+                          builderSettings.appleTeamId ||
+                          getState().getConfig("apple_team_id") ||
+                          "",
+                        placeholder: req.__("Please enter your Apple Team ID"),
+                      })
+                    )
+                  ),
+                  div(
+                    { class: "row pb-3 pt-2" },
                     div(
                       label(
                         { class: "form-label fw-bold" },
@@ -2377,6 +2390,7 @@ router.post(
       allowOfflineMode,
       synchedTables,
       includedPlugins,
+      appleTeamId,
     } = req.body;
     if (!includedPlugins) includedPlugins = [];
     if (!synchedTables) synchedTables = [];
@@ -2419,10 +2433,9 @@ router.post(
     if (androidPlatform) spawnParams.push("-p", "android");
     if (iOSPlatform) {
       spawnParams.push("-p", "ios");
-      const teamId = getState().getConfig("apple_team_id");
-      if (!teamId || teamId === "null") {
+      if (!appleTeamId || appleTeamId === "null")
         spawnParams.push("--buildForEmulator");
-      }
+      else spawnParams.push("--appleTeamId", appleTeamId);
     }
     if (appName) spawnParams.push("--appName", appName);
     if (appVersion) spawnParams.push("--appVersion", appVersion);
@@ -2467,6 +2480,7 @@ router.post(
       synchedTables: synchedTables,
       includedPlugins: includedPlugins,
       excludedPlugins,
+      appleTeamId,
     });
     // end http call, return the out directory name
     // the gui polls for results

package/routes/menu.js

@@ -19,7 +19,7 @@ const { save_menu_items } = require("@saltcorn/data/models/config");
 const db = require("@saltcorn/data/db");
 
 const { renderForm } = require("@saltcorn/markup");
-const { script, domReady, div, ul } = require("@saltcorn/markup/tags");
+const { script, domReady, div, ul, i } = require("@saltcorn/markup/tags");
 const { send_infoarch_page } = require("../markup/admin.js");
 const Table = require("@saltcorn/data/models/table");
 const Trigger = require("@saltcorn/data/models/trigger");
@@ -368,7 +368,7 @@ const menuEditorScript = (menu_items) => `
               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)
+              maxLevel: 2 // (Optional) Default is -1 (no level limit)
               // Valid levels are from [0, 1, 2, 3,...N]
               });
   editor.setForm($('#menuForm'));
@@ -446,7 +446,16 @@ router.get(
           above: [
             {
               besides: [
-                div(ul({ id: "myEditor", class: "sortableLists list-group" })),
+                div(
+                  ul({ id: "myEditor", class: "sortableLists list-group" }),
+                  div(
+                    i(
+                      req.__(
+                        "Some themes support only one level of menu nesting."
+                      )
+                    )
+                  )
+                ),
                 div(
                   renderForm(form, req.csrfToken()),
                   script(domReady(menuEditorScript(menu_items)))