scottk/twenty
1
0
Fork 0
mirror of https://github.com/lingble/twenty.git synced 2025-11-02 21:57:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix hide calender icon if no deadline on task (#7465)

Browse Source 
Closes #7402 


![image](https://github.com/user-attachments/assets/46912a22-8dfb-4065-a877-de179fd796d3)

Ensured that the calendar icon is only visible when a deadline is
assigned

---------

Co-authored-by: ehconitin <nitinkoche03@gmail.com>
This commit is contained in:
Vardhaman Bhandari
2024-10-10 13:04:25 +05:30
committed by GitHub
parent e45e45d8b2
commit c13b29a6ea
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx
View File

@@ -130,6 +130,14 @@ export const TaskRow = ({ task }: { task: Task }) => {
</StyledTaskBody> </StyledTaskBody>
</StyledLeftSideContainer> </StyledLeftSideContainer>
<StyledRightSideContainer> <StyledRightSideContainer>
{task.dueAt && (
<StyledDueDate
isPast={hasDatePassed(task.dueAt) && task.status === 'TODO'}
>
<IconCalendar size={theme.icon.size.md} />
{beautifyExactDate(task.dueAt)}
</StyledDueDate>
)}
{TaskTargetsContextProvider && ( {TaskTargetsContextProvider && (
<TaskTargetsContextProvider> <TaskTargetsContextProvider>
<ActivityTargetsInlineCell <ActivityTargetsInlineCell
@@ -141,14 +149,6 @@ export const TaskRow = ({ task }: { task: Task }) => {
/> />
</TaskTargetsContextProvider> </TaskTargetsContextProvider>
)} )}
<StyledDueDate
isPast={
!!task.dueAt && hasDatePassed(task.dueAt) && task.status === 'TODO'
}
>
<IconCalendar size={theme.icon.size.md} />
{task.dueAt && beautifyExactDate(task.dueAt)}
</StyledDueDate>
</StyledRightSideContainer> </StyledRightSideContainer>
</StyledContainer> </StyledContainer>
); );