Merge pull request #123 from mendix/release/8.0.0

Release/8.0.0

Author: ozgeMendix

build.gradle

@@ -22,8 +22,8 @@ apply plugin: 'org.owasp.dependencycheck'
 apply plugin: 'com.github.ben-manes.versions'
 
 project.ext {
-    PNC_VERSION = '7.4.2'
-    MXBUILD_VERSION = '9.24.0.2965'
+    PNC_VERSION = '8.0.0'
+    MXBUILD_VERSION = '10.21.0.64362'
     MODULE_NAME = 'PushNotifications'
 }
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "MxPushNotifications",
-  "version": "7.4.2",
+  "version": "8.0.0",
   "description": "Phonegap widget for notifications",
   "license": "Apache 2.0",
   "author": "Mendix Technology B.V.",

package.json

@@ -26,54 +26,57 @@ export async function Export_To_Excel(datagridName, fileName, sheetName, include
         return false;
     }
 
-    return new Promise((resolve, reject) => {
-        const stream =
-            window[window.DATAGRID_DATA_EXPORT][datagridName].create();
+    const REGISTRY_NAME = "com.mendix.widgets.web.datagrid.export";
+    const registry = window[REGISTRY_NAME];
+    const controller = registry.get(datagridName);
 
-        let worksheet;
-        let headers;
-        const streamOptions = { limit: chunkSize };
-        stream.process((msg) => {
-            if (!msg) {
-                return;
-            }
+    if (controller === undefined) {
+        return false;
+    }
+
+    return new Promise((resolve) => {
+        function handler(req) {
+            let worksheet;
+            let headers;
 
-            switch (msg.type) {
-                case "columns":
-                    headers = msg.payload.map(column => column.name);
-                    if (includeColumnHeaders) {
-                        worksheet = utils.aoa_to_sheet([headers]);
-                    }
-                    break;
-                case "data":
-                    if (worksheet === undefined) {
-                        worksheet = utils.aoa_to_sheet(msg.payload)
-                    } else {
-                        utils.sheet_add_aoa(worksheet, msg.payload, { origin: -1 });
-                    }
-                    break;
-                case "end":
-                    if (worksheet) {
-                        // Set character width for each column
-                        // https://docs.sheetjs.com/docs/csf/sheet#worksheet-object
-                        worksheet["!cols"] = headers.map(header => ({
-                            wch: header.length + 10
-                        }));
-                        const workbook = utils.book_new();
-                        utils.book_append_sheet(workbook, worksheet, sheetName === "" ? "Data" : sheetName);
-                        writeFileXLSX(workbook, `${fileName}.xlsx`);
-                        resolve(true);
-                    } else {
-                        resolve(false);
-                    }
-                    break;
-                case "aborted":
+            req.on("headers", (hds) => {
+                headers = hds.map(header => header.name);
+                if (includeColumnHeaders) {
+                    worksheet = utils.aoa_to_sheet([headers]);
+                }
+            });
+
+            req.on("data", (data) => {
+                if (worksheet === undefined) {
+                    worksheet = utils.aoa_to_sheet(data)
+                } else {
+                    utils.sheet_add_aoa(worksheet, data, { origin: -1 });
+                }
+            });
+
+            req.on("end", () => {
+                if (worksheet) {
+                    // Set character width for each column
+                    // https://docs.sheetjs.com/docs/csf/sheet#worksheet-object
+                    worksheet["!cols"] = headers.map(header => ({
+                        wch: header.length + 10
+                    }));
+                    const workbook = utils.book_new();
+                    utils.book_append_sheet(workbook, worksheet, sheetName === "" ? "Data" : sheetName);
+                    writeFileXLSX(workbook, `${fileName}.xlsx`);
+                    resolve(true);
+                } else {
                     resolve(false);
-                    break;
-            }
-        }, streamOptions);
+                }
+            });
+
+            req.on("abort", () => resolve(false));
+        }
 
-        stream.start();
+        controller.exportData(handler, {
+            withHeaders: true,
+            limit: chunkSize.toNumber()
+        })
     });
 	// END USER CODE
 }

test/PushNotfications.mpr

@@ -13,13 +13,14 @@ import "mx-global";
 
 /**
  * @param {string} targetName - Name of the widget for which filters should be reset. Valid targets are: Data grid 2, Gallery. You can find filter name in widget settings in the "Common" group (Properties>Common>Name).
+ * @param {boolean} setToDefault - Set to default value. If true, filter will be set to its default value, otherwise it will be set to empty.
  * @returns {Promise.<void>}
  */
-export async function Reset_All_Filters(targetName) {
+export async function Reset_All_Filters(targetName, setToDefault) {
 	// BEGIN USER CODE
     const plugin = window["com.mendix.widgets.web.plugin.externalEvents"];
     if (plugin) {
-        plugin.emit(targetName, "reset.filters");
+        plugin.emit(targetName, "reset.filters", setToDefault);
     }
 	// END USER CODE
 }

test/javascriptsource/datawidgets/actions/Export_To_Excel.js

@@ -13,13 +13,14 @@ import { Big } from "big.js";
 
 /**
  * @param {string} targetName - Name of the filter to reset. Valid targets are: Number filter, Date filter, Text filter, Drop-down filter. You can find filter name in widget settings in the "Common" group (Properties>Common>Name).
+ * @param {boolean} setToDefault - Set to default value. If true, filter will be set to its default value, otherwise it will be set to empty.
  * @returns {Promise.<void>}
  */
-export async function Reset_Filter(targetName) {
+export async function Reset_Filter(targetName, setToDefault) {
 	// BEGIN USER CODE
     const plugin = window["com.mendix.widgets.web.plugin.externalEvents"];
     if (plugin) {
-        plugin.emit(targetName, "reset.value");
+        plugin.emit(targetName, "reset.value", setToDefault);
     }
 	// END USER CODE
 }

test/javascriptsource/datawidgets/actions/Reset_All_Filters.js

@@ -0,0 +1,34 @@
+// This file was generated by Mendix Studio Pro.
+//
+// WARNING: Only the following code will be retained when actions are regenerated:
+// - the import list
+// - the code between BEGIN USER CODE and END USER CODE
+// - the code between BEGIN EXTRA CODE and END EXTRA CODE
+// Other code you write will be lost the next time you deploy the project.
+import "mx-global";
+import { Big } from "big.js";
+
+// BEGIN EXTRA CODE
+// END EXTRA CODE
+
+/**
+ * @param {string} targetName - Name of the filter to set. Valid targets are: Number filter, Date filter, Text filter, Drop-down filter. You can find filter name in widget settings in the "Common" group (Properties>Common>Name).
+ * @param {boolean} useDefaultValue - Determine the use of default value provided by the filter component itself.
+If true, "Value" section will be ignored
+ * @param {"DataWidgets.Filter_Operators.contains"|"DataWidgets.Filter_Operators.startsWith"|"DataWidgets.Filter_Operators.endsWith"|"DataWidgets.Filter_Operators.between"|"DataWidgets.Filter_Operators.greater"|"DataWidgets.Filter_Operators.greaterEqual"|"DataWidgets.Filter_Operators.equal"|"DataWidgets.Filter_Operators.notEqual"|"DataWidgets.Filter_Operators.smaller"|"DataWidgets.Filter_Operators.smallerEqual"|"DataWidgets.Filter_Operators.empty"|"DataWidgets.Filter_Operators.notEmpty"} operators - Selected operators value. If filter has operators, this value will be applied.
+ * @param {string} stringValue - Value set for dropdown filter or text filter. Choose empty if not use.
+ * @param {Big} numberValue - Number value for number filter. Choose empty if not use.
+ * @param {Date} dateTimeValue - Date time value for date filter, can also be use as "start date". Choose empty if not use.
+ * @param {Date} dateTimeValue_2 - End date time value for range filter. Choose empty if not use.
+ * @returns {Promise.<void>}
+ */
+export async function Set_Filter(targetName, useDefaultValue, operators, stringValue, numberValue, dateTimeValue, dateTimeValue_2) {
+	// BEGIN USER CODE
+	const plugin = window["com.mendix.widgets.web.plugin.externalEvents"];
+    if (plugin) {
+        plugin.emit(targetName, "set.value", useDefaultValue, {
+			operators, stringValue, numberValue, dateTimeValue, dateTimeValue2: dateTimeValue_2
+		});
+    }
+	// END USER CODE
+}

test/javascriptsource/datawidgets/actions/Reset_Filter.js

@@ -12,11 +12,11 @@ import { Base64 } from 'js-base64';
 // END EXTRA CODE
 
 /**
- * @param {string} string
+ * @param {string} stringToEncode
  * @returns {Promise.<string>}
  */
-export async function Base64Encode(string) {
+export async function Base64Encode(stringToEncode) {
 	// BEGIN USER CODE
-    return Base64.encode(string);
+    return Base64.encode(stringToEncode);
 	// END USER CODE
 }