Merge remote-tracking branch 'upstream/master'

Author: tieniber

README.md

@@ -1,28 +1,4 @@
-# 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)
+Please see [Microflow Timer](https://docs.mendix.com/appstore/widgets/microflow-timer) in the Mendix documentation for details.
 
-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. In offline profile only a nanoflow can be used.
-
-## Typical usage scenario
-
-* Update a grid or object after a certain amount of time, for example a message inbox
-* Close a form with a message automatically after 10 seconds
-* Automatically make backup copies while the user is still editing an object.
-* Open a form and directly trigger validation errors. (to achieve this, use interval: 0, execute once: true, start at once: true) (new in 1.2)
-
-## Features and limitations
-
-* Adds timed behavior to your applications.
-* 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 or nanoflow.
-
-## Properties
-
-* Interval (in ms): Defines how often the microflow or nanoflow is called. Note that the inteval is in milliseconds, so the default, 30000, equals 30 seconds. Note that, unless Execute Once is set to true, the microflow is invoked immediately after loading the form for the first time.
-* Execute once: If true, the microflow will be invoked only once, and interval defines after how many seconds.
-
-* Microflow: The microflow to be executed. If the microflow returns false, it will not be executed any longer until the context changes.
-* Nanoflow: The nanoflow to be executed. If the nanoflow returns false, it will not be executed any longer until the context changes.
-* Start at once: If true (and execute once is true), 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.
+## Raising problems/issues
+-   We encourage everyone to open a Support ticket on [Mendix Support](https://support.mendix.com) in case of problems with widgets or scaffolding tools (Pluggable Widgets Generator or Pluggable Widgets Tools)

package-lock.json

@@ -26,16 +26,18 @@ define([
         _timeout: null,
         _timerStarted: false,
 
+        _flowRunning: false,
+
         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)
+            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) {
-            logger.debug(this.id + ".update");
+            mx.logger.debug(this.id + ".update");
 
             this._contextObj = obj;
             this._resetSubscriptions();
@@ -59,7 +61,7 @@ define([
         },
 
         _checkTimerStatus: function() {
-            logger.debug(this.id + "._checkStatus");
+            mx.logger.debug(this.id + "._checkStatus");
 
             var running, newInterval;
 
@@ -107,7 +109,7 @@ define([
 
         //Called when the optional timer interval attribute is changed
         _intervalChange: function (newInterval) {
-            logger.debug(this.id + "._intervalChange");
+            mx.logger.debug(this.id + "._intervalChange");
 
             this.interval = newInterval;
 
@@ -118,7 +120,7 @@ define([
         },
 
         _runTimer: function() {
-            logger.debug(this.id + "._runTimer", this.interval);
+            mx.logger.debug(this.id + "._runTimer", this.interval);
             if (this.callEvent !== "" && this._contextObj) {
                 this._timerStarted = true;
 
@@ -152,33 +154,39 @@ define([
         },
 
         _stopTimer: function() {
-            logger.debug(this.id + "._stopTimer");
+            mx.logger.debug(this.id + "._stopTimer");
             this._timerStarted = false;
 
             if (this._timer !== null) {
-                logger.debug(this.id + "._stopTimer timer cleared");
+                mx.logger.debug(this.id + "._stopTimer timer cleared");
                 clearInterval(this._timer);
                 this._timer = null;
             }
             if (this._timeout !== null) {
-                logger.debug(this.id + "._stopTimer timeout cleared");
+                mx.logger.debug(this.id + "._stopTimer timeout cleared");
                 clearTimeout(this._timeout);
                 this._timeout = null;
             }
         },
 
         _executeEvent: function() {
+            if (this._flowRunning === true) {
+                return;
+              }
+
+              this._flowRunning = true;
+
             if(this.callEvent === "callMicroflow" && this.microflow) {
-                this._execMf()
+                this._execMf();
             } else if (this.callEvent === "callNanoflow" && this.nanoflow.nanoflow){
-                this._executeNanoFlow()
+                this._executeNanoFlow();
             } else {
                 return;
             }
         },
 
         _execMf: function() {
-            logger.debug(this.id + "._execMf");
+            mx.logger.debug(this.id + "._execMf");
             if (!this._contextObj) {
                 return;
             }
@@ -192,12 +200,14 @@ define([
                     },
                     callback: lang.hitch(this, function(result) {
                         if (!result) {
-                            logger.debug(this.id + "._execMf callback, stopping timer");
+                            mx.logger.debug(this.id + "._execMf callback, stopping timer");
                             this._stopTimer();
                         }
+                        this._flowRunning = false;
                     }),
                     error: lang.hitch(this, function(error) {
-                        logger.error(this.id + ": An error ocurred while executing microflow: ", error);
+                        mx.logger.error(this.id + ": An error ocurred while executing microflow: ", error);
+                        this._flowRunning = false;
                     })
                 };
 
@@ -221,12 +231,14 @@ define([
                     context: this.mxcontext,
                     callback: lang.hitch(this, function(result) {
                         if (!result) {
-                            logger.debug(this.id + "._executeNanoFlow callback, stopping timer");
+                            mx.logger.debug(this.id + "._executeNanoFlow callback, stopping timer");
                             this._stopTimer();
                         }
+                        this._flowRunning = false;
                     }),
                     error: lang.hitch(this, function(error) {
-                        logger.error(this.id + ": An error ocurred while executing nanoflow: ", error);
+                        mx.logger.error(this.id + ": An error ocurred while executing nanoflow: ", error);
+                        this._flowRunning = false;
                     })
                 });
             }
@@ -264,12 +276,12 @@ define([
         },
 
         _executeCallback: function (cb, from) {
-            logger.debug(this.id + "._executeCallback" + (from ? " from " + from : ""));
+            mx.logger.debug(this.id + "._executeCallback" + (from ? " from " + from : ""));
             if (cb && typeof cb === "function") {
                 cb();
             }
         }
     });
 });
 
-require(["MicroflowTimer/widget/MicroflowTimer"])
+require(["MicroflowTimer/widget/MicroflowTimer"]);

src/MicroflowTimer/widget/MicroflowTimer.js

@@ -8,4 +8,4 @@
             <file path="MicroflowTimer/widget/"/>
         </files>
     </clientModule>
-</package>
+</package>