Skip to content

Commit 0039527

Browse files
authored
Merge pull request Expensify#65018 from software-mansion-labs/feature/kuba-nowakowski/redirection_path
Update Workspaces tab URLs to just workspaces to clearly differentiate them from Account-related URLs
2 parents 8ff8c1d + 08ab6fb commit 0039527

16 files changed

Lines changed: 1248 additions & 1011 deletions

File tree

contributingGuides/NAVIGATION.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ In Expensify, we use an extended implementation of this function because:
503503

504504
Here are examples how the state is generated based on route:
505505

506-
- `settings/workspaces/1/overview`
506+
- `workspaces/1/overview`
507507

508508
```json
509509
{
@@ -536,7 +536,7 @@ Here are examples how the state is generated based on route:
536536
"params": {
537537
"policyID": "1"
538538
},
539-
"path": "/settings/workspaces/1/overview",
539+
"path": "workspaces/1/overview",
540540
"key": "Workspace_Overview-key"
541541
}
542542
]

contributingGuides/NAVIGATION_TESTS.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333

3434
1. Open any workspace settings (Settings → Workspaces → Select any workspace)
3535
2. Click the Settings button on the bottom tab.
36-
3. Verify that the Workspace list is displayed (`/settings/workspaces`)
36+
3. Verify that the Workspace list is displayed (`/workspaces`)
3737
4. Select any workspace again.
3838
5. Reload the page.
3939
6. Click the Settings button on the bottom tab.
40-
7. Verify that the Workspace list is displayed (`/settings/workspaces`)
40+
7. Verify that the Workspace list is displayed (`/workspaces/`)
4141

4242

4343
#### The last visited screen in the settings tab is saved when switching between tabs
@@ -52,7 +52,7 @@
5252

5353
#### Going up to the workspace list page after refreshing on the workspace settings and pressing the up button
5454

55-
1. Open the workspace settings from the deep link (use a link in format: `/settings/workspaces/:policyID:/profile`)
55+
1. Open the workspace settings from the deep link (use a link in format: `/workspaces/:policyID:/profile`)
5656
2. Click the app’s back button.
5757
3. Verify if the workspace list is displayed.
5858

@@ -241,4 +241,4 @@ Linked issue: https://github.com/Expensify/App/issues/50177
241241
11. Go back.
242242
12. Verify you are navigated back to the employee size step.
243243
13. Go back.
244-
14. Verify you are navigated back to the Purpose step.
244+
14. Verify you are navigated back to the Purpose step.

contributingGuides/STYLE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -535,13 +535,13 @@ We need to change the `getRoute()` `policyID` argument type to allow `undefined`
535535
536536
```diff
537537
WORKSPACE_PROFILE_ADDRESS: {
538-
route: 'settings/workspaces/:policyID/profile/address',
539-
- getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`settings/workspaces/${policyID}/profile/address` as const, backTo),
538+
route: 'workspaces/:policyID/profile/address',
539+
- getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`workspaces/${policyID}/profile/address` as const, backTo),
540540
+ getRoute: (policyID: string | undefined, backTo?: string) => {
541541
+ if (!policyID) {
542542
+ Log.warn("Invalid policyID is used to build the WORKSPACE_PROFILE_ADDRESS route")
543543
+ }
544-
+ return getUrlWithBackToParam(`settings/workspaces/${policyID}/profile/address` as const, backTo);
544+
+ return getUrlWithBackToParam(`workspaces/${policyID}/profile/address` as const, backTo);
545545
+ },
546546
},
547547
```

help/ref/settings/workspaces/:policyId/index.md

Lines changed: 0 additions & 33 deletions
This file was deleted.

help/ref/settings/workspaces/:policyID/accounting/index.md renamed to help/ref/workspaces/:policyID/accounting/index.md

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/ROUTES.ts

Lines changed: 515 additions & 525 deletions
Large diffs are not rendered by default.

src/components/SidePanel/HelpContent/helpContentMap.tsx

Lines changed: 649 additions & 442 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)