@saltcorn/server 0.8.7-beta.3 → 0.8.7-beta.4

package/auth/admin.js

@@ -55,7 +55,7 @@ module.exports = router;
  */
 const getUserFields = async (req) => {
   const userTable = Table.findOne({ name: "users" });
-  const userFields = (await userTable.getFields()).filter(
+  const userFields = (userTable.getFields()).filter(
     (f) => !f.calculated && f.name !== "id"
   );
   //console.log("userFields:",userFields);
@@ -265,7 +265,7 @@ router.get(
                 class: "form-control",
                 type: "search",
                 "data-filter-table": "table.user-admin",
-                placeholder: "🔍 Search",
+                placeholder: `🔍 ${req.__("Search")}`,
               })
             )
           ),
@@ -280,7 +280,7 @@ router.get(
                 label: "",
                 key: (r) =>
                   r.disabled
-                    ? span({ class: "badge bg-danger" }, "Disabled")
+                    ? span({ class: "badge bg-danger" }, req.__("Disabled"))
                     : "",
               },
               {

package/locales/en.json

@@ -1175,5 +1175,21 @@
 	"App version": "App version",
 	"Forgot password?": "Forgot password?",
 	"Details": "Details",
-	"URL is a formula?": "URL is a formula?"
+	"URL is a formula?": "URL is a formula?",
+	"Receive notifications by:": "Receive notifications by:",
+	"Backup settings": "Backup settings",
+	"Logo image": "Logo image",
+	"Custom code": "Custom code",
+	"Extension store": "Extension store",
+	"Backup file prefix": "Backup file prefix",
+	"Directory for backup files": "Directory for backup files",
+	"Backup File Prefix": "Backup File Prefix",
+	"Search for...": "Search for...",
+	"Every 5 minutes": "Every 5 minutes",
+	"Not scheduled but can be run as an action from a button click": "Not scheduled but can be run as an action from a button click",
+	"Fixed and blocked fields": "Fixed and blocked fields",
+	"Do not allow the following fields to have a value set from the query string or state": "Do not allow the following fields to have a value set from the query string or state",
+	"Action configuration saved": "Action configuration saved",
+	"Prevent any deletion of parent rows": "Prevent any deletion of parent rows",
+	"If the parent row is deleted, set key fields on child rows to null": "If the parent row is deleted, set key fields on child rows to null"
 }

package/locales/ru.json

@@ -164,8 +164,8 @@
 	"Installed": "Установлены",
 	"Refresh": "Обновить",
 	"Upgrade installed plugins": "Обновить установленные плагины",
-	"Add another plugin": "Добавить еще один плагин",
-	"Add another pack": "Добавить еще один пакет",
+	"Add another plugin": "Установить плагин",
+	"Add another pack": "Установить пакет",
 	"Create pack": "Создать пакет",
 	"Pack": "Пакет",
 	"Install": "Установить",
@@ -261,8 +261,8 @@
 	"New field:": "Новое поле:",
 	"Field attributes": "Атрибуты поля",
 	"Field %s created": "Поле %s создано",
-	"Summary field": "Поле итога",
-	"A default value is required when adding required fields to nonempty tables": "Для обязательных полей необходимо определить значение по-умолчанию",
+	"Summary field": "Поле сводки",
+	"A default value is required when adding required fields to nonempty tables": "Значение по умолчанию требуется при добавлении обязательных полей в непустные таблицы",
 	"Create user": "Создать пользователя",
 	"Please create your first user account, which will have administrative privileges. You can add other users and give them administrative privileges later.": "Пожалуйства создайте первого пользователя, который будет обладать правами администратора. Позже вы можете создать остальных пользователей и наделить их правами администратора при необходимости.",
 	"Create first user": "Создать первого пользователя",
@@ -807,9 +807,9 @@
 	"Automated backup": "Автоматическое резервное копирование",
 	"Snapshots": "Снимки (снепшоты)",
 	"Mobile app": "Мобильное приложение",
-	"Module store": "Магазин модулей",
+	"Module store": "Магазин расширений",
 	"Upgrade installed modules": "Обновить установленные модули",
-	"Add another module": "Добавить модуль",
+	"Add another module": "Установить модуль",
 	"Module": "Модуль",
 	"Module installation and control": "Установка и управление модулями",
 	"System logging verbosity": "Уровень логирования системы",
