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

Jump to bottom

Fix not found page display briefly after deleting the workspace #31255

Merged
merged 9 commits into from
Nov 14, 2023
Merged

Fix not found page display briefly after deleting the workspace #31255

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b068258
fix: 30100
dukenv0307 Oct 23, 2023
3038e7f
merge main
dukenv0307 Nov 13, 2023
3f98313
fix lint
dukenv0307 Nov 13, 2023
78fda3d
Merge branch 'main' into fix/30100
dukenv0307 Nov 14, 2023
a532c04
add variable
dukenv0307 Nov 14, 2023
b6facd7
fix lint
dukenv0307 Nov 14, 2023
b311a90
edit comment
dukenv0307 Nov 14, 2023
21d0e41
edit comment
dukenv0307 Nov 14, 2023
c57dc10
Update src/pages/workspace/WorkspaceInitialPage.js
dukenv0307 Nov 14, 2023
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
12 changes: 11 additions & 1 deletion src/pages/workspace/WorkspaceInitialPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
import Text from '@components/Text';
import Tooltip from '@components/Tooltip';
import useLocalize from '@hooks/useLocalize';
import usePrevious from '@hooks/usePrevious';
import useSingleExecution from '@hooks/useSingleExecution';
import useWaitForNavigation from '@hooks/useWaitForNavigation';
import useWindowDimensions from '@hooks/useWindowDimensions';
Expand Down Expand Up @@ -221,6 +222,15 @@ function WorkspaceInitialPage(props) {
return items;
}, [adminsRoom, announceRoom, translate]);

const prevPolicy = usePrevious(policy);

// eslint-disable-next-line rulesdir/no-negated-variables
const shouldShowNotFoundPage =
_.isEmpty(policy) ||
!PolicyUtils.isPolicyAdmin(policy) ||
// We check isPendingDelete for both policy and prevPolicy to prevent the NotFound view from showing right after we delete the workspace
(PolicyUtils.isPendingDeletePolicy(policy) && PolicyUtils.isPendingDeletePolicy(prevPolicy));

return (
<ScreenWrapper
includeSafeAreaPaddingBottom={false}
Expand All @@ -229,7 +239,7 @@ function WorkspaceInitialPage(props) {
{({safeAreaPaddingBottomStyle}) => (
<FullPageNotFoundView
onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)}
shouldShow={_.isEmpty(policy) || !PolicyUtils.isPolicyAdmin(policy) || PolicyUtils.isPendingDeletePolicy(policy)}
shouldShow={shouldShowNotFoundPage}
subtitleKey={_.isEmpty(policy) ? undefined : 'workspace.common.notAuthorized'}
>
<HeaderWithBackButton
Expand Down
Loading