@saltcorn/server 1.0.0-beta.14 → 1.0.0-beta.15

package/load_plugins.js

@@ -173,7 +173,7 @@ const loadAllPlugins = async (force) => {
     }
   }
   await getState().refreshUserLayouts();
-  await getState().refresh(true);
+  await getState().refresh(true, true);
   if (!isRoot()) reloadAuthFromRoot();
 };
 

package/locales/en.json

@@ -1472,5 +1472,6 @@
 	"Minimum user role required to create a new tenant<div class=\"alert alert-danger fst-normal\" role=\"alert\" data-show-if=\"showIfFormulaInputs($('select[name=role_to_create_tenant]'), '+role_to_create_tenant>1')\">Giving non-trusted users access to create tenants is a security risk and not recommended.</div>": "Minimum user role required to create a new tenant<div class=\"alert alert-danger fst-normal\" role=\"alert\" data-show-if=\"showIfFormulaInputs($('select[name=role_to_create_tenant]'), '+role_to_create_tenant>1')\">Giving non-trusted users access to create tenants is a security risk and not recommended.</div>",
 	"Select tag": "Select tag",
 	"Invalid build directory path": "Invalid build directory path",
-	"Invalid build directory name": "Invalid build directory name"
-}
+	"Invalid build directory name": "Invalid build directory name",
+	"clean node_modules": "clean node_modules"
+}

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.0.0-beta.14",
+  "version": "1.0.0-beta.15",
   "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": "1.0.0-beta.14",
-    "@saltcorn/builder": "1.0.0-beta.14",
-    "@saltcorn/data": "1.0.0-beta.14",
-    "@saltcorn/admin-models": "1.0.0-beta.14",
-    "@saltcorn/filemanager": "1.0.0-beta.14",
-    "@saltcorn/markup": "1.0.0-beta.14",
-    "@saltcorn/plugins-loader": "1.0.0-beta.14",
-    "@saltcorn/sbadmin2": "1.0.0-beta.14",
+    "@saltcorn/base-plugin": "1.0.0-beta.15",
+    "@saltcorn/builder": "1.0.0-beta.15",
+    "@saltcorn/data": "1.0.0-beta.15",
+    "@saltcorn/admin-models": "1.0.0-beta.15",
+    "@saltcorn/filemanager": "1.0.0-beta.15",
+    "@saltcorn/markup": "1.0.0-beta.15",
+    "@saltcorn/plugins-loader": "1.0.0-beta.15",
+    "@saltcorn/sbadmin2": "1.0.0-beta.15",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn-common.js

