twentyhq/twenty
1
1
Fork 0
mirror of https://github.com/twentyhq/twenty.git synced 2024-10-04 21:07:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix calendar preview avatar display (#4930)

Browse Source 
- Fix avatar preview
- Fix border radius
This commit is contained in:
bosiraphael 2024-04-11 18:02:08 +02:00 committed by GitHub
parent f332213e0d
commit bc3930911e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/twenty-front/src/modules/activities/calendar/components/CalendarEventRow.tsx
View File

@ -161,12 +161,13 @@ export const CalendarEventRow = ({
key={[participant.workspaceMemberId, participant.displayName] key={[participant.workspaceMemberId, participant.displayName]
.filter(isDefined) .filter(isDefined)
.join('-')} .join('-')}
avatarUrl={ avatarUrl={participant.avatarUrl}
participant.workspaceMemberId === currentWorkspaceMember?.id placeholder={
? currentWorkspaceMember?.avatarUrl participant.firstName && participant.lastName
: undefined ? `${participant.firstName} ${participant.lastName}`
: participant.displayName
} }
placeholder={participant.displayName} entityId={participant.workspaceMemberId ?? participant.personId}
type="rounded" type="rounded"
/> />
))} ))}

9
packages/twenty-front/src/modules/activities/calendar/components/CalendarMonthCard.tsx
View File

@ -1,5 +1,4 @@
import { useContext } from 'react'; import { useContext } from 'react';
import styled from '@emotion/styled';
import { CalendarDayCardContent } from '@/activities/calendar/components/CalendarDayCardContent'; import { CalendarDayCardContent } from '@/activities/calendar/components/CalendarDayCardContent';
import { CalendarContext } from '@/activities/calendar/contexts/CalendarContext'; import { CalendarContext } from '@/activities/calendar/contexts/CalendarContext';
@ -9,15 +8,11 @@ type CalendarMonthCardProps = {
dayTimes: number[]; dayTimes: number[];
}; };
const StyledCard = styled(Card)`
overflow: visible;
`;
export const CalendarMonthCard = ({ dayTimes }: CalendarMonthCardProps) => { export const CalendarMonthCard = ({ dayTimes }: CalendarMonthCardProps) => {
const { calendarEventsByDayTime } = useContext(CalendarContext); const { calendarEventsByDayTime } = useContext(CalendarContext);
return ( return (
<StyledCard fullWidth> <Card fullWidth>
{dayTimes.map((dayTime, index) => { {dayTimes.map((dayTime, index) => {
const dayCalendarEvents = calendarEventsByDayTime[dayTime] || []; const dayCalendarEvents = calendarEventsByDayTime[dayTime] || [];
@ -29,6 +24,6 @@ export const CalendarMonthCard = ({ dayTimes }: CalendarMonthCardProps) => {
/> />
); );
})} })}
</StyledCard> </Card>
); );
}; };