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

feat: Recurring GCal event dialog #9506

Merged
merged 4 commits into from
Mar 13, 2024

Conversation

Dschoordsch
Copy link
Contributor

@Dschoordsch Dschoordsch commented Mar 5, 2024

Description

Fixes #9406
Combine Gcal scheduling dialog with recurring retros

Demo

https://www.loom.com/share/160fc84e251e49f8a5d2bfd01381b959?sid=eddcf00d-239d-49e5-a15c-818cca6618c5

Testing scenarios

  • legacy new meeting dialog, check recurring settings for stands
  • with no gcal integration, check schedule dialog and integrate gcal from the dialog
  • with recurringRetros feature flag add recurrence and gcal event to a retro

Final checklist

  • I checked the code review guidelines
  • I have added Metrics Representative as reviewer(s) if my PR invovles metrics/data/analytics related changes
  • I have performed a self-review of my code, the same way I'd do it for any other team member
  • I have tested all cases I listed in the testing scenarios and I haven't found any issues or regressions
  • Whenever I took a non-obvious choice I added a comment explaining why I did it this way
  • I added the label Skip Maintainer Review Indicating the PR only requires reviewer review and can be merged right after it's approved if the PR introduces only minor changes, does not contain any architectural changes or does not introduce any new patterns and I think one review is sufficient'
  • PR title is human readable and could be used in changelog

@Dschoordsch Dschoordsch force-pushed the feat/9406/recurringGCalEventDialog branch from 021de43 to afc0311 Compare March 5, 2024 13:10
@github-actions github-actions bot added the size/l label Mar 5, 2024
@Dschoordsch Dschoordsch requested a review from nickoferrall March 7, 2024 16:22
@Dschoordsch Dschoordsch marked this pull request as ready for review March 7, 2024 16:25
Copy link
Contributor

@nickoferrall nickoferrall left a comment

Choose a reason for hiding this comment

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

I really like that you've combined them into one modal. That makes a lot of sense.

The main thing that I think needs changing before shipping it is giving the user some confirmation state once they've selected the calendar invite or recurrence settings. At the moment, I think it's easy to think you've created a calendar/recurrence setting, create the meeting, and discover that it hasn't happened: https://www.loom.com/share/0a61393ad28e4e2bb5951bb5ec23c726

@@ -299,6 +303,20 @@ const ActivityDetailsSidebar = (props: Props) => {
history.push(`/me/organizations/${selectedTeam.orgId}/billing`)
}

const meetingNamePlaceholder =
Copy link
Contributor

Choose a reason for hiding this comment

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

+1 I think this should just be "Enter the name of your meeting" rather than the meeting type. As user could think the placeholder is the actual value of the text, whereas "Enter the name of your meeting" makes it clearer that they need to update the input in my opinion.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

They don't need to enter anything, we will default to the placeholder. Why forcing the extra step on them?

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah I thought it was a required input

packages/client/components/ScheduleDialog.tsx Outdated Show resolved Hide resolved
<Collapsible.Root
className='flex flex-col rounded border border-slate-500'
open={hasGcalEvent}
onOpenChange={onOpenGcalChange}
Copy link
Contributor

Choose a reason for hiding this comment

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

-1 after integrating with gcal, I think the Calendar Invite section should automatically open. After I integrated with GCal, it wasn't clear to me that I could edit the settings

@Dschoordsch
Copy link
Contributor Author

I see. The 'x' actually removes the recurrence/gcal invite. As it's an accordion, the user might not expect that. I will play around with the wording a bit and see how it looks:

  • add invite / invited 2 people
  • does not repeat / repeats M,T every week

What's not clear to me yet is how to get rid of the invite again. I think there needs to be a more obvious button for this (probably a trash can)

@Dschoordsch
Copy link
Contributor Author

@nickoferrall I've updated the dialog to not mix expanding/contracting the accordion with enabling/disabling anymore. Let me know what you think
https://www.loom.com/share/81702552e7614aaf83d25dcb1a693dd4?sid=9362e0cd-6bd2-4331-b30e-9f8f1dc406b8

Copy link
Contributor

@nickoferrall nickoferrall left a comment

Choose a reason for hiding this comment

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

I really like that update! It's now very clear to me. I also like the way you added the invite count to the title

@Dschoordsch
Copy link
Contributor Author

I will fix the merge conflicts after the review is done to avoid additional changes in the changeset.

@Dschoordsch Dschoordsch force-pushed the feat/9406/recurringGCalEventDialog branch from b551502 to b8160a3 Compare March 12, 2024 13:08
@Dschoordsch Dschoordsch merged commit fc4429c into master Mar 13, 2024
4 checks passed
@Dschoordsch Dschoordsch deleted the feat/9406/recurringGCalEventDialog branch March 13, 2024 08:22
@github-actions github-actions bot mentioned this pull request Mar 13, 2024
24 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Recurring retros: Unified schedule dialog
2 participants