Add standard object to left pannel when required

twentyhq · May 27, 2024 · caa7c1b · caa7c1b
1 parent f1d778a
commit caa7c1b
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 9 deletions.
diff --git a/packages/twenty-front/src/modules/favorites/components/Favorites.tsx b/packages/twenty-front/src/modules/favorites/components/Favorites.tsx
@@ -1,8 +1,8 @@
 import styled from '@emotion/styled';
 import { Avatar } from 'twenty-ui';
 
-import { useIsLogged } from '@/auth/hooks/useIsLogged';
 import { FavoritesSkeletonLoader } from '@/favorites/components/FavoritesSkeletonLoader';
+import { useIsMockedDrawerPage } from '@/navigation/hooks/useIsMockedDrawerPage';
 import { useIsPrefetchLoading } from '@/prefetch/hooks/useIsPrefetchLoading';
 import { DraggableItem } from '@/ui/layout/draggable-list/components/DraggableItem';
 import { DraggableList } from '@/ui/layout/draggable-list/components/DraggableList';
@@ -36,9 +36,11 @@ const StyledNavigationDrawerItem = styled(NavigationDrawerItem)`
 export const Favorites = () => {
   const { favorites, handleReorderFavorite } = useFavorites();
   const loading = useIsPrefetchLoading();
-  const isLogged = useIsLogged();
+  const isMockedDrawerPage = useIsMockedDrawerPage();
 
-  if (loading && isLogged) {
+  const displayLoader = loading && !isMockedDrawerPage;
+
+  if (displayLoader) {
     return <FavoritesSkeletonLoader />;
   }
 

diff --git a/packages/twenty-front/src/modules/navigation/hooks/useIsMockedDrawerPage.ts b/packages/twenty-front/src/modules/navigation/hooks/useIsMockedDrawerPage.ts
@@ -0,0 +1,12 @@
+import { AppPath } from '@/types/AppPath';
+import { useIsMatchingLocation } from '~/hooks/useIsMatchingLocation';
+
+export const useIsMockedDrawerPage = () => {
+  const isMatchingLocation = useIsMatchingLocation();
+  return (
+    isMatchingLocation(AppPath.SignInUp) ||
+    isMatchingLocation(AppPath.PlanRequired) ||
+    isMatchingLocation(AppPath.PlanRequiredSuccess) ||
+    isMatchingLocation(AppPath.CreateWorkspace)
+  );
+};
diff --git a/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataNavItems.tsx b/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataNavItems.tsx
@@ -1,7 +1,7 @@
 import { useLocation } from 'react-router-dom';
 import { useIcons } from 'twenty-ui';
 
-import { useIsLogged } from '@/auth/hooks/useIsLogged';
+import { useIsMockedDrawerPage } from '@/navigation/hooks/useIsMockedDrawerPage';
 import { ObjectMetadataNavItemsSkeletonLoader } from '@/object-metadata/components/ObjectMetadataNavItemsSkeletonLoader';
 import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
 import { useIsPrefetchLoading } from '@/prefetch/hooks/useIsPrefetchLoading';
@@ -18,9 +18,11 @@ export const ObjectMetadataNavItems = () => {
 
   const { records: views } = usePrefetchedData<View>(PrefetchKey.AllViews);
   const loading = useIsPrefetchLoading();
-  const isLogged = useIsLogged();
+  const isMockedDrawerPage = useIsMockedDrawerPage();
 
-  if (loading && isLogged) {
+  const displayLoader = loading && !isMockedDrawerPage;
+
+  if (displayLoader) {
     return <ObjectMetadataNavItemsSkeletonLoader />;
   }
 

diff --git a/...t/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle.tsx b/...t/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled';
 
-import { useIsLogged } from '@/auth/hooks/useIsLogged';
+import { useIsMockedDrawerPage } from '@/navigation/hooks/useIsMockedDrawerPage';
 import { useIsPrefetchLoading } from '@/prefetch/hooks/useIsPrefetchLoading';
 import { NavigationDrawerSectionTitleSkeletonLoader } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitleSkeletonLoader';
 
@@ -21,9 +21,11 @@ export const NavigationDrawerSectionTitle = ({
   label,
 }: NavigationDrawerSectionTitleProps) => {
   const loading = useIsPrefetchLoading();
-  const isLogged = useIsLogged();
+  const isMockedDrawerPage = useIsMockedDrawerPage();
 
-  if (loading && isLogged) {
+  const displayLoader = loading && !isMockedDrawerPage;
+
+  if (displayLoader) {
     return <NavigationDrawerSectionTitleSkeletonLoader />;
   }
   return <StyledTitle>{label}</StyledTitle>;