Skip to content

feat(calendar): Add endTime display to calendar event items #39930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
VedantGupta-DTU wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

feat(calendar): Add endTime display to calendar event items #39930

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions apps/meteor/client/views/outlookCalendar/OutlookEventsList/OutlookEventItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { useSetModal } from '@rocket.chat/ui-contexts';
import { useTranslation } from 'react-i18next';

import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime';
import { useFormatTime } from '../../../hooks/useFormatTime';
import { usePreventPropagation } from '../../../hooks/usePreventPropagation';
import OutlookCalendarEventModal from '../OutlookCalendarEventModal';
import { useOutlookOpenCall } from '../hooks/useOutlookOpenCall';
Expand All @@ -22,10 +23,11 @@ const hovered = css`
}
`;

const OutlookEventItem = ({ subject, description, startTime, meetingUrl }: OutlookEventItemProps) => {
const OutlookEventItem = ({ subject, description, startTime, endTime, meetingUrl }: OutlookEventItemProps) => {
const { t } = useTranslation();
const setModal = useSetModal();
const formatDateAndTime = useFormatDateAndTime();
const formatTime = useFormatTime();
const openCall = useOutlookOpenCall(meetingUrl);
const handleMeetingClick = usePreventPropagation(openCall);

Expand Down Expand Up @@ -55,7 +57,10 @@ const OutlookEventItem = ({ subject, description, startTime, meetingUrl }: Outlo
>
<Box>
<Box fontScale='h4'>{subject}</Box>
<Box fontScale='c1'>{formatDateAndTime(startTime)}</Box>
<Box fontScale='c1'>
{formatDateAndTime(startTime)}
{endTime && ` - ${formatTime(endTime)}`}
</Box>
Comment thread
VedantGupta-DTU marked this conversation as resolved.
</Box>
<Box>
{meetingUrl && (
Expand Down