@saltcorn/server 1.3.0-beta.1 → 1.3.0-beta.10

package/docs/types/_saltcorn_types.Types.base_types.SubField.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">string</span></h5></li></ul></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/38672c1aa3/packages/saltcorn-types/base_types.ts#L696">saltcorn-types/base_types.ts:696</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/220de627d2/packages/saltcorn-types/base_types.ts#L697">saltcorn-types/base_types.ts:697</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/docs/types/_saltcorn_types.Types.base_types.TableProvider.html

@@ -62,7 +62,7 @@
 <h5><span class="tsd-kind-parameter">cfg</span>: <a href="_saltcorn_types.Types.common_types.GenObj.html" class="tsd-signature-type tsd-kind-type-alias">GenObj</a></h5></li></ul></div>
 <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 ">Partial</span><span class="tsd-signature-symbol">&lt;</span><a href="../interfaces/_saltcorn_types.ModelAbstracts.abstract_table.AbstractTable.html" class="tsd-signature-type tsd-kind-interface">AbstractTable</a><span class="tsd-signature-symbol">&gt;</span><span class="tsd-signature-symbol">&gt;</span></h4></li></ul></li></ul></li></ul></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/38672c1aa3/packages/saltcorn-types/base_types.ts#L498">saltcorn-types/base_types.ts:498</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/220de627d2/packages/saltcorn-types/base_types.ts#L498">saltcorn-types/base_types.ts:498</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/docs/types/_saltcorn_types.Types.base_types.TableQuery.html

@@ -51,7 +51,7 @@
 <li class="tsd-parameter">
 <h5><code class="tsd-tag ts-flagOptional">Optional</code> <span class="tsd-kind-property">where</span><span class="tsd-signature-symbol">?: </span><span class="tsd-signature-type ">Where</span></h5></li></ul></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/38672c1aa3/packages/saltcorn-types/base_types.ts#L186">saltcorn-types/base_types.ts:186</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/220de627d2/packages/saltcorn-types/base_types.ts#L186">saltcorn-types/base_types.ts:186</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/docs/types/_saltcorn_types.Types.base_types.Tablely.html

@@ -25,7 +25,7 @@
 <li class="tsd-parameter">
 <h5><span class="tsd-kind-property">external</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">true</span></h5></li></ul></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/38672c1aa3/packages/saltcorn-types/base_types.ts#L587">saltcorn-types/base_types.ts:587</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/220de627d2/packages/saltcorn-types/base_types.ts#L588">saltcorn-types/base_types.ts:588</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/docs/types/_saltcorn_types.Types.base_types.ViewTemplate.html

@@ -395,7 +395,7 @@
 <h5><span class="tsd-kind-parameter">configuration</span>: <span class="tsd-signature-type">any</span></h5></li></ul></div>
 <h4 class="tsd-returns-title">Returns <span class="tsd-signature-type ">Promise</span><span class="tsd-signature-symbol">&lt;</span><a href="../interfaces/_saltcorn_types.ModelAbstracts.abstract_trigger.AbstractTrigger.html" class="tsd-signature-type tsd-kind-interface">AbstractTrigger</a><span class="tsd-signature-symbol">[]</span><span class="tsd-signature-symbol">&gt;</span></h4></li></ul></li></ul></li></ul></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/38672c1aa3/packages/saltcorn-types/base_types.ts#L244">saltcorn-types/base_types.ts:244</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/220de627d2/packages/saltcorn-types/base_types.ts#L244">saltcorn-types/base_types.ts:244</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.ErrorMessage.html

@@ -29,7 +29,7 @@
 <li class="tsd-parameter">
 <h5><code class="tsd-tag ts-flagOptional">Optional</code> <span class="tsd-kind-property">errors</span><span class="tsd-signature-symbol">?: </span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">[]</span></h5></li></ul></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/38672c1aa3/packages/saltcorn-types/common_types.ts#L8">saltcorn-types/common_types.ts:8</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/220de627d2/packages/saltcorn-types/common_types.ts#L8">saltcorn-types/common_types.ts:8</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.GenObj.html