@@ -18,7 +18,7 @@ function monospace_block_click(e) {
 function copy_monospace_block(e) {
   let e1 = $(e).next("pre");
   let e2 = $(e1).next("pre");
-  if (!e2.length) return navigator.clipboard.writeText($(el).text());
+  if (!e2.length) return navigator.clipboard.writeText($(e1).text());
   const e1t = e1.text();
   const e2t = e2.text();
   if (e1t.length > e2t.length) return navigator.clipboard.writeText(e1t);

package/public/saltcorn.js

@@ -225,8 +225,10 @@ function ajax_done(res, viewname) {
 function spin_action_link(e) {
   const $e = $(e);
   const width = $e.width();
+  const height = $e.height();
+
   $e.attr("data-innerhtml-prespin", $e.html());
-  $e.html('<i class="fas fa-spinner fa-spin"></i>').width(width);
+  $e.html('<i class="fas fa-spinner fa-spin"></i>').width(width).height(height);
 }
 
 function reset_spinners() {
@@ -870,7 +872,7 @@ function build_mobile_app(button) {
 
   if (
     params.useDocker &&
-    !cordovaBuilderAvailable &&
+    !window.cordovaBuilderAvailable &&
     !confirm(
       "Docker is selected but the Cordova builder seems not to be installed. " +
         "Do you really want to continue?"
@@ -878,6 +880,21 @@ function build_mobile_app(button) {
   ) {
     return;
   }
+
+  const notSupportedPlugins = params.includedPlugins.filter(
+    (plugin) => !window.pluginsReadyForMobile.includes(plugin)
+  );
+  if (
+    notSupportedPlugins.length > 0 &&
+    !confirm(
+      `It seems that the plugins '${notSupportedPlugins.join(
+        ", "
+      )}' are not ready for mobile. Do you really want to continue?`
+    )
+  ) {
+    return;
+  }
+
   ajax_post("/admin/build-mobile-app", {
     data: params,
     success: (data) => {
@@ -949,8 +966,8 @@ function check_cordova_builder() {
   $.ajax("/admin/mobile-app/check-cordova-builder", {
     type: "GET",
     success: function (res) {
-      cordovaBuilderAvailable = !!res.installed;
-      if (cordovaBuilderAvailable) {
+      window.cordovaBuilderAvailable = !!res.installed;
+      if (window.cordovaBuilderAvailable) {
         $("#dockerBuilderStatusId").html(
           `<span>
             installed<i class="ps-2 fas fa-check text-success"></i>
@@ -1044,7 +1061,7 @@ function toggle_tbl_sync() {
 function toggle_android_platform() {
   if ($("#androidCheckboxId")[0].checked === true) {
     $("#dockerCheckboxId").attr("hidden", false);
-    $("#dockerCheckboxId").attr("checked", cordovaBuilderAvailable);
+    $("#dockerCheckboxId").attr("checked", window.cordovaBuilderAvailable);
     $("#dockerLabelId").removeClass("d-none");
   } else {
     $("#dockerCheckboxId").attr("hidden", true);

package/routes/actions.js

@@ -154,10 +154,12 @@ const triggerForm = async (req, trigger) => {
     .filter(([k, v]) => v.hasChannel)
     .map(([k, v]) => k);
 
-  const allActions = Trigger.action_options(false);
+  const allActions = Trigger.action_options({ notRequireRow: false });
   const table_triggers = ["Insert", "Update", "Delete", "Validate"];
   const action_options = {};
-  const actionsNotRequiringRow = Trigger.action_options(true);
+  const actionsNotRequiringRow = Trigger.action_options({
+    notRequireRow: true,
+  });
 
   Trigger.when_options.forEach((t) => {
     if (table_triggers.includes(t)) action_options[t] = allActions;

package/routes/admin.js

@@ -1281,6 +1281,7 @@ router.get(
         throw new Error(req.__("Unable to fetch versions"));
       const versions = Object.keys(pkgInfo.versions);
       if (versions.length === 0) throw new Error(req.__("No versions found"));
+      const tags = pkgInfo["dist-tags"] || {};
       res.set("Page-Title", req.__("%s versions", "Saltcorn"));
       let selected = packagejson.version;
       res.send(
@@ -1290,6 +1291,7 @@ router.get(
             method: "post",
           },
           input({ type: "hidden", name: "_csrf", value: req.csrfToken() }),
+          // version select
           div(
             { class: "form-group" },
             label(
@@ -1315,6 +1317,37 @@ router.get(
               )
             )
           ),
+          // tag select
+          div(
+            { class: "form-group" },
+            label(
+              {
+                for: "tag_select",
+                class: "form-label fw-bold",
+              },
+              req.__("Tags")
+            ),
+            select(
+              {
+                id: "tag_select",
+                class: "form-control form-select",
+              },
+              option({
+                id: "empty_opt",
+                value: "",
+                label: req.__("Select tag"),
+                selected: true,
+              }),
+              Object.keys(tags).map((tag) =>
+                option({
+                  id: `${tag}_opt`,
+                  value: tags[tag],
+                  label: `${tag} (${tags[tag]})`,
+                })
+              )
+            )
+          ),
+          // deep clean checkbox
           div(
             { class: "form-group" },
             input({
@@ -1351,7 +1384,18 @@ router.get(
               req.__("Install")
             )
           )
-        )
+        ) +
+          script(
+            domReady(`
+document.getElementById('tag_select').addEventListener('change', () => {
+  const version = document.getElementById('tag_select').value;
+  if (version) document.getElementById('version_select').value = version;
+});
+document.getElementById('version_select').addEventListener('change', () => {
+  document.getElementById('tag_select').value = '';
+});
+`)
+          )
       );
     } catch (error) {
       getState().log(
@@ -1780,8 +1824,8 @@ router.get(
     });
   })
 );
-const buildDialogScript = (cordovaBuilderAvailable) => {
-  return `<script>
+const buildDialogScript = (cordovaBuilderAvailable) =>
+  `<script>
   var cordovaBuilderAvailable = ${cordovaBuilderAvailable};
   function showEntrySelect(type) {
     for( const currentType of ["view", "page", "pagegroup"]) {
@@ -1807,7 +1851,6 @@ const buildDialogScript = (cordovaBuilderAvailable) => {
     notifyAlert("Building the app, please wait.", true)
   }
   </script>`;
-};
 
 const imageAvailable = async () => {
   try {
@@ -1865,6 +1908,9 @@ router.get(
     const plugins = (await Plugin.find()).filter(
       (plugin) => ["base", "sbadmin2"].indexOf(plugin.name) < 0
     );
+    const pluginsReadyForMobile = plugins
+      .filter((plugin) => plugin.ready_for_mobile())
+      .map((plugin) => plugin.name);
     const builderSettings =
       getState().getConfig("mobile_builder_settings") || {};
     const dockerAvailable = await imageAvailable();
@@ -1879,6 +1925,11 @@ router.get(
         {
           headerTag: buildDialogScript(dockerAvailable),
         },
+        {
+          headerTag: `<script>var pluginsReadyForMobile = ${JSON.stringify(
+            pluginsReadyForMobile
+          )}</script>`,
+        },
       ],
       contents: {
         above: [

package/routes/menu.js

@@ -269,6 +269,9 @@ const menuForm = async (req) => {
         name: "icon",
         class: "item-menu",
         input_type: "hidden",
+        showIf: {
+          type: ["View", "Page", "Page Group", "Link", "Header", "Action"],
+        },
       },
       {
         name: "tooltip",

package/routes/pageedit.js

@@ -183,6 +183,12 @@ const pageBuilderData = async (req, context) => {
       });
     }
   }
+  const actionsNotRequiringRow = Trigger.action_options({
+    notRequireRow: true,
+    apiNeverTriggers: true,
+    builtInLabel: "Page Actions",
+    builtIns: ["GoBack"],
+  });
   const library = (await Library.find({})).filter((l) => l.suitableFor("page"));
   const fixed_state_fields = {};
   for (const view of views) {
@@ -228,7 +234,7 @@ const pageBuilderData = async (req, context) => {
     images,
     pages,
     page_groups,
-    actions,
+    actions: actionsNotRequiringRow,
     builtInActions: ["GoBack"],
     library,
     min_role: context.min_role,

package/routes/tables.js

@@ -670,7 +670,10 @@ router.get(
  * @param {string} lbl
  * @returns {string}
  */
-const badge = (col, lbl) => `<span class="badge bg-${col}">${lbl}</span>&nbsp;`;
+const badge = (col, lbl, title) =>
+  `<span ${
+    title ? `title="${title}" ` : ""
+  }class="badge bg-${col}">${lbl}</span>&nbsp;`;
 
 /**
  * @param {object} f
@@ -708,8 +711,11 @@ const attribBadges = (f) => {
         ].includes(k)
       )
         return;
-      if(Array.isArray(v) && !v.length) return;
-      if (v || v === 0) s += badge("secondary", k);
+      if (Array.isArray(v) && !v.length) return;
+      const title = ["string", "number", "boolean"].includes(typeof v)
+        ? `${v}`
+        : null;
+      if (v || v === 0) s += badge("secondary", k, title);
     });
   }
   return s;