@saltcorn/server 1.3.0-beta.6 → 1.3.0-beta.7

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

@@ -20,7 +20,7 @@
 <h1>Type alias ResultMessage</h1></div>
 <div class="tsd-signature"><span class="tsd-kind-type-alias">Result<wbr/>Message</span><span class="tsd-signature-symbol">:</span> <a href="_saltcorn_types.Types.common_types.ErrorMessage.html" class="tsd-signature-type tsd-kind-type-alias">ErrorMessage</a><span class="tsd-signature-symbol"> | </span><a href="_saltcorn_types.Types.common_types.SuccessMessage.html" class="tsd-signature-type tsd-kind-type-alias">SuccessMessage</a></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/23846f083c/packages/saltcorn-types/common_types.ts#L26">saltcorn-types/common_types.ts:26</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/7e4a533f76/packages/saltcorn-types/common_types.ts#L26">saltcorn-types/common_types.ts:26</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

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

@@ -31,7 +31,7 @@
 <li class="tsd-parameter">
 <h5><code class="tsd-tag ts-flagOptional">Optional</code> <span class="tsd-kind-property">table</span><span class="tsd-signature-symbol">?: </span><span class="tsd-signature-type">any</span></h5></li></ul></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/23846f083c/packages/saltcorn-types/common_types.ts#L14">saltcorn-types/common_types.ts:14</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/7e4a533f76/packages/saltcorn-types/common_types.ts#L14">saltcorn-types/common_types.ts:14</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

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/23846f083c/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/7e4a533f76/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 ">DbExportsType</span><span class="tsd-signature-symbol"> = ...</span></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/23846f083c/packages/saltcorn-data/db/index.ts#L56">saltcorn-data/db/index.ts:56</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/7e4a533f76/packages/saltcorn-data/db/index.ts#L56">saltcorn-data/db/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.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/23846f083c/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/7e4a533f76/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/23846f083c/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/7e4a533f76/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/23846f083c/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/7e4a533f76/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/23846f083c/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/7e4a533f76/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/23846f083c/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/7e4a533f76/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/23846f083c/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/7e4a533f76/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/23846f083c/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/7e4a533f76/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/23846f083c/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/7e4a533f76/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/locales/en.json

@@ -1616,5 +1616,6 @@
 	"Select the page to display during maintenance mode": "Select the page to display during maintenance mode",
 	"Create basic views": "Create basic views",
 	"Create views": "Create views",
-	"Decimal places": "Decimal places"
+	"Decimal places": "Decimal places",
+	"%s view - %s": "%s view - %s"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.3.0-beta.6",
+  "version": "1.3.0-beta.7",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
@@ -8,14 +8,14 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.735.0",
     "@dr.pogodin/csurf": "1.15.0",
-    "@saltcorn/admin-models": "1.3.0-beta.6",
-    "@saltcorn/base-plugin": "1.3.0-beta.6",
-    "@saltcorn/builder": "1.3.0-beta.6",
-    "@saltcorn/data": "1.3.0-beta.6",
-    "@saltcorn/filemanager": "1.3.0-beta.6",
-    "@saltcorn/markup": "1.3.0-beta.6",
-    "@saltcorn/plugins-loader": "1.3.0-beta.6",
-    "@saltcorn/sbadmin2": "1.3.0-beta.6",
+    "@saltcorn/admin-models": "1.3.0-beta.7",
+    "@saltcorn/base-plugin": "1.3.0-beta.7",
+    "@saltcorn/builder": "1.3.0-beta.7",
+    "@saltcorn/data": "1.3.0-beta.7",
+    "@saltcorn/filemanager": "1.3.0-beta.7",
+    "@saltcorn/markup": "1.3.0-beta.7",
+    "@saltcorn/plugins-loader": "1.3.0-beta.7",
+    "@saltcorn/sbadmin2": "1.3.0-beta.7",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.16",

package/public/saltcorn-common.js

@@ -168,6 +168,8 @@ function add_extra_state(base_url, extra_state_fml, row) {
 
 const apply_showif_fetching_urls = new Set();
 
+const global_fetch_options_cache = {};
+
 function apply_showif() {
   const isNode = getIsNode();
   $("[data-show-if]").each(function (ix, element) {
@@ -309,6 +311,9 @@ function apply_showif() {
         qss.push(...dynwhere.dereference.map((d) => `dereference=${d}`));
       else qss.push(`dereference=${dynwhere.dereference}`);
     }
+    if (!dynwhere.label_formula && dynwhere.summary_field && dynwhere.refname) {
+      qss.push(`fields=${dynwhere.summary_field},${dynwhere.refname}`);
+    }
     const qs = qss.join("&");
     let current = e.attr("data-selected");
     if (current === "null") current = null;
@@ -395,36 +400,27 @@ function apply_showif() {
           e.selectize()[0].selectize.setValue(currentDataOption);
       }
     };
-
-    const cache = e.prop("data-fetch-options-cache") || {};
+    if (!global_fetch_options_cache[dynwhere.table])
+      global_fetch_options_cache[dynwhere.table] = {};
+    const cache = global_fetch_options_cache[dynwhere.table] || {};
     if (cache[qs] === "fetching") {
       // do nothing, this will be activated by someone else
     } else if (cache[qs]) {
       activate(cache[qs], qs);
     } else {
-      e.prop("data-fetch-options-cache", {
-        ...cache,
-        [qs]: "fetching",
-      });
+      cache[qs] = "fetching";
       apply_showif_fetching_urls.add(`/api/${dynwhere.table}?${qs}`);
       $.ajax(`/api/${dynwhere.table}?${qs}`)
         .then((resp) => {
+          const cacheNow = global_fetch_options_cache[dynwhere.table] || {};
           if (resp.success) {
             if (window._sc_loglevel > 4)
               console.log("dynwhere fetch", qs, resp.success);
-
             activate(resp.success, qs);
-            const cacheNow = e.prop("data-fetch-options-cache") || {};
-            e.prop("data-fetch-options-cache", {
-              ...cacheNow,
-              [qs]: resp.success,
-            });
+            cacheNow[qs] = resp.success;
+            apply_showif();
           } else {
-            const cacheNow = e.prop("data-fetch-options-cache") || {};
-            e.prop("data-fetch-options-cache", {
-              ...cacheNow,
-              [qs]: undefined,
-            });
+            cacheNow[qs] = undefined;
           }
         })
         .fail(checkNetworkError)

package/routes/tables.js

@@ -2577,6 +2577,12 @@ router.post(
         const isEdit = viewtemplate === "Edit";
         const vtObj = getState().viewtemplates[viewtemplate];
         const name = getName(viewtemplate);
+        const template_view = form.values.template_table
+          ? View.findOne({
+              table_id: Table.findOne(form.values.template_table).id,
+              viewtemplate,
+            })
+          : undefined;
         const configuration = await vtObj.createBasicView({
           table,
           viewname: name,
@@ -2584,18 +2590,14 @@ router.post(
           template_table: form.values.template_table
             ? Table.findOne(form.values.template_table)
             : undefined,
-          template_view: form.values.template_table
-            ? View.findOne({
-                table_id: Table.findOne(form.values.template_table).id,
-                viewtemplate,
-              })
-            : undefined,
+          template_view,
         });
         const view = await View.create({
           name,
           configuration,
           viewtemplate,
           table_id: table.id,
+          attributes: template_view?.attributes,
           min_role: isEdit ? table.min_role_write : table.min_role_read,
         });
         return view;

package/routes/viewedit.js

@@ -416,7 +416,7 @@ router.get(
           class: "mt-0",
           titleAjaxIndicator: true,
           title: req.__(
-            `%s view - %s on %s`,
+            viewrow.table_name ? `%s view - %s on %s` : `%s view - %s`,
             viewname,
             viewrow.viewtemplate,
             viewrow.table_name