@saltcorn/server 0.9.4-beta.0 → 0.9.4-beta.10

package/help/JavaScript action code.tmd

@@ -122,6 +122,7 @@ Example:
 ```
 return { download: {
     mimetype: "text/csv",
+    filename: "stock.csv",
     blob: filecontents
   }
 }

package/locales/en.json

@@ -1346,5 +1346,19 @@
 	"Show if formula": "Show if formula",
 	"Show link or embed if true, don't show if false. Based on state variables from URL query string and <code>user</code>. For the full state use <code>row</code>. Example: <code>!!row.createlink</code> to show link if and only if state has <code>createlink</code>.": "Show link or embed if true, don't show if false. Based on state variables from URL query string and <code>user</code>. For the full state use <code>row</code>. Example: <code>!!row.createlink</code> to show link if and only if state has <code>createlink</code>.",
 	"Pagegroup": "Pagegroup",
-	"Pagegroup %s has no members": "Pagegroup %s has no members"
-}
+	"Pagegroup %s has no members": "Pagegroup %s has no members",
+	"Remove border": "Remove border",
+	"No lines between tables": "No lines between tables",
+	"Use this to restrict your field to a list of options (separated by commas). For instance, enter <kbd class=\"fst-normal\">Red, Green, Blue</kbd> here if the permissible values are Red, Green and Blue. Leave blank if the string can hold any value.": "Use this to restrict your field to a list of options (separated by commas). For instance, enter <kbd class=\"fst-normal\">Red, Green, Blue</kbd> here if the permissible values are Red, Green and Blue. Leave blank if the string can hold any value.",
+	"Page description": "Page description",
+	"Some view patterns accept interpolations. Ex: <code>{{ name }}</code> or <code>{{ row ? `Edit ${row.name}` : `New person` }}</code>": "Some view patterns accept interpolations. Ex: <code>{{ name }}</code> or <code>{{ row ? `Edit ${row.name}` : `New person` }}</code>",
+	"For search engines. Some view patterns accept interpolations.": "For search engines. Some view patterns accept interpolations.",
+	"Files cache TTL (minutes)": "Files cache TTL (minutes)",
+	"Cache-control max-age for files.": "Cache-control max-age for files.",
+	"Popup min width": "Popup min width",
+	"Add %s to tag %s": "Add %s to tag %s",
+	"Add entries to tag %s": "Add entries to tag %s",
+	"Tag not found": "Tag not found",
+	"Unable to save: No page or no layout": "Unable to save: No page or no layout",
+	"Unable to save: No view": "Unable to save: No view"
+}

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.4-beta.0",
+  "version": "0.9.4-beta.10",
   "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.0",
-    "@saltcorn/builder": "0.9.4-beta.0",
-    "@saltcorn/data": "0.9.4-beta.0",
-    "@saltcorn/admin-models": "0.9.4-beta.0",
-    "@saltcorn/filemanager": "0.9.4-beta.0",
-    "@saltcorn/markup": "0.9.4-beta.0",
-    "@saltcorn/sbadmin2": "0.9.4-beta.0",
+    "@saltcorn/base-plugin": "0.9.4-beta.10",
+    "@saltcorn/builder": "0.9.4-beta.10",
+    "@saltcorn/data": "0.9.4-beta.10",
+    "@saltcorn/admin-models": "0.9.4-beta.10",
+    "@saltcorn/filemanager": "0.9.4-beta.10",
+    "@saltcorn/markup": "0.9.4-beta.10",
+    "@saltcorn/sbadmin2": "0.9.4-beta.10",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",
@@ -90,14 +90,14 @@
       "/plugin_packages/"
     ],
     "moduleNameMapper": {
-      "@saltcorn/sqlite/(.*)": "@saltcorn/sqlite/dist/$1",
-      "@saltcorn/db-common/(.*)": "@saltcorn/db-common/dist/$1",
-      "@saltcorn/data/(.*)": "@saltcorn/data/dist/$1",
-      "@saltcorn/types/(.*)": "@saltcorn/types/dist/$1",
-      "@saltcorn/markup$": "@saltcorn/markup/dist",
-      "@saltcorn/markup/(.*)": "@saltcorn/markup/dist/$1",
-      "@saltcorn/server/(.*)": "@saltcorn/server/dist/$1",
-      "@saltcorn/admin-models/(.*)": "@saltcorn/admin-models/dist/$1"
+      "@saltcorn/sqlite/(.*)": "<rootDir>/../sqlite/dist/$1",
+      "@saltcorn/db-common/(.*)": "<rootDir>/../db-common/dist/$1",
+      "@saltcorn/data/(.*)": "<rootDir>/../saltcorn-data/dist/$1",
+      "@saltcorn/types/(.*)": "<rootDir>/../saltcorn-types/dist/$1",
+      "@saltcorn/markup$": "<rootDir>/../saltcorn-markup/dist",
+      "@saltcorn/markup/(.*)": "<rootDir>/../saltcorn-markup/dist/$1",
+      "@saltcorn/server/(.*)": "<rootDir>/../server/dist/$1",
+      "@saltcorn/admin-models/(.*)": "<rootDir>/../saltcorn-admin-models/dist/$1"
     }
   },
   "publishConfig": {

package/public/saltcorn-builder.css

@@ -54,16 +54,34 @@ div.builder-embed-view {
       rgba(0, 0, 0, 0) 100%
     );
 }
+
+.builder-left-enlarged div.toolbox-card.componets-and-library-accordion {
+  width: 13.35rem;
+  padding-right: 1rem;
+  margin-bottom: 1rem;
+}
+
 div.toolbox-card {
   width: 9.2rem;
   padding-right: 1rem;
   margin-bottom: 1rem;
 }
-div.wrap-builder-elem {
+
+.builder-left-enlarged div.wrap-builder-elem {
+  width: 33%;
+  height: 4rem;
+  position: relative;
+}
+.builder-left-shrunk div.wrap-builder-elem {
   width: 50%;
   height: 4rem;
   position: relative;
 }
+
+.builder-left-enlarged div.toolbox-card div.wrap-builder-elem:nth-child(2) {
+  border-right: 1px solid #bcbcbc;
+}
+
 div.toolbox-card div.wrap-builder-elem:nth-child(1) {
   border-right: 1px solid #bcbcbc;
 }

package/public/saltcorn.css

@@ -498,3 +498,7 @@ table.help-md th:nth-child(2) {
 tr[onclick] {
   cursor: pointer;
 }
+
+.editStarRating i.fa-star {
+  color: unset;
+}

package/public/saltcorn.js

@@ -376,6 +376,7 @@ function ajax_modal(url, opts = {}) {
     success: function (res, textStatus, request) {
       var title = request.getResponseHeader("Page-Title");
       var width = request.getResponseHeader("SaltcornModalWidth");
+      var minwidth = request.getResponseHeader("SaltcornModalMinWidth");
       var saveIndicate = !!request.getResponseHeader(
         "SaltcornModalSaveIndicator"
       );
@@ -386,6 +387,8 @@ function ajax_modal(url, opts = {}) {
       else $(".sc-modal-linkout").hide();
       if (width) $(".modal-dialog").css("max-width", width);
       else $(".modal-dialog").css("max-width", "");
+      if (minwidth) $(".modal-dialog").css("min-width", minwidth);
+      else $(".modal-dialog").css("min-width", "");
       if (title) $("#scmodal .modal-title").html(decodeURIComponent(title));
       $("#scmodal .modal-body").html(res);
       $("#scmodal").prop("data-modal-state", url);
@@ -687,7 +690,7 @@ function make_unique_field(
   );
 }
 function test_formula(tablename, stored) {
-  var formula = $("input[name=expression]").val();
+  var formula = $("input[name=expression],textarea[name=expression]").val();
   ajax_post(`/field/test-formula`, {
     data: { formula, tablename, stored },
     success: (data) => {

package/restart_watcher.js

@@ -15,6 +15,7 @@ const { eachTenant } = require("@saltcorn/admin-models/models/tenant");
  */
 const relevantPackages = [
   "db-common",
+  "common-code",
   "postgres",
   "saltcorn-data",
   "saltcorn-builder",

package/routes/actions.js

@@ -14,6 +14,8 @@ const {
 const { getState } = require("@saltcorn/data/db/state");
 const Trigger = require("@saltcorn/data/models/trigger");
 const { getTriggerList } = require("./common_lists");
+const TagEntry = require("@saltcorn/data/models/tag_entry");
+const Tag = require("@saltcorn/data/models/tag");
 
 /**
  * @type {object}
@@ -77,7 +79,20 @@ router.get(
   "/",
   isAdmin,
   error_catcher(async (req, res) => {
-    const triggers = await Trigger.findAllWithTableName();
+    let triggers = await Trigger.findAllWithTableName();
+    let filterOnTag;
+
+    if (req.query._tag) {
+      const tagEntries = await TagEntry.find({
+        tag_id: +req.query._tag,
+        not: { trigger_id: null },
+      });
+      const tagged_trigger_ids = new Set(
+        tagEntries.map((te) => te.trigger_id).filter(Boolean)
+      );
+      triggers = triggers.filter((t) => tagged_trigger_ids.has(t.id));
+      filterOnTag = await Tag.findOne({ id: +req.query._tag });
+    }
     const actions = await getActions();
     send_events_page({
       res,
@@ -89,7 +104,7 @@ router.get(
             type: "card",
             title: req.__("Triggers"),
             contents: div(
-              getTriggerList(triggers, req),
+              await getTriggerList(triggers, req, { filterOnTag }),
               link("/actions/new", req.__("Add trigger"))
             ),
           },