@saltcorn/server 0.8.5-beta.0 → 0.8.5-beta.2

package/auth/admin.js

@@ -57,7 +57,8 @@ const getUserFields = async (req) => {
         (signup_form.configuration.columns || []).forEach((f) => {
           const uf = userFields.find((uff) => uff.name === f.field_name);
           if (uf) {
-            if (!f?.fieldview?.unsuitableAsAdminDefault) {
+            const fvObj = uf.type?.fieldviews?.[uf.fieldview];
+            if (fvObj && !fvObj?.fieldview?.unsuitableAsAdminDefault) {
               uf.fieldview = f.fieldview;
               uf.attributes = { ...f.configuration, ...uf.attributes };
             }
@@ -68,6 +69,7 @@ const getUserFields = async (req) => {
   };
   await iterForm("signup_form");
   await iterForm("new_user_form");
+  //console.log(userFields);
   for (const f of userFields) {
     await f.fill_fkey_options();
     if (f.name === "email") {

package/locales/en.json

@@ -1105,5 +1105,7 @@
 	"Tag entry": "Tag entry",
 	"Clear": "Clear",
 	"Restore a snapshot": "Restore a snapshot",
-	"Snapshot restored": "Snapshot restored"
+	"Snapshot restored": "Snapshot restored",
+	"Configuration check report": "Configuration check report",
+	"Re-run": "Re-run"
 }

package/package.json

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

package/public/saltcorn.css

@@ -227,7 +227,6 @@ footer.bs-mobile-nav-footer {
 
 .containerbgimage {
   position: absolute;
-  top: 0;
   left: 0;
   width: 100%;
   height: 100%;
@@ -372,7 +371,7 @@ table.table-inner-grid td {
 }
 
 .join-table-header {
-  padding: 0.25rem 1rem; 
+  padding: 0.25rem 1rem;
   margin-bottom: 0 !important;
   text-decoration: underline;
-}
+}

package/public/saltcorn.js

@@ -320,6 +320,7 @@ function saveAndContinue(e, k) {
     data: form_data,
     success: function (res) {
       ajax_indicator(false);
+      form.parent().find(".full-form-error").text("");
       if (res.id && form.find("input[name=id")) {
         form.append(
           `<input type="hidden" class="form-control  " name="id" value="${res.id}">`
@@ -327,9 +328,23 @@ function saveAndContinue(e, k) {
       }
     },
     error: function (request) {
-      $("#page-inner-content").html(request.responseText);
+      var ct = request.getResponseHeader("content-type") || "";
+      if (ct.startsWith && ct.startsWith("application/json")) {
+        var errorArea = form.parent().find(".full-form-error");
+        if (errorArea.length) {
+          errorArea.text(request.responseJSON.error);
+        } else {
+          form
+            .parent()
+            .append(
+              `<p class="text-danger full-form-error">${request.responseJSON.error}</p>`
+            );
+        }
+      } else {
+        $("#page-inner-content").html(request.responseText);
+        initialize_page();
+      }
       ajax_indicate_error(e, request);
-      initialize_page();
     },
     complete: function () {
       if (k) k();

package/routes/actions.js

@@ -41,6 +41,7 @@ const {
   h6,
   pre,
   text,
+  i,
 } = require("@saltcorn/markup/tags");
 const Table = require("@saltcorn/data/models/table");
 const { getActionConfigFields } = require("@saltcorn/data/plugin-helper");
@@ -510,17 +511,20 @@ router.post(
     });
     form.validate(req.body);
     if (form.hasErrors) {
-      send_events_page({
-        res,
-        req,
-        active_sub: "Triggers",
-        sub2_page: "Configure",
-        contents: {
-          type: "card",
-          title: req.__("Configure trigger"),
-          contents: renderForm(form, req.csrfToken()),
-        },
-      });
+      if (req.xhr) {
+        res.status(400).json({ error: form.errorSummary });
+      } else
+        send_events_page({
+          res,
+          req,
+          active_sub: "Triggers",
+          sub2_page: "Configure",
+          contents: {
+            type: "card",
+            title: req.__("Configure trigger"),
+            contents: renderForm(form, req.csrfToken()),
+          },
+        });
     } else {
       await Trigger.update(trigger.id, { configuration: form.values });
       if (req.xhr) {
@@ -598,6 +602,7 @@ router.get(
         user: req.user,
       });
     } catch (e) {
+      console.error(e);
       fakeConsole.error(e.message);
     }
     if (output.length === 0) {
@@ -622,8 +627,16 @@ router.get(
             div({ class: "testrunoutput" }, output),
 
             a(
-              { href: `/actions`, class: "mt-4 btn btn-primary" },
+              { href: `/actions`, class: "mt-4 btn btn-primary me-1" },
               "« " + req.__("back to actions")
+            ),
+            a(
+              {
+                href: `/actions/testrun/${id}`,
+                class: "ms-1 mt-4 btn btn-primary",
+              },
+              i({ class: "fas fa-redo me-1" }),
+              req.__("Re-run")
             )
           ),
         },

package/routes/admin.js

@@ -40,6 +40,7 @@ const {
   p,
   code,
   h5,
+  h3,
   pre,
   button,
   form,
@@ -100,6 +101,7 @@ const os = require("os");
 const Page = require("@saltcorn/data/models/page");
 const { getSafeSaltcornCmd } = require("@saltcorn/data/utils");
 const stream = require("stream");
+const Crash = require("@saltcorn/data/models/crash");
 
 const router = new Router();
 module.exports = router;
@@ -892,7 +894,6 @@ router.get(
                 {
                   href: "/admin/configuration-check",
                   class: "btn btn-info",
-                  onClick: "press_store_button(this)",
                 },
                 i({ class: "fas fa-stethoscope" }),
                 " ",
@@ -1306,49 +1307,74 @@ router.get(
   "/configuration-check",
   isAdmin,
   error_catcher(async (req, res) => {
-    const { passes, errors, pass, warnings } = await runConfigurationCheck(req);
-    const mkError = (err) =>
-      div(
-        { class: "alert alert-danger", role: "alert" },
-        pre({ class: "mb-0" }, code(err))
+    const filename = `${moment().format("YYYMMDDHHmm")}.html`;
+    await File.new_folder("configuration_checks");
+    const go = async () => {
+      const { passes, errors, pass, warnings } = await runConfigurationCheck(
+        req
       );
-    const mkWarning = (err) =>
-      div(
-        { class: "alert alert-warning", role: "alert" },
-        pre({ class: "mb-0" }, code(err))
+      const mkError = (err) =>
+        div(
+          { class: "alert alert-danger", role: "alert" },
+          pre({ class: "mb-0" }, code(err))
+        );
+      const mkWarning = (err) =>
+        div(
+          { class: "alert alert-warning", role: "alert" },
+          pre({ class: "mb-0" }, code(err))
+        );
+
+      const report =
+        div(
+          h3("Errors"),
+          pass
+            ? div(req.__("No errors detected during configuration check"))
+            : errors.map(mkError)
+        ) +
+        div(
+          h3("Warnings"),
+          (warnings || []).length
+            ? (warnings || []).map(mkWarning)
+            : "No warnings"
+        ) +
+        div(
+          h3("Passes"),
+
+          pre(code(passes.join("\n")))
+        );
+      await File.from_contents(
+        filename,
+        "text/html",
+        report,
+        req.user.id,
+        1,
+        "/configuration_checks"
       );
+    };
+    go().catch((err) => Crash.create(err, req));
     res.sendWrap(req.__(`Admin`), {
       above: [
         {
           type: "breadcrumbs",
           crumbs: [
             { text: req.__("Settings") },
-            { text: req.__("Admin"), href: "/admin" },
+            { text: req.__("About application"), href: "/admin" },
+            { text: req.__("System"), href: "/admin/system" },
             { text: req.__("Configuration check") },
           ],
         },
+
         {
           type: "card",
-          title: req.__("Configuration errors"),
+          title: req.__("Configuration check report"),
           contents: div(
-            pass
-              ? div(
-                  { class: "alert alert-success", role: "alert" },
-                  i({ class: "fas fa-check-circle fa-lg me-2" }),
-                  h5(
-                    { class: "d-inline" },
-                    req.__("No errors detected during configuration check")
-                  )
-                )
-              : errors.map(mkError),
-            (warnings || []).map(mkWarning)
+            "When completed, the report will be ready here: ",
+            a(
+              { href: `/files/serve/configuration_checks/${filename}` },
+              "/configuration_checks/" + filename
+            )
           ),
         },
-        {
-          type: "card",
-          title: req.__("Configuration checks passed"),
-          contents: div(pre(code(passes.join("\n")))),
-        },
       ],
     });
   })