@saltcorn/server 1.1.4-beta.1 → 1.1.4-beta.11

package/locales/de.json

@@ -1235,7 +1235,7 @@
   "Secondary outline button": "Sekundärer Umrissknopf",
   "Standard": "Standard",
   "X-Small": "X-Klein",
-  "Block": "Block",
+  "Block": "Blockieren",
   "Large block": "Großer Block",
   "Formula for JavaScript object that will be added to state parameters": "Formel für ein JavaScript-Objekt, das zu den Statusparametern hinzugefügt wird.",
   "Alignment": "Ausrichtung",
@@ -1584,5 +1584,23 @@
   "Manage tags...": "Tags verwalten...",
   "Started": "Gestartet",
   "Updated": "Aktualisiert",
-  "Status": "Status"
+  "Status": "Status",
+  "Working directory": "Arbeitsverzeichnis",
+  "Row click event": "Zeilenklick-Ereignis",
+  "What happens when a row is clicked": "Was passiert, wenn eine Zeile angeklickt wird?",
+  "Row click action": "Zeilenklickaktion",
+  "Run this action when row is clicked": "Führe diese Aktion aus, wenn die Zeile angeklickt wird.",
+  "Reset password view": "Passwort-Zurücksetzen-Ansicht",
+  "A view that will be emailed to users when they have forgotten their password": "Eine Ansicht, die an Benutzer gesendet wird, wenn sie ihr Passwort vergessen haben.",
+  "Allow login methods": "Login-Methoden erlauben",
+  "Inherit configuration values": "Konfigurationswerte erben",
+  "Comma-separated list of configuration settings tenants inherit from root. Ex: <code>site_name, smtp_host, allow_signup</code>": "Kommagetrennte Liste von Konfigurationseinstellungen, die Mieter vom Root erben. Bsp.: <code>site_name, smtp_host, allow_signup</code>",
+  "Disable CSRF routes": "CSRF-Routen deaktivieren",
+  "Comma-separated list of relative URL routes where CSRF token checking is disabled. Example: <code>/files/upload, /auth/signup</code>": "Durch Kommas getrennte Liste relativer URL-Routen, bei denen die CSRF-Token-Überprüfung deaktiviert ist. Beispiel: <code>/files/upload, /auth/signup</code>",
+  "Only day": "Nur Tag",
+  "Language CSV": "Sprache CSV",
+  "Upload language CSV": "Sprach-CSV hochladen",
+  "Create an account!": "Erstellen Sie ein Konto!",
+  "Login with %s": "Mit %s anmelden",
+  "Already have an account? Login!": "Bereits ein Konto? Einloggen!"
 }

package/locales/en.json

@@ -1593,5 +1593,16 @@
 	"Comma-separated list of configuration settings tenants inherit from root. Ex: <code>site_name, smtp_host, allow_signup</code>": "Comma-separated list of configuration settings tenants inherit from root. Ex: <code>site_name, smtp_host, allow_signup</code>",
 	"Disable CSRF routes": "Disable CSRF routes",
 	"Comma-separated list of relative URL routes where CSRF token checking is disabled. Example: <code>/files/upload, /auth/signup</code>": "Comma-separated list of relative URL routes where CSRF token checking is disabled. Example: <code>/files/upload, /auth/signup</code>",
-	"Only day": "Only day"
+	"Only day": "Only day",
+	"Language CSV": "Language CSV",
+	"Upload language CSV": "Upload language CSV",
+	"Create an account!": "Create an account!",
+	"Login with %s": "Login with %s",
+	"Already have an account? Login!": "Already have an account? Login!",
+	"Translated %s strings. Click 'Translate with LLM' again to continue": "Translated %s strings. Click 'Translate with LLM' again to continue",
+	"Translate with LLM": "Translate with LLM",
+	"You may need to adjust view relations associated with this table after renaming it": "You may need to adjust view relations associated with this table after renaming it",
+	"Error running workflow": "Error running workflow",
+	"Choose File": "Choose File",
+	"No file chosen": "No file chosen"
 }

package/locales/es.json

@@ -1332,7 +1332,7 @@
   "width": "ancho",
   "height": "altura",
   "innerWidth": "innerWidth",
