You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2023/06/13 22:29:00 UTC
[myfaces] branch main updated: MYFACES-4606: Fix a small issue caused by the naming container fixes
This is an automated email from the ASF dual-hosted git repository.
werpu pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/main by this push:
new 3302456ac MYFACES-4606: Fix a small issue caused by the naming container fixes
new f87f4b95e Merge pull request #584 from werpu/main
3302456ac is described below
commit 3302456ac314b95b39b77c410b7013284cc5d3a2
Author: Werner Punz <we...@gmail.com>
AuthorDate: Wed Jun 14 00:19:00 2023 +0200
MYFACES-4606: Fix a small issue caused by the naming container fixes
---
api/src/client/package-lock.json | 14 +++++++-------
api/src/client/package.json | 2 +-
api/src/client/typescript/faces/impl/xhrCore/XhrRequest.ts | 9 +++++++++
.../faces/test/xhrCore/RequestParamsTest.spec.ts | 3 ++-
4 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/api/src/client/package-lock.json b/api/src/client/package-lock.json
index 800604403..90fdf9bb9 100644
--- a/api/src/client/package-lock.json
+++ b/api/src/client/package-lock.json
@@ -22,7 +22,7 @@
"html-webpack-plugin": "^5.5.1",
"jsdom": "^21.1.1",
"jsdom-global": "^3.0.2",
- "jsf.js_next_gen": "4.0.1-beta.9",
+ "jsf.js_next_gen": "4.0.2-beta.1",
"mocha": "^10.2.0",
"npm-check-updates": "^16.10.8",
"nyc": "^15.1.0",
@@ -4990,9 +4990,9 @@
}
},
"node_modules/jsf.js_next_gen": {
- "version": "4.0.1-beta.9",
- "resolved": "https://registry.npmjs.org/jsf.js_next_gen/-/jsf.js_next_gen-4.0.1-beta.9.tgz",
- "integrity": "sha512-0huNEzqsxNg//xuIrL91tMHJ6r4OhPOHlFk20MQS9D2PyoKByX+iinXG5vtY+OXhLIzZYsvWAraWZcd3OcZeoA==",
+ "version": "4.0.2-beta.1",
+ "resolved": "https://registry.npmjs.org/jsf.js_next_gen/-/jsf.js_next_gen-4.0.2-beta.1.tgz",
+ "integrity": "sha512-rzrvgZpIwRaW2WqsAKZppYMhdRSuxHkapWWUR+k15eapKXtYh6MWpCS0lvA38fZWKUGcTnDzWpvtZxdhNCAdHg==",
"dev": true,
"dependencies": {
"mona-dish": "0.28.10"
@@ -13831,9 +13831,9 @@
"dev": true
},
"jsf.js_next_gen": {
- "version": "4.0.1-beta.9",
- "resolved": "https://registry.npmjs.org/jsf.js_next_gen/-/jsf.js_next_gen-4.0.1-beta.9.tgz",
- "integrity": "sha512-0huNEzqsxNg//xuIrL91tMHJ6r4OhPOHlFk20MQS9D2PyoKByX+iinXG5vtY+OXhLIzZYsvWAraWZcd3OcZeoA==",
+ "version": "4.0.2-beta.1",
+ "resolved": "https://registry.npmjs.org/jsf.js_next_gen/-/jsf.js_next_gen-4.0.2-beta.1.tgz",
+ "integrity": "sha512-rzrvgZpIwRaW2WqsAKZppYMhdRSuxHkapWWUR+k15eapKXtYh6MWpCS0lvA38fZWKUGcTnDzWpvtZxdhNCAdHg==",
"dev": true,
"requires": {
"mona-dish": "0.28.10"
diff --git a/api/src/client/package.json b/api/src/client/package.json
index e8e729592..ef10a2886 100644
--- a/api/src/client/package.json
+++ b/api/src/client/package.json
@@ -24,7 +24,7 @@
"html-webpack-plugin": "^5.5.1",
"jsdom": "^21.1.1",
"jsdom-global": "^3.0.2",
- "jsf.js_next_gen": "4.0.1-beta.9",
+ "jsf.js_next_gen": "4.0.2-beta.1",
"mocha": "^10.2.0",
"npm-check-updates": "^16.10.8",
"nyc": "^15.1.0",
diff --git a/api/src/client/typescript/faces/impl/xhrCore/XhrRequest.ts b/api/src/client/typescript/faces/impl/xhrCore/XhrRequest.ts
index 429dd268e..586f71653 100644
--- a/api/src/client/typescript/faces/impl/xhrCore/XhrRequest.ts
+++ b/api/src/client/typescript/faces/impl/xhrCore/XhrRequest.ts
@@ -126,6 +126,7 @@ export class XhrRequest extends AsyncRunnable<XMLHttpRequest> {
executes, partialIdsArray
);
+
this.contentType = formData.isMultipartRequest ? "undefined" : this.contentType;
// next step the pass through parameters are merged in for post params
@@ -149,6 +150,14 @@ export class XhrRequest extends AsyncRunnable<XMLHttpRequest> {
requestPassThroughParams.$nspEnabled = true;
}
+ const issuingItemId = this.internalContext.getIf(CTX_PARAM_SRC_CTL_ID).value;
+ if(issuingItemId) {
+ const issuingItem = DQ.byId(issuingItemId);
+ const arr = new ExtConfig({});
+ arr.assign(issuingItemId).value = issuingItem.val;
+ formData.shallowMerge(arr, true, true);
+ }
+
this.responseContext = requestPassThroughParams.deepCopy;
// we have to shift the internal passthroughs around to build up our response context
diff --git a/api/src/client/typescript/faces/test/xhrCore/RequestParamsTest.spec.ts b/api/src/client/typescript/faces/test/xhrCore/RequestParamsTest.spec.ts
index a58e35503..9f8e53889 100644
--- a/api/src/client/typescript/faces/test/xhrCore/RequestParamsTest.spec.ts
+++ b/api/src/client/typescript/faces/test/xhrCore/RequestParamsTest.spec.ts
@@ -68,7 +68,8 @@ describe("test for proper request param patterns identical to the old implementa
"jakarta.faces.partial.ajax": "true",
"jakarta.faces.partial.execute": "cmd_update_insert2",
"form1": "form1",
- "jakarta.faces.ViewState": "blubbblubblubb"
+ "jakarta.faces.ViewState": "blubbblubblubb",
+ "cmd_update_insert2": "update insert second protocol path"
}
/**
* matches two maps for absolute identicality