Skip to content

Fixes/locations#2383

Merged
kodiakhq[bot] merged 9 commits intomainfrom
fixes/locations
Apr 5, 2022
Merged

Fixes/locations#2383
kodiakhq[bot] merged 9 commits intomainfrom
fixes/locations

Conversation

@zomars
Copy link
Copy Markdown
Contributor

@zomars zomars commented Apr 5, 2022 •
edited
Loading

What does this PR do?

Fixes #2382 #2378

  • Reintroduces Google Meet as a location Options
  • Refactors the way LocationTypes are defined
  • Moves location labels to App Store

Type of change

  • Bug fix (non-breaking change which fixes an issue)

How should this be tested?

  • Add a Google Calendar
  • Add Google Meet as a location options in an event type

Checklist

@vercel
Copy link
Copy Markdown

vercel Bot commented Apr 5, 2022 •
edited
Loading

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployments, click below or on the icon next to each commit.

docs – ./apps/docs

🔍 Inspect: https://vercel.com/cal/docs/CGvczB7EtnNCod2VJe6JCE4gjJjv
✅ Preview: Canceled

[Deployment for b957e43 canceled]

calendso – ./apps/web

🔍 Inspect: https://vercel.com/cal/calendso/AwaWkmCVa1MpsAyUktCPQFE88fHm
✅ Preview: https://calendso-git-fixes-locations-cal.vercel.app

@zomars zomars marked this pull request as draft April 5, 2022 15:01
@vercel vercel Bot temporarily deployed to Preview – docs April 5, 2022 15:03 Inactive
@vercel vercel Bot temporarily deployed to Preview – calendso April 5, 2022 15:04 Inactive
@vercel vercel Bot temporarily deployed to Preview – docs April 5, 2022 15:20 Inactive
@vercel vercel Bot temporarily deployed to Preview – calendso April 5, 2022 15:20 Inactive
@vercel vercel Bot temporarily deployed to Preview – docs April 5, 2022 15:46 Inactive
@vercel vercel Bot temporarily deployed to Preview – calendso April 5, 2022 15:46 Inactive
@vercel vercel Bot temporarily deployed to Preview – docs April 5, 2022 15:53 Inactive
@vercel vercel Bot temporarily deployed to Preview – calendso April 5, 2022 15:53 Inactive
@vercel vercel Bot temporarily deployed to Preview – docs April 5, 2022 15:54 Inactive
@vercel vercel Bot temporarily deployed to Preview – calendso April 5, 2022 15:56 Inactive
zomars
zomars commented Apr 5, 2022
View reviewed changes
Copy link
Copy Markdown
Contributor Author

@zomars zomars left a comment

Choose a reason for hiding this comment

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

Comment thread packages/app-store/googlecalendar/index.ts Outdated
variant: "calendar",
category: "calendar",
label: "Google Calendar",
label: "Google Meet",
Copy link
Copy Markdown
Contributor Author

@zomars zomars Apr 5, 2022

Choose a reason for hiding this comment

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

This is intentional

@zomars zomars marked this pull request as ready for review April 5, 2022 16:04
@zomars zomars requested review from a team, PeerRich, emrysal, jamiepine and mihaic195 and removed request for a team and jamiepine April 5, 2022 16:04
@zomars zomars added the ♻️ autoupdate tells kodiak to keep this branch up-to-date label Apr 5, 2022
@vercel vercel Bot temporarily deployed to Preview – calendso April 5, 2022 16:32 Inactive
@vercel vercel Bot temporarily deployed to Preview – docs April 5, 2022 16:32 Inactive
@zomars zomars mentioned this pull request Apr 5, 2022
Closed
@vercel vercel Bot temporarily deployed to Preview – docs April 5, 2022 16:38 Inactive
@vercel vercel Bot temporarily deployed to Preview – calendso April 5, 2022 16:39 Inactive
alannnc
alannnc approved these changes Apr 5, 2022
View reviewed changes
Copy link
Copy Markdown
Contributor

@alannnc alannnc left a comment

Choose a reason for hiding this comment

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

Code looks good

alishaz-polymath
alishaz-polymath approved these changes Apr 5, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@alishaz-polymath alishaz-polymath left a comment

Choose a reason for hiding this comment

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

Looks good to me

@kodiakhq kodiakhq Bot merged commit f8b7e17 into main Apr 5, 2022
@kodiakhq kodiakhq Bot deleted the fixes/locations branch April 5, 2022 18:03
joeauyeung added a commit that referenced this pull request Apr 6, 2022
@joeauyeung
Revert "Fixes/locations (#2383)"
75f4c5a 
This reverts commit f8b7e17.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alishaz-polymath alishaz-polymath alishaz-polymath approved these changes

@emrysal emrysal Awaiting requested review from emrysal

@PeerRich PeerRich Awaiting requested review from PeerRich

@mihaic195 mihaic195 Awaiting requested review from mihaic195

+1 more reviewer

@alannnc alannnc alannnc approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

automerge ♻️ autoupdate tells kodiak to keep this branch up-to-date

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

google meet missing in location dropdown

3 participants

@zomars @alannnc @alishaz-polymath