cal.com
cal.com copied to clipboard
feat: Manage Team ooo or crud and fetch past ooo records
What does this PR do?
- Fixes #16333
- Fixes CAL-
Approach to fetch past records:- Infinite scrolling with pagination is implemented to fetch additional records (10 at a time) when the user scrolls to the bottom of the table. Also search by username and email is implemented to fetch past records of a member quickly.
https://www.loom.com/share/fe88b4739846419493fe26836daedf88?sid=96acca39-eaad-4fcc-89e9-c2153532e080
Mandatory Tasks (DO NOT REMOVE)
- [x] I have self-reviewed the code (A decent size PR without self-review might be rejected).
- [x] - N/A - I have added a Docs issue here if this PR makes changes that would require a documentation change. If N/A, write N/A here and check the checkbox.
- [x] I confirm automated tests are in place that prove my fix is effective or that my feature works.
@vijayraghav-io is attempting to deploy a commit to the cal Team on Vercel.
A member of the Team first needs to authorize it.
Graphite Automations
"Add consumer team as reviewer" took an action on this PR • (09/02/24)
1 reviewer was added to this PR based on Keith Williams's automation.
"Add community label" took an action on this PR • (09/02/24)
1 label was added to this PR based on Keith Williams's automation.
"Add foundation team as reviewer" took an action on this PR • (09/23/24)
1 reviewer was added to this PR based on Keith Williams's automation.
Unable to scroll Redirect To Member when editing an entry, can only scroll it while adding a new that too I have to close it and open it for it to work, can you also replicate it?
https://github.com/user-attachments/assets/103278f8-dc90-4cb5-b058-93274247d4fd
Thankyou! 🙏 @Amit91848 @anikdhabal , sure will address the comments.
Unable to scroll Redirect To Member when editing an entry, can only scroll it while adding a new that too I have to close it and open it for it to work, can you also replicate it?
I checked multiple times, not able to recreate this for me. Able to search the list of members for redirect also.
@CarinaWolli , Thanks for review 🙏
-
added current-previous tab My view:
Team view :
-
Updated not to show
Team OOOtab for non-admin/owners -
For Rounded Corners - Since the
DataTablecomponent is generic and any changes here may affect any other views, its taking more time to update this than i expected. Will try to update this. Also i have one doubt - should the rounded corners be there for all items in the list, or only for first and last one.
For Rounded Corners - Since the DataTable component is generic and any changes here may affect any other views, its taking more time to update this than i expected. Will try to update this. Also i have one doubt - should the rounded corners be there for all items in the list, or only for first and last one.
I see, it should be rounded corners on all other tables as well. Like on the team availability view:
Only the 4 outside corners should be rounded same as in the team member list for example:
I see, it should be rounded corners on all other tables as well. Like on the team availability view:
@CarinaWolli , Thanks for confirming, i tried with existing classes like rounded-lg,rounded-md,... and tried with new class like rounded-[10px]. Though i can see in browser debugger 10px radius gets applied, for some reason this is not visible.
@Amit91848 @anikdhabal , have addressed your comments 🙏
@CarinaWolli , updated for rounded corners. Can you please take this PR forward as all other comments are also addressed and implemented. 🙏
Found a few month things that need to be addressed first 🙏
@CarinaWolli Thankyou! 🙏 , i have addressed the review comments.
@Amit91848 @anikdhabal addressed the comments
@CarinaWolli , @Amit91848 , @anikdhabal Can you please approve and merge this PR, as all review comments are addressed
This PR is being marked as stale due to inactivity.
@keithwillcode , reminding that have attached raw sql queries as requested, these are simple queries without complex joins, hope these should be ok, Please share if any concerns. Thankyou! 🙏
@vijayraghav-io thanks for your work so far. I will give the final review. Could pls fix the conflicts?
@vijayraghav-io thanks for your work so far. I will give the final review. Could pls fix the conflicts?
sure will fix the conflicts, by tomorrow , hope it is fine.
@anikdhabal , Sorry for the delay! resolved merge conflicts, and updated due to latest changes in DataTable generic component & others. Have tested again thoroughly and its working fine. Please take it forward.
This PR is being marked as stale due to inactivity.
@anikdhabal , resolved merge conflicts again. Updated due to changes in member search feature. Tested again and verified working as expected. Please do merge 🙏
PFB loom with updated UI https://www.loom.com/share/a20dd52901714dfaadd735f7e15893b6?sid=2229d2d9-8584-4920-9d3a-7194ac4eb2ca
hey @vijayraghav-io can you resolve merge conflicts ?
Ok will resolve
@Praashh, resolved merge conflicts.
@vijayraghav-io Thanks for your patience, man. Could you please fix the conflicts again?
@vijayraghav-io Thanks for your patience, man. Could you please fix the conflicts again?
sure will do
resolved merge conflicts. Will do one more self review by tomorrow, that should fix the tests as well
The latest updates on your projects. Learn more about Vercel for Git ↗︎
2 Skipped Deployments
| Name | Status | Preview | Comments | Updated (UTC) |
|---|---|---|---|---|
| cal | ⬜️ Ignored (Inspect) | Visit Preview | Dec 11, 2024 1:20pm | |
| calcom-web-canary | ⬜️ Ignored (Inspect) | Visit Preview | Dec 11, 2024 1:20pm |
@vijayraghav-io unit tests are failing, please fix it 🙏
@anikdhabal , @Praashh resolved conflicts, updated tests due to changes from merges. Also verified and tested again team OOO flow.
@vijayraghav-io great works man. But I am thinking of completely transferring all the E2E tests related to OOO into unit tests. Could you go through all the OOO E2E tests and add them to your current test file along with the other tests?
@vijayraghav-io great works man. But I am thinking of completely transferring all the E2E tests related to OOO into unit tests. Could you go through all the OOO E2E tests and add them to your current test file along with the other tests?
Thank you! @anikdhabal . IMO replacing E2E tests with unit tests may reduce the current scope of testing for OOO. As these are End to End tests testing both UI and backend functionalities. Also the flakiness for OOO tests is reduced very much now, observing the E2E results from latest PRs merged after https://github.com/calcom/cal.com/pull/18367