@@ -1004,10 +1004,51 @@
 	"Connected views": "Связанные представления",
 	"Embedded in": "Встроенно в",
 	"Linked from": "Ссылается из",
-	"First user E-mail": "First user E-mail",
+	"First user E-mail": "E-mail первого пользователя",
 	"Table constraints": "Констрейнты таблиц",
 	"Sessions": "Сессии",
 	"Event logs": "Лог событий",
 	"Migrations": "Миграции",
-	"Tag Entries": "Экземпляры тегов"
+	"Tag Entries": "Экземпляры тегов",
+	"Locale identifier short code, e.g. en, zh, fr, ar etc. ": "Короткий код локали, например: en, zh, fr, ar и т.д. ",
+	" with password %s": " с паролем %s",
+	"Import table %s": "Импорт таблицы %s",
+	"Import CSV": "Импорт CSV",
+	"Open": "Открыть",
+	"App name": "Название приложения",
+	"App version": "Версия приложения",
+	"App icon": "Иконка приложения",
+	"Splash Page": "Заставка",
+	"Allow offline mode": "Разрешить режим оффлайн",
+	"URL is a formula?": "Является ли URL формулой?",
+	"In scope:": "В области (In scope):",
+	"Destination page": "Целевая страница",
+	"Include in full-text search": "Включить в полнотекстовый поиск",
+	"The field that will be shown to the user when choosing a value": "Данное поле будет показано пользователю при выборе значения из связанной таблицы",
+	"On delete": "При удалении",
+	"If the parent row is deleted, do this to the child rows.": "В случае удаления родительской записи, выполнить указанное действие для дочерних записей.",
+	"Set a default value for missing data": "Установить значение для недостающих данных",
+	"Prevent any deletion of parent rows": "Запретить удаление родительских строк",
+	"If the parent row is deleted, automatically delete the child rows.": "При удалении родительской записи автоматически удалять дочерние записи.",
+	"If the parent row is deleted, set key fields on child rows to null": "При удалении родительской записи установить ключевые поля в null для дочерних записей",
+	"Every 5 minutes": "Каждые 5 минут",
+	"Not scheduled but can be run as an action from a button click": "Не запланировано, но может быть запущено по кнопке",
+	"Action configuration saved": "Конфигурация действия сохранена",
+	"Action information saved": "Информация о действии сохранена",
+	"JavaScript code:": "JavaScript code:",
+	"code here": "ваш программный код",
+	"No notifications": "Нет уведомлений",
+	"Receive notifications by:": "Receive notifications by:",
+	"Backup file prefix": "Префикс имени файлов backup",
+	"Directory for backup files": "Папка для файлов backup",
+	"Backup File Prefix": "Префикс имени файлов backup",
+	"Module %s installed": "Модуль %s установлен",
+	"View patterns": "Паттерны представления",
+	"%s module information": "Информация о модуле %s",
+	"Search for...": "Поиск...",
+	"Modules up-to-date. Please restart server": "Модули актуальны. Пожалуйста рестартуйте сервер",
+	"Logo image": "Логотип сайта",
+	"Custom code": "Пользовательский код",
+	"Extension store": "Магазин расширений",
+	"Progressive Web Application": "Прогрессивное веб-приложение (PWA)"
 }

package/markup/admin.js

@@ -402,7 +402,7 @@ const config_fields_form = async ({
     if (typeof name0 === "object" && name0.section_header) {
       fields.push({
         input_type: "section_header",
-        label: name0.section_header,
+        label: req.__(name0.section_header),
       });
       continue;
     }

package/markup/forms.js

@@ -63,10 +63,16 @@ const fileUploadForm = (req, folder) => {
       name: "file",
       class: "form-control ms-1 w-unset d-inline",
       type: "file",
-      onchange: "form.submit()",
+      onchange: "handle_upload_file_change(form)",
       multiple: true,
     }),
-    folder && input({ type: "hidden", name: "folder", value: folder })
+    folder &&
+      input({
+        id: "uploadFolderInpId",
+        type: "hidden",
+        name: "folder",
+        value: folder,
+      })
   );
   return frm;
 };

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.8.7-beta.3",
+  "version": "0.8.7-beta.4",
   "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.7-beta.3",
