@saltcorn/server 0.8.0-beta.4 → 0.8.1-beta.0

package/auth/testhelp.js

@@ -3,6 +3,7 @@
  * @module auth/testhelp
  * @subcategory auth
  */
+/*global it, expect*/
 const request = require("supertest");
 const app = require("../app");
 const getApp = require("../app");
@@ -10,8 +11,8 @@ const fixtures = require("@saltcorn/data/db/fixtures");
 const reset = require("@saltcorn/data/db/reset_schema");
 
 /**
- * 
- * @param {string} loc 
+ *
+ * @param {string} loc
  * @returns {void}
  * @throws {Error}
  */
@@ -27,62 +28,68 @@ const toRedirect = (loc) => (res) => {
 };
 
 /**
- * 
- * @param {number} txt 
- * @param {number} expCode 
+ *
+ * @param {number} txt
+ * @param {number} expCode
  * @returns {void}
  * @throws {Error}
  */
-const toInclude = (txt, expCode = 200) => (res) => {
-  if (res.statusCode !== expCode) {
-    console.log(res.text);
-    throw new Error(
-      `Expected status ${expCode} when lookinng for "${txt}", received ${res.statusCode}`
-    );
-  }
-
-  if (!res.text.includes(txt)) {
-    console.log(res.text);
-    throw new Error(`Expected text ${txt} not found`);
-  }
-};
+const toInclude =
+  (txt, expCode = 200) =>
+  (res) => {
+    if (res.statusCode !== expCode) {
+      console.log(res.text);
+      throw new Error(
+        `Expected status ${expCode} when lookinng for "${txt}", received ${res.statusCode}`
+      );
+    }
+
+    if (!res.text.includes(txt)) {
+      console.log(res.text);
+      throw new Error(`Expected text ${txt} not found`);
+    }
+  };
 
 /**
- * 
- * @param {number} expCode 
+ *
+ * @param {number} expCode
  * @returns {void}
  * @throws {Error}
  */
-const toSucceed = (expCode = 200) => (res) => {
-  if (res.statusCode !== expCode) {
-    console.log(res.text);
-    throw new Error(`Expected status ${expCode}, received ${res.statusCode}`);
-  }
-};
+const toSucceed =
+  (expCode = 200) =>
+  (res) => {
+    if (res.statusCode !== expCode) {
+      console.log(res.text);
+      throw new Error(`Expected status ${expCode}, received ${res.statusCode}`);
+    }
+  };
 
 /**
- * 
- * @param {number} txt 
- * @param {number} expCode 
+ *
+ * @param {number} txt
+ * @param {number} expCode
  * @returns {void}
  * @throws {Error}
-*/
-const toNotInclude = (txt, expCode = 200) => (res) => {
-  if (res.statusCode !== expCode) {
-    console.log(res.text);
-    throw new Error(
-      `Expected status ${expCode} when not lookinng for "${txt}", received ${res.statusCode}`
-    );
-  }
-
-  if (res.text.includes(txt)) {
-    console.log(res.text);
-    throw new Error(`Expected text ${txt} to be absent, but was present`);
-  }
-};
+ */
+const toNotInclude =
+  (txt, expCode = 200) =>
+  (res) => {
+    if (res.statusCode !== expCode) {
+      console.log(res.text);
+      throw new Error(
+        `Expected status ${expCode} when not lookinng for "${txt}", received ${res.statusCode}`
+      );
+    }
+
+    if (res.text.includes(txt)) {
+      console.log(res.text);
+      throw new Error(`Expected text ${txt} to be absent, but was present`);
+    }
+  };
 
 /**
- * 
+ *
  * @returns {Promise<void>}
  */
 const getStaffLoginCookie = async () => {
@@ -96,7 +103,7 @@ const getStaffLoginCookie = async () => {
 };
 
 /**
- * 
+ *
  * @returns {Promise<void>}
  */
 const getAdminLoginCookie = async () => {
@@ -111,9 +118,9 @@ const getAdminLoginCookie = async () => {
 };
 
 /**
- * 
- * @param {string} path 
- * @param {string} dest 
+ *
+ * @param {string} path
+ * @param {string} dest
  * @returns {void}
  */
 const itShouldRedirectUnauthToLogin = (path, dest) => {
@@ -137,8 +144,8 @@ const resetToFixtures = async () => {
 };
 
 /**
- * 
- * @param {*} pred 
+ *
+ * @param {*} pred
  * @returns {void}
  * @throws {Error}
  */
@@ -155,9 +162,9 @@ const succeedJsonWith = (pred) => (res) => {
 };
 
 /**
- * 
- * @param {number} code 
- * @param {number} pred 
+ *
+ * @param {number} code
+ * @param {number} pred
  * @returns {void}
  * @throws {Error}
  */
@@ -174,8 +181,8 @@ const respondJsonWith = (code, pred) => (res) => {
 };
 
 /**
- * 
- * @param {object} res 
+ *
+ * @param {object} res
  * @returns {void}
  * @throws {Error}
  */

package/fixture_persons.js

@@ -13,7 +13,7 @@ const basePlugin = require("@saltcorn/base-plugin");
 getState().registerPlugin("base", basePlugin);
 
 /**
- * @param {object[]} vs 
+ * @param {object[]} vs
  * @returns {object}
  */
 const rndElem = (vs) => vs[Math.floor(Math.random() * vs.length)];

package/index.js

@@ -1,22 +1,22 @@
-// for the jsdoc documentation
-/**
- *
- * @category server
- * @module server/index
- */
-
-/**
- * All files and sub-modules in the saltcorn-markup package.
- * @namespace server_overview
- * @property {module:auth/index~auth_overview} auth
- * @property {module:markup/index~markup_overview} markup
- * @property {module:routes/index~routes_overview} routes
- * 
- * @property {module:app} app
- * @property {module:errors} errors
- * @property {module:load_plugins} load_plugins
- * @property {module:serve} serve
- * @property {module:systemd} systemd
- * @property {module:wrapper} wrapper
- * @category server
- */
+// for the jsdoc documentation
+/**
+ *
+ * @category server
+ * @module server/index
+ */
+
+/**
+ * All files and sub-modules in the saltcorn-markup package.
+ * @namespace server_overview
+ * @property {module:auth/index~auth_overview} auth
+ * @property {module:markup/index~markup_overview} markup
+ * @property {module:routes/index~routes_overview} routes
+ *
+ * @property {module:app} app
+ * @property {module:errors} errors
+ * @property {module:load_plugins} load_plugins
+ * @property {module:serve} serve
+ * @property {module:systemd} systemd
+ * @property {module:wrapper} wrapper
+ * @category server
+ */

package/locales/en.json

@@ -1055,5 +1055,17 @@
 	"Specifies a filter for what file types the user can pick from the file input dialog box. Example is `text/csv,audio/*,video/*,image/*`": "Specifies a filter for what file types the user can pick from the file input dialog box. Example is `text/csv,audio/*,video/*,image/*`",
 	"Default Files accept filter": "Default Files accept filter",
 	"Specifies a default filter for what file types the user can pick from the file input dialog box. Example is `.doc, text/csv,audio/*,video/*,image/*`": "Specifies a default filter for what file types the user can pick from the file input dialog box. Example is `.doc, text/csv,audio/*,video/*,image/*`",
-	"Destination page": "Destination page"
+	"Destination page": "Destination page",
+	"Module Store endpoint": "Module Store endpoint",
+	"Authentication settings updated": "Authentication settings updated",
+	"Log client errors": "Log client errors",
+	"Record all client errors in the crash log": "Record all client errors in the crash log",
+	"Default File accept filter": "Default File accept filter",
+	"File upload debug": "File upload debug",
+	"Turn on to debug file upload in express-fileupload.": "Turn on to debug file upload in express-fileupload.",
+	"Upload size limit (Kb)": "Upload size limit (Kb)",
+	"Maximum upload file size in kilobytes": "Maximum upload file size in kilobytes",
+	"File upload timeout": "File upload timeout",
+	"Defines how long to wait for data before aborting file upload. Set to 0 if you want to turn off timeout checks. ": "Defines how long to wait for data before aborting file upload. Set to 0 if you want to turn off timeout checks. ",
+	"Files settings": "Files settings"
 }

package/locales/fr.json

@@ -274,5 +274,17 @@
 	"Field %s deleted": "Champ %s supprimé",
 	"Language: ": "Langage: ",
 	"Local": "Local",
-	"Language changed to %s": "Langage changé vers %s"
-}
+	"Language changed to %s": "Langage changé vers %s",
+	"CSV upload": "CSV upload",
+	"Create page": "Create page",
+	"Action": "Action",
+	"Table or Channel": "Table or Channel",
+	"Add trigger": "Add trigger",
+	"Upload file(s)": "Upload file(s)",
+	"About application": "About application",
+	"Modules": "Modules",
+	"Users and security": "Users and security",
+	"Site structure": "Site structure",
+	"Events": "Events",
+	"Are you sure?": "Are you sure?"
+}

