@saltcorn/server 0.7.4-beta.2 → 0.7.4-beta.3

package/locales/en.json

@@ -951,7 +951,6 @@
 	"Modules up-to-date": "Modules up-to-date",
 	"User must have this role or higher to read rows from the table, unless they are the owner": "User must have this role or higher to read rows from the table, unless they are the owner",
 	"User must have this role or higher to edit or create new rows in the table, unless they are the owner": "User must have this role or higher to edit or create new rows in the table, unless they are the owner",
-	"Tag": "Tag",
 	"Tagname": "Tagname",
 	"Create tag": "Create tag",
 	"Tags": "Tags",
@@ -965,6 +964,24 @@
 	"Trigger": "Trigger",
 	"Add %s to tag": "Add %s to tag",
 	"Tag %s deleted": "Tag %s deleted",
-	"Tag %s created": "Tag %s created"
-
-}
+	"Tag %s created": "Tag %s created",
+	"Application diagram": "Application diagram",
+	"Diagram": "Diagram",
+	"Entry point": "Entry point",
+	"Platform": "Platform",
+	"docker": "docker",
+	"android": "android",
+	"iOS": "iOS",
+	"App file": "App file",
+	"Server URL": "Server URL",
+	"Module %s installed, please complete configuration.": "Module %s installed, please complete configuration.",
+	"Module %s removed.": "Module %s removed.",
+	"Module %s installed": "Module %s installed",
+	"Upgrading modules...": "Upgrading modules...",
+	"Backup now": "Backup now",
+	"Snapshot now": "Snapshot now",
+	"Restore/download automated backups »": "Restore/download automated backups »",
+	"Snapshots store your application structure and definition, without the table data. Individual views and pages can be restored from snapshots from the <a href='/viewedit'>view</a> or <a href='/pageedit'>pages</a> overviews (\"Restore\" from individual page or view dropdowns).": "Snapshots store your application structure and definition, without the table data. Individual views and pages can be restored from snapshots from the <a href='/viewedit'>view</a> or <a href='/pageedit'>pages</a> overviews (\"Restore\" from individual page or view dropdowns).",
+	"List/download snapshots &raquo;": "List/download snapshots &raquo;",
+	"Discover tables that are already in the Database, but not known to Saltcorn": "Discover tables that are already in the Database, but not known to Saltcorn"
+}

package/locales/ru.json

@@ -180,7 +180,7 @@
 	"Pack %s uninstalled": "Пакет %s удален",
 	"Uninstall": "Удалить",
 	"Result preview for ": "Предварительный просмотр результатов для ",
-	"Choose views for <a href=\"/search\">search results</a> for each table.<br/>Set to blank to omit table from global search.": "Выберите для каждой таблицы  представление для вывода <a href=\"/search\">результатов поиска</a>.<br/>Оставьте незаполненным, если не хотите, чтобы таблица отображалась в глобальном поиске.",
+	"Choose views for <a href=\"/search\">search results</a> for each table.<br/>Set to blank to omit table from global search.": "Выберите для каждой таблицы представление для вывода <a href=\"/search\">результатов поиска</a>.<br/>Оставьте незаполненным, если не хотите, чтобы таблица отображалась в глобальном поиске.",
 	"These tables lack suitable views: ": "Указанные таблицы не имеют представлений с поддержкой поиска: ",
 	"Search configuration": "Настройки поиска",
 	"Table saved with version history enabled": "Таблица сохранена с включенной историей версий",
@@ -303,7 +303,7 @@
 	"Clone": "Клонировать",
 	"View %s cloned as %s": "Представление %s клонировано в %s",
 	"Duplicate": "Дублировать",
-	"View %s duplicated as %s": "Представление %s задублировано в %s",
+	"View %s duplicated as %s": "Представление %s дублировано в %s",
 	"The view name will appear as the title of pop-ups showing this view, and in the URL when it is shown alone.": "Имя представления отображается как заголовок всплывающего окна или в URL, в зависимости от режима отображения.",
 	"Saltcorn version": "версия платформы",
 	"Node.js version": "версия Node.js",
@@ -337,7 +337,7 @@
 	"Subtables": "Подчиненные таблицы",
 	"List View": "Представление Список (List)",
 	"Show View": "Представление Show",
-	"Which related tables would you like to show in sub-lists below the selected item?": "Which related tables would you like to show in sub-lists below the selected item?",
+	"Which related tables would you like to show in sub-lists below the selected item?": "Какие связанные таблицы вы хотите отобразить в подчиненных списках (sub-lists) под выбранной записью?",
 	"Order and layout": "Сортировка и Макет",
 	"Order by": "Сортировка по",
 	"Descending": "В обратном порядке",
@@ -801,11 +801,11 @@
 	"Expiration in days": "Срок хранения (в днях)",
 	"Delete old backup files in this directory after the set number of days": "Старые резервные копии в этой папке будут удалять после истечения срока хранения ",
 	"Backup settings updated": "Настройки резервного копирования обновлены",
-	"Periodic snapshots enabled": "Регулярные снимки (снэпшоты) активированы",
-	"Snapshot will be made every hour if there are changes": "Снимки (снэпшоты) будут выполняться каждый час",
+	"Periodic snapshots enabled": "Регулярные снимки (снепшоты)",
+	"Snapshot will be made every hour if there are changes": "Снимки (снепшоты) будут выполняться каждый час",
 	"Manual backup": "Ручное резервное копирование",
 	"Automated backup": "Автоматическое резервное копирование",
