fix(linked-items): don't transition to index route

adfinis · Feb 2, 2022 · 8461794 · 8461794
1 parent ab5edf9
commit 8461794
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/addon/components/-private/linked-list-item.js b/addon/components/-private/linked-list-item.js
@@ -62,19 +62,25 @@ export default class LinkedListItemComponent extends Component {
 
     if (!routeInfo) return null;
 
-    return { routeInfo, dynamicSegments: getParams(routeInfo) };
+    return {
+      name: routeInfo.name.replace(/\.index$/, ""),
+      args: [
+        ...getParams(routeInfo),
+        ...(Object.keys(routeInfo.queryParams)
+          ? [{ queryParams: routeInfo.queryParams }]
+          : []),
+      ],
+    };
   }
 
   get active() {
     if (!this.route || this.args.active !== undefined) {
       return this.args.active ?? false;
     }
 
-    const { routeInfo, dynamicSegments } = this.route;
+    const { name, args } = this.route;
 
-    return this.router.isActive(routeInfo.name, ...dynamicSegments, {
-      queryParams: routeInfo.queryParams,
-    });
+    return this.router.isActive(name, ...args);
   }
 
   @action
@@ -84,10 +90,8 @@ export default class LinkedListItemComponent extends Component {
     if (typeof this.args.onClick === "function") {
       this.args.onClick(...[event, this.href].filter(Boolean));
     } else if (this.route) {
-      const { routeInfo, dynamicSegments } = this.route;
-      this.router.transitionTo(routeInfo.name, ...dynamicSegments, {
-        queryParams: routeInfo.queryParams,
-      });
+      const { name, args } = this.route;
+      this.router.transitionTo(name, ...args);
     }
   }
 }