@saltcorn/server 0.9.1-beta.13 → 0.9.1-beta.15

package/locales/en.json

@@ -1283,5 +1283,6 @@
 	"Theme for role": "Theme for role",
 	"Set theme for each user role »": "Set theme for each user role »",
 	"Available themes": "Available themes",
-	"Install more themes »": "Install more themes »"
+	"Install more themes »": "Install more themes »",
+	"Configure action": "Configure action"
 }

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.1-beta.13",
+  "version": "0.9.1-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": "0.9.1-beta.13",
-    "@saltcorn/builder": "0.9.1-beta.13",
-    "@saltcorn/data": "0.9.1-beta.13",
-    "@saltcorn/admin-models": "0.9.1-beta.13",
-    "@saltcorn/filemanager": "0.9.1-beta.13",
-    "@saltcorn/markup": "0.9.1-beta.13",
-    "@saltcorn/sbadmin2": "0.9.1-beta.13",
+    "@saltcorn/base-plugin": "0.9.1-beta.15",
+    "@saltcorn/builder": "0.9.1-beta.15",
+    "@saltcorn/data": "0.9.1-beta.15",
+    "@saltcorn/admin-models": "0.9.1-beta.15",
+    "@saltcorn/filemanager": "0.9.1-beta.15",
+    "@saltcorn/markup": "0.9.1-beta.15",
+    "@saltcorn/sbadmin2": "0.9.1-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

@@ -1049,7 +1049,10 @@ function notifyAlert(note, spin) {
     type = note.type;
   }
   const { id, html } = buildToast(txt, type, spin);
-  $("#toasts-area").append(html);
+  let $modal = $("#scmodal");
+  if ($modal.length && $modal.hasClass("show"))
+    $("#modal-toasts-area").append(html);
+  else $("#toasts-area").append(html);
   if (type === "success") {
     setTimeout(() => {
       $(`#${id}`).removeClass("show");
@@ -1085,19 +1088,21 @@ function common_done(res, viewname, isWeb = true) {
     if (Array.isArray(element)) for (const current of element) fn(current);
     else fn(element);
   };
+  const eval_it = (s) => {
+    if (res.row && res.field_names) {
+      const f = new Function(`viewname, row, {${res.field_names}}`, s);
+      const evalres = f(viewname, res.row, res.row);
+      if (evalres) common_done(evalres, viewname, isWeb);
+    } else {
+      const f = new Function(`viewname`, s);
+      const evalres = f(viewname);
+      if (evalres) common_done(evalres, viewname, isWeb);
+    }
+  };
   if (res.notify) handle(res.notify, notifyAlert);
   if (res.error)
     handle(res.error, (text) => notifyAlert({ type: "danger", text: text }));
-
-  if (res.eval_js && res.row && res.field_names) {
-    const f = new Function(`viewname, row, {${res.field_names}}`, res.eval_js);
-    const evalres = f(viewname, res.row, res.row);
-    if (evalres) common_done(evalres, viewname, isWeb);
-  } else if (res.eval_js) {
-    const f = new Function(`viewname`, res.eval_js);
-    const evalres = f(viewname);
-    if (evalres) common_done(evalres, viewname, isWeb);
-  }
+  if (res.eval_js) handle(res.eval_js, eval_it);
 
   if (res.reload_page) {
     (isWeb ? location : parent).reload(); //TODO notify to cookie if reload or goto

package/public/saltcorn.js

@@ -135,6 +135,29 @@ $(function () {
   });
 });
 
+function reload_embedded_view(viewname) {
+  $(`[data-sc-embed-viewname="${viewname}"]`).each(function () {
+    const $e = $(this);
+    const url =
+      $e.attr("data-sc-local-state") || $e.attr("data-sc-view-source");
+    if (!url) return;
+    const headers = {
+      pjaxpageload: "true",
+      localizedstate: "true", //no admin bar
+    };
+    $.ajax(url, {
+      headers,
+      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");
@@ -281,6 +304,13 @@ function ensure_modal_exists_and_closed() {
             <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">            
             </button>
           </div>
+          <div 
+            id="modal-toasts-area"
+            class="toast-container position-fixed top-0 end-0 p-2 "
+            style: "z-index: 7000;"
+            aria-live="polite"
+            aria-atomic="true">           
+          </div>
         </div>
         <div class="modal-body">
           <p>Modal body text goes here.</p>
@@ -292,9 +322,9 @@ function ensure_modal_exists_and_closed() {
     // remove reload handler added by edit, for when we have popup link
     // in autosave edit in popup
     $("#scmodal").off("hidden.bs.modal");
-
     close_saltcorn_modal();
   }
+  $("#modal-toasts-area").empty();
 }
 
 function expand_thumbnail(img_id, filename) {

package/routes/actions.js

@@ -400,7 +400,7 @@ router.get(
       { class: "ms-3" },
       trigger.action,
       table ? ` on ` + a({ href: `/table/${table.name}` }, table.name) : ""
-    );
+    ) + a({href: `/actions/testrun/${id}`, class: "ms-2" }, req.__("Test run")+" »");
     if (!action) {
       req.flash("warning", req.__("Action not found"));
       res.redirect(`/actions/`);
@@ -618,7 +618,7 @@ router.get(
     let table, row;
     if (trigger.table_id) {
       table = Table.findOne({ id: trigger.table_id });
-      row = await table.getRow({});
+      row = await table.getRow({}, {orderBy: "RANDOM()"});
     }
     let runres;
 
@@ -665,6 +665,10 @@ router.get(
               { href: `/actions`, class: "mt-4 btn btn-primary me-1" },
               "« " + req.__("back to actions")
             ),
+            a(
+              { href: `/actions/configure/${trigger.id}`, class: "mt-4 btn btn-primary me-1" },
+              req.__("Configure action")
+            ),
             a(
               {
                 href: `/actions/testrun/${id}`,

package/routes/menu.js

@@ -307,7 +307,16 @@ const menuForm = async (req) => {
         name: "location",
         label: req.__("Location"),
         showIf: {
-          type: ["View", "Page", "Link", "Header", "Dynamic", "Action"],
+          type: [
+            "View",
+            "Page",
+            "Link",
+            "Header",
+            "Dynamic",
+            "Search",
+            "Separator",
+            "Action",
+          ],
         },
         sublabel: req.__("Not all themes support all locations"),
         class: "item-menu",
@@ -317,7 +326,7 @@ const menuForm = async (req) => {
         //default: "Standard",
         attributes: {
           inline: true,
-          options: "Standard, Mobile Bottom",
+          options: "Standard, Mobile Bottom, Secondary Menu",
         },
       },
     ],