@saltcorn/server 1.2.0-beta.2 → 1.2.0-beta.4

package/docs/types/_saltcorn_types.Types.common_types.Type.html

@@ -102,7 +102,7 @@
 <li class="tsd-parameter">
 <h5><code class="tsd-tag ts-flagOptional">Optional</code> <span class="tsd-kind-property">validate_<wbr/>attributes</span><span class="tsd-signature-symbol">?: </span><span class="tsd-signature-type ">Function</span></h5></li></ul></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/b8b176e2f6/packages/saltcorn-types/common_types.ts#L36">saltcorn-types/common_types.ts:36</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/9cc283c18e/packages/saltcorn-types/common_types.ts#L36">saltcorn-types/common_types.ts:36</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/docs/variables/_saltcorn_data.db.html

@@ -18,7 +18,7 @@
 <h1>Variable db<code class="tsd-tag ts-flagConst">Const</code> </h1></div>
 <div class="tsd-signature"><span class="tsd-kind-variable">db</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">any</span><span class="tsd-signature-symbol"> = ...</span></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/b8b176e2f6/packages/saltcorn-data/db/index.ts#L55">saltcorn-data/db/index.ts:55</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/9cc283c18e/packages/saltcorn-data/db/index.ts#L55">saltcorn-data/db/index.ts:55</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/docs/variables/_saltcorn_data.migrations.html

@@ -18,7 +18,7 @@
 <h1>Variable migrations</h1></div>
 <div class="tsd-signature"><span class="tsd-kind-variable">migrations</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">any</span><span class="tsd-signature-symbol"> = {}</span></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/b8b176e2f6/packages/saltcorn-data/index.ts#L26">saltcorn-data/index.ts:26</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/9cc283c18e/packages/saltcorn-data/index.ts#L26">saltcorn-data/index.ts:26</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/docs/variables/_saltcorn_data.models.config.available_languages.html

@@ -85,7 +85,7 @@
 <li class="tsd-parameter">
 <h5><span class="tsd-kind-property">zh</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">string</span></h5></li></ul></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/b8b176e2f6/packages/saltcorn-data/models/index.ts#L56">saltcorn-data/models/index.ts:56</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/9cc283c18e/packages/saltcorn-data/models/index.ts#L56">saltcorn-data/models/index.ts:56</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/docs/variables/_saltcorn_data.models.config.configTypes.html

@@ -20,7 +20,7 @@
 <h1>Variable configTypes</h1></div>
 <div class="tsd-signature"><span class="tsd-kind-variable">config<wbr/>Types</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type ">ConfigTypes</span></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/b8b176e2f6/packages/saltcorn-data/models/index.ts#L54">saltcorn-data/models/index.ts:54</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/9cc283c18e/packages/saltcorn-data/models/index.ts#L54">saltcorn-data/models/index.ts:54</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/docs/variables/_saltcorn_data.models.scheduler.runScheduler.html

@@ -65,7 +65,7 @@
 <h4 class="tsd-returns-title">Returns <span class="tsd-signature-type ">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">void</span><span class="tsd-signature-symbol">&gt;</span></h4>
 <div class="tsd-comment tsd-typography"></div></li></ul></li></ul></li></ul></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/b8b176e2f6/packages/saltcorn-data/models/index.ts#L116">saltcorn-data/models/index.ts:116</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/9cc283c18e/packages/saltcorn-data/models/index.ts#L116">saltcorn-data/models/index.ts:116</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/docs/variables/_saltcorn_data.plugin_helper.run_action_column.html

@@ -19,7 +19,7 @@
 <h1>Variable run_action_column</h1></div>
 <div class="tsd-signature"><span class="tsd-kind-variable">run_<wbr/>action_<wbr/>column</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">any</span></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/b8b176e2f6/packages/saltcorn-data/index.ts#L15">saltcorn-data/index.ts:15</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/9cc283c18e/packages/saltcorn-data/index.ts#L15">saltcorn-data/index.ts:15</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/docs/variables/_saltcorn_data.utils.NotAuthorized.html