-  "innerHeight": "innerHeight",
+  "innerHeight": "interiorAlto",
   "Screen info added": "Información de pantalla agregada",
   "Screen info removed": "Información de pantalla eliminada",
   "Edit screen info": "Editar información de pantalla",
@@ -1584,5 +1584,23 @@
   "Manage tags...": "Administrar etiquetas...",
   "Started": "Iniciado",
   "Updated": "Actualizado",
-  "Status": "Estado"
+  "Status": "Estado",
+  "Working directory": "Directorio de trabajo",
+  "Row click event": "Evento de clic en fila",
+  "What happens when a row is clicked": "¿Qué sucede cuando se hace clic en una fila?",
+  "Row click action": "Acción de clic en fila",
+  "Run this action when row is clicked": "Ejecutar esta acción cuando se haga clic en la fila.",
+  "Reset password view": "Vista de restablecimiento de contraseña",
+  "A view that will be emailed to users when they have forgotten their password": "Una vista que se enviará por correo electrónico a los usuarios cuando hayan olvidado su contraseña.",
+  "Allow login methods": "Permitir métodos de inicio de sesión",
+  "Inherit configuration values": "Heredar valores de configuración",
+  "Comma-separated list of configuration settings tenants inherit from root. Ex: <code>site_name, smtp_host, allow_signup</code>": "Lista separada por comas de configuraciones que los inquilinos heredan de la raíz. Ej: <code>site_name, smtp_host, allow_signup</code>",
+  "Disable CSRF routes": "Desactivar rutas CSRF",
+  "Comma-separated list of relative URL routes where CSRF token checking is disabled. Example: <code>/files/upload, /auth/signup</code>": "Lista separada por comas de rutas de URL relativas donde la verificación del token CSRF está deshabilitada. Ejemplo: <code>/files/upload, /auth/signup</code>",
+  "Only day": "Solo día",
+  "Language CSV": "CSV de idioma",
+  "Upload language CSV": "Subir CSV de idiomas",
+  "Create an account!": "¡Crear una cuenta!",
+  "Login with %s": "Iniciar sesión con %s",
+  "Already have an account? Login!": "¿Ya tienes una cuenta? ¡Inicia sesión!"
 }

package/locales/fr.json

@@ -150,7 +150,7 @@
   "Version %s restored": "Version %s restorée",
   "Site name": "Nom du site",
   "Site logo": "Logo du site",
-  "Type": "Type",
+  "Type": "Taper",
   "Text label": "Étiquette de texte",
   "Minimum role": "Rôle minimum",
   "URL": "URL",
@@ -970,7 +970,7 @@
   "Entry point": "Point d'entrée",
   "Platform": "Plateforme",
   "docker": "Docker",
-  "android": "android",
+  "android": "Android",
   "iOS": "iOS",
   "App file": "Fichier d'application",
   "Server URL": "URL du serveur",
@@ -1579,5 +1579,23 @@
   "Manage tags...": "Gérer les étiquettes...",
   "Started": "Commencé",
   "Updated": "Mis à jour",
-  "Status": "Statut"
+  "Status": "Statut",
+  "Working directory": "Répertoire de travail",
+  "Row click event": "Événement de clic sur la ligne",
+  "What happens when a row is clicked": "Que se passe-t-il lorsqu'une ligne est cliquée ?",
+  "Row click action": "Action de clic sur une ligne",
+  "Run this action when row is clicked": "Exécuter cette action lorsque la ligne est cliquée.",
+  "Reset password view": "Vue de réinitialisation du mot de passe",
+  "A view that will be emailed to users when they have forgotten their password": "Une vue qui sera envoyée par e-mail aux utilisateurs lorsqu'ils ont oublié leur mot de passe.",
+  "Allow login methods": "Autoriser les méthodes de connexion",
+  "Inherit configuration values": "Hériter des valeurs de configuration",
+  "Comma-separated list of configuration settings tenants inherit from root. Ex: <code>site_name, smtp_host, allow_signup</code>": "Liste séparée par des virgules des paramètres de configuration que les locataires héritent de la racine. Ex : <code>site_name, smtp_host, allow_signup</code>",
+  "Disable CSRF routes": "Désactiver les routes CSRF",
+  "Comma-separated list of relative URL routes where CSRF token checking is disabled. Example: <code>/files/upload, /auth/signup</code>": "Liste de routes URL relatives séparées par des virgules où la vérification du jeton CSRF est désactivée. Exemple : <code>/files/upload, /auth/signup</code>",
+  "Only day": "Seulement le jour",
+  "Language CSV": "Langage CSV",
+  "Upload language CSV": "Télécharger le fichier CSV de langue",
+  "Create an account!": "Créer un compte !",
+  "Login with %s": "Connectez-vous avec %s",
+  "Already have an account? Login!": "Vous avez déjà un compte ? Connectez-vous !"
 }

