saasufy-components 3.35.0 → 3.36.0

package/README.md

@@ -85,6 +85,7 @@ The following utility functions can be used anywhere inside template `{{expressi
 - Remove leading and trailing spaces from text: `{{trim('   test   ')}}`
 - Specify one or more fallback values in case values are null or undefined: `{{fallback(Product.imageSrc, 'path/to/default-image.png')}}`
 - Format UNIX timestamp as a human-readable date: `{{date(Product.updatedAt)}}`
+- Make a string safe by escaping HTML characters: `{{safeString(Product.name)}}`
 - Given an array of objects, extract the values from the specified field and join them together into a single comma-separated string: `{{joinFields(Product, 'name')}}`
 
 ### Special fields

package/app-router.js

@@ -186,24 +186,24 @@ export class AppRouter extends SocketConsumer {
       let hardRedirect = pageTemplate.hasAttribute('hard-redirect');
 
       if (authRedirect != null) {
+        routeArgs = this.computeRouteArgs(pagePath, regExp, params);
+        pagePath = this.substituteRouteAgs(authRedirect, routeArgs);
         if (hardRedirect) {
-          location.hash = authRedirect;
+          location.hash = pagePath;
           return;
         }
-        routeArgs = this.computeRouteArgs(pagePath, regExp, params);
-        pagePath = this.substituteRouteAgs(authRedirect, routeArgs);
         let result = this.getMatchingPage(pagePath, 'auth-redirect');
         pageTemplate = result.pageTemplate;
         route = result.route;
         regExp = result.regExp;
         params = result.params;
       } else if (noAuthRedirect != null) {
+        routeArgs = this.computeRouteArgs(pagePath, regExp, params);
+        pagePath = this.substituteRouteAgs(noAuthRedirect, routeArgs);
         if (hardRedirect) {
-          location.hash = noAuthRedirect;
+          location.hash = pagePath;
           return;
         }
-        routeArgs = this.computeRouteArgs(pagePath, regExp, params);
-        pagePath = this.substituteRouteAgs(noAuthRedirect, routeArgs);
         let result = this.getMatchingPage(pagePath, 'no-auth-redirect');
         pageTemplate = result.pageTemplate;
         route = result.route;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "saasufy-components",
-  "version": "3.35.0",
+  "version": "3.36.0",
   "description": "Components for Saasufy.",
   "main": "index.js",
   "scripts": {

package/utils.js

@@ -232,7 +232,8 @@ let templateFormatters = {
   combineFilters: (filterMap, useOr) => {
     return Object.values(filterMap || {}).join(useOr ? ' %OR% ' : ' %AND% ');
   },
-  computeId
+  computeId,
+  safeString: toSafeHTML
 };
 
 let templateTripleTagsRegExp = /{{{.*?}}}/gs;