@singularsystems/neo-react 1.3.0 → 1.3.1

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This file details all new features and changes to functionality. If you only need to see changes that require updates to your project, see the [breaking changes](./Breaking.md) readme.
 
+## Version 1.3.1
+
+- Routing - Fixed an issue where the base route would take precedence over other routes if it had parameters, and was declared before other routes.
+
 ## Version 1.3.0
 
 - ViewBase and ViewComponentBase now require that the linked view model has a `TaskRunner` as the first argument. See breaking changes for more info.

package/dist/ReactComponents/Icons/MaterialSymbolsFontFactory.js

@@ -118,5 +118,6 @@ var neoFontAwesomeMappings = [
     ["greater-than-equal", ""],
     ["stamp", "approval"],
     ["circle-notch", "progress_activity"],
-    ["cube", "deployed_code"]
+    ["cube", "deployed_code"],
+    ["paper-plane", "send"]
 ];

package/dist/Routing/RouteProvider.d.ts

@@ -10,6 +10,7 @@ export interface IProcessedRoute extends Routing.IRoute {
     path: string;
     /** Route params in order, excluding query parameters. */
     params: INamedRouteParameter[];
+    order: number;
 }
 type ParamsObject = {
     [index: string]: string | undefined;

package/dist/Routing/RouteProvider.js

@@ -22,9 +22,7 @@ var RouteProvider = /** @class */ (function () {
         this.staticRoutes = this.allRoutes.filter(function (c) { return c.params.length === 0; });
         this.parameterisedRoutes = this.allRoutes
             .filter(function (c) { return c.params.length > 0; })
-            .map(function (route) { return ({ route: route, order: route.path.split("/").length }); })
-            .sortBy(function (c) { return c.order; }, "desc")
-            .map(function (c) { return c.route; });
+            .sortBy(function (c) { return c.order; }, "desc");
     }
     /** Gets the path the component is bound to. If the component is bound to multiple paths, the first path is returned. */
     RouteProvider.prototype.getPathForComponent = function (component) {
@@ -108,7 +106,7 @@ var RouteProvider = /** @class */ (function () {
      * Adds a unique key, and adds route parameters extracted from the component static params object.
      */
     RouteProvider.prototype.processRoute = function (into, route) {
-        var processed = __assign(__assign({}, route), { path: route.path, params: [], key: this.key++ });
+        var processed = __assign(__assign({}, route), { path: route.path, params: [], key: this.key++, order: 0 });
         if (route instanceof MenuRoute) {
             processed.path = route.basePath;
         }
@@ -116,6 +114,9 @@ var RouteProvider = /** @class */ (function () {
         if (processed.path.length > 1 && processed.path.endsWith("/")) {
             processed.path = processed.path.substring(0, processed.path.length - 1);
         }
+        if (processed.path.length > 1) {
+            processed.order = processed.path.split("/").length;
+        }
         var viewBaseComponent = route.component;
         if (viewBaseComponent.params) {
             for (var param in viewBaseComponent.params) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@singularsystems/neo-react",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "React application logic and components for the Neo client library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",