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

package/auth/routes.js

@@ -1586,9 +1586,17 @@ router.post(
  */
 router.post(
   "/settings",
+  setTenant,
   loggedIn,
   error_catcher(async (req, res) => {
-    const user = await User.findOne({ id: req.user.id });
+    const user = await User.findOne({ id: req.user?.id });
+    if (!user) {
+      res.sendWrap(
+        req.__("User settings") || "User settings",
+        "Must be logged in"
+      );
+      return;
+    }
     if (req.body.new_password && user.password) {
       const pwform = changPwForm(req);
 

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.15",
+  "version": "0.9.1-beta.17",
   "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.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",
+    "@saltcorn/base-plugin": "0.9.1-beta.17",
+    "@saltcorn/builder": "0.9.1-beta.17",
+    "@saltcorn/data": "0.9.1-beta.17",
+    "@saltcorn/admin-models": "0.9.1-beta.17",
+    "@saltcorn/filemanager": "0.9.1-beta.17",
+    "@saltcorn/markup": "0.9.1-beta.17",
+    "@saltcorn/sbadmin2": "0.9.1-beta.17",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

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

@@ -338,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",
@@ -536,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/pageedit.js

@@ -216,6 +216,7 @@ const pageBuilderData = async (req, context) => {
     images,
     pages,
     actions,
+    builtInActions: ["GoBack"],
     library,
     min_role: context.min_role,
     actionConfigForms,