admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove timelineActivity featureFlag (#5856)

Browse Source
This commit is contained in:
Weiko
2024-06-13 17:39:31 +02:00
committed by GitHub
parent 21dbd6441a
commit 93c17a8a5b
6 changed files with 18 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageRightContainer.tsx
View File

@ -15,8 +15,6 @@ import { EmailThreads } from '@/activities/emails/components/EmailThreads';
import { Attachments } from '@/activities/files/components/Attachments';
import { Notes } from '@/activities/notes/components/Notes';
import { ObjectTasks } from '@/activities/tasks/components/ObjectTasks';
import { Timeline } from '@/activities/timeline/components/Timeline';
import { TimelineQueryEffect } from '@/activities/timeline/components/TimelineQueryEffect';
import { TimelineActivities } from '@/activities/timelineActivities/components/TimelineActivities';
import { TimelineActivitiesQueryEffect } from '@/activities/timelineActivities/components/TimelineActivitiesQueryEffect';
import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
@ -24,7 +22,6 @@ import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSi
import { TabList } from '@/ui/layout/tab/components/TabList';
import { useTabList } from '@/ui/layout/tab/hooks/useTabList';
import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
const StyledShowPageRightContainer = styled.div<{ isMobile: boolean }>`
display: flex;
@ -84,7 +81,6 @@ export const ShowPageRightContainer = ({
].includes(targetObjectNameSingular);
const shouldDisplayCalendarTab = isCompanyOrPerson;
const shouldDisplayLogTab = useIsFeatureEnabled('IS_EVENT_OBJECT_ENABLED');
const shouldDisplayEmailsTab = emails && isCompanyOrPerson;
const isMobile = useIsMobile() || isRightDrawer;
@ -122,18 +118,13 @@ export const ShowPageRightContainer = ({
const renderActiveTabContent = () => {
switch (activeTabId) {
case 'timeline':
return shouldDisplayLogTab ? (
return (
<>
<TimelineActivitiesQueryEffect
targetableObject={targetableObject}
/>
<TimelineActivities targetableObject={targetableObject} />
</>
) : (
<>
<TimelineQueryEffect targetableObject={targetableObject} />
<Timeline loading={loading} targetableObject={targetableObject} />
</>
);
case 'summary':
return summary;