jsf.js_next_gen 4.0.4-beta.5 → 4.0.4-beta.7

package/dist/window/jsf-development.js

@@ -4202,13 +4202,20 @@ var myfaces;
      *
      * @param source the event source
      * @param event the event
-     * @param eventName event name for java.jakarta.faces.behavior.evemnt
+     * @param eventName event name for java.jakarta.faces.behavior.event
      * @param execute execute list as passed down in faces.ajax.request
      * @param render the render list as string
-     * @param options the options which need to be mered in
+     * @param options the options which need to be merged in
+     * @param userParameters a set of user parameters which go into the final options under params, they can overide whatever is passed via options
      */
-    function ab(source, event, eventName, execute, render, options = {}) {
+    function ab(source, event, eventName, execute, render, options = {}, userParameters = {}) {
         var _a, _b;
+        if (!options) {
+            options = {};
+        }
+        if (!userParameters) {
+            userParameters = {};
+        }
         if (eventName) {
             options[Const_1.CTX_OPTIONS_PARAMS] = (_a = options === null || options === void 0 ? void 0 : options[Const_1.CTX_OPTIONS_PARAMS]) !== null && _a !== void 0 ? _a : {};
             options[Const_1.CTX_OPTIONS_PARAMS][(0, Const_1.$nsp)(Const_1.P_BEHAVIOR_EVENT)] = eventName;
@@ -4219,6 +4226,13 @@ var myfaces;
         if (render) {
             options[Const_1.CTX_PARAM_RENDER] = render;
         }
+        //we push the users parameters in
+        if (!options["params"]) {
+            options["params"] = {};
+        }
+        for (let key in userParameters) {
+            options["params"][key] = userParameters[key];
+        }
         ((_b = window === null || window === void 0 ? void 0 : window.faces) !== null && _b !== void 0 ? _b : window.jsf).ajax.request(source, event, options);
     }
     myfaces.ab = ab;
@@ -6788,7 +6802,7 @@ class ErrorData extends EventData_1.EventData {
         this.type = Const_1.ERROR;
         this.errorName = errorName;
         //tck requires that the type is prefixed to the message itself (jsdoc also) in case of a server error
-        this.errorMessage = errorMessage;
+        this.errorMessage = (type == ErrorType.SERVER_ERROR) ? type + ": " + errorMessage : errorMessage;
         this.responseCode = responseCode;
         this.responseText = responseText;
         this.responseXML = responseXML;
@@ -6856,16 +6870,26 @@ exports.EventData = void 0;
 const mona_dish_1 = __webpack_require__(/*! mona-dish */ "./node_modules/mona-dish/src/main/typescript/index_core.ts");
 const Const_1 = __webpack_require__(/*! ../core/Const */ "./src/main/typescript/impl/core/Const.ts");
 class EventData {
-    static createFromRequest(request, context, /*event name*/ name) {
+    static createFromRequest(request, internalContext, context, /*event name*/ name) {
         let eventData = new EventData();
+        let internalSource = "_internal._source";
         eventData.type = Const_1.EVENT;
         eventData.status = name;
-        let sourceId = context.getIf(Const_1.SOURCE)
-            .orElseLazy(() => context.getIf(Const_1.P_AJAX_SOURCE).value)
-            .orElseLazy(() => context.getIf(Const_1.CTX_PARAM_REQ_PASS_THR, Const_1.P_AJAX_SOURCE).value)
-            .value;
-        if (sourceId) {
-            eventData.source = mona_dish_1.DQ.byId(sourceId, true).first().value.value;
+        eventData.source = internalContext.getIf("_source", "_element").value;
+        // this fixes the issue that the source element is not present anymore at done
+        // at page transitions
+        if (!eventData.source) {
+            let sourceId = context.getIf(Const_1.SOURCE)
+                .orElseLazy(() => context.getIf(Const_1.P_AJAX_SOURCE).value)
+                .orElseLazy(() => context.getIf(Const_1.CTX_PARAM_REQ_PASS_THR, Const_1.P_AJAX_SOURCE).value)
+                .value;
+            if (sourceId) {
+                eventData.source = mona_dish_1.DQ.byId(sourceId, true).first().value.value;
+            }
+            if (eventData.source) {
+                //we store the event source for later references
+                internalContext.assign("_source", "_element").value = eventData.source;
+            }
         }
         if (name !== Const_1.BEGIN) {
             eventData.responseCode = request === null || request === void 0 ? void 0 : request.status;
@@ -7704,7 +7728,7 @@ class ResponseProcessor {
      * all processing done we can close the request and send the appropriate events
      */
     done() {
-        const eventData = EventData_1.EventData.createFromRequest(this.request.value, this.externalContext, Const_1.SUCCESS);
+        const eventData = EventData_1.EventData.createFromRequest(this.request.value, this.internalContext, this.externalContext, Const_1.SUCCESS);
         //because some frameworks might decorate them over the context in the response
         const eventHandler = this.externalContext.getIf(Const_1.ON_EVENT).orElseLazy(() => this.internalContext.getIf(Const_1.ON_EVENT).value).orElse(Const_1.EMPTY_FUNC).value;
         AjaxImpl_1.Implementation.sendEvent(eventData, eventHandler);
@@ -8409,7 +8433,7 @@ class XhrRequest extends AsyncRunnable_1.AsyncRunnable {
      */
     sendEvent(evtType) {
         var _a;
-        const eventData = EventData_1.EventData.createFromRequest(this.xhrObject, this.requestContext, evtType);
+        const eventData = EventData_1.EventData.createFromRequest(this.xhrObject, this.internalContext, this.requestContext, evtType);
         try {
             // User code error, we might cover
             // this in onError, but also we cannot swallow it.