@saltcorn/server 1.1.0-beta.9 → 1.1.1-beta.0

package/auth/admin.js

@@ -1182,7 +1182,7 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
-    const u = await User.findOne({ id });
+    const u = await User.findForSession({ id });
     if (u) {
       await u.relogin(req);
       req.flash(

package/auth/roleadmin.js

@@ -56,7 +56,11 @@ const editRoleLayoutForm = (role, layouts, layout_by_role, req) => {
     },
     csrfField(req),
     select(
-      { name: "layout", onchange: "form.submit()" },
+      {
+        name: "layout",
+        onchange: "form.submit()",
+        class: "form-select form-select-sm w-unset d-inline",
+      },
       layouts.map((layout, ix) =>
         option(
           {
@@ -88,7 +92,11 @@ const editRole2FAPolicyForm = (role, twofa_policy_by_role, req) =>
     },
     csrfField(req),
     select(
-      { name: "policy", onchange: "form.submit()" },
+      {
+        name: "policy",
+        onchange: "form.submit()",
+        class: "form-select form-select-sm w-unset d-inline",
+      },
       ["Optional", "Disabled", "Mandatory"].map((p) =>
         option({ selected: twofa_policy_by_role[role.id] === p }, p)
       )

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

@@ -8,7 +8,7 @@
 const db = require("@saltcorn/data/db");
 const { getState, getRootState } = require("@saltcorn/data/db/state");
 const Plugin = require("@saltcorn/data/models/plugin");
-const { isRoot } = require("@saltcorn/data/utils");
+const { isRoot, getFetchProxyOptions } = require("@saltcorn/data/utils");
 const { eachTenant } = require("@saltcorn/admin-models/models/tenant");
 
 const PluginInstaller = require("@saltcorn/plugins-loader/plugin_installer");
@@ -35,7 +35,8 @@ const getEngineInfos = async (plugin, forceFetch) => {
   } else {
     getState().log(5, `Fetching versions for '${plugin.location}'`);
     const pkgInfo = await npmFetch.json(
-      `https://registry.npmjs.org/${plugin.location}`
+      `https://registry.npmjs.org/${plugin.location}`,
+      getFetchProxyOptions()
     );
     const versions = pkgInfo.versions;
     const newCached = {};
@@ -97,7 +98,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 +166,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 +238,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

@@ -1493,5 +1493,34 @@
 	"You must be logged in to share": "You must be logged in to share",
 	"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"
+	"Location of view to create new row": "Location of view to create new row",
+	"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",
+	"Next step": "Next step",
+	"Step name": "Step name",
+	"Step saved": "Step saved",
+	"Initial step": "Initial step",
+	"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",
+	"Workflow runs": "Workflow runs",
+	"Workflow run": "Workflow run",
+	"Share to enabled": "Share to enabled",
+	"Enable the share to feature": "Enable the share to feature",
+	"Allocate new row": "Allocate new row",
+	"If the view is run without existing row, allocate a new row on load. Defaults must be set on all required fields.": "If the view is run without existing row, allocate a new row on load. Defaults must be set on all required fields.",
+	"Step traces": "Step traces",
+	"Please enter a version in the format 'x.y.z' (e.g. 0.0.1 with numbers from 0 to 999) or leave it empty.": "Please enter a version in the format 'x.y.z' (e.g. 0.0.1 with numbers from 0 to 999) or leave it empty.",
+	"Delete unchanged": "Delete unchanged",
+	"Delete allocated row if there are no changes.": "Delete allocated row if there are no changes.",
+	"Triggers on table": "Triggers on table",
+	"Please provide the keystore alias and password for the android build.": "Please provide the keystore alias and password for the android build.",
+	"Submit": "Submit",
+	"OK": "OK",
+	"Step settings": "Step settings",
+	"Action settings": "Action settings",
+	"Workflow": "Workflow",
+	"Previous runs": "Previous runs",
+	"The workflow the user will be interacting with.": "The workflow the user will be interacting with."
 }

package/locales/pl.json

@@ -57,7 +57,7 @@
   "If you did not request this, please ignore this email.": "Jeżeli nie żądałeś tego, nie klikaj w poniższy link.",
   "Your password will not change until you access the link above and set a new one.": "Twoje hasło nie ulegnie zmianie dopóki nie klikniesz w powyższy link i nie ustawisz nowego hasła.",
   "Change my password": "Zmień moje hasło",
-  "Must be admin": "Musi być adminem",
+  "Must be admin": "Musisz być adminem",
   "Site identity": "Tożsamość strony",
   "Authentication": "Uwierzytelnianie",
   "Development": "Development",
@@ -1491,5 +1491,22 @@
 	"Login and signup views should be accessible by public users": "Widoki logowania i rejestracji powinny być dostępne dla użytkowników publicznych",
 	"Shared: %s": "Udostępnione: %s",
 	"Sharing not enabled": "Udostępnianie nie jest włączone",
-	"You must be logged in to share": "Musisz być zalogowany, aby udostępniać"
+	"You must be logged in to share": "Musisz być zalogowany, aby udostępniać",
+	"Fluid layout": "Układ elastyczny",
+	"Request fluid layout from theme for a wider display for this page": "Poproś o elastyczny układ z motywu, aby zapewnić szerszy widok dla tej strony",
+	"Location of view to create new row": "Lokalizacja widoku do utworzenia nowego wiersza",
+	"Capacitor builder": "Capacitor builder",
+	"Pulling the capacitor-builder docker image...": "Pobieranie obrazu Docker capacitor-builder...",
+	"Pull done with code %s": "Pobieranie zakończone z kodem %s",
+	"Default locale": "Domyślny język/region",
+	"Next step": "Następny krok",
+	"Step name": "Nazwa kroku",
+	"Step saved": "Krok zapisany",
+	"Initial step": "Początkowy krok",
+	"Confirm leaving unsaved": "Potwierdzenie opuszczenia bez zapisania",
+	"Ask the user to confirm if they close a tab with unsaved changes": "Poproś użytkownika o potwierdzenie, czy chce zamknąć kartę z niezapisanymi zmianami",
+	"Workflow runs": "Przepływ pracy jest uruchomiony",
+	"Workflow run": "Uruchomienie przepływu pracy",
+	"Share to enabled": "Udostępnij włączone",
+	"Enable the share to feature": "Włącz udostępnianie funkcji"
 }

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");
@@ -310,6 +310,7 @@ const send_events_page = (args) => {
       { text: "Custom", href: "/eventlog/custom" },
       { text: "Settings", href: "/eventlog/settings" },
       { text: "Event log", href: "/eventlog" },
+      { text: "Workflow runs", href: "/actions/runs" },
       ...(isRoot ? [{ text: "Crash log", href: "/crashlog" }] : []),
     ],
     ...args,
@@ -466,7 +467,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 +476,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 +509,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.9",
+  "version": "1.1.1-beta.0",
   "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.9",
-    "@saltcorn/builder": "1.1.0-beta.9",
-    "@saltcorn/data": "1.1.0-beta.9",
-    "@saltcorn/admin-models": "1.1.0-beta.9",
-    "@saltcorn/filemanager": "1.1.0-beta.9",
-    "@saltcorn/markup": "1.1.0-beta.9",
-    "@saltcorn/plugins-loader": "1.1.0-beta.9",
-    "@saltcorn/sbadmin2": "1.1.0-beta.9",
+    "@saltcorn/base-plugin": "1.1.1-beta.0",
+    "@saltcorn/builder": "1.1.1-beta.0",
+    "@saltcorn/data": "1.1.1-beta.0",
+    "@saltcorn/admin-models": "1.1.1-beta.0",
+    "@saltcorn/filemanager": "1.1.1-beta.0",
+    "@saltcorn/markup": "1.1.1-beta.0",
+    "@saltcorn/plugins-loader": "1.1.1-beta.0",
+    "@saltcorn/sbadmin2": "1.1.1-beta.0",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/codemirror.css

@@ -348,3 +348,36 @@ div.CodeMirror-dragcursors {
 
 /* Help users use markselection to safely style text background */
 span.CodeMirror-selectedtext { background: none; }
+
+/* Port of TextMate's Blackboard theme */
+
+.cm-s-blackboard.CodeMirror { background: #0C1021; color: #F8F8F8; }
+.cm-s-blackboard div.CodeMirror-selected { background: #253B76; }
+.cm-s-blackboard .CodeMirror-line::selection, .cm-s-blackboard .CodeMirror-line > span::selection, .cm-s-blackboard .CodeMirror-line > span > span::selection { background: rgba(37, 59, 118, .99); }
+.cm-s-blackboard .CodeMirror-line::-moz-selection, .cm-s-blackboard .CodeMirror-line > span::-moz-selection, .cm-s-blackboard .CodeMirror-line > span > span::-moz-selection { background: rgba(37, 59, 118, .99); }
+.cm-s-blackboard .CodeMirror-gutters { background: #0C1021; border-right: 0; }
+.cm-s-blackboard .CodeMirror-guttermarker { color: #FBDE2D; }
+.cm-s-blackboard .CodeMirror-guttermarker-subtle { color: #888; }
+.cm-s-blackboard .CodeMirror-linenumber { color: #888; }
+.cm-s-blackboard .CodeMirror-cursor { border-left: 1px solid #A7A7A7; }
+
+.cm-s-blackboard .cm-keyword { color: #FBDE2D; }
+.cm-s-blackboard .cm-atom { color: #D8FA3C; }
+.cm-s-blackboard .cm-number { color: #D8FA3C; }
+.cm-s-blackboard .cm-def { color: #8DA6CE; }
+.cm-s-blackboard .cm-variable { color: #FF6400; }
+.cm-s-blackboard .cm-operator { color: #FBDE2D; }
+.cm-s-blackboard .cm-comment { color: #AEAEAE; }
+.cm-s-blackboard .cm-string { color: #61CE3C; }
+.cm-s-blackboard .cm-string-2 { color: #61CE3C; }
+.cm-s-blackboard .cm-meta { color: #D8FA3C; }
+.cm-s-blackboard .cm-builtin { color: #8DA6CE; }
+.cm-s-blackboard .cm-tag { color: #8DA6CE; }
+.cm-s-blackboard .cm-attribute { color: #8DA6CE; }
+.cm-s-blackboard .cm-header { color: #FF6400; }
+.cm-s-blackboard .cm-hr { color: #AEAEAE; }
+.cm-s-blackboard .cm-link { color: #8DA6CE; }
+.cm-s-blackboard .cm-error { background: #9D1E15; color: #F8F8F8; }
+
+.cm-s-blackboard .CodeMirror-activeline-background { background: #3C3636; }
+.cm-s-blackboard .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }