fix: infinite rerender fix, refetch fix

jwplayer · Jul 17, 2023 · c8acc0f · c8acc0f
1 parent 1c7a537
commit c8acc0f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/components/Root/Root.tsx b/src/components/Root/Root.tsx
@@ -1,7 +1,7 @@
 import React, { FC, useEffect, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useQuery } from 'react-query';
-import { Navigate, useSearchParams } from 'react-router-dom';
+import { Navigate, useLocation, useSearchParams } from 'react-router-dom';
 
 import ErrorPage from '#components/ErrorPage/ErrorPage';
 import AccountModal from '#src/containers/AccountModal/AccountModal';
@@ -25,6 +25,7 @@ const Root: FC = () => {
   });
 
   const [searchParams, setSearchParams] = useSearchParams();
+  const location = useLocation();
 
   const configSource = useMemo(() => getConfigSource(searchParams, settingsQuery.data), [searchParams, settingsQuery.data]);
 
@@ -46,7 +47,7 @@ const Root: FC = () => {
     registerCustomScreens();
   }, []);
 
-  const userData = useAccountStore((s) => ({ loading: s.loading, user: s.user, profile: s.profile }));
+  const userData = useAccountStore((s) => ({ loading: s.loading, user: s.user, profile: s.profile, canManageProfiles: s.canManageProfiles }));
 
   if (userData.user && !userData.loading && window.location.href.includes('#token')) {
     return <Navigate to="/" />; // component instead of hook to prevent extra re-renders
@@ -59,7 +60,7 @@ const Root: FC = () => {
     return <LoadingOverlay />;
   }
 
-  if (!userData.profile) {
+  if (userData.canManageProfiles && !userData.profile && !location.pathname.includes('/u/profiles')) {
     return <Navigate to="/u/profiles" />;
   }
 

diff --git a/src/components/UserMenu/UserMenu.tsx b/src/components/UserMenu/UserMenu.tsx
@@ -32,7 +32,7 @@ const UserMenu = ({ showPaymentsItem, small = false, onClick }: Props) => {
   const { data, isFetching } = useListProfiles();
   const profiles = data?.responseData.collection;
 
-  if (!profiles?.length) {
+  if (canManageProfiles && !profiles?.length) {
     unpersistProfile();
     navigate('/u/profiles');
   }

diff --git a/src/containers/Profiles/Profiles.tsx b/src/containers/Profiles/Profiles.tsx
@@ -26,12 +26,16 @@ const Profiles = ({ editMode = false }: Props) => {
     if (!canManageProfiles) navigate('/');
   }, [canManageProfiles, navigate]);
 
-  const { data, isLoading, isFetching } = useListProfiles();
+  const { data, isLoading, isFetching, refetch } = useListProfiles();
   const activeProfiles = data?.responseData.collection.length || 0;
   const canAddNew = activeProfiles < MAX_PROFILES;
 
   const selectProfile = useSelectProfile();
 
+  useEffect(() => {
+    refetch();
+  }, [refetch]);
+
   if (loading || isLoading || isFetching) return <LoadingOverlay inline />;
 
   return (