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.

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

[BYOC] Form's submission is failing. Updated @sitecore-feaas/clientside to v0.5.19. Updated @sitecore-cloudsdk to v0.4.1. #1966

Merged
merged 6 commits into from
Nov 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,11 @@ Our versioning strategy is as follows:
* `[templates/angular]``[templates/node-xmcloud-proxy]``[templates/node-headless-ssr-proxy]``[templates/node-headless-ssr-experience-edge]` Adjust out of box .gitignore rules
* New Angular add-on's are not scaffolded within build pipeline ([#1962](https://github.com/Sitecore/jss/pull/1962))

## 22.2.1

### 🐛 Bug Fixes
* [BYOC] Form's submission is failing. Updated @sitecore-feaas/clientside to v0.5.19. Passed rendering data to FEAAS.ExternalComponent. Updated @sitecore-cloudsdk to v0.4.1. ([#1966](https://github.com/Sitecore/jss/pull/1966))

## 22.2.0

### 🛠 Breaking Change
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"prepare:proxy-build": "ts-node --project src/tsconfig.webpack-server.json ./scripts/proxy-build.ts"
},
"dependencies": {
"@sitecore-cloudsdk/core": "^0.4.0",
"@sitecore-cloudsdk/events": "^0.4.0",
"@sitecore-cloudsdk/core": "^0.4.1",
"@sitecore-cloudsdk/events": "^0.4.1",
"font-awesome": "^4.7.0",
"sass": "^1.52.3",
"sass-alias": "^1.0.5"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"dependencies": {
"@sitecore/components": "~2.0.0",
"@sitecore-cloudsdk/core": "^0.4.0",
"@sitecore-cloudsdk/events": "^0.4.0",
"@sitecore-feaas/clientside": "^0.5.17"
"@sitecore/components": "~2.0.1-alpha.1",
"@sitecore-cloudsdk/core": "^0.4.1",
"@sitecore-cloudsdk/events": "^0.4.1",
"@sitecore-feaas/clientside": "^0.5.19"
}
}
8 changes: 4 additions & 4 deletions packages/sitecore-jss-nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"url": "https://github.com/sitecore/jss/issues"
},
"devDependencies": {
"@sitecore-cloudsdk/core": "^0.4.0",
"@sitecore-cloudsdk/personalize": "^0.4.0",
"@sitecore-cloudsdk/core": "^0.4.1",
"@sitecore-cloudsdk/personalize": "^0.4.1",
"@types/chai": "^4.3.4",
"@types/chai-as-promised": "^7.1.5",
"@types/chai-string": "^1.4.2",
Expand Down Expand Up @@ -66,8 +66,8 @@
"typescript": "~4.9.4"
},
"peerDependencies": {
"@sitecore-cloudsdk/core": "^0.4.0",
"@sitecore-cloudsdk/personalize": "^0.4.0",
"@sitecore-cloudsdk/core": "^0.4.1",
"@sitecore-cloudsdk/personalize": "^0.4.1",
"next": "^14.2.7",
"react": "^18.2.0",
"react-dom": "^18.2.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/sitecore-jss-proxy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"url": "https://github.com/sitecore/jss/issues"
},
"dependencies": {
"@sitecore-cloudsdk/core": "^0.4.0",
"@sitecore-cloudsdk/personalize": "^0.4.0",
"@sitecore-cloudsdk/core": "^0.4.1",
"@sitecore-cloudsdk/personalize": "^0.4.1",
"@sitecore-jss/sitecore-jss": "22.3.0-canary.4",
"http-proxy-middleware": "^2.0.6",
"http-status-codes": "^2.2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/sitecore-jss-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"url": "https://github.com/sitecore/jss/issues"
},
"devDependencies": {
"@sitecore-feaas/clientside": "^0.5.6",
"@sitecore-feaas/clientside": "^0.5.19",
"@types/chai": "^4.3.4",
"@types/chai-string": "^1.4.2",
"@types/enzyme": "^3.10.12",
Expand Down Expand Up @@ -56,7 +56,7 @@
"typescript": "~4.9.3"
},
"peerDependencies": {
"@sitecore-feaas/clientside": "^0.5.6",
"@sitecore-feaas/clientside": "^0.5.19",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ import { MissingComponent, MissingComponentProps } from './MissingComponent';
describe('BYOCComponent', () => {
it('should render with props when ComponentProps is provided', () => {
const mockProps = {
rendering: {
uid: '1111-2222-3333-4444',
componentName: 'BYOCWrapper',
},
params: {
ComponentName: 'Foo',
ComponentProps: JSON.stringify({ prop1: 'value1' }),
Expand All @@ -29,6 +33,7 @@ describe('BYOCComponent', () => {
expect(fooComponent.prop('prop1')).to.equal('value1');
expect(fooComponent.prop('data-external-id')).to.equal('Foo');
expect(fooComponent.find('#foo-content')).to.have.length(1);
expect(fooComponent.prop('uid')).to.equal('1111-2222-3333-4444');
});

it('should use datasource fields when provided', () => {
Expand Down
9 changes: 7 additions & 2 deletions packages/sitecore-jss-react/src/components/BYOCComponent.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { ComponentFields } from '@sitecore-jss/sitecore-jss/layout';
import { ComponentFields, ComponentRendering } from '@sitecore-jss/sitecore-jss/layout';
import { getDataFromFields } from '../utils';
import { MissingComponent, MissingComponentProps } from './MissingComponent';
import * as FEAAS from '@sitecore-feaas/clientside/react';
Expand Down Expand Up @@ -43,6 +43,10 @@ export type BYOCComponentParams = {
* Props for BYOCComponent. Includes components list to load external components from.
*/
export type BYOCComponentClientProps = {
/**
* rendering data
*/
rendering: ComponentRendering;
/**
* rendering params
*/
Expand Down Expand Up @@ -157,6 +161,7 @@ export class BYOCComponent extends React.Component<BYOCComponentProps> {
// we render fallback on client to avoid problems with client-only components
return (
<FEAAS.ExternalComponent
{...props.rendering}
componentName={componentName}
clientFallback={fallbackComponent}
datasources={dataSourcesData}
Expand All @@ -172,7 +177,7 @@ export class BYOCComponent extends React.Component<BYOCComponentProps> {
*/
export async function fetchBYOCComponentServerProps(
params: BYOCComponentParams
): Promise<BYOCComponentProps> {
): Promise<BYOCServerProps> {
const fetchDataOptions: FEAAS.DataOptions = params.ComponentDataOverride
? JSON.parse(params.ComponentDataOverride)
: {};
Expand Down
78 changes: 39 additions & 39 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5997,52 +5997,52 @@ __metadata:
languageName: node
linkType: hard

"@sitecore-cloudsdk/core@npm:^0.4.0":
version: 0.4.0
resolution: "@sitecore-cloudsdk/core@npm:0.4.0"
"@sitecore-cloudsdk/core@npm:^0.4.1":
version: 0.4.1
resolution: "@sitecore-cloudsdk/core@npm:0.4.1"
dependencies:
"@sitecore-cloudsdk/utils": ^0.4.0
"@sitecore-cloudsdk/utils": ^0.4.1
debug: ^4.3.4
checksum: 0640147f4767c6d84f90bbefe011fcc76d2fb47adc078f5017f7c2d686c7eff53a661cd77c4b70315c06b2be0b071c8d279a0db3502bcf5e6e288d1a36dd8896
checksum: c64d45229f90b393fb423972af4fccb455fb6e5a3dd326eb65b42c6690cc5a535672fffa674c58736a530c2c6c77f0e3faf27a69b6fd2832aafbb04d895db151
languageName: node
linkType: hard

"@sitecore-cloudsdk/events@npm:^0.4.0":
version: 0.4.0
resolution: "@sitecore-cloudsdk/events@npm:0.4.0"
"@sitecore-cloudsdk/events@npm:^0.4.1":
version: 0.4.1
resolution: "@sitecore-cloudsdk/events@npm:0.4.1"
dependencies:
"@sitecore-cloudsdk/core": ^0.4.0
"@sitecore-cloudsdk/utils": ^0.4.0
checksum: 0e36c44b4bfd23e71b46f20d9ef852e8a948da3ff9f037e37b8a68f4c36220f48d44c2a032979855a5945ed0b100272f7a477ea1f7fdc6b77eab4a32a1d22657
"@sitecore-cloudsdk/core": ^0.4.1
"@sitecore-cloudsdk/utils": ^0.4.1
checksum: 8b4727473bc6dbe0ac70e4c0050e78634303262e3d6d088f1e1225c18835431c1c930921601403074435d4a42ffbcb61bcc06cb0e85210a273c5ebc2025232a4
languageName: node
linkType: hard

"@sitecore-cloudsdk/personalize@npm:^0.4.0":
version: 0.4.0
resolution: "@sitecore-cloudsdk/personalize@npm:0.4.0"
"@sitecore-cloudsdk/personalize@npm:^0.4.1":
version: 0.4.1
resolution: "@sitecore-cloudsdk/personalize@npm:0.4.1"
dependencies:
"@sitecore-cloudsdk/core": ^0.4.0
"@sitecore-cloudsdk/events": ^0.4.0
"@sitecore-cloudsdk/utils": ^0.4.0
checksum: 62668f95a111c1b25668c20fc7cf0bf1958b3aefaf2b9c6cdb79179de4e508b7b466e25654f8efcaefdbffd86a715f210e76f2fda964650f601b0fc9e0579893
"@sitecore-cloudsdk/core": ^0.4.1
"@sitecore-cloudsdk/events": ^0.4.1
"@sitecore-cloudsdk/utils": ^0.4.1
checksum: 2a13fe671aa0319a5e845a15cbf96adbc77a9269b6e18ceb2d813ff5ef88cb0d95332d68db83507d01712e8a19afdddc01fb9a995b508fdd3f0c7dfd49b3e754
languageName: node
linkType: hard

"@sitecore-cloudsdk/utils@npm:^0.4.0":
version: 0.4.0
resolution: "@sitecore-cloudsdk/utils@npm:0.4.0"
checksum: ec5a0611ad4d6ae4b3c2a7542c2021f0b956d2c78e08cab1ff8bd5e6300c3059d5fff6022d0ed2462cd0b4f127d02b5bfabf34e890cddbb51876aebaca3033dc
"@sitecore-cloudsdk/utils@npm:^0.4.1":
version: 0.4.1
resolution: "@sitecore-cloudsdk/utils@npm:0.4.1"
checksum: 719657350cb6871b28c1b88cc3666496d7cc42d5b85eb503441b79e164b40d80ad22d1bea6330bd415b31c00ac7c0a3c24033ec064caff0637b5621efe820205
languageName: node
linkType: hard

"@sitecore-feaas/clientside@npm:^0.5.6":
version: 0.5.9
resolution: "@sitecore-feaas/clientside@npm:0.5.9"
"@sitecore-feaas/clientside@npm:^0.5.19":
version: 0.5.19
resolution: "@sitecore-feaas/clientside@npm:0.5.19"
dependencies:
"@sitecore/byoc": ^0.2.8
"@sitecore/byoc": ^0.2.10
peerDependencies:
react-dom: ">=16.8.0"
checksum: ae5a3c57b104f7ce849341b3b01204210e4f6060f751567aee32a21df77e127bacba970bce2f3eb4f0a4959351f112791d6c7027eb210300e8476defef790115
checksum: 63bcc151e9d79cc591c98f2f68cae8feb9b6a368ba9b4f12aa74a418a208e20cd37d682e671bb7a32ed275a78e7dca3034678af5943961afa2b2ce4d8ddc2955
languageName: node
linkType: hard

Expand Down Expand Up @@ -6224,8 +6224,8 @@ __metadata:
version: 0.0.0-use.local
resolution: "@sitecore-jss/sitecore-jss-nextjs@workspace:packages/sitecore-jss-nextjs"
dependencies:
"@sitecore-cloudsdk/core": ^0.4.0
"@sitecore-cloudsdk/personalize": ^0.4.0
"@sitecore-cloudsdk/core": ^0.4.1
"@sitecore-cloudsdk/personalize": ^0.4.1
"@sitecore-jss/sitecore-jss": 22.3.0-canary.4
"@sitecore-jss/sitecore-jss-dev-tools": 22.3.0-canary.4
"@sitecore-jss/sitecore-jss-react": 22.3.0-canary.4
Expand Down Expand Up @@ -6267,8 +6267,8 @@ __metadata:
ts-node: ^10.9.1
typescript: ~4.9.4
peerDependencies:
"@sitecore-cloudsdk/core": ^0.4.0
"@sitecore-cloudsdk/personalize": ^0.4.0
"@sitecore-cloudsdk/core": ^0.4.1
"@sitecore-cloudsdk/personalize": ^0.4.1
next: ^14.2.7
react: ^18.2.0
react-dom: ^18.2.0
Expand All @@ -6279,8 +6279,8 @@ __metadata:
version: 0.0.0-use.local
resolution: "@sitecore-jss/sitecore-jss-proxy@workspace:packages/sitecore-jss-proxy"
dependencies:
"@sitecore-cloudsdk/core": ^0.4.0
"@sitecore-cloudsdk/personalize": ^0.4.0
"@sitecore-cloudsdk/core": ^0.4.1
"@sitecore-cloudsdk/personalize": ^0.4.1
"@sitecore-jss/sitecore-jss": 22.3.0-canary.4
"@types/chai": ^4.3.4
"@types/express": ^4.17.17
Expand Down Expand Up @@ -6387,7 +6387,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@sitecore-jss/sitecore-jss-react@workspace:packages/sitecore-jss-react"
dependencies:
"@sitecore-feaas/clientside": ^0.5.6
"@sitecore-feaas/clientside": ^0.5.19
"@sitecore-jss/sitecore-jss": 22.3.0-canary.4
"@types/chai": ^4.3.4
"@types/chai-string": ^1.4.2
Expand Down Expand Up @@ -6420,7 +6420,7 @@ __metadata:
ts-node: ^10.9.1
typescript: ~4.9.3
peerDependencies:
"@sitecore-feaas/clientside": ^0.5.6
"@sitecore-feaas/clientside": ^0.5.19
react: ^18.2.0
react-dom: ^18.2.0
languageName: unknown
Expand Down Expand Up @@ -6520,13 +6520,13 @@ __metadata:
languageName: unknown
linkType: soft

"@sitecore/byoc@npm:^0.2.8":
version: 0.2.8
resolution: "@sitecore/byoc@npm:0.2.8"
"@sitecore/byoc@npm:^0.2.10":
version: 0.2.15
resolution: "@sitecore/byoc@npm:0.2.15"
dependencies:
"@rjsf/utils": "*"
json-schema: ^0.4.0
checksum: fb5545021a4e78b05b20d03eb38a663a6bf8453679e0a3fa4ae4477989571c7ce4ece304e4d27c3f1a119d3b2ac20045da9e6eff743c814cebd882b10635642d
checksum: 5da0cd994a55e0809433d0534c1ffcf39a306a8e3769d5aecfc95113c7a2f69ada7c27db9e1bb1ac40bc5a7bbf50344689f1096811bdc8c291067044bafd7dbe
languageName: node
linkType: hard

Expand Down