@saltcorn/server 0.9.4 → 0.9.5-beta.1

package/auth/admin.js

@@ -357,6 +357,7 @@ const auth_settings_form = async (req) =>
       "user_settings_form",
       "verification_view",
       "logout_url",
+      "signup_role",
       "elevate_verified",
       "email_mask",
     ],

package/auth/routes.js

@@ -786,6 +786,7 @@ router.post(
         res.sendAuthWrap(new_user_form, form, getAuthLinks("signup", true));
         return;
       }
+      uobj.role_id = +getState().getConfig("signup_role", "80");
       const u = await User.create(uobj);
       await send_verification_email(u, req);
 
@@ -843,6 +844,7 @@ router.post(
         res.sendAuthWrap(new_user_form, form, getAuthLinks("signup", true));
       } else {
         try {
+          form.values.role_id = +getState().getConfig("signup_role", "80");
           const u = await User.create(form.values);
           await send_verification_email(u, req);
 
@@ -978,6 +980,7 @@ router.post(
             getAuthLinks("signup", true)
           );
         } else {
+          userObject.role_id = +getState().getConfig("signup_role", "80");
           const u = await User.create(userObject);
           await send_verification_email(u, req);
 
@@ -1010,6 +1013,7 @@ router.post(
         form.values.password = password;
         res.sendAuthWrap(new_user_form, form, getAuthLinks("signup", true));
       } else {
+        form.values.role_id = +getState().getConfig("signup_role", "80");
         const u = await User.create(form.values);
         await send_verification_email(u, req);
         if (req.smr)

package/locales/en.json

@@ -1382,5 +1382,7 @@
 	"Open a connection to TLS server with self-signed or invalid TLS certificate": "Open a connection to TLS server with self-signed or invalid TLS certificate",
 	"Allow self-signed": "Allow self-signed",
 	"Optionally associate a table with this trigger": "Optionally associate a table with this trigger",
-	"Delete table": "Delete table"
+	"Delete table": "Delete table",
+	"Signup role": "Signup role",
+	"The initial role of signed up users": "The initial role of signed up users"
 }

package/markup/admin.js

@@ -23,6 +23,8 @@ const Form = require("@saltcorn/data/models/form");
 const Table = require("@saltcorn/data/models/table");
 const View = require("@saltcorn/data/models/view");
 const User = require("@saltcorn/data/models/user");
+const FieldRepeat = require("@saltcorn/data/models/fieldrepeat");
+const Field = require("@saltcorn/data/models/field");
 
 /**
  * Restore Backup
@@ -437,6 +439,26 @@ const config_fields_form = async ({
     const label = configTypes[name].label || name;
     const sublabel = configTypes[name].sublabel || configTypes[name].blurb;
 
+    if (configTypes[name].type === "Repeat") {
+      const repFields = configTypes[name].fields;
+      const filledFields = [];
+      for (const rfield of repFields) {
+        const fillField = new Field(rfield);
+        await fillField.fill_fkey_options();
+        filledFields.push(fillField);
+      }
+      fields.push(
+        new FieldRepeat({
+          name,
+          label,
+          fields: filledFields,
+          showIf,
+        })
+      );
+
+      continue;
+    }
+
     fields.push({
       name,
       ...configTypes[name],

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.4",
+  "version": "0.9.5-beta.1",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
     "@aws-sdk/client-s3": "^3.451.0",
-    "@saltcorn/base-plugin": "0.9.4",
-    "@saltcorn/builder": "0.9.4",
-    "@saltcorn/data": "0.9.4",
-    "@saltcorn/admin-models": "0.9.4",
-    "@saltcorn/filemanager": "0.9.4",
-    "@saltcorn/markup": "0.9.4",
-    "@saltcorn/sbadmin2": "0.9.4",
+    "@saltcorn/base-plugin": "0.9.5-beta.1",
+    "@saltcorn/builder": "0.9.5-beta.1",
+    "@saltcorn/data": "0.9.5-beta.1",
+    "@saltcorn/admin-models": "0.9.5-beta.1",
+    "@saltcorn/filemanager": "0.9.5-beta.1",
+    "@saltcorn/markup": "0.9.5-beta.1",
+    "@saltcorn/sbadmin2": "0.9.5-beta.1",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn.js

@@ -472,15 +472,7 @@ function saveAndContinue(e, k) {
           `<input type="hidden" class="form-control  " name="id" value="${res.id}">`
         );
       }
-      if (res.notify) {
-        notifyAlert(res.notify);
-      }
-      if (res.notify_success) {
-        notifyAlert({ type: "success", text: res.notify });
-      }
-      if (res.reload_page) {
-        location.reload(); //TODO notify to cookie if reload or goto
-      }
+      common_done(res, form.attr("data-viewname"));
     },
     error: function (request) {
       var ct = request.getResponseHeader("content-type") || "";

package/public/serviceworker.js

@@ -1 +1,5 @@
 // do nothing so far
+
+self.addEventListener("fetch", function () {
+  return;
+});

package/routes/admin.js

@@ -2453,6 +2453,11 @@ router.post(
         }
       }
     }
+    if (form.values.triggers) {
+      await db.deleteWhere("_sc_tag_entries", { not: { trigger_id: null } });
+      await db.deleteWhere("_sc_triggers");
+      await getState().refresh_triggers();
+    }
     if (form.values.tables) {
       await db.deleteWhere("_sc_table_constraints");
       await db.deleteWhere("_sc_model_instances");
@@ -2492,10 +2497,7 @@ router.post(
       }
       await getState().refresh_plugins();
     }
-    if (form.values.triggers) {
-      await db.deleteWhere("_sc_triggers");
-      await getState().refresh_triggers();
-    }
+
     if (form.values.library) {
       await db.deleteWhere("_sc_library");
     }
@@ -2676,6 +2678,10 @@ admin_config_route({
       name: "pwa_background_color",
       showIf: { pwa_enabled: true, pwa_set_colors: true },
     },
+    {
+      name: "pwa_icons",
+      showIf: { pwa_enabled: true },
+    },
   ],
   response(form, req, res) {
     send_admin_page({

package/routes/notifications.js

@@ -11,6 +11,7 @@ const { div, a, i, text, h5, p, span } = require("@saltcorn/markup/tags");
 const moment = require("moment");
 const { getState } = require("@saltcorn/data/db/state");
 const Form = require("@saltcorn/data/models/form");
+const File = require("@saltcorn/data/models/file");
 const User = require("@saltcorn/data/models/user");
 const { renderForm } = require("@saltcorn/markup");
 
@@ -114,14 +115,24 @@ router.get(
     const state = getState();
     const manifest = {
       name: state.getConfig("site_name"),
-      start_url: state.getConfig("base_url") || "/",
+      start_url: "/",
       display: state.getConfig("pwa_display", "browser"),
     };
     const site_logo = state.getConfig("site_logo_id");
-    if (site_logo)
+    const pwa_icons = state.getConfig("pwa_icons");
+    if (Array.isArray(pwa_icons) && pwa_icons.length > 0)
+      manifest.icons = pwa_icons.map(({ image, size, maskable }) => ({
+        src: `/files/serve/${image}`,
+        type: File.nameToMimeType(site_logo),
+        sizes: size ? `${size}x${size}` : "144x144",
+        ...(maskable ? { purpose: "maskable" } : {}),
+      }));
+    else if (site_logo)
       manifest.icons = [
         {
           src: `/files/serve/${site_logo}`,
+          type: File.nameToMimeType(site_logo),
+          sizes: "144x144",
         },
       ];
     if (state.getConfig("pwa_set_colors", false)) {