@saltcorn/server 0.8.2 → 0.8.3-alpha.1

package/app.js

@@ -184,7 +184,7 @@ const getApp = async (opts = {}) => {
     new CustomStrategy((req, done) => {
       loginAttempt();
       async function loginAttempt() {
-        const { remember, _csrf, ...userobj } = req.body;
+        const { remember, _csrf, dest, ...userobj } = req.body;
         if (!is.objVals(is.str).check(userobj))
           return done(
             null,

package/auth/routes.js

@@ -93,7 +93,7 @@ const loginForm = (req, isCreating) => {
     // TBD unresolved usernameLabel
     .map((auth) => `${auth.usernameLabel} for ${auth.label}`)
     .join(", ");
-  return new Form({
+  const form = new Form({
     class: "login",
     fields: [
       new Field({
@@ -119,6 +119,12 @@ const loginForm = (req, isCreating) => {
     action: "/auth/login",
     submitLabel: req.__("Login"),
   });
+  const { dest } = req.query;
+  if (dest) {
+    form.hidden("dest");
+    form.values.dest = encodeURIComponent(dest);
+  }
+  return form;
 };
 
 /**
@@ -1049,7 +1055,6 @@ router.post(
       res.redirect("/auth/twofa/login/totp");
       return;
     }
-
     if (req.session.cookie)
       if (req.body.remember) {
         const setDur = +getState().getConfig("cookie_duration_remember", 0);
@@ -1070,6 +1075,8 @@ router.post(
     }
     if (getState().get2FApolicy(req.user) === "Mandatory") {
       res.redirect("/auth/twofa/setup/totp");
+    } else if (req.body.dest) {
+      res.redirect(decodeURIComponent(req.body.dest));
     } else res.redirect("/");
   })
 );

package/auth/testhelp.js

@@ -131,7 +131,10 @@ const itShouldRedirectUnauthToLogin = (path, dest) => {
     const res = await request(app)
       .get(path)
       .expect(302)
-      .expect("Location", dest || "/auth/login");
+      .expect(
+        "Location",
+        dest || `/auth/login?dest=${encodeURIComponent(path)}`
+      );
 
     expect(res.statusCode).toEqual(302);
   });

package/locales/en.json

@@ -1043,7 +1043,6 @@
 	"Rights settings": "Rights settings",
 	"Database name": "Database name",
 	"Database schema": "Database schema",
-	"<p>You have views with a role to access lower than the table role to read, \n      with no table ownership. In the next version of Saltcorn, this may cause a\n      denial of access. Users will need to have table read access to any data displayed.</p> \n      Views potentially affected: %s": "<p>You have views with a role to access lower than the table role to read, \n      with no table ownership. In the next version of Saltcorn, this may cause a\n      denial of access. Users will need to have table read access to any data displayed.</p> \n      Views potentially affected: %s",
 	"If the parent row is deleted, do this to the child rows.": "If the parent row is deleted, do this to the child rows.",
 	"On delete": "On delete",
 	"Permissions": "Permissions",
@@ -1082,5 +1081,10 @@
 	"Cache-control max-age for public views and pages. 0 to disable": "Cache-control max-age for public views and pages. 0 to disable",
 	"Files accept filter": "Files accept filter",
 	"User group": "User group",
-	"Add relations to this table in dropdown options for ownership field": "Add relations to this table in dropdown options for ownership field"
+	"Add relations to this table in dropdown options for ownership field": "Add relations to this table in dropdown options for ownership field",
+	"You have views with a role to access lower than the table role to read, with no table ownership. This may cause a denial of access. Users need to have table read access to any data displayed.": "You have views with a role to access lower than the table role to read, with no table ownership. This may cause a denial of access. Users need to have table read access to any data displayed.",
+	"Views potentially affected": "Views potentially affected",
+	"Empty view": "Empty view",
+	"A view that will be shown only if there are no tables rows to show": "A view that will be shown only if there are no tables rows to show",
+	"Calculated field will be stored in Database": "Calculated field will be stored in Database"
 }

package/locales/ru.json

@@ -731,7 +731,7 @@
 	"Forget table": "Забыть таблицу",
 	"Ownership formula": "Owner (формула)",
 	"User is treated as owner if true. In scope: ": "Ownership formula. Пользователь воспринимается как владелец, если значение формулы true. В рамках: ",
-	"This is a translation of a different field in a different language": "Это трансляция перевода полей на разные языки",
+	"This is a translation of a different field in a different language": "Это поле является переводом другого поля на другой язык",
 	"Language locale of translation": "Языковая локализация (locale) для перевода",
 	"Slug": "Slug",
 	"Field that can be used for a prettier URL structure": "Поле, которе используется для настройки структуры URL",
@@ -933,21 +933,40 @@
 	"%s view - %s on %s": "%s view - %s on %s",
 	"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/*`",
+	"Specifies a filter for what file types the user can pick from the file input dialog box. Example is `text/csv,audio/*,video/*,image/*`": "Определяет через запятую список MIME типов файлов, которые допустимо загружать через диалог загрузки файлов. Пример `text/csv,audio/*,video/*,image/*`",
 	"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/*`",
-	"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/*`",
+	"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/*`": "Определяет через запятую список MIME типов файлов, которые допустимо загружать через диалог загрузки файлов. Пример  `.doc,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/*`": "Определяет через запятую список MIME типов файлов, которые допустимо загружать через диалог загрузки файлов. Пример  `.doc, text/csv,audio/*,video/*,image/*`",
 	"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.",
+	"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.",
+	"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": "Настройки Файлов"
+	"Defines how long to wait for data before aborting for express-fileupload. Set to 0 if you want to turn off timeout checks. ": "определяет максимально допустимый интервал времени ожидания загрузки файла. 0 отключает проверку. ",
+	"Files settings": "Настройки Файлов",
+	"Log client errors": "Логировать ошибки на клиенте",
+	"Record all client errors in the crash log": "Записывать все ошибки в приложении-клиенте в журнал сбоев (crash log)",
+	"NPM packages in code": "Пакеты NPM для JS кода",
+	"Comma-separated list of packages which will be available in JavaScript actions": "Список пакетов через запятую, которые будут использованы в действиях Javascript",
+	"Owned": "Принадлежит",
+	"You have views with a role to access lower than the table role to read, with no table ownership. This may cause a denial of access. Users need to have table read access to any data displayed.": "Настроены представления с уровнем доступа меньшим, чем уровень чтения данных из таблиц.  При этом не используется механизм владения таблицей. Это может вызвать конфликт доступа. Пользователи должны иметь доступ ко всем отображаемым данным.",
+	"Views potentially affected": "Потенциально затронутые представления",
+	"Become user": "Стать пользователем",
+	"Public cache TTL (minutes)": "Публичный кеш TTL (минуты)",
+	"Cache-control max-age for public views and pages. 0 to disable": "Максимальный возраст кеша для публичных представлений и страниц. 0 отключает проверку",
+	"Update": "Обновить",
+	"Add": "Добавить",
+	"Recalculate dynamic": "Пересчитать динамические элементы",
+	"Upload size limit (Kb)": "Лимит размера загружаемых файлов (Kb)",
+	"Maximum upload file size in kilobytes": "Максимальный допустимый размер загружаемого файла (указывается в килобайтах)",
+	"Defines how long to wait for data before aborting file upload. Set to 0 if you want to turn off timeout checks. ": "Определяет максимальный допустимый интервал времени ожидания загрузки данных файла. 0 отключает проверку. ",
+	"User group": "Группа пользователей",
+	"Add relations to this table in dropdown options for ownership field": "Добавить связь с этой таблицей в выбор опций для поля Владельца ",
+	"Calculated field will be stored in Database": "Вычисляемое будет сохранено в базе данных"
 }

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.8.2",
+  "version": "0.8.3-alpha.1",
   "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.2",
-    "@saltcorn/builder": "0.8.2",
-    "@saltcorn/data": "0.8.2",
-    "@saltcorn/admin-models": "0.8.2",
-    "@saltcorn/filemanager": "0.8.2",
-    "@saltcorn/markup": "0.8.2",
-    "@saltcorn/sbadmin2": "0.8.2",
+    "@saltcorn/base-plugin": "0.8.3-alpha.1",
+    "@saltcorn/builder": "0.8.3-alpha.1",
+    "@saltcorn/data": "0.8.3-alpha.1",
+    "@saltcorn/admin-models": "0.8.3-alpha.1",
+    "@saltcorn/filemanager": "0.8.3-alpha.1",
+    "@saltcorn/markup": "0.8.3-alpha.1",
+    "@saltcorn/sbadmin2": "0.8.3-alpha.1",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "aws-sdk": "^2.1037.0",
@@ -33,7 +33,7 @@
     "greenlock-express": "^4.0.3",
     "helmet": "^3.23.3",
     "i18n": "^0.14.0",
-    "jsonwebtoken": "^8.5.1",
+    "jsonwebtoken": "^9.0.0",
     "live-plugin-manager": "^0.16.0",
     "moment": "^2.27.0",
     "multer": "^1.4.3",
@@ -44,7 +44,7 @@
     "passport": "^0.4.1",
     "passport-custom": "^1.1.1",
     "passport-http-bearer": "^1.0.1",
-    "passport-jwt": "4.0.0",
+    "passport-jwt": "4.0.1",
     "passport-totp": "0.0.2",
     "pg": "^8.2.1",
     "pluralize": "^8.0.0",

package/public/diagram_utils.js

@@ -29,7 +29,8 @@ function initMouseOver() {
     };
     node.on("position", update);
     cy.on("pan zoom resize", update);
-    buildPreview(node);
+    const { type } = node.data();
+    if (type === "page" || type === "view") buildPreview(node);
   });
 
   cy.on("mouseout", "node", (event) => {
@@ -41,7 +42,7 @@ function initMouseOver() {
 }
 
 function buildCard(node) {
-  const { type, label } = node.data();
+  const { type, label, isVirtual } = node.data();
   const html = `
     <div class="card" style="width: 20rem;">
       <div class="card-header">
@@ -49,7 +50,7 @@ function buildCard(node) {
         <h6 class="card-subtitle text-muted">${label}</h6>
       </div>
       <div class="card-body">
-        ${buildTagBadges(node)}
+        ${!isVirtual ? buildTagBadges(node) : "<h5>virtual</h5>"}
         ${buildCardBody(node)}
         <div>
           ${type === "page" || type === "view" ? buildPreviewDiv(node) : ""}

package/public/saltcorn-common.js

@@ -780,16 +780,19 @@ function unique_field_from_rows(
   const vals = rows
     .map((o) => o[field_name])
     .filter((s) => s.startsWith(value));
-
+  const numtype =
+    char_type !== "Lowercase Letters" && char_type !== "Uppercase Letters";
   if (vals.includes(value) || always_append) {
     let newname;
     const stripped = vals
       .filter((v) => v !== value)
       .map((s) => s.replace(value_wspace, ""))
-      .sort();
+      .map((s) => (numtype ? +s : s))
+      .sort(numtype ? (a, b) => a - b : undefined);
     if (stripped.length === 0) newname = `${value_wspace}${gen_char(start)}`;
     else {
-      const last_i = char_to_i(stripped[stripped.length - 1]);
+      const i = char_to_i(stripped[stripped.length - 1]);
+      const last_i = numtype ? Math.max(i, start - 1) : i;
 
       newname = `${value_wspace}${gen_char(last_i + 1)}`;
     }
@@ -872,6 +875,7 @@ function split_paste_handler(e) {
           //const pasted =
           $elem.val(lines.shift());
         } else $elem.val(lines.shift());
+        $elem.trigger("change");
       }
     });
 }

package/public/saltcorn.css

@@ -370,3 +370,9 @@ table.table-inner-grid td {
   margin-left: 0;
   margin-right: 0.5em;
 }
+
+.join-table-header {
+  padding: 0.25rem 1rem; 
+  margin-bottom: 0 !important;
+  text-decoration: underline;
+}

package/public/saltcorn.js

@@ -380,8 +380,11 @@ function updateViewPreview() {
         "CSRF-Token": _sc_globalCsrf,
       },
 
-      error: function (request) {},
+      error: function (resp) {
+        $("#viewcfg-preview-error").html(resp.responseText || resp.statusText);
+      },
       success: function (res) {
+        $("#viewcfg-preview-error").html("");
         $preview.css({ opacity: 1.0 });
 
         //disable functions preview migght try to call
@@ -619,6 +622,11 @@ function build_mobile_app(button) {
   });
 }
 
+function join_field_clicked(e, fieldPath) {
+  $("#inputjoin_field").val(fieldPath);
+  apply_showif();
+}
+
 (() => {
   const e = document.querySelector("[data-sidebar-toggler]");
   let closed = localStorage.getItem("sidebarClosed") === "true";

package/routes/api.js

@@ -381,7 +381,10 @@ router.post(
             res.status(400).json({ error: errors.join(", ") });
             return;
           }
-          const ins_res = await table.tryInsertRow(row, req.user);
+          const ins_res = await table.tryInsertRow(
+            row,
+            req.user || user || { role_id: 10 }
+          );
           if (ins_res.error) res.status(400).json(ins_res);
           else res.json(ins_res);
         } else {
@@ -436,7 +439,11 @@ router.post(
             res.status(400).json({ error: errors.join(", ") });
             return;
           }
-          const ins_res = await table.tryUpdateRow(row, id, req.user);
+          const ins_res = await table.tryUpdateRow(
+            row,
+            id,
+            user || req.user || { role_id: 10 }
+          );
 
           if (ins_res.error) res.status(400).json(ins_res);
           else res.json(ins_res);
@@ -475,8 +482,15 @@ router.delete(
               //const fields = await table.getFields();
               const row = req.body;
               //readState(row, fields);
-              await table.deleteRows({ [pk_name]: row[pk_name] });
-            } else await table.deleteRows({ id });
+              await table.deleteRows(
+                { [pk_name]: row[pk_name] },
+                user || req.user || { role_id: 10 }
+              );
+            } else
+              await table.deleteRows(
+                { id },
+                user || req.user || { role_id: 10 }
+              );
             res.json({ success: true });
           } catch (e) {
             res.status(400).json({ error: e.message });

package/routes/delete.js

@@ -36,11 +36,12 @@ router.post(
     const table = await Table.findOne({ name: tableName });
     const role = req.user && req.user.id ? req.user.role_id : 10;
     try {
-      if (role <= table.min_role_write) await table.deleteRows({ id });
+      if (role <= table.min_role_write)
+        await table.deleteRows({ id }, req.user || { role_id: 10 });
       else if (table.ownership_field_id && req.user) {
         const row = await table.getRow({ id });
         if (row && table.is_owner(req.user, row))
-          await table.deleteRows({ id });
+          await table.deleteRows({ id }, req.user || { role_id: 10 });
         else req.flash("error", req.__("Not authorized"));
       } else
         req.flash(

package/routes/fields.js

@@ -137,6 +137,9 @@ const fieldForm = async (req, fkey_opts, existing_names, id, hasData) => {
       new Field({
         label: req.__("Stored"),
         name: "stored",
+        sublabel: req.__(
+            "Calculated field will be stored in Database"
+        ),
         type: "Bool",
         disabled: !!id,
         showIf: { calculated: true },

package/routes/menu.js

@@ -83,10 +83,10 @@ const menuForm = async (req) => {
     labelCols: 3,
     noSubmitButton: true,
     additionalButtons: [
-      { label: "Update", id: "btnUpdate", class: "btn btn-primary" },
-      { label: "Add", id: "btnAdd", class: "btn btn-primary" },
+      { label: req.__("Update"), id: "btnUpdate", class: "btn btn-primary" },
+      { label: req.__("Add"), id: "btnAdd", class: "btn btn-primary" },
       {
-        label: "Recalculate dynamic",
+        label: req.__("Recalculate dynamic"),
         id: "btnRecalc",
         class: "btn btn-primary",
       },

package/routes/page.js

@@ -61,10 +61,14 @@ router.get(
         })
       );
     } else {
-      state.log(2, `Page $pagename} not found or not authorized`);
-      res
-        .status(404)
-        .sendWrap(`${pagename} page`, req.__("Page %s not found", pagename));
+      if (db_page && !req.user) {
+        res.redirect(`/auth/login?dest=${encodeURIComponent(req.originalUrl)}`);
+      } else {
+        state.log(2, `Page $pagename} not found or not authorized`);
+        res
+          .status(404)
+          .sendWrap(`${pagename} page`, req.__("Page %s not found", pagename));
+      }
     }
   })
 );

package/routes/tables.js

@@ -430,6 +430,7 @@ router.get(
         label: `<b>${t.name}</b>\n${t.fields
           .map((f) => `${f.name} : ${f.pretty_type}`)
           .join("\n")}`,
+        title: t.description? t.description : t.name,
       })),
       edges,
     };
@@ -439,7 +440,7 @@ router.get(
         headers: [
           {
             script:
-              "https://unpkg.com/vis-network@9.0.2/standalone/umd/vis-network.min.js",
+              "https://unpkg.com/vis-network@9.1.2/standalone/umd/vis-network.min.js",
           },
         ],
       },
@@ -887,8 +888,10 @@ router.post(
           "exttables_min_role_read",
           exttables_min_role_read
         );
-        req.flash("success", req.__("Table saved"));
-        res.redirect(`/table/${table.name}`);
+        if (!req.xhr) {
+          req.flash("success", req.__("Table saved"));
+          res.redirect(`/table/${table.name}`);
+        } else res.json({ success: "ok" });
       }
     } else {
       const { id, _csrf, ...rest } = v;

package/routes/tenant.js

@@ -279,18 +279,17 @@ router.post(
         const tenant_template = getState().getConfig("tenant_template");
         // tenant creator
         const user_email = req.user && req.user.email;
-        // switch to tenant
-        await switchToTenant(
-          await insertTenant(
-            subdomain,
-            user_email,
-            description,
-            tenant_template
-          ),
-          newurl
+        const tenrow = await insertTenant(
+          subdomain,
+          user_email,
+          description,
+          tenant_template
         );
         // add tenant to global state
         add_tenant(subdomain);
+
+        await switchToTenant(tenrow, newurl);
+
         await create_tenant({
           t: subdomain,
           plugin_loader: loadAllPlugins,

package/routes/utils.js

@@ -58,7 +58,7 @@ function isAdmin(req, res, next) {
         ? "/auth/twofa/login/totp"
         : req.user
         ? "/"
-        : "/auth/login"
+        : `/auth/login?dest=${encodeURIComponent(req.originalUrl)}`
     );
   }
 }

package/routes/view.js

@@ -57,6 +57,10 @@ router.get(
       role > view.min_role &&
       !(await view.authorise_get({ query, req, ...view }))
     ) {
+      if (!req.user) {
+        res.redirect(`/auth/login?dest=${encodeURIComponent(req.originalUrl)}`);
+        return;
+      }
       req.flash("danger", req.__("Not authorized"));
       state.log(2, `View ${viewname} not authorized`);
       res.redirect("/");

package/routes/viewedit.js

@@ -8,7 +8,15 @@
 const Router = require("express-promise-router");
 
 const { renderForm, renderBuilder, alert } = require("@saltcorn/markup");
-const { p, a, div, script, text, domReady } = require("@saltcorn/markup/tags");
+const {
+  p,
+  a,
+  div,
+  script,
+  text,
+  domReady,
+  pre,
+} = require("@saltcorn/markup/tags");
 
 const { getState } = require("@saltcorn/data/db/state");
 const { isAdmin, error_catcher, addOnDoneRedirect } = require("./utils.js");
@@ -59,6 +67,7 @@ router.get(
     const viewAccessWarning = (view) => {
       const table = tables.find((t) => t.name === view.table);
       if (!table) return false;
+      if (table.name === "users") return false;
       if (table.ownership_field_id || table.ownership_formula) return false;
 
       return table.min_role_read < view.min_role;
@@ -68,13 +77,12 @@ router.get(
       hasAccessWarning.length > 0
         ? alert(
             "danger",
-            req.__(
-              `<p>You have views with a role to access lower than the table role to read, 
-      with no table ownership. In the next version of Saltcorn, this may cause a
-      denial of access. Users will need to have table read access to any data displayed.</p> 
-      Views potentially affected: %s`,
-              hasAccessWarning.map((v) => v.name).join(", ")
-            )
+            `<p>${req.__(
+              `You have views with a role to access lower than the table role to read, with no table ownership. This may cause a denial of access. Users need to have table read access to any data displayed.`
+            )}</p> 
+      ${req.__("Views potentially affected")}: ${hasAccessWarning
+              .map((v) => v.name)
+              .join(", ")}`
           )
         : "";
     res.sendWrap(req.__(`Views`), {
@@ -481,8 +489,11 @@ const respondWorkflow = (view, wf, wfres, req, res) => {
               type: "card",
               title: req.__("Preview"),
               contents: div(
-                { id: "viewcfg-preview", "data-preview-url": previewURL },
-                script(domReady(`updateViewPreview()`))
+                div(pre({ id: "viewcfg-preview-error", class: "text-danger" })),
+                div(
+                  { id: "viewcfg-preview", "data-preview-url": previewURL },
+                  script(domReady(`updateViewPreview()`))
+                )
               ),
             },
           ]

package/systemd.js

@@ -3,6 +3,7 @@
  * @module systemd
  */
 const fetch = require("node-fetch");
+const { getState } = require("@saltcorn/data/db/state");
 
 /**
  * @param {number} interval
@@ -21,29 +22,33 @@ const watchDog = (interval, notify, { port }) => {
         const User = require("@saltcorn/data/models/user");
         User.count()
           .then((c) => {
-            console.log("watchdog user count", c);
+            getState().log(5, `watchdog user count ${c}`);
             notify.watchdog();
           })
           .catch((e) => {
-            console.error(e);
+            getState().log(1, e);
             process.exit(1);
           });
       } else {
         // check we can serve
         fetch(`http://127.0.0.1:${port}/auth/login`)
           .then((response) => {
-            console.log("watchdog request status", response.status);
+            getState().log(5, `watchdog request status ${response.status}`);
             if (response.status < 400) notify.watchdog();
             else process.exit(1);
           })
           .catch((e) => {
-            console.error(e);
+            getState().log(1, e);
             process.exit(1);
           });
       }
-    } else return notify.watchdog();
+    } else {
+      getState().log(5, `watchdog with no test`);
+      notify.watchdog();
+      return;
+    }
   } catch (e) {
-    console.error(e);
+    getState().log(1, e);
     process.exit(1);
   }
 };
@@ -57,6 +62,7 @@ module.exports =
   (opts) => {
     try {
       const notify = require("sd-notify");
+      getState().log(4, `systemd notify ready`);
       notify.ready();
       const watchdogInterval = notify.watchdogInterval();
       if (watchdogInterval && watchdogInterval > 0) {
@@ -65,7 +71,12 @@ module.exports =
           watchDog(interval, notify, opts);
         }, interval);
       }
-    } catch {
+    } catch (e) {
       //ignore, systemd lib not installed
+      getState().log(
+        4,
+        `Failed to notify systemd on startup (systemd lib not installed?) with error ${e}`
+      );
     }
   };
+4;

package/tests/auth.test.js

@@ -18,7 +18,7 @@ const { getState } = require("@saltcorn/data/db/state");
 const { get_reset_link, generate_email } = require("../auth/resetpw");
 const i18n = require("i18n");
 const path = require("path");
-const fs = require("fs")
+const fs = require("fs");
 
 afterAll(db.close);
 beforeAll(async () => {
@@ -606,19 +606,19 @@ describe("signup with custom login form", () => {
 
 describe("Locale files", () => {
   it("should be valid JSON", async () => {
-
-    const localeFiles =
-      await fs.promises.readdir(path.join(__dirname, "..", "/locales"));
-    expect(localeFiles.length).toBeGreaterThan(3)
-    expect(localeFiles).toContain("en.json")
+    const localeFiles = await fs.promises.readdir(
+      path.join(__dirname, "..", "/locales")
+    );
+    expect(localeFiles.length).toBeGreaterThan(3);
+    expect(localeFiles).toContain("en.json");
     for (const fnm of localeFiles) {
       const conts = await fs.promises.readFile(
         path.join(__dirname, "..", "/locales", fnm)
-      )
-      expect(conts.length).toBeGreaterThan(1)
+      );
+      expect(conts.length).toBeGreaterThan(1);
 
-      const j = JSON.parse(conts)
-      expect(Object.keys(j).length).toBeGreaterThan(1)
+      const j = JSON.parse(conts);
+      expect(Object.keys(j).length).toBeGreaterThan(1);
     }
-  })
-})
+  });
+});

package/tests/clientjs.test.js

@@ -65,10 +65,10 @@ test("updateQueryStringParameter hash", () => {
   );
 });
 test("unique_field_from_rows test", () => {
-  $("body").append(`<input id="mkuniq" value="bar"></div>`);
+  $("body").append(`<input id="mkuniq6" value="bar"></div>`);
   unique_field_from_rows(
     [{ foo: "bar" }, { foo: "bar0" }],
-    "mkuniq",
+    "mkuniq6",
     "foo",
     false,
     0,
@@ -76,12 +76,12 @@ test("unique_field_from_rows test", () => {
     "Digits",
     "bar"
   );
-  expect($("#mkuniq").val()).toBe("bar1");
+  expect($("#mkuniq6").val()).toBe("bar1");
 
-  $("body").append(`<input id="mkuniq" value="bar"></div>`);
+  $("body").append(`<input id="mkuniq5" value="bar"></div>`);
   unique_field_from_rows(
     [{ foo: "bar" }],
-    "mkuniq",
+    "mkuniq5",
     "foo",
     false,
     9,
@@ -89,12 +89,12 @@ test("unique_field_from_rows test", () => {
     "Digits",
     "bar"
   );
-  expect($("#mkuniq").val()).toBe("bar9");
+  expect($("#mkuniq5").val()).toBe("bar9");
 
-  $("body").append(`<input id="mkuniq" value="bar"></div>`);
+  $("body").append(`<input id="mkuniq4" value="bar"></div>`);
   unique_field_from_rows(
-    [{ foo: "bar0" }],
-    "mkuniq",
+    [{ foo: "bar" }, { foo: "bar0" }],
+    "mkuniq4",
     "foo",
     false,
     9,
@@ -102,16 +102,25 @@ test("unique_field_from_rows test", () => {
     "Digits",
     "bar"
   );
-  expect($("#mkuniq").val()).toBe("bar9");
+  expect($("#mkuniq4").val()).toBe("bar9");
 
-  $("#mkuniq").val("bar");
-  unique_field_from_rows([], "mkuniq", "foo", false, 0, false, "Digits", "bar");
-  expect($("#mkuniq").val()).toBe("bar");
+  $("#mkuniq6").val("bar");
+  unique_field_from_rows(
+    [],
+    "mkuniq6",
+    "foo",
+    false,
+    0,
+    false,
+    "Digits",
+    "bar"
+  );
+  expect($("#mkuniq6").val()).toBe("bar");
 
-  $("body").append(`<input id="mkuniq" value="bar"></div>`);
+  $("body").append(`<input id="mkuniq3" value="bar"></div>`);
   unique_field_from_rows(
     [{ foo: "bar" }, { foo: "bar A" }],
-    "mkuniq",
+    "mkuniq3",
     "foo",
     true,
     0,
@@ -119,13 +128,13 @@ test("unique_field_from_rows test", () => {
     "Uppercase Letters",
     "bar"
   );
-  expect($("#mkuniq").val()).toBe("bar B");
+  expect($("#mkuniq3").val()).toBe("bar B");
 
   //skips blanks
-  $("body").append(`<input id="mkuniq" value="bar"></div>`);
+  $("body").append(`<input id="mkuniq2" value="bar"></div>`);
   unique_field_from_rows(
     [{ foo: "bar" }, { foo: "bar0" }, { foo: "bar1" }, { foo: "bar3" }],
-    "mkuniq",
+    "mkuniq2",
     "foo",
     false,
     0,
@@ -133,5 +142,42 @@ test("unique_field_from_rows test", () => {
     "Digits",
     "bar"
   );
-  expect($("#mkuniq").val()).toBe("bar4");
+  expect($("#mkuniq2").val()).toBe("bar4");
+
+  $("body").append(`<input id="mkuniq1" value="bar"></div>`);
+  unique_field_from_rows(
+    [{ foo: "bar100" }, { foo: "bar101" }, { foo: "bar103" }],
+    "mkuniq1",
+    "foo",
+    false,
+    100,
+    true,
+    "Digits",
+    "bar"
+  );
+  expect($("#mkuniq1").val()).toBe("bar104");
+  $("body").append(`<input id="mkuniq10" value="bar"></div>`);
+  unique_field_from_rows(
+    [],
+    "mkuniq10",
+    "foo",
+    false,
+    100,
+    true,
+    "Digits",
+    "bar"
+  );
+  expect($("#mkuniq10").val()).toBe("bar100");
+  $("body").append(`<input id="mkuniq11" value="bar"></div>`);
+  unique_field_from_rows(
+    [{ foo: "bar100" }, { foo: "bar101" }, { foo: "bar35" }, { foo: "bar103" }],
+    "mkuniq11",
+    "foo",
+    false,
+    100,
+    true,
+    "Digits",
+    "bar"
+  );
+  expect($("#mkuniq11").val()).toBe("bar104");
 });

package/tests/files.test.js

@@ -109,6 +109,7 @@ describe("files admin", () => {
 describe("files edit", () => {
   it("creates table and view", async () => {
     const table = await Table.create("thefiletable");
+    await table.update({ min_role_read: 8, min_role_write: 8 });
     await Field.create({
       table,
       name: "first_name",

package/tests/kittens.test.js

@@ -24,8 +24,8 @@ const pack = {
   tables: [
     {
       name: "cats",
-      min_role_read: 1,
-      min_role_write: 1,
+      min_role_read: 10,
+      min_role_write: 10,
       versioned: false,
       fields: [
         {

package/tests/table.test.js

@@ -33,9 +33,9 @@ describe("Table Endpoints", () => {
       .post("/table/")
       .send("name=mypostedtable")
       .set("Cookie", loginCookie)
-      .expect(toRedirect("/table/7"));
+      .expect(toRedirect("/table/10"));
     await request(app)
-      .get("/table/7")
+      .get("/table/10")
       .set("Cookie", loginCookie)
       .expect(toInclude("mypostedtable"));
     await request(app)
@@ -114,7 +114,7 @@ describe("Table Endpoints", () => {
   });
   it("should edit external table role", async () => {
     const loginCookie = await getAdminLoginCookie();
-    getState().registerPlugin("mock_plugin", plugin_with_routes);
+    getState().registerPlugin("mock_plugin", plugin_with_routes());
     const app = await getApp({ disableCsrf: true });
     await request(app)
       .post(`/table`)
@@ -149,7 +149,7 @@ Pencil, 0.5,2, t`;
       .set("Cookie", loginCookie)
       .field("name", "expenses")
       .attach("file", Buffer.from(csv, "utf-8"))
-      .expect(toRedirect("/table/8"));
+      .expect(toRedirect("/table/11"));
   });
   it("should upload csv to existing table", async () => {
     const csv = `author,Pages

package/tests/tenant.test.js

@@ -16,7 +16,6 @@ const { getState } = require("@saltcorn/data/db/state");
 afterAll(db.close);
 jest.setTimeout(10000);
 
-
 beforeAll(async () => {
   if (!db.isSQLite) {
     await db.query(`drop schema if exists test2 cascade`);
@@ -94,12 +93,9 @@ describe("tenant routes", () => {
         .set("Cookie", loginCookie)
         .expect(toRedirect("/tenant/list"));
     });
-
   } else {
-
     it("does not support tenants on SQLite", async () => {
       expect(db.isSQLite).toBe(true);
     });
-
   }
 });

package/tests/view.test.js

@@ -2,6 +2,7 @@ const request = require("supertest");
 const getApp = require("../app");
 const {
   toRedirect,
+  getAdminLoginCookie,
   getStaffLoginCookie,
   itShouldRedirectUnauthToLogin,
   toInclude,
@@ -33,7 +34,7 @@ describe("nonexisting view", () => {
   itShouldRedirectUnauthToLogin("/view/patlist", "/");
 });
 describe("view patients list endpoint", () => {
-  itShouldRedirectUnauthToLogin("/view/patientlist", "/");
+  itShouldRedirectUnauthToLogin("/view/patientlist");
 
   it("should show view to staff", async () => {
     const loginCookie = await getStaffLoginCookie();
@@ -78,17 +79,18 @@ describe("edit view", () => {
   });
   it("should submit edit", async () => {
     const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
     await request(app)
       .post("/view/authoredit")
+      .set("Cookie", loginCookie)
       .send("author=Chekov")
-
       .expect(toRedirect("/view/authorlist"));
   });
 });
 
 describe("view with routes", () => {
   it("should enable", async () => {
-    getState().registerPlugin("mock_plugin", plugin_with_routes);
+    getState().registerPlugin("mock_plugin", plugin_with_routes());
     expect(getState().viewtemplates.ViewWithRoutes.name).toBe("ViewWithRoutes");
     const table = await Table.findOne({ name: "books" });