@saltcorn/server 0.6.2-beta.3 → 0.6.3-beta.0

package/locales/en.json

@@ -843,5 +843,7 @@
 	"Optional. String type with options, each of which will become a menu section": "Optional. String type with options, each of which will become a menu section",
 	"Role to generate API keys": "Role to generate API keys",
 	"User should have this role or higher to generate API keys in their user settings": "User should have this role or higher to generate API keys in their user settings",
-	"API token removed": "API token removed"
+	"API token removed": "API token removed",
+	"Row inclusion formula": "Row inclusion formula",
+	"Only include rows where this formula is true": "Only include rows where this formula is true"
 }

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.6.2-beta.3",
+  "version": "0.6.3-beta.0",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.6.2-beta.3",
-    "@saltcorn/builder": "0.6.2-beta.3",
-    "@saltcorn/data": "0.6.2-beta.3",
+    "@saltcorn/base-plugin": "0.6.3-beta.0",
+    "@saltcorn/builder": "0.6.3-beta.0",
+    "@saltcorn/data": "0.6.3-beta.0",
     "greenlock-express": "^4.0.3",
-    "@saltcorn/markup": "0.6.2-beta.3",
-    "@saltcorn/sbadmin2": "0.6.2-beta.3",
+    "@saltcorn/markup": "0.6.3-beta.0",
+    "@saltcorn/sbadmin2": "0.6.3-beta.0",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "connect-flash": "^0.1.1",
@@ -74,7 +74,9 @@
     "moduleNameMapper": {
       "@saltcorn/sqlite/(.*)": "@saltcorn/sqlite/dist/$1",
       "@saltcorn/db-common/(.*)": "@saltcorn/db-common/dist/$1",
-      "@saltcorn/data/(.*)": "@saltcorn/data/dist/$1"
+      "@saltcorn/data/(.*)": "@saltcorn/data/dist/$1",
+      "@saltcorn/markup$": "@saltcorn/markup/dist",
+      "@saltcorn/markup/(.*)": "@saltcorn/markup/dist/$1"
     }
   },
   "publishConfig": {

package/public/saltcorn.js

@@ -585,11 +585,11 @@ function test_formula(tablename, stored) {
 function align_dropdown(id) {
   setTimeout(() => {
     if ($("#dm" + id).hasClass("show")) {
-      var inputWidth = $(".input-group.search-bar").outerWidth();
-      $(".dropdown-menu.search-bar").css("width", inputWidth);
-      var d0pos = $(".input-group.search-bar").offset();
+      var inputWidth = $("#search-input-group-" + id).outerWidth();
+      $("#dm" + id).css("width", inputWidth);
+      var d0pos = $("#search-input-group-" + id).offset();
       $("#dm" + id).offset({ left: d0pos.left });
-      $(document).on("click", ".dropdown-menu.search-bar", function (e) {
+      $(document).on("click", "#dm" + id, function (e) {
         e.stopPropagation();
       });
     }

package/restart_watcher.js

@@ -120,10 +120,6 @@ const listenForChanges = (projectDirs, pluginDirs) => {
         (event, file) => {
           console.log("'%s' changed \n re-starting now", file);
           closeWatchers();
-          spawnSync("npm", ["run", "tsc"], {
-            stdio: "inherit",
-            cwd: projectRoot,
-          });
           process.exit();
         }
       )

package/routes/plugins.js

@@ -511,7 +511,7 @@ const plugin_store_html = (items, req) => {
       },
       {
         besides: items.map(store_item_html(req)),
-        widths: items.map((item) => 4), // todo warning that item uis unused
+        widths: items.map(() => 4),
       },
     ],
   };

package/serve.js

@@ -38,6 +38,7 @@ const {
   getRelevantPackages,
   getPluginDirectories,
 } = require("./restart_watcher");
+const { spawnSync } = require("child_process");
 
 // helpful https://gist.github.com/jpoehls/2232358
 /**
@@ -162,6 +163,9 @@ module.exports =
     ...appargs
   } = {}) => {
     if (dev && cluster.isMaster) {
+      spawnSync("npm", ["run", "tsc"], {
+        stdio: "inherit",
+      });
       listenForChanges(getRelevantPackages(), await getPluginDirectories());
     }
     const useNCpus = process.env.SALTCORN_NWORKERS

package/wrapper.js

@@ -239,6 +239,7 @@ module.exports = (version_tag) =>
             brand: get_brand(state),
             menu: get_menu(req),
             currentUrl,
+            originalUrl: req.originalUrl,
             alerts: getFlashes(req),
             body,
             headers: get_headers(req, version_tag),
@@ -283,6 +284,8 @@ module.exports = (version_tag) =>
           brand: get_brand(state),
           menu: get_menu(req),
           currentUrl,
+          originalUrl: req.originalUrl,
+
           alerts,
           body: html.length === 1 ? html[0] : html.join(""),
           headers: get_headers(req, version_tag, opts.description, pageHeaders),