-    "@saltcorn/builder": "0.8.7-beta.3",
-    "@saltcorn/data": "0.8.7-beta.3",
-    "@saltcorn/admin-models": "0.8.7-beta.3",
-    "@saltcorn/filemanager": "0.8.7-beta.3",
-    "@saltcorn/markup": "0.8.7-beta.3",
-    "@saltcorn/sbadmin2": "0.8.7-beta.3",
+    "@saltcorn/base-plugin": "0.8.7-beta.4",
+    "@saltcorn/builder": "0.8.7-beta.4",
+    "@saltcorn/data": "0.8.7-beta.4",
+    "@saltcorn/admin-models": "0.8.7-beta.4",
+    "@saltcorn/filemanager": "0.8.7-beta.4",
+    "@saltcorn/markup": "0.8.7-beta.4",
+    "@saltcorn/sbadmin2": "0.8.7-beta.4",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn-common.js

@@ -143,6 +143,13 @@ function apply_showif() {
         } value="${value}">${label}</option>`;
         e.append($(html));
       });
+      //TODO: also sort inserted HTML options
+      dataOptions.sort((a, b) =>
+        (a.text?.toLowerCase?.() || a.text) >
+        (b.text?.toLowerCase?.() || b.text)
+          ? 1
+          : -1
+      );
       element.dispatchEvent(new Event("RefreshSelectOptions"));
       if (e.hasClass("selectized") && $().selectize) {
         e.selectize()[0].selectize.clearOptions(true);
@@ -841,6 +848,10 @@ function notifyAlert(note, spin) {
 </div>`);
 }
 
+function emptyAlerts() {
+  $("#alerts-area").html("");
+}
+
 function press_store_button(clicked) {
   const width = $(clicked).width();
   $(clicked).html('<i class="fas fa-spinner fa-spin"></i>').width(width);

package/public/saltcorn.js

@@ -51,13 +51,13 @@ function removeQueryStringParameter(uri1, key) {
     uri = uris[0];
   }
 
-  var re = new RegExp("([?&])" + key + "=.*?(&|$)", "i");
-  var separator = uri.indexOf("?") !== -1 ? "&" : "?";
+  var re = new RegExp("([?&])" + key + "=.*?(&|$)", "gi");
   if (uri.match(re)) {
     uri = uri.replace(re, "$1" + "$2");
   }
   if (uri[uri.length - 1] === "?" || uri[uri.length - 1] === "&")
     uri = uri.substring(0, uri.length - 1);
+  if (uri.match(re)) return removeQueryStringParameter(uri + hash, key);
   return uri + hash;
 }
 
@@ -561,6 +561,22 @@ function create_new_folder(folder) {
     });
 }
 
+function handle_upload_file_change(form) {
+  const url = new URL(window.location);
+  const dir = url.searchParams.get("dir");
+  if (dir !== null) $("#uploadFolderInpId").val(dir);
+  const jqForm = $(form);
+  const sortBy = url.searchParams.get("sortBy");
+  if (sortBy) {
+    jqForm.append(`<input type="hidden" name="sortBy" value="${sortBy}" />`);
+  }
+  const sortDesc = url.searchParams.get("sortDesc");
+  if (sortDesc === "on") {
+    jqForm.append('<input type="hidden" name="sortDesc" value="on" />');
+  }
+  form.submit();
+}
+
 async function fill_formula_btn_click(btn, k) {
   const formula = decodeURIComponent($(btn).attr("data-formula"));
   const free_vars = JSON.parse(

package/routes/actions.js

@@ -173,9 +173,9 @@ const triggerForm = async (req, trigger) => {
         sublabel: req.__("Event type which runs the trigger"),
         attributes: {
           explainers: {
-            Often: "Every 5 minutes",
+            Often: req.__("Every 5 minutes"),
             Never:
-              "Not scheduled but can be run as an action from a button click",
+              req.__("Not scheduled but can be run as an action from a button click"),
           },
         },
       },
@@ -358,7 +358,7 @@ router.post(
       });
     } else {
       await Trigger.update(trigger.id, form.values); //{configuration: form.values});
-      req.flash("success", "Action information saved");
+      req.flash("success", req.__("Action information saved"));
       res.redirect(`/actions/`);
     }
   })
@@ -443,13 +443,13 @@ router.get(
                       )
                     )
                   ),
