@saltcorn/server 0.8.5-beta.3 → 0.8.5-beta.5

package/auth/admin.js

@@ -23,7 +23,16 @@ const {
 const { isAdmin, error_catcher } = require("../routes/utils");
 const { send_reset_email } = require("./resetpw");
 const { getState } = require("@saltcorn/data/db/state");
-const { a, div, span, code, h5, i, p } = require("@saltcorn/markup/tags");
+const {
+  a,
+  div,
+  span,
+  code,
+  h5,
+  i,
+  p,
+  input,
+} = require("@saltcorn/markup/tags");
 const Table = require("@saltcorn/data/models/table");
 const {
   send_users_page,
@@ -243,6 +252,18 @@ router.get(
         type: "card",
         title: req.__("Users"),
         contents: [
+          div(
+            { class: "row mb-3" },
+            div(
+              { class: "col-sm-6 offset-sm-3" },
+              input({
+                class: "form-control",
+                type: "search",
+                "data-filter-table": "table.user-admin",
+                placeholder: "🔍 Search",
+              })
+            )
+          ),
           mkTable(
             [
               { label: req.__("ID"), key: "id" },
@@ -273,7 +294,7 @@ router.get(
               },
             ],
             users,
-            { hover: true }
+            { hover: true, class: "user-admin" }
           ),
           link(`/useradmin/new`, req.__("Create user")),
         ],

package/auth/testhelp.js

@@ -128,6 +128,20 @@ const getStaffLoginCookie = async () => {
   return resToLoginCookie(res);
 };
 
+/**
+ *
+ * @returns {Promise<void>}
+ */
+const getUserLoginCookie = async () => {
+  const app = await getApp({ disableCsrf: true });
+  const res = await request(app)
+    .post("/auth/login/")
+    .send("email=user@foo.com")
+    .send("password=GFeggwrwq45fjn");
+  if (res.statusCode !== 302) console.log(res.text);
+  return resToLoginCookie(res);
+};
+
 /**
  *
  * @returns {Promise<void>}
@@ -235,6 +249,7 @@ const notAuthorized = (res) => {
 module.exports = {
   getStaffLoginCookie,
   getAdminLoginCookie,
+  getUserLoginCookie,
   itShouldRedirectUnauthToLogin,
   toRedirect,
   toInclude,

package/locales/da.json

@@ -704,5 +704,7 @@
 	"Tables organise data by fields and rows.": "Tables organise data by fields and rows.",
 	"Views display data from tables. A view is a view pattern applied to a table, with configuration.": "Views display data from tables. A view is a view pattern applied to a table, with configuration.",
 	"No views": "No views",
-	"No pages": "No pages"
+	"No pages": "No pages",
+	"Welcome to Saltcorn!": "Welcome to Saltcorn!",
+	"Notifications": "Notifications"
 }

package/locales/en.json

@@ -1119,5 +1119,30 @@
 	"Choose the field to be indexed. This make searching the table faster.": "Choose the field to be indexed. This make searching the table faster.",
 	"Disk usage": "Disk usage",
 	"CPU usage": "CPU usage",
-	"Mem usage": "Mem usage"
+	"Mem usage": "Mem usage",
+	"The field that will be shown to the user when choosing a value": "The field that will be shown to the user when choosing a value",
+	"String value must match regular expression": "String value must match regular expression",
+	"Modules up-to-date. Please restart server": "Modules up-to-date. Please restart server",
+	"Install git plugins": "Install git plugins",
+	"Set available npm modules": "Set available npm modules",
+	"Only store modules can be installed on tenant instances": "Only store modules can be installed on tenant instances",
+	"Unsafe modules": "Unsafe modules",
+	"Notifications": "Notifications",
+	"No notifications": "No notifications",
+	"In user menu": "In user menu",
+	"Show notifications in the user menu": "Show notifications in the user menu",
+	"Notification settings": "Notification settings",
+	"PWA": "PWA",
+	"Progressive Web Application": "Progressive Web Application",
+	"Display": "Display",
+	"Progressive Web Application enabled": "Progressive Web Application enabled",
+	"Saltcorn test email": "Saltcorn test email",
+	"Hello from Saltcorn": "Hello from Saltcorn",
+	"Set colors": "Set colors",
+	"Theme color": "Theme color",
+	"Background color": "Background color",
+	"Table provider": "Table provider",
+	"Database table": "Database table",
+	"Configure provider": "Configure provider",
+	"In scope:": "In scope:"
 }

package/locales/pl.json

@@ -1106,5 +1106,21 @@
 	"Clear": "Wyczyść",
 	"Restore a snapshot": "Przywróć snapshot",
 	"Snapshot restored": "Snapshot przywrócony",
-	"Configuration check report": "Raport sprawdzenia konfiguracji"
+	"Configuration check report": "Raport sprawdzenia konfiguracji",
+	"Re-run": "Uruchom ponownie",
+	"Add constraint:": "Dodaj ograniczenie:",
+	"Index": "Index",
+	"Add constraint: ": "Dodaj ograniczenie: ",
+	"Choose the field to be indexed": "Wybierz pole do indeksacji",
+	"Constraint formula": "Formuła ograniczenia",
+	"Formula must evaluate to true for valid rows. In scope: ": "Formuła musi być prawdziwa dla uwierzytelnienia wierszy. W zakresie: ",
+	"Add %s constraint to %s": "Dodaj %s ograniczenie do %s",
+	"What": "Co",
+	"Choose the field to be indexed. This make searching the table faster.": "Wybierz pola, jakie mają być indeksowane. To przyspieszy wyszukiwanie w tabeli.",
+	"Disk usage": "Zużycie dysku",
+	"CPU usage": "Zużycie procesora",
+	"Mem usage": "Zużycie pamięci",
+	"The field that will be shown to the user when choosing a value": "Pole jakie będzie pokazane użytkownikowi przy wyborze wartości",
+	"String value must match regular expression": "Wartość ciągu musi odpowiadać wyrażeniu regularnemu",
+	"Modules up-to-date. Please restart server": "Moduły zaktualizowane. Proszę zresetować serwer"
 }

package/markup/admin.js

@@ -315,6 +315,7 @@ const send_admin_page = (args) => {
       { text: "System", href: "/admin/system" },
       { text: "Mobile app", href: "/admin/build-mobile-app" },
       { text: "Development", href: "/admin/dev" },
+      { text: "Notifications", href: "/admin/notifications" },
     ],
     ...args,
   });
@@ -343,7 +344,7 @@ const viewAttributes = async (key) => {
  * @param {*} req
  * @returns {void}
  */
-const flash_restart_if_required = (cfgForm, req) => {
+const check_if_restart_required = (cfgForm, req) => {
   let restart = false;
   cfgForm.fields.forEach((f) => {
     if (configTypes[f.name]?.restart_required) {
@@ -351,7 +352,7 @@ const flash_restart_if_required = (cfgForm, req) => {
       if (current !== cfgForm.values[f.name]) restart = true;
     }
   });
-  if (restart) flash_restart(req);
+  return restart;
 };
 
 /**
@@ -396,14 +397,21 @@ const config_fields_form = async ({
     const tens = await db.select("_sc_tenants");
     return { options: tens.map((t) => t.subdomain) };
   };
-  for (const name of field_names) {
-    if (typeof name === "object" && name.section_header) {
+  for (const name0 of field_names) {
+    if (typeof name0 === "object" && name0.section_header) {
       fields.push({
         input_type: "section_header",
-        label: name.section_header,
+        label: name0.section_header,
       });
       continue;
     }
+    let name, showIf;
+    if (typeof name0 === "object" && name0.name) {
+      name = name0.name;
+      showIf = name0.showIf;
+    } else {
+      name = name0;
+    }
     values[name] = state.getConfig(name);
     // console.log(`config field name: %s`,name);
     if (configTypes[name].root_only && tenant !== db.connectObj.default_schema)
@@ -427,6 +435,7 @@ const config_fields_form = async ({
           ? undefined
           : configTypes[name].type,
       input_type: configTypes[name].input_type,
+      showIf,
       attributes: isView
         ? await viewAttributes(name)
         : isRole
@@ -553,7 +562,7 @@ module.exports = {
   send_admin_page,
   send_files_page,
   save_config_from_form,
-  flash_restart_if_required,
+  check_if_restart_required,
   flash_restart,
   send_tags_page,
 };

package/package.json

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

package/public/saltcorn-common.js

@@ -167,7 +167,16 @@ function apply_showif() {
         }
       });
   });
-
+  $("[data-filter-table]").each(function (ix, element) {
+    const e = $(element);
+    const target = $(e.attr("data-filter-table"));
+    $(e).on("keyup", function () {
+      const value = $(this).val().toLowerCase();
+      target.find("tr").filter(function () {
+        $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1);
+      });
+    });
+  });
   $("[data-source-url]").each(function (ix, element) {
     const e = $(element);
     const rec0 = get_form_record(e);
@@ -1045,3 +1054,23 @@ function split_paste_handler(e) {
 function is_paging_param(key) {
   return key.endsWith("_page") || key.endsWith("_pagesize");
 }
+function check_saltcorn_notifications() {
+  $.ajax(`/notifications/count-unread`).then((resp) => {
+    if (resp.success) {
+      const n = resp.success;
+      const menu_item = $(`a.notify-menu-item`);
+
+      menu_item.html(
+        `<i class="fa-fw mr-05 fas fa-bell"></i>Notifications (${n})`
+      );
+      $(".user-nav-section").html(
+        `<i class="fa-fw mr-05 fas fa-user"></i>User (${n})`
+      );
+      $(".user-nav-section-with-span").html(
+        `<i class="fa-fw mr-05 fas fa-user"></i><span>User (${n})</span>`
+      );
+      window.update_theme_notification_count &&
+        window.update_theme_notification_count(n);
+    }
+  });
+}

package/public/saltcorn.css

@@ -375,3 +375,30 @@ table.table-inner-grid td {
   margin-bottom: 0 !important;
   text-decoration: underline;
 }
+
+@supports (zoom: 2) {
+  input[type="radio"].large,
+  input[type="checkbox"].large {
+    zoom: 2;
+  }
+  input[type="radio"].medium,
+  input[type="checkbox"].medium {
+    zoom: 1.5;
+  }
+}
+@supports not (zoom: 2) {
+  input[type="radio"].large,
+  input[type="checkbox"].large {
+    transform: scale(2);
+    margin: 15px;
+  }
+  input[type="radio"].medium,
+  input[type="checkbox"].medium {
+    transform: scale(1.5);
+    margin: 8px;
+  }
+}
+
+div.unread-notify {
+  border-left: 4px solid green;
+}

package/public/saltcorn.js

@@ -326,6 +326,9 @@ function saveAndContinue(e, k) {
           `<input type="hidden" class="form-control  " name="id" value="${res.id}">`
         );
       }
+      if (res.notify) {
+        notifyAlert(res.notify);
+      }
     },
     error: function (request) {
       var ct = request.getResponseHeader("content-type") || "";

package/public/serviceworker.js

@@ -0,0 +1 @@
+// do nothing so far