@saltcorn/server 1.1.0-beta.11 → 1.1.0-beta.13

package/help/{Cordova Builder.tmd → Capacitor Builder.tmd }

@@ -1,4 +1,4 @@
-The Cordova builder is a docker image with all dependencies to build Android apps.
+The Capacitor builder is a docker image with all dependencies to build Android apps.
 It can be pulled from dockerhub while installing Saltcorn, or you can use the pull button.
 
 Please make sure your server has a valid and accessible docker daemon running. 

package/help/Configuration keys.tmd

@@ -0,0 +1,5 @@
+These are the available configuration keys:
+
+{{# for (const [key, defn] of Object.entries(configTypes)) { }}
+* `{{key}}`: {{defn.label||""}}
+{{# } }}

package/help/index.js

@@ -11,6 +11,7 @@ const { pre } = require("@saltcorn/markup/tags");
 const path = require("path");
 const { getState } = require("@saltcorn/data/db/state");
 const { oneOf } = require("@saltcorn/types/generators");
+const { configTypes } = require("@saltcorn/data/models/config");
 const get_md_file = async (topic) => {
   try {
     const fp = File.normalise_in_base(__dirname, `${topic}.tmd`);
@@ -36,6 +37,7 @@ const get_help_markup = async (topic, query, req) => {
       query,
       oneOf,
       moment,
+      configTypes
     };
     const mdTemplate = await get_md_file(topic);
     if (!mdTemplate) return { markup: "Topic not found" };

package/load_plugins.js

@@ -97,7 +97,10 @@ const loadPlugin = async (plugin, force, forceFetch) => {
     }
   }
   // load plugin
-  const loader = new PluginInstaller(plugin);
+  const loader = new PluginInstaller(plugin, {
+    scVersion: packagejson.version,
+    envVars: { PUPPETEER_SKIP_DOWNLOAD: true },
+  });
   const res = await loader.install(force);
   const configuration =
     typeof plugin.configuration === "string"
@@ -162,7 +165,10 @@ const reloadAuthFromRoot = () => {
  * @returns {Promise<{plugin_module: *}|{plugin_module: any}>}
  */
 const requirePlugin = async (plugin, force) => {
-  const loader = new PluginInstaller(plugin);
+  const loader = new PluginInstaller(plugin, {
+    scVersion: packagejson.version,
+    envVars: { PUPPETEER_SKIP_DOWNLOAD: true },
+  });
   return await loader.install(force);
 };
 
@@ -231,7 +237,7 @@ const loadAndSaveNewPlugin = async (
   const loadMsgs = [];
   const loader = new PluginInstaller(plugin, {
     scVersion: packagejson.version,
-    envVars: { PUPPETEER_SKIP_DOWNLOAD: "1" },
+    envVars: { PUPPETEER_SKIP_DOWNLOAD: true },
   });
   const { version, plugin_module, location, loadedWithReload, msgs } =
     await loader.install(force);

package/locales/en.json

@@ -1494,5 +1494,10 @@
 	"Fluid layout": "Fluid layout",
 	"Request fluid layout from theme for a wider display for this page": "Request fluid layout from theme for a wider display for this page",
 	"Location of view to create new row": "Location of view to create new row",
-	"Default locale": "Default locale"
+	"Capacitor builder": "Capacitor builder",
+	"Pulling the capacitor-builder docker image...": "Pulling the capacitor-builder docker image...",
+	"Pull done with code %s": "Pull done with code %s",
+	"Default locale": "Default locale",
+	"Confirm leaving unsaved": "Confirm leaving unsaved",
+	"Ask the user to confirm if they close a tab with unsaved changes": "Ask the user to confirm if they close a tab with unsaved changes"
 }

package/markup/admin.js

@@ -17,7 +17,7 @@ const {
   li,
 } = require("@saltcorn/markup/tags");
 const db = require("@saltcorn/data/db");
-const { configTypes, isFixedConfig } = require("@saltcorn/data/models/config");
+const { configTypes } = require("@saltcorn/data/models/config");
 const { getState } = require("@saltcorn/data/db/state");
 const Form = require("@saltcorn/data/models/form");
 const Table = require("@saltcorn/data/models/table");
@@ -466,7 +466,7 @@ const config_fields_form = async ({
       ...configTypes[name],
       label: label ? req.__(label) : undefined,
       sublabel: sublabel ? req.__(sublabel) : undefined,
-      disabled: isFixedConfig(name),
+      disabled: state.isFixedConfig(name),
       type:
         isView || isRole || isTenant
           ? "String"
@@ -475,6 +475,9 @@ const config_fields_form = async ({
           : configTypes[name].type,
       input_type: configTypes[name].input_type,
       showIf,
+      help: configTypes[name].helpTopic
+        ? { topic: configTypes[name].helpTopic }
+        : undefined,
       attributes: isView
         ? await viewAttributes(name)
         : isRole
@@ -505,7 +508,7 @@ const save_config_from_form = async (form) => {
   const state = getState();
 
   for (const [k, v] of Object.entries(form.values)) {
-    if (!isFixedConfig(k) && typeof v !== "undefined") {
+    if (!state.isFixedConfig(k) && typeof v !== "undefined") {
       await state.setConfig(k, v);
     }
   }

package/package.json

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