-                  h6({ class: "mt-1" }, "JavaScript code:"),
+                  h6({ class: "mt-1" }, req.__("JavaScript code:")),
                   div(
                     { class: "mt-1" },
 
                     pre(
                       { class: "js-code-display" },
-                      code({ id: "blockly_js_output" }, "code here")
+                      code({ id: "blockly_js_output" }, req.__("code here"))
                     )
                   ),
                 ],
@@ -538,7 +538,7 @@ router.post(
         res.json({ success: "ok" });
         return;
       }
-      req.flash("success", "Action configuration saved");
+      req.flash("success", req.__("Action configuration saved"));
       res.redirect(
         req.query.on_done_redirect &&
           is_relative_url(req.query.on_done_redirect)

package/routes/admin.js

@@ -249,6 +249,11 @@ router.get(
   "/backup",
   isAdmin,
   error_catcher(async (req, res) => {
+    //
+    const aBackupFilePrefixForm = backupFilePrefixForm(req);
+    aBackupFilePrefixForm.values.backup_file_prefix =
+      getState().getConfig("backup_file_prefix");
+    //
     const backupForm = autoBackupForm(req);
     backupForm.values.auto_backup_frequency = getState().getConfig(
       "auto_backup_frequency"
@@ -262,11 +267,13 @@ router.get(
     backupForm.values.auto_backup_expire_days = getState().getConfig(
       "auto_backup_expire_days"
     );
+    //
     const aSnapshotForm = snapshotForm(req);
     aSnapshotForm.values.snapshots_enabled =
       getState().getConfig("snapshots_enabled");
+    //
     const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
-
+    //
     send_admin_page({
       res,
       req,
@@ -367,6 +374,12 @@ router.get(
               )
             ),
           },
+          {
+            type: "card",
+            title: req.__("Backup settings"),
+            titleAjaxIndicator: true,
+            contents: div(renderForm(aBackupFilePrefixForm, req.csrfToken())),
+          },
         ],
       },
     });
@@ -388,10 +401,17 @@ router.get(
       return;
     }
     const auto_backup_directory = getState().getConfig("auto_backup_directory");
-    const fileNms = await fs.promises.readdir(auto_backup_directory);
+
+    const backup_file_prefix = getState().getConfig("backup_file_prefix");
+
+    const fileNms = auto_backup_directory
+      ? await fs.promises.readdir(auto_backup_directory)
+      : [];
+
     const backupFiles = fileNms.filter(
-      (fnm) => fnm.startsWith("sc-backup") && fnm.endsWith(".zip")
+      (fnm) => fnm.startsWith(backup_file_prefix) && fnm.endsWith(".zip")
     );
+
     send_admin_page({
       res,
       req,
@@ -402,20 +422,22 @@ router.get(
             type: "card",
             title: req.__("Download automated backup"),
             contents: div(
-              ul(
-                backupFiles.map((fnm) =>
-                  li(
-                    a(
-                      {
-                        href: `/admin/auto-backup-download/${encodeURIComponent(
+              backupFiles.length > 0
+                ? ul(
+                    backupFiles.map((fnm) =>
+                      li(
+                        a(
+                          {
+                            href: `/admin/auto-backup-download/${encodeURIComponent(
+                              fnm
+                            )}`,
+                          },
                           fnm
-                        )}`,
-                      },
-                      fnm
+                        )
+                      )
                     )
                   )
-                )
-              )
+                : p(req.__("No files"))
             ),
           },
           {
@@ -465,23 +487,25 @@ router.get(
             type: "card",
             title: req.__("Download snapshots"),
             contents: div(
-              ul(
-                snaps.map((snap) =>
-                  li(
-                    a(
-                      {
-                        href: `/admin/snapshot-download/${encodeURIComponent(
-                          snap.id
-                        )}`,
-                        target: "_blank",
-                      },
-                      `${localeDateTime(snap.created)} (${moment(
-                        snap.created
-                      ).fromNow()})`
+              snaps.length > 0
+                ? ul(
+                    snaps.map((snap) =>
+                      li(
+                        a(
+                          {
+                            href: `/admin/snapshot-download/${encodeURIComponent(
+                              snap.id
+                            )}`,
+                            target: "_blank",
+                          },
+                          `${localeDateTime(snap.created)} (${moment(
+                            snap.created
+                          ).fromNow()})`
+                        )
+                      )
                     )
                   )
-                )
-              )
+                : p(req.__("No files"))
             ),
           },
         ],
@@ -588,9 +612,10 @@ router.get(
   error_catcher(async (req, res) => {
     const { filename } = req.params;
     const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
+    const backup_file_prefix = getState().getConfig("backup_file_prefix");
     if (
       !isRoot ||
-      !(filename.startsWith("sc-backup") && filename.endsWith(".zip"))
+      !(filename.startsWith(backup_file_prefix) && filename.endsWith(".zip"))
     ) {
       res.redirect("/admin/backup");
       return;
@@ -600,6 +625,27 @@ router.get(
   })
 );
 
+/**
+ * Set Backup File Prefix Form
+ * @param req
+ * @returns {Form}
+ */
+const backupFilePrefixForm = (req) =>
+  new Form({
+    action: "/admin/set-backup-prefix",
+    onChange: `saveAndContinue(this);`,
+    noSubmitButton: true,
+    fields: [
+      {
+        type: "String",
+        label: req.__("Backup file prefix"),
+        name: "backup_file_prefix",
+        sublabel: req.__("Backup file prefix"),
+        default: "sc-backup-",
+      },
+    ],
+  });
+
 /**
  * Auto backup Form
  * @param {object} req
@@ -638,9 +684,10 @@ const autoBackupForm = (req) =>
         type: "String",
         label: req.__("Directory"),
         name: "auto_backup_directory",
+        sublabel: req.__("Directory for backup files"),
         showIf: {
           auto_backup_frequency: ["Daily", "Weekly"],
-          auto_backup_destination: "Local directory",
+          //auto_backup_destination: "Local directory",
         },
       },
       {
@@ -658,6 +705,11 @@ const autoBackupForm = (req) =>
     ],
   });
 
+/**
+ * Snapshot Form
+ * @param req
+ * @returns {Form}
+ */
 const snapshotForm = (req) =>
   new Form({
     action: "/admin/set-snapshot",
@@ -682,6 +734,9 @@ const snapshotForm = (req) =>
       },
     ],
   });
+/**
+ * Do Set snapshot
+ */
 router.post(
   "/set-snapshot",
   isAdmin,
@@ -697,6 +752,38 @@ router.post(
     } else res.json({ success: "ok" });
   })
 );
+/**
+ * Do Set Backup Prefix
+ */
+router.post(
+  "/set-backup-prefix",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const form = await backupFilePrefixForm(req);
+    form.validate(req.body);
+    if (form.hasErrors) {
+      send_admin_page({
+        res,
+        req,
+        active_sub: "Backup",
+        contents: {
+          type: "card",
+          title: req.__("Backup settings"),
+          contents: [renderForm(form, req.csrfToken())],
+        },
+      });
+    } else {
+      await save_config_from_form(form);
+      if (!req.xhr) {
+        req.flash("success", req.__("Backup settings updated"));
+        res.redirect("/admin/backup");
+      } else res.json({ success: "ok" });
+    }
+  })
+);
+/**
+ * Do Set auto backup
+ */
 router.post(
   "/set-auto-backup",
   isAdmin,
@@ -723,6 +810,9 @@ router.post(
     }
   })
 );
