@saltcorn/server 0.9.1-beta.14 → 0.9.1-beta.16

package/markup/admin.js

@@ -79,9 +79,11 @@ const add_edit_bar = ({
   table,
   cfgUrl,
 }) => {
+  if (req && req.headers.localizedstate)
+    return { above: [contents], noWrapTop: true };
   if (role > 1 && req && req.xhr) return { above: [contents] }; //make sure not put in card
   if (role > 1) return contents;
-  if (req && req.headers.localizedstate) return { above: [contents] };
+
   let viewSpec = "";
   if (viewtemplate) viewSpec = viewtemplate;
   if (table) {

package/package.json

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

@@ -487,3 +487,7 @@ table.help-md th:nth-child(2) {
   padding-left: 10px;
   padding-right: 10px;
 }
+
+.progress-bar-radial {
+  color: unset;
+}

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) {
@@ -308,8 +338,10 @@ function expand_thumbnail(img_id, filename) {
 
 function ajax_modal(url, opts = {}) {
   ensure_modal_exists_and_closed();
+  $("#scmodal").removeClass("no-submit-reload");
+  $("#scmodal").attr("data-on-close-reload-view", opts.reload_view || null);
+
   if (opts.submitReload === false) $("#scmodal").addClass("no-submit-reload");
-  else $("#scmodal").removeClass("no-submit-reload");
   $.ajax(url, {
     headers: {
       SaltcornModalRequest: "true",
@@ -506,8 +538,15 @@ function ajaxSubmitForm(e) {
     contentType: false,
     success: function (res) {
       var no_reload = $("#scmodal").hasClass("no-submit-reload");
+      const on_close_reload_view = $("#scmodal").attr(
+        "data-on-close-reload-view"
+      );
       $("#scmodal").modal("hide");
-      if (!no_reload) location.reload();
+      if (on_close_reload_view) {
+        const viewE = $(`[data-sc-embed-viewname=${on_close_reload_view}]`);
+        if (viewE.length) reload_embedded_view(on_close_reload_view);
+        else location.reload();
+      } else if (!no_reload) location.reload();
       else common_done(res, form.attr("data-viewname"));
     },
     error: function (request) {

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",
         },
       },
     ],