package/locales/pl.json

@@ -969,7 +969,7 @@
   "Diagram": "Diagram",
   "Entry point": "Punkt początkowy",
   "Platform": "Platforma",
-  "docker": "docker",
+  "docker": "Docker",
   "android": "Android",
   "iOS": "iOS",
   "App file": "Plik aplikacji",
@@ -1583,12 +1583,22 @@
   "Started": "Rozpoczęto",
   "Updated": "Zaktualizowano",
   "Status": "Status",
-  "Working directory": "Katalog roboczy",  
-  "Row click event": "Zdarzenie kliknięcia w wiersz",  
-  "What happens when a row is clicked": "Co się dzieje po kliknięciu wiersz",  
-  "Row click action": "Akcja po kliknięciu wiersza",  
-  "Run this action when row is clicked": "Wykonaj tę akcję po kliknięciu wiersza",  
-  "Reset password view": "Widok resetowania hasła",  
-  "A view that will be emailed to users when they have forgotten their password": "Widok, który zostanie wysłany e-mailem do użytkowników, gdy zapomną hasła",  
-  "Allow login methods": "Zezwalaj na metody logowania" 
+  "Working directory": "Katalog roboczy",
+  "Row click event": "Zdarzenie kliknięcia w wiersz",
+  "What happens when a row is clicked": "Co się dzieje po kliknięciu wiersz",
+  "Row click action": "Akcja po kliknięciu wiersza",
+  "Run this action when row is clicked": "Wykonaj tę akcję po kliknięciu wiersza",
+  "Reset password view": "Widok resetowania hasła",
+  "A view that will be emailed to users when they have forgotten their password": "Widok, który zostanie wysłany e-mailem do użytkowników, gdy zapomną hasła",
+  "Allow login methods": "Zezwalaj na metody logowania",
+  "Inherit configuration values": "Dziedziczenie wartości konfiguracji",
+  "Comma-separated list of configuration settings tenants inherit from root. Ex: <code>site_name, smtp_host, allow_signup</code>": "Lista ustawień konfiguracyjnych oddzielonych przecinkami, które dzierżawcy dziedziczą z głównego. Przykład: <code>site_name, smtp_host, allow_signup</code>",
+  "Disable CSRF routes": "Wyłącz trasy CSRF",
+  "Comma-separated list of relative URL routes where CSRF token checking is disabled. Example: <code>/files/upload, /auth/signup</code>": "Lista rozdzielona przecinkami względnych tras URL, gdzie sprawdzanie tokena CSRF jest wyłączone. Przykład: <code>/files/upload, /auth/signup</code>",
+  "Only day": "Tylko dzień",
+  "Language CSV": "Język CSV",
+  "Upload language CSV": "Prześlij plik CSV z językiem",
+  "Create an account!": "Utwórz konto!",
+  "Login with %s": "Zaloguj się za pomocą %s",
+  "Already have an account? Login!": "Masz już konto? Zaloguj się!"
 }

package/locales/pt.json

@@ -969,7 +969,7 @@
   "Entry point": "Ponto de entrada",
   "Platform": "Plataforma",
   "docker": "docker",
-  "android": "android",
+  "android": "Android",
   "iOS": "iOS",
   "App file": "Arquivo de aplicativo",
   "Server URL": "URL do servidor",
@@ -1579,5 +1579,23 @@
   "Manage tags...": "Gerenciar etiquetas...",
   "Started": "Iniciado",
   "Updated": "Atualizado",