+/**
+ * Do Auto backup now
+ */
 router.post(
   "/auto-backup-now",
   isAdmin,
@@ -737,7 +827,9 @@ router.post(
     res.json({ reload_page: true });
   })
 );
-
+/**
+ * Do Snapshot now
+ */
 router.post(
   "/snapshot-now",
   isAdmin,
@@ -755,6 +847,7 @@ router.post(
 );
 
 /**
+ * Show System page
  * @name get/system
  * @function
  * @memberof module:routes/admin~routes/adminRouter
@@ -948,6 +1041,7 @@ router.get(
 );
 
 /**
+ * Do Restart
  * @name post/restart
  * @function
  * @memberof module:routes/admin~routes/adminRouter
@@ -972,6 +1066,7 @@ router.post(
 );
 
 /**
+ * Do Upgrade
  * @name post/upgrade
  * @function
  * @memberof module:routes/admin~routes/adminRouter
@@ -1013,7 +1108,7 @@ router.post(
   })
 );
 /**
- * /check-for-updates
+ * Do Check for Update
  */
 router.post(
   "/check-for-upgrade",
@@ -1025,6 +1120,7 @@ router.post(
   })
 );
 /**
+ * Do Manual Backup
  * @name post/backup
  * @function
  * @memberof module:routes/admin~routes/adminRouter
@@ -1045,6 +1141,7 @@ router.post(
 );
 
 /**
+ * Do Restore from Backup
  * @name post/restore
  * @function
  * @memberof module:routes/admin~routes/adminRouter
@@ -1143,6 +1240,7 @@ const clearAllForm = (req) =>
   });
 
 /**
+ * Do Enable letsencrypt
  * @name post/enable-letsencrypt
  * @function
  * @memberof module:routes/admin~routes/adminRouter
@@ -1222,6 +1320,7 @@ router.post(
 );
 
 /**
+ * Do Clear All
  * @name get/clear-all
  * @function
  * @memberof module:routes/admin~routes/adminRouter
@@ -1250,7 +1349,7 @@ router.get(
   })
 );
 /**
- * /configuration-check
+ * Do Configuration Check
  */
 router.get(
   "/configuration-check",
@@ -1337,7 +1436,6 @@ router.get(
     });
   })
 );