package/locales/ru.json

@@ -920,28 +920,34 @@
 	"Permissions settings": "Настройки разрешений",
 	"Permissions": "Разрешения",
 	"Permissions settings updated": "Настройки разрешений обновлены",
-	"Upload file(s)": "Upload file(s)",
-	"Split paste": "Split paste",
-	"Separate paste content into separate inputs": "Separate paste content into separate inputs",
-	"Preview": "Preview",
-	"Create new row": "Create new row",
-	"Descending?": "Descending?",
-	"Only include rows where this formula is true. ": "Only include rows where this formula is true. ",
-	"Use %s to access current user ID": "Use %s to access current user ID",
-	"Formula value": "Formula value",
-	"Units": "Units",
+	"Upload file(s)": "Загрузка файл(ов)",
+	"Split paste": "Раздельная вставка",
+	"Separate paste content into separate inputs": "Разделять выставляемый конент на отдельные элементы",
+	"Preview": "Превью",
+	"Create new row": "Создать новую строку",
+	"Descending?": "В обратном порядке?",
+	"Only include rows where this formula is true. ": "Включать только строки, для который формула возвращает true. ",
+	"Use %s to access current user ID": "Использовать %s для доступа к ID пользователя",
+	"Formula value": "Значение формулы",
+	"Units": "Единицы",
 	"%s view - %s on %s": "%s view - %s on %s",
-	"Password Repeat": "Password Repeat",
-	"Remember me": "Remember me",
-	"Files accept filter ": "Files accept filter ",
+	"Password Repeat": "Повторите пароль",
+	"Remember me": "Запомнить меня",
 	"Specifies a filter for what file types the user can pick from the file input dialog box. Example is `text/csv,audio/*,video/*,image/*`": "Specifies a filter for what file types the user can pick from the file input dialog box. Example is `text/csv,audio/*,video/*,image/*`",
-	"Home Page by Role": "Home Page by Role",
-	"Files accept filter": "Files accept filter",
-	"Specify how to create a new row": "Specify how to create a new row",
-	"Cascade delete to file": "Cascade delete to file",
+	"Home Page by Role": "Домашняя страница в соответствие с ролью",
+	"Files accept filter": "Фильтр типов файлов при загрузке",
+	"Specify how to create a new row": "Укажите как создавать новую строку",
+	"Cascade delete to file": "Каскадное удаление к файлу",
 	"Deleting a row will also delete the file referenced by this field": "Deleting a row will also delete the file referenced by this field",
 	"Specifies a filter for what file types the user can pick from the file input dialog box. Example is `.doc,audio/*,video/*,image/*`": "Specifies a filter for what file types the user can pick from the file input dialog box. Example is `.doc,audio/*,video/*,image/*`",
-	"Default Files accept filter": "Default Files accept filter",
 	"Specifies a default filter for what file types the user can pick from the file input dialog box. Example is `.doc, text/csv,audio/*,video/*,image/*`": "Specifies a default filter for what file types the user can pick from the file input dialog box. Example is `.doc, text/csv,audio/*,video/*,image/*`",
-	"No file found": "No file found"
+	"No file found": "Файл не найден",
+	"Default File accept filter": "Фильтр типов файлов для загрузки",
+	"File upload debug": "Флаг отладки загрузки файлов",
+	"Turn on to debug file upload in express-fileupload.": "Turn on to debug file upload in express-fileupload.",
+	"File upload size limit in bytes": "Ограничение на размер файла при загрузке (в байтах)",
+	"Defines in bytes limit for upload files in express-fileupload.": "Defines in bytes limit for upload files in express-fileupload.",
+	"File upload timeout": "Таймаут загрузки файлов",
+	"Defines how long to wait for data before aborting for express-fileupload. Set to 0 if you want to turn off timeout checks. ": "Defines how long to wait for data before aborting for express-fileupload. Set to 0 if you want to turn off timeout checks. ",
+	"Files settings": "Настройки Файлов"
 }

package/markup/admin.js