@@ -25,7 +25,7 @@
 <li class="tsd-parameter-index-signature">
 <h5><span class="tsd-signature-symbol">[</span><span class="tsd-kind-parameter">key</span>: <span class="tsd-signature-type">string</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/38672c1aa3/packages/saltcorn-types/common_types.ts#L65">saltcorn-types/common_types.ts:65</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/220de627d2/packages/saltcorn-types/common_types.ts#L65">saltcorn-types/common_types.ts:65</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.ReqRes.html

@@ -27,7 +27,7 @@
 <li class="tsd-parameter">
 <h5><code class="tsd-tag ts-flagOptional">Optional</code> <span class="tsd-kind-property">res</span><span class="tsd-signature-symbol">?: </span><a href="_saltcorn_types.Types.base_types.Res.html" class="tsd-signature-type tsd-kind-type-alias">Res</a></h5></li></ul></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/38672c1aa3/packages/saltcorn-types/common_types.ts#L21">saltcorn-types/common_types.ts:21</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/220de627d2/packages/saltcorn-types/common_types.ts#L21">saltcorn-types/common_types.ts:21</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.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/38672c1aa3/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/220de627d2/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/38672c1aa3/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/220de627d2/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/38672c1aa3/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/220de627d2/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/38672c1aa3/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/220de627d2/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/38672c1aa3/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/220de627d2/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/38672c1aa3/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/220de627d2/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/38672c1aa3/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/220de627d2/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/38672c1aa3/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/220de627d2/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/38672c1aa3/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/220de627d2/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/38672c1aa3/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/220de627d2/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/38672c1aa3/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/220de627d2/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/38672c1aa3/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/220de627d2/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/help/Template tables.tmd

@@ -0,0 +1,9 @@
+Views can be generated based on views from a different table. 
+
+To use this facility create a table with fields of different types and create views on this table that you would like to use as a template for generating basic views for other tables. Saltcorn will attempt to apply the style and the field view choices to the new tables. 
+
+For list views this is relatively straightforward. You may not get the ordering you are desiring and will need to adjust the list view after the generation. 
+
+Show and Edit views make some assumptions about the views you are trying to clone. This works best if there is one container in the template view that contain all of the fields in sub elements. Each field along with its associated labels should be inside its own elements (e.g. a container for each group of elements related to one field).
+
+Use this templating facility to quickly create many different views of a consistent style. If you're doing this across many instances you may want to create a tag for your template table and template views and download this tag's pack and restore it on each application you are building.

package/locales/en.json

@@ -1604,5 +1604,20 @@
 	"You may need to adjust view relations associated with this table after renaming it": "You may need to adjust view relations associated with this table after renaming it",
 	"Error running workflow": "Error running workflow",
 	"Choose File": "Choose File",
-	"No file chosen": "No file chosen"
+	"No file chosen": "No file chosen",
+	"S3 Bucket Name": "S3 Bucket Name",
+	"S3 Access Key": "S3 Access Key",
+	"S3 Secret Key": "S3 Secret Key",
+	"S3 Region": "S3 Region",
+	"S3 Endpoint": "S3 Endpoint",
+	"Enable maintenance mode": "Enable maintenance mode",
+	"Enable maintenance mode to restrict access to non-admin users": "Enable maintenance mode to restrict access to non-admin users",
+	"Maintenance mode page": "Maintenance mode page",
+	"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",
+	"%s view - %s": "%s view - %s",
+	"Password to encrypt the backup file. Leave empty for no encryption": "Password to encrypt the backup file. Leave empty for no encryption",
+	"Show full error to user on crash, enable editing field type": "Show full error to user on crash, enable editing field type"
 }

package/locales/pt.json

@@ -20,7 +20,7 @@
   "Admin": "Administrador",
   "Tenants": "Inquilinos",
   "Crash log": "Registro de falhas",
-  "Sign up": "inscrever-se",
+  "Sign up": "Inscrever-se",
   "Login": "Entrar",
   "An error occurred": "Ocorreu um erro",
   "ID": "ID",
@@ -1598,4 +1598,4 @@
   "Create an account!": "Crie uma conta!",
   "Login with %s": "Entrar com %s",
   "Already have an account? Login!": "Já tem uma conta? Faça login!"
-}
+}

package/markup/admin.js

@@ -25,6 +25,7 @@ const View = require("@saltcorn/data/models/view");
 const User = require("@saltcorn/data/models/user");
 const FieldRepeat = require("@saltcorn/data/models/fieldrepeat");
 const Field = require("@saltcorn/data/models/field");