-  "Status": "Status"
+  "Status": "Estado",
+  "Working directory": "Diretório de trabalho",
+  "Row click event": "Evento de clique na linha",
+  "What happens when a row is clicked": "O que acontece quando uma linha é clicada?",
+  "Row click action": "Ação de clique na linha",
+  "Run this action when row is clicked": "Execute esta ação quando a linha for clicada.",
+  "Reset password view": "Visualização de redefinição de senha",
+  "A view that will be emailed to users when they have forgotten their password": "Uma visualização que será enviada por email aos usuários quando eles esquecerem sua senha.",
+  "Allow login methods": "Permitir métodos de login",
+  "Inherit configuration values": "Herdar valores de configuração",
+  "Comma-separated list of configuration settings tenants inherit from root. Ex: <code>site_name, smtp_host, allow_signup</code>": "Lista separada por vírgulas de configurações que os inquilinos herdam da raiz. Ex: <code>site_name, smtp_host, allow_signup</code>",
+  "Disable CSRF routes": "Desativar rotas CSRF",
+  "Comma-separated list of relative URL routes where CSRF token checking is disabled. Example: <code>/files/upload, /auth/signup</code>": "Lista separada por vírgulas de rotas de URL relativas onde a verificação do token CSRF está desativada. Exemplo: <code>/files/upload, /auth/signup</code>",
+  "Only day": "Apenas dia",
+  "Language CSV": "CSV de Idiomas",
+  "Upload language CSV": "Carregar CSV de idioma",
+  "Create an account!": "Crie uma conta!",
+  "Login with %s": "Entrar com %s",
+  "Already have an account? Login!": "Já tem uma conta? Faça login!"
 }

package/markup/admin.js

@@ -59,6 +59,33 @@ const restore_backup = (csrf, inner, action = `/admin/restore`) =>
     })
   );
 
