chore: app router - all sub-pages in `/apps` #16976

hbjORbj · 2024-10-07T19:43:21Z

What does this PR do?

Fixes CAL-4897
Fixes CAL-4828
Fixes [CAL-4828] migrate /apps/routing-forms/forms to /routing #17955

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 updated the developer docs in /docs 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?

Test all sub pages of /apps

vercel · 2024-10-07T19:43:31Z

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		Jan 10, 2025 5:39am
calcom-web-canary	⬜️ Ignored (Inspect)	Visit Preview		Jan 10, 2025 5:39am

graphite-app · 2024-10-07T19:45:10Z

Graphite Automations

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

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

"Add foundation team as reviewer" took an action on this PR • (01/09/25)

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

github-actions · 2024-10-22T00:21:33Z

This PR is being marked as stale due to inactivity.

…es-router-1

hbjORbj · 2025-01-09T04:16:43Z

apps/web/components/apps/App.tsx

-      <HeadSeo
-        title={props.name}
-        description={props.description}
-        app={{ slug: props.logo, name: props.name, description: props.description }}
-      />


this is replaced by generateMetadata in apps/[slug]/page.tsx where we use generateAppMetadata

eunjae-lee

massive work! the code change looks good and it behaves correctly on my local machine (according to your video)

(btw the e2e test is broken, though)

eunjae-lee · 2025-01-09T14:54:08Z

packages/app-store/routing-forms/pages/routing-link/getServerSideProps.ts

  const isEmbed = params.appPages[1] === "embed";
-  if (context.query["flag.coep"] === "true") {
-    context.res.setHeader("Cross-Origin-Embedder-Policy", "require-corp");
-  }



could you explain briefly about what this was and why it's removed?

sorry, forgot to explain the context here. This logic is already being handled in the middleware, https://github.com/calcom/cal.com/blob/main/apps/web/middleware.ts#L122, so we don't need this here

eunjae-lee · 2025-01-09T15:27:05Z

packages/app-store/routing-forms/playwright/tests/basic.e2e.ts

@@ -93,20 +93,20 @@ test.describe("Routing Forms", () => {
      await gotoRoutingLink({ page, formId });
      await expect(page.locator("text=Test Form Name")).toBeVisible();

-      await page.goto(`apps/routing-forms/route-builder/${formId}`);
+      await page.goto(`routing/route-builder/${formId}`);


do you think it's too much to keep the tests for the old paths to ensure they're still redirected correctly in the future? (in case someone makes some change unknowingly)

In that case, I think we better add specific tests for redirects!

* chore: apps/[slug] remove pages router * remove apps/[slug] pages from /future * chore: apps/installed remove pages router * chore: apps/installation remove pages router * remove Head element * fix metadata * fix test * fix another test * chore: apps/categories remove pages router * revert unneeded changes * update middleware * Remove <Head> * remove unused import and code * remove unused import and code again * fix * fix category page * add split icon * add /routing paths to middleware matcher * wip * remove HeadSeo from App.tsx * clean up head-seo test * add generateAppMetadata * use generateAppMetadata in apps/[slug] page * delete file * remove log * fix * fix * fix apps/installed pages * fix cateogires pages * fix * fix imports * wip * fix * fix * fix metadata * fix * redirect /apps/routing-forms to /routing * replace all usages of /apps/routing-forms to /routing * better naming * /routing -> /routing/forms * fix * fix * fix * fix * remove backPath as it is irrelevant when withoutMain is true * fix type checks * fix type check in apps/[slug] * refactors * fix * fix test * fix * fix * fix * Replace multiple leading slashes with a single slash * migrate routing-forms too * add re routing * fix * add redirection --------- Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>

…8702) * revert * add incomplete-booking

* Upgrade jsforce to 3.6.2 * Refactor connecting to Salesforce * Revert yarn.lock changes * Add `TASKER_ENABLE_CRM_EVENT_CREATION` to .env * Add createCRMEvent scheduler * Schedule CRM event creating in `EventManager` * Add calendar event builder for CRM tasks * Do not write to person record if fields don't exist * Change type to expect string from tasker * Create CRM event * Create booking references * Type fixes * Migrate callback endpoint * Add jsforce node dependency * Migrate add endpoint * Import * Import package into crmService * Use new package types * Type fix * Update vite config * Push updated lockfile * Attempt to bump platform/libraries to unlock jsforce * Also update lockfile, naturally * bump platform libraries * feat: salesforce to tasker improvements (#18419) * feat: salesforce to tasker * refactor: event manager * tests: add unit tests for create CRM Event * Update vite.config * Add jsforce to vite config * Revert mint.json changes * Default to not enabling * Revert yarn.lock changes * Remove `TASKER_ENABLE_CRM_EVENT_CREATION` variable * Revert yarn.lock changes * feat: Round Robin weights future members toggle (#17782) Co-authored-by: Omar López <zomars@me.com> * detailed customer card (#18511) Co-authored-by: Omar López <zomars@me.com> * chore: app router - all sub-pages in `/apps` (#16976) * chore: apps/[slug] remove pages router * remove apps/[slug] pages from /future * chore: apps/installed remove pages router * chore: apps/installation remove pages router * remove Head element * fix metadata * fix test * fix another test * chore: apps/categories remove pages router * revert unneeded changes * update middleware * Remove <Head> * remove unused import and code * remove unused import and code again * fix * fix category page * add split icon * add /routing paths to middleware matcher * wip * remove HeadSeo from App.tsx * clean up head-seo test * add generateAppMetadata * use generateAppMetadata in apps/[slug] page * delete file * remove log * fix * fix * fix apps/installed pages * fix cateogires pages * fix * fix imports * wip * fix * fix * fix metadata * fix * redirect /apps/routing-forms to /routing * replace all usages of /apps/routing-forms to /routing * better naming * /routing -> /routing/forms * fix * fix * fix * fix * remove backPath as it is irrelevant when withoutMain is true * fix type checks * fix type check in apps/[slug] * refactors * fix * fix test * fix * fix * fix * Replace multiple leading slashes with a single slash * migrate routing-forms too * add re routing * fix * add redirection --------- Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> * chore: app router 404 page (#18597) * wip * wip * fix not found page * render middleware for /settings pages * fix * remove global-error page * add metadata to not-found page * make not-found page static * remove 404 * adding not-found to middleware is not necessary * add every routes to config.matcher * fix test * fix style * use i18n string * fix tests * fix * fix * revert unneeded changes * fix * fix * fix * fix style * fix * remove 404 * remove log * fix * fix * fix * fix * better naming * parallel testing --------- Co-authored-by: Benny Joo <sldisek783@gmail.com> * feat: render custom error page for unexpected sever error + remove` pages/_error` (#18606) * remove page/_error * refactor app/error * fix: app/not-found cannot be a static page (#18610) * Async False (#18611) * chore: redirect to /500 if pathname does not exist + better error handling (#18615) * fix lint error * fix booking page and better error handling * chore: gracefully handle 404s from pages router's dynamic pages + tests (#18618) * restore pages/_error * set custom header in pages/_error * handle it in middleware * add test * remove logs * better test description * chore: try using custom 404 in pages/_error (#18622) * fix: parsing teamId (#18623) * chore: restore error pages for pages router (#18625) * disable emails to all guests (#18628) Co-authored-by: CarinaWolli <wollencarina@gmail.com> * revert: "feat: bulk shorten links with dub.links.createMany (#18539)" (#18587) This reverts commit 4902c6a. Co-authored-by: Alex van Andel <me@alexvanandel.com> * chore: release v4.8.18 * fix: disable sending sms when email is present (#18632) * fix: disable sending sms when email is present * fix: update test * fix: main lint errors (#18634) * fix: error-page.tsx related lint errors * fix: lint no continue-on-error * Adding more lint fixes * Bring back annotate code linting results * Bring back linting continue-on-error * Slimline lint * feat: do not show automation webhooks in webhook list (#18607) * fix: make ESLint work and fix lint errors that were undetected before (#18639) * fix eslint config * fix * add it to dev dep * fix * sync eslint version * force ts-node to compile our ESLint plugin's TS files into CommonJS (which ESLint requires) * fix some lint errors * fix lint errors * remove duplicate classname * make @typescript-eslint/ban-types a warn for packages/trpc files * fix lint errors in trpc * fix lint errors in trpc - 2 * fix * fix * fix lint warnings * chore: clean up config.matcher in middleware (#18638) Co-authored-by: Alex van Andel <me@alexvanandel.com> * Allow lint to error but continue (unblock pipeline) * fix: potential fix for flaky layout shift (#18651) * potential fix: layout shift * fix lint error * feat: update translations via @replexica (#18598) * chore: sync with main * feat: update translations via @replexica --------- Co-authored-by: Replexica <support@replexica.com> * Update yarn.lock * nit: let tasker handle payload stringification --------- Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Co-authored-by: Alex van Andel <me@alexvanandel.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: Morgan Vernay <morgan@cal.com> Co-authored-by: Omar López <zomars@me.com> Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Co-authored-by: Nizzy <140507264+nizzyabi@users.noreply.github.com> Co-authored-by: Benny Joo <sldisek783@gmail.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: Keith Williams <keithwillcode@gmail.com> Co-authored-by: GitHub Actions <github-actions@github.com> Co-authored-by: Kartik Saini <41051387+kart1ka@users.noreply.github.com> Co-authored-by: Calcom Bot <109866826+calcom-bot@users.noreply.github.com> Co-authored-by: Replexica <support@replexica.com>

* chore: apps/[slug] remove pages router * remove apps/[slug] pages from /future * chore: apps/installed remove pages router * chore: apps/installation remove pages router * remove Head element * fix metadata * fix test * fix another test * chore: apps/categories remove pages router * revert unneeded changes * update middleware * Remove <Head> * remove unused import and code * remove unused import and code again * fix * fix category page * add split icon * add /routing paths to middleware matcher * wip * remove HeadSeo from App.tsx * clean up head-seo test * add generateAppMetadata * use generateAppMetadata in apps/[slug] page * delete file * remove log * fix * fix * fix apps/installed pages * fix cateogires pages * fix * fix imports * wip * fix * fix * fix metadata * fix * redirect /apps/routing-forms to /routing * replace all usages of /apps/routing-forms to /routing * better naming * /routing -> /routing/forms * fix * fix * fix * fix * remove backPath as it is irrelevant when withoutMain is true * fix type checks * fix type check in apps/[slug] * refactors * fix * fix test * fix * fix * fix * Replace multiple leading slashes with a single slash * migrate routing-forms too * add re routing * fix * add redirection --------- Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>

… (calcom#18702) * revert * add incomplete-booking

* Upgrade jsforce to 3.6.2 * Refactor connecting to Salesforce * Revert yarn.lock changes * Add `TASKER_ENABLE_CRM_EVENT_CREATION` to .env * Add createCRMEvent scheduler * Schedule CRM event creating in `EventManager` * Add calendar event builder for CRM tasks * Do not write to person record if fields don't exist * Change type to expect string from tasker * Create CRM event * Create booking references * Type fixes * Migrate callback endpoint * Add jsforce node dependency * Migrate add endpoint * Import * Import package into crmService * Use new package types * Type fix * Update vite config * Push updated lockfile * Attempt to bump platform/libraries to unlock jsforce * Also update lockfile, naturally * bump platform libraries * feat: salesforce to tasker improvements (calcom#18419) * feat: salesforce to tasker * refactor: event manager * tests: add unit tests for create CRM Event * Update vite.config * Add jsforce to vite config * Revert mint.json changes * Default to not enabling * Revert yarn.lock changes * Remove `TASKER_ENABLE_CRM_EVENT_CREATION` variable * Revert yarn.lock changes * feat: Round Robin weights future members toggle (calcom#17782) Co-authored-by: Omar López <zomars@me.com> * detailed customer card (calcom#18511) Co-authored-by: Omar López <zomars@me.com> * chore: app router - all sub-pages in `/apps` (calcom#16976) * chore: apps/[slug] remove pages router * remove apps/[slug] pages from /future * chore: apps/installed remove pages router * chore: apps/installation remove pages router * remove Head element * fix metadata * fix test * fix another test * chore: apps/categories remove pages router * revert unneeded changes * update middleware * Remove <Head> * remove unused import and code * remove unused import and code again * fix * fix category page * add split icon * add /routing paths to middleware matcher * wip * remove HeadSeo from App.tsx * clean up head-seo test * add generateAppMetadata * use generateAppMetadata in apps/[slug] page * delete file * remove log * fix * fix * fix apps/installed pages * fix cateogires pages * fix * fix imports * wip * fix * fix * fix metadata * fix * redirect /apps/routing-forms to /routing * replace all usages of /apps/routing-forms to /routing * better naming * /routing -> /routing/forms * fix * fix * fix * fix * remove backPath as it is irrelevant when withoutMain is true * fix type checks * fix type check in apps/[slug] * refactors * fix * fix test * fix * fix * fix * Replace multiple leading slashes with a single slash * migrate routing-forms too * add re routing * fix * add redirection --------- Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> * chore: app router 404 page (calcom#18597) * wip * wip * fix not found page * render middleware for /settings pages * fix * remove global-error page * add metadata to not-found page * make not-found page static * remove 404 * adding not-found to middleware is not necessary * add every routes to config.matcher * fix test * fix style * use i18n string * fix tests * fix * fix * revert unneeded changes * fix * fix * fix * fix style * fix * remove 404 * remove log * fix * fix * fix * fix * better naming * parallel testing --------- Co-authored-by: Benny Joo <sldisek783@gmail.com> * feat: render custom error page for unexpected sever error + remove` pages/_error` (calcom#18606) * remove page/_error * refactor app/error * fix: app/not-found cannot be a static page (calcom#18610) * Async False (calcom#18611) * chore: redirect to /500 if pathname does not exist + better error handling (calcom#18615) * fix lint error * fix booking page and better error handling * chore: gracefully handle 404s from pages router's dynamic pages + tests (calcom#18618) * restore pages/_error * set custom header in pages/_error * handle it in middleware * add test * remove logs * better test description * chore: try using custom 404 in pages/_error (calcom#18622) * fix: parsing teamId (calcom#18623) * chore: restore error pages for pages router (calcom#18625) * disable emails to all guests (calcom#18628) Co-authored-by: CarinaWolli <wollencarina@gmail.com> * revert: "feat: bulk shorten links with dub.links.createMany (calcom#18539)" (calcom#18587) This reverts commit 4902c6a. Co-authored-by: Alex van Andel <me@alexvanandel.com> * chore: release v4.8.18 * fix: disable sending sms when email is present (calcom#18632) * fix: disable sending sms when email is present * fix: update test * fix: main lint errors (calcom#18634) * fix: error-page.tsx related lint errors * fix: lint no continue-on-error * Adding more lint fixes * Bring back annotate code linting results * Bring back linting continue-on-error * Slimline lint * feat: do not show automation webhooks in webhook list (calcom#18607) * fix: make ESLint work and fix lint errors that were undetected before (calcom#18639) * fix eslint config * fix * add it to dev dep * fix * sync eslint version * force ts-node to compile our ESLint plugin's TS files into CommonJS (which ESLint requires) * fix some lint errors * fix lint errors * remove duplicate classname * make @typescript-eslint/ban-types a warn for packages/trpc files * fix lint errors in trpc * fix lint errors in trpc - 2 * fix * fix * fix lint warnings * chore: clean up config.matcher in middleware (calcom#18638) Co-authored-by: Alex van Andel <me@alexvanandel.com> * Allow lint to error but continue (unblock pipeline) * fix: potential fix for flaky layout shift (calcom#18651) * potential fix: layout shift * fix lint error * feat: update translations via @replexica (calcom#18598) * chore: sync with main * feat: update translations via @replexica --------- Co-authored-by: Replexica <support@replexica.com> * Update yarn.lock * nit: let tasker handle payload stringification --------- Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Co-authored-by: Alex van Andel <me@alexvanandel.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: Morgan Vernay <morgan@cal.com> Co-authored-by: Omar López <zomars@me.com> Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Co-authored-by: Nizzy <140507264+nizzyabi@users.noreply.github.com> Co-authored-by: Benny Joo <sldisek783@gmail.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: Keith Williams <keithwillcode@gmail.com> Co-authored-by: GitHub Actions <github-actions@github.com> Co-authored-by: Kartik Saini <41051387+kart1ka@users.noreply.github.com> Co-authored-by: Calcom Bot <109866826+calcom-bot@users.noreply.github.com> Co-authored-by: Replexica <support@replexica.com>

chore: apps/[slug] remove pages router

ec41b0c

hbjORbj marked this pull request as draft October 7, 2024 19:43

graphite-app bot requested a review from a team October 7, 2024 19:43

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

dosubot bot added the 💻 refactor label Oct 7, 2024

keithwillcode added consumer core area: core, team members only labels Oct 7, 2024

remove apps/[slug] pages from /future

873088d

vercel bot deployed to Preview – api October 7, 2024 20:00 View deployment

vercel bot deployed to Preview – dev October 7, 2024 20:16 View deployment

github-actions bot added the Stale label Oct 22, 2024

hbjORbj added 2 commits December 14, 2024 13:35

Merge remote-tracking branch 'origin/main' into chore/apps-remove-pag…

89ecada

…es-router-1

chore: apps/installed remove pages router

5587b8f

hbjORbj force-pushed the chore/apps-remove-pages-router-1 branch from b1501ff to 5587b8f Compare December 14, 2024 18:36

hbjORbj added 6 commits December 14, 2024 13:37

chore: apps/installation remove pages router

bcd6b9a

remove Head element

9dfa68c

fix metadata

d202648

fix test

ca569fe

fix another test

d77b260

chore: apps/categories remove pages router

45639f3

hbjORbj changed the title ~~chore: apps/[slug] remove pages router~~ chore: app router - all sub-pages in /apps Dec 14, 2024

hbjORbj added 3 commits December 14, 2024 13:40

revert unneeded changes

30e0f40

update middleware

e5902dd

Remove <Head>

9d083e5

hbjORbj added ready-for-e2e and removed Stale labels Dec 14, 2024

hbjORbj mentioned this pull request Dec 14, 2024

chore: apps/categories remove pages router #16977

Closed

3 tasks

Replace multiple leading slashes with a single slash

c50c666

hbjORbj commented Jan 9, 2025

View reviewed changes

vercel bot deployed to Preview – api January 9, 2025 04:18 View deployment

hbjORbj added 4 commits January 9, 2025 00:03

migrate routing-forms too

373d579

add re routing

b2ab920

fix

df29b0e

add redirection

3526865

vercel bot deployed to Preview – api January 9, 2025 05:21 View deployment

hbjORbj removed ⚡ Quick Wins A collection of quick wins/quick fixes that are less than 30 minutes of work Medium priority Created by Linear-GitHub Sync labels Jan 9, 2025

hbjORbj marked this pull request as ready for review January 9, 2025 13:45

graphite-app bot requested a review from a team January 9, 2025 13:45

eunjae-lee approved these changes Jan 9, 2025

View reviewed changes

Merge branch 'main' into chore/apps-remove-pages-router-1

32cc39e

github-actions bot added Medium priority Created by Linear-GitHub Sync ⚡ Quick Wins A collection of quick wins/quick fixes that are less than 30 minutes of work labels Jan 9, 2025

vercel bot deployed to Preview – api January 9, 2025 16:24 View deployment

Merge branch 'main' into chore/apps-remove-pages-router-1

f3b298c

vercel bot deployed to Preview – api January 10, 2025 05:46 View deployment

hbjORbj merged commit bb40b2f into main Jan 11, 2025
38 checks passed

hbjORbj deleted the chore/apps-remove-pages-router-1 branch January 11, 2025 01:16

emrysal pushed a commit that referenced this pull request Jan 16, 2025

fix: Revert - chore: app router - all sub-pages in /apps #16976 (#1…

ce87de4

…8702) * revert * add incomplete-booking

MuhammadAimanSulaiman pushed a commit to hit-pay/cal.com that referenced this pull request Feb 25, 2025

fix: Revert - chore: app router - all sub-pages in /apps calcom#16976…

5167f55

… (calcom#18702) * revert * add incomplete-booking

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: app router - all sub-pages in `/apps` #16976

chore: app router - all sub-pages in `/apps` #16976

hbjORbj commented Oct 7, 2024 •

edited

Loading

vercel bot commented Oct 7, 2024 •

edited

Loading

graphite-app bot commented Oct 7, 2024 •

edited

Loading

github-actions bot commented Oct 22, 2024

hbjORbj Jan 9, 2025

eunjae-lee left a comment

eunjae-lee Jan 9, 2025

hbjORbj Jan 9, 2025

eunjae-lee Jan 9, 2025

hbjORbj Jan 10, 2025 •

edited

Loading

chore: app router - all sub-pages in /apps #16976

chore: app router - all sub-pages in /apps #16976

Conversation

hbjORbj commented Oct 7, 2024 • edited Loading

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

vercel bot commented Oct 7, 2024 • edited Loading

graphite-app bot commented Oct 7, 2024 • edited Loading

Graphite Automations

github-actions bot commented Oct 22, 2024

hbjORbj Jan 9, 2025

Choose a reason for hiding this comment

eunjae-lee left a comment

Choose a reason for hiding this comment

eunjae-lee Jan 9, 2025

Choose a reason for hiding this comment

hbjORbj Jan 9, 2025

Choose a reason for hiding this comment

eunjae-lee Jan 9, 2025

Choose a reason for hiding this comment

hbjORbj Jan 10, 2025 • edited Loading

Choose a reason for hiding this comment

chore: app router - all sub-pages in `/apps` #16976

chore: app router - all sub-pages in `/apps` #16976

hbjORbj commented Oct 7, 2024 •

edited

Loading

vercel bot commented Oct 7, 2024 •

edited

Loading

graphite-app bot commented Oct 7, 2024 •

edited

Loading

hbjORbj Jan 10, 2025 •

edited

Loading