Skip to content
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.

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

Fix hide calender icon if no deadline on task #7465

Conversation

Vardhaman619
Copy link
Contributor

Closes #7402

image

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

Copy link
Contributor

@greptile-apps greptile-apps bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR Summary

This pull request addresses the issue of displaying a calendar icon for tasks without deadlines. The main changes are focused on improving the task display in the Twenty front-end application.

  • Modified TaskRow.tsx to conditionally render the calendar icon and due date only when task.dueAt is present
  • Adjusted layout in SettingsApiKeysFieldItemTableRow.tsx, SettingsApiKeysTable.tsx, and SettingsDevelopersWebhookTableRow.tsx for improved responsiveness
  • Updated grid template columns in settings components to use more flexible layouts
  • Removed unnecessary React import in SettingsDevelopersWebhookTableRow.tsx

These changes enhance the user interface by removing visual clutter and improving the overall layout of various components in the application.

4 file(s) reviewed, 2 comment(s)
Edit PR Review Bot Settings

}
>
<IconCalendar size={theme.icon.size.md} />
{task.dueAt && beautifyExactDate(task.dueAt)}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style: Redundant check for task.dueAt, as it's already verified in the conditional rendering

@Bonapara
Copy link
Member

Bonapara commented Oct 9, 2024

@Vardhaman619, could you move the due date to the left of the relation field on the card?

@Vardhaman619
Copy link
Contributor Author

@Vardhaman619, could you move the due date to the left of the relation field on the card?

@Bonapara Done 👍

@ehconitin
Copy link
Contributor

Could u fix the conflicts @Vardhaman619? or do you need help?

@Vardhaman619
Copy link
Contributor Author

@ehconitin I really want to fix this conflict, but I'm not sure where to start. Could you please outline the steps and processes I should follow to resolve it? Your guidance would be really helpful.

@ehconitin
Copy link
Contributor

@Vardhaman619 We merged your previous PR #7438 yesterday, but for some reason same changes were included in this PR as well. The merged changes differ slightly from what you’ve added here, so I’ve removed those redundant changes to resolve the conflicts.
:)
This was a straightforward case, but conflicts like this can become more complex. To avoid them, I recommend keeping your branch up to date with the upstream branch as frequently as possible. ;)

@Vardhaman619
Copy link
Contributor Author

@ehconitin Thank you for handling the conflicts and for the helpful advice! I'll make sure to keep my branch up to date with the upstream branch more frequently to avoid such issues in the future.

Thanks

@ehconitin
Copy link
Contributor

ehconitin commented Oct 9, 2024

@Bonapara instead of showing due date after task target, should we show it before?
That way task target would be consistently shown last, let me know what do you think!
due date after task target -

Screenshot 2024-10-09 at 22 34 09

due date before task target -

Screenshot 2024-10-09 at 22 34 25

@Bonapara
Copy link
Member

@ehconitin yes we should show it before!

@ehconitin ehconitin merged commit c13b29a into twentyhq:main Oct 10, 2024
11 checks passed
Copy link

oss-gg bot commented Oct 10, 2024

Awarding Vardhaman619: 150 points 🕹️ Well done! Check out your new contribution on oss.gg/Vardhaman619

Copy link

Thanks @Vardhaman619 for your contribution!
This marks your 5th PR on the repo. You're top 5% of all our contributors 🎉
See contributor page - Share on LinkedIn - Share on Twitter

Contributions

harshit078 pushed a commit to harshit078/twenty that referenced this pull request Oct 14, 2024
Closes twentyhq#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 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Hide calendar icon if no deadline on task
3 participants