Add an argument to the callback in PollingManager to stop the polling…

… | refs #35772

src/lib/polling-manager.js

@@ -24,7 +24,7 @@ export class PollingManager {
         this.interval = interval;
         this.fct = fct;
 
-        if (enabled === true || enabled === undefined) {
+        if (enabled === undefined || enabled === true) {
             this.enable();
         }
         document.addEventListener('visibilitychange', function () {
@@ -51,10 +51,12 @@ export class PollingManager {
         if (this.enabled && !this.running) {
             this.running = true;
             this.cancel();
-            this.fct(function () {
+            this.fct(function (planNext) {
                 this.lastRun = (new Date()).getTime();
                 this.running = false;
-                this.plan(this.interval);
+                if (planNext === undefined || planNext === true) {
+                    this.plan(this.interval);
+                }
             }.bind(this));
         }
     }

tests/test_polling.spec.js

@@ -2,14 +2,14 @@
 const assert = require('assert');
 import { PollingManager } from '../src/lib/polling-manager.js';
 
+const sleep = (time) => {
+    return new Promise((resolve) => {
+        setTimeout(resolve, time);
+    });
+};
+
 describe('PollingManager', () => {
     it('should handle polling function', async () => {
-        const sleep = (time) => {
-            return new Promise((resolve) => {
-                setTimeout(resolve, time);
-            });
-        };
-
         const start = new Date().getTime();
         const calls = [];
         const polling = new PollingManager(function (callback) {
@@ -47,4 +47,24 @@ describe('PollingManager', () => {
         // Cleanup test
         polling.disable();
     }).timeout(5000);
+    it('should handle planNext in callback', async () => {
+        const start = new Date().getTime();
+        const calls = [];
+        const polling = new PollingManager(function (callback) {
+            calls.push(new Date().getTime() - start);
+            callback(false);
+        }, 1000);
+
+        // Test call after init
+        await sleep(500);
+        assert(calls.length == 1);
+        assert(calls[0] < 100, `${calls[0]} ~= 0`);
+
+        // Test no call after first run because planNext=false
+        await sleep(1000);
+        assert(calls.length == 1);
+
+        // Cleanup test
+        polling.disable();
+    }).timeout(2000);
 });