honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(router): migration incorrectly replacing deprecated key (#39763) 

In #38762 we added a migration to replace the deprecated `preserveQueryParams`
option with `queryParamsHandling`, however due to a typo, we ended up replacing it
with `queryParamsHandler` which is invalid.

Fixes #39755.

PR Close #39763
This commit is contained in:
Kristiyan Kostadinov 2020-11-19 17:21:51 +01:00 committed by Andrew Kushnir
parent 61506404a9
commit 81d72a1e37
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/schematics/migrations.json
View File

@ -72,7 +72,7 @@
}, },
"migration-v11-router-preserve-query-params": { "migration-v11-router-preserve-query-params": {
"version": "11.0.0-beta", "version": "11.0.0-beta",
"description": "NavigationExtras.preserveQueryParams has been removed as of Angular version 11. This migration replaces any usages with the appropriate assignment of the queryParamsHandler key.", "description": "NavigationExtras.preserveQueryParams has been removed as of Angular version 11. This migration replaces any usages with the appropriate assignment of the queryParamsHandling key.",
"factory": "./migrations/router-preserve-query-params/index" "factory": "./migrations/router-preserve-query-params/index"
}, },
"migration-v11-router-initial-navigation-options": { "migration-v11-router-initial-navigation-options": {

4
packages/core/schematics/migrations/router-preserve-query-params/README.md
View File

@ -2,7 +2,7 @@
Previously the `NatigationExtras` property of `preserveQueryParams` defined what should be done with Previously the `NatigationExtras` property of `preserveQueryParams` defined what should be done with
query parameters on navigation. This migration updates the usages of `preserveQueryParams` to query parameters on navigation. This migration updates the usages of `preserveQueryParams` to
instead use the `queryParamsHandler` property. instead use the `queryParamsHandling` property.
#### Before #### Before
```ts ```ts
@ -29,7 +29,7 @@ export class MyComponent {
constructor(private _router: Router) {} constructor(private _router: Router) {}
goHome() { goHome() {
this._router.navigate('/', { queryParamsHandler: 'preserve', skipLocationChange: 'foo' }); this._router.navigate('/', { queryParamsHandling: 'preserve', skipLocationChange: 'foo' });
} }
} }
``` ```

2
packages/core/schematics/migrations/router-preserve-query-params/util.ts
View File

@ -56,7 +56,7 @@ export function migrateLiteral(
return ts.updateObjectLiteral( return ts.updateObjectLiteral(
node, node,
propertiesToKeep.concat( propertiesToKeep.concat(
ts.createPropertyAssignment('queryParamsHandler', ts.createIdentifier(`'preserve'`)))); ts.createPropertyAssignment('queryParamsHandling', ts.createIdentifier(`'preserve'`))));
} }
return ts.updateObjectLiteral(node, propertiesToKeep); return ts.updateObjectLiteral(node, propertiesToKeep);

6
packages/core/schematics/test/preserve_query_params_migration_spec.ts
View File

@ -71,7 +71,7 @@ describe('NavigationExtras preserveQueryParams migration', () => {
await runMigration(); await runMigration();
const content = tree.readContent('/index.ts'); const content = tree.readContent('/index.ts');
expect(content).toContain(`this._router.navigate('/', { queryParamsHandler: 'preserve' });`); expect(content).toContain(`this._router.navigate('/', { queryParamsHandling: 'preserve' });`);
}); });
it('`createUrlTree` function', async () => { it('`createUrlTree` function', async () => {
@ -114,7 +114,7 @@ describe('NavigationExtras preserveQueryParams migration', () => {
const content = tree.readContent('/index.ts'); const content = tree.readContent('/index.ts');
expect(content).toContain( expect(content).toContain(
`const config = { replaceUrl: true, fragment: 'foo', state: {}, queryParamsHandler: 'preserve' };`); `const config = { replaceUrl: true, fragment: 'foo', state: {}, queryParamsHandling: 'preserve' };`);
}); });
it('should remove when the value is `false`', async () => { it('should remove when the value is `false`', async () => {
@ -178,7 +178,7 @@ describe('NavigationExtras preserveQueryParams migration', () => {
const content = tree.readContent('/index.ts'); const content = tree.readContent('/index.ts');
expect(content).toContain( expect(content).toContain(
`this._router.navigate('/', { replaceUrl: true, fragment: 'foo', state: {}, queryParamsHandler: 'preserve' });`); `this._router.navigate('/', { replaceUrl: true, fragment: 'foo', state: {}, queryParamsHandling: 'preserve' });`);
}); });
it('should remove when the value is `false`', async () => { it('should remove when the value is `false`', async () => {