fix: #16028 Org Settings - SEOIndexing,Disable Org Url by vijayraghav-io · Pull Request #16075 · calcom/cal.diy

vijayraghav-io · 2024-08-05T14:42:37Z

What does this PR do?

Fixes [CAL-4097] redirect to org core domain when visiting the root path at org domain #16028
Fixes CAL-4097

https://www.loom.com/share/5421eda4a55a4c6fbcb690f26bc6e504?sid=bb1ece9f-d52d-480a-b776-cd6898618d0f

https://www.loom.com/share/415c9dab0e54482594e3e7a9994d9772?sid=a313a1cf-db70-4875-8400-6d9457a896b5

https://www.loom.com/share/fb9f0bb399244ecca6f0e6986a2b2fb3?sid=deb7a35d-5bb9-4b62-a98d-39b40994d94d

Mandatory Tasks (DO NOT REMOVE)

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

vercel · 2024-08-05T14:42:45Z

@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-app · 2024-08-05T14:45:10Z

Graphite Automations

"Add community label" took an action on this PR • (08/05/24)

1 label was added to this PR based on Keith Williams's automation.

"Add consumer team as reviewer" took an action on this PR • (08/05/24)

1 reviewer was added to this PR based on Keith Williams's automation.

Amit91848 · 2024-08-05T16:04:40Z

Converting to draft as this looks incomplete.

Amit91848

Left some minor NIT

vijayraghav-io · 2024-08-05T17:00:17Z

Converting to draft as this looks incomplete.

@Amit91848
Except redirecting sub-domain to domain (its in progress i am updating this), rest all are done -

allowSEOIndexing - UI , DB save and retrieval, marking for SEOIndexing based on this org setting (users-type-public-view.getServerSideProps.tsx)
disableOrgSubdomainURL - UI, DB save and retrieval, (redirecting based on this setting is pending)

vijayraghav-io · 2024-08-05T20:25:28Z

updated for subdomain redirect

Amit91848

Thanks for the PR @vijayraghav-io ! I have some doubts about redirecting to org domain.

…6028_updateOrgProfile

anikdhabal · 2024-11-06T12:54:37Z

@vijayraghav-io could you pls fix the conflicts

vijayraghav-io · 2024-11-06T12:57:00Z

@vijayraghav-io could you pls fix the conflicts

Sure, will do.

…6028_updateOrgProfile

vijayraghav-io · 2024-11-07T10:55:48Z

@anikdhabal , resolved merge conflicts

…6028_updateOrgProfile

github-actions · 2024-11-11T06:46:40Z

E2E results are ready!

Workflow #39492.1 latest results

keithwillcode · 2024-11-27T16:15:22Z

@vijayraghav-io You mind fixing the conflicts please? We are looking to merge this one soon for you! Thank you 🙏

@hariombalhara Do you mind giving this a once over again now that changes have been made?

vijayraghav-io · 2024-11-27T17:18:02Z

@vijayraghav-io You mind fixing the conflicts please? We are looking to merge this one soon for you! Thank you 🙏

@hariombalhara Do you mind giving this a once over again now that changes have been made?

@keithwillcode , sure will do . Thank you 🙏

…6028_updateOrgProfile

vijayraghav-io · 2024-11-27T17:44:06Z

@keithwillcode , @hariombalhara resolved conflicts.

hariombalhara · 2024-11-29T04:25:40Z

    } as const;
  }

+  const allowSEOIndexing = org


Followup: Abstract it out into something like packages/lib/isSeoIndexableForUser and reuse it at all places where we derive user's seoIndexing setting from org and user.

hariombalhara

Thanks for your patience here @vijayraghav-io !! Great work !!

let's merge it.

I have one followup comment, that we can address later.

vijayraghav-io · 2024-11-29T05:04:46Z

Thanks for your patience here @vijayraghav-io !! Great work !!

let's merge it.

I have one followup comment, that we can address later.

Thank you! @hariombalhara 🙏 ,
sure will address the followup comments.

update orgsettings

4d826a0

graphite-app Bot added the community Created by Linear-GitHub Sync label Aug 5, 2024

graphite-app Bot requested a review from a team August 5, 2024 14:42

dosubot Bot added organizations area: organizations, orgs 🐛 bug Something isn't working labels Aug 5, 2024

dosubot Bot added this to the v4.4 milestone Aug 5, 2024

update for org seo indexing

cce35a9

github-actions Bot added enterprise area: enterprise, audit log, organisation, SAML, SSO ✨ feature New feature or request labels Aug 5, 2024

Amit91848 marked this pull request as draft August 5, 2024 16:04

Amit91848 reviewed Aug 5, 2024

View reviewed changes

Comment thread apps/web/public/static/locales/en/common.json Outdated

updated for domain rediredt

d064cf8

vijayraghav-io marked this pull request as ready for review August 5, 2024 20:24

update for new url

52ae778

Amit91848 requested changes Aug 7, 2024

View reviewed changes

Comment thread apps/web/lib/getMainDomainOrgRedirect.ts Outdated

vijayraghav-io added 2 commits August 7, 2024 13:09

Merge branch 'main' of https://github.com/calcom/cal.com into feat_#1…

2f2bd82

…6028_updateOrgProfile

updated ALLOWED_HOSTNAMES

6592eee

github-actions Bot added the ❗️ .env changes contains changes to env variables label Aug 7, 2024

keithwillcode modified the milestones: v4.6, v4.7 Oct 16, 2024

dosubot Bot modified the milestone: v4.7 Oct 16, 2024

keithwillcode marked this pull request as draft November 6, 2024 13:28

vijayraghav-io added 2 commits November 7, 2024 15:48

Merge branch 'main' of https://github.com/calcom/cal.com into feat_#1…

09bae32

…6028_updateOrgProfile

Merge branch 'main' of https://github.com/calcom/cal.com into feat_#1…

bb99be5

…6028_updateOrgProfile

vijayraghav-io marked this pull request as ready for review November 7, 2024 14:00

vijayraghav-io added 3 commits November 10, 2024 12:34

Merge branch 'main' of https://github.com/calcom/cal.com into feat_#1…

49eb742

…6028_updateOrgProfile

added e2e tests

0ff14a6

nit

ad4273c

anikdhabal added the ready-for-e2e label Nov 11, 2024

keithwillcode modified the milestones: v4.7, v4.8 Nov 18, 2024

dosubot Bot modified the milestone: v4.8 Nov 18, 2024

keithwillcode added the High priority Created by Linear-GitHub Sync label Nov 27, 2024

Merge branch 'main' of https://github.com/calcom/cal.com into feat_#1…

6a92ee1

…6028_updateOrgProfile

hariombalhara reviewed Nov 29, 2024

View reviewed changes

hariombalhara approved these changes Nov 29, 2024

View reviewed changes

hariombalhara merged commit f631abf into calcom:main Nov 29, 2024

ThyMinimalDev mentioned this pull request Dec 9, 2024

fix: public booking page serialization error #18070

Merged

3 tasks

Conversation

vijayraghav-io commented Aug 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

Uh oh!

vercel Bot commented Aug 5, 2024

Uh oh!

graphite-app Bot commented Aug 5, 2024

Graphite Automations

Uh oh!

Amit91848 commented Aug 5, 2024

Uh oh!

Amit91848 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

vijayraghav-io commented Aug 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vijayraghav-io commented Aug 5, 2024

Uh oh!

Amit91848 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

anikdhabal commented Nov 6, 2024

Uh oh!

vijayraghav-io commented Nov 6, 2024

Uh oh!

vijayraghav-io commented Nov 7, 2024

Uh oh!

github-actions Bot commented Nov 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

E2E results are ready!

Uh oh!

keithwillcode commented Nov 27, 2024

Uh oh!

vijayraghav-io commented Nov 27, 2024

Uh oh!

vijayraghav-io commented Nov 27, 2024

Uh oh!

hariombalhara Nov 29, 2024

Choose a reason for hiding this comment

Uh oh!

hariombalhara left a comment

Choose a reason for hiding this comment

Uh oh!

vijayraghav-io commented Nov 29, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

vijayraghav-io commented Aug 5, 2024 •

edited

Loading

vijayraghav-io commented Aug 5, 2024 •

edited

Loading

github-actions Bot commented Nov 11, 2024 •

edited

Loading