@wavemaker/angular-codegen 11.2.0-next.140957 → 11.2.0-next.140960

angular-codegen/dependencies/transpilation-web.cjs.js

@@ -58685,7 +58685,7 @@ const getFormWidgetTemplate = (widgetType, innerTmpl, attrs, options = {}) => {
             tmpl = `<div wmCheckbox ${innerTmpl} ${attrs.get('required') === 'true' ? 'required=true' : ''}></div>`;
             break;
         case FormWidgetType.CHECKBOXSET:
-            tmpl = `<ul wmCheckboxset ${innerTmpl} ${attrs.get('required') === 'true' ? 'required=true' : ''}></ul>`;
+            tmpl = `<ul role="group" wmCheckboxset ${innerTmpl} ${attrs.get('required') === 'true' ? 'required=true' : ''}></ul>`;
             break;
         case FormWidgetType.CHIPS:
             tmpl = `<ul wmChips role="input" debouncetime="${attrs.get('debouncetime')}" ${innerTmpl}></ul>`;
@@ -58709,7 +58709,7 @@ const getFormWidgetTemplate = (widgetType, innerTmpl, attrs, options = {}) => {
             tmpl = `<wm-input ${innerTmpl} ${attrs.get('required') === 'true' ? 'required=true' : ''} type="password" aria-label="Enter password" ${updateOnTmpl}></wm-input>`;
             break;
         case FormWidgetType.RADIOSET:
-            tmpl = `<ul wmRadioset ${innerTmpl}></ul>`;
+            tmpl = `<ul role="radiogroup" wmRadioset ${innerTmpl}></ul>`;
             break;
         case FormWidgetType.RATING:
             tmpl = `<div wmRating ${innerTmpl}></div>`;
@@ -58731,10 +58731,10 @@ const getFormWidgetTemplate = (widgetType, innerTmpl, attrs, options = {}) => {
             break;
         case FormWidgetType.TEXT:
             const inputType = options.inputType || 'inputtype';
-            tmpl = `<wm-input ${innerTmpl}  ${attrs.get('required') === 'true' ? 'required=true' : ''} type="${attrs.get(inputType) || 'text'}" aria-describedby="Enter text" ${updateOnTmpl}></wm-input>`;
+            tmpl = `<wm-input ${innerTmpl}  ${attrs.get('required') === 'true' ? 'required=true' : ''} type="${attrs.get(inputType) || 'text'}" ${updateOnTmpl}></wm-input>`;
             break;
         case FormWidgetType.TEXTAREA:
-            tmpl = `<wm-textarea ${innerTmpl} ${attrs.get('required') === 'true' ? 'required=true' : ''} role="textbox" aria-describedby="Place your text" ${updateOnTmpl}></wm-textarea>`;
+            tmpl = `<wm-textarea ${innerTmpl} ${attrs.get('required') === 'true' ? 'required=true' : ''} role="textbox" ${updateOnTmpl}></wm-textarea>`;
             break;
         case FormWidgetType.TIME:
             tmpl = `<div wmTime ${attrs.get('required') === 'true' ? 'required=true' : ''} dataentrymode="${attrs.get('dataentrymode')}" ${innerTmpl}></div>`;
@@ -58763,7 +58763,7 @@ const getFormWidgetTemplate = (widgetType, innerTmpl, attrs, options = {}) => {
             }
             break;
         default:
-            tmpl = `<wm-input ${innerTmpl} ${attrs.get('required') === 'true' ? 'required=true' : ''} aria-describedby="Enter text" type="text" ${updateOnTmpl}></wm-input>`;
+            tmpl = `<wm-input ${innerTmpl} ${attrs.get('required') === 'true' ? 'required=true' : ''} type="text" ${updateOnTmpl}></wm-input>`;
             break;
     }
     return tmpl;
@@ -60572,41 +60572,42 @@ const validateDataSourceCtx = (ds, ctx) => {
  * @param name name of the variable
  * @param context scope of the variable
  */
-const processFilterExpBindNode = (context, filterExpressions) => {
+const processFilterExpBindNode = (context, filterExpressions, variable) => {
     const destroyFn = context.registerDestroyListener ? context.registerDestroyListener.bind(context) : _.noop;
     const filter$ = new Subject();
     const bindFilExpObj = (obj, targetNodeKey) => {
+        const listener = (newVal, oldVal) => {
+            if ((newVal === oldVal && _.isUndefined(newVal)) || (_.isUndefined(newVal) && !_.isUndefined(oldVal))) {
+                return;
+            }
+            // Skip cloning for blob column
+            if (!_.includes(['blob', 'file'], obj.type)) {
+                newVal = getClonedObject(newVal);
+            }
+            // backward compatibility: where we are allowing the user to bind complete object
+            if (obj.target === 'dataBinding') {
+                // remove the existing databinding element
+                filterExpressions.rules = [];
+                // now add all the returned values
+                _.forEach(newVal, function (value, target) {
+                    filterExpressions.rules.push({
+                        'target': target,
+                        'value': value,
+                        'matchMode': obj.matchMode || 'startignorecase',
+                        'required': false,
+                        'type': ''
+                    });
+                });
+            }
+            else {
+                // setting value to the root node
+                obj[targetNodeKey] = newVal;
+            }
+            filter$.next({ filterExpressions, newVal });
+        };
         if (stringStartsWith(obj[targetNodeKey], 'bind:')) {
             // [Todo-CSP]: needs a check, where is this used
-            destroyFn($watch(obj[targetNodeKey].replace('bind:', ''), context, {}, (newVal, oldVal) => {
-                if ((newVal === oldVal && _.isUndefined(newVal)) || (_.isUndefined(newVal) && !_.isUndefined(oldVal))) {
-                    return;
-                }
-                // Skip cloning for blob column
-                if (!_.includes(['blob', 'file'], obj.type)) {
-                    newVal = getClonedObject(newVal);
-                }
-                // backward compatibility: where we are allowing the user to bind complete object
-                if (obj.target === 'dataBinding') {
-                    // remove the existing databinding element
-                    filterExpressions.rules = [];
-                    // now add all the returned values
-                    _.forEach(newVal, function (value, target) {
-                        filterExpressions.rules.push({
-                            'target': target,
-                            'value': value,
-                            'matchMode': obj.matchMode || 'startignorecase',
-                            'required': false,
-                            'type': ''
-                        });
-                    });
-                }
-                else {
-                    // setting value to the root node
-                    obj[targetNodeKey] = newVal;
-                }
-                filter$.next({ filterExpressions, newVal });
-            }, undefined, false, { arrayType: _.includes(['in', 'notin'], obj.matchMode) }));
+            destroyFn($watch(obj[targetNodeKey].replace('bind:', ''), context, {}, variable ? variable.invokeOnFiltertExpressionChange.bind(variable, obj, targetNodeKey) : listener, undefined, false, { arrayType: _.includes(['in', 'notin'], obj.matchMode) }));
         }
     };
     const traverseFilterExpressions = expressions => {
@@ -60715,6 +60716,13 @@ const addForIdAttributes = (element) => {
             setAttr(labelEl[0], 'for', widgetId);
         }
     }
+    /*Adding aria-labelledby to radioset, checkboxset widgets*/
+    const ulEl = element.querySelectorAll('ul');
+    if (labelEl.length && ulEl.length && (ulEl[0].getAttribute('role') === 'radiogroup' || ulEl[0].getAttribute('role') === 'group')) {
+        const widgetId = 'wm-group-label-' + generateGUId();
+        setAttr(ulEl[0], 'aria-labelledby', widgetId);
+        setAttr(labelEl[0], 'id', widgetId);
+    }
 };
 /**
  * This method is used to adjust the container position
@@ -62107,6 +62115,12 @@ class PaginationService {
     fetchNextDatasetOnScroll(dataNavigator, parent) {
         // Load next set of data only after the success of current call
         if (!parent.variableInflight) {
+            // Fix for [WMS-23263]: set 'isNextPageData' flag to true & 'isDataUpdatedByUser' to false as next page data is being rendered on Scroll
+            if (parent.widgetType === 'wm-table') {
+                // set isNextPageData flag to true as next page data is being rendered
+                parent.gridOptions.setIsNextPageData(true);
+                parent.gridOptions.setIsDataUpdatedByUser(false);
+            }
             dataNavigator.navigatePage('next');
         }
     }
@@ -62841,13 +62855,13 @@ const scopeComponentStyles = (componentName, componentType, styles = '') => {
 
 const carouselTagName = 'carousel';
 const dataSetKey$5 = 'dataset';
-const idGen$r = new IDGenerator('wm_carousel_ref_');
+const idGen$s = new IDGenerator('wm_carousel_ref_');
 const isDynamicCarousel = node => node.attrs.find(attr => attr.name === 'type' && attr.value === 'dynamic');
 register('wm-carousel', () => {
     return {
         pre: (attrs, shared) => {
             // generating unique Id for the carousel
-            const counter = idGen$r.nextUid();
+            const counter = idGen$s.nextUid();
             shared.set('carousel_ref', counter);
             return `<div class="app-carousel carousel"><${carouselTagName} wmCarousel #${counter}="wmCarousel"  ${getAttrMarkup(attrs)} interval="0" [ngClass]="${counter}.navigationClass">`;
         },
@@ -62947,12 +62961,12 @@ var marquee_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1A = 'a';
-const idGen$q = new IDGenerator('wm_anchor');
+const idGen$r = new IDGenerator('wm_anchor');
 register('wm-anchor', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$q.nextUid();
-            return `<${tagName$1A} wmAnchor #${counter}="wmAnchor" role="link" data-identifier="anchor" [attr.aria-label]="${counter}.hint || ${counter}.caption || 'Link'" ${getAttrMarkup(attrs)}>`;
+            const counter = idGen$r.nextUid();
+            return `<${tagName$1A} wmAnchor #${counter}="wmAnchor" role="link" data-identifier="anchor" [attr.aria-label]="${counter}.hint || ${counter}.caption" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$1A}>`
     };
@@ -62979,11 +62993,11 @@ var audio_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1y = 'div';
-const idGen$p = new IDGenerator('wm_html');
+const idGen$q = new IDGenerator('wm_html');
 register('wm-html', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$p.nextUid();
+            const counter = idGen$q.nextUid();
             return `<${tagName$1y} wmHtml #${counter}="wmHtml" [attr.aria-label]="${counter}.hint || 'HTML content'" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$1y}>`
@@ -63025,12 +63039,12 @@ var iframe_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1v = 'label';
-const idGen$o = new IDGenerator('wm_label');
+const idGen$p = new IDGenerator('wm_label');
 register('wm-label', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$o.nextUid();
-            return `<${tagName$1v} wmLabel #${counter}="wmLabel" [attr.aria-label]="${counter}.hint || 'Label text'" ${getAttrMarkup(attrs)}>`;
+            const counter = idGen$p.nextUid();
+            return `<${tagName$1v} wmLabel #${counter}="wmLabel" [attr.aria-label]="${counter}.hint" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$1v}>`
     };
@@ -63043,11 +63057,11 @@ var label_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1u = 'img';
-const idGen$n = new IDGenerator('wm_picture');
+const idGen$o = new IDGenerator('wm_picture');
 register('wm-picture', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$n.nextUid();
+            const counter = idGen$o.nextUid();
             return `<${tagName$1u} wmPicture #${counter}="wmPicture" alt="image" wmImageCache="${attrs.get('offline') || 'true'}" [attr.aria-label]="${counter}.hint || 'Image'" ${getAttrMarkup(attrs)}>`;
         }
     };
@@ -63060,11 +63074,11 @@ var picture_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1t = 'div';
-const idGen$m = new IDGenerator('wm_spinner');
+const idGen$n = new IDGenerator('wm_spinner');
 register('wm-spinner', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$m.nextUid();
+            const counter = idGen$n.nextUid();
             return `<${tagName$1t} wmSpinner #${counter}="wmSpinner" role="alert" [attr.aria-label]="${counter}.hint || 'Loading...'" aria-live="assertive" aria-busy="true" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$1t}>`
@@ -63131,11 +63145,11 @@ var progressCircle_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1q = 'div';
-const idGen$l = new IDGenerator('wm_richtexteditor');
+const idGen$m = new IDGenerator('wm_richtexteditor');
 register('wm-richtexteditor', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$l.nextUid();
+            const counter = idGen$m.nextUid();
             return `<${tagName$1q} wmRichTextEditor #${counter}="wmRichTextEditor" role="textbox" [attr.aria-label]="${counter}.hint || 'Richtext editor'" ${getFormMarkupAttr(attrs)}>`;
         },
         post: () => `</${tagName$1q}>`
@@ -63248,13 +63262,13 @@ var chart_build$1 = /*#__PURE__*/Object.freeze({
 
 const tagName$1i = 'div';
 const dataSetKey$4 = 'dataset';
-const idGen$k = new IDGenerator('wm_accordion_ref_');
+const idGen$l = new IDGenerator('wm_accordion_ref_');
 const isDynamicAccordion = node => node.attrs.find(attr => attr.name === 'type' && attr.value === 'dynamic');
 register('wm-accordion', () => {
     return {
         pre: (attrs, shared) => {
             // generating unique Id for the accordion
-            const counter = idGen$k.nextUid();
+            const counter = idGen$l.nextUid();
             shared.set('accordion_ref', counter);
             return `<${tagName$1i} wmAccordion #${counter}="wmAccordion" role="tablist" aria-multiselectable="true" ${getAttrMarkup(attrs)}>`;
         },
@@ -63290,9 +63304,13 @@ var accordion_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1h = 'div';
+const idGen$k = new IDGenerator('wm_accordionpane');
 register('wm-accordionpane', () => {
     return {
-        pre: attrs => `<${tagName$1h} wmAccordionPane partialContainer wm-navigable-element="true" role="tab" ${getAttrMarkup(attrs)}>`,
+        pre: (attrs) => {
+            const counter = idGen$k.nextUid();
+            return `<${tagName$1h} #${counter}="wmAccordionPane" [attr.aria-expanded]="${counter}.isActive" wmAccordionPane partialContainer wm-navigable-element="true" role="tab" ${getAttrMarkup(attrs)}>`;
+        },
         post: () => `</${tagName$1h}>`
     };
 });
@@ -63365,7 +63383,7 @@ register('wm-panel', () => {
     return {
         pre: (attrs) => {
             const counter = idGen$j.nextUid();
-            return `<${tagName$1c} wmPanel #${counter}="wmPanel" partialContainer [attr.aria-label]="${counter}.hint || 'Panel'" wm-navigable-element="true" ${getAttrMarkup(attrs)}>`;
+            return `<${tagName$1c} wmPanel #${counter}="wmPanel" partialContainer wm-navigable-element="true" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$1c}>`
     };
@@ -63886,12 +63904,14 @@ const registerFormField = (isFormField) => {
             const pCounter = (parent && parent.get('form_reference')) || 'form';
             const widgetType = attrs.get('widget') || FormWidgetType.TEXT;
             const dataRole = isFormField ? 'form-field' : 'filter-field';
+            const formFieldErrorMsgId = 'wmform-field-error-' + generateGUId();
             const validationMsg = isFormField ? `<p *ngIf="${counter}._control?.invalid && ${counter}._control?.touched && ${pCounter}.isUpdateMode"
-                                   class="help-block text-danger" aria-hidden="false" [attr.aria-label]="${counter}.validationmessage" role="alert"
-                                   aria-live="assertive" [textContent]="${counter}.validationmessage"></p>` : '';
+                                   class="help-block text-danger" aria-hidden="false" role="alert"
+                                   aria-live="assertive" [attr.aria-label]="${counter}.validationmessage" id="${formFieldErrorMsgId}"><span aria-hidden="true" [textContent]="${counter}.validationmessage"></span></p>` : '';
             const eventsTmpl = widgetType === FormWidgetType.UPLOAD ? '' : getEventsTemplate(attrs);
             const controlLayout = isMobileApp() ? 'col-xs-12' : 'col-sm-12';
             const isInList = pCounter === (parentList && parentList.get('parent_form_reference'));
+            attrs.set('__errormsg', formFieldErrorMsgId);
             attrs.set('__widgetType', widgetType);
             attrs.delete('widget');
             shared.set('counter', counter);
@@ -63908,7 +63928,7 @@ const registerFormField = (isFormField) => {
                                         [ngStyle]="{width: ${pCounter}.captionsize}" [ngClass]="{'text-danger': ${counter}._control?.invalid && ${counter}._control?.touched && ${pCounter}.isUpdateMode,
                                          required: ${pCounter}.isUpdateMode && ${counter}.required}" [textContent]="${counter}.displayname"> </label>
                             <div [ngClass]="${counter}.displayname ? ${pCounter}._widgetClass : '${controlLayout}'">
-                                 <label class="form-control-static app-label"
+                                 <label class="form-control-static app-label" *ngIf="!(${pCounter}.isUpdateMode || ${counter}.viewmodewidget === 'default' || ${counter}.widgettype === 'upload')"
                                        [hidden]="${pCounter}.isUpdateMode || ${counter}.viewmodewidget === 'default' || ${counter}.widgettype === 'upload'" [innerHTML]="${getCaptionByWidget(attrs, widgetType, counter)}"></label>
                                 ${getTemplate(attrs, widgetType, eventsTmpl, counter, pCounter, isInList)}
                                 <span aria-hidden="true" *ngIf="${counter}.showPendingSpinner" class="form-field-spinner fa fa-circle-o-notch fa-spin form-control-feedback"></span>
@@ -64179,7 +64199,7 @@ register('wm-button', () => {
     return {
         pre: (attrs) => {
             const counter = idGen$c.nextUid();
-            return `<${tagName$P} wmButton #${counter}="wmButton" [attr.aria-label]="${counter}.hint || ${counter}.caption || 'Button'" ${getAttrMarkup(attrs)}>`;
+            return `<${tagName$P} wmButton #${counter}="wmButton" [attr.aria-label]="${counter}.hint || ${counter}.caption" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$P}>`
     };
@@ -64208,7 +64228,7 @@ var checkbox_build$1 = /*#__PURE__*/Object.freeze({
 const tagName$N = 'ul';
 register('wm-checkboxset', () => {
     return {
-        pre: attrs => `<${tagName$N} wmCheckboxset ${getFormMarkupAttr(attrs)} ${getChildAttrs(attrs)} ${getNgModelAttr(attrs)}>`,
+        pre: attrs => `<${tagName$N} role="group" wmCheckboxset ${getFormMarkupAttr(attrs)} ${getChildAttrs(attrs)} ${getNgModelAttr(attrs)}>`,
         post: () => `</${tagName$N}>`
     };
 });
@@ -64250,7 +64270,7 @@ var number_build$1 = /*#__PURE__*/Object.freeze({
 const tagName$K = 'ul';
 register('wm-radioset', () => {
     return {
-        pre: attrs => `<${tagName$K} wmRadioset ${getFormMarkupAttr(attrs)} ${getChildAttrs(attrs)} ${getNgModelAttr(attrs)}>`,
+        pre: attrs => `<${tagName$K} role="radiogroup" wmRadioset ${getFormMarkupAttr(attrs)} ${getChildAttrs(attrs)} ${getNgModelAttr(attrs)}>`,
         post: () => `</${tagName$K}>`
     };
 });
@@ -64771,7 +64791,7 @@ register('wm-page', () => {
         },
         pre: (attrs) => {
             const counter = idGen$8.nextUid();
-            return `<${tagName$p} wmPage #${counter}="wmPage" data-role="pageContainer" [attr.aria-label]="${counter}.hint || 'Main page content'" ${getAttrMarkup(attrs)}>`;
+            return `<${tagName$p} wmPage #${counter}="wmPage" data-role="pageContainer" [attr.aria-label]="${counter}.hint" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$p}>`
     };
@@ -64885,7 +64905,7 @@ register('wm-left-panel', () => {
     return {
         pre: (attrs) => {
             const counter = idGen$4.nextUid();
-            return `<${tagName$i} wmLeftPanel #${counter}="wmLeftPanel" partialContainer data-role="page-left-panel" role="navigation" [attr.aria-label]="${counter}.hint || 'Left navigation panel'" wmSmoothscroll="${attrs.get('smoothscroll') || 'false'}" ${getAttrMarkup(attrs)}>`;
+            return `<${tagName$i} wmLeftPanel #${counter}="wmLeftPanel" partialContainer data-role="page-left-panel" [attr.aria-label]="${counter}.hint || 'Left navigation panel'" wmSmoothscroll="${attrs.get('smoothscroll') || 'false'}" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$i}>`
     };
@@ -65393,12 +65413,13 @@ const tagName$5 = 'div';
 const getRowExpansionActionTmpl = (attrs) => {
     const tag = attrs.get('widget-type') === 'anchor' ? 'a' : 'button';
     const directive = attrs.get('widget-type') === 'anchor' ? 'wmAnchor' : 'wmButton';
+    const title = attrs.get('display-name') || attrs.get('title') || 'Collapse/Expand';
     return `<ng-template #rowExpansionActionTmpl let-row="row">
                <${tag} ${directive}
                     ${getRowActionAttrs(attrs)}
                     class="${attrs.get('class')} row-expansion-button"
                     iconclass="${attrs.get('collapseicon')}"
-                    type="button"></${tag}>
+                    type="button" aria-label="${title}"></${tag}>
             </ng-template>`;
 };
 register('wm-table-row', () => {

angular-codegen/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/angular-codegen",
-    "version": "11.2.0-next.140957",
+    "version": "11.2.0-next.140960",
     "description": "",
     "main": "index.js",
     "scripts": {