Skip to content

Fix not found page shows when going back from WS list after open a WS join link #46021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Julesssss merged 3 commits into from
Jul 29, 2024
Merged

Fix not found page shows when going back from WS list after open a WS join link #46021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eac73b2
replaces old setting route with the new setting route
bernhardoj Jul 23, 2024
02da16c
navigate to setting on small screen
bernhardoj Jul 29, 2024
ffbfa35
Merge branch 'main' into fix/44845-not-found-page-going-back-from-ws-…
bernhardoj Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/ROUTES.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ const ROUTES = {
// This route renders the list of reports.
HOME: 'home',

ALL_SETTINGS: 'all-settings',

SEARCH_CENTRAL_PANE: {
route: 'search',
getRoute: ({query, isCustomQuery = false, policyIDs}: {query: SearchQueryString; isCustomQuery?: boolean; policyIDs?: string}) =>
Expand Down
1 change: 0 additions & 1 deletion src/SCREENS.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ const PROTECTED_SCREENS = {

const SCREENS = {
...PROTECTED_SCREENS,
ALL_SETTINGS: 'AllSettings',
REPORT: 'Report',
PROFILE_AVATAR: 'ProfileAvatar',
WORKSPACE_AVATAR: 'WorkspaceAvatar',
Expand Down
4 changes: 4 additions & 0 deletions src/libs/navigateAfterJoinRequest/index.desktop.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import getIsSmallScreenWidth from '@libs/getIsSmallScreenWidth';
import Navigation from '@navigation/Navigation';
import ROUTES from '@src/ROUTES';

const navigateAfterJoinRequest = () => {
Navigation.goBack(undefined, false, true);
if (getIsSmallScreenWidth()) {
Navigation.navigate(ROUTES.SETTINGS);
}
Navigation.navigate(ROUTES.SETTINGS_WORKSPACES);
};
export default navigateAfterJoinRequest;
2 changes: 1 addition & 1 deletion src/libs/navigateAfterJoinRequest/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import ROUTES from '@src/ROUTES';

const navigateAfterJoinRequest = () => {
Navigation.goBack(undefined, false, true);
Navigation.navigate(ROUTES.ALL_SETTINGS);
Navigation.navigate(ROUTES.SETTINGS);
Comment thread
Julesssss marked this conversation as resolved.
Navigation.navigate(ROUTES.SETTINGS_WORKSPACES);
};
export default navigateAfterJoinRequest;
4 changes: 4 additions & 0 deletions src/libs/navigateAfterJoinRequest/index.web.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import getIsSmallScreenWidth from '@libs/getIsSmallScreenWidth';
import Navigation from '@navigation/Navigation';
import ROUTES from '@src/ROUTES';

const navigateAfterJoinRequest = () => {
Navigation.goBack(undefined, false, true);
if (getIsSmallScreenWidth()) {
Navigation.navigate(ROUTES.SETTINGS);
}
Navigation.navigate(ROUTES.SETTINGS_WORKSPACES);
};
export default navigateAfterJoinRequest;