Skip to content

Commit 68f4304

Browse files
committed
update old routes
1 parent ccbd6bd commit 68f4304

2 files changed

Lines changed: 18 additions & 0 deletions

File tree

src/libs/Navigation/linkingConfig/OldRoutes.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
const oldRoutes: Record<string, string> = {
22
/* eslint-disable @typescript-eslint/naming-convention */
33
'/settings/*/category/*/edit': '/settings/$1/category/$2/category-edit',
4+
'/settings/*/tags/*/edit': '/settings/$1/tags/settings/edit/$2',
5+
'/settings/*/tags/new': '/settings/$1/tags/tag-new',
6+
'/settings/*/tag/*/*/edit': '/settings/$1/tags/tag-settings/$2/$3/tag-edit/$2/$3',
7+
'/settings/*/tag/*/*/gl-code': '/settings/$1/tags/tag-settings/$2/$3/gl-code/$2/$3',
8+
'/settings/*/tag/*/*': '/settings/$1/tags/tag-settings/$2/$3',
49
'/workspaces/*/category/*/payroll-code': '/workspaces/$1/categories/category/$2/payroll-code',
510
'/workspaces/*/category/*/gl-code': '/workspaces/$1/categories/category/$2/gl-code',
611
'/workspaces/*/category/*/edit': '/workspaces/$1/categories/category/$2/edit',

tests/navigation/getMatchingNewRouteTest.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,19 @@ describe('getBestMatchingPath', () => {
7878
expect(getMatchingNewRoute('/settings/abc/category/Meals/edit?backTo=/home')).toBe('/settings/abc/category/Meals/category-edit?backTo=/home');
7979
});
8080

81+
it('redirects old settings tag routes to the new dynamic suffix shape', () => {
82+
expect(getMatchingNewRoute('/settings/p123/tags/10/edit')).toBe('/settings/p123/tags/settings/edit/10');
83+
expect(getMatchingNewRoute('/settings/p123/tags/new')).toBe('/settings/p123/tags/tag-new');
84+
expect(getMatchingNewRoute('/settings/p123/tag/10/Meals')).toBe('/settings/p123/tags/tag-settings/10/Meals');
85+
expect(getMatchingNewRoute('/settings/p123/tag/10/Meals/edit')).toBe('/settings/p123/tags/tag-settings/10/Meals/tag-edit/10/Meals');
86+
expect(getMatchingNewRoute('/settings/p123/tag/10/Meals/gl-code')).toBe('/settings/p123/tags/tag-settings/10/Meals/gl-code/10/Meals');
87+
});
88+
89+
it('preserves query params when redirecting old settings tag routes', () => {
90+
expect(getMatchingNewRoute('/settings/p123/tags/10/edit?backTo=/home')).toBe('/settings/p123/tags/settings/edit/10?backTo=/home');
91+
expect(getMatchingNewRoute('/settings/p123/tag/10/Meals?parentTagsFilter=Food')).toBe('/settings/p123/tags/tag-settings/10/Meals?parentTagsFilter=Food');
92+
});
93+
8194
it('redirects old flag comment path to report-based dynamic route', () => {
8295
expect(getMatchingNewRoute('/flag/123/456')).toBe('/r/123/flag/123/456');
8396
});

0 commit comments

Comments
 (0)