@@ -19,7 +19,7 @@
 <h1>Variable NotAuthorized</h1></div>
 <div class="tsd-signature"><span class="tsd-kind-variable">Not<wbr/>Authorized</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">any</span></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/b8b176e2f6/packages/saltcorn-data/index.ts#L20">saltcorn-data/index.ts:20</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/9cc283c18e/packages/saltcorn-data/index.ts#L20">saltcorn-data/index.ts:20</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/docs/variables/_saltcorn_data.utils.sleep.html

@@ -19,7 +19,7 @@
 <h1>Variable sleep</h1></div>
 <div class="tsd-signature"><span class="tsd-kind-variable">sleep</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">any</span></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/b8b176e2f6/packages/saltcorn-data/index.ts#L20">saltcorn-data/index.ts:20</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/9cc283c18e/packages/saltcorn-data/index.ts#L20">saltcorn-data/index.ts:20</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/docs/variables/_saltcorn_db_common.multi_tenant.tenantNamespace.html

@@ -19,7 +19,7 @@
 <h1>Variable tenantNamespace<code class="tsd-tag ts-flagConst">Const</code> </h1></div>
 <div class="tsd-signature"><span class="tsd-kind-variable">tenant<wbr/>Namespace</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type ">AsyncLocalStorage</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type ">RequestContext</span><span class="tsd-signature-symbol">&gt;</span><span class="tsd-signature-symbol"> = ...</span></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/b8b176e2f6/packages/db-common/multi-tenant.ts#L17">db-common/multi-tenant.ts:17</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/9cc283c18e/packages/db-common/multi-tenant.ts#L17">db-common/multi-tenant.ts:17</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.2.0-beta.2",
+  "version": "1.2.0-beta.4",
   "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.735.0",
-    "@dr.pogodin/csurf": "^1.14.1",
-    "@saltcorn/base-plugin": "1.2.0-beta.2",
-    "@saltcorn/builder": "1.2.0-beta.2",
-    "@saltcorn/data": "1.2.0-beta.2",
-    "@saltcorn/admin-models": "1.2.0-beta.2",
-    "@saltcorn/filemanager": "1.2.0-beta.2",
-    "@saltcorn/markup": "1.2.0-beta.2",
-    "@saltcorn/plugins-loader": "1.2.0-beta.2",
-    "@saltcorn/sbadmin2": "1.2.0-beta.2",
+    "@dr.pogodin/csurf": "1.15.0",
+    "@saltcorn/base-plugin": "1.2.0-beta.4",
+    "@saltcorn/builder": "1.2.0-beta.4",
+    "@saltcorn/data": "1.2.0-beta.4",
+    "@saltcorn/admin-models": "1.2.0-beta.4",
+    "@saltcorn/filemanager": "1.2.0-beta.4",
+    "@saltcorn/markup": "1.2.0-beta.4",
+    "@saltcorn/plugins-loader": "1.2.0-beta.4",
+    "@saltcorn/sbadmin2": "1.2.0-beta.4",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.16",

package/routes/tenant.js

@@ -435,7 +435,7 @@ router.get(
               {
                 label: req.__("Subdomain"),
                 key: (r) =>
-                  link(getNewURL(req, r.subdomain), text(r.subdomain)),
+                  link(getNewURL(req, r.subdomain, get_cfg_tenant_base_url(req)), text(r.subdomain)),
               },
               {
                 label: req.__("Description"),

package/routes/view.js

@@ -53,9 +53,16 @@ router.get(
       }`
     );
     if (!view) {
-      req.flash("danger", req.__(`No such view: %s`, text(viewname)));
       state.log(2, `View ${viewname} not found`);
-      res.redirect("/");
+      const errMsg = req.__(`No such view: %s`, text(viewname));
+      if (!req.rvr) {
+        req.flash("danger", errMsg);
+        res.redirect("/");
+      } else {
+        res.status(404).json({
+          error: errMsg,
+        });
+      }
       return;
     }
     const tic = new Date();
@@ -147,7 +154,7 @@ router.get(
           : contents0;
       res.sendWrap(
         title,
-        !req.smr
+        !req.smr && !req.rvr
           ? add_edit_bar({
               role,
               title: view.name,