jsf.js_next_gen 4.0.0-beta-23 → 4.0.0

package/src/main/typescript/myfaces/OamSubmit.ts

@@ -62,18 +62,23 @@ export module oam {
         DQ.byId(element).delete();
     };
 
-    // noinspection JSUnusedGlobalSymbols
+    // noinspection JSUnusedGlobalSymbols,JSUnusedLocalSymbols
     /**
      * does special form submit remapping
      * re-maps the issuing command link into something,
-     * a decode of the command link on the server can understand
+     * the "decode" of the command link on the server can understand
      *
      * @param formName
      * @param linkId
      * @param target
      * @param params
      */
-    export const submitForm = function (formName: string, linkId: string, target: string, params: { [key: string]: any }): boolean {
+    export const submitForm = function (formName: string, linkId: string | null = null, target: string |null = null, params: AssocArr<any> | Tuples<string, any> | null = {} ): boolean {
+
+
+        //handle a possible incoming null, not sure if this is used that way anywhere, but we allow it
+        params = (!params) ? {} : params;
+
         let clearFn = 'clearFormHiddenParams_' + formName.replace(/-/g, '\$:').replace(/:/g, '_');
         window?.[clearFn]?.(formName);
 
@@ -81,18 +86,23 @@ export module oam {
         if (window?.myfaces?.core?.config?.autoScroll && (window as any)?.getScrolling) {
             myfaces.oam.setHiddenInput(formName, 'autoScroll', (window as any)?.getScrolling());
         }
-        Stream.ofAssoc(params).each((param: [string, any]) => {
-            myfaces.oam.setHiddenInput(formName, param[0], param[1]);
-        });
+        let paramsStream: Stream<[string, any]> = Array.isArray(params) ? Stream.of(...params) : Stream.ofAssoc(params);
+        paramsStream.each(([key, data]) => myfaces.oam.setHiddenInput(formName, key, data));
 
         //we call the namespaced function, to allow decoration, via a direct call we would
-        myfaces.oam.setHiddenInput(formName, `${formName}:_idcl`, linkId);
+        myfaces.oam.setHiddenInput(formName, `${formName}:_idcl`, linkId ?? '');
+
 
-        DQ.byId(document.forms[formName]).each(form => {
+        DQ.byId(document.forms?.[formName] ?? document.getElementById(formName)).each(form => {
             const ATTR_TARGET = "target";
             const formElement = form.getAsElem(0).value as HTMLFormElement;
-            const oldTarget = form.attr(ATTR_TARGET).value;
-            form.attr(ATTR_TARGET).value = target;
+            const oldTarget = (form.getAsElem(0).value as HTMLFormElement).getAttribute("target");
+
+            if(target != "null" && target) {
+                (form.getAsElem(0).value as HTMLFormElement).setAttribute("target", target);
+            }
+
+
 
             const result = formElement?.onsubmit?.(null);
 
@@ -103,9 +113,15 @@ export module oam {
             } catch (e) {
                 window?.console.error(e);
             } finally {
-                form.attr(ATTR_TARGET).value = oldTarget;
-                Stream.ofAssoc(params).each((param: [string, any]) => {
-                    myfaces.oam.clearHiddenInput(formName, param[0]);
+                if(oldTarget == null || oldTarget == "null") {
+                    (form.getAsElem(0).value as HTMLFormElement).removeAttribute("target");
+                } else {
+                    (form.getAsElem(0).value as HTMLFormElement).setAttribute("target", oldTarget);
+                }
+
+                // noinspection JSUnusedLocalSymbols
+                paramsStream.each(([key, data]) => {
+                    myfaces.oam.clearHiddenInput(formName, key);
                 });
                 myfaces.oam.clearHiddenInput(formName, `${formName}:_idcl`);
             }

package/src/main/typescript/test/frameworkBase/_ext/monadish/DomQueryTest.spec.ts

@@ -18,7 +18,6 @@ import {expect} from 'chai';
 import {describe, it} from 'mocha';
 import {ArrayCollector, DomQuery, DomQueryCollector, Lang, LazyStream} from "mona-dish";
 import trim = Lang.trim;
-import {ExtDomquery} from "../../../../impl/util/ExtDomQuery";
 import {from} from "rxjs";
 
 
@@ -30,6 +29,7 @@ describe('DOMQuery tests', function () {
 
     beforeEach(function () {
 
+        // language=HTML
         dom = new JSDOM(`
             <!DOCTYPE html>
         <html lang="en">
@@ -93,7 +93,7 @@ describe('DOMQuery tests', function () {
         let isDQuery = false;
         let cnt2 = 0;
 
-        o1.subscribe((item: any) => {
+        o1.subscribe(() => {
             cnt1++;
         });
 
@@ -119,7 +119,7 @@ describe('DOMQuery tests', function () {
         let isDQuery = false;
         let cnt2 = 0;
 
-        o1.subscribe((item: any) => {
+        o1.subscribe(() => {
             cnt1++;
         });
 
@@ -183,7 +183,7 @@ describe('DOMQuery tests', function () {
     it('domquery ops test2 eachNode', function () {
         let probe2 = DomQuery.querySelectorAll("div");
         let noIter = 0;
-        probe2 = probe2.each((item, cnt) => {
+        probe2.each((item, cnt) => {
             expect(item instanceof DomQuery).to.be.true;
             expect(noIter == cnt).to.be.true;
             noIter++;
@@ -319,7 +319,7 @@ describe('DOMQuery tests', function () {
 
     it('it must have parents', function () {
         let probe1 = new DomQuery(document).querySelectorAll("div");
-        let coll: Array<any> = probe1.parents("body").stream.collect(new ArrayCollector());
+        let coll: Array<any> = probe1.firstParent("body").stream.collect(new ArrayCollector());
         expect(coll.length == 1).to.be.true;
 
     });
@@ -345,19 +345,19 @@ describe('DOMQuery tests', function () {
     it("must have a working input handling", function () {
         DomQuery.querySelectorAll("body").innerHTML = `<form id="blarg">
     <div id="embed1">
-        <input type="text" id="id_1" name="id_1" value="id_1_val"></input>
-        <input type="text" id="id_2" name="id_2" value="id_2_val" disabled="disabled"> </input>
-        <textarea type="text" id="id_3" name="id_3">textareaVal</textarea>
+        <input type="text" id="id_1" name="id_1" value="id_1_val">
+        <input type="text" id="id_2" name="id_2" value="id_2_val" disabled="disabled">
+        <textarea id="id_3" name="id_3">textareaVal</textarea>
 
         <fieldset>
-            <input type="radio" id="mc" name="cc_1" value="Mastercard" checked="checked"></input>
+            <input type="radio" id="mc" name="cc_1" value="Mastercard" checked="checked">
             <label for="mc"> Mastercard</label>
-            <input type="radio" id="vi" name="cc_1" value="Visa"></input>
+            <input type="radio" id="vi" name="cc_1" value="Visa">
             <label for="vi"> Visa</label>
-            <input type="radio" id="ae" name="cc_1" value="AmericanExpress"></input>
+            <input type="radio" id="ae" name="cc_1" value="AmericanExpress">
             <label for="ae"> American Express</label>
         </fieldset>
-        <select id="val_5" name="val_5" name="top5" size="5">
+        <select id="val_5" name="val_5" size="5">
             <option>barg</option>
             <option>jjj</option>
             <option selected>akaka</option>
@@ -376,7 +376,7 @@ describe('DOMQuery tests', function () {
         expect(length2 == 8).to.be.true;
 
         let count = DomQuery.byId("embed1").elements
-            .stream.map<number>(item => item.disabled ? 1 : 0)
+            .stream.map(item => item.disabled ? 1 : 0)
             .reduce((val1, val2) => val1 + val2, 0);
         expect(count.value).to.eq(1);
 
@@ -385,12 +385,12 @@ describe('DOMQuery tests', function () {
             .each(item => item.disabled = false);
 
         count = DomQuery.byId("embed1").elements
-            .stream.map<number>(item => item.disabled ? 1 : 0)
+            .stream.map(item => item.disabled ? 1 : 0)
             .reduce((val1, val2) => val1 + val2, 0);
         expect(count.value).to.eq(0);
 
         count = DomQuery.byId("embed1").elements
-            .stream.map<number>(item => item.attr("checked").isPresent() ? 1 : 0)
+            .stream.map(item => item.attr("checked").isPresent() ? 1 : 0)
             .reduce((val1, val2) => val1 + val2, 0);
         expect(count.value).to.eq(1);
 
@@ -451,7 +451,7 @@ describe('DOMQuery tests', function () {
             //-->   
             </script>
         
-            <style type="text/css">
+            <style>
                 #first {
                     border: 1px solid black;
                 }
@@ -482,7 +482,7 @@ describe('DOMQuery tests', function () {
 
     it("it must handle events properly", function () {
         let clicked = 0;
-        let listener = (evt: any) => {
+        let listener = () => {
             clicked++;
         };
         let eventReceiver = DomQuery.byId("id_1");
@@ -629,14 +629,11 @@ describe('DOMQuery tests', function () {
 
     it('must by recycleable', function () {
         let probe = DomQuery.querySelectorAll("div");
-        let probe2 = DomQuery.querySelectorAll("body");
 
         let res1 = probe.filter(item => item.matchesSelector("div"));
         expect(res1.length).to.eq(4);
         let res2 = probe.filter(item => item.matchesSelector("div"));
         expect(res2.length).to.eq(4);
-
-
     })
 
     it('delete must work', function () {
@@ -654,8 +651,8 @@ describe('DOMQuery tests', function () {
         let probe2 = DomQuery.querySelectorAll("div");
         let probeCnt = 0;
         let probe2Cnt = 0;
-        from(probe).subscribe(el => probeCnt++);
-        from(probe2.stream).subscribe(el => probe2Cnt++);
+        from(probe).subscribe(() => probeCnt++);
+        from(probe2.stream).subscribe(() => probe2Cnt++);
         expect(probeCnt).to.be.above(0);
         expect(probeCnt).to.eq(probe2Cnt);
     })

package/src/main/typescript/test/frameworkBase/_ext/shared/StandardInits.ts

@@ -91,6 +91,102 @@ export module StandardInits {
 
 
 
+    /**
+     * a page simulating basically a simple faces form
+     */
+    const HTML_FORM_PREFIXED = `<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+<form id="form1">
+    <input type="text" id="form1:input_1::field" name="form1:input_1" value="form1:input_1_val"></input>
+    <input type="hidden" id="form1:jakarta.faces.ViewState" name="jakarta.faces.ViewState" value="blubbblubblubb"></input>
+    <input type="button" id="form1:input_2::field" name="form1:input_2" value="form1:input_1_val"></input>
+    <input type="text" id="form1:input_3::field" name="form1:input_23 value="form1:input_1_val"></input>
+</form>
+</body>
+</html>`;
+
+
+    /**
+     * a page based on Tobago for a file upload
+     */
+    const HTML_TOBAGO_FILE_FORM = `<!DOCTYPE html>
+<html lang='de'>
+ <head>
+  <meta charset='UTF-8'>
+  <meta name='viewport' content='width=device-width, initial-scale=1.0'>
+  <title>Test</title>
+ </head>
+ <body>
+  <tobago-page locale='de' class='container-fluid' id='page' focus-on-error='true' wait-overlay-delay-full='1000' wait-overlay-delay-ajax='1000'>
+   <form action='/content/100-upload/File_Upload.xhtml' id='page::form' method='post' enctype='multipart/form-data' accept-charset='UTF-8' data-tobago-context-path=''>
+    <input type='hidden' name='javax.faces.source' id='javax.faces.source' disabled='disabled'>
+    <tobago-focus id='page::lastFocusId'>
+     <input type='hidden' name='page::lastFocusId' id='page::lastFocusId::field'>
+    </tobago-focus>
+    <input type='hidden' name='org.apache.myfaces.tobago.webapp.Secret' id='org.apache.myfaces.tobago.webapp.Secret' value='secretValue'>
+    <tobago-file id='page:fileAjax' class='tobago-auto-spacing'>
+     <div class='input-group'>
+      <input type='file' tabindex='-1' id='page:fileAjax::field' class='form-control' name='page:fileAjax'>
+      <tobago-behavior event='change' client-id='page:fileAjax' field-id='page:fileAjax::field' execute='page:fileAjax'></tobago-behavior>
+      <label class='input-group-text' for='page:fileAjax::field'><span><i class='bi-folder2-open'></i></span></label>
+     </div>
+    </tobago-file>
+    <div class='tobago-page-menuStore'>
+    </div>
+    <span id='page::jsf-state-container'><input type='hidden' name='javax.faces.ViewState' id='j_id__v_0:javax.faces.ViewState:1' value='viewStateValue' autocomplete='off'><input type='hidden' name='javax.faces.RenderKitId' value='tobago'><input type='hidden' id='j_id__v_0:javax.faces.ClientWindow:1' name='javax.faces.ClientWindow' value='clientWindowValue'></span>
+   </form>
+  </tobago-page>
+ </body>
+</html>`;
+
+    /**
+     * a page simulating basically a simple faces form
+     */
+    export const HTML_PREFIX_EMBEDDED_BODY = `<form id="form1">
+  <tobago-in id="page:input" class="tobago-auto-spacing">
+     <input type="text" name="page:input" id="page:input::field" class="form-control" value="input_value">
+     <tobago-behavior event="change" client-id="page:input" field-id="page:input::field" execute="page:input" render="page:output"></tobago-behavior>
+  </tobago-in>
+  
+  <tobago-out id="page:output" class="tobago-auto-spacing">
+    <input type="text" name="page:output" id="page:output::field" class="form-control">
+  </tobago-out>
+</form>`;
+
+    const HTML_FORM_PREFIXED_EMBEDDED = `<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+    ${HTML_PREFIX_EMBEDDED_BODY}
+</body>
+</html>`;
+
+
+    const HTML_FORM_NAMESPACED = `<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+<form id="jd_0:blarg">
+    <input type="text" id="jd_0:input_1" name="jd_0:input_1" value="input_1_val"></input>
+    <input type="hidden" id="jd_0:jakarta.faces.ViewState" name="jakarta.faces.ViewState" value="blubbblubblubb"></input>
+    <input type="button" id="jd_0:input_2" name="input_2" value="input_1_val"></input>
+</form>
+</body>
+</html>`;
+
+
+
     /**
      * a page simulating basically a simple faces form
      */
@@ -102,7 +198,7 @@ export module StandardInits {
 </head>
 <body>
 <form id="blarg" enctype="multipart/form-data">
-    <input type="file" id="fíleupload"></input>
+    <input type="file" id="fíleupload" name="fíleupload"></input>
     <input type="text" id="input_1" name="input_1" value="input_1_val"></input>
     <input type="hidden" id="jakarta.faces.ViewState" name="jakarta.faces.ViewState" value="blubbblubblubb"></input>
     <input type="button" id="input_2" name="input_2" value="input_1_val"></input>
@@ -277,12 +373,18 @@ export module StandardInits {
     export function defaultMyFaces(withJsf = true): Promise<() => void> {
         return init(HTML_FORM_DEFAULT, withJsf);
     }
+    export function defaultMyFacesNamespaces(withJsf = true): Promise<() => void> {
+        return init(HTML_FORM_NAMESPACED, withJsf);
+    }
     export function defaultMyFaces23(withJsf = true): Promise<() => void> {
         return init(HTML_FORM_DEFAULT.replace(/jakarta/gi, "javax"), withJsf, false);
     }
     export function defaultFileForm(withJsf = true): Promise<() => void> {
         return init(HTML_FILE_FORM_DEFAULT, withJsf);
     }
+    export function tobagoFileForm(withJsf = true): Promise<() => void> {
+        return init(HTML_TOBAGO_FILE_FORM, withJsf);
+    }
     export function defaultFileForm_23(withJsf = true): Promise<() => void> {
         return init(HTML_FILE_FORM_DEFAULT.replace(/jakarta/gi, "javax"), withJsf, false);
     }
@@ -302,6 +404,11 @@ export module StandardInits {
         return <any>init((IS_40) ? PROTOCOL_PAGE : PROTOCOL_PAGE.replace(/jakarta/gi,"javax"), withJsf, IS_40);
     }
 
+    export function prefixEmbeddedPage(withJsf = true, IS_40 = true): Promise<() => void> {
+        return <any>init((IS_40) ? HTML_FORM_PREFIXED_EMBEDDED : HTML_FORM_PREFIXED_EMBEDDED.replace(/jakarta/gi,"javax"), withJsf, IS_40);
+    }
+
+
     export function defaultSeparatorChar(separatorChar: string, withJsf = true, IS_40 = true): Promise<() => void> {
         let template = HTML_DEFAULT_SEPARATOR_CHAR(separatorChar, IS_40);
         return init(template, withJsf);

package/src/main/typescript/test/frameworkBase/_ext/shared/XmlResponses.ts

@@ -194,7 +194,7 @@ export class XmlResponses {
 <partial-response id="j_id__v_0"><changes><update id="jakarta.faces.Resource">
     <![CDATA[
         <script src="../../../xhrCore/fixtures/addedViewHead3.js"></script>
-        <style type="text/css" rel="../../../xhrCore/fixtures/addedViewHead2.css"></style>
+        <link rel="stylesheet" href="../../../xhrCore/fixtures/addedViewHead2.css"></link>
         <script type="text/javascript">
             document.getElementById('resource_area_1').innerHTML = 'booga';
         </script>
@@ -204,6 +204,45 @@ export class XmlResponses {
 </partial-response>
 `
 
+    static HEAD_REPLACE = `
+<partial-response id="j_id__v_0"><changes><update id="jakarta.faces.ViewHead">
+    <![CDATA[
+    <head>
+        <script type="text/javascript" src="../../../xhrCore/fixtures/addedViewHead3.js"></script>
+        <link rel="stylesheet" href="../../../xhrCore/fixtures/addedViewHead2.css"></link>
+        <script type="text/javascript">
+            setTimeout(() => document.getElementById('resource_area_1').innerHTML = 'booga', 100);
+        </script>
+    </head>    
+    ]]>
+</update>
+</changes>
+</partial-response>
+`
+
+    static HEAD_REPLACE2 = `
+<partial-response id="j_id__v_0"><changes><update id="jakarta.faces.ViewHead">
+    <![CDATA[
+    <head>
+        <title>After Update</title>
+        <meta charset="UTF-8">
+        <meta name="description" content="Free Web tutorials">
+        <meta name="keywords" content="HTML, CSS, JavaScript, JSF">
+        <meta name="viewport" content="width=device-width, initial-scale=0.8">
+        <meta name="author" content="Whoever">
+        <script type="text/javascript" src="../../../xhrCore/fixtures/addedViewHead3.js"></script>
+        <link rel="stylesheet" href="../../../xhrCore/fixtures/addedViewHead2.css"></link>
+        <script type="text/javascript">
+            setTimeout(() => document.getElementById('resource_area_1').innerHTML = 'booga', 100);
+        </script>
+    </head>    
+    ]]>
+</update>
+</changes>
+</partial-response>
+`
+
+
     static NONCE_REPLY = `
     <partial-response><changes><update id='nonce_result'>
     <![CDATA[<script nonce='test12d3' type='text/javascript' src='http://foobaz/nonce_script.js'></script>]]>

package/src/main/typescript/test/impl/ImplTest.spec.ts

@@ -20,7 +20,7 @@ import {expect} from 'chai';
 import * as sinon from 'sinon';
 
 import {StandardInits} from "../frameworkBase/_ext/shared/StandardInits";
-import {P_EXECUTE, P_RENDER} from "../../impl/core/Const";
+import {CTX_PARAM_REQ_PASS_THR, P_EXECUTE, P_RENDER} from "../../impl/core/Const";
 import defaultMyFaces = StandardInits.defaultMyFaces;
 
 
@@ -60,9 +60,9 @@ describe('faces.ajax.request test suite', () => {
             expect(addRequestToQueue.callCount).to.eq(1);
             const context = (<Config>addRequestToQueue.args[0][2]);
 
-            expect(context.getIf("passThrgh", P_RENDER).value).eq("@all");
+            expect(context.getIf(CTX_PARAM_REQ_PASS_THR, P_RENDER).value).eq("@all");
             //Execute issuing form due to @form and always the issuing element
-            expect(context.getIf("passThrgh", P_EXECUTE).value).eq("blarg input_2");
+            expect(context.getIf(CTX_PARAM_REQ_PASS_THR, P_EXECUTE).value).eq("blarg input_2");
         } finally {
             //once done we restore the proper state
             addRequestToQueue.restore();

package/src/main/typescript/test/impl/ImplTest_23.spec.ts

@@ -20,7 +20,7 @@ import {expect} from 'chai';
 import * as sinon from 'sinon';
 
 import {StandardInits} from "../frameworkBase/_ext/shared/StandardInits";
-import {P_EXECUTE, P_RENDER} from "../../impl/core/Const";
+import {CTX_PARAM_REQ_PASS_THR, P_EXECUTE, P_RENDER} from "../../impl/core/Const";
 import defaultMyFaces23 = StandardInits.defaultMyFaces23;
 
 
@@ -60,9 +60,9 @@ describe('javax.ajax.request test suite', () => {
             expect(addRequestToQueue.callCount).to.eq(1);
             const context = (<Config>addRequestToQueue.args[0][2]);
 
-            expect(context.getIf("passThrgh", P_RENDER).value).eq("@all");
+            expect(context.getIf(CTX_PARAM_REQ_PASS_THR, P_RENDER).value).eq("@all");
             //Execute issuing form due to @form and always the issuing element
-            expect(context.getIf("passThrgh", P_EXECUTE).value).eq("blarg input_2");
+            expect(context.getIf(CTX_PARAM_REQ_PASS_THR, P_EXECUTE).value).eq("blarg input_2");
         } finally {
             //once done we restore the proper state
             addRequestToQueue.restore();
@@ -120,10 +120,6 @@ describe('javax.ajax.request test suite', () => {
         expect(!!called["func5"]).to.be.false;
 
     });
-
-
-
-
 });
 
 

package/src/main/typescript/test/xhrCore/EventTests.spec.ts

@@ -108,7 +108,7 @@ describe('tests the addOnEvent and addOnError handling', function () {
         expect(onErrorCalled1).to.eq(1);
         expect(onErrorCalled2).to.eq(1);
         expect(errorTitle).to.eq('Erro21');
-        expect(errorMessage).to.eq('Error2 Text');
+        expect(errorMessage).to.eq('serverError: Error2 Text');
     });
 
     it("must have an id set if there is an emitting element", function () {

package/src/main/typescript/test/xhrCore/FileUploadTest.spec.ts

@@ -17,7 +17,7 @@ import {describe, it} from "mocha";
 import * as sinon from "sinon";
 import {expect} from "chai";
 import {StandardInits} from "../frameworkBase/_ext/shared/StandardInits";
-import {DomQuery} from "mona-dish";
+import {DomQuery, DQ} from "mona-dish";
 import defaultFileForm = StandardInits.defaultFileForm;
 import {Implementation} from "../../impl/AjaxImpl";
 
@@ -66,6 +66,8 @@ describe('Tests on the xhr core when it starts to call the request', function ()
         const CONTENT_TYPE = "Content-Type";
         const POST = "POST";
 
+        global["debug_f"] = true;
+
         try {
 
             let button = DomQuery.byId("input_1");
@@ -128,11 +130,12 @@ describe('Tests on the xhr core when it starts to call the request', function ()
         const MULTIPART_FORM = "multipart/form-data";
         const POST = "POST";
 
+
         try {
             let button = DomQuery.byId("input_1");
 
             button.addEventListener("click", (event: Event) => {
-                faces.ajax.request(event.target, event, {render: '@all', execute: 'input_1 fileupload'});
+                faces.ajax.request(event.target, event, {render: '@all', execute: '@none'});
             }).click();
 
             expect(this.requests.length).to.eq(1);