Skip to content

Fix showing not found page after deleting a workspace #38488

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
pecanoro merged 5 commits into from
Mar 21, 2024
Merged

Fix showing not found page after deleting a workspace #38488

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f960ccc
Fix shouldShow in WorkspacePageWithSections
WojtekBoman Mar 18, 2024
7782d5e
Run prettier
WojtekBoman Mar 18, 2024
c98834f
Merge branch 'main' into fix/delete-workspace-not-found
WojtekBoman Mar 20, 2024
5ed9f31
Merge branch 'main' into fix/delete-workspace-not-found
WojtekBoman Mar 20, 2024
d8184b4
Fix showing not found page after deleting workspace
WojtekBoman Mar 20, 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
8 changes: 7 additions & 1 deletion src/pages/workspace/WorkspacePageWithSections.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
import ScreenWrapper from '@components/ScreenWrapper';
import ScrollViewWithContext from '@components/ScrollViewWithContext';
import useNetwork from '@hooks/useNetwork';
import usePrevious from '@hooks/usePrevious';
import useThemeStyles from '@hooks/useThemeStyles';
import useWindowDimensions from '@hooks/useWindowDimensions';
import BankAccount from '@libs/models/BankAccount';
Expand Down Expand Up @@ -127,6 +128,7 @@ function WorkspacePageWithSections({
const {isSmallScreenWidth} = useWindowDimensions();
const firstRender = useRef(true);
const isFocused = useIsFocused();
const prevPolicy = usePrevious(policy);

useEffect(() => {
// Because isLoading is false before merging in Onyx, we need firstRender ref to display loading page as well before isLoading is change to true
Expand All @@ -143,7 +145,11 @@ function WorkspacePageWithSections({
return true;
}

return (!isEmptyObject(policy) && !PolicyUtils.isPolicyAdmin(policy) && !shouldShowNonAdmin) || PolicyUtils.isPendingDeletePolicy(policy);
// We check isPendingDelete for both policy and prevPolicy to prevent the NotFound view from showing right after we delete the workspace
Copy link
Copy Markdown
Contributor

@ishpaul777 ishpaul777 Nov 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

coming from #49093, we should use PolicyUtils.shouldShowPolicy to check if workspace is deleted or not, More detaills #49093 (comment)

return (
(!isEmptyObject(policy) && !PolicyUtils.isPolicyAdmin(policy) && !shouldShowNonAdmin) ||
(PolicyUtils.isPendingDeletePolicy(policy) && PolicyUtils.isPendingDeletePolicy(prevPolicy))
);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [policy, shouldShowNonAdmin]);

Expand Down