+const upload_language_pack = (req) =>
+  form(
+    {
+      method: "post",
+      action: "/site-structure/localizer/upload-language-pack",
+      encType: "multipart/form-data",
+    },
+    input({ type: "hidden", name: "_csrf", value: req.csrfToken() }),
+    label(
+      {
+        class: "btn btn-outline-secondary",
+        for: "upload_langpack",
+        style: { cursor: "pointer" },
+      },
+      i({ class: "fas fa-upload me-1" }),
+      req.__("Upload language CSV")
+    ),
+    input({
+      id: "upload_langpack",
+      class: "d-none",
+      name: "file",
+      type: "file",
+      accept: "text/csv",
+      onchange: "this.form.submit();",
+    })
+  );
+
 /**
  * Add Edit Bar
  * @param {object} opts
@@ -648,4 +675,5 @@ module.exports = {
   check_if_restart_required,
   flash_restart,
   send_tags_page,
+  upload_language_pack,
 };

package/markup/expression_blurb.js

@@ -20,7 +20,7 @@ const toJsType = (type) =>
     Date: "Date class",
     String: "string",
     Color: "string",
-  }[type] || type);
+  })[type] || type;
 
 /**
  * @param {string} type
@@ -31,7 +31,9 @@ const toJsType = (type) =>
  */
 const expressionBlurb = (type, stored, table, req) => {
   const allFields = table.fields;
-  const fields = allFields.filter((f) => !f.calculated);
+  const fields = stored
+    ? allFields.filter((f) => !f.stored || f.expression === "__aggregation")
+    : allFields.filter((f) => !f.calculated);
   const funs = getState().functions;
   const funNames = Object.entries(funs)
     .filter(([k, v]) => !(!stored && v.isAsync))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.1.4-beta.1",
+  "version": "1.1.4-beta.11",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
@@ -8,14 +8,14 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.735.0",
     "@dr.pogodin/csurf": "^1.14.1",
-    "@saltcorn/base-plugin": "1.1.4-beta.1",
-    "@saltcorn/builder": "1.1.4-beta.1",
-    "@saltcorn/data": "1.1.4-beta.1",
-    "@saltcorn/admin-models": "1.1.4-beta.1",
-    "@saltcorn/filemanager": "1.1.4-beta.1",
-    "@saltcorn/markup": "1.1.4-beta.1",
-    "@saltcorn/plugins-loader": "1.1.4-beta.1",
-    "@saltcorn/sbadmin2": "1.1.4-beta.1",
+    "@saltcorn/base-plugin": "1.1.4-beta.11",
+    "@saltcorn/builder": "1.1.4-beta.11",
+    "@saltcorn/data": "1.1.4-beta.11",
+    "@saltcorn/admin-models": "1.1.4-beta.11",
+    "@saltcorn/filemanager": "1.1.4-beta.11",
+    "@saltcorn/markup": "1.1.4-beta.11",
+    "@saltcorn/plugins-loader": "1.1.4-beta.11",
+    "@saltcorn/sbadmin2": "1.1.4-beta.11",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.16",
@@ -27,6 +27,7 @@
     "cookie-session": "^2.1.0",
     "cors": "2.8.5",
     "csv-stringify": "^6.5.2",
+    "csvtojson": "^2.0.10",
     "dockerode": "~4.0.4",
     "express": "^5.0.1",
     "express-fileupload": "^1.5.1",

package/public/saltcorn-common.js

@@ -252,7 +252,7 @@ function apply_showif() {
       decodeURIComponent(e.attr("data-fetch-options"))
     );
     if (window._sc_loglevel > 4) console.log("dynwhere", dynwhere);
-    const kvToQs = ([k, v], is_or) => {
+    const kvToQs = ([k, v], is_or, no_blanks) => {
       return k === "or" && Array.isArray(v)
         ? v
             .map((v1) =>
@@ -261,9 +261,28 @@ function apply_showif() {
                 .join("&")
             )
             .join("&")
-        : `${k}=${v[0] === "$" ? rec[v.substring(1)] : v}${
-            is_or ? "&_or_field=" + k : ""
-          }`;
+        : k === "not"
+          ? Object.entries(v)
+              .map((kv) => {
+                const q = kvToQs(kv, false, true);
+                return q ? `_not_${q}` : "";
+              })
+              .join("&")
+          : v[0] === "$" && rec[v.substring(1)] === "" && no_blanks
+            ? ""
+            : typeof v === "object" && v !== null
+              ? Object.entries(v)
+                  .map(([k1, v1]) => {
+                    const q = v1[0] === "$" ? rec[v1.substring(1)] : v1;
+                    return k1 === "equal" || !q
+                      ? ""
+                      : `_${k1}${v.equal ? "e" : ""}_${k}=${q}`;
+                  })
+                  .filter(Boolean)
+                  .join("&")
+              : `${k}=${v[0] === "$" ? rec[v.substring(1)] : v}${
+                  is_or ? "&_or_field=" + k : ""
+                }`;
     };
     const qss = Object.entries(dynwhere.whereParsed).map((kv) => kvToQs(kv));
     if (dynwhere.existingValue) {
@@ -717,6 +736,14 @@ function escapeHtml(text) {
   });
 }
 
+function unescapeHtml(str) {
+  if (!str || !str.replace) return str;
+  return str
+    .replaceAll("&lt;", "<")
+    .replaceAll("&gt;", ">")
+    .replaceAll("&amp;", "&");
+}
+
 function reload_on_init() {
   localStorage.setItem("reload_on_init", true);
 }
@@ -999,7 +1026,8 @@ function initialize_page() {
       );
     }
   });