-	"Snapshots": "Снимки (снэпшоты)",
+	"Snapshots": "Снимки (снепшоты)",
 	"Mobile app": "Мобильное приложение",
 	"Module store": "Магазин модулей",
 	"Upgrade installed modules": "Обновить установленные модули",
@@ -829,5 +829,58 @@
 	"App file": "Файл приложения",
 	"Server URL": "URL сервера",
 	"android": "android",
-	"iOS": "iOS"
+	"iOS": "iOS",
+	"Tag %s created": "Тег %s создан",
+	"%s Tag": "%s Тег",
+	"Add tables": "Добавить таблицы",
+	"Add views": "Добавить представления",
+	"Remove From Tag": "Удалить из тега",
+	"Add tages": "Добавить теги",
+	"Trigger": "Триггер",
+	"Tag": "Тег",
+	"Download snapshots": "Скачать снепшоты",
+	"Snapshots store your application structure and definition, without the table data. Individual views and pages can be restored from snapshots from the <a href='/viewedit'>view</a> or <a href='/pageedit'>pages</a> overviews (\"Restore\" from individual page or view dropdowns).": "Снепшоты сохраняют структуру приложения, но не сохраняют данные в таблицах. Конкретные представления и страницы могут быть восстановлены по ссылке <a href='/viewedit'>view</a> или <a href='/pageedit'>pages</a> (Кнопка \"Восстановить\" в выпадающем меню представления или страницы).",
+	"List/download snapshots &raquo;": "Список снепшотов &raquo;",
+	"Add %s to tag": "Добавить %s к тегу",
+	"Tagname": "Имя тега",
+	"Create tag": "Создать тег",
+	"Tags": "Теги",
+	"New tag": "Новый тег",
+	"Tag name": "Имя тега",
+	"Tag %s deleted": "Тег %s удален",
+	"Add entries to tag": "Добавить объекты в тег",
+	"Please select at least one item": "Пожалуйста добавьте хотя бы один объект",
+	"Backup now": "Сделать бекап сейчас",
+	"Snapshot now": "Сделать снепшот сейчас",
+	"Restore/download automated backups &raquo;": "Восстановить/скачать резервные копии &raquo;",
+	"No changes detected, snapshot skipped": "Нет изменений, снепшот пропущен",
+	"Pattern": "Паттерн",
+	"Add pages": "Добавить страницы",
+	"Add triggers": "Добавить триггеры",
+	"Edit Module": "Настроить Модуль",
+	"Page %s duplicated as %s": "Страница %s дублирована в %s",
+	"Auto save": "Автосохранение",
+	"Save any changes immediately": "Сохранять все изменения данных в форме немедленно",
+	"This is the view to which the user will be sent when the form is submitted. The view you specify here can be ignored depending on the context of the form, for instance if it appears in a pop-up the redirect will not take place.": "Указывается представление, куда будет перенаправлен пользователь после отправки формы. В некоторых случаях перенаправление не будет выполнено, например, если форма использована в режиме всплывающего окна.",
+	"Destination view": "Destination view",
+	"Destination URL Formula": "Destination URL Formula",
+	"Back": "Назад",
+	"Backup successful": "Резервная копия успешно создана",
+	"Save before going back": "Save before going back",
+	"Reload after going back": "Reload after going back",
+	"Steps to go back": "Steps to go back",
+	"View pattern": "Паттерн представления",
+	"The view pattern sets the foundation of how the view relates to the table and the behaviour of the view": "The view pattern sets the foundation of how the view relates to the table and the behaviour of the view",
+	"This will delete <strong>EVERYTHING</strong> in the selected categories": "Внимание! Будут удалены <strong>ВСЕ</strong> данные в выбранных категориях",
+	"Tag not found": "Тэг не найден",
+	"Build Result": "Результат сборки",
+	"Download automated backup": "Автоматически созданные резервные копии",
+	"Restoring automated backup": "Восстановление из автоматически созданной резервной копии",
+	"Download one of the backups above": "Скачать один из бекапов (файлов с резервной копией) выше",
+	"Clear this application": "Удалить ВСЕ данные в текущем приложении",
+	"(tick all boxes)": "(указав все галочки)",
+	"When prompted to create the first user, click the link to restore a backup": "Вместо создания первого пользователя, выберите Восстановление из резервной копии (restore a backup)",
+	"Select the downloaded backup file": "Выбрать скаченный бекап (файл с резервной копией)",
+	"Snapshot successful": "Снимок (Снепшот) выполнен успешно",
+	"Unable to build the app:": "Ошибка создания приложения:"
 }

package/markup/admin.js

@@ -203,6 +203,8 @@ const send_infoarch_page = (args) => {
             { text: "Multitenancy", href: "/tenant/settings" },
           ]
         : []),
+      { text: "Tags", href: "/tag" },
+      { text: "Diagram", href: "/diagram" },
     ],
     ...args,
   });
@@ -288,10 +290,7 @@ const send_admin_page = (args) => {
       { text: "Backup", href: "/admin/backup" },
       { text: "Email", href: "/admin/email" },
       { text: "System", href: "/admin/system" },
-      ...(isRoot ? [{ text: "Tag", href: "/tag" }] : []),
-      ...(isRoot
-        ? [{ text: "Mobile app", href: "/admin/build-mobile-app" }]
-        : []),
+      { text: "Mobile app", href: "/admin/build-mobile-app" },
     ],
     ...args,
   });

package/markup/expression_blurb.js

