@saltcorn/server 0.9.6-beta.4 → 0.9.6-beta.6

package/auth/admin.js

@@ -531,7 +531,10 @@ router.post(
         if (restart_required)
           res.json({
             success: "ok",
-            notify: req.__("Restart required for changes to take effect."),
+            notify:
+              req.__("Restart required for changes to take effect.") +
+              " " +
+              a({ href: "/admin/system" }, req.__("Restart here")),
           });
         else res.json({ success: "ok" });
       }

package/load_plugins.js

@@ -141,7 +141,11 @@ const loadAndSaveNewPlugin = async (
     const existing = await Plugin.findOne({ location: loc });
     if (!existing && loc !== plugin.location) {
       await loadAndSaveNewPlugin(
-        new Plugin({ name: loc, location: loc, source: "npm" }),
+        new Plugin({
+          name: loc.replace("@saltcorn/", ""),
+          location: loc,
+          source: "npm",
+        }),
         force,
         noSignalOrDB
       );

package/package.json

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

package/routes/fields.js

@@ -255,6 +255,7 @@ const fieldFlow = (req) =>
         expression = "__aggregation";
         attributes.agg_relation = context.agg_relation;
         attributes.agg_field = context.agg_field;
+        attributes.agg_order_by = context.agg_order_by;
         attributes.aggwhere = context.aggwhere;
         attributes.aggregate = context.aggregate;
         const [table, ref] = context.agg_relation.split(".");
@@ -435,46 +436,64 @@ const fieldFlow = (req) =>
 
           const { child_field_list, child_relations } =
             await table.get_child_relations(true);
-          const agg_field_opts = child_relations.map(
-            ({ table, key_field, through }) => {
-              const aggKey =
-                (through ? `${through.name}->` : "") +
-                `${table.name}.${key_field.name}`;
-              aggStatOptions[aggKey] = [
-                "Count",
-                "CountUnique",
-                "Avg",
-                "Sum",
-                "Max",
-                "Min",
-                "Array_Agg",
-              ];
-              table.fields.forEach((f) => {
-                if (f.type && f.type.name === "Date") {
-                  aggStatOptions[aggKey].push(`Latest ${f.name}`);
-                  aggStatOptions[aggKey].push(`Earliest ${f.name}`);
-                }
-              });
-              return {
-                name: `agg_field`,
-                label: req.__("On Field"),
-                type: "String",
-                required: true,
-                attributes: {
-                  options: table.fields
-                    .filter((f) => !f.calculated || f.stored)
-                    .map((f) => ({
-                      label: f.name,
-                      name: `${f.name}@${f.type_name}`,
-                    })),
-                },
-                showIf: {
-                  agg_relation: aggKey,
-                  expression_type: "Aggregation",
-                },
-              };
-            }
-          );
+          const agg_field_opts = [];
+          const agg_order_opts = [];
+          child_relations.forEach(({ table, key_field, through }) => {
+            const aggKey =
+              (through ? `${through.name}->` : "") +
+              `${table.name}.${key_field.name}`;
+            aggStatOptions[aggKey] = [
+              "Count",
+              "CountUnique",
+              "Avg",
+              "Sum",
+              "Max",
+              "Min",
+              "Array_Agg",
+            ];
+            table.fields.forEach((f) => {
+              if (f.type && f.type.name === "Date") {
+                aggStatOptions[aggKey].push(`Latest ${f.name}`);
+                aggStatOptions[aggKey].push(`Earliest ${f.name}`);
+              }
+            });
+            agg_field_opts.push({
+              name: `agg_field`,
+              label: req.__("On Field"),
+              type: "String",
+              required: true,
+              attributes: {
+                options: table.fields
+                  .filter((f) => !f.calculated || f.stored)
+                  .map((f) => ({
+                    label: f.name,
+                    name: `${f.name}@${f.type_name}`,
+                  })),
+              },
+              showIf: {
+                agg_relation: aggKey,
+                expression_type: "Aggregation",
+              },
+            });
+            agg_order_opts.push({
+              name: `agg_order_by`,
+              label: req.__("Order by"),
+              type: "String",
+              attributes: {
+                options: table.fields
+                  .filter((f) => !f.calculated || f.stored)
+                  .map((f) => ({
+                    label: f.name,
+                    name: f.name,
+                  })),
+              },
+              showIf: {
+                agg_relation: aggKey,
+                expression_type: "Aggregation",
+                aggregate: "Array_Agg",
+              },
+            });
+          });
           return new Form({
             fields: [
               {
@@ -520,6 +539,7 @@ const fieldFlow = (req) =>
                 required: false,
                 showIf: { expression_type: "Aggregation" },
               },
+              ...agg_order_opts,
               {
                 name: "model",
                 label: req.__("Model"),
@@ -1157,7 +1177,7 @@ router.post(
       else res.send(fv.run(result, req, { row, ...configuration }));
     } catch (e) {
       console.error("show-calculated error", e);
-      return res.status(400).send(`Error: ${e.message}`);
+      return res.status(200).send(``);
     }
   })
 );

package/routes/plugins.js

@@ -1315,7 +1315,12 @@ router.get(
       await upgrade_all_tenants_plugins((p, f) =>
         load_plugins.loadPlugin(p, f)
       );
-      req.flash("success", req.__(`Modules up-to-date. Please restart server`));
+      req.flash(
+        "success",
+        req.__(`Modules up-to-date. Please restart server`) +
+          ". " +
+          a({ href: "/admin/system" }, req.__("Restart here"))
+      );
     } else {
       const installed_plugins = await Plugin.find({});
       for (const plugin of installed_plugins) {

package/routes/tables.js

@@ -681,6 +681,10 @@ const attribBadges = (f) => {
           "on_delete_cascade",
           "on_delete",
           "unique_error_msg",
+          "ref",
+          "table",
+          "agg_field",
+          "agg_relation",
         ].includes(k)
       )
         return;

package/routes/utils.js

@@ -14,7 +14,7 @@ const {
 } = require("@saltcorn/data/db/state");
 const { get_base_url } = require("@saltcorn/data/models/config");
 const { hash } = require("@saltcorn/data/utils");
-const { input, script, domReady } = require("@saltcorn/markup/tags");
+const { input, script, domReady, a } = require("@saltcorn/markup/tags");
 const session = require("express-session");
 const cookieSession = require("cookie-session");
 const is = require("contractis/is");
@@ -398,7 +398,10 @@ const admin_config_route = ({
           if (restart_required)
             res.json({
               success: "ok",
-              notify: req.__("Restart required for changes to take effect."),
+              notify:
+                req.__("Restart required for changes to take effect.") +
+                " " +
+                a({ href: "/admin/system" }, req.__("Restart here")),
             });
           else res.json({ success: "ok" });
         }

package/tests/plugins.test.js

@@ -137,8 +137,10 @@ describe("Plugin dependency resolution and upgrade", () => {
       .expect(toRedirect("/plugins"));
     const quill = await Plugin.findOne({ name: "quill-editor" });
     expect(quill.location).toBe("@saltcorn/quill-editor");
+    expect(quill.name).toBe("quill-editor");
     const html = await Plugin.findOne({ location: "@saltcorn/html" });
     expect(html.location).toBe("@saltcorn/html");
+    expect(html.name).toBe("html");
     const html_type = getState().types.HTML;
     expect(!!html_type.fieldviews.Quill).toBe(true);
   });