-
 const buildDialogScript = () => {
   return `<script>
   function swapEntryInputs(activeTab, activeInput, disabledTab, disabledInput) {
@@ -1760,7 +1858,9 @@ router.get(
     });
   })
 );
-
+/**
+ * Do Build Mobile App
+ */
 router.post(
   "/build-mobile-app",
   isAdmin,
@@ -1788,7 +1888,7 @@ router.post(
         error: req.__("Only the android build supports docker."),
       });
     }
-    if (!serverURL || serverURL.length == 0) {
+    if (!serverURL || serverURL.length === 0) {
       serverURL = getState().getConfig("base_url") || "";
     }
     if (!serverURL.startsWith("http")) {
@@ -1888,8 +1988,7 @@ router.post(
 );
 
 /**
- * Clear all
- * @name post/clear-all
+ * Do Clear All
  * @function
  * @memberof module:routes/admin~routes/adminRouter
  */
@@ -2012,7 +2111,9 @@ router.post(
     }
   })
 );
-
+/**
+ * Dev / Admin
+ */
 admin_config_route({
   router,
   path: "/dev",
@@ -2051,7 +2152,9 @@ admin_config_route({
     });
   },
 });
-
+/**
+ * Notifications
+ */
 admin_config_route({
   router,
   path: "/notifications",

package/routes/fields.js

@@ -454,11 +454,11 @@ const fieldFlow = (req) =>
                 required: true,
                 attributes: {
                   explainers: {
-                    Fail: "Prevent any deletion of parent rows",
+                    Fail: req.__("Prevent any deletion of parent rows"),
                     Cascade:
-                      "If the parent row is deleted, automatically delete the child rows.",
+                        req.__("If the parent row is deleted, automatically delete the child rows."),
                     "Set null":
-                      "If the parent row is deleted, set key fields on child rows to null",
+                        req.__("If the parent row is deleted, set key fields on child rows to null"),
                   },
                 },
                 sublabel: req.__(

package/routes/files.js

@@ -69,9 +69,12 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     // todo limit select from file by 10 or 20
-    const { dir } = req.query;
+    const { dir, search } = req.query;
     const safeDir = File.normalise(dir || "/");
-    const rows = await File.find({ folder: dir }, { orderBy: "filename" });
+    const rows = await File.find(
+      { folder: dir, search },
+      { orderBy: "filename" }
+    );
     const roles = await User.get_roles();
     if (safeDir && safeDir !== "/" && safeDir !== ".") {
       let dirname = path.dirname(safeDir);
@@ -383,7 +386,7 @@ router.post(
   "/upload",
   setTenant,
   error_catcher(async (req, res) => {
-    let { folder } = req.body;
+    let { folder, sortBy, sortDesc } = req.body;
     let jsonResp = {};
     const min_role_upload = getState().getConfig("min_role_upload", 1);
     const role = req.user && req.user.id ? req.user.role_id : 100;
@@ -404,16 +407,11 @@ router.post(
       );
       const many = Array.isArray(f);
       file_for_redirect = many ? f[0] : f;
-      if (!req.xhr)
-        req.flash(
-          "success",
-          req.__(
-            `File %s uploaded`,
-            many
-              ? f.map((fl) => text(fl.filename)).join(", ")
-              : text(f.filename)
-          )
-        );
+      const successMsg = req.__(
+        `File %s uploaded`,
+        many ? f.map((fl) => text(fl.filename)).join(", ") : text(f.filename)
+      );
+      if (!req.xhr) req.flash("success", successMsg);
       else
         jsonResp = {
           success: {
@@ -422,16 +420,18 @@ router.post(
             url: many
               ? f.map((fl) => `/files/serve/${fl.path_to_serve}`)
               : `/files/serve/${f.path_to_serve}`,
+            msg: successMsg,
           },
         };
     }
-    if (!req.xhr)
-      res.redirect(
-        !file_for_redirect
-          ? "/files"
-          : `/files?dir=${encodeURIComponent(file_for_redirect.current_folder)}`
-      );
-    else res.json(jsonResp);
+    if (!req.xhr) {
+      const sp = new URLSearchParams();
+      if (file_for_redirect) sp.append("dir", file_for_redirect.current_folder);
+      if (sortBy) sp.append("sortBy", sortBy);
+      if (sortDesc) sp.append("sortDesc", sortDesc);
+      const query = sp.toString();
+      res.redirect(`/files${query ? `?${query}` : ""}`);
+    } else res.json(jsonResp);
   })
 );
 
@@ -449,7 +449,7 @@ router.post(
     const { redirect } = req.query;
     const f = await File.findOne(serve_path);
     if (!f) {
-      req.flash("error", "File not found");
+      req.flash("error", req.__("File not found"));
       res.redirect("/files");
       return;
     }

package/routes/notifications.js

@@ -70,7 +70,7 @@ router.get(
             {
               type: "card",
               contents: [
-                "Receive notifications by:",
+                req.__("Receive notifications by:"),
                 renderForm(notificationSettingsForm(), req.csrfToken()),
               ],
             },

package/routes/plugins.js

@@ -526,7 +526,8 @@ const plugin_store_html = (items, req) => {
         contents: div(
           { class: "d-flex justify-content-between" },
           storeNavPills(req),
-          div(search_bar("q", req.query.q || "", { stateField: "q" })),
+          div(search_bar("q", req.query.q || "",
+              { placeHolder: req.__("Search for..."), stateField: "q" })),
           div(store_actions_dropdown(req))
         ),
       },
@@ -825,7 +826,7 @@ router.get(
       pkgjson = require(path.join(mod.location, "package.json"));
 
     if (!plugin_db) {
-      req.flash("warning", "Module not found");
+      req.flash("warning", req.__("Module not found"));
       res.redirect("/plugins");
       return;
     }
@@ -1035,7 +1036,7 @@ router.post(
 
     const plugin = await Plugin.findOne({ name: decodeURIComponent(name) });
     if (!plugin) {
-      req.flash("warning", "Module not found");
+      req.flash("warning", req.__("Module not found"));
       res.redirect("/plugins");
       return;
     }

package/routes/tables.js

@@ -1135,7 +1135,7 @@ router.get(
   error_catcher(async (req, res) => {
     const { name } = req.params;
     const table = Table.findOne({ name });
-    const rows = await table.getRows({}, { orderBy: "id", orderDesc: true });
+    const rows = await table.getRows({}, { orderBy: "id" });
     res.setHeader("Content-Type", "text/csv");
     res.setHeader("Content-Disposition", `attachment; filename="${name}.csv"`);
     res.setHeader("Cache-Control", "no-cache");

package/tests/clientjs.test.js

@@ -34,6 +34,9 @@ test("updateQueryStringParameter", () => {
   expect(removeQueryStringParameter("/foo?name=Bar&age=45", "age")).toBe(
     "/foo?name=Bar"
   );
+  expect(
+    removeQueryStringParameter("/foo?name=Baz&name=Foo&age=45", "name")
+  ).not.toContain("name");
   expect(
     updateQueryStringParameter("/foo", "publisher.publisher->name", "AK")
   ).toBe("/foo?publisher.publisher->name=AK");

package/tests/files.test.js

@@ -7,9 +7,9 @@ const {
   itShouldRedirectUnauthToLogin,
   toInclude,
   toSucceed,
-  toNotInclude,
   resetToFixtures,
   toSucceedWithImage,
+  respondJsonWith,
 } = require("../auth/testhelp");
 const db = require("@saltcorn/data/db");
 const fs = require("fs").promises;
@@ -18,7 +18,17 @@ const File = require("@saltcorn/data/models/file");
 const Field = require("@saltcorn/data/models/field");
 const Table = require("@saltcorn/data/models/table");
 const View = require("@saltcorn/data/models/view");
-const { table } = require("console");
+const { existsSync } = require("fs");
+
+const createTestFile = async (folder, name, mimetype, content) => {
+  if (
+    !existsSync(
+      path.join(db.connectObj.file_store, db.getTenantSchema(), folder, name)
+    )
+  ) {
+    await File.from_contents(name, mimetype, content, 1, 100, folder);
+  }
+};
 
 beforeAll(async () => {
   await resetToFixtures();
@@ -47,6 +57,33 @@ beforeAll(async () => {
     1,
     100
   );
+
+  await File.new_folder(path.join("_sc_test_subfolder_one", "subsubfolder"));
+  await createTestFile(
+    "_sc_test_subfolder_one",
+    "foo_image.png",
+    "image/png",
+    "imagecontent"
+  );
+  await createTestFile(
+    "_sc_test_subfolder_one",
+    "bar_image.png",
+    "image/png",
+    "imagecontent"
+  );
+  await createTestFile(
+    path.join("_sc_test_subfolder_one", "subsubfolder"),
+    "bar_image.png",
+    "image/png",
+    "imagecontent"
+  );
+  await File.new_folder("_sc_test_subfolder_two");
+  await createTestFile(
+    "_sc_test_subfolder_two",
+    "foo_image.png",
+    "image/png",
+    "imagecontent"
+  );
 });
 afterAll(db.close);
 
@@ -146,6 +183,90 @@ describe("files admin", () => {
 
       .expect(toRedirect("/files?dir=."));
   });
+  it("search files by name", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    const checkFiles = (files, expecteds) =>
+      files.length === expecteds.length &&
+      expecteds.every(({ filename, location }) =>
+        files.find(
+          (file) => file.filename === filename && file.location === location
+        )
+      );
+    const searchTestHelper = async (dir, search, expected) => {
+      await request(app)
+        .get("/files")
+        .query({ dir, search })
+        .set("X-Requested-With", "XMLHttpRequest")
+        .set("Cookie", loginCookie)
+        .expect(
+          respondJsonWith(200, (data) => checkFiles(data.files, expected))
+        );
+    };
+
+    await searchTestHelper("/", "foo", [
+      {
+        filename: "foo_image.png",
+        location: path.join("_sc_test_subfolder_one", "foo_image.png"),
+      },
+      {
+        filename: "foo_image.png",
+        location: path.join("_sc_test_subfolder_two", "foo_image.png"),
+      },
+    ]);
+    await searchTestHelper("_sc_test_subfolder_two", "foo", [
+      {
+        filename: "foo_image.png",
+        location: path.join("_sc_test_subfolder_two", "foo_image.png"),
+      },
+      {
+        filename: "..",
+        location: "",
+      },
+    ]);
+    await searchTestHelper("/", "bar", [
+      {
+        filename: "bar_image.png",
+        location: path.join("_sc_test_subfolder_one", "bar_image.png"),
+      },
+      {
+        filename: "bar_image.png",
+        location: path.join(
+          "_sc_test_subfolder_one",
+          "subsubfolder",
+          "bar_image.png"
+        ),
+      },
+    ]);
+    await searchTestHelper(
+      path.join("_sc_test_subfolder_one", "subsubfolder"),
+      "foo",
+      [
+        {
+          filename: "..",
+          location: "_sc_test_subfolder_one",
+        },
+      ]
+    );
+    await searchTestHelper(
+      path.join("_sc_test_subfolder_one", "subsubfolder"),
+      "bar",
+      [
+        {
+          filename: "..",
+          location: "_sc_test_subfolder_one",
+        },
+        {
+          filename: "bar_image.png",
+          location: path.join(
+            "_sc_test_subfolder_one",
+            "subsubfolder",
+            "bar_image.png"
+          ),
+        },
+      ]
+    );
+  });
 });
 describe("files edit", () => {
   it("creates table and view", async () => {