Skip to content
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

fix: app shows full page notfound in ws features page #39835

Merged
merged 8 commits into from
Apr 22, 2024
Merged

fix: app shows full page notfound in ws features page #39835

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
879c812
fix: app shows full page notfound in ws features page
nkdengineer Apr 8, 2024
8804b26
fix: lint
nkdengineer Apr 8, 2024
c6d8e37
resolve conflict
nkdengineer Apr 15, 2024
fa16d28
Merge branch 'main' into fix/39092
nkdengineer Apr 19, 2024
a2ed4ca
resolve conflict
nkdengineer Apr 19, 2024
78d8049
fix: full screen not found page
nkdengineer Apr 19, 2024
76f3363
Revert "fix: full screen not found page"
nkdengineer Apr 19, 2024
68f258f
fix: full screen not found page
nkdengineer Apr 19, 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
16 changes: 16 additions & 0 deletions src/pages/workspace/AdminPolicyAccessOrNotFoundWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
import React, {useEffect} from 'react';
import type {OnyxEntry} from 'react-native-onyx';
import {withOnyx} from 'react-native-onyx';
import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
import FullscreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
import ScreenWrapper from '@components/ScreenWrapper';
import Navigation from '@libs/Navigation/Navigation';
import * as PolicyUtils from '@libs/PolicyUtils';
import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
Expand Down Expand Up @@ -50,11 +52,25 @@ function AdminPolicyAccessOrNotFoundComponent(props: AdminPolicyAccessOrNotFound
}

if (shouldShowNotFoundPage) {
const isPolicyNotAccessible = isEmptyObject(props.policy) || !props.policy?.id;

if (isPolicyNotAccessible) {
return (
<ScreenWrapper testID={AdminPolicyAccessOrNotFoundComponent.displayName}>
<FullPageNotFoundView
shouldShow
shouldForceFullScreen
onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)}
/>
</ScreenWrapper>
);
}
return <NotFoundPage onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_PROFILE.getRoute(props.policyID))} />;
}

return typeof props.children === 'function' ? props.children(props) : props.children;
}
AdminPolicyAccessOrNotFoundComponent.displayName = 'AdminPolicyAccessOrNotFoundComponent';

export default withOnyx<AdminPolicyAccessOrNotFoundComponentProps, AdminAccessOrNotFoundOnyxProps>({
policy: {
Expand Down
Loading