The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Show exact date on hover for timeline activity dates (#24265)
Félix Malfait2dd23e0fd538
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/components/EventRow.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/components/EventRow.tsxindex 38b84ce04b2..4773a963d69 100644--- a/packages/twenty-front/src/modules/activities/timeline-activities/components/EventRow.tsx+++ b/packages/twenty-front/src/modules/activities/timeline-activities/components/EventRow.tsx@@ -15,8 +15,6 @@ import { getObjectRecordIdentifier } from '@/object-metadata/utils/getObjectRecoimport { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';import { themeCssVariables } from 'twenty-ui/theme-constants';-import { dateLocaleState } from '~/localization/states/dateLocaleState';-import { beautifyPastDateRelativeToNow } from '~/utils/date-utils';import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';import { allowRequestsToTwentyIconsState } from '@/client-config/states/allowRequestsToTwentyIcons';@@ -95,16 +93,10 @@ export const EventRow = ({allowRequestsToTwentyIconsState,);- const { localeCatalog } = useAtomStateValue(dateLocaleState);-const { recordId } = useContext(TimelineActivityContext);const recordStore = useAtomFamilyStateValue(recordStoreFamilyState, recordId);- const beautifiedCreatedAt = beautifyPastDateRelativeToNow(- event.createdAt,- localeCatalog,- );const linkedObjectMetadataItem = useLinkedObjectObjectMetadataItem(event.linkedObjectMetadataId,);@@ -159,7 +151,7 @@ export const EventRow = ({event={event}mainObjectMetadataItem={mainObjectMetadataItem}linkedObjectMetadataItem={linkedObjectMetadataItem}- createdAt={beautifiedCreatedAt}+ createdAt={event.createdAt}/></StyledSummary></StyledItemContainer>diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/activity/components/EventRowActivity.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/activity/components/EventRowActivity.tsxindex 0befb301ca6..4c0e68b8d81 100644--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/activity/components/EventRowActivity.tsx+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/activity/components/EventRowActivity.tsx@@ -1,12 +1,12 @@import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';+import { EventRowDate } from '@/activities/timeline-activities/rows/components/EventRowDate';import { type EventRowDynamicComponentProps } from '@/activities/timeline-activities/rows/components/EventRowDynamicComponent.types';import { EventRowItem } from '@/activities/timeline-activities/rows/components/EventRowItem';import {StyledEventRowContainer,StyledEventRowContent,- StyledEventRowDate,StyledEventRowLinkedRecord,} from '@/activities/timeline-activities/rows/components/EventRowStyles';import { isTimelineActivityWithLinkedRecord } from '@/activities/timeline-activities/types/TimelineActivity';@@ -89,7 +89,7 @@ export const EventRowActivity = ({<OverflowingTextWithTooltip text={activityTitle} /></StyledEventRowLinkedRecord></StyledEventRowContent>- <StyledEventRowDate>{createdAt}</StyledEventRowDate>+ <EventRowDate createdAt={createdAt} /></StyledEventRowContainer></StyledEventRow>);diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowDate.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowDate.tsxnew file mode 100644index 00000000000..dd31003a731--- /dev/null+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowDate.tsx@@ -0,0 +1,63 @@+import { styled } from '@linaria/react';+import { isNonEmptyString } from '@sniptt/guards';+import { useId } from 'react';++import { useDateTimeFormat } from '@/localization/hooks/useDateTimeFormat';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { AppTooltip, TooltipDelay } from 'twenty-ui/surfaces';+import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';+import { dateLocaleState } from '~/localization/states/dateLocaleState';+import { beautifyPastDateRelativeToNow } from '~/utils/date-utils';+import { formatDateTimeString } from '~/utils/string/formatDateTimeString';++const StyledEventRowDate = styled.div`+ @media (max-width: ${MOBILE_VIEWPORT}px) {+ display: none;+ }+ color: ${themeCssVariables.font.color.tertiary};+ padding: 0 ${themeCssVariables.spacing[1]};+ white-space: nowrap;+`;++type EventRowDateProps = {+ createdAt?: string;+};++export const EventRowDate = ({ createdAt }: EventRowDateProps) => {+ const { dateFormat, timeFormat, timeZone } = useDateTimeFormat();+ const { localeCatalog } = useAtomStateValue(dateLocaleState);++ const instanceId = useId();+ const dateElementId = `event-row-date-${instanceId.replace(/[^a-zA-Z0-9-_]/g, '-')}`;++ if (!isNonEmptyString(createdAt)) {+ return null;+ }++ const relativeCreatedAt = beautifyPastDateRelativeToNow(+ createdAt,+ localeCatalog,+ );+ const exactCreatedAt = formatDateTimeString({+ value: createdAt,+ timeZone,+ dateFormat,+ timeFormat,+ localeCatalog,+ });++ return (+ <>+ <StyledEventRowDate id={dateElementId} tabIndex={0}>+ {relativeCreatedAt}+ </StyledEventRowDate>+ <AppTooltip+ anchorSelect={`#${dateElementId}`}+ content={exactCreatedAt}+ delay={TooltipDelay.mediumDelay}+ noArrow+ place="left"+ />+ </>+ );+};diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowStyles.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowStyles.tsxindex 134fcd4b90f..42b49c3780c 100644--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowStyles.tsx+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowStyles.tsx@@ -1,6 +1,6 @@import { styled } from '@linaria/react';-import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';+import { themeCssVariables } from 'twenty-ui/theme-constants';export const StyledEventRowContainer = styled.div`align-items: center;@@ -16,14 +16,6 @@ export const StyledEventRowContent = styled.div`overflow: hidden;`;-export const StyledEventRowDate = styled.div`- @media (max-width: ${MOBILE_VIEWPORT}px) {- display: none;- }- color: ${themeCssVariables.font.color.tertiary};- padding: 0 ${themeCssVariables.spacing[1]};-`;-export const StyledEventRowLinkedRecord = styled.span`color: ${themeCssVariables.font.color.primary};cursor: pointer;diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/__stories__/EventRowDate.stories.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/__stories__/EventRowDate.stories.tsxnew file mode 100644index 00000000000..6a67a922710--- /dev/null+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/__stories__/EventRowDate.stories.tsx@@ -0,0 +1,26 @@+import { EventRowDate } from '@/activities/timeline-activities/rows/components/EventRowDate';+import { type Meta, type StoryObj } from '@storybook/react-vite';++import { ComponentDecorator } from 'twenty-ui/testing';++// stories run with a mocked date of 2024-03-12T09:30:00.000Z+const meta: Meta<typeof EventRowDate> = {+ title: 'Modules/TimelineActivities/Rows/EventRowDate',+ component: EventRowDate,+ decorators: [ComponentDecorator],+};++export default meta;+type Story = StoryObj<typeof EventRowDate>;++export const Default: Story = {+ args: {+ createdAt: '2024-03-09T09:30:00.000Z',+ },+};++export const WithoutDate: Story = {+ args: {+ createdAt: undefined,+ },+};diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/generic/components/EventRowGenericLinked.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/generic/components/EventRowGenericLinked.tsxindex 019d089e93b..955c58c303c 100644--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/generic/components/EventRowGenericLinked.tsx+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/generic/components/EventRowGenericLinked.tsx@@ -1,12 +1,12 @@import { t } from '@lingui/core/macro';import { type KeyboardEvent } from 'react';+import { EventRowDate } from '@/activities/timeline-activities/rows/components/EventRowDate';import { type EventRowDynamicComponentProps } from '@/activities/timeline-activities/rows/components/EventRowDynamicComponent.types';import { EventRowItem } from '@/activities/timeline-activities/rows/components/EventRowItem';import {StyledEventRowContainer,StyledEventRowContent,- StyledEventRowDate,StyledEventRowLinkedRecord,} from '@/activities/timeline-activities/rows/components/EventRowStyles';import { useOpenRecordInSidePanel } from '@/side-panel/hooks/useOpenRecordInSidePanel';@@ -69,7 +69,7 @@ export const EventRowGenericLinked = ({<OverflowingTextWithTooltip text={linkedRecordName} /></StyledEventRowLinkedRecord></StyledEventRowContent>- <StyledEventRowDate>{createdAt}</StyledEventRowDate>+ <EventRowDate createdAt={createdAt} /></StyledEventRowContainer>);};diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRowMainObject.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRowMainObject.tsxindex 6853ba2d01b..fe7f3dd01e2 100644--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRowMainObject.tsx+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRowMainObject.tsx@@ -1,9 +1,10 @@+import { EventRowDate } from '@/activities/timeline-activities/rows/components/EventRowDate';import { type EventRowDynamicComponentProps } from '@/activities/timeline-activities/rows/components/EventRowDynamicComponent.types';import { EventRowItem } from '@/activities/timeline-activities/rows/components/EventRowItem';import { EventRowMainObjectUpdated } from '@/activities/timeline-activities/rows/main-object/components/EventRowMainObjectUpdated';import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';-import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';+import { themeCssVariables } from 'twenty-ui/theme-constants';type EventRowMainObjectProps = EventRowDynamicComponentProps;@@ -21,14 +22,6 @@ const StyledRowContainer = styled.div`justify-content: space-between;`;-const StyledItemTitleDate = styled.div`- @media (max-width: ${MOBILE_VIEWPORT}px) {- display: none;- }- color: ${themeCssVariables.font.color.tertiary};- padding: 0 ${themeCssVariables.spacing[1]};-`;-const StyledRow = styled.div`align-items: center;display: flex;@@ -55,7 +48,7 @@ export const EventRowMainObject = ({<EventRowItem variant="action">{t`was created by`}</EventRowItem><EventRowItem>{authorFullName}</EventRowItem></StyledRow>- <StyledItemTitleDate>{createdAt}</StyledItemTitleDate>+ <EventRowDate createdAt={createdAt} /></StyledRowContainer></StyledMainContainer>);@@ -80,7 +73,7 @@ export const EventRowMainObject = ({<EventRowItem variant="action">{t`was deleted by`}</EventRowItem><EventRowItem>{authorFullName}</EventRowItem></StyledRow>- <StyledItemTitleDate>{createdAt}</StyledItemTitleDate>+ <EventRowDate createdAt={createdAt} /></StyledRowContainer></StyledMainContainer>);@@ -94,7 +87,7 @@ export const EventRowMainObject = ({<EventRowItem variant="action">{t`was restored by`}</EventRowItem><EventRowItem>{authorFullName}</EventRowItem></StyledRow>- <StyledItemTitleDate>{createdAt}</StyledItemTitleDate>+ <EventRowDate createdAt={createdAt} /></StyledRowContainer></StyledMainContainer>);diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRowMainObjectUpdated.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRowMainObjectUpdated.tsxindex ba097dd18b8..037387a418c 100644--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRowMainObjectUpdated.tsx+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRowMainObjectUpdated.tsx@@ -4,11 +4,12 @@ import { useState } from 'react';import { EventCard } from '@/activities/timeline-activities/rows/components/EventCard';import { EventCardToggleButton } from '@/activities/timeline-activities/rows/components/EventCardToggleButton';+import { EventRowDate } from '@/activities/timeline-activities/rows/components/EventRowDate';import { EventRowItem } from '@/activities/timeline-activities/rows/components/EventRowItem';import { EventFieldDiffContainer } from '@/activities/timeline-activities/rows/main-object/components/EventFieldDiffContainer';import { type TimelineActivity } from '@/activities/timeline-activities/types/TimelineActivity';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';-import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';+import { themeCssVariables } from 'twenty-ui/theme-constants';type EventRowMainObjectUpdatedProps = {mainObjectMetadataItem: EnrichedObjectMetadataItem;@@ -25,14 +26,6 @@ const StyledRowContainer = styled.div`justify-content: space-between;`;-const StyledItemTitleDate = styled.div`- @media (max-width: ${MOBILE_VIEWPORT}px) {- display: none;- }- color: ${themeCssVariables.font.color.tertiary};- padding: 0 ${themeCssVariables.spacing[1]};-`;-const StyledRow = styled.div`align-items: center;display: flex;@@ -89,7 +82,7 @@ export const EventRowMainObjectUpdated = ({</>)}</StyledRow>- <StyledItemTitleDate>{createdAt}</StyledItemTitleDate>+ <EventRowDate createdAt={createdAt} /></StyledRowContainer>{diffEntries.length > 1 && (<EventCard isOpen={isOpen}>