@@ -93,15 +93,15 @@ const add_edit_bar = ({
     { class: "alert alert-light d-print-none admin-edit-bar" },
     title,
     what && span({ class: "ms-1 me-2 badge bg-primary" }, what),
-    viewSpec,
     a({ class: "ms-2", href: url }, "Edit ", i({ class: "fas fa-edit" })),
     cfgUrl
       ? a(
-          { class: "ms-1", href: cfgUrl },
+          { class: "ms-1 me-3", href: cfgUrl },
           "Configure ",
           i({ class: "fas fa-cog" })
         )
-      : ""
+      : "",
+    viewSpec
   );
 
   if (contents.above) {
@@ -344,7 +344,7 @@ const viewAttributes = async (key) => {
 const flash_restart_if_required = (cfgForm, req) => {
   let restart = false;
   cfgForm.fields.forEach((f) => {
-    if (configTypes[f.name].restart_required) {
+    if (configTypes[f.name]?.restart_required) {
       const current = getState().getConfig(f.name);
       if (current !== cfgForm.values[f.name]) restart = true;
     }
@@ -384,8 +384,24 @@ const config_fields_form = async ({
   const state = getState();
   const fields = [];
   const tenant = db.getTenantSchema();
-
+  const roleAttribs = {
+    options: (await User.get_roles()).map((r) => ({
+      label: r.role,
+      name: `${r.id}`,
+    })),
+  };
+  const getTenants = async () => {
+    const tens = await db.select("_sc_tenants");
+    return { options: tens.map((t) => t.subdomain) };
+  };
   for (const name of field_names) {
+    if (typeof name === "object" && name.section_header) {
+      fields.push({
+        input_type: "section_header",
+        label: name.section_header,
+      });
+      continue;
+    }
     values[name] = state.getConfig(name);
     // console.log(`config field name: %s`,name);
     if (configTypes[name].root_only && tenant !== db.connectObj.default_schema)
@@ -395,16 +411,7 @@ const config_fields_form = async ({
     const isTenant = configTypes[name].type === "Tenant";
     const label = configTypes[name].label || name;
     const sublabel = configTypes[name].sublabel || configTypes[name].blurb;
-    const roleAttribs = {
-      options: (await User.get_roles()).map((r) => ({
-        label: r.role,
-        name: `${r.id}`,
-      })),
-    };
-    const getTenants = async () => {
-      const tens = await db.select("_sc_tenants");
-      return { options: tens.map((t) => t.subdomain) };
-    };
+
     fields.push({
       name,
       ...configTypes[name],

package/markup/blockly.js

@@ -38,7 +38,7 @@ const blocklyImportScripts = ({ locale }) =>
   });
 
 /**
- * @param {boolean} hasActions 
+ * @param {boolean} hasActions
  * @returns {string}
  */
 const blocklyToolbox = (hasActions) => `

package/markup/expression_blurb.js

@@ -9,7 +9,7 @@ const { contract, is } = require("contractis");
 const { getState } = require("@saltcorn/data/db/state");
 
 /**
- * @param {*} type 
+ * @param {*} type
  * @returns {*}
  */
 const toJsType = (type) =>
@@ -23,8 +23,8 @@ const toJsType = (type) =>
   }[type] || type);
 
 /**
- * @param {*} type 
- * @param {object[]} fields 
+ * @param {*} type
+ * @param {object[]} fields
  * @returns {string[]}
  */
 const intExamples = (type, fields) => {
@@ -43,8 +43,8 @@ const intExamples = (type, fields) => {
 };
 
 /**
- * @param {*} type 
- * @param {object[]} fields 
+ * @param {*} type
+ * @param {object[]} fields
  * @returns {string[]}
  */
 const colorExamples = (type, fields) => {
@@ -58,8 +58,8 @@ const colorExamples = (type, fields) => {
 };
 
 /**
- * @param {*} type 
- * @param {object[]} fields 
+ * @param {*} type
+ * @param {object[]} fields
  * @returns {string[]}
  */
 const stringExamples = (type, fields) => {
@@ -78,8 +78,8 @@ const stringExamples = (type, fields) => {
 };
 
 /**
- * @param {*} type 
- * @param {object[]} fields 
+ * @param {*} type
+ * @param {object[]} fields
  * @returns {string[]}
  */
 const floatExamples = (type, fields) => {
@@ -107,8 +107,8 @@ const floatExamples = (type, fields) => {
 };
 
 /**
- * @param {*} type 
- * @param {object[]} fields 
+ * @param {*} type
+ * @param {object[]} fields
  * @returns {string[]}
  */
 const boolExamples = (type, fields) => {
@@ -139,10 +139,10 @@ const boolExamples = (type, fields) => {
 };
 
 /**
- * @param {string} type 
- * @param {*} stored 
- * @param {object[]} allFields 
- * @param {object} req 
+ * @param {string} type
+ * @param {*} stored
+ * @param {object[]} allFields
+ * @param {object} req
  * @returns {p[]}
  */
 const expressionBlurb = (type, stored, allFields, req) => {

package/markup/forms.js

@@ -50,33 +50,32 @@ const editRoleForm = ({ url, current_role, roles, req }) =>
  * @param folder
  * @returns {Form}
  */
-const fileUploadForm = (req, folder
-    ) => {
-    const frm = form(
-        {
-            action: "/files/upload",
-            method: "post",
-            enctype: "multipart/form-data",
-        },
-        csrfField(req),
-        label(req.__("Upload file(s)")),
-        input({
-            name: "file",
-            class: "form-control ms-1 w-unset d-inline",
-            type: "file",
-            onchange: "form.submit()",
-            multiple: true,
-        }),
-        folder && input({type: "hidden", name: "folder", value: folder})
-    );
-    return frm;
+const fileUploadForm = (req, folder) => {
+  const frm = form(
+    {
+      action: "/files/upload",
+      method: "post",
+      enctype: "multipart/form-data",
+    },
+    csrfField(req),
+    label(req.__("Upload file(s)")),
+    input({
+      name: "file",
+      class: "form-control ms-1 w-unset d-inline",
+      type: "file",
+      onchange: "form.submit()",
+      multiple: true,
+    }),
+    folder && input({ type: "hidden", name: "folder", value: folder })
+  );
+  return frm;
 };
 
 /**
  * Get Wizard Card Title
  * @param {string} wizardTitle
- * @param {*} wf 
- * @param {object} wfres 
+ * @param {*} wf
+ * @param {object} wfres
  * @returns {string}
  */
 const wizardCardTitle = (wizardTitle, wf, wfres) =>

package/markup/index.js

@@ -1,20 +1,20 @@
-// for the jsdoc documentation
-/**
- *
- * @category server
- * @module markup/index
- * @subcategory markup
- */
-
-/**
- * All files in the auth module.
- * @namespace markup_overview
- * @property {module:markup/admin} admin
- * @property {module:markup/blockly} blockly
- * @property {module:markup/expression_blurb} expression_blurb
- * @property {module:markup/forms} forms
- * @property {module:markup/plugin-store} plugin-store
- * 
- * @category server
- * @subcategory markup
- */
+// for the jsdoc documentation
+/**
+ *
+ * @category server
+ * @module markup/index
+ * @subcategory markup
+ */
+
+/**
+ * All files in the auth module.
+ * @namespace markup_overview
+ * @property {module:markup/admin} admin
+ * @property {module:markup/blockly} blockly
+ * @property {module:markup/expression_blurb} expression_blurb
+ * @property {module:markup/forms} forms
+ * @property {module:markup/plugin-store} plugin-store
+ *
+ * @category server
+ * @subcategory markup
+ */

package/markup/plugin-store.js

@@ -101,10 +101,10 @@ const showRepository = (repo) =>
   !repo
     ? repo
     : repo.url
-      ? link(repo.url, repo.url)
-      : repo.startsWith && repo.startsWith("github:")
-        ? link(repo.replace("github:", "https://github.com/"), repo)
-        : repo;
+    ? link(repo.url, repo.url)
+    : repo.startsWith && repo.startsWith("github:")
+    ? link(repo.replace("github:", "https://github.com/"), repo)
+    : repo;
 
 module.exports = {
   plugin_types_info_card,

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.8.0-beta.4",
+  "version": "0.8.1-beta.0",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.8.0-beta.4",
-    "@saltcorn/builder": "0.8.0-beta.4",
-    "@saltcorn/data": "0.8.0-beta.4",
-    "@saltcorn/admin-models": "0.8.0-beta.4",
-    "@saltcorn/filemanager": "0.8.0-beta.4",
-    "@saltcorn/markup": "0.8.0-beta.4",
-    "@saltcorn/sbadmin2": "0.8.0-beta.4",
+    "@saltcorn/base-plugin": "0.8.1-beta.0",
+    "@saltcorn/builder": "0.8.1-beta.0",
+    "@saltcorn/data": "0.8.1-beta.0",
+    "@saltcorn/admin-models": "0.8.1-beta.0",
+    "@saltcorn/filemanager": "0.8.1-beta.0",
+    "@saltcorn/markup": "0.8.1-beta.0",
+    "@saltcorn/sbadmin2": "0.8.1-beta.0",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "aws-sdk": "^2.1037.0",