Add loader and transition for details page tabs (#5935)

Closes https://github.com/twentyhq/twenty/issues/5656



https://github.com/twentyhq/twenty/assets/22936103/3e4beea2-9aa9-4015-bb99-ee22adb53b63

packages/twenty-front/src/modules/activities/calendar/components/Calendar.tsx

@@ -9,6 +9,7 @@ import { useCalendarEvents } from '@/activities/calendar/hooks/useCalendarEvents
 import { getTimelineCalendarEventsFromCompanyId } from '@/activities/calendar/queries/getTimelineCalendarEventsFromCompanyId';
 import { getTimelineCalendarEventsFromPersonId } from '@/activities/calendar/queries/getTimelineCalendarEventsFromPersonId';
 import { CustomResolverFetchMoreLoader } from '@/activities/components/CustomResolverFetchMoreLoader';
+import { SkeletonLoader } from '@/activities/components/SkeletonLoader';
 import { useCustomResolver } from '@/activities/hooks/useCustomResolver';
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
@@ -18,6 +19,7 @@ import {
   AnimatedPlaceholderEmptySubTitle,
   AnimatedPlaceholderEmptyTextContainer,
   AnimatedPlaceholderEmptyTitle,
+  EMPTY_PLACEHOLDER_TRANSITION_PROPS,
 } from '@/ui/layout/animated-placeholder/components/EmptyPlaceholderStyled';
 import { Section } from '@/ui/layout/section/components/Section';
 import { TimelineCalendarEventsWithTotal } from '~/generated/graphql';
@@ -74,14 +76,16 @@ export const Calendar = ({
   } = useCalendarEvents(timelineCalendarEvents || []);
 
   if (firstQueryLoading) {
-    // TODO: implement loader
+    return <SkeletonLoader />;
-    return;
   }
 
   if (!firstQueryLoading && !timelineCalendarEvents?.length) {
     // TODO: change animated placeholder
     return (
-      <AnimatedPlaceholderEmptyContainer>
+      <AnimatedPlaceholderEmptyContainer
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...EMPTY_PLACEHOLDER_TRANSITION_PROPS}
+      >
         <AnimatedPlaceholder type="noMatchRecord" />
         <AnimatedPlaceholderEmptyTextContainer>
           <AnimatedPlaceholderEmptyTitle>

packages/twenty-front/src/modules/activities/components/SkeletonLoader.tsx

@@ -18,18 +18,14 @@ const StyledSkeletonSubSection = styled.div`
   gap: ${({ theme }) => theme.spacing(4)};
 `;
 
-const StyledSkeletonColumn = styled.div`
+const StyledSkeletonSubSectionContent = styled.div`
   display: flex;
   flex-direction: column;
   gap: ${({ theme }) => theme.spacing(3)};
   justify-content: center;
 `;
 
-const StyledSkeletonLoader = ({
+const SkeletonColumnLoader = ({ height }: { height: number }) => {
-  isSecondColumn,
-}: {
-  isSecondColumn: boolean;
-}) => {
   const theme = useTheme();
   return (
     <SkeletonTheme
@@ -37,12 +33,16 @@ const StyledSkeletonLoader = ({
       highlightColor={theme.background.transparent.lighter}
       borderRadius={80}
     >
-      <Skeleton width={24} height={isSecondColumn ? 120 : 84} />
+      <Skeleton width={24} height={height} />
     </SkeletonTheme>
   );
 };
 
-export const TimelineSkeletonLoader = () => {
+export const SkeletonLoader = ({
+  withSubSections = false,
+}: {
+  withSubSections?: boolean;
+}) => {
   const theme = useTheme();
   const skeletonItems = Array.from({ length: 3 }).map((_, index) => ({
     id: `skeleton-item-${index}`,
@@ -56,16 +56,17 @@ export const TimelineSkeletonLoader = () => {
     >
       <StyledSkeletonContainer>
         <Skeleton width={440} height={16} />
-        {skeletonItems.map(({ id }, index) => (
+        {withSubSections &&
-          <StyledSkeletonSubSection key={id}>
+          skeletonItems.map(({ id }, index) => (
-            <StyledSkeletonLoader isSecondColumn={index === 1} />
+            <StyledSkeletonSubSection key={id}>
-            <StyledSkeletonColumn>
+              <SkeletonColumnLoader height={index === 1 ? 120 : 84} />
-              <Skeleton width={400} height={24} />
+              <StyledSkeletonSubSectionContent>
-              <Skeleton width={400} height={24} />
+                <Skeleton width={400} height={24} />
-              {index === 1 && <Skeleton width={400} height={24} />}
+                <Skeleton width={400} height={24} />
-            </StyledSkeletonColumn>
+                {index === 1 && <Skeleton width={400} height={24} />}
-          </StyledSkeletonSubSection>
+              </StyledSkeletonSubSectionContent>
-        ))}
+            </StyledSkeletonSubSection>
+          ))}
       </StyledSkeletonContainer>
     </SkeletonTheme>
   );

packages/twenty-front/src/modules/activities/emails/components/EmailThreads.tsx

@@ -2,7 +2,7 @@ import styled from '@emotion/styled';
 import { H1Title, H1TitleFontColor } from 'twenty-ui';
 
 import { CustomResolverFetchMoreLoader } from '@/activities/components/CustomResolverFetchMoreLoader';
-import { EmailLoader } from '@/activities/emails/components/EmailLoader';
+import { SkeletonLoader } from '@/activities/components/SkeletonLoader';
 import { EmailThreadPreview } from '@/activities/emails/components/EmailThreadPreview';
 import { TIMELINE_THREADS_DEFAULT_PAGE_SIZE } from '@/activities/emails/constants/Messaging';
 import { getTimelineThreadsFromCompanyId } from '@/activities/emails/queries/getTimelineThreadsFromCompanyId';
@@ -16,6 +16,7 @@ import {
   AnimatedPlaceholderEmptySubTitle,
   AnimatedPlaceholderEmptyTextContainer,
   AnimatedPlaceholderEmptyTitle,
+  EMPTY_PLACEHOLDER_TRANSITION_PROPS,
 } from '@/ui/layout/animated-placeholder/components/EmptyPlaceholderStyled';
 import { Card } from '@/ui/layout/card/components/Card';
 import { Section } from '@/ui/layout/section/components/Section';
@@ -61,12 +62,15 @@ export const EmailThreads = ({
   const { totalNumberOfThreads, timelineThreads } = data?.[queryName] ?? {};
 
   if (firstQueryLoading) {
-    return <EmailLoader />;
+    return <SkeletonLoader />;
   }
 
   if (!firstQueryLoading && !timelineThreads?.length) {
     return (
-      <AnimatedPlaceholderEmptyContainer>
+      <AnimatedPlaceholderEmptyContainer
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...EMPTY_PLACEHOLDER_TRANSITION_PROPS}
+      >
         <AnimatedPlaceholder type="emptyInbox" />
         <AnimatedPlaceholderEmptyTextContainer>
           <AnimatedPlaceholderEmptyTitle>

packages/twenty-front/src/modules/activities/files/components/Attachments.tsx

@@ -1,8 +1,8 @@
 import { ChangeEvent, useRef, useState } from 'react';
 import styled from '@emotion/styled';
-import { isNonEmptyArray } from '@sniptt/guards';
 import { IconPlus } from 'twenty-ui';
 
+import { SkeletonLoader } from '@/activities/components/SkeletonLoader';
 import { AttachmentList } from '@/activities/files/components/AttachmentList';
 import { DropZone } from '@/activities/files/components/DropZone';
 import { useAttachments } from '@/activities/files/hooks/useAttachments';
@@ -15,6 +15,7 @@ import {
   AnimatedPlaceholderEmptySubTitle,
   AnimatedPlaceholderEmptyTextContainer,
   AnimatedPlaceholderEmptyTitle,
+  EMPTY_PLACEHOLDER_TRANSITION_PROPS,
 } from '@/ui/layout/animated-placeholder/components/EmptyPlaceholderStyled';
 import { isDefined } from '~/utils/isDefined';
 
@@ -41,7 +42,7 @@ export const Attachments = ({
   targetableObject: ActivityTargetableObject;
 }) => {
   const inputFileRef = useRef<HTMLInputElement>(null);
-  const { attachments } = useAttachments(targetableObject);
+  const { attachments, loading } = useAttachments(targetableObject);
   const { uploadAttachmentFile } = useUploadAttachmentFile();
 
   const [isDraggingFile, setIsDraggingFile] = useState(false);
@@ -58,7 +59,13 @@ export const Attachments = ({
     await uploadAttachmentFile(file, targetableObject);
   };
 
-  if (!isNonEmptyArray(attachments)) {
+  const isAttachmentsEmpty = !attachments || attachments.length === 0;
+
+  if (loading && isAttachmentsEmpty) {
+    return <SkeletonLoader />;
+  }
+
+  if (isAttachmentsEmpty) {
     return (
       <StyledDropZoneContainer onDragEnter={() => setIsDraggingFile(true)}>
         {isDraggingFile ? (
@@ -67,7 +74,10 @@ export const Attachments = ({
             onUploadFile={onUploadFile}
           />
         ) : (
-          <AnimatedPlaceholderEmptyContainer>
+          <AnimatedPlaceholderEmptyContainer
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...EMPTY_PLACEHOLDER_TRANSITION_PROPS}
+          >
             <AnimatedPlaceholder type="noFile" />
             <AnimatedPlaceholderEmptyTextContainer>
               <AnimatedPlaceholderEmptyTitle>

packages/twenty-front/src/modules/activities/files/hooks/useAttachments.tsx

@@ -4,13 +4,12 @@ import { getActivityTargetObjectFieldIdName } from '@/activities/utils/getActivi
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 
-// do we need to test this?
 export const useAttachments = (targetableObject: ActivityTargetableObject) => {
   const targetableObjectFieldIdName = getActivityTargetObjectFieldIdName({
     nameSingular: targetableObject.targetObjectNameSingular,
   });
 
-  const { records: attachments } = useFindManyRecords<Attachment>({
+  const { records: attachments, loading } = useFindManyRecords<Attachment>({
     objectNameSingular: CoreObjectNameSingular.Attachment,
     filter: {
       [targetableObjectFieldIdName]: {
@@ -26,5 +25,6 @@ export const useAttachments = (targetableObject: ActivityTargetableObject) => {
 
   return {
     attachments,
+    loading,
   };
 };

packages/twenty-front/src/modules/activities/notes/components/Notes.tsx

@@ -1,6 +1,7 @@
 import styled from '@emotion/styled';
 import { IconPlus } from 'twenty-ui';
 
+import { SkeletonLoader } from '@/activities/components/SkeletonLoader';
 import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer';
 import { NoteList } from '@/activities/notes/components/NoteList';
 import { useNotes } from '@/activities/notes/hooks/useNotes';
@@ -12,6 +13,7 @@ import {
   AnimatedPlaceholderEmptySubTitle,
   AnimatedPlaceholderEmptyTextContainer,
   AnimatedPlaceholderEmptyTitle,
+  EMPTY_PLACEHOLDER_TRANSITION_PROPS,
 } from '@/ui/layout/animated-placeholder/components/EmptyPlaceholderStyled';
 
 const StyledNotesContainer = styled.div`
@@ -27,13 +29,22 @@ export const Notes = ({
 }: {
   targetableObject: ActivityTargetableObject;
 }) => {
-  const { notes } = useNotes(targetableObject);
+  const { notes, loading } = useNotes(targetableObject);
 
   const openCreateActivity = useOpenCreateActivityDrawer();
 
-  if (notes?.length === 0) {
+  const isNotesEmpty = !notes || notes.length === 0;
+
+  if (loading && isNotesEmpty) {
+    return <SkeletonLoader />;
+  }
+
+  if (isNotesEmpty) {
     return (
-      <AnimatedPlaceholderEmptyContainer>
+      <AnimatedPlaceholderEmptyContainer
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...EMPTY_PLACEHOLDER_TRANSITION_PROPS}
+      >
         <AnimatedPlaceholder type="noNote" />
         <AnimatedPlaceholderEmptyTextContainer>
           <AnimatedPlaceholderEmptyTitle>
@@ -62,7 +73,7 @@ export const Notes = ({
     <StyledNotesContainer>
       <NoteList
         title="All"
-        notes={notes ?? []}
+        notes={notes}
         button={
           <Button
             Icon={IconPlus}

packages/twenty-front/src/modules/activities/tasks/components/TaskGroups.tsx

@@ -2,6 +2,7 @@ import styled from '@emotion/styled';
 import { useRecoilValue } from 'recoil';
 import { IconPlus } from 'twenty-ui';
 
+import { SkeletonLoader } from '@/activities/components/SkeletonLoader';
 import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer';
 import { TASKS_TAB_LIST_COMPONENT_ID } from '@/activities/tasks/constants/TasksTabListComponentId';
 import { useTasks } from '@/activities/tasks/hooks/useTasks';
@@ -13,6 +14,7 @@ import {
   AnimatedPlaceholderEmptySubTitle,
   AnimatedPlaceholderEmptyTextContainer,
   AnimatedPlaceholderEmptyTitle,
+  EMPTY_PLACEHOLDER_TRANSITION_PROPS,
 } from '@/ui/layout/animated-placeholder/components/EmptyPlaceholderStyled';
 import { useTabList } from '@/ui/layout/tab/hooks/useTabList';
 
@@ -40,6 +42,8 @@ export const TaskGroups = ({
     upcomingTasks,
     unscheduledTasks,
     completedTasks,
+    incompleteTasksLoading,
+    completeTasksLoading,
   } = useTasks({
     filterDropdownId: filterDropdownId,
     targetableObjects: targetableObjects ?? [],
@@ -50,15 +54,27 @@ export const TaskGroups = ({
   const { activeTabIdState } = useTabList(TASKS_TAB_LIST_COMPONENT_ID);
   const activeTabId = useRecoilValue(activeTabIdState);
 
-  if (
+  const isLoading =
+    (activeTabId !== 'done' && incompleteTasksLoading) ||
+    (activeTabId === 'done' && completeTasksLoading);
+
+  const isTasksEmpty =
     (activeTabId !== 'done' &&
       todayOrPreviousTasks?.length === 0 &&
       upcomingTasks?.length === 0 &&
       unscheduledTasks?.length === 0) ||
-    (activeTabId === 'done' && completedTasks?.length === 0)
+    (activeTabId === 'done' && completedTasks?.length === 0);
-  ) {
+
+  if (isLoading && isTasksEmpty) {
+    return <SkeletonLoader />;
+  }
+
+  if (isTasksEmpty) {
     return (
-      <AnimatedPlaceholderEmptyContainer>
+      <AnimatedPlaceholderEmptyContainer
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...EMPTY_PLACEHOLDER_TRANSITION_PROPS}
+      >
         <AnimatedPlaceholder type="noTask" />
         <AnimatedPlaceholderEmptyTextContainer>
           <AnimatedPlaceholderEmptyTitle>

packages/twenty-front/src/modules/activities/tasks/hooks/useTasks.ts

@@ -107,17 +107,19 @@ export const useTasks = ({
     setCurrentIncompleteTaskQueryVariables,
   ]);
 
-  const { activities: completeTasksData } = useActivities({
+  const { activities: completeTasksData, loading: completeTasksLoading } =
-    targetableObjects,
+    useActivities({
-    activitiesFilters: completedQueryVariables.filter ?? {},
+      targetableObjects,
-    activitiesOrderByVariables: completedQueryVariables.orderBy ?? [{}],
+      activitiesFilters: completedQueryVariables.filter ?? {},
-  });
+      activitiesOrderByVariables: completedQueryVariables.orderBy ?? [{}],
+    });
 
-  const { activities: incompleteTaskData } = useActivities({
+  const { activities: incompleteTaskData, loading: incompleteTasksLoading } =
-    targetableObjects,
+    useActivities({
-    activitiesFilters: incompleteQueryVariables.filter ?? {},
+      targetableObjects,
-    activitiesOrderByVariables: incompleteQueryVariables.orderBy ?? [{}],
+      activitiesFilters: incompleteQueryVariables.filter ?? {},
-  });
+      activitiesOrderByVariables: incompleteQueryVariables.orderBy ?? [{}],
+    });
 
   const todayOrPreviousTasks = incompleteTaskData?.filter((task) => {
     if (!task.dueAt) {
@@ -148,5 +150,7 @@ export const useTasks = ({
     upcomingTasks: (upcomingTasks ?? []) as Activity[],
     unscheduledTasks: (unscheduledTasks ?? []) as Activity[],
     completedTasks: (completedTasks ?? []) as Activity[],
+    completeTasksLoading,
+    incompleteTasksLoading,
   };
 };

packages/twenty-front/src/modules/activities/timeline/components/Timeline.tsx

@@ -1,8 +1,8 @@
 import styled from '@emotion/styled';
 import { useRecoilValue } from 'recoil';
 
+import { SkeletonLoader } from '@/activities/components/SkeletonLoader';
 import { TimelineCreateButtonGroup } from '@/activities/timeline/components/TimelineCreateButtonGroup';
-import { TimelineSkeletonLoader } from '@/activities/timeline/components/TimelineSkeletonLoader';
 import { timelineActivitiesForGroupState } from '@/activities/timeline/states/timelineActivitiesForGroupState';
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
 import AnimatedPlaceholder from '@/ui/layout/animated-placeholder/components/AnimatedPlaceholder';
@@ -11,6 +11,7 @@ import {
   AnimatedPlaceholderEmptySubTitle,
   AnimatedPlaceholderEmptyTextContainer,
   AnimatedPlaceholderEmptyTitle,
+  EMPTY_PLACEHOLDER_TRANSITION_PROPS,
 } from '@/ui/layout/animated-placeholder/components/EmptyPlaceholderStyled';
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
 
@@ -40,12 +41,15 @@ export const Timeline = ({
   );
 
   if (loading) {
-    return <TimelineSkeletonLoader />;
+    return <SkeletonLoader withSubSections />;
   }
 
   if (timelineActivitiesForGroup.length === 0) {
     return (
-      <AnimatedPlaceholderEmptyContainer>
+      <AnimatedPlaceholderEmptyContainer
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...EMPTY_PLACEHOLDER_TRANSITION_PROPS}
+      >
         <AnimatedPlaceholder type="emptyTimeline" />
         <AnimatedPlaceholderEmptyTextContainer>
           <AnimatedPlaceholderEmptyTitle>

packages/twenty-front/src/modules/activities/timelineActivities/components/TimelineActivities.tsx

@@ -1,7 +1,7 @@
 import styled from '@emotion/styled';
-import { isNonEmptyArray } from '@sniptt/guards';
 
 import { CustomResolverFetchMoreLoader } from '@/activities/components/CustomResolverFetchMoreLoader';
+import { SkeletonLoader } from '@/activities/components/SkeletonLoader';
 import { TimelineCreateButtonGroup } from '@/activities/timeline/components/TimelineCreateButtonGroup';
 import { EventList } from '@/activities/timelineActivities/components/EventList';
 import { useTimelineActivities } from '@/activities/timelineActivities/hooks/useTimelineActivities';
@@ -12,6 +12,7 @@ import {
   AnimatedPlaceholderEmptySubTitle,
   AnimatedPlaceholderEmptyTextContainer,
   AnimatedPlaceholderEmptyTitle,
+  EMPTY_PLACEHOLDER_TRANSITION_PROPS,
 } from '@/ui/layout/animated-placeholder/components/EmptyPlaceholderStyled';
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
 
@@ -40,9 +41,19 @@ export const TimelineActivities = ({
   const { timelineActivities, loading, fetchMoreRecords } =
     useTimelineActivities(targetableObject);
 
-  if (!isNonEmptyArray(timelineActivities)) {
+  const isTimelineActivitiesEmpty =
+    !timelineActivities || timelineActivities.length === 0;
+
+  if (loading && isTimelineActivitiesEmpty) {
+    return <SkeletonLoader withSubSections />;
+  }
+
+  if (isTimelineActivitiesEmpty) {
     return (
-      <AnimatedPlaceholderEmptyContainer>
+      <AnimatedPlaceholderEmptyContainer
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...EMPTY_PLACEHOLDER_TRANSITION_PROPS}
+      >
         <AnimatedPlaceholder type="emptyTimeline" />
         <AnimatedPlaceholderEmptyTextContainer>
           <AnimatedPlaceholderEmptyTitle>

packages/twenty-front/src/modules/ui/layout/animated-placeholder/components/EmptyPlaceholderStyled.tsx

@@ -1,6 +1,7 @@
 import styled from '@emotion/styled';
+import { motion } from 'framer-motion';
 
-const StyledEmptyContainer = styled.div`
+const StyledEmptyContainer = styled(motion.div)`
   align-items: center;
   width: 100%;
   height: 100%;
@@ -13,6 +14,14 @@ const StyledEmptyContainer = styled.div`
 
 export { StyledEmptyContainer as AnimatedPlaceholderEmptyContainer };
 
+export const EMPTY_PLACEHOLDER_TRANSITION_PROPS = {
+  initial: { opacity: 0 },
+  animate: { opacity: 1 },
+  transition: {
+    duration: 0.15,
+  },
+};
+
 const StyledEmptyTextContainer = styled.div`
   align-items: center;
   display: flex;