Skip to content

fix: info request is triggered twice #142

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
Shelex wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: info request is triggered twice #142

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
5 changes: 2 additions & 3 deletions app/components/aside.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,12 @@ export const Aside: React.FC = () => {
const pathname = usePathname();
const session = useSession();
const { authRequired } = useAuthConfig();
const isAuthenticated = authRequired === false || session.status === 'authenticated';

const { data: serverInfo } = useQuery<ServerInfo>('/api/info', {
dependencies: [],
enabled: isAuthenticated,
});

const isAuthenticated = authRequired === false || session.status === 'authenticated';

return (
<Card className="w-16 h-full rounded-none border-r border-gray-200 dark:border-gray-800 dark:bg-black shadow-none">
<CardBody className="px-2 py-4">
Expand Down
23 changes: 13 additions & 10 deletions app/components/page-layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,20 @@ interface PageLayoutProps {
render: (props: { info: ServerDataInfo; onUpdate: () => void }) => React.ReactNode;
}

export default function PageLayout({ render }: PageLayoutProps) {
export default function PageLayout({ render }: Readonly<PageLayoutProps>) {
const { data: session, status } = useSession();
const authIsLoading = status === 'loading';
const { authRequired } = useAuthConfig();
const isAuthenticated = authRequired === false || status === 'authenticated';

const { data: info, error, refetch, isLoading: isInfoLoading } = useQuery<ServerDataInfo>('/api/info');
const {
data: info,
error,
refetch,
isLoading: isInfoLoading,
} = useQuery<ServerDataInfo>('/api/info', {
enabled: isAuthenticated,
});
const [refreshId, setRefreshId] = useState<string>(uuidv4());

useEffect(() => {
Expand All @@ -34,17 +42,12 @@ export default function PageLayout({ render }: PageLayoutProps) {
}, [authIsLoading, session, authRequired]);

useLayoutEffect(() => {
// Skip session check if auth is not required
if (authRequired === false) {
refetch();

// skip refetch is not authorized
if (authRequired && (authIsLoading || !session)) {
return;
}

if (authIsLoading || !session) {
return;
}
refetch();
refetch({ cancelRefetch: false });
}, [refreshId, session, authRequired]);

if (authIsLoading || isInfoLoading) {
Expand Down