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.

Sign up for GitHub

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

Jump to bottom

fix(marketing): move the sitemap for search engines to core app #15893

Closed
wants to merge 484 commits into from
Closed

fix(marketing): move the sitemap for search engines to core app #15893

wants to merge 484 commits into from

Conversation

p6l-richard
Copy link
Contributor

What does this PR do?

  • Fixes #XXXX (GitHub issue number)
  • Fixes CAL-XXXX (Linear issue number - should be visible at the bottom of the GitHub issue description)

Mandatory Tasks (DO NOT REMOVE)

  • I have self-reviewed the code (A decent size PR without self-review might be rejected).
  • 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.
  • I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

  • Are there environment variables that should be set?
  • What are the minimal test data to have?
  • What is expected (happy path) to have (input and output)?
  • Any other important info that could help to test that PR

Checklist

  • I haven't read the contributing guide
  • My code doesn't follow the style guidelines of this project
  • I haven't commented my code, particularly in hard-to-understand areas
  • I haven't checked if my changes generate no new warnings

Udit-takkar and others added 30 commits July 22, 2024 18:54
@Udit-takkar @keithwillcode @p6l-richard
fix: add blacklist email logic in backend (#15270)
0de20dc 
* fix: add blacklist email logic in backedn

* chore: type err

* Update packages/features/bookings/lib/handleNewBooking.ts

* Update packages/features/bookings/lib/handleNewBooking.ts

---------

Co-authored-by: Keith Williams <[email protected]>
@zomars @p6l-richard
chore: v4.1.6 (#15266)
f26fcda
@joeauyeung @Shaik-Sirajuddin
@sean-brydon @zomars @CarinaWolli @SomayChauhan @p6l-richard
refactor: Introduce crmManager (#14272)
ac38b11 
* fix timezone display on booking page to reflect event availability timezone

* migrate fetching event owner's schedule to server side

* migrate fetching event owner's schedule to server side

* fix e2e test errors

* Add WEBAPP_URL_FOR_OAUTH to salesforce auth

* In event manager constructor include "_crm" credentials as calendar creds

* Change crm apps to type to end with `_crm`

* Move sendgrid out of CRM

* Add zoho bigin to CRM apps

* When getting apps, use slug

* Add `crm` variants

* Hubspot Oauth use `WEBAPP_URL_FOR_OAUTH`

* Refactor creating credentials

* Fix empty CRM page

* Use credentials with `_crm`

* Abstract getAppCategoryTitle

* Add integration.handler changes

* Init crmManager

* Change salesforce to CrmService

* Create crmManager

* Create contact on new event

* Create event

* Create new CRM reference

* - Fix create new contact for salesforce
- Add reschedule to crmManager

* Create deleteAllCRMEvents

* When searching for credential, look for current credentials in class

* On cancel, delete 3rd party events

* Add delete method

* Type fix

* Type fix

* Convert Close.com to CrmService

* Convert Close.com to CrmService

* Move hubspot to CrmService

* Convert Pipedrive to CrmService

* Rename classes to CrmService

* Move ZohoCrm to CrmService

* Move Bigin to CrmService

* Type return for CrmServices

* Fix type errors

* Close.com create leads and contacts

* Fix tests

* Type fix

* Zoho bug fixes

* Clean up

* Type fixes

* Remove apiDeletes

* Type fixes

* Specific typing

* Type fix

* Type fix

* Type fix

* Type fix

* Type fix

* feat: Enable CRM apps on a per event type basis (#14450)

* Add Salesforce to be an event type app

* Handle new booking, only get enabled CRM credentials

* Abstract generating search params

* Add close.com to event type

* Clean up

* Move hubspot to event type

* Add pipedrive to event type

* Add zoho bigin to event type

* Add zoho crm to event type

* Remove console.log

* Add deleting CRM apps from event type

* Delete event type apps

* Fix deleting credentials

* Add CRM app data to event type metadata

* Backwards compatibility: add CRM credential if doesn't exist on event type

* Don't include user CRM credentials for backwards comp

* Backwards compatibility show CRM app is enabled and dirty field

* Clean up

* Type fixes

* Type fixes

* Type fix

* Type fix

* Remove console.log

* Test fix

* Upgrade embed-react vite version - dev

* Change build can't find error message

* Add back omni install prop

* Clean up

* Refactor `writeAppDataToEventType`

* Use eventType repository in writeAppDataToEventType

* Clean up old comments

* Add error logging

* createCRMEvents pass event uid as created event uid

* Use `getUid`

* Clean up props in create crm event

* Small changes to `crmManager`

* Fix zoho CRM

* refactor crmManager

* Undo vite config change

* Fix teamId query

* Fix bigin error

* Remove need for `writeAppDataToEventType`

* Add `getAllCredentials` test

* Add crmManager tests

* Type fixes

* Fix type errors

* Fix getAllCredentials test

* Fix tests

* Skip CRM manager tests for now

* feat: Skip RR Assignment if Contact Exists In Salesforce (#14556)

Co-authored-by: CarinaWolli <[email protected]>

* Update yarn.lock

* @zomars feedback - use new URL for state params

* fix: update hook to not produce enabled === undefined

* fix: update app card interfaces to use the new enabled from useIsAppEnabled

* fix: feedback for crm RR skip (#15160)

* code clean up

* fix type any

* test setup for RR lead skip

* code clean up

* simplify code

* type error

* finshed first test for RR lead skip

* add seconds test

* add test for handleNewBooking

* test if teamMember is set

* fix missing enabled key

* fix tests

* fix type error

* use setSystemTime instead of getDate

* remove nested if

---------

Co-authored-by: CarinaWolli <[email protected]>

* fix type error

* fix: remove app metadata from all eventTypes on deleting the app

* fix: update hook to not produce enabled === undefined (default to false)

---------

Co-authored-by: Shaik-Sirajuddin <sirajuddinshaik30gmail.com>
Co-authored-by: Shaik-Sirajuddin <[email protected]>
Co-authored-by: Shaik-Sirajuddin <[email protected]>
Co-authored-by: sean-brydon <[email protected]>
Co-authored-by: Omar López <[email protected]>
Co-authored-by: CarinaWolli <[email protected]>
Co-authored-by: sean-brydon <[email protected]>
Co-authored-by: Carina Wollendorfer <[email protected]>
Co-authored-by: Somay Chauhan <[email protected]>
@keithwillcode @p6l-richard
chore: v4.1.7 (#15277)
102d17a
@SomayChauhan @p6l-richard
add redirectUrl to /eventTypes page as well (#15274)
85bb834 
* During signup, if the account already exists, we redirect the user to /event-types instead of onboarding. Adding this redirection logic to /event-types page as well to ensure the user is redirected to the correct redirectUrl.
@hariombalhara @p6l-richard
feat: Add framework to send all events fired for embed to Analytics A…
e4fc378 
…pps (#15173)

* Send all events to analytics apps

* feat: Start sending all events fired for embed to Analytics Apps(GTM Support added)

* Add tests
@joeauyeung @p6l-richard
fix: Typo in deleteCredential handler (#15281)
26977f2 
* Fix typo

* Added optional chaining
@keithwillcode @zomars @p6l-richard
fix: 404 collisions (#15249)
7523ca9 
* fix: 404 collisions

* Added E2E test

* Removed await

* Attempting to fix E2E

* fingers crossed

Signed-off-by: zomars <[email protected]>

* fix: e2e tests

* fix: missing navigation to 404 page

* fix: don't interrupt post login navigation

* fix: Expect owner as possible host for RR events

---------

Signed-off-by: zomars <[email protected]>
Co-authored-by: Omar López <[email protected]>
@zomars @p6l-richard
v4.1.8 (#15287)
e487ace
@Amit91848 @SomayChauhan @p6l-richard
feat: ability to assign people to round robin from org members (#14199)
26201f6 
* feat: ability to assign people to round robin from org members

* fix: include schedulingtype in filter

* fix: type check

* rename to EventTypesList

* rename to teams, change icon to link, early return if no events or teamId

* filter scheduling type array, change filter name

* rename to bulkAddMembersToTeams and bulkAddMembersToEventTypes

* filter refactor

* remove bulk

* filter remove null return

* Revert "filter remove null return"

This reverts commit 8ae6296.

* show checked if user already host in event type

* check boxes if user is part of the team

* remove hosts on unchecking boxes

* fix isSelected condition

* remove selected members from teams

---------

Co-authored-by: Somay Chauhan <[email protected]>
@hichemfantar @p6l-richard
fix: Kbar component styles and improve transitions (#15283)
94557bd 
* fix: Kbar component styles

Fix Kbar styles on active state

* refactor: Add transition to event type list item

The commit refactors the event type list item component by adding a transition effect to improve the user experience.
@Ryukemeister @ThyMinimalDev @p6l-richard
feat: outlook 365 calendar endpoints (#15077)
5c851f9 
* init endpoints for office 365 syncing

* get web app url for oauth

* update typings

* nethods for office 365 calendar

* update office 365 connect endpoint

* update packages

* add calendar type and if office 365 calendar

* add SelectedCalendarsRepository and TokensModule

* add functions for getting oauth credentials, getting default calendars and redirect url for office 365 calendar

* update controllers

* e2e tests for office 365 calendar endpoints

* fixup! Merge branch 'main' into rajiv/cal-3544-outlookoffice365-integration-connect-atom

* fixup! fixup! Merge branch 'main' into rajiv/cal-3544-outlookoffice365-integration-connect-atom

* fix merge conflict

* update typings

* abstract microsoft outlook into its own module

* add one common interface for calendar apps

* make calendars dynamic

* abstract every calendar app into its own service

* cleanup

* make all calendar endpoints dynamic

* calendar app constants

* cleanup

* remove unused repositories

* rename microsoft calendar type

* fix typings

* add google and outlook calendar service to calendars module

* fixup

* some more e2e tests including  google calendar

* chore: small type change and apple calendar not implemented yet

---------

Co-authored-by: Morgan <[email protected]>
Co-authored-by: Morgan Vernay <[email protected]>
Co-authored-by: Rajiv Sahal <[email protected]>
@PeerRich @joeauyeung @p6l-richard
added admin API docs (#15297)
d48de1c 
Co-authored-by: Joe Au-Yeung <[email protected]>
@joeauyeung @p6l-richard
fix: Double encoding in addAppMutation (#15303)
9c56c5e 
* Remove double encoding

* Add test for OAuth page

* Add tests

* Remove test from integrations.e2e
@AbhishekGurav @p6l-richard
Updated CONTRIBUTING.md (#15102)
b2df0ae 
For AES256 CALENDSO_ENCRYPTION_KEY
@smitgol @PeerRich @p6l-richard
fix: no rating submitted text fixed (#15007)
3a17de4 
* no rating submitted text fixed

* Update packages/ui/components/empty-screen/EmptyScreen.tsx

* Update packages/ui/components/empty-screen/EmptyScreen.tsx

---------

Co-authored-by: Peer Richelsen <[email protected]>
Co-authored-by: Peer Richelsen <[email protected]>
@SomayChauhan @sean-brydon @p6l-richard
fix: inviting a team member dosent work when he login in via Google (#…
c99704d 
…11312)

Co-authored-by: sean-brydon <[email protected]>
@Ryukemeister @p6l-richard
fix: typo in Gcal atom prop and outlook service (#15319)
28603bf 
* fix typo in onCheckError prop

* pass in correct access token

---------

Co-authored-by: Rajiv Sahal <[email protected]>
@keithwillcode @ThyMinimalDev @p6l-richard
feat: API v2 subversioning (#15135)
8ca9c88 
* feat: API v2 subversioning

* Update app.ts

* Added multiple versions to existing controllers

* Updated the slots controller

* chore: version platform library package with npm package alias

* chore: use consts to version

* chore: use consts to version

* chore: version api for cal provider

* chore: remove timezone controller subversion poc

* fixup! Merge branch 'main' into feat/api-v2-subversioning

---------

Co-authored-by: Morgan <[email protected]>
Co-authored-by: Morgan Vernay <[email protected]>
@hariombalhara @joeauyeung @p6l-richard
fix: Booking Error - cannot be booked at this time (#15288)
3328881 
Co-authored-by: Joe Au-Yeung <[email protected]>
@alishaz-polymath @PeerRich
@sean-brydon @p6l-richard
feat: track no-shows in bookings (#15307)
fa68db6 
* added dropdown for no-shows in past bookings

* added layout

* nit

* todo comment: figure out how to close dropdown

* more todo comments

* Adds TRPC route among other WIP

* functional update

* fixes type err

* fix type err

* fix: styles

* strikethrough in email

* NITs

* removed stale comment

* add tests

* err comment

---------

Co-authored-by: Peer Richelsen <[email protected]>
Co-authored-by: Peer Richelsen <[email protected]>
Co-authored-by: sean-brydon <[email protected]>
Co-authored-by: sean-brydon <[email protected]>
@keithwillcode @p6l-richard
v4.1.9 (#15321)
8daa5a4
@kart1ka @p6l-richard
feat: org-wide webhooks (#15144)
0481137 
* feat: include org in teams list

* feat: org-wide webhooks

* Move getOrgIdFromMemberOrTeamId to packages/lib
@emrysal @p6l-richard
chore: Remove DeploySentinel (#15328)
98158a8
@Amit91848 @p6l-richard
fix: install flow: wrong org team avatars (#15334)
5b754b4
@hariombalhara @p6l-richard
fix: Wrong error message when inviting (#15332)
41f8704 
* fix: Wrong message when inviting

* Fix num users invited
@emrysal @Udit-takkar
@pumfleet @CarinaWolli @PeerRich @keithwillcode @p6l-richard
chore: Remove deprecated logo/avatar/away fields (#14705)
d99b5a3 
* chore: Remove deprecated logo/avatar/away fields

* Use right variables for accounts-step-card

* Remove more deprecated logo/avatar usage

* Dont drop the fields until all usages are gone

* Remove the avatar/logo drops for staggered release

* fix: Typescript blindspot (unvalidated include fields)

* fix: Further updates (mostly to API) typescript missed

---------

Co-authored-by: Udit Takkar <[email protected]>
Co-authored-by: Bailey Pumfleet <[email protected]>
Co-authored-by: Carina Wollendorfer <[email protected]>
Co-authored-by: Peer Richelsen <[email protected]>
Co-authored-by: Keith Williams <[email protected]>
@zomars @p6l-richard
Revert "fix: 404 collisions (#15249)" (#15339)
c3f697a 
This reverts commit 5d01eb2.

Signed-off-by: zomars <[email protected]>
@PeerRich @p6l-richard
added apple verification (#15346)
e46c163
@hariombalhara @p6l-richard
fix: Team and User Links (#15342)
40fdba0 
* fix: Team and User Links

* Add tests
dilpreetsio and others added 12 commits July 22, 2024 18:54
@dilpreetsio @Udit-takkar
@Amit91848 @keithwillcode @p6l-richard
fix: multiple getSchedule requests on email change in booker (#15616)
8c77ab1 
* fix: multiple getSchedule requests on email change in booker

* fix: use debounce for formEmail

---------

Co-authored-by: Udit Takkar <[email protected]>
Co-authored-by: Amit Sharma <[email protected]>
Co-authored-by: Keith Williams <[email protected]>
@ThyMinimalDev @p6l-richard
fix: api-auth-strategy tests are e2e apiv2 (#15837)
699c023
@supalarry @p6l-richard
feat: v2 organizations event types endpoints (#15775)
4aeb5b8 
* fix: event-types input service transform length property

* feat: create organizations event-types controller, service and repository

* feat: enable organizations event types

* fix: create team request user isOrgAdmin check

* refactor: hosts array required in team input and output

* chore: use platform-libraries at version 0.0.19

* tests: test organizations event-types

* feat: enable managed event-types

* chore: fix main merge into this branch

* feat: assign all team members for managed event-types

* refactor: gathering managed event-type users ids

* chore: include assignAllTeamMembers in team event response

* test: assign all team members db event

* chore: delete unused files

* docs: swagger create and update request body objects

* revert: event-types platform-libraries update

* refactor: organisations event-types endpoints accessible by TEAM_ADMIN and up

* fix: managed event types output hosts array empty

* fix: dont allow creating event-type for non-team member

* chore: delete unused variables

* tests: negative tests

* chore: finish main merge
@suprabhu77 @p6l-richard
fix: TimeZone select should show the selected timezone (#15838)
90276fb 
* bugfix - CAL4052 TimeZone select should show the selected timezone

* Pusheding the code for type - check failure

* Updating MenuPosition as absolute

---------

Co-authored-by: sumantha <[email protected]>
@hariombalhara @Udit-takkar @p6l-richard
feat: Add a fresh signup to matching organization after email verific…
b8b4392 
…ation (#15705)

* Support automatically adding user to organization

* Use Repository

* Fix unit test

* Code Improvements

* Fix type error

---------

Co-authored-by: Udit Takkar <[email protected]>
@karlromets @ThyMinimalDev
@anikdhabal @p6l-richard
fix: added translations for et (#15762)
1c3a4b1 
* added translations for et

* estonian support

---------

Co-authored-by: Morgan <[email protected]>
Co-authored-by: unknown <[email protected]>
Co-authored-by: Anik Dhabal Babu <[email protected]>
@anikdhabal @p6l-richard
fix: broken ui of availability setup in onboarding (#15854)
5e7f06a
@punitive1729 @p6l-richard
fix: added fix for email title for issue# 15848 (#15855)
98850e1
@krishnendusukumar @anikdhabal @p6l-richard
fix: Text in React Embed Code Becomes Invisible on Selection (#15835)
b2c16b7 
* fix: #15832

* fix: #15832

* Revert yarn.lock to its state before unintended changes

* Update EmbedTabs.tsx

---------

Co-authored-by: Anik Dhabal Babu <[email protected]>
@hichemfantar @anikdhabal @p6l-richard
chore: Add transition effects in UI components (#15841)
5839d83 
* chore: Add transition to hover effects in UI components

* chore: Add transition to hover effects in UI components

* Update ToggleGroup component transition

---------

Co-authored-by: Anik Dhabal Babu <[email protected]>
@hariombalhara @p6l-richard
fix: Fix React cal api namespaced usage (#15834)
4ef1e81 
* fix: Fix React cal api namespaced usage

* Update e2e
@p6l-richard
sitemap in core, globby needs love still
9e005e8
@vercel Vercel
Copy link

vercel bot commented Jul 24, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

1 Skipped Deployment
Name Status Preview Comments Updated (UTC)
cal ⬜️ Ignored (Inspect) Jul 24, 2024 2:40pm

@github-actions github-actions bot added foundation High priority Created by Linear-GitHub Sync Low priority Created by Linear-GitHub Sync teams area: teams, round robin, collective, managed event-types ui area: UI, frontend, button, form, input 🐛 bug Something isn't working labels Jul 24, 2024
@keithwillcode keithwillcode added the core area: core, team members only label Jul 24, 2024
@CLAassistant
Copy link

CLAassistant commented Jul 24, 2024 •
edited
Loading

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
20 out of 23 committers have signed the CLA.

✅ emrysal
✅ nholden
✅ supalarry
✅ ThyMinimalDev
✅ sekaiking
✅ vijayraghav-io
✅ Neon-20
✅ joeauyeung
✅ satya-nutella
✅ Udit-takkar
✅ NitinPSingh
✅ anikdhabal
✅ panzacoder
✅ keithwillcode
✅ suprabhu77
✅ p6l-richard
✅ punitive1729
✅ dilpreetsio
✅ DeepaPrasanna
✅ hichemfantar
❌ Just-Moh-it
❌ karlromets
❌ krishnendusukumar
You have signed the CLA already but the status is still pending? Let us recheck it.

@github-actions github-actions bot added ❗️ migrations contains migration files ❗️ .env changes contains changes to env variables and removed core area: core, team members only labels Jul 24, 2024
@p6l-richard p6l-richard deleted the richardpoelderl/mkt-131-move-sitemap-from-calcomwebsite-to-calcomweb branch July 24, 2024 14:42
@linear Linear
Copy link

linear bot commented Jul 24, 2024

MKT-131 Move sitemap from `@calcom/website` to `@calcom/web`

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
🐛 bug Something isn't working ❗️ .env changes contains changes to env variables foundation High priority Created by Linear-GitHub Sync Low priority Created by Linear-GitHub Sync ❗️ migrations contains migration files teams area: teams, round robin, collective, managed event-types ui area: UI, frontend, button, form, input
Projects
None yet
Milestone
No milestone