@saltcorn/server 0.9.0-beta.2 → 0.9.0-beta.4

package/auth/routes.js

@@ -228,7 +228,7 @@ const loginWithJwt = async (email, password, saltcornApp, res, req) => {
   const loginFn = async () => {
     const publicUserLink = getState().getConfig("public_user_link");
     const jwt_secret = db.connectObj.jwt_secret;
-    if (email && password) {
+    if (email !== undefined && password !== undefined) {
       // with credentials
       const user = await User.findOne({ email });
       if (user && user.checkPassword(password)) {

package/locales/en.json

@@ -1260,5 +1260,6 @@
 	"Close": "Close",
 	"Module up-to-date": "Module up-to-date",
 	"Module '%s' not found": "Module '%s' not found",
-	"Module %s not found": "Module %s not found"
-}
+	"Module %s not found": "Module %s not found",
+	"Initially open": "Initially open"
+}

package/package.json

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

package/public/saltcorn.js

@@ -381,6 +381,9 @@ function saveAndContinue(e, k) {
       if (res.notify) {
         notifyAlert(res.notify);
       }
+      if (res.reload_page) {
+        location.reload(); //TODO notify to cookie if reload or goto
+      }
     },
     error: function (request) {
       var ct = request.getResponseHeader("content-type") || "";
@@ -423,7 +426,8 @@ function updateMatchingRows(e, viewname) {
   }
 }
 
-function applyViewConfig(e, url, k) {
+function applyViewConfig(e, url, k, event) {
+  if (event && event.target && event.target.id === "myEditor_icon") return;
   var form = $(e).closest("form");
   var form_data = form.serializeArray();
   const cfg = {};

package/routes/admin.js

@@ -1545,7 +1545,7 @@ router.get(
                 input({
                   type: "hidden",
                   name: "entryPointType",
-                  value: "view",
+                  value: builderSettings.entryPointType || "view",
                   id: "entryPointTypeID",
                 }),
                 div(
@@ -1578,7 +1578,8 @@ router.get(
                           div(
                             {
                               class: `nav-link ${
-                                !builderSettings.entryPointType || builderSettings.entryPointType === "view"
+                                !builderSettings.entryPointType ||
+                                builderSettings.entryPointType === "view"
                                   ? "active"
                                   : ""
                               }`,
@@ -1613,7 +1614,8 @@ router.get(
                               ? "d-none"
                               : ""
                           }`,
-                          ...(!builderSettings.entryPointType || builderSettings.entryPointType === "view"
+                          ...(!builderSettings.entryPointType ||
+                          builderSettings.entryPointType === "view"
                             ? { name: "entryPoint" }
                             : {}),
                           id: "viewInputID",
@@ -1636,7 +1638,8 @@ router.get(
                       select(
                         {
                           class: `form-select ${
-                            !builderSettings.entryPointType || builderSettings.entryPointType === "view"
+                            !builderSettings.entryPointType ||
+                            builderSettings.entryPointType === "view"
                               ? "d-none"
                               : ""
                           }`,