@wavemaker/app-ng-runtime 11.4.0-next.28701 → 11.4.0-rc.121

app-ng-runtime/scripts/datatable/datatable.js

@@ -983,7 +983,7 @@ $.widget('wm.datatable', {
         this._render(true);
     },
     _setGridEditMode: function (val) {
-        if ($.isFunction(this.options.setGridEditMode)) {
+        if (_.isFunction(this.options.setGridEditMode)) {
             this.options.setGridEditMode(val);
         }
     },
@@ -1041,7 +1041,7 @@ $.widget('wm.datatable', {
             $gridBody,
             $alwaysNewRow;
 
-        if (!alwaysNewRow && $.isFunction(this.options.beforeRowInsert)) {
+        if (!alwaysNewRow && _.isFunction(this.options.beforeRowInsert)) {
             this.options.beforeRowInsert();
         }
 
@@ -1680,10 +1680,10 @@ $.widget('wm.datatable', {
             isQuickEdit = this.options.editmode === this.CONSTANTS.QUICK_EDIT;
 
         function callRowSelectionEvents() {
-            if (selected && $.isFunction(self.options.onRowSelect)) {
+            if (selected && _.isFunction(self.options.onRowSelect)) {
                 self.options.onRowSelect(data, e);
             }
-            if (!selected && $.isFunction(self.options.onRowDeselect)) {
+            if (!selected && _.isFunction(self.options.onRowDeselect)) {
                 self.options.onRowDeselect(data, e);
             }
         }
@@ -1728,7 +1728,7 @@ $.widget('wm.datatable', {
         if (!rowData) {
             return;
         }
-        if ($.isFunction(this.options.onRowDblClick)) {
+        if (_.isFunction(this.options.onRowDblClick)) {
             this.options.onRowDblClick(rowData, e);
         }
     },
@@ -1770,13 +1770,13 @@ $.widget('wm.datatable', {
         if (selected) {
             $column.addClass(selectedClass);
             $th.addClass(selectedClass);
-            if ($.isFunction(this.options.onColumnSelect) && e) {
+            if (_.isFunction(this.options.onColumnSelect) && e) {
                 this.options.onColumnSelect(colInfo, e);
             }
         } else {
             $column.removeClass(selectedClass);
             $th.removeClass(selectedClass);
-            if ($.isFunction(this.options.onColumnDeselect) && e) {
+            if (_.isFunction(this.options.onColumnDeselect) && e) {
                 this.options.onColumnDeselect(colInfo, e);
             }
         }
@@ -2029,7 +2029,7 @@ $.widget('wm.datatable', {
 
         //On success of update or delete
         function onSaveSuccess(skipFocus, error) {
-            if ($.isFunction(options.success)) {
+            if (_.isFunction(options.success)) {
                 options.success(skipFocus, error);
             }
             if (!advancedEdit || self.options.actionsEnabled.edit) {
@@ -2060,7 +2060,7 @@ $.widget('wm.datatable', {
                 return;
             }
             $row.addClass('row-editing');
-            if ($.isFunction(this.options.beforeRowUpdate)) {
+            if (_.isFunction(this.options.beforeRowUpdate)) {
                 this.options.beforeRowUpdate(rowData, e);
             }
 
@@ -2073,7 +2073,7 @@ $.widget('wm.datatable', {
                 self.toggleNewRowActions(true);
             }
             //Event for on before form render. User can update row data here.
-            if ($.isFunction(this.options.onBeforeFormRender)) {
+            if (_.isFunction(this.options.onBeforeFormRender)) {
                 isValid = this.options.onBeforeFormRender(rowData, e, options.operation || action);
                 if (isValid === false) {
                     return;
@@ -2096,7 +2096,7 @@ $.widget('wm.datatable', {
                 });
             }
             //Event for on before form render. User can access form widgets here.
-            if ($.isFunction(this.options.onFormRender)) {
+            if (_.isFunction(this.options.onFormRender)) {
                 this.options.onFormRender($row, e, options.operation || action, $row.hasClass('always-new-row'));
             }
         } else {
@@ -2160,7 +2160,7 @@ $.widget('wm.datatable', {
                             }
                             self.options.setTouched($invalidTd.find('[formcontrolname]').attr('formcontrolname'));
                         });
-                        if ($.isFunction(options.success)) {
+                        if (_.isFunction(options.success)) {
                             options.success(false, true);
                         }
                         return;
@@ -2168,14 +2168,14 @@ $.widget('wm.datatable', {
 
                     if (isNewRow && advancedEdit && _.isEmpty(rowData)) {
                         self.removeNewRow($row);
-                        if ($.isFunction(options.success)) {
+                        if (_.isFunction(options.success)) {
                             options.success(false, undefined, true);
                         }
                         return;
                     }
 
                     if (isNewRow) {
-                        if ($.isFunction(this.options.onBeforeRowInsert)) {
+                        if (_.isFunction(this.options.onBeforeRowInsert)) {
                             isValid = this.options.onBeforeRowInsert(rowData, e, editOptions);
                             if (isValid === false) {
                                 return;
@@ -2192,7 +2192,7 @@ $.widget('wm.datatable', {
                             self.removeNewRow($row);
                         }
                     } else {
-                        if ($.isFunction(this.options.onBeforeRowUpdate)) {
+                        if (_.isFunction(this.options.onBeforeRowUpdate)) {
                             isValid = this.options.onBeforeRowUpdate(rowData, e, editOptions);
                             if (isValid === false) {
                                 return;
@@ -2205,7 +2205,7 @@ $.widget('wm.datatable', {
                     if (!options.noMsg) {
                         this.options.noChangesDetected();
                     }
-                    if ($.isFunction(options.success)) {
+                    if (_.isFunction(options.success)) {
                         options.success(false);
                     }
                 }
@@ -2315,7 +2315,7 @@ $.widget('wm.datatable', {
         this.options.setActionRowIndex(rowId);
         this.options.setLastActionPerformed(this.options.ACTIONS.DELETE);
 
-        if ($.isFunction(this.options.beforeRowDelete)) {
+        if (_.isFunction(this.options.beforeRowDelete)) {
             this.options.beforeRowDelete(rowData, e);
         }
         if (isNewRow) {
@@ -2331,13 +2331,13 @@ $.widget('wm.datatable', {
             return;
         }
         /* calling onbeforerowDelete callback function.*/
-        if($.isFunction(this.options.onBeforeRowDelete)) {
+        if(_.isFunction(this.options.onBeforeRowDelete)) {
             isValid = this.options.onBeforeRowDelete(rowData, e, options);
             if (isValid === false) {
                 return;
             }
         }
-        if ($.isFunction(this.options.onRowDelete)) {
+        if (_.isFunction(this.options.onRowDelete)) {
             className = this.options.cssClassNames.deleteRow;
             isActiveRow = $row.attr('class').indexOf('active') !== -1;
             if (isActiveRow) {
@@ -2982,10 +2982,10 @@ $.widget('wm.datatable', {
                 // If we enable multiselect and check header checkbox then updating selecteditem in datatable.
                 self.options.assignSelectedItems(rowData, e);
                 self.toggleRowSelection($row, checked, e, true);
-                if (checked && $.isFunction(self.options.onRowSelect)) {
+                if (checked && _.isFunction(self.options.onRowSelect)) {
                     self.options.onRowSelect(rowData, e);
                 }
-                if (!checked && $.isFunction(self.options.onRowDeselect)) {
+                if (!checked && _.isFunction(self.options.onRowDeselect)) {
                     self.options.onRowDeselect(rowData, e);
                 }
             });
@@ -3020,7 +3020,7 @@ $.widget('wm.datatable', {
         /**Add event handler, to the select all checkbox on the header**/
         $header.on('click', '.app-datagrid-header-cell input:checkbox', toggleSelectAll);
 
-        if ($.isFunction(this.options.onHeaderClick)) {
+        if (_.isFunction(this.options.onHeaderClick)) {
             this.gridHeaderElement.find('th.app-datagrid-header-cell').on('click', this.headerClickHandler.bind(this));
         }
 
@@ -3168,7 +3168,7 @@ $.widget('wm.datatable', {
         if (isCreated) {
             this._setColSpan(this.options.headerConfig);
         }
-        if ($.isFunction(this.options.onDataRender)) {
+        if (_.isFunction(this.options.onDataRender)) {
             this.options.onDataRender();
         }
         if (!isCreated && this.options.selectFirstRow) {

app-ng-runtime/scripts/tree-keyboard-navigation/keyboard-navigation.js

@@ -0,0 +1,251 @@
+(function ($) {
+	/**
+	 * Dummy function to provide a placeholder for the destroy function
+	 */
+	$.fn.zTreeKeyboardNavigationDestroy = function () {
+	}
+
+	/**
+	 * Creates a function that adds keyboard navigation:
+	 * Home: home key (keycode 36)				Goes to the first root element is visible
+	 * End: end key (keycode 35)				Goes to the last leaf node and will expand nodes and scroll the element into view
+	 * Down: right cursor key (keycode 39)		Goes to the next visible node in the tree following the hierarchy
+	 * Next: down cursor key (keycode 40)		Goes to the next visible node at the same level
+	 * Up: up cursor key (keycode 37)			Goes to the prior visible node at the same level
+	 * Previous: left cursor key (keycode 38)	Goes to the prior visible node following the hierarchy
+	 * Toggle: space key (keycode 32)			Toggles the expand/collapse state of a parent node
+	 * @param {IxTreeObj} zTree
+	 * @param {string|JQuery<HTMLElement} element
+	 * @param {IJSON[]} selectedNodes
+	 */
+	$.fn.zTreeKeyboardNavigation = function (zTree, element, selectedNodes = null, treeicon) {
+		if (typeof element === 'string' || element instanceof String) {
+			element = $(element);
+		}
+
+		var rootNodes = zTree.getNodes();
+		if (!rootNodes) return;
+
+		var focusSelectedNode = function () {
+			if ((selectedNodes = zTree.getSelectedNodes()) && selectedNodes.length) {
+				$("#" + selectedNodes[0].tId).focus();
+			}
+		}
+
+		// Clear the previous event handler (there may be none)
+		$.fn.zTreeKeyboardNavigationDestroy();
+
+		/**
+		 * Make it possible to destroy (remove the event handlers)
+		 */
+		$.fn.zTreeKeyboardNavigationDestroy = function () {
+			$(element).off('keydown');
+		}
+
+		$.fn.changeTreeIcons = function () {
+			let eleClose = $('.app-tree li span.button.switch');
+
+			$(eleClose).map((idx, ele) => {
+				$(ele).addClass(treeicon);
+				$(ele).on("click", function (e) {
+					setTimeout(() => {
+						$(ele).addClass(treeicon);
+					}, 0);
+				});
+			})
+		}
+
+
+		$(element).on('keydown', function (e) {
+			var selectedNodes = zTree.getSelectedNodes();
+			var selectedNode = selectedNodes.length ? selectedNodes[0] : null;
+
+			var processSpace = function () {
+				// If there are no nodes or the selected node is not a parent, get out
+				if (selectedNode && selectedNode.isParent) {
+					// Toggle the node
+					zTree.expandNode(selectedNode, selectedNode.open ? false : true, true, true);
+					$.fn.changeTreeIcons()
+				}
+			}
+
+			var processHome = function () {
+				zTree.selectNode(rootNodes[0], false, true);
+			}
+
+			var processEnd = function () {
+				var nodes = zTree.transformToArray(rootNodes);
+				// Select the last node
+				zTree.selectNode(nodes[nodes.length - 1]);
+			}
+
+			var processUp = function () {
+				var priorNode;
+				if (selectedNode) {
+					priorNode = selectedNode.getPreNode();
+					if (!priorNode) return;
+				}
+				else {
+					processEnd();
+				}
+
+				if (!priorNode) return;
+
+				zTree.selectNode(priorNode);
+			}
+
+			var processDown = function () {
+				var nextNode;
+				if (selectedNode) {
+					nextNode = selectedNode.getNextNode();
+					if (!nextNode) return;
+				}
+				else {
+					processHome();
+				}
+
+				if (!nextNode) return;
+
+				zTree.selectNode(nextNode);
+			}
+
+			var processOut = function () {
+				if (!selectedNode) return;
+
+				var parentNode = selectedNode.getParentNode();
+				var priorNode = selectedNode.getPreNode();
+				if (!parentNode && !priorNode) return; // Must have been the root node
+
+				if (priorNode) {
+					if (priorNode.isParent) {
+						// There is a prior node, now the the question is where is the last open node?
+						while (priorNode) {
+							if (!priorNode.isParent || !priorNode.open || !priorNode.children) break;
+
+							priorNode = priorNode.children[priorNode.children.length - 1];
+						}
+
+						zTree.selectNode(priorNode);
+						return;
+					}
+					else {
+						zTree.selectNode(priorNode);
+						return;
+					}
+				}
+
+				// Find the parent node with a valid prior sibling
+				if (parentNode) {
+					// This call should be silent otherwise (in my view a bug in) 
+					// selectNode causes the root node to blur
+					zTree.selectNode(parentNode, false, true);
+				}
+			}
+
+			var processIn = function () {
+				if (!selectedNode) return;
+
+				if (selectedNode.isParent && selectedNode.open && selectedNode.children) {
+					zTree.selectNode(selectedNode.children[0]);
+					return;
+				}
+
+				var nextNode = selectedNode.getNextNode();
+				if (nextNode) {
+					zTree.selectNode(nextNode);
+				}
+				else {
+					// Cannot be root if there is a selected node that is not a parent
+					var node = selectedNode;
+					// Find the parent node with a valid next sibling
+					while (node = node.getParentNode()) {
+						var nextNode = node.getNextNode();
+						if (nextNode) {
+							zTree.selectNode(nextNode);
+							break;
+						}
+					}
+				}
+			}
+
+			var processLetter = function (keyCode) {
+				if (!Array.from({ length: 26 }, (v, i) => i + 65).includes(keyCode & 95)) return false;
+
+				var nodes = zTree.transformToArray(rootNodes);
+				nodes = nodes.filter(node => {
+					return 'accesskey' in node && node.accesskey.length && (node.accesskey.charCodeAt(0) & 95) == keyCode;
+				});
+
+				if (!nodes.length) return false;
+
+				var selectedNodes = zTree.getSelectedNodes();
+				if (!selectedNodes.length) return false;
+
+				if (selectedNodes[0] == nodes[0]) return false;
+
+				zTree.selectNode(nodes[0]);
+
+				return true;
+			}
+
+			// console.log('before');
+			// console.log(document.activeElement);
+
+			switch (e.keyCode) {
+				case 32: /* Toggle parent nodes */
+					processSpace();
+					return;
+
+				case 36: /* Home - go to the root node */
+					processHome();
+					break;
+
+				case 35: /* End - go to the last node */
+					processEnd();
+					break;
+
+				case 33: /* PageUp */
+					// Do nothing
+					break;
+
+				case 34: /* PageDown */
+					// Do nothing
+					break;
+
+				case 37: /* Left */
+					processOut();
+					break;
+
+				case 38: /* Up */
+					processUp();
+					break;
+
+				case 39: /* Right */
+					processIn();
+					break;
+
+				case 40: /* Down */
+					processDown();
+					break;
+
+				default:
+					if (!processLetter(e.keyCode & 95)) return;
+					break;
+			}
+
+			// console.log('after');
+			// console.log(document.activeElement);
+			focusSelectedNode();
+		});
+
+		if (selectedNodes && selectedNodes.length) {
+			zTree.selectNode(selectedNodes[0]);
+			focusSelectedNode();
+		}
+		else {
+			$(element).trigger({ type: 'keydown', which: 36, keyCode: 36 });
+		}
+
+	}
+
+})(jQuery);

app-ng-runtime/variables/bundles/index.umd.js

@@ -1563,30 +1563,35 @@
                 toaster.onHidden.subscribe(this.onToasterHide.bind(this, variable));
             }
         };
+        NotificationActionManager.prototype.getDialogConfig = function (variable, options, dialogId, closeCallBackFn) {
+            return {
+                'title': options.title || variable.dataBinding.title,
+                'text': options.message || variable.dataBinding.text,
+                'okButtonText': options.okButtonText || variable.dataBinding.okButtonText || 'OK',
+                'cancelButtonText': options.cancelButtonText || variable.dataBinding.cancelButtonText || 'CANCEL',
+                'alerttype': options.alerttype || variable.dataBinding.alerttype || 'information',
+                onOk: function () {
+                    // Close the action dialog after triggering onOk callback event
+                    exports.dialogService.close(dialogId, undefined, closeCallBackFn);
+                },
+                onCancel: function () {
+                    initiateCallback('onCancel', variable, options.data);
+                    // Close the action dialog after triggering onCancel callback event
+                    exports.dialogService.close(dialogId, undefined);
+                },
+                onClose: function () {
+                    initiateCallback('onClose', variable, options.data);
+                }
+            };
+        };
         NotificationActionManager.prototype.notifyViaDialog = function (variable, options) {
-            var commonPageDialogId = 'Common' + _.capitalize(variable.operation) + 'Dialog', variableOwner = variable.owner, dialogId = (variableOwner === VARIABLE_CONSTANTS.OWNER.APP) ? commonPageDialogId : 'notification' + variable.operation + 'dialog';
+            var isPrefabType = core.getWmProjectProperties().type === 'PREFAB';
+            var dialogPrefix = isPrefabType ? 'Prefab' : 'Common';
+            var dialogId = dialogPrefix + _.capitalize(variable.operation) + 'Dialog';
             var closeCallBackFn = function () { return initiateCallback('onOk', variable, options.data); };
-            exports.dialogService.open(dialogId, variable._context, {
-                notification: {
-                    'title': options.title || variable.dataBinding.title,
-                    'text': options.message || variable.dataBinding.text,
-                    'okButtonText': options.okButtonText || variable.dataBinding.okButtonText || 'OK',
-                    'cancelButtonText': options.cancelButtonText || variable.dataBinding.cancelButtonText || 'CANCEL',
-                    'alerttype': options.alerttype || variable.dataBinding.alerttype || 'information',
-                    onOk: function () {
-                        // Close the action dialog after triggering onOk callback event
-                        exports.dialogService.close(dialogId, variable._context, closeCallBackFn);
-                    },
-                    onCancel: function () {
-                        initiateCallback('onCancel', variable, options.data);
-                        // Close the action dialog after triggering onCancel callback event
-                        exports.dialogService.close(dialogId, variable._context);
-                    },
-                    onClose: function () {
-                        initiateCallback('onClose', variable, options.data);
-                    }
-                }
-            });
+            var dialogConfig = this.getDialogConfig(variable, options, dialogId, closeCallBackFn);
+            dialogConfig = isPrefabType ? dialogConfig : { notification: dialogConfig };
+            exports.dialogService.open(dialogId, undefined, dialogConfig);
         };
         // *********************************************************** PUBLIC ***********************************************************//
         NotificationActionManager.prototype.notify = function (variable, options, success, error) {
@@ -3486,6 +3491,14 @@
         { type: core.AbstractHttpService }
     ]; };
 
+    var Formatter = /** @class */ (function () {
+        function Formatter() {
+        }
+        Formatter.prototype.format = function (value, format) {
+            return exports.appManager.getPipe('date').transform(value, format);
+        };
+        return Formatter;
+    }());
     var VariablesService = /** @class */ (function () {
         function VariablesService(httpService, metadataService, navigationService, routerService, toasterService, oAuthService, securityService, dialogService) {
             this.httpService = httpService;
@@ -3611,6 +3624,7 @@
                 if (this.isVariableSeperated(variablesJson, variableName)) {
                     this.processBinding(varInstance, scope, 'dataBinding', this.getBindSourceTarget(varInstance));
                     varInstance.httpService = this.httpService;
+                    varInstance.dateFormatter = new Formatter();
                     varInstance.subscribe('afterInvoke', function () { return core.$invokeWatchers(true); });
                     if (varInstance.category === 'wm.LiveVariable' && varInstance.operation === 'read') {
                         core.processFilterExpBindNode(varInstance._context, varInstance.filterExpressions, varInstance);
@@ -3705,6 +3719,7 @@
     exports.DB_CONSTANTS = DB_CONSTANTS;
     exports.DeviceVariableManager = DeviceVariableManager;
     exports.DeviceVariableService = DeviceVariableService;
+    exports.Formatter = Formatter;
     exports.MetadataService = MetadataService;
     exports.SWAGGER_CONSTANTS = SWAGGER_CONSTANTS;
     exports.VARIABLE_CONSTANTS = VARIABLE_CONSTANTS;