Skip to content

fix: reorder render to fix project error -- Rendered fewer hooks tha… #7073

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: reorder render to fix project error -- Rendered fewer hooks tha… #7073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 4 deletions packages/web/app/src/pages/organization.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,10 +348,6 @@ function OrganizationPageContent(
});
}, [projectsConnection, props.search, sortKey, sortOrder]);

if (query.error) {
return <QueryError organizationSlug={props.organizationSlug} error={query.error} />;
}

const onSearchChange = useCallback(
(event: ChangeEvent<HTMLInputElement>) => {
void router.navigate({
Expand Down Expand Up @@ -392,6 +388,10 @@ function OrganizationPageContent(
});
}, [router, props.sortOrder]);

if (query.error) {
return <QueryError organizationSlug={props.organizationSlug} error={query.error} />;
}

return (
<OrganizationLayout
page={Page.Overview}
Expand Down
20 changes: 10 additions & 10 deletions packages/web/app/src/pages/project.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,16 +304,6 @@ const ProjectsPageContent = (
return 100;
}, [targetConnection?.edges]);

if (query.error) {
return (
<QueryError
organizationSlug={props.organizationSlug}
error={query.error}
showLogoutButton={false}
/>
);
}

const onSearchChange = useCallback(
(event: ChangeEvent<HTMLInputElement>) => {
void router.navigate({
Expand Down Expand Up @@ -354,6 +344,16 @@ const ProjectsPageContent = (
});
}, [router, props.sortOrder]);

if (query.error) {
return (
<QueryError
organizationSlug={props.organizationSlug}
error={query.error}
showLogoutButton={false}
/>
);
}

return (
<div className="grow">
<div className="flex flex-row items-center justify-between py-6">
Expand Down
Loading