@@ -146,7 +146,7 @@ const boolExamples = (type, fields) => {
  * @returns {p[]}
  */
 const expressionBlurb = (type, stored, allFields, req) => {
-  const fields = allFields.filter((f) => !f.is_fkey && !f.calculated);
+  const fields = allFields.filter((f) => !f.calculated);
   const funs = getState().functions;
   const funNames = Object.entries(funs)
     .filter(([k, v]) => !(!stored && v.isAsync))

package/package.json

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

package/public/blockly.js

@@ -403,11 +403,10 @@ function activate_blockly({ events, actions, tables }) {
       Blockly.JavaScript.ORDER_ATOMIC
     );
     // TODO: Assemble JavaScript into code variable.
-    var code = `await fetchJSON(${value_url}, { method: '${dropdown_method}'${
-      value_body
-        ? `, body: ${value_body}, headers: { "Content-Type": "application/json" }`
-        : ""
-    } })`;
+    var code = `await fetchJSON(${value_url}, { method: '${dropdown_method}'${value_body
+      ? `, body: ${value_body}, headers: { "Content-Type": "application/json" }`
+      : ""
+      } })`;
     // TODO: Change ORDER_NONE to the correct strength.
     return [code, Blockly.JavaScript.ORDER_NONE];
   };
@@ -416,6 +415,7 @@ function activate_blockly({ events, actions, tables }) {
     init: function () {
       this.appendDummyInput().appendField("Return");
       this.appendValueInput("GOTO").setCheck("String").appendField("Go to URL");
+      this.appendValueInput("POPUP").setCheck("String").appendField("Popup URL");
       this.appendDummyInput()
         .appendField("Reload page")
         .appendField(new Blockly.FieldCheckbox("FALSE"), "RELOAD");
@@ -434,6 +434,11 @@ function activate_blockly({ events, actions, tables }) {
       "GOTO",
       Blockly.JavaScript.ORDER_ATOMIC
     );
+    var value_popup = Blockly.JavaScript.valueToCode(
+      block,
+      "POPUP",
+      Blockly.JavaScript.ORDER_ATOMIC
+    );
     var checkbox_reload = block.getFieldValue("RELOAD") == "TRUE";
     var value_notify = Blockly.JavaScript.valueToCode(
       block,
@@ -443,6 +448,7 @@ function activate_blockly({ events, actions, tables }) {
     // TODO: Assemble JavaScript into code variable.
     let s = "";
     if (value_goto) s += `goto: ${value_goto},`;
+    if (value_popup) s += `popup: ${value_popup},`;
     if (value_notify) s += `notify: ${value_notify},`;
     if (checkbox_reload) s += `reload_page: true,`;
     var code = `return {${s}};\n`;

package/public/gridedit.js

@@ -4,7 +4,10 @@ function showHideCol(nm, e) {
 }
 
 function lookupIntToString(cell, formatterParams, onRendered) {
-  const val = `${cell.getValue()}`;
+  const cellVal = cell.getValue()
+  const val = typeof cellVal === "object" && cellVal !== null
+    ? `${cellVal.id}`
+    : `${cellVal}`;
   const res = formatterParams.values[val];
   return res;
 }
@@ -150,6 +153,8 @@ function delete_tabulator_row(e, cell) {
   if (def && def.formatterParams && def.formatterParams.confirm) {
     if (!confirm("Are you sure you want to delete this row?")) return;
   }
+  const tableName = def?.formatterParams?.tableName || window.tabulator_table_name
+
   const row = cell.getRow().getData();
   if (!row.id) {
     cell.getRow().delete();
@@ -157,7 +162,7 @@ function delete_tabulator_row(e, cell) {
   }
   $.ajax({
     type: "DELETE",
-    url: `/api/${window.tabulator_table_name}/${row.id}`,
+    url: `/api/${tableName}/${row.id}`,
     data: row, // to process primary keys different from id
     headers: {
       "CSRF-Token": _sc_globalCsrf,

package/public/saltcorn-common.js

@@ -86,8 +86,7 @@ function apply_showif() {
       } else {
         e.append(
           $(
-            `<option ${
-              `${current}` === `${o.value}` ? "selected" : ""
+            `<option ${`${current}` === `${o.value}` ? "selected" : ""
             } value="${o.value}">${o.label}</option>`
           )
         );
@@ -118,15 +117,13 @@ function apply_showif() {
         resp.success.forEach((r) => {
           e.append(
             $(
-              `<option ${
-                `${current}` === `${r[dynwhere.refname]}` ? "selected" : ""
-              } value="${r[dynwhere.refname]}">${
-                dynwhere.label_formula
-                  ? new Function(
-                      `{${Object.keys(r).join(",")}}`,
-                      "return " + dynwhere.label_formula
-                    )(r)
-                  : r[dynwhere.summary_field]
+              `<option ${`${current}` === `${r[dynwhere.refname]}` ? "selected" : ""
+              } value="${r[dynwhere.refname]}">${dynwhere.label_formula
+                ? new Function(
+                  `{${Object.keys(r).join(",")}}`,
+                  "return " + dynwhere.label_formula
+                )(r)
+                : r[dynwhere.summary_field]
               }</option>`
             )
           );
@@ -466,16 +463,14 @@ function notifyAlert(note, spin) {
   }
 
   $("#alerts-area")
-    .append(`<div class="alert alert-${type} alert-dismissible fade show ${
-    spin ? "d-flex align-items-center" : ""
-  }" role="alert">
+    .append(`<div class="alert alert-${type} alert-dismissible fade show ${spin ? "d-flex align-items-center" : ""
+      }" role="alert">
   ${txt}
-  ${
-    spin
-      ? `<div class="spinner-border ms-auto" role="status" aria-hidden="true"></div>`
-      : `<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close">
+  ${spin
+        ? `<div class="spinner-border ms-auto" role="status" aria-hidden="true"></div>`
+        : `<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close">
   </button>`
-  }
+      }
 </div>`);
 }
 
@@ -492,9 +487,8 @@ function common_done(res, isWeb = true) {
     (isWeb ? location : parent.location).reload(); //TODO notify to cookie if reload or goto
   }
   if (res.download) {
-    const dataurl = `data:${
-      res.download.mimetype || "application/octet-stream"
-    };base64,${res.download.blob}`;
+    const dataurl = `data:${res.download.mimetype || "application/octet-stream"
+      };base64,${res.download.blob}`;
     fetch(dataurl)
       .then((res) => res.blob())
       .then((blob) => {
@@ -515,6 +509,9 @@ function common_done(res, isWeb = true) {
     if (res.target === "_blank") window.open(res.goto, "_blank").focus();
     else window.location.href = res.goto;
   }
+  if (res.popup) {
+    ajax_modal(res.popup)
+  }
 }
 
 const repeaterCopyValuesToForm = (form, editor, noTriggerChange) => {
@@ -523,10 +520,11 @@ const repeaterCopyValuesToForm = (form, editor, noTriggerChange) => {
   const setVal = (k, ix, v) => {
     const $e = form.find(`input[name="${k}_${ix}"]`);
     if ($e.length) $e.val(v);
-    else
-      form.append(
-        `<input type="hidden" data-repeater-ix="${ix}" name="${k}_${ix}" value="${v}"></input>`
-      );
+    else {
+      const $ne = $(`<input type="hidden" data-repeater-ix="${ix}" name="${k}_${ix}"></input>`);
+      $ne.val(v);
+      form.append($ne);
+    }
   };
   vs.forEach((v, ix) => {
     Object.entries(v).forEach(([k, v]) => {
@@ -649,9 +647,9 @@ function room_older(viewname, room_id, btn) {
 function init_room(viewname, room_id) {
   const socket = parent?.config?.server_path
     ? io(parent.config.server_path, {
-        query: `jwt=${localStorage.getItem("auth_jwt")}`,
-        transports: ["websocket"],
-      })
+      query: `jwt=${localStorage.getItem("auth_jwt")}`,
+      transports: ["websocket"],
+    })
     : io({ transports: ["websocket"] });
 
   socket.emit("join_room", [viewname, room_id]);

package/public/saltcorn.js

@@ -51,12 +51,19 @@ function removeQueryStringParameter(uri1, key) {
   return uri + hash;
 }
 
+function get_current_state_url() {
+  let $modal = $("#scmodal");
+  if ($modal.length === 0 || !$modal.hasClass("show"))
+    return window.location.href;
+  else return $modal.prop("data-modal-state");
+}
+
 function select_id(id) {
-  pjax_to(updateQueryStringParameter(window.location.href, "id", id));
+  pjax_to(updateQueryStringParameter(get_current_state_url(), "id", id));
 }
 
 function set_state_field(key, value) {
-  pjax_to(updateQueryStringParameter(window.location.href, key, value));
+  pjax_to(updateQueryStringParameter(get_current_state_url(), key, value));
 }
 
 function check_state_field(that) {
@@ -65,13 +72,13 @@ function check_state_field(that) {
   const value = that.value;
   var separator = window.location.href.indexOf("?") !== -1 ? "&" : "?";
   let dest;
-  if (checked) dest = window.location.href + `${separator}${name}=${value}`;
-  else dest = window.location.href.replace(`${name}=${value}`, "");
+  if (checked) dest = get_current_state_url() + `${separator}${name}=${value}`;
+  else dest = get_current_state_url().replace(`${name}=${value}`, "");
   pjax_to(dest.replace("&&", "&").replace("?&", "?"));
 }
 
 function set_state_fields(kvs) {
-  var newhref = window.location.href;
+  var newhref = get_current_state_url();
   Object.entries(kvs).forEach((kv) => {
     if (kv[1].unset && kv[1].unset === true)
       newhref = removeQueryStringParameter(newhref, kv[0]);
@@ -80,7 +87,7 @@ function set_state_fields(kvs) {
   pjax_to(newhref.replace("&&", "&").replace("?&", "?"));
 }
 function unset_state_field(key) {
-  pjax_to(removeQueryStringParameter(window.location.href, key));
+  pjax_to(removeQueryStringParameter(get_current_state_url(), key));
 }
 
 let loadPage = true;
@@ -93,7 +100,11 @@ $(function () {
 });
 
 function pjax_to(href) {
-  if (!$("#page-inner-content").length) window.location.href = href;
+  let $modal = $("#scmodal");
+  const inModal = $modal.length && $modal.hasClass("show")
+  let $dest = inModal ? $("#scmodal .modal-body") : $("#page-inner-content");
+
+  if (!$dest.length) window.location.href = href;
   else {
     loadPage = false;
     $.ajax(href, {
@@ -101,18 +112,21 @@ function pjax_to(href) {
         pjaxpageload: "true",
       },
       success: function (res, textStatus, request) {
-        window.history.pushState({ url: href }, "", href);
+        if (!inModal) window.history.pushState({ url: href }, "", href);
         setTimeout(() => {
           loadPage = true;
         }, 0);
-        if (res.includes("<!--SCPT:")) {
+        if (!inModal && res.includes("<!--SCPT:")) {
           const start = res.indexOf("<!--SCPT:");
           const end = res.indexOf("-->", start);
           document.title = res.substring(start + 9, end);
         }
-        $("#page-inner-content").html(res);
+        $dest.html(res);
         initialize_page();
       },
+      error: function (res) {
+        notifyAlert({ type: "danger", text: res.responseText });
+      }
     });
   }
 }
@@ -120,8 +134,24 @@ function pjax_to(href) {
 function href_to(href) {
   window.location.href = href;
 }
-function clear_state() {
-  pjax_to(window.location.href.split("?")[0]);
+function clear_state(omit_fields_str) {
+  let newUrl = get_current_state_url().split("?")[0]
+  const hash = get_current_state_url().split("#")[1]
+  if (omit_fields_str) {
+    const omit_fields = omit_fields_str.split(',').map(s => s.trim())
+    let qs = (get_current_state_url().split("?")[1] || "").split("#")[0]
+    let params = new URLSearchParams(qs);
+    newUrl = newUrl + '?'
+    omit_fields.forEach(f => {
+      if (params.get(f))
+        newUrl = updateQueryStringParameter(newUrl, f, params.get(f));
+    })
+
+  }
+  if (hash)
+    newUrl += '#' + hash;
+
+  pjax_to(newUrl);
 }
 
 function ajax_done(res) {
@@ -210,6 +240,7 @@ function ajax_modal(url, opts = {}) {
       var title = request.getResponseHeader("Page-Title");
       if (title) $("#scmodal .modal-title").html(decodeURIComponent(title));
       $("#scmodal .modal-body").html(res);
+      $("#scmodal").prop("data-modal-state", url);
       new bootstrap.Modal($("#scmodal")).show();
       initialize_page();
       (opts.onOpen || function () { })(res);
@@ -468,3 +499,7 @@ Copyright (c) 2015 Jeff Green
     });
   };
 })(jQuery);
+
+// Copyright (c) 2011 Marcus Ekwall, http://writeless.se/
+// https://github.com/mekwall/jquery-throttle
+(function (a) { var b = a.jQuery || a.me || (a.me = {}), i = function (e, f, g, h, c, a) { f || (f = 100); var d = !1, j = !1, i = typeof g === "function", l = function (a, b) { d = setTimeout(function () { d = !1; if (h || c) e.apply(a, b), c && (j = +new Date); i && g.apply(a, b) }, f) }, k = function () { if (!d || a) { if (!d && !h && (!c || +new Date - j > f)) e.apply(this, arguments), c && (j = +new Date); (a || !c) && clearTimeout(d); l(this, arguments) } }; if (b.guid) k.guid = e.guid = e.guid || b.guid++; return k }; b.throttle = i; b.debounce = function (a, b, g, h, c) { return i(a, b, g, h, c, !0) } })(this);

package/routes/admin.js

@@ -390,7 +390,7 @@ router.get(
                 renderForm(backupForm, req.csrfToken()),
                 a(
                   { href: "/admin/auto-backup-list" },
-                  "Restore/download automated backups »"
+                  req.__("Restore/download automated backups »")
                 ),
                 script(
                   domReady(
@@ -406,13 +406,13 @@ router.get(
             contents: div(
               p(
                 i(
-                  "Snapshots store your application structure and definition, without the table data. Individual views and pages can be restored from snapshots from the <a href='/viewedit'>view</a> or <a href='/pageedit'>pages</a> overviews (\"Restore\" from individual page or view dropdowns)."
+                  req.__("Snapshots store your application structure and definition, without the table data. Individual views and pages can be restored from snapshots from the <a href='/viewedit'>view</a> or <a href='/pageedit'>pages</a> overviews (\"Restore\" from individual page or view dropdowns).")
                 )
               ),
               renderForm(aSnapshotForm, req.csrfToken()),
               a(
                 { href: "/admin/snapshot-list" },
-                "List/download snapshots &raquo;"
+                req.__("List/download snapshots &raquo;")
               )
             ),
           },
@@ -472,16 +472,16 @@ router.get(
             title: req.__("Restoring automated backup"),
             contents: div(
               ol(
-                li("Download one of the backups above"),
+                li(req.__("Download one of the backups above")),
                 li(
-                  a({ href: "/admin/clear-all" }, "Clear this application"),
+                  a({ href: "/admin/clear-all" }, req.__("Clear this application")),
                   " ",
-                  "(tick all boxes)"
+                    req.__("(tick all boxes)")
                 ),
                 li(
-                  "When prompted to create the first user, click the link to restore a backup"
+                    req.__("When prompted to create the first user, click the link to restore a backup")
                 ),
-                li("Select the downloaded backup file")
+                li(req.__("Select the downloaded backup file"))
               )
             ),
           },
@@ -551,7 +551,7 @@ router.get(
       mkTable(
         [
           {
-            label: "When",
+            label: req.__("When"),
             key: (r) =>
               `${localeDateTime(r.created)} (${moment(r.created).fromNow()})`,
           },
@@ -618,7 +618,7 @@ const autoBackupForm = (req) =>
     noSubmitButton: true,
     additionalButtons: [
       {
-        label: "Backup now",
+        label: req.__("Backup now"),
         id: "btnBackupNow",
         class: "btn btn-outline-secondary",
         onclick: "ajax_post('/admin/auto-backup-now')",
@@ -671,7 +671,7 @@ const snapshotForm = (req) =>
     noSubmitButton: true,
     additionalButtons: [
       {
-        label: "Snapshot now",
+        label: req.__("Snapshot now"),
         id: "btnSnapNow",
         class: "btn btn-outline-secondary",
         onclick: "ajax_post('/admin/snapshot-now')",
@@ -808,7 +808,6 @@ router.get(
                 " ",
                 req.__("Configuration check")
               ),
-
               hr(),
 
               a(
@@ -945,7 +944,7 @@ router.post(
       });
       child.on("exit", function (code, signal) {
         res.end(
-          `Upgrade done (if it was available) with code ${code}.\n\nPress the BACK button in your browser, then RELOAD the page.`
+          req.__(`Upgrade done (if it was available) with code ${code}.\n\nPress the BACK button in your browser, then RELOAD the page.`)
         );
         setTimeout(() => {
           if (process.send) process.send("RestartServer");
@@ -1193,7 +1192,7 @@ router.get(
   })
 );
 /**
- * /confiuration-check
+ * /configuration-check
  */
 router.get(
   "/configuration-check",
@@ -1576,7 +1575,7 @@ router.post(
             {
               type: "card",
               title: req.__("Build Result"),
-              contents: div("The build was successfully"),
+              contents: div(req.__("The build was successfully")),
             },
             files.length > 0 ? app_files_table(files, req) : "",
           ],
@@ -1588,7 +1587,7 @@ router.post(
               type: "card",
               title: req.__("Build Result"),
               contents: div(
-                "Unable to build the app:",
+                req.__("Unable to build the app:"),
                 pre(code(childOutputs.join("<br/>")))
               ),
             },
@@ -1604,7 +1603,7 @@ router.post(
             type: "card",
             title: req.__("Build Result"),
             contents: div(
-              p("Unable to build the app:"),
+              p(req.__("Unable to build the app:")),
               pre(code(message)),
               pre(code(stack))
             ),

package/routes/api.js

@@ -71,8 +71,8 @@ function accessAllowedRead(req, user, table) {
     req.user && req.user.id
       ? req.user.role_id
       : user && user.role_id
-      ? user.role_id
-      : 10;
+        ? user.role_id
+        : 10;
 
   return role <= table.min_role_read;
 }
@@ -89,8 +89,8 @@ function accessAllowedWrite(req, user, table) {
     req.user && req.user.id
       ? req.user.role_id
       : user && user.role_id
-      ? user.role_id
-      : 10;
+        ? user.role_id
+        : 10;
 
   return role <= table.min_role_write;
 }
@@ -106,8 +106,8 @@ function accessAllowed(req, user, trigger) {
     req.user && req.user.id
       ? req.user.role_id
       : user && user.role_id
-      ? user.role_id
-      : 10;
+        ? user.role_id
+        : 10;
 
   return role <= trigger.min_role;
 }
@@ -247,6 +247,7 @@ router.get(
               fields: tbl_fields,
               approximate: !!approximate,
               state: req_query,
+              table
             });
             rows = await table.getRows(qstate);
           } else {

package/routes/diagram.js

@@ -0,0 +1,59 @@
+const Page = require("@saltcorn/data/models/page");
+const {
+  buildObjectTrees,
+} = require("@saltcorn/data/diagram/node_extract_utils");
+const { generateCyCode } = require("@saltcorn/data/diagram/cy_generate_utils");
+const { getState } = require("@saltcorn/data/db/state");
+const { div, script, domReady } = require("@saltcorn/markup/tags");
+const { isAdmin, error_catcher } = require("./utils.js");
+const Router = require("express-promise-router");
+
+const router = new Router();
+module.exports = router;
+
+router.get(
+  "/",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const modernCfg = getState().getConfig("home_page_by_role");
+    let pages = null;
+    if (modernCfg) {
+      pages = Object.values(modernCfg)
+        .filter((val) => val)
+        .map((val) => Page.findOne({ name: val }));
+    } else {
+      pages = new Array();
+      for (const legacyRole of ["public", "user", "staff", "admin"]) {
+        const page = await Page.findOne({ name: `${legacyRole}_home` });
+        if (page) pages.push(page);
+      }
+    }
+    const cyCode = generateCyCode(await buildObjectTrees(pages));
+    res.sendWrap(
+      {
+        title: req.__(`Application diagram`),
+        headers: [
+          {
+            script:
+              "https://cdnjs.cloudflare.com/ajax/libs/cytoscape/3.22.1/cytoscape.min.js",
+            style: `
+            #cy {
+              width: 100%;
+              height: 900px;
+              display: block;
+          }`,
+          },
+        ],
+      },
+      {
+        above: [
+          {
+            type: "card",
+            title: req.__(`Application diagram`),
+            contents: [div({ id: "cy" }), script(domReady(cyCode))],
+          },
+        ],
+      }
+    );
+  })
+);

package/routes/fields.js

@@ -19,12 +19,13 @@ const {
   expressionValidator,
   get_async_expression_function,
   get_expression_function,
+  freeVariables,
 } = require("@saltcorn/data/models/expression");
 const db = require("@saltcorn/data/db");
 
 const { isAdmin, error_catcher } = require("./utils.js");
 const expressionBlurb = require("../markup/expression_blurb");
-const { readState } = require("@saltcorn/data/plugin-helper");
+const { readState, add_free_variables_to_joinfields } = require("@saltcorn/data/plugin-helper");
 const { wizardCardTitle } = require("../markup/forms.js");
 const FieldRepeat = require("@saltcorn/data/models/fieldrepeat");
 const { applyAsync } = require("@saltcorn/data/utils");
@@ -621,7 +622,11 @@ router.post(
     const { formula, tablename, stored } = req.body;
     const table = await Table.findOne({ name: tablename });
     const fields = await table.getFields();
-    const rows = await table.getRows({}, { orderBy: "RANDOM()", limit: 1 });
+    const freeVars = freeVariables(formula)
+    const joinFields = {}
+    if (stored)
+      add_free_variables_to_joinfields(freeVars, joinFields, fields)
+    const rows = await table.getJoinedRows({ joinFields, orderBy: "RANDOM()", limit: 1 });
     if (rows.length < 1) return "No rows in table";
     let result;
     try {
@@ -661,8 +666,12 @@ router.post(
       return;
     }
     const fields = await table.getFields();
-    const row = { ...req.body };
-    readState(row, fields);
+    let row = { ...req.body };
+    if (!row || Object.keys(row).length === 0) {
+      const { id } = req.query
+      if (id) row = await table.getRow({ id })
+    } else
+      readState(row, fields);
 
     if (fieldName.includes(".")) {
       //join field
@@ -694,7 +703,7 @@ router.post(
             return;
           }
         } else {
-          targetField.type.fieldviews[fieldview];
+          fv = targetField.type.fieldviews[fieldview];
           if (!fv)
             fv =
               targetField.type.fieldviews.show ||
@@ -743,7 +752,9 @@ router.post(
 
     let result;
     try {
-      if (field.stored) {
+      if (!field.calculated) {
+        result = row[field.name]
+      } else if (field.stored) {
         const f = get_async_expression_function(formula, fields);
         result = await f(row);
       } else {
@@ -751,7 +762,9 @@ router.post(
         result = f(row);
       }
       const fv = field.type.fieldviews[fieldview];
-      res.send(fv.run(result));
+      if (!fv)
+        res.send(text(result));
+      else res.send(fv.run(result));
     } catch (e) {
       return res.status(400).send(`Error: ${e.message}`);
     }

package/routes/index.js

@@ -72,6 +72,7 @@ const roleadmin = require("../auth/roleadmin");
 const scapi = require("./scapi");
 const tags = require("./tags");
 const tagentries = require("./tag_entries");
+const dataDiagram = require("./diagram");
 
 module.exports =
   /**
@@ -110,4 +111,5 @@ module.exports =
     app.use("/scapi", scapi);
     app.use("/tag", tags);
     app.use("/tag-entries", tagentries);
+    app.use("/diagram", dataDiagram);
   };

package/routes/pageedit.js

@@ -185,9 +185,8 @@ const pageBuilderData = async (req, context) => {
 const getRootPageForm = (pages, roles, req) => {
   const form = new Form({
     action: "/pageedit/set_root_page",
-    submitLabel: req.__("Save"),
-    submitButtonClass: "btn-outline-primary",
-    onChange: "remove_outline(this)",
+    noSubmitButton: true,
+    onChange: "saveAndContinue(this)",
     blurb: req.__(
       "The root page is the page that is served when the user visits the home location (/). This can be set for each user role."
     ),

package/routes/plugins.js

@@ -455,7 +455,7 @@ const store_actions_dropdown = (req) =>
         {
           class: "dropdown-item",
           href: `/plugins/upgrade`,
-          onClick: `notifyAlert('Upgrading modules...', true)`,
+          onClick: `notifyAlert('${req.__("Upgrading modules...")}', true)`,
         },
         '<i class="far fa-arrow-alt-circle-up"></i>&nbsp;' +
         req.__("Upgrade installed modules")
@@ -551,7 +551,7 @@ router.get(
     const { name } = req.params;
     const plugin = await Plugin.findOne({ name: decodeURIComponent(name) });
     if (!plugin) {
-      req.flash("warning", "Plugin not found");
+      req.flash("warning", req.__("Module not found"));
       res.redirect("/plugins");
       return;
     }
@@ -792,7 +792,7 @@ router.get(
       pkgjson = require(path.join(mod.location, "package.json"));
 
     if (!plugin_db) {
-      req.flash("warning", "Plugin not found");
+      req.flash("warning", "Module not found");
       res.redirect("/plugins");
       return;
     }
@@ -817,7 +817,7 @@ router.get(
         ),
         mod.plugin_module.dependencies
           ? tr(
-            th(req.__("Plugin dependencies")),
+            th(req.__("Module dependencies")),
             td(
               mod.plugin_module.dependencies.map((d) =>
                 span({ class: "badge bg-primary me-1" }, d)
@@ -933,7 +933,7 @@ router.get(
 
     const plugin = await Plugin.findOne({ name });
     await plugin.upgrade_version((p, f) => load_plugins.loadPlugin(p, f));
-    req.flash("success", req.__(`Plugin up-to-date`));
+    req.flash("success", req.__(`Module up-to-date`));
 
     res.redirect(`/plugins/info/${plugin.name}`);
   })
@@ -954,7 +954,7 @@ router.post(
     if (schema !== db.connectObj.default_schema) {
       req.flash(
         "error",
-        req.__(`Only store plugins can be installed on tenant instances`)
+        req.__(`Only store modules can be installed on tenant instances`)
       );
       res.redirect(`/plugins`);
     } else {
@@ -963,12 +963,12 @@ router.post(
           plugin,
           schema === db.connectObj.default_schema || plugin.source === "github"
         );
-        req.flash("success", req.__(`Plugin %s installed`, plugin.name));
+        req.flash("success", req.__(`Module %s installed`, plugin.name));
         res.redirect(`/plugins`);
       } catch (e) {
         req.flash("error", `${e.message}`);
         const form = pluginForm(req, plugin);
-        res.sendWrap(req.__(`Edit Plugin`), renderForm(form, req.csrfToken()));
+        res.sendWrap(req.__(`Edit Module`), renderForm(form, req.csrfToken()));
       }
     }
   })
@@ -988,7 +988,7 @@ router.post(
 
     const plugin = await Plugin.findOne({ name: decodeURIComponent(name) });
     if (!plugin) {
-      req.flash("warning", "Plugin not found");
+      req.flash("warning", "Module not found");
       res.redirect("/plugins");
       return;
     }
@@ -998,11 +998,11 @@ router.post(
       getState().getConfig("development_mode", false)
     ) {
       await plugin.delete();
-      req.flash("success", req.__(`Plugin %s removed.`, plugin.name));
+      req.flash("success", req.__(`Module %s removed.`, plugin.name));
     } else {
       req.flash(
         "error",
-        req.__(`Cannot remove plugin: views %s depend on it`, depviews.join())
+        req.__(`Cannot remove module: views %s depend on it`, depviews.join())
       );
     }
     res.redirect(`/plugins`);
@@ -1025,7 +1025,7 @@ router.post(
     if (!plugin) {
       req.flash(
         "error",
-        req.__(`Plugin %s not found`, text(decodeURIComponent(name)))
+        req.__(`Module %s not found`, text(decodeURIComponent(name)))
       );
       res.redirect(`/plugins`);
       return;
@@ -1034,7 +1034,7 @@ router.post(
     if (!isRoot && plugin.unsafe) {
       req.flash(
         "error",
-        req.__("Cannot install unsafe plugins on subdomain tenants")
+        req.__("Cannot install unsafe modules on subdomain tenants")
       );
       res.redirect(`/plugins`);
       return;
@@ -1047,14 +1047,14 @@ router.post(
       req.flash(
         "success",
         req.__(
-          `Plugin %s installed, please complete configuration.`,
+          `Module %s installed, please complete configuration.`,
           plugin_db.name
         )
       );
       await sleep(1000); // Allow other workers to load this plugin
       res.redirect(`/plugins/configure/${plugin_db.name}`);
     } else {
-      req.flash("success", req.__(`Plugin %s installed`, plugin.name));
+      req.flash("success", req.__(`Module %s installed`, plugin.name));
       res.redirect(`/plugins`);
     }
   })

package/routes/tables.js

@@ -1013,7 +1013,6 @@ router.get(
     const getRole = (rid) => roles.find((r) => r.id === rid).role;
     const mainCard = await tablesList(rows, req);
     const createCard = div(
-      h5(req.__("Create table")),
       a(
         { href: `/table/new`, class: "btn btn-primary mt-1 me-3" },
         i({ class: "fas fa-plus-square me-1" }),
@@ -1029,8 +1028,13 @@ router.get(
       ),
       !db.isSQLite &&
       a(
-        { href: `/table/discover`, class: "btn btn-secondary mt-1" },
+        {
+          href: `/table/discover`,
+          class: "btn btn-secondary mt-1",
+          title: req.__("Discover tables that are already in the Database, but not known to Saltcorn"),
+        },
         i({ class: "fas fa-map-signs me-1" }),
+
         req.__("Discover tables")
       )
     );

package/routes/tag_entries.js

@@ -105,7 +105,7 @@ router.get(
         },
         {
           type: "card",
-          title: `Add entries to tag`,
+          title: req.__(`Add entries to tag`),
           contents: buildForm(
             entry_type,
             tag_id,
@@ -143,7 +143,7 @@ router.post(
     const { entry_type, tag_id } = req.params;
     const { ids } = req.body;
     if (!ids) {
-      req.flash("error", req.__("Please select at least on item"));
+      req.flash("error", req.__("Please select at least one item"));
       return res.redirect(`/tag-entries/add/${entry_type}/${tag_id}`);
     }
     const fieldName = idField(entry_type);

package/routes/tags.js

@@ -6,7 +6,7 @@ const Form = require("@saltcorn/data/models/form");
 const User = require("@saltcorn/data/models/user");
 
 const { isAdmin, error_catcher, csrfField } = require("./utils");
-const { send_admin_page } = require("../markup/admin");
+const { send_infoarch_page } = require("../markup/admin");
 
 const {
   mkTable,
@@ -31,7 +31,7 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     const rows = await Tag.find();
-    send_admin_page({
+    send_infoarch_page({
       res,
       req,
       active_sub: "Tags",
@@ -199,7 +199,7 @@ router.get(
                 href: `/tag-entries/add/pages/${tag.id}`,
                 class: "btn btn-primary",
               },
-              req.__("Add tages")
+              req.__("Add pages")
             ),
           ],
         },
@@ -222,7 +222,7 @@ router.get(
                 href: `/tag-entries/add/trigger/${tag.id}`,
                 class: "btn btn-primary",
               },
-              req.__("Add trigger")
+              req.__("Add triggers")
             ),
           ],
         },

package/tests/page.test.js

@@ -146,6 +146,15 @@ describe("pageedit", () => {
       .send("id=1")
       .expect(toRedirect("/pageedit/"));
   });
+  it("show builder", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/pageedit/edit/a_page")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("<script>builder.renderBuilder"));
+
+  });
 
   it("sets root page", async () => {
     const app = await getApp({ disableCsrf: true });

package/tests/viewedit.test.js

@@ -43,6 +43,22 @@ describe("viewedit edit endpoint", () => {
       .set("Cookie", loginCookie)
       .expect(toInclude("author"));
   });
+  it("show list editor", async () => {
+    const loginCookie = await getAdminLoginCookie();
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .get("/viewedit/config/authorlist")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("author"));
+  });
+  it("show builder", async () => {
+    const loginCookie = await getAdminLoginCookie();
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .get("/viewedit/config/authorshow")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("<script>builder.renderBuilder"));
+  });
 });
 
 describe("viewedit new List", () => {