[Nextjs] [Multi-site] Ensure site and variant prefixes are position agnostic #1286
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit 3c412ed6855d60452e1e29d21a92d1901312d3d4)
| @@ -52,6 +52,13 @@ describe('utils', () => { | |||
| const result = getPersonalizedRewriteData(pathname); | |||
| expect(result.variantId).to.equal(''); | |||
| }); | |||
| it('should return varinat id from any position in pathname', () => { | |||
There was a problem hiding this comment.
We have unit test which covers this case:
https://github.com/Sitecore/jss/pull/1286/files#diff-1f4e67a3c64ca2fb78679219cf3a4ece8637f674e6e35e1af42290ef3daea60bR40-R44
| @@ -54,6 +54,14 @@ describe('utils', () => { | |||
| const result = getSiteRewriteData(pathname, defaultSiteName); | |||
| expect(result.siteName).to.equal(defaultSiteName); | |||
| }); | |||
|
|
|||
| it('should return site name from anywhere in the path', () => { | |||
There was a problem hiding this comment.
We have unit test which covers this case
https://github.com/Sitecore/jss/pull/1286/files#diff-9180dcad4ff6d90d1a74047e8ed7c00e0cf601c420f20989cc514bf5faf3545aR40-R44
ambrauer
approved these changes
Jan 12, 2023
ambrauer
added a commit
that referenced
this pull request
Jan 12, 2023
* [Next.js][Multi-site] Create plugin approach for extract-path * Minor changes to JSDoc * [Next.js][Multi-site] Dynamic site resolver (#1271) * [Next.js][Multi-site] Dynamic site resolver * add changes * Add unit tests, parse pattern * etc * simplify reg exp * [Next.js][Multi-site] Multi-site path utils (#1275) * [Next.js][Multi-site] Multi-site path utils * Add return type to `getSiteRewriteData` Co-authored-by: Adam Brauer <400763+ambrauer@users.noreply.github.com> * [Next.js][Multi-site] Fetch site info during build (#1276) * GraphQL site info service (#1227) * GraphQL site info service * some tweaks * more tweaks: debug, query * query fix for xm cloud * move template id to contstants * [Next.js][Multi-site] Dynamic site resolver (#1224) * [Next.js][Multi-site] Dynamic site resolver * Use SiteInfo from graphql-siteinfo-service Co-authored-by: Adam Brauer <400763+ambrauer@users.noreply.github.com> * Plugin approach for JSS config generation. Added multisite plugin to set the "sites" prop. * Standardized comments in config plugins. Misc fixes. * Fixed tests and relocated headlessSiteGroupingTemplate constant (since this query is temp anyway) * Moved defaultLanguage of 'en' to defaultConfig * Simplify config plugin order. Delete multisite-sample.ts Co-authored-by: Artem Alexeyenko <ala@sitecore.net> Co-authored-by: Illia Kovalenko <23364749+illiakovalenko@users.noreply.github.com> * [Next.js][Multi-site] Site resolution in API routes (#1277) * add site resolution in api routes * re-exported SiteResolver from nextjs package * passed siteInfo to siteResolver * refactored based on changes in resolver function * [Next.js][Multi-site] Site resolution in page props factory (#1281) * SiteResolver.resolve updates: removed 'language' from site resolution logic, return SiteInfo instead of site name * Another refactor of SiteResolver. It now must be instantiated with the array of SiteInfo passed. Also introduced a way to resolve by site name ("getByName"). The old "resolve" became "getByHost". * Added "site" prop to page props and resolve for both base nextjs initializer (single site) and nextjs-multisite add-on. * misc lint fixes * Adjustments to API routes based on latest SiteResolver changes * Added comments * Removed generateConfig from fetch-graphql-introspection-data.ts. No longer works after config generation refactor, and not necessary anyway since we provide details on how to generate config in error message anyway * Update page props factory error-pages plugin to use props.site.name * [Next.js][Multi-site] Multi-site middleware plugin (#1279) * jss-cli unit test coverage: first batch * jss-cli unit test coverage: second batch * jss-cli unit tests: second batch * fix expected output for test not to fail across environments * lint * dev-tools unit test coverage first batch * dev-tools unit test coverage: second batch * resolve-scjssconfig test placeholder (for the future!) * exclude index file from jss-vue test coverage (#1266) * version v21.1.0-canary.58 [skip ci] * fix test for scjssconfig resolving * Update packages/sitecore-jss-dev-tools/src/manifest/manifest-manager.test.ts Co-authored-by: Adam Brauer <400763+ambrauer@users.noreply.github.com> * Update packages/sitecore-jss-dev-tools/src/manifest/manifest-manager.test.ts Co-authored-by: Adam Brauer <400763+ambrauer@users.noreply.github.com> * lint * adding test data for scjssconfig * some improvements to reject logic in resolve scjssconfig * lint numero 2 * version v21.1.0-canary.59 [skip ci] * #556667: fixed urls for sitemap * version v21.1.0-canary.60 [skip ci] * final batch * re-gen yarn.lock * yarn.lock re-update * version v21.1.0-canary.61 [skip ci] * #552985: fixed header styles * version v21.1.0-canary.62 [skip ci] * #546298: fixed style for showing hidden components * version v21.1.0-canary.63 [skip ci] * SiteResolver.resolve updates: removed 'language' from site resolution logic, return SiteInfo instead of site name * [Next.js][Multi-site] Multi-site middleware plugin * #559044: fixed rendering dynamic placeholder (#1278) * version v21.1.0-canary.64 [skip ci] * Adjust with latest site resolver changes * adjust * Add latest changes * Extra comment * extra fix * Extend unit tests * Revert cookie set change * Use response cookies instead of request * Adjust changes according to review * Adjust changes according to review * lint fix Co-authored-by: Artem Alexeyenko <ala@sitecore.net> Co-authored-by: Automated Build <builds@sitecore.com> Co-authored-by: Adam Brauer <400763+ambrauer@users.noreply.github.com> Co-authored-by: Ruslan Matkovskyi <rusm@sitecore.net> Co-authored-by: Ruslan Matkovskyi <100142572+matkovskyi@users.noreply.github.com> * [Next.js][Multi-site] Support for "sc_site" query string parameter (#1283) * jss-cli unit test coverage: first batch * jss-cli unit test coverage: second batch * jss-cli unit tests: second batch * fix expected output for test not to fail across environments * lint * dev-tools unit test coverage first batch * dev-tools unit test coverage: second batch * resolve-scjssconfig test placeholder (for the future!) * exclude index file from jss-vue test coverage (#1266) * version v21.1.0-canary.58 [skip ci] * fix test for scjssconfig resolving * Update packages/sitecore-jss-dev-tools/src/manifest/manifest-manager.test.ts Co-authored-by: Adam Brauer <400763+ambrauer@users.noreply.github.com> * Update packages/sitecore-jss-dev-tools/src/manifest/manifest-manager.test.ts Co-authored-by: Adam Brauer <400763+ambrauer@users.noreply.github.com> * lint * adding test data for scjssconfig * some improvements to reject logic in resolve scjssconfig * lint numero 2 * version v21.1.0-canary.59 [skip ci] * #556667: fixed urls for sitemap * version v21.1.0-canary.60 [skip ci] * final batch * re-gen yarn.lock * yarn.lock re-update * version v21.1.0-canary.61 [skip ci] * #552985: fixed header styles * version v21.1.0-canary.62 [skip ci] * #546298: fixed style for showing hidden components * version v21.1.0-canary.63 [skip ci] * SiteResolver.resolve updates: removed 'language' from site resolution logic, return SiteInfo instead of site name * [Next.js][Multi-site] Multi-site middleware plugin * #559044: fixed rendering dynamic placeholder (#1278) * version v21.1.0-canary.64 [skip ci] * Adjust with latest site resolver changes * adjust * Add latest changes * Extra comment * extra fix * Extend unit tests * Revert cookie set change * Use response cookies instead of request * Add querystring support * Adjust changes according to review * Adjust changes * Adjust changes according to review * lint fix * Use `sc_site` request cookie when it's present Co-authored-by: Artem Alexeyenko <ala@sitecore.net> Co-authored-by: Automated Build <builds@sitecore.com> Co-authored-by: Adam Brauer <400763+ambrauer@users.noreply.github.com> Co-authored-by: Ruslan Matkovskyi <rusm@sitecore.net> Co-authored-by: Ruslan Matkovskyi <100142572+matkovskyi@users.noreply.github.com> * Import SiteResolver from `middleware` submodule * Ensure site and variant prefixes are position agnostic (#1286) * personalize rewrite unit tests (cherry picked from commit 3c412ed6855d60452e1e29d21a92d1901312d3d4) * site path utils unit tests, tweak to personalize path unit test * [MultiSite] SSG support (#1284) * added ssg support for multisite * added changes from review comments * added sitename for debug log * refactored sitemap methods * fixed debug sitename * add error when no sites * removed commented code * refactored transformLanguageSitePaths * Update packages/sitecore-jss-nextjs/src/services/graphql-sitemap-service.ts Co-authored-by: Adam Brauer <400763+ambrauer@users.noreply.github.com> * lint fix Co-authored-by: illiakovalenko <illia.kovalenko@sitecore.com> Co-authored-by: Illia Kovalenko <23364749+illiakovalenko@users.noreply.github.com> Co-authored-by: Artem Alexeyenko <ala@sitecore.net> Co-authored-by: Addy Pathania <89087450+sc-addypathania@users.noreply.github.com> Co-authored-by: Automated Build <builds@sitecore.com> Co-authored-by: Ruslan Matkovskyi <rusm@sitecore.net> Co-authored-by: Ruslan Matkovskyi <100142572+matkovskyi@users.noreply.github.com>
addy-pathania
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With multisite feature adding another prefix, we need to ensure the program will understand and correctly handle path prefixes regardless of the order they go in, or their position.
Types of changes