@saltcorn/server 0.9.4-beta.13 → 0.9.4-beta.15

package/auth/admin.js

@@ -187,7 +187,8 @@ const user_dropdown = (user, req, can_reset) =>
     post_dropdown_item(
       `/useradmin/set-random-password/${user.id}`,
       '<i class="fas fa-random"></i>&nbsp;' + req.__("Set random password"),
-      req
+      req,
+      true
     ),
     can_reset &&
       post_dropdown_item(

package/auth/routes.js

@@ -1783,6 +1783,7 @@ router.post(
       res.redirect("/auth/twofa/setup/totp");
       return;
     }
+    console.log("TOTP return ", rv);
     user._attributes.totp_enabled = true;
     await user.update({ _attributes: user._attributes });
     req.flash(
@@ -1901,6 +1902,9 @@ router.get(
     const form = new Form({
       action: "/auth/twofa/login/totp",
       submitLabel: "Verify",
+      blurb: req.__(
+        "Please enter the two-factor authetication code from your authenticator device"
+      ),
       fields: [
         {
           name: "code",
@@ -1911,6 +1915,7 @@ router.get(
             inputmode: "numeric",
             pattern: "[0-9]*",
             autocomplete: "one-time-code",
+            autofocus: true,
           },
           required: true,
         },

package/load_plugins.js

@@ -196,7 +196,10 @@ const loadAndSaveNewPlugin = async (plugin, force, noSignalOrDB, manager) => {
   );
   const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
   if (!isRoot && !tenants_unsafe_plugins) {
-    if (plugin.source !== "npm") return;
+    if (plugin.source !== "npm") {
+      console.error("\nWARNING: Skipping unsafe plugin ", plugin.name);
+      return;
+    }
     //get allowed plugins
 
     //refresh root store
@@ -207,7 +210,10 @@ const loadAndSaveNewPlugin = async (plugin, force, noSignalOrDB, manager) => {
 
     const instore = getRootState().getConfig("available_plugins", []);
     const safes = instore.filter((p) => !p.unsafe).map((p) => p.location);
-    if (!safes.includes(plugin.location)) return;
+    if (!safes.includes(plugin.location)) {
+      console.error("\nWARNING: Skipping unsafe plugin ", plugin.name);
+      return;
+    }
   }
   const { version, plugin_module, location } = await requirePlugin(
     plugin,

package/locales/en.json

@@ -1375,5 +1375,6 @@
 	"open logs viewer": "open logs viewer",
 	"Server logs": "Server logs",
 	"Timestamp": "Timestamp",
-	"Message": "Message"
-}
+	"Message": "Message",
+	"Please enter the two-factor authetication code from your authenticator device": "Please enter the two-factor authetication code from your authenticator device"
+}

package/package.json

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

package/public/saltcorn-builder.css

@@ -147,13 +147,19 @@ div.wrap-builder-elem label {
   padding: 2px;
 }
 
-#builder-main-canvas div.root-canvas:empty:before {
+#builder-main-canvas.emptymsg div.root-canvas:empty:before {
   font-size: 26px;
   opacity: 0.5;
   margin-left: 10px;
   content: "Drag-and-drop components here";
 }
 
+#builder-main-canvas div.list-empty-msg:empty:before {
+  opacity: 0.5;
+  margin-left: 10px;
+  content: "Drag-and-drop components here";
+}
+
 #builder-main-canvas .image-widget {
   min-width: 15px;
   min-height: 15px;
@@ -485,3 +491,21 @@ Copyright (c) 2017 Taha Paksu
 div.builder-config-field {
   margin-top: 0.5rem;
 }
+
+.flex-50 {
+  flex: 50%;
+}
+
+#builder-main-canvas .list-column {
+  min-height: 80px;
+}
+
+#builder-main-canvas .list-col-canvas {
+  min-height: 70px;
+  margin: 5px;
+}
+
+#builder-main-canvas .list-column-outer {
+  border: 1px solid black;
+  margin-top: 2px;
+}

package/tests/viewedit.test.js

@@ -78,6 +78,37 @@ describe("viewedit edit endpoint", () => {
 });
 
 describe("viewedit new List", () => {
+  const columns = [
+    { type: "Field", field_name: "author" },
+    { type: "Field", field_name: "pages" },
+  ];
+  const layout = {
+    besides: [
+      {
+        contents: {
+          type: "field",
+          fieldview: "as_text",
+          field_name: "author",
+          configuration: {},
+        },
+        alignment: "Default",
+        header_label: "Author",
+        col_width_units: "px",
+      },
+      {
+        contents: {
+          type: "field",
+          fieldview: "show",
+          field_name: "pages",
+          configuration: {},
+        },
+        alignment: "Default",
+        header_label: "Pages",
+        col_width_units: "px",
+      },
+    ],
+    list_columns: true,
+  };
   itShouldRedirectUnauthToLogin("/viewedit/new");
 
   it("show new view", async () => {
@@ -117,11 +148,8 @@ describe("viewedit new List", () => {
       .post("/viewedit/config/mybooklist")
       .send("contextEnc=" + ctx)
       .send("stepName=Columns")
-      .send("type_0=Field")
-      .send("field_name_0=author")
-      .send("type_1=Field")
-      .send("field_name_1=pages")
-      .send("create_view_display=Link")
+      .send("columns=" + encodeURIComponent(JSON.stringify(columns)))
+      .send("layout=" + encodeURIComponent(JSON.stringify(layout)))
       .set("Cookie", loginCookie)
       .expect(toInclude("Default state"));
   });
@@ -205,6 +233,23 @@ describe("viewedit new List", () => {
 });
 
 describe("viewedit new List with one field", () => {
+  const columns = [{ type: "Field", field_name: "author", state_field: "on" }];
+  const layout = {
+    besides: [
+      {
+        contents: {
+          type: "field",
+          fieldview: "as_text",
+          field_name: "author",
+          configuration: {},
+        },
+        alignment: "Default",
+        header_label: "Author",
+        col_width_units: "px",
+      },
+    ],
+    list_columns: true,
+  };
   it("submit new view", async () => {
     const loginCookie = await getAdminLoginCookie();
 
@@ -234,9 +279,8 @@ describe("viewedit new List with one field", () => {
       .post("/viewedit/config/mybooklist1")
       .send("contextEnc=" + ctx)
       .send("stepName=Columns")
-      .send("type_0=Field")
-      .send("field_name_0=author")
-      .send("create_view_display=Link")
+      .send("columns=" + encodeURIComponent(JSON.stringify(columns)))
+      .send("layout=" + encodeURIComponent(JSON.stringify(layout)))
       .set("Cookie", loginCookie)
       .expect(toInclude("Default state"));
   });