Merge pull request #396 from cah-briangantzler/fix-error

Stop the error caused by routeWillChange
NullVoxPopuli · Nov 16, 2021 · fcc20a6 · fcc20a6
2 parents c1106ea + aae63eb
commit fcc20a6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/addon/services/query-params.ts b/addon/services/query-params.ts
@@ -4,7 +4,6 @@ import { isPresent } from '@ember/utils';
 
 import * as qs from 'qs';
 
-import type Transition from '@ember/routing/-private/transition';
 import type RouterService from '@ember/routing/router-service';
 
 interface QueryParams {
@@ -29,8 +28,10 @@ export default class QueryParamsService extends Service {
 
     // TODO: drop support for Ember < 3.24 and use @ember/destroyable
     //       to not cause a memory leak in tests
-    this.router.on('routeDidChange', () => this.updateParams());
-    this.router.on('routeWillChange', (transition) => this.updateURL(transition));
+    this.router.on('routeDidChange', () => {
+      this.updateParams();
+      this.updateURL(this.router.currentRouteName);
+    });
   }
 
   get pathParts() {
@@ -62,8 +63,8 @@ export default class QueryParamsService extends Service {
    * throw them on the URL
    *
    */
-  private updateURL(transition: Transition) {
-    const path = this.router.urlFor(transition.to.name);
+  private updateURL(routeName: string) {
+    const path = this.router.urlFor(routeName);
     const { protocol, host, pathname, search, hash } = window.location;
     const queryParams = this.byPath[path];
     const existing = qs.parse(search.split('?')[1]);

diff --git a/tests/dummy/app/controllers/application.ts b/tests/dummy/app/controllers/application.ts
@@ -1,5 +1,5 @@
 import Controller from '@ember/controller';
 
 export default class Application extends Controller {
-  queryParams = ['a', 'b', 'foo', 'bar'];
+  queryParams = ['a', 'b'];
 }