-  $("[data-inline-edit-dest-url]").click(function () {
+  $("[data-inline-edit-dest-url]").click(function (event) {
+    event.stopPropagation();
     var url = $(this).attr("data-inline-edit-dest-url");
     var current =
       $(this).attr("data-inline-edit-current") ||
@@ -1023,7 +1051,7 @@ function initialize_page() {
           })
         );
         $(this).replaceWith(
-          `<form method="post" action="/field/save-click-edit" onsubmit="inline_ajax_submit_with_fielddata(event, '${opts}')"        
+          `<form method="post" action="/field/save-click-edit" onclick="event.stopPropagation()" onsubmit="inline_ajax_submit_with_fielddata(event, '${opts}')"        
       <input type="hidden" name="_csrf" value="${_sc_globalCsrf}">
       <input type="hidden" name="_fielddata" value="${fielddata}">
       <div class="input-group">
@@ -1105,7 +1133,8 @@ function initialize_page() {
     } else if (is_key) {
       const [tblName, target] = type.replace("Key:", "").split(".");
       doAjaxOptionsFetch(tblName, target);
-    } else
+    } else {
+      const parent = $(this).parent();
       $(this).replaceWith(
         `<form method="post" action="${url}" ${
           ajax
@@ -1135,17 +1164,18 @@ function initialize_page() {
                   : "any"
               }"`
             : ""
-        } name="${key}" ${
-          type === "Bool"
-            ? current
-              ? "checked"
-              : ""
-            : `value="${escapeHtml(current)}"`
-        }>
+        } name="${key}" ${type === "Bool" ? (current ? "checked" : "") : ``}>
       <button type="submit" class="btn btn-sm btn-primary">OK</button>
-      <button onclick="cancel_inline_edit(event, '${opts}')" type="button" class="btn btn-sm btn-danger"><i class="fas fa-times"></i></button>
+      <button onclick="cancel_inline_edit(event, '${opts.replaceAll("'", "\\'")}')" type="button" class="btn btn-sm btn-danger"><i class="fas fa-times"></i></button>
       </form>`
       );
+      if (type !== "Bool") {
+        const newVal = $(this).attr("data-inline-edit-unescape")
+          ? unescapeHtml(current)
+          : current;
+        parent.find(`[name="${key}"]`).val(newVal);
+      }
+    }
   });
   if (!isNode) {
     doMobileTransforms();
@@ -1294,7 +1324,13 @@ function initialize_page() {
       });
     }
   });
-}
+
+  $('input[type="file"].file-has-existing').on("change", (e) => {
+    const $elem = $(e.target);
+    $elem.removeClass("file-has-existing");
+    $elem.parent().find("span.file-upload-exising").remove();
+  });
+} //initialize_page
 
 $(initialize_page);
 
@@ -1769,7 +1805,7 @@ async function common_done(res, viewnameOrElem0, isWeb = true) {
   }
 }
 
-function editAllowedAuthByRole(id, event) {  
+function editAllowedAuthByRole(id, event) {
   ajax_post_json(
     `/roleadmin/setrole_allowed_auth_methods/${id}`,
     {
@@ -2238,7 +2274,7 @@ function handle_identical_fields(event) {
         });
     } else if (tagName === "INPUT") {
       form.querySelectorAll(`input[name="${name}"]`).forEach((input) => {
-        input.value = newValue;
+        if (input.type !== "file") input.value = newValue;
       });
     }
   }

package/public/saltcorn.css

@@ -818,5 +818,15 @@ tr:hover span.add-tag {
 }
 
 #saltcorn-file-manager .filelist tr.selected td {
-  background-color: var(--bs-secondary-bg-subtle, var(--tblr-secondary-bg-subtle, gray));;
+  background-color: var(
+    --bs-secondary-bg-subtle,
+    var(--tblr-secondary-bg-subtle, gray)
+  );
+}
+
+input[type="file"].file-has-existing {
+  font-size: 0;
+}
+::file-selector-button {
+  font-size: initial;
 }

package/public/saltcorn.js

@@ -215,6 +215,7 @@ function pjax_to(href, e) {
         $dest.html(res);
         if (localizer.length) localizer.attr("data-sc-local-state", href);
         initialize_page();
+        document.dispatchEvent(new Event("pjax-loaded"));
       },
       error: function (res) {
         if (!checkNetworkError(res))
@@ -722,9 +723,15 @@ function checkNetworkError(e) {
 }
 
 function ajax_post_btn(e, reload_on_done, reload_delay) {
-  var form = $(e).closest("form");
-  var url = form.attr("action");
-  var form_data = form.serialize();
+  let form_data = "";
+  let url;
+  if (typeof e === "string") url = e;
+  else if (e) {
+    var form = $(e).closest("form");
+    url = form.attr("action");
+    form_data = form.serialize();
+  }
+
   $.ajax(url, {
     type: "POST",
     headers: {