+const Page = require("@saltcorn/data/models/page");
 
 /**
  * Restore Backup
@@ -494,6 +495,7 @@ const config_fields_form = async ({
     const isView = (configTypes[name].type || "").startsWith("View ");
     const isRole = configTypes[name].type === "Role";
     const isTenant = configTypes[name].type === "Tenant";
+    const isPage = configTypes[name].type === "Page";
     const label = configTypes[name].label || name;
     const sublabel = configTypes[name].sublabel || configTypes[name].blurb;
 
@@ -536,7 +538,7 @@ const config_fields_form = async ({
               )
             : ""),
         type:
-          isView || isRole || isTenant
+          isView || isRole || isTenant || isPage
             ? "String"
             : configTypes[name].input_type
               ? undefined
@@ -552,7 +554,14 @@ const config_fields_form = async ({
             ? roleAttribs
             : isTenant
               ? await getTenants()
-              : configTypes[name].attributes,
+              : isPage
+                ? {
+                    options: (await Page.find()).map((p) => ({
+                      label: p.name,
+                      name: p.name,
+                    })),
+                  }
+                : configTypes[name].attributes,
       });
   }
   const form = new Form({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.3.0-beta.1",
+  "version": "1.3.0-beta.10",
   "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.1",
-    "@saltcorn/base-plugin": "1.3.0-beta.1",
-    "@saltcorn/builder": "1.3.0-beta.1",
-    "@saltcorn/data": "1.3.0-beta.1",
-    "@saltcorn/filemanager": "1.3.0-beta.1",
-    "@saltcorn/markup": "1.3.0-beta.1",
-    "@saltcorn/plugins-loader": "1.3.0-beta.1",
-    "@saltcorn/sbadmin2": "1.3.0-beta.1",
+    "@saltcorn/admin-models": "1.3.0-beta.10",
+    "@saltcorn/base-plugin": "1.3.0-beta.10",
+    "@saltcorn/builder": "1.3.0-beta.10",
+    "@saltcorn/data": "1.3.0-beta.10",
+    "@saltcorn/filemanager": "1.3.0-beta.10",
+    "@saltcorn/markup": "1.3.0-beta.10",
+    "@saltcorn/plugins-loader": "1.3.0-beta.10",
+    "@saltcorn/sbadmin2": "1.3.0-beta.10",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.16",

package/public/assets/databases/databases.json

@@ -0,0 +1,3 @@
+{
+  "databaseList": ["prepopulated.db"]
+}

package/public/gridedit.js

@@ -172,7 +172,7 @@ function delete_tabulator_row(e, cell) {
   }
   $.ajax({
     type: "DELETE",
-    url: `/api/${tableName}/${row[pk_name]}`,
+    url: `/api/${tableName}/${encodeURIComponent(row[pk_name])}`,
     data: row, // to process primary keys different from id
     headers: {
       "CSRF-Token": _sc_globalCsrf,

package/public/saltcorn-common.js

@@ -151,8 +151,25 @@ function valid_js_var_name(s) {
   return !!s.match(/^[a-zA-Z_$][a-zA-Z_$0-9]*$/);
 }
 
+function add_extra_state(base_url, extra_state_fml, row) {
+  //console.log("add_extra_state", { base_url, extra_state_fml, row });
+  if (!extra_state_fml) return base_url;
+  let extra_state = new Function(
+    "row",
+    `{${Object.keys(row).join(",")}}`,
+    "return " + extra_state_fml
+  )(row, row);
+  let qs = Object.entries(extra_state)
+    .map(([k, v]) => `${k}=${encodeURIComponent(v)}`)
+    .join("&");
+  let sepChar = base_url.includes("?") ? "&" : "?";
+  return base_url + sepChar + qs;
+}
+
 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) {
@@ -294,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;
@@ -380,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)
@@ -428,6 +439,49 @@ function apply_showif() {
       });
     });
   });
+  $("[data-view-source]").each(function (ix, element) {
+    const e = $(element);
+    const rec = get_form_record(e);
+    const current = e.attr("data-view-source-current");
+    const encFml = e.attr("data-view-source");
+    const needFields = e.attr("data-view-source-need-fields");
+    if (needFields) {
+      const isSet = (v) => v !== null && v !== "" && typeof v !== "undefined";
+      if (needFields.split(",").some((k) => !isSet(rec[k]))) return;
+    }
+    const fml = decodeURIComponent(encFml);
+    //console.log("fml", fml);
+
+    const viewname = e.attr("data-sc-embed-viewname");
+
+    const newUrl = new Function("row", "return " + fml)(rec);
+    //console.log("current-new", current, newUrl);
+
+    if (current && current == newUrl) return;
+
+    e.attr("data-view-source-current", newUrl); // to prevent concurrent fetches
+    $.ajax(newUrl, {
+      headers: {
+        pjaxpageload: "true",
+        localizedstate: "true", //no admin bar
+      },
+      success: function (res, textStatus, request) {
+        const newE = `<div class="d-inline" 
+        data-sc-embed-viewname="${viewname}" 
+        data-sc-view-source="${newUrl}" 
+        data-view-source-current="${newUrl}"
+        data-view-source-need-fields="${needFields}"
+        data-view-source="${encFml}">${res}</div>`;
+
+        e.replaceWith(newE);
+        initialize_page();
+      },
+      error: function (res) {
+        if (!checkNetworkError(res))
+          notifyAlert({ type: "danger", text: res.responseText });
+      },
+    });
+  });
   $("[data-source-url]").each(function (ix, element) {
     const e = $(element);
     const rec0 = get_form_record(e);
@@ -1664,8 +1718,10 @@ function press_store_button(clicked, keepOld, disable) {
 }
 
 function restore_old_button(btnId) {
+  if (window.reset_spinners) reset_spinners();
   const btn = btnId instanceof jQuery ? btnId : $(`#${btnId}`);
   const oldText = $(btn).data("old-text");
+  if (!oldText.length) reuturn;
   btn.html(oldText);
   btn.css({ width: "", height: "" }).prop("disabled", false);
   btn.removeData("old-text");
@@ -1689,6 +1745,9 @@ async function common_done(res, viewnameOrElem0, isWeb = true) {
       for (const current of element) await fn(current);
     else await fn(element);
   };
+  //TODO what if something else is spinning?
+  if (window.reset_spinners) reset_spinners();
+
   const eval_it = async (s) => {
     if (res.row && res.field_names) {
       const f = new Function(`viewname, row, {${res.field_names}}`, s);
@@ -1741,7 +1800,7 @@ async function common_done(res, viewnameOrElem0, isWeb = true) {
           form.append(
             `<input type="hidden" name="id" value="${res.set_fields[k]}">`
           );
-          reloadEmbeddedEditOwnViews(form, res.set_fields[k]);
+          apply_showif();
           return;
         }
         if (input.attr("type") === "checkbox")
@@ -1830,29 +1889,6 @@ function editAllowedAuthByRole(id, event) {
   );
 }
 
-function reloadEmbeddedEditOwnViews(form, id) {
-  form.find("div[sc-load-on-assign-id]").each(function () {
-    const $e = $(this);
-    const viewname = $e.attr("sc-load-on-assign-id");
-    const newUrl = `/view/${viewname}?id=${id}`;
-    $.ajax(newUrl, {
-      headers: {
-        pjaxpageload: "true",
-        localizedstate: "true", //no admin bar
-      },
-      success: function (res, textStatus, request) {
-        const newE = `<div class="d-inline" data-sc-embed-viewname="${viewname}" data-sc-view-source="${newUrl}">${res}</div>`;
-        $e.replaceWith(newE);
-        initialize_page();
-      },
-      error: function (res) {
-        if (!checkNetworkError(res))
-          notifyAlert({ type: "danger", text: res.responseText });
-      },
-    });
-  });
-}
-
 const repeaterCopyValuesToForm = (form, editor, noTriggerChange) => {
   const vs = JSON.parse(editor.getString());
 
@@ -1981,7 +2017,8 @@ function unique_field_from_rows(
       .filter((v) => v !== value)
       .map((s) => s.replace(value_wspace, ""))
       .map((s) => (numtype ? +s : s))
-      .sort(numtype ? (a, b) => a - b : undefined);
+      .filter((s) => (numtype ? !isNaN(s) : true))
+      .sort((a, b) => a - b);
     if (stripped.length === 0) newname = `${value_wspace}${gen_char(start)}`;
     else {
       const i = char_to_i(stripped[stripped.length - 1]);
@@ -2039,6 +2076,25 @@ function init_room(viewname, room_id) {
   });
 }
 
+function init_collab_room(viewname, eventCfgs) {
+  const socket = io({ transports: ["websocket"] });
+  for (const [event, callback] of Object.entries(eventCfgs.events)) {
+    socket.on(event, callback);
+  }
+  socket.on("connect", function () {
+    socket.emit("join_collab_room", viewname, (ack) => {
+      if (ack && ack.status === "ok") {
+        console.log(`Joined collaboration room for view '${viewname}'`);
+      } else {
+        console.error("Failed to join collaboration room:", ack);
+      }
+    });
+  });
+  socket.on("disconnect", function () {
+    console.log("Disconnected from the server");
+  });
+}
+
 function cancel_form(form) {
   if (!form) return;
   $(form).trigger("reset");
@@ -2281,6 +2337,22 @@ function formInEmbed(event) {
   return form;
 }
 
+function login_from_edit_view(e) {
+  e.stopPropagation();
+  e.preventDefault();
+  const form = $(e.target).closest("form");
+  form.attr("action", "/auth/login");
+  form.submit();
+}
+
+function signup_from_edit_view(e) {
+  e.stopPropagation();
+  e.preventDefault();
+  const form = $(e.target).closest("form");
+  form.attr("action", "/auth/signup");
+  form.submit();
+}
+
 function handle_identical_fields(event) {
   let form = null;
   if (event.srcElement) {