gina 0.1.6-alpha.7 → 0.1.6-alpha.71

package/framework/{v0.1.6-alpha.7 → v0.1.6-alpha.71}/core/plugins/lib/validator/src/main.js

@@ -128,6 +128,7 @@
         'eventData'             : {},
         'target'                : (isGFFCtx) ? document : null, // by default
         'cachedErrors'          : {},
+        'lastFocused'           : (isGFFCtx) ? [] : null,
         'binded'                : false,
         'unbinded'              : false,
         'withUserBindings'      : false,
@@ -409,12 +410,12 @@
 
     var refreshWarning = function($el) {
         var formId = $el.form.getAttribute('id');
-        if ( /^true$/i.test(instance.$forms[formId].isValidating) ) {
-            return;
-        }
 
-        var $parent = $el.parentNode, isErrorMessageHidden = false;
-        var $children = $parent.getElementsByTagName('div');
+
+        var $parent                 = $el.parentNode
+            , isErrorMessageHidden  = false
+            ,  $children            = $parent.getElementsByTagName('div')
+        ;
 
         if ( /form\-item\-warning/.test($parent.className) ) {
             $parent.className = $parent.className.replace(/form\-item\-warning/, 'form-item-error');
@@ -424,6 +425,14 @@
             isErrorMessageHidden = true;
         }
 
+        // Fixed added on 2025-03-07
+        if (
+            /^true$/i.test(instance.$forms[formId].isValidating)
+            && !isErrorMessageHidden
+        ) {
+            return;
+        }
+
 
         for (var c = 0, cLen = $children.length; c<cLen; ++c) {
             if ( /form\-item\-error\-message/.test($children[c].className) ) {
@@ -445,7 +454,7 @@
      * @param {object} $form - Target (HTMLFormElement)
      * @param {object} errors
      * @param {object|null} data
-     * @param {object|null} [fileName]
+     * @param {string|null} [fileName]
      */
     var liveCheckErrors = {}; // Per Form & Per Element
     var handleErrorsDisplay = function($form, errors, data, fieldName) {
@@ -476,7 +485,7 @@
                 if ( typeof(liveCheckErrors[formId]) == 'undefined') {
                     liveCheckErrors[formId] = {};
                 }
-                if (errors.count() > 0) {
+                if (errors && errors.count() > 0) {
                     // reset field name
                     liveCheckErrors[formId][fieldName] = {};
                     // override
@@ -486,8 +495,29 @@
                     }
                     errors = liveCheckErrors[formId];
                     // only if the form has not been sent yet
-                    if (!instance.$forms[formId].sent || instance.$forms[formId].isValidating) {
+                    if (
+                        !instance.$forms[formId].sent
+                        ||
+                        instance.$forms[formId].isValidating
+                    ) {
                         isWarning = true;
+                        // Fixed on 2025-03-07
+                        var lastFocused = instance.$forms[formId].lastFocused;
+                        // console.debug('fieldName: '+ fieldName + '\nactiveElement: '+ document.activeElement.getAttribute('name') +'\nlastFocused: ', lastFocused);
+                        if (
+                            lastFocused.length > 0
+                                && typeof(lastFocused[1]) != 'undefined'
+                                && lastFocused[1].name == fieldName
+                            ||
+                            lastFocused.length > 0
+                                && !lastFocused[1]
+                                && document.activeElement.getAttribute('name') != lastFocused[0].name
+                            ||
+                            document.activeElement.getAttribute('name') != fieldName
+                        ) {
+                            isWarning = false;
+                        }
+                        // console.debug('isWarning: '+isWarning);
                     }
                 } else {
                     if ( typeof(liveCheckErrors[formId][fieldName]) != 'undefined') {
@@ -551,7 +581,11 @@
 
             if (!name) continue;
 
-            if ( typeof(errors[name]) != 'undefined' && !/(form\-item\-error|form\-item\-warning)/.test($parent.className) ) {
+            if (
+                errors
+                && typeof(errors[name]) != 'undefined'
+                && !/(form\-item\-error|form\-item\-warning)/.test($parent.className)
+            ) {
 
                 if (isWarning) {
                     // adding warning class
@@ -592,7 +626,24 @@
 
 
 
-            } else if ( typeof(errors[name]) == 'undefined' && /(form\-item\-error|form\-item\-warning)/.test($parent.className) || typeof(errors[name]) != 'undefined' && errors[name].count() == 0 && /(form\-item\-error|form\-item\-warning)/.test($parent.className) ) {
+            } else if (
+                errors
+                    && typeof(errors[name]) == 'undefined'
+                    && /(form\-item\-error|form\-item\-warning)/.test($parent.className)
+                ||
+                errors
+                    && typeof(errors[name]) != 'undefined' && errors[name].count() == 0
+                    && /(form\-item\-error|form\-item\-warning)/.test($parent.className)
+            ) {
+                // Fixed on 2025-03-10
+                // targeted field must be the active element
+                if (
+                    document.activeElement.getAttribute('name') != fieldName
+                    && errors.count() > 0
+                ) {
+                    break
+                }
+                console.debug('[handleErrorsDisplay] Resetting when not in error');
                 // reset when not in error
                 // remove child elements
                 var $children = $parent.getElementsByTagName('div');
@@ -606,16 +657,34 @@
 
                 $parent.className = $parent.className.replace(/(\s+form\-item\-error|form\-item\-error|\s+form\-item\-warning|form\-item\-warning)/, '');
 
-            } else if ( typeof(errors[name]) != 'undefined' && errAttr) {
+            } else if (
+                errors.count() > 0
+                && typeof(errors[name]) != 'undefined'
+                && errAttr
+            ) {
                 // refreshing already displayed error on msg update
                 var $divs = $parent.getElementsByTagName('div');
                 for (var d = 0, dLen = $divs.length; d<dLen; ++d) {
-                    if ($divs[d].className == 'form-item-error-message') {
+                    // Fixed added on 2025-03-05: className can have more than one !!
+                    let foundMessage = $divs[d].className.match("form-item-error-message");
+                    if (
+                        foundMessage
+                        && typeof(foundMessage.length) != 'undefined'
+                        && foundMessage.length > 0
+                    ) {
 
                         $divs[d].parentElement.removeChild($divs[d]);
                         $err = document.createElement('div');
                         $err.setAttribute('class', 'form-item-error-message');
 
+                        // Fixed added on 2025-03-09: className cleanup
+                        if (
+                            !isWarning
+                            && /(\s+form\-item\-warning|form\-item\-warning)/.test($parent.className)
+                        ) {
+                            $parent.className = $parent.className.replace(/(\s+form\-item\-warning|form\-item\-warning)/, ' form-item-error');
+                        }
+
                         // injecting error messages
                         // {
                         //     field: {
@@ -640,12 +709,17 @@
                     }
                 }
 
-                if ($err && $target.type != 'hidden')
+                if ($err && $target.type != 'hidden') {
                     insertAfter($target, $err);
-
+                }
             }
 
-            if (typeof(fieldName) != 'undefined' && fieldName === $el.name) break;
+            if (
+                typeof(fieldName) != 'undefined'
+                && fieldName === $el.name
+            ) {
+                break;
+            }
         }
 
 
@@ -1276,6 +1350,13 @@
                             // } else { // external - need to remove `X-Requested-With` from `options.headers`
                                 result.location = (!/^http/.test(result.location) && !/^\//.test(result.location) ) ? location.protocol +'//' + result.location : result.location;
                             //}
+                            // isProxyHost ?
+                            if (
+                                result.location.replace(/^http(.*)\:\d+/, '$1').replace(/^\:\/\//, '').split(/\//g)[0] == gina.config.hostname
+                                && gina.config.hostname == window.location.host
+                            ) {
+                                result.location = location.protocol  + result.location.replace(/^http(.*)\:\d+/, '$1').replace(/^\:/, '')
+                            }
 
                             return setTimeout(() => {
                                 window.location.href = result.location;
@@ -3126,7 +3207,6 @@
                                 } else {
                                     handleErrorsDisplay(event.target.form, errors, null, event.target.name);
                                 }
-                                //return cancelEvent(event);
                             }
 
 
@@ -3162,7 +3242,7 @@
                                 instance.$forms[formId].isValidating = true;
                                 validate($gForm, gFields, $gFields, gRules, function onSilentGlobalLiveValidation(gResult){
                                     instance.$forms[formId].isValidating = false;
-                                    console.debug('['+ formId +'] onSilentGlobalLiveValidation: '+ gResult.isValid(), gResult);
+                                    console.debug('['+ formId +'] onSilentGlobalLiveValidation: '+ gResult.isValid(), gResult, gFields);
                                     var isFormValid = gResult.isValid();
                                     if ( envIsDev && isGFFCtx && typeof(window.ginaToolbar) != 'undefined' && window.ginaToolbar ) {
                                         // update toolbar
@@ -3178,6 +3258,24 @@
                                     }
 
 
+                                    if ( !isFormValid && gResult.error ) {
+                                        instance.$forms[ $el.form.getAttribute('id') ].errors = gResult.error;
+                                        // Fixed on 2025-03-09
+                                        // for (let eField in gResult.error) {
+                                        //     refreshWarning($gFields[eField]);
+                                        //     // handleErrorsDisplay($gForm, gResult.error, gResult.data, eField);
+                                        // }
+                                    }
+                                    // Fixed on 2025-03-10
+                                    // Eg.: input select change impacting another element: solve `no more errors`
+                                    else if (isFormValid) {
+                                         //resetting error display
+                                         instance.$forms[ formId ].errors = {};
+                                         console.debug('resetting field: '+ $el.name);
+                                         liveCheckErrors[formId] = {};
+                                         handleErrorsDisplay($gForm, {}, null, $el.name);
+                                    }
+
                                     updateSubmitTriggerState( $gForm, isFormValid);
 
                                     once = false;
@@ -3211,13 +3309,17 @@
                         // other inputs & textareas
                         else if ( /^focusin\./i.test(event.type) ) {
                             if ( /\-error/.test($el.parentNode.className) ) {
-                                console.debug('#1 you just focusin ....'+$el.id, $el.value);
+                                console.debug('#1 you just focusin ....'+$el.id, $el.value, instance.$forms[ $el.form.getAttribute('id') ].isValidating);
                                 refreshWarning($el);
                             }
                         }
                         else if ( /^focusout\./i.test(event.type) ) {
                             if ( /\-warning/.test($el.parentNode.className) ) {
                                 console.debug('#1 you just focusout ....'+$el.id, $el.value);
+                                // event.target.form.getAttribute('id');
+                                // $el.form.id
+                                // $el.form.getAttribute('id')
+                                instance.$forms[ $el.form.getAttribute('id') ].isValidating = false;
                                 refreshWarning($el);
                                 // in case error context is changed by another task
                                 handleErrorsDisplay($el.form, instance.$forms[ $el.form.getAttribute('id') ].errors, null, $el.name);
@@ -3226,12 +3328,30 @@
                         else if ( /^keyup\./i.test(event.type) ) {
                             $el.ginaFormValidatorTestedValue = $el.value;
                             liveCheckTimer = setTimeout( function onLiveCheckTimer() {
-                                // do not trigger for copy/paste event
-                                if ( ['91', '17'].indexOf(''+event.keyCode) > -1  && keyboardMapping.count() == 0) {
+                                // Do not trigger for copy/paste event
+                                if ( ['91', '17', '16'].indexOf(''+event.keyCode) > -1  && keyboardMapping.count() == 0) {
                                     //console.debug('mapping ', keyboardMapping);
                                     return;
                                 }
-                                console.debug(' keyup ('+ event.keyCode +') .... '+$el.id, $el.value, ' VS ',$el.ginaFormValidatorTestedValue + '(old)');
+
+                                // Fixed added on 2025-03-05:
+                                // Treat TAB as focus in/out
+                                if ( ['9'].indexOf(''+event.keyCode) > -1 ) {
+                                    var $previeousEl = document.getElementById(instance.$forms[ $el.form.getAttribute('id') ].lastFocused[1].id);
+                                    var errors = instance.$forms[ $previeousEl.form.getAttribute('id') ].errors;
+                                    var isFormValid = true;
+                                    console.debug('[TAB] you just focusout from "'+ instance.$forms[ $el.form.getAttribute('id') ].lastFocused[1].id +'" to "'+ $el.id +'"', "errors: ", errors);
+                                    if (errors && errors.count() > 0 ) {
+                                        instance.$forms[ $previeousEl.form.getAttribute('id') ].isValidating = false;
+                                        isFormValid = false;
+                                    }
+                                    refreshWarning($previeousEl);
+                                    // in case error context is changed by another task
+                                    handleErrorsDisplay($previeousEl.form, errors, null, $previeousEl.name);
+                                    updateSubmitTriggerState( $el.form, isFormValid);
+                                    return;
+                                }
+                                console.debug('[A]['+keyboardMapping.count()+'] keyup ('+ event.keyCode +') .... '+$el.id, $el.value, ' VS ',$el.ginaFormValidatorTestedValue + '(old)');
                                 processEvent();
                             }, 1000);
                         }
@@ -3651,7 +3771,7 @@
         // submit buttons
         $elTMP = $form.target.getElementsByTagName('button');
         if ( $elTMP.length > 0 ) {
-            for(let i = 0, len = $elTMP.length; i < len; ++i) {
+            for (let i = 0, len = $elTMP.length; i < len; ++i) {
                 // if button is != type="submit", you will need to provide : data-gina-form-submit
                 // TODO - On button binding, you can then provide data-gina-form-action & data-gina-form-method
                 $els.push($elTMP[i])
@@ -3661,7 +3781,7 @@
         // submit links
         $elTMP = $form.target.getElementsByTagName('a');
         if ( $elTMP.length > 0 ) {
-            for(let i = 0, len = $elTMP.length; i < len; ++i) {
+            for (let i = 0, len = $elTMP.length; i < len; ++i) {
                 $els.push($elTMP[i])
             }
         }
@@ -3717,7 +3837,7 @@
         // textarea
         $elTMP = $form.target.getElementsByTagName('textarea');
         if ( $elTMP.length > 0 ) {
-            for(let i = 0, len = $elTMP.length; i < len; ++i) {
+            for (let i = 0, len = $elTMP.length; i < len; ++i) {
                 $els.push( $elTMP[i] )
             }
         }
@@ -3726,7 +3846,7 @@
         // forms inside main form
         $elTMP = $form.target.getElementsByTagName('form');
         if ( $elTMP.length > 0 ) {
-            for(let i = 0, len = $elTMP.length; i < len; ++i) {
+            for (let i = 0, len = $elTMP.length; i < len; ++i) {
                 $els.push( $elTMP[i] )
             }
         }
@@ -4535,7 +4655,16 @@
                     validate($gForm, gFields, $gFields, gRules, function onSilentGlobalLiveValidation(gResult){
                         instance.$forms[formId].isValidating = false;
                         console.debug('[updateSelect]: onSilentGlobalLiveValidation: '+ gResult.isValid(), gResult);
+                        // Fixed on 2025-03-09
                         var isFormValid = gResult.isValid();
+                        if (!isFormValid) {
+                            instance.$forms[formId].errors = gResult.error;
+                            for (let eField in gResult.error) {
+                                // refreshWarning($gFields[eField]);
+                                handleErrorsDisplay($gForm, gResult.error, gResult.data, eField);
+                            }
+                        }
+
                         updateSubmitTriggerState( $gForm, isFormValid);
                         once = false;
                     })
@@ -5058,7 +5187,7 @@
                 ) {
                     return false;
                 }
-                // Fixed on 2021/06/08 - because of radio reset
+                // Fixed added on 2021/06/08 - because of radio reset
                 event.preventDefault();
 
                 var _evt = $el.id;
@@ -5129,6 +5258,25 @@
                 if (gina.events[_evt]) {
                     cancelEvent(event);
 
+                    // Fixed added on 2025-03-05 - "last focus" vs "current focus"
+                    // To get active element: document.activeElement
+                    var formId      = event.target.form.getAttribute('id') || event.currentTarget.getAttribute('id');
+                    var lastFocused = {
+                        id  : $el.id,
+                        name: $el.name
+                    };
+                    if (!instance.$forms[formId].lastFocused.length) {
+                        instance.$forms[formId].lastFocused[0] = lastFocused;
+                    } else {
+                        instance.$forms[formId].lastFocused.splice(0,0,lastFocused);
+                    }
+                    lastFocused = ( typeof(instance.$forms[formId].lastFocused[1]) != 'undefined' ) ? instance.$forms[formId].lastFocused[1].id : null;
+
+                    // cleanup
+                    instance.$forms[formId].lastFocused.splice(2);
+
+                    // console.debug('lastFocused: ', lastFocused, ' VS current: ', $el.id);
+
                     triggerEvent(gina, $el, _evt, event.detail);
                 }
             });
@@ -5445,7 +5593,7 @@
         ;
         $buttonsTMP = $target.getElementsByTagName('button');
         if ( $buttonsTMP.length > 0 ) {
-            for(let b = 0, len = $buttonsTMP.length; b < len; ++b) {
+            for (let b = 0, len = $buttonsTMP.length; b < len; ++b) {
                 if ($buttonsTMP[b].type == 'submit') {
                     $buttons.push($buttonsTMP[b])
                 }
@@ -5455,7 +5603,7 @@
         // binding links
         $buttonsTMP = $target.getElementsByTagName('a');
         if ( $buttonsTMP.length > 0 ) {
-            for(let b = 0, len = $buttonsTMP.length; b < len; ++b) {
+            for (let b = 0, len = $buttonsTMP.length; b < len; ++b) {
                 if ( $buttonsTMP[b].attributes.getNamedItem('data-gina-form-submit') ) {
                     $buttons.push($buttonsTMP[b])
                 } else if (
@@ -6175,7 +6323,8 @@
                                 if ( !/^form$/i.test($formOrElement.tagName) ) {
                                     $currentForm  = $formOrElement.form;
                                 }
-                                var formId = $currentForm.getAttribute('id');
+                                var formId      = $currentForm.getAttribute('id');
+                                var isFormValid = null;
 
                                 if (
                                     hasParsedAllRules
@@ -6190,49 +6339,79 @@
 
                                     cb._data = d['toData']();
                                     cb._errors = d['getErrors'](field);
-                                    // console.debug('query callbakc triggered ', cb._errors, '\nisValidating: ', instance.$forms[formId].isValidating);
+                                    isFormValid = ( cb._errors.count() > 0 ) ? false : true;
+                                    console.debug('[A] query callback triggered ', cb._errors, 'isFormValid: '+isFormValid, '\nisValidating: '+ instance.$forms[formId].isValidating);
                                     // update instance form errors
-                                    if ( cb._errors && cb._errors.count() > 0) {
+                                    if ( cb._errors /**&& cb._errors.count() > 0*/) {
                                         if ( typeof(instance.$forms[formId].errors) == 'undefined' ) {
                                             instance.$forms[formId].errors = {}
                                         }
 
                                         instance.$forms[formId].errors[field] = cb._errors[field];
 
-                                        if (!isFormValid && /^true|false$/i.test(instance.$forms[formId].isValidating) || d[field].target.value != '' ) {
-                                            refreshWarning($allFields[field]);
-                                            handleErrorsDisplay($currentForm, cb._errors, cb._data, field);
-                                            updateSubmitTriggerState( $currentForm, isFormValid);
-                                        }
+                                        // if (!isFormValid && /^true|false$/i.test(instance.$forms[formId].isValidating) || d[field].target.value != '' ) {
+                                        //     if ( typeof($allFields[field]._cancelled) == 'undefined' ) {
+                                        //         refreshWarning($allFields[field]);
+                                        //     }
+                                        //     handleErrorsDisplay($currentForm, cb._errors, cb._data, field);
+                                        //     updateSubmitTriggerState( $currentForm, isFormValid);
+                                        // }
 
-                                        if ( envIsDev && isGFFCtx && typeof(window.ginaToolbar) != 'undefined' && window.ginaToolbar ) {
-                                            // update toolbar
-                                            if (!gina.forms.errors)
-                                                gina.forms.errors = {};
+                                        // if ( envIsDev && isGFFCtx && typeof(window.ginaToolbar) != 'undefined' && window.ginaToolbar ) {
+                                        //     // update toolbar
+                                        //     if (!gina.forms.errors)
+                                        //         gina.forms.errors = {};
 
-                                            var objCallback = {
-                                                id      : formId,
-                                                errors  :  instance.$forms[formId].errors || {}
-                                            };
+                                        //     var objCallback = {
+                                        //         id      : formId,
+                                        //         errors  :  instance.$forms[formId].errors || {}
+                                        //     };
 
-                                            window.ginaToolbar.update('forms', objCallback);
-                                        }
+                                        //     window.ginaToolbar.update('forms', objCallback);
+                                        // }
 
 
-                                        triggerEvent(gina, $currentForm, 'validated.' + formId, cb);
-                                        return;
+                                        // triggerEvent(gina, $currentForm, 'validated.' + formId, cb);
+                                        // return;
                                     }
+                                    // Fixed on 2025-03-06
+                                    if (!isFormValid && /^true|false$/i.test(instance.$forms[formId].isValidating) || d[field].target.value != '' ) {
+                                        console.debug('[A] Refreshing warning/error on field '+ field);
+                                        // if ( typeof($allFields[field]._cancelled) == 'undefined' ) {
+                                            refreshWarning($allFields[field]);
+                                        // }
+                                        handleErrorsDisplay($currentForm, cb._errors, cb._data, field);
+                                        updateSubmitTriggerState( $currentForm, isFormValid);
+                                    }
+
+                                    if ( envIsDev && isGFFCtx && typeof(window.ginaToolbar) != 'undefined' && window.ginaToolbar ) {
+                                        // update toolbar
+                                        if (!gina.forms.errors)
+                                            gina.forms.errors = {};
+
+                                        var objCallback = {
+                                            id      : formId,
+                                            errors  :  instance.$forms[formId].errors || {}
+                                        };
+
+                                        window.ginaToolbar.update('forms', objCallback);
+                                    }
+
+
+                                    triggerEvent(gina, $currentForm, 'validated.' + formId, cb);
+                                    return;
                                 }
 
                                 // is this the last or the only field to be validated ?
-                                var needsGlobalReValidation = false, isFormValid = null;
+                                var needsGlobalReValidation = false;
                                 if ( listedFields.length == 1 || listedFields[listedFields.length-1] == field) {
                                     // trigger end of validation
                                     // console.debug(field +' is the last element to be validated for formId: '+ formId, cb._errors, instance.$forms[formId].errors);
                                     isFormValid = ( cb._errors.count() > 0 ) ? false : true;
                                     if (!isFormValid && /^true|false$/i.test(instance.$forms[formId].isValidating)) {
-                                        //console.debug('should update error display now ', cb._errors);
+                                        console.debug('[1] Should update error display now ', cb._errors);
                                         instance.$forms[formId].errors = merge(cb._errors, instance.$forms[formId].errors);
+                                        console.debug('[2] Should update error display now ', instance.$forms[formId].errors);
                                         refreshWarning($allFields[field]);
                                         handleErrorsDisplay($currentForm, cb._errors, cb._data, field);
                                         updateSubmitTriggerState( $currentForm, isFormValid);
@@ -6408,7 +6587,7 @@
 
                     for (var c in rules) {
                         if (!/^\_case\_/.test(c) ) continue;
-                        if ( typeof(rules[c].conditions) == 'undefined' || Array.isArray(rules[c].conditions) && !rules[c].conditions.length ) continue;
+                        if ( typeof(rules[c].conditions) == 'undefined' || Array.isArray(rules[c].conditions) && !rules[c].conditions.length ) continue;
                         if ( typeof(rules[c].conditions[0].rules) == 'undefined' ) continue;
 
 
@@ -6590,7 +6769,14 @@
                             // filtering conditions
                             for (var _c = 0, _cLen = rules[c].conditions.length; _c < _cLen; ++_c) {
 
-                                if (rules[c].conditions[_c].case != caseValue) {
+                                if (
+                                    Array.isArray(rules[c].conditions[_c].case)
+                                        && rules[c].conditions[_c].case.indexOf(caseValue) == -1
+                                    ||
+                                    !Array.isArray(rules[c].conditions[_c].case)
+                                        && rules[c].conditions[_c].case != caseValue
+
+                                ) {
                                     continue;
                                 }
 
@@ -6735,7 +6921,8 @@
                             if (
                                 conditions[c]['case'] === caseValue
                                 ||
-                                Array.isArray(conditions[c]['case']) && conditions[c]['case'].indexOf(caseValue) > -1
+                                Array.isArray(conditions[c]['case'])
+                                    && conditions[c]['case'].indexOf(caseValue) > -1
                                 ||
                                 /^\//.test(conditions[c]['case'])
                             ) {