@saltcorn/server 0.9.1-beta.9 → 0.9.2-rc.1

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);
 
@@ -1615,12 +1623,24 @@ router.post(
       if (user_settings_form) {
         const view = await View.findOne({ name: user_settings_form });
         if (view) {
+          const fakeRes = {
+            status() {},
+            sendWrap() {},
+            json() {},
+            redirect() {},
+          };
           await view.runPost({ id: user.id }, req.body, {
             req,
-            res,
+            res: fakeRes,
             redirect: "/auth/settings",
           });
-          req.flash("success", req.__("User settings changed"));
+          const u = await User.findForSession({ id: user.id });
+          req.login(u.session_object, function (err) {
+            if (err) req.flash("danger", err);
+            else req.flash("success", req.__("User settings changed"));
+
+            res.redirect("/auth/settings");
+          });
         }
       } else {
         res.redirect("/auth/settings");

package/help/Extra state formula.tmd

@@ -68,4 +68,7 @@ variable name by a dollar sign (in pages and Show views). For instance if your U
 you can access the value of `foo` (here 1) as `$foo`. In Filter views, there is no 
 underlying row and the purpose of the view is fundamentally to manipulate the state
 so the state in extra state formulae is accessed without dollar sign; in the 
-previous example `foo` instead of `$foo`.
+previous example `foo` instead of `$foo`.
+
+Use `session_id` to refer to the current session ID string (unique for the user's session
+whether the are logged in or not).

package/load_plugins.js

@@ -29,6 +29,15 @@ const staticDependencies = {
   "@saltcorn/data/models/fieldrepeat": require("@saltcorn/data/models/fieldrepeat"),
   "@saltcorn/data/models/table": require("@saltcorn/data/models/table"),
   "@saltcorn/data/models/form": require("@saltcorn/data/models/form"),
+  "@saltcorn/data/models/discovery": require("@saltcorn/data/models/discovery"),
+  "@saltcorn/data/models/config": require("@saltcorn/data/models/config"),
+  "@saltcorn/data/models/library": require("@saltcorn/data/models/library"),
+  "@saltcorn/data/models/model": require("@saltcorn/data/models/model"),
+  "@saltcorn/data/models/model_instance": require("@saltcorn/data/models/model_instance"),
+  "@saltcorn/data/models/notification": require("@saltcorn/data/models/notification"),
+  "@saltcorn/data/models/role": require("@saltcorn/data/models/role"),
+  "@saltcorn/data/models/tag": require("@saltcorn/data/models/tag"),
+  "@saltcorn/data/models/tag_entry": require("@saltcorn/data/models/tag_entry"),
   "@saltcorn/data/models/view": require("@saltcorn/data/models/view"),
   "@saltcorn/data/models/page": require("@saltcorn/data/models/page"),
   "@saltcorn/data/models/file": require("@saltcorn/data/models/file"),
@@ -202,7 +211,7 @@ const loadAndSaveNewPlugin = async (plugin, force, noSignalOrDB, manager) => {
   const { version, plugin_module, location } = await requirePlugin(
     plugin,
     force,
-    manager,
+    manager
   );
 
   // install dependecies

package/locales/en.json

@@ -1278,5 +1278,12 @@
 	"HTML file to use as page content": "HTML file to use as page content",
 	"Offline mode: cannot load file": "Offline mode: cannot load file",
 	"None - use drag and drop builder": "None - use drag and drop builder",
-	"Do not pick or compare time": "Do not pick or compare time"
+	"Do not pick or compare time": "Do not pick or compare time",
+	"Installed theme": "Installed theme",
+	"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 »",
+	"Configure action": "Configure action",
+	"No changes detected, snapshot skipped": "No changes detected, snapshot skipped"
 }

package/markup/admin.js

@@ -77,11 +77,14 @@ const add_edit_bar = ({
   req,
   viewtemplate,
   table,
+  view,
   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) {
@@ -89,20 +92,26 @@ const add_edit_bar = ({
     if (tbl)
       viewSpec = `${viewSpec} on <a href="/table/${table}">${tbl.name}</a>`;
   }
+  const singleton = view?.viewtemplateObj?.singleton;
 
   const bar = div(
     { class: "alert alert-light d-print-none admin-edit-bar" },
     title,
     what && span({ class: "ms-1 me-2 badge bg-primary" }, what),
-    a({ class: "ms-2", href: url }, "Edit&nbsp;", i({ class: "fas fa-edit" })),
-    cfgUrl
+    !singleton &&
+      a(
+        { class: "ms-2", href: url },
+        "Edit&nbsp;",
+        i({ class: "fas fa-edit" })
+      ),
+    cfgUrl && !singleton
       ? a(
           { class: "ms-1 me-3", href: cfgUrl },
           "Configure&nbsp;",
           i({ class: "fas fa-cog" })
         )
       : "",
-    viewSpec
+    !singleton && viewSpec
   );
 
   if (contents.above) {

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.1-beta.9",
+  "version": "0.9.2-rc.1",
   "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.9",
-    "@saltcorn/builder": "0.9.1-beta.9",
-    "@saltcorn/data": "0.9.1-beta.9",
-    "@saltcorn/admin-models": "0.9.1-beta.9",
-    "@saltcorn/filemanager": "0.9.1-beta.9",
-    "@saltcorn/markup": "0.9.1-beta.9",
-    "@saltcorn/sbadmin2": "0.9.1-beta.9",
+    "@saltcorn/base-plugin": "0.9.2-rc.1",
+    "@saltcorn/builder": "0.9.2-rc.1",
+    "@saltcorn/data": "0.9.2-rc.1",
+    "@saltcorn/admin-models": "0.9.2-rc.1",
+    "@saltcorn/filemanager": "0.9.2-rc.1",
+    "@saltcorn/markup": "0.9.2-rc.1",
+    "@saltcorn/sbadmin2": "0.9.2-rc.1",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/dayjs.min.js

@@ -1 +1,3 @@
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).dayjs=e()}(this,(function(){"use strict";var t=1e3,e=6e4,n=36e5,r="millisecond",i="second",s="minute",u="hour",a="day",o="week",f="month",h="quarter",c="year",d="date",l="Invalid Date",$=/^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/,y=/\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,M={name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),ordinal:function(t){var e=["th","st","nd","rd"],n=t%100;return"["+t+(e[(n-20)%10]||e[n]||e[0])+"]"}},m=function(t,e,n){var r=String(t);return!r||r.length>=e?t:""+Array(e+1-r.length).join(n)+t},v={s:m,z:function(t){var e=-t.utcOffset(),n=Math.abs(e),r=Math.floor(n/60),i=n%60;return(e<=0?"+":"-")+m(r,2,"0")+":"+m(i,2,"0")},m:function t(e,n){if(e.date()<n.date())return-t(n,e);var r=12*(n.year()-e.year())+(n.month()-e.month()),i=e.clone().add(r,f),s=n-i<0,u=e.clone().add(r+(s?-1:1),f);return+(-(r+(n-i)/(s?i-u:u-i))||0)},a:function(t){return t<0?Math.ceil(t)||0:Math.floor(t)},p:function(t){return{M:f,y:c,w:o,d:a,D:d,h:u,m:s,s:i,ms:r,Q:h}[t]||String(t||"").toLowerCase().replace(/s$/,"")},u:function(t){return void 0===t}},g="en",D={};D[g]=M;var p=function(t){return t instanceof _},S=function t(e,n,r){var i;if(!e)return g;if("string"==typeof e){var s=e.toLowerCase();D[s]&&(i=s),n&&(D[s]=n,i=s);var u=e.split("-");if(!i&&u.length>1)return t(u[0])}else{var a=e.name;D[a]=e,i=a}return!r&&i&&(g=i),i||!r&&g},w=function(t,e){if(p(t))return t.clone();var n="object"==typeof e?e:{};return n.date=t,n.args=arguments,new _(n)},O=v;O.l=S,O.i=p,O.w=function(t,e){return w(t,{locale:e.$L,utc:e.$u,x:e.$x,$offset:e.$offset})};var _=function(){function M(t){this.$L=S(t.locale,null,!0),this.parse(t)}var m=M.prototype;return m.parse=function(t){this.$d=function(t){var e=t.date,n=t.utc;if(null===e)return new Date(NaN);if(O.u(e))return new Date;if(e instanceof Date)return new Date(e);if("string"==typeof e&&!/Z$/i.test(e)){var r=e.match($);if(r){var i=r[2]-1||0,s=(r[7]||"0").substring(0,3);return n?new Date(Date.UTC(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)):new Date(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)}}return new Date(e)}(t),this.$x=t.x||{},this.init()},m.init=function(){var t=this.$d;this.$y=t.getFullYear(),this.$M=t.getMonth(),this.$D=t.getDate(),this.$W=t.getDay(),this.$H=t.getHours(),this.$m=t.getMinutes(),this.$s=t.getSeconds(),this.$ms=t.getMilliseconds()},m.$utils=function(){return O},m.isValid=function(){return!(this.$d.toString()===l)},m.isSame=function(t,e){var n=w(t);return this.startOf(e)<=n&&n<=this.endOf(e)},m.isAfter=function(t,e){return w(t)<this.startOf(e)},m.isBefore=function(t,e){return this.endOf(e)<w(t)},m.$g=function(t,e,n){return O.u(t)?this[e]:this.set(n,t)},m.unix=function(){return Math.floor(this.valueOf()/1e3)},m.valueOf=function(){return this.$d.getTime()},m.startOf=function(t,e){var n=this,r=!!O.u(e)||e,h=O.p(t),l=function(t,e){var i=O.w(n.$u?Date.UTC(n.$y,e,t):new Date(n.$y,e,t),n);return r?i:i.endOf(a)},$=function(t,e){return O.w(n.toDate()[t].apply(n.toDate("s"),(r?[0,0,0,0]:[23,59,59,999]).slice(e)),n)},y=this.$W,M=this.$M,m=this.$D,v="set"+(this.$u?"UTC":"");switch(h){case c:return r?l(1,0):l(31,11);case f:return r?l(1,M):l(0,M+1);case o:var g=this.$locale().weekStart||0,D=(y<g?y+7:y)-g;return l(r?m-D:m+(6-D),M);case a:case d:return $(v+"Hours",0);case u:return $(v+"Minutes",1);case s:return $(v+"Seconds",2);case i:return $(v+"Milliseconds",3);default:return this.clone()}},m.endOf=function(t){return this.startOf(t,!1)},m.$set=function(t,e){var n,o=O.p(t),h="set"+(this.$u?"UTC":""),l=(n={},n[a]=h+"Date",n[d]=h+"Date",n[f]=h+"Month",n[c]=h+"FullYear",n[u]=h+"Hours",n[s]=h+"Minutes",n[i]=h+"Seconds",n[r]=h+"Milliseconds",n)[o],$=o===a?this.$D+(e-this.$W):e;if(o===f||o===c){var y=this.clone().set(d,1);y.$d[l]($),y.init(),this.$d=y.set(d,Math.min(this.$D,y.daysInMonth())).$d}else l&&this.$d[l]($);return this.init(),this},m.set=function(t,e){return this.clone().$set(t,e)},m.get=function(t){return this[O.p(t)]()},m.add=function(r,h){var d,l=this;r=Number(r);var $=O.p(h),y=function(t){var e=w(l);return O.w(e.date(e.date()+Math.round(t*r)),l)};if($===f)return this.set(f,this.$M+r);if($===c)return this.set(c,this.$y+r);if($===a)return y(1);if($===o)return y(7);var M=(d={},d[s]=e,d[u]=n,d[i]=t,d)[$]||1,m=this.$d.getTime()+r*M;return O.w(m,this)},m.subtract=function(t,e){return this.add(-1*t,e)},m.format=function(t){var e=this,n=this.$locale();if(!this.isValid())return n.invalidDate||l;var r=t||"YYYY-MM-DDTHH:mm:ssZ",i=O.z(this),s=this.$H,u=this.$m,a=this.$M,o=n.weekdays,f=n.months,h=function(t,n,i,s){return t&&(t[n]||t(e,r))||i[n].slice(0,s)},c=function(t){return O.s(s%12||12,t,"0")},d=n.meridiem||function(t,e,n){var r=t<12?"AM":"PM";return n?r.toLowerCase():r},$={YY:String(this.$y).slice(-2),YYYY:this.$y,M:a+1,MM:O.s(a+1,2,"0"),MMM:h(n.monthsShort,a,f,3),MMMM:h(f,a),D:this.$D,DD:O.s(this.$D,2,"0"),d:String(this.$W),dd:h(n.weekdaysMin,this.$W,o,2),ddd:h(n.weekdaysShort,this.$W,o,3),dddd:o[this.$W],H:String(s),HH:O.s(s,2,"0"),h:c(1),hh:c(2),a:d(s,u,!0),A:d(s,u,!1),m:String(u),mm:O.s(u,2,"0"),s:String(this.$s),ss:O.s(this.$s,2,"0"),SSS:O.s(this.$ms,3,"0"),Z:i};return r.replace(y,(function(t,e){return e||$[t]||i.replace(":","")}))},m.utcOffset=function(){return 15*-Math.round(this.$d.getTimezoneOffset()/15)},m.diff=function(r,d,l){var $,y=O.p(d),M=w(r),m=(M.utcOffset()-this.utcOffset())*e,v=this-M,g=O.m(this,M);return g=($={},$[c]=g/12,$[f]=g,$[h]=g/3,$[o]=(v-m)/6048e5,$[a]=(v-m)/864e5,$[u]=v/n,$[s]=v/e,$[i]=v/t,$)[y]||v,l?g:O.a(g)},m.daysInMonth=function(){return this.endOf(f).$D},m.$locale=function(){return D[this.$L]},m.locale=function(t,e){if(!t)return this.$L;var n=this.clone(),r=S(t,e,!0);return r&&(n.$L=r),n},m.clone=function(){return O.w(this.$d,this)},m.toDate=function(){return new Date(this.valueOf())},m.toJSON=function(){return this.isValid()?this.toISOString():null},m.toISOString=function(){return this.$d.toISOString()},m.toString=function(){return this.$d.toUTCString()},M}(),T=_.prototype;return w.prototype=T,[["$ms",r],["$s",i],["$m",s],["$H",u],["$W",a],["$M",f],["$y",c],["$D",d]].forEach((function(t){T[t[1]]=function(e){return this.$g(e,t[0],t[1])}})),w.extend=function(t,e){return t.$i||(t(e,_,w),t.$i=!0),w},w.locale=S,w.isDayjs=p,w.unix=function(t){return w(1e3*t)},w.en=D[g],w.Ls=D,w.p={},w}));
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).dayjs=e()}(this,(function(){"use strict";var t=1e3,e=6e4,n=36e5,r="millisecond",i="second",s="minute",u="hour",a="day",o="week",f="month",h="quarter",c="year",d="date",l="Invalid Date",$=/^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/,y=/\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,M={name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),ordinal:function(t){var e=["th","st","nd","rd"],n=t%100;return"["+t+(e[(n-20)%10]||e[n]||e[0])+"]"}},m=function(t,e,n){var r=String(t);return!r||r.length>=e?t:""+Array(e+1-r.length).join(n)+t},v={s:m,z:function(t){var e=-t.utcOffset(),n=Math.abs(e),r=Math.floor(n/60),i=n%60;return(e<=0?"+":"-")+m(r,2,"0")+":"+m(i,2,"0")},m:function t(e,n){if(e.date()<n.date())return-t(n,e);var r=12*(n.year()-e.year())+(n.month()-e.month()),i=e.clone().add(r,f),s=n-i<0,u=e.clone().add(r+(s?-1:1),f);return+(-(r+(n-i)/(s?i-u:u-i))||0)},a:function(t){return t<0?Math.ceil(t)||0:Math.floor(t)},p:function(t){return{M:f,y:c,w:o,d:a,D:d,h:u,m:s,s:i,ms:r,Q:h}[t]||String(t||"").toLowerCase().replace(/s$/,"")},u:function(t){return void 0===t}},g="en",D={};D[g]=M;var p=function(t){return t instanceof _},S=function t(e,n,r){var i;if(!e)return g;if("string"==typeof e){var s=e.toLowerCase();D[s]&&(i=s),n&&(D[s]=n,i=s);var u=e.split("-");if(!i&&u.length>1)return t(u[0])}else{var a=e.name;D[a]=e,i=a}return!r&&i&&(g=i),i||!r&&g},w=function(t,e){if(p(t))return t.clone();var n="object"==typeof e?e:{};return n.date=t,n.args=arguments,new _(n)},O=v;O.l=S,O.i=p,O.w=function(t,e){return w(t,{locale:e.$L,utc:e.$u,x:e.$x,$offset:e.$offset})};var _=function(){function M(t){this.$L=S(t.locale,null,!0),this.parse(t)}var m=M.prototype;return m.parse=function(t){this.$d=function(t){var e=t.date,n=t.utc;if(null===e)return new Date(NaN);if(O.u(e))return new Date;if(e instanceof Date)return new Date(e);if("string"==typeof e&&!/Z$/i.test(e)){var r=e.match($);if(r){var i=r[2]-1||0,s=(r[7]||"0").substring(0,3);return n?new Date(Date.UTC(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)):new Date(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)}}return new Date(e)}(t),this.$x=t.x||{},this.init()},m.init=function(){var t=this.$d;this.$y=t.getFullYear(),this.$M=t.getMonth(),this.$D=t.getDate(),this.$W=t.getDay(),this.$H=t.getHours(),this.$m=t.getMinutes(),this.$s=t.getSeconds(),this.$ms=t.getMilliseconds()},m.$utils=function(){return O},m.isValid=function(){return!(this.$d.toString()===l)},m.isSame=function(t,e){var n=w(t);return this.startOf(e)<=n&&n<=this.endOf(e)},m.isAfter=function(t,e){return w(t)<this.startOf(e)},m.isBefore=function(t,e){return this.endOf(e)<w(t)},m.$g=function(t,e,n){return O.u(t)?this[e]:this.set(n,t)},m.unix=function(){return Math.floor(this.valueOf()/1e3)},m.valueOf=function(){return this.$d.getTime()},m.startOf=function(t,e){var n=this,r=!!O.u(e)||e,h=O.p(t),l=function(t,e){var i=O.w(n.$u?Date.UTC(n.$y,e,t):new Date(n.$y,e,t),n);return r?i:i.endOf(a)},$=function(t,e){return O.w(n.toDate()[t].apply(n.toDate("s"),(r?[0,0,0,0]:[23,59,59,999]).slice(e)),n)},y=this.$W,M=this.$M,m=this.$D,v="set"+(this.$u?"UTC":"");switch(h){case c:return r?l(1,0):l(31,11);case f:return r?l(1,M):l(0,M+1);case o:var g=this.$locale().weekStart||0,D=(y<g?y+7:y)-g;return l(r?m-D:m+(6-D),M);case a:case d:return $(v+"Hours",0);case u:return $(v+"Minutes",1);case s:return $(v+"Seconds",2);case i:return $(v+"Milliseconds",3);default:return this.clone()}},m.endOf=function(t){return this.startOf(t,!1)},m.$set=function(t,e){var n,o=O.p(t),h="set"+(this.$u?"UTC":""),l=(n={},n[a]=h+"Date",n[d]=h+"Date",n[f]=h+"Month",n[c]=h+"FullYear",n[u]=h+"Hours",n[s]=h+"Minutes",n[i]=h+"Seconds",n[r]=h+"Milliseconds",n)[o],$=o===a?this.$D+(e-this.$W):e;if(o===f||o===c){var y=this.clone().set(d,1);y.$d[l]($),y.init(),this.$d=y.set(d,Math.min(this.$D,y.daysInMonth())).$d}else l&&this.$d[l]($);return this.init(),this},m.set=function(t,e){return this.clone().$set(t,e)},m.get=function(t){return this[O.p(t)]()},m.add=function(r,h){var d,l=this;r=Number(r);var $=O.p(h),y=function(t){var e=w(l);return O.w(e.date(e.date()+Math.round(t*r)),l)};if($===f)return this.set(f,this.$M+r);if($===c)return this.set(c,this.$y+r);if($===a)return y(1);if($===o)return y(7);var M=(d={},d[s]=e,d[u]=n,d[i]=t,d)[$]||1,m=this.$d.getTime()+r*M;return O.w(m,this)},m.subtract=function(t,e){return this.add(-1*t,e)},m.format=function(t){var e=this,n=this.$locale();if(!this.isValid())return n.invalidDate||l;var r=t||"YYYY-MM-DDTHH:mm:ssZ",i=O.z(this),s=this.$H,u=this.$m,a=this.$M,o=n.weekdays,f=n.months,h=function(t,n,i,s){return t&&(t[n]||t(e,r))||i[n].slice(0,s)},c=function(t){return O.s(s%12||12,t,"0")},d=n.meridiem||function(t,e,n){var r=t<12?"AM":"PM";return n?r.toLowerCase():r},$={YY:String(this.$y).slice(-2),YYYY:this.$y,M:a+1,MM:O.s(a+1,2,"0"),MMM:h(n.monthsShort,a,f,3),MMMM:h(f,a),D:this.$D,DD:O.s(this.$D,2,"0"),d:String(this.$W),dd:h(n.weekdaysMin,this.$W,o,2),ddd:h(n.weekdaysShort,this.$W,o,3),dddd:o[this.$W],H:String(s),HH:O.s(s,2,"0"),h:c(1),hh:c(2),a:d(s,u,!0),A:d(s,u,!1),m:String(u),mm:O.s(u,2,"0"),s:String(this.$s),ss:O.s(this.$s,2,"0"),SSS:O.s(this.$ms,3,"0"),Z:i};return r.replace(y,(function(t,e){return e||$[t]||i.replace(":","")}))},m.utcOffset=function(){return 15*-Math.round(this.$d.getTimezoneOffset()/15)},m.diff=function(r,d,l){var $,y=O.p(d),M=w(r),m=(M.utcOffset()-this.utcOffset())*e,v=this-M,g=O.m(this,M);return g=($={},$[c]=g/12,$[f]=g,$[h]=g/3,$[o]=(v-m)/6048e5,$[a]=(v-m)/864e5,$[u]=v/n,$[s]=v/e,$[i]=v/t,$)[y]||v,l?g:O.a(g)},m.daysInMonth=function(){return this.endOf(f).$D},m.$locale=function(){return D[this.$L]},m.locale=function(t,e){if(!t)return this.$L;var n=this.clone(),r=S(t,e,!0);return r&&(n.$L=r),n},m.clone=function(){return O.w(this.$d,this)},m.toDate=function(){return new Date(this.valueOf())},m.toJSON=function(){return this.isValid()?this.toISOString():null},m.toISOString=function(){return this.$d.toISOString()},m.toString=function(){return this.$d.toUTCString()},M}(),T=_.prototype;return w.prototype=T,[["$ms",r],["$s",i],["$m",s],["$H",u],["$W",a],["$M",f],["$y",c],["$D",d]].forEach((function(t){T[t[1]]=function(e){return this.$g(e,t[0],t[1])}})),w.extend=function(t,e){return t.$i||(t(e,_,w),t.$i=!0),w},w.locale=S,w.isDayjs=p,w.unix=function(t){return w(1e3*t)},w.en=D[g],w.Ls=D,w.p={},w}));
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_plugin_advancedFormat=t()}(this,(function(){"use strict";return function(e,t){var r=t.prototype,n=r.format;r.format=function(e){var t=this,r=this.$locale();if(!this.isValid())return n.bind(this)(e);var s=this.$utils(),a=(e||"YYYY-MM-DDTHH:mm:ssZ").replace(/\[([^\]]+)]|Q|wo|ww|w|WW|W|zzz|z|gggg|GGGG|Do|X|x|k{1,2}|S/g,(function(e){switch(e){case"Q":return Math.ceil((t.$M+1)/3);case"Do":return r.ordinal(t.$D);case"gggg":return t.weekYear();case"GGGG":return t.isoWeekYear();case"wo":return r.ordinal(t.week(),"W");case"w":case"ww":return s.s(t.week(),"w"===e?1:2,"0");case"W":case"WW":return s.s(t.isoWeek(),"W"===e?1:2,"0");case"k":case"kk":return s.s(String(0===t.$H?24:t.$H),"k"===e?1:2,"0");case"X":return Math.floor(t.$d.getTime()/1e3);case"x":return t.$d.getTime();case"z":return"["+t.offsetName()+"]";case"zzz":return"["+t.offsetName("long")+"]";default:return e}}));return n.bind(this)(a)}}}));
+dayjs.extend(window.dayjs_plugin_advancedFormat)

package/public/saltcorn-common.js

@@ -34,6 +34,11 @@ function add_repeater(nm) {
     $(element).attr("name", newnm).attr("id", newid);
   });
   newe.appendTo($("div.repeats-" + nm));
+  newe.find("[data-on-cloned]").each(function (ix, element) {
+    (function (str) {
+      return eval(str);
+    }).call(element, $(element).attr("data-on-cloned"));
+  });
 }
 
 const _apply_showif_plugins = [];
@@ -160,7 +165,7 @@ function apply_showif() {
       e.prop("data-fetch-options-current-set", qs);
       const toAppend = [];
       if (!dynwhere.required)
-        toAppend.push({ label: dynwhere.neutral_label || "" });
+        toAppend.push({ label: dynwhere.neutral_label || "", value: "" });
       let currentDataOption = undefined;
       const dataOptions = [];
       //console.log(success);
@@ -196,7 +201,7 @@ function apply_showif() {
           .map(
             ({ label, value, selected }) =>
               `<option${selected ? ` selected` : ""}${
-                value ? ` value="${value}"` : ""
+                typeof value !== "undefined" ? ` value="${value}"` : ""
               }>${label || ""}</option>`
           )
           .join("")
@@ -416,6 +421,8 @@ function get_form_record(e_in, select_labels) {
 }
 function showIfFormulaInputs(e, fml) {
   const rec = get_form_record(e);
+  if (window._sc_loglevel > 4)
+    console.log(`show if fml ${fml} form_record`, rec);
   try {
     return new Function(
       "row",
@@ -423,7 +430,11 @@ function showIfFormulaInputs(e, fml) {
       "return " + fml
     )(rec, rec);
   } catch (e) {
-    throw new Error(`Error in evaluating showIf formula ${fml}: ${e.message}`);
+    throw new Error(
+      `Error in evaluating showIf formula ${fml} with values ${JSON.stringify(
+        rec
+      )}: ${e.message}`
+    );
   }
 }
 
@@ -604,7 +615,7 @@ function initialize_page() {
       schema = JSON.parse(decodeURIComponent(schema));
     }
     if (type === "Date") {
-      console.log("timeelsems", $(this).find("span.current time"));
+      //console.log("timeelsems", $(this).find("span.current time"));
       current =
         $(this).attr("data-inline-edit-current") ||
         $(this).find("span.current time").attr("datetime"); // ||
@@ -1043,7 +1054,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");
@@ -1074,28 +1088,41 @@ function restore_old_button(btnId) {
   btn.removeData("old-text");
 }
 
-function common_done(res, viewname, isWeb = true) {
-  const handle = (element, fn) => {
-    if (Array.isArray(element)) for (const current of element) fn(current);
-    else fn(element);
+async function common_done(res, viewname, isWeb = true) {
+  if (window._sc_loglevel > 4)
+    console.log("ajax result directives", viewname, res);
+  const handle = async (element, fn) => {
+    if (Array.isArray(element))
+      for (const current of element) await fn(current);
+    else await fn(element);
+  };
+  const eval_it = async (s) => {
+    if (res.row && res.field_names) {
+      const f = new Function(`viewname, row, {${res.field_names}}`, s);
+      const evalres = await f(viewname, res.row, res.row);
+      if (evalres) await common_done(evalres, viewname, isWeb);
+    } else {
+      const f = new Function(`viewname`, s);
+      const evalres = await f(viewname);
+      if (evalres) await common_done(evalres, viewname, isWeb);
+    }
   };
-  if (res.notify) handle(res.notify, notifyAlert);
+  if (res.notify) await 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(`row, {${res.field_names}}`, res.eval_js);
-    const evalres = f(res.row, res.row);
-    if (evalres) common_done(evalres, viewname, isWeb);
-  } else if (res.eval_js) {
-    handle(res.eval_js, eval);
-  }
+    await handle(res.error, (text) =>
+      notifyAlert({ type: "danger", text: text })
+    );
+  if (res.notify_success)
+    await handle(res.notify_success, (text) =>
+      notifyAlert({ type: "success", text: text })
+    );
+  if (res.eval_js) await handle(res.eval_js, eval_it);
 
   if (res.reload_page) {
     (isWeb ? location : parent).reload(); //TODO notify to cookie if reload or goto
   }
   if (res.download) {
-    handle(res.download, (download) => {
+    await handle(res.download, (download) => {
       const dataurl = `data:${
         download.mimetype || "application/octet-stream"
       };base64,${download.blob}`;

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,36 @@ $(function () {
   });
 });
 
+function reload_embedded_view(viewname) {
+  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);
+    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");
@@ -257,6 +287,7 @@ 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);
@@ -281,6 +312,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 +330,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 +346,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",
@@ -364,6 +404,11 @@ function submitWithAjax(e) {
       notifyAlert({ type: "danger", text: res.responseJSON.error });
   });
 }
+function saveAndContinueAsync(e) {
+  return new Promise((resolve, reject) => {
+    saveAndContinue(e, (x) => resolve(x));
+  });
+}
 
 function saveAndContinue(e, k) {
   var form = $(e).closest("form");
@@ -390,6 +435,9 @@ function saveAndContinue(e, k) {
       if (res.notify) {
         notifyAlert(res.notify);
       }
+      if (res.notify_success) {
+        notifyAlert({ type: "success", text: res.notify });
+      }
       if (res.reload_page) {
         location.reload(); //TODO notify to cookie if reload or goto
       }
@@ -506,8 +554,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/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/`);
@@ -478,7 +478,9 @@ router.get(
       res.redirect(`/actions/`);
     } else {
       // get configuration fields
-      const cfgFields = await getActionConfigFields(action, table);
+      const cfgFields = await getActionConfigFields(action, table, {
+        mode: "trigger",
+      });
       // create form
       const form = new Form({
         action: addOnDoneRedirect(`/actions/configure/${id}`, req),
@@ -523,7 +525,9 @@ router.post(
     const table = trigger.table_id
       ? Table.findOne({ id: trigger.table_id })
       : null;
-    const cfgFields = await getActionConfigFields(action, table);
+    const cfgFields = await getActionConfigFields(action, table, {
+      mode: "trigger",
+    });
     const form = new Form({
       action: `/actions/configure/${id}`,
       fields: cfgFields,
@@ -614,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;
 
@@ -661,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/common_lists.js

@@ -123,40 +123,46 @@ const view_dropdown = (view, req, on_done_redirect_str = "") =>
       },
       '<i class="fas fa-running"></i>&nbsp;' + req.__("Run")
     ),
-    a(
-      {
-        class: "dropdown-item",
-        href: `/viewedit/edit/${encodeURIComponent(
-          view.name
-        )}${on_done_redirect_str}`,
-      },
-      '<i class="fas fa-edit"></i>&nbsp;' + req.__("Edit")
-    ),
+    view.id &&
+      a(
+        {
+          class: "dropdown-item",
+          href: `/viewedit/edit/${encodeURIComponent(
+            view.name
+          )}${on_done_redirect_str}`,
+        },
+        '<i class="fas fa-edit"></i>&nbsp;' + req.__("Edit")
+      ),
     post_dropdown_item(
-      `/viewedit/add-to-menu/${view.id}${on_done_redirect_str}`,
+      `/viewedit/add-to-menu/${encodeURIComponent(
+        view.name
+      )}${on_done_redirect_str}`,
       '<i class="fas fa-bars"></i>&nbsp;' + req.__("Add to menu"),
       req
     ),
-    post_dropdown_item(
-      `/viewedit/clone/${view.id}${on_done_redirect_str}`,
-      '<i class="far fa-copy"></i>&nbsp;' + req.__("Duplicate"),
-      req
-    ),
-    a(
-      {
-        class: "dropdown-item",
-        href: `javascript:ajax_modal('/admin/snapshot-restore/view/${view.name}')`,
-      },
-      '<i class="fas fa-undo-alt"></i>&nbsp;' + req.__("Restore")
-    ),
-    div({ class: "dropdown-divider" }),
-    post_dropdown_item(
-      `/viewedit/delete/${view.id}${on_done_redirect_str}`,
-      '<i class="far fa-trash-alt"></i>&nbsp;' + req.__("Delete"),
-      req,
-      true,
-      view.name
-    ),
+    view.id &&
+      post_dropdown_item(
+        `/viewedit/clone/${view.id}${on_done_redirect_str}`,
+        '<i class="far fa-copy"></i>&nbsp;' + req.__("Duplicate"),
+        req
+      ),
+    view.id &&
+      a(
+        {
+          class: "dropdown-item",
+          href: `javascript:ajax_modal('/admin/snapshot-restore/view/${view.name}')`,
+        },
+        '<i class="fas fa-undo-alt"></i>&nbsp;' + req.__("Restore")
+      ),
+    view.id && div({ class: "dropdown-divider" }),
+    view.id &&
+      post_dropdown_item(
+        `/viewedit/delete/${view.id}${on_done_redirect_str}`,
+        '<i class="far fa-trash-alt"></i>&nbsp;' + req.__("Delete"),
+        req,
+        true,
+        view.name
+      ),
   ]);
 
 const setTableRefs = async (views) => {
@@ -222,17 +228,21 @@ const viewsList = async (
           {
             label: req.__("Role to access"),
             key: (row) =>
-              editViewRoleForm(row, roles, req, on_done_redirect_str),
+              row.id
+                ? editViewRoleForm(row, roles, req, on_done_redirect_str)
+                : "admin",
           },
           {
             label: "",
             key: (r) =>
-              link(
-                `/viewedit/config/${encodeURIComponent(
-                  r.name
-                )}${on_done_redirect_str}`,
-                req.__("Configure")
-              ),
+              r.id && r.viewtemplateObj?.configuration_workflow
+                ? link(
+                    `/viewedit/config/${encodeURIComponent(
+                      r.name
+                    )}${on_done_redirect_str}`,
+                    req.__("Configure")
+                  )
+                : "",
           },
           !tagId
             ? {

package/routes/fields.js

@@ -1169,7 +1169,10 @@ router.post(
     }
 
     const field = table.getField(fieldName);
-
+    if (!field) {
+      res.send("");
+      return;
+    }
     const fieldViewConfigForms = await calcfldViewConfig([field], false, 0);
     const formFields = fieldViewConfigForms[field.name][fv_name];
     if (!formFields) {

package/routes/homepage.js

@@ -12,8 +12,9 @@ const View = require("@saltcorn/data/models/view");
 const User = require("@saltcorn/data/models/user");
 const File = require("@saltcorn/data/models/file");
 const Page = require("@saltcorn/data/models/page");
+const Plugin = require("@saltcorn/data/models/plugin");
 const { link, mkTable } = require("@saltcorn/markup");
-const { div, a, p, i } = require("@saltcorn/markup/tags");
+const { div, a, p, i, h5, span } = require("@saltcorn/markup/tags");
 const Table = require("@saltcorn/data/models/table");
 const { get_cached_packs } = require("@saltcorn/admin-models/models/pack");
 // const { restore_backup } = require("../markup/admin");
@@ -310,10 +311,80 @@ const packTab = (req, packlist) =>
       { noHeader: true }
     ),
     a(
-      { href: `/plugins?set=packs`, class: "btn btn-primary" },
+      { href: `/plugins?set=packs`, class: "btn btn-sm btn-primary" },
       req.__("Go to pack store »")
     )
   );
+
+const themeCard = (req, roleMap) => {
+  const state_layouts = getState().layouts;
+  const state_layout_names = Object.keys(state_layouts);
+  const layout_by_role = getState().getConfig("layout_by_role");
+  const used_layout_by_role = {};
+  Object.keys(roleMap).forEach((role_id) => {
+    used_layout_by_role[role_id] =
+      layout_by_role[role_id] ||
+      state_layout_names[state_layout_names.length - 1];
+  });
+  const themes_available = Plugin.get_cached_plugins().filter(
+    (p) => p.has_theme && !state_layout_names.includes(p.name)
+  );
+  const layouts = Object.entries(getState().layouts)
+    .filter(([nm, v]) => nm !== "emergency")
+    .map(([name, layout]) => {
+      let plugin = getState().plugins[name];
+      const for_role = Object.entries(used_layout_by_role)
+        .filter(([role, rname]) => rname === name)
+        .map(([role, rname]) =>
+          span({ class: "badge bg-info" }, roleMap[role])
+        );
+
+      return {
+        name,
+        layout,
+        plugin,
+        for_role,
+        edit_cfg_link: plugin?.configuration_workflow
+          ? a(
+              {
+                href: `/plugins/configure/${encodeURIComponent(name)}`,
+              },
+              i({ class: "fa fa-cog ms-2" })
+            )
+          : "",
+      };
+    });
+  const show_installable = themes_available.length > 0 || layouts.length == 1;
+  return div(
+    { class: "pb-3 pt-2 pe-4" },
+    mkTable(
+      [
+        {
+          label: req.__("Installed theme"),
+          key: ({ name, edit_cfg_link }) => `${name}${edit_cfg_link}`,
+        },
+        {
+          label: req.__("Theme for role"),
+          key: ({ for_role }) => for_role.join(" "),
+        },
+      ],
+      layouts
+    ),
+    a({ href: "/roleadmin" }, req.__("Set theme for each user role »")),
+    show_installable && h5({ class: "mt-2" }, req.__("Available themes")),
+    show_installable &&
+      div(
+        themes_available
+          .map((p) => span({ class: "badge bg-secondary" }, p.name))
+          .join(" ")
+      ),
+    show_installable &&
+      a(
+        { href: `/plugins?set=themes`, class: "mt-2" },
+        req.__("Install more themes »")
+      )
+  );
+};
 /**
  * Help Card
  * @param req
@@ -412,10 +483,12 @@ const welcome_page = async (req) => {
               users.length > 4
                 ? {
                     Users: await usersTab(req, users, roleMap),
+                    Theme: themeCard(req, roleMap),
                     Help: helpCard(req),
                   }
                 : {
                     Help: helpCard(req),
+                    Theme: themeCard(req, roleMap),
                     Users: await usersTab(req, users, roleMap),
                   },
           },

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

package/routes/pageedit.js

@@ -167,7 +167,9 @@ const pageBuilderData = async (req, context) => {
   for (const name of actions) {
     const action = stateActions[name];
     if (action && action.configFields) {
-      actionConfigForms[name] = await getActionConfigFields(action);
+      actionConfigForms[name] = await getActionConfigFields(action, null, {
+        mode: "page",
+      });
     }
   }
   const library = (await Library.find({})).filter((l) => l.suitableFor("page"));
@@ -214,9 +216,11 @@ const pageBuilderData = async (req, context) => {
     images,
     pages,
     actions,
+    builtInActions: ["GoBack"],
     library,
     min_role: context.min_role,
     actionConfigForms,
+    allowMultiStepAction: true,
     page_name: context.name,
     page_id: context.id,
     mode: "page",

package/routes/plugins.js

@@ -1243,6 +1243,8 @@ router.post(
     }
     await load_plugins.loadAndSaveNewPlugin(plugin, forceReInstall);
     const plugin_module = getState().plugins[name];
+    await getState().refresh_views();
+
     if (plugin_module && plugin_module.configuration_workflow) {
       const plugin_db = await Plugin.findOne({ name });
       req.flash(

package/routes/view.js

@@ -10,7 +10,7 @@ const View = require("@saltcorn/data/models/view");
 const Table = require("@saltcorn/data/models/table");
 const Trigger = require("@saltcorn/data/models/trigger");
 
-const { text, style } = require("@saltcorn/markup/tags");
+const { text, style, div } = require("@saltcorn/markup/tags");
 const {
   isAdmin,
   error_catcher,
@@ -70,11 +70,11 @@ router.get(
     }
     const isModal = req.headers?.saltcornmodalrequest;
 
-    const contents = await view.run_possibly_on_page(query, req, res);
+    const contents0 = await view.run_possibly_on_page(query, req, res);
     const title =
       isModal && view.attributes?.popup_title
         ? view.attributes?.popup_title
-        : scan_for_page_title(contents, view.name);
+        : scan_for_page_title(contents0, view.name);
     if (isModal && view.attributes?.popup_width)
       res.set(
         "SaltcornModalWidth",
@@ -95,9 +95,21 @@ router.get(
         name: viewname,
         render_time: ms,
       });
-    if (typeof contents === "object" && contents.goto)
-      res.redirect(contents.goto);
-    else
+    if (typeof contents0 === "object" && contents0.goto)
+      res.redirect(contents0.goto);
+    else {
+      const qs = "";
+      const contents =
+        typeof contents0 === "string" && !req.xhr
+          ? div(
+              {
+                class: "d-inline",
+                "data-sc-embed-viewname": view.name,
+                "data-sc-view-source": req.originalUrl,
+              },
+              contents0
+            )
+          : contents0;
       res.sendWrap(
         title,
         add_edit_bar({
@@ -108,10 +120,12 @@ router.get(
           cfgUrl: `/viewedit/config/${encodeURIComponent(view.name)}`,
           contents,
           req,
+          view,
           viewtemplate: view.viewtemplate,
           table: view.table_id || view.exttable_name,
         })
       );
+    }
   })
 );
 

package/routes/viewedit.js

@@ -118,6 +118,9 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
     .filter(([k, v]) => !v.tableless)
     .map(([k, v]) => k);
   const slugOptions = await Table.allSlugOptions();
+  const viewpatternOptions = Object.values(getState().viewtemplates)
+    .filter((vt) => !vt.singleton)
+    .map((vt) => vt.name);
   return new Form({
     action: addOnDoneRedirect("/viewedit/save", req),
     submitLabel: req.__("Configure") + " »",
@@ -151,7 +154,7 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
           topic: "View patterns",
           context: {},
         },
-        options: Object.keys(getState().viewtemplates),
+        options: viewpatternOptions,
         attributes: {
           explainers: mapObjectValues(
             getState().viewtemplates,
@@ -661,11 +664,11 @@ router.post(
  * @function
  */
 router.post(
-  "/add-to-menu/:id",
+  "/add-to-menu/:viewname",
   isAdmin,
   error_catcher(async (req, res) => {
-    const { id } = req.params;
-    const view = await View.findOne({ id });
+    const { viewname } = req.params;
+    const view = await View.findOne({ name: viewname });
     await add_to_menu({
       label: view.name,
       type: "View",

package/tests/view.test.js

@@ -643,4 +643,43 @@ describe("many to many relations", () => {
       .expect(toInclude("album A"))
       .expect(toNotInclude("album B"));
   });
+
+  it("fan_club feed with query", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+
+    const queryObj_1 = {
+      relation:
+        ".pressing_job.album.artist_plays_on_album$album.artist.fan_club$artist",
+      srcId: 1,
+    };
+    await request(app)
+      .get(
+        `/view/fan_club_feed?_inbound_relation_path_=${encodeURIComponent(
+          JSON.stringify(queryObj_1)
+        )}`
+      )
+      .set("Cookie", loginCookie)
+      .expect(toInclude("crazy fan club"))
+      .expect(toInclude("another club"))
+      .expect(toInclude("fan club"))
+      .expect(toInclude("fan club official"));
+
+    const queryObj_2 = {
+      relation:
+        ".pressing_job.album.artist_plays_on_album$album.artist.fan_club$artist",
+      srcId: 2,
+    };
+    await request(app)
+      .get(
+        `/view/fan_club_feed?_inbound_relation_path_=${encodeURIComponent(
+          JSON.stringify(queryObj_2)
+        )}`
+      )
+      .set("Cookie", loginCookie)
+      .expect(toInclude("crazy fan club"))
+      .expect(toNotInclude("another club"))
+      .expect(toInclude("fan club"))
+      .expect(toInclude("fan club official"));
+  });
 });