Process pull request review

Author: SamuelMuloki

README.md

@@ -1,6 +1,6 @@
-# ActionTimer [![Support](https://img.shields.io/badge/Mendix%20Support%3A-Platform-green.svg)](https://docs.mendix.com/community/app-store/app-store-content-support)
+# Microflow Timer [![Support](https://img.shields.io/badge/Mendix%20Support%3A-Platform-green.svg)](https://docs.mendix.com/community/app-store/app-store-content-support)
 
-This widget can be used to time and execute a Microflow as long as a certain form is open. The microflow or nanoflow can be executed once or repeatedly, in which case it will not stop until it returns false or until the form is closed.
+This widget can be used to time and execute a Microflow or Nanoflow as long as a certain form is open. The microflow or nanoflow can be executed once or repeatedly, in which case it will not stop until it returns false or until the form is closed.
 
 ## Contributing
 
@@ -16,11 +16,11 @@ For more information on contributing to this repository visit [Contributing to a
 ## Features and limitations
 
 * Adds timed behavior to your applications.
-* Nanoflow support starts from Mendix 7.13.1.
+* Run a Microflow or Nanoflow.
 
 ## Configuration
 
-* The widget requires a dataview or template grid context. This object will be send as argument to the invoked microflow.
+* The widget requires a dataview or template grid context. This object will be send as argument to the invoked microflow or nanoflow.
 
 ## Properties
 

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "actiontimer",
-  "version": "3.2.0",
+  "name": "MicroflowTimer",
+  "version": "4.0.0",
   "description": "",
   "license": "",
   "author": "",

src/MicroflowTimer/MicroflowTimer.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <widget id="MicroflowTimer.widget.MicroflowTimer" needsEntityContext="true" xmlns="http://www.mendix.com/widget/1.0/">
-    <name>ActionTimer</name>
+    <name>MicroflowTimer</name>
     <description>The description of this widget</description>
     <icon></icon>
 
@@ -21,7 +21,7 @@
             <description>If true (and execute once is false), the microflow or nanoflow will be invoked the first time if the widget has loaded. If false, the microflow or nanoflow will be invoked the first time after interval has passed</description>
         </property>
         <property key="callEvent" type="enumeration" defaultValue="callMicroflow">
-            <caption>Call event</caption>
+            <caption>Timer event</caption>
             <category>Behavior</category>
             <description/>
             <enumerationValues>

src/MicroflowTimer/widget/MicroflowTimer.js

@@ -26,8 +26,12 @@ define([
         _timeout: null,
         _timerStarted: false,
 
-        postcreate: function() {
+        postCreate: function() {
             this._handles = [];
+
+            if(!(this.microflow && this.callEvent == "callMicroflow" || this.nanoflow.nanoflow && this.callEvent == "callNanoflow")) {
+                mx.ui.error("No action specified for " + this.callEvent)
+            }
         },
 
         update: function (obj, callback) {
@@ -166,10 +170,10 @@ define([
         _executeEvent: function() {
             if(this.callEvent === "callMicroflow" && this.microflow) {
                 this._execMf()
-            } else if (this.callEvent === "callNanoflow" && this.nanoflow){
+            } else if (this.callEvent === "callNanoflow" && this.nanoflow.nanoflow){
                 this._executeNanoFlow()
             } else {
-                mx.ui.error("No action specified for " + this.callEvent)
+                return;
             }
         },
 
@@ -183,6 +187,7 @@ define([
                 var mfObject = {
                     params: {
                         actionname: this.microflow,
+                        origin: this.mxform,
                         applyto: "selection",
                         guids: [this._contextObj.getGuid()]
                     },
@@ -193,18 +198,10 @@ define([
                         }
                     }),
                     error: lang.hitch(this, function(error) {
+                        logger.error(this.id + ": An error ocurred while executing microflow: ", error);
                         mx.ui.error("An error ocurred while executing microflow" + error.message);
                     })
                 };
-                if (!mx.version || mx.version && parseInt(mx.version.split(".")[0]) < 7) {
-                    // < Mendix 7
-                    mfObject.store = {
-                        caller: this.mxform
-                    };
-                } else {
-                    mfObject.origin = this.mxform;
-                }
-
                 mx.data.action(mfObject, this);
             }
         },
@@ -222,6 +219,7 @@ define([
                         }
                     }),
                     error: lang.hitch(this, function(error) {
+                        logger.error(this.id + ": An error ocurred while executing nanoflow: ", error);
                         mx.ui.error("An error ocurred while executing nanoflow" + error.message);
                     })
                 });

src/package.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="ActionTimer" version="3.2.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="MicroflowTimer" version="4.0.0" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="MicroflowTimer/MicroflowTimer.xml"/>
         </widgetFiles>