From 78e54cd6bf58fc0e033f76715da60bc204465910 Mon Sep 17 00:00:00 2001 From: Artem Alexeyenko Date: Wed, 29 Jan 2025 16:41:31 -0500 Subject: [PATCH 1/2] [Component Library] accept dataSourceId query param --- .../src/editing/editing-render-middleware.test.ts | 4 ++-- .../src/editing/editing-render-middleware.ts | 2 +- .../src/editing/rest-component-layout-service.ts | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/sitecore-jss-nextjs/src/editing/editing-render-middleware.test.ts b/packages/sitecore-jss-nextjs/src/editing/editing-render-middleware.test.ts index bc80b5b3ab..cd7b889895 100644 --- a/packages/sitecore-jss-nextjs/src/editing/editing-render-middleware.test.ts +++ b/packages/sitecore-jss-nextjs/src/editing/editing-render-middleware.test.ts @@ -216,7 +216,7 @@ describe('EditingRenderMiddleware', () => { sc_version: 'latest', secret: secret, sc_renderingId: '123', - sc_datasourceId: '456', + dataSourceId: '456', sc_uid: '789', }; @@ -237,7 +237,7 @@ describe('EditingRenderMiddleware', () => { site: query.sc_site, pageState: 'normal', mode: 'library', - dataSourceId: query.sc_datasourceId, + dataSourceId: query.dataSourceId, version: query.sc_version, }); diff --git a/packages/sitecore-jss-nextjs/src/editing/editing-render-middleware.ts b/packages/sitecore-jss-nextjs/src/editing/editing-render-middleware.ts index 588f38346b..4ec913ca73 100644 --- a/packages/sitecore-jss-nextjs/src/editing/editing-render-middleware.ts +++ b/packages/sitecore-jss-nextjs/src/editing/editing-render-middleware.ts @@ -392,7 +392,7 @@ export class MetadataHandler { site: query.sc_site, pageState: LayoutServicePageState.Normal, mode: 'library', - dataSourceId: query.sc_datasourceId, + dataSourceId: query.dataSourceId, version: query.sc_version, } as ComponentLibraryRenderPreviewData, { diff --git a/packages/sitecore-jss/src/editing/rest-component-layout-service.ts b/packages/sitecore-jss/src/editing/rest-component-layout-service.ts index 15c0cf2a13..40f5077ee6 100644 --- a/packages/sitecore-jss/src/editing/rest-component-layout-service.ts +++ b/packages/sitecore-jss/src/editing/rest-component-layout-service.ts @@ -60,11 +60,12 @@ export class RestComponentLayoutService extends RestLayoutService { params.siteName = params.siteName || this.config.siteName; const querystringParams = this.getComponentFetchParams(params); debug.layout( - 'fetching component with uid %s for %s %s %s', + 'fetching component with uid %s for %s %s %s %s', params.componentUid, params.itemId, params.language, - params.siteName + params.siteName, + params.dataSourceId ); const fetcher = this.getFetcher(req, res); From cf26cb70acc282abc6af6f584f93ffdf7ff6d811 Mon Sep 17 00:00:00 2001 From: Artem Alexeyenko Date: Wed, 29 Jan 2025 16:44:49 -0500 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d40563adb7..524f115567 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ Our versioning strategy is as follows: ### 🎉 New Features & Improvements -* `[nextjs][sitecore-jss-nextjs]` Support for Component Library feature in XMCloud ([#1987](https://github.com/Sitecore/jss/pull/1987)[#2000](https://github.com/Sitecore/jss/pull/2000)[#2002](https://github.com/Sitecore/jss/pull/2002)[#2005](https://github.com/Sitecore/jss/pull/2005)) +* `[nextjs][sitecore-jss-nextjs]` Support for Component Library feature in XMCloud ([#1987](https://github.com/Sitecore/jss/pull/1987)[#2000](https://github.com/Sitecore/jss/pull/2000)[#2002](https://github.com/Sitecore/jss/pull/2002)[#2005](https://github.com/Sitecore/jss/pull/2005)[#2024](https://github.com/Sitecore/jss/pull/2024)) ### 🐛 Bug Fixes