Merge pull request #583 from erwindon/timers-off

timers are not always stopped when leaving a page

Author: erwindon

saltgui/static/scripts/issues/State.js

@@ -65,39 +65,41 @@ export class StateIssues extends Issues {
       jobs = jobs.slice(0, MAX_HIGHSTATE_JOBS);
     }
 
-    this.jobs = jobs;
+    pPanel.jobs = jobs;
     // this is good only while "State" is the only issue-provider that uses play/pause
     pPanel.setPlayPauseButton(jobs.length === 0 ? "none" : "play");
 
     this._updateNextJob(pPanel, pMsg, pKeys);
   }
 
   _updateNextJob (pPanel, pMsg, pKeys) {
-    if (!this.jobs) {
+    if (!pPanel.jobs) {
       return;
     }
-    if (!this.jobs.length) {
+    if (!pPanel.jobs.length) {
       // this is good only while "State" is the only issue-provider
       pPanel.setPlayPauseButton("none");
-      this.jobs = null;
+      pPanel.jobs = null;
       Issues.readyCategory(pPanel, pMsg);
       return;
     }
 
     if (pPanel.playOrPause !== "play") {
-      window.setTimeout(() => {
+      pPanel.issuesStateTimeout = window.setTimeout(() => {
+        pPanel.issuesStateTimeout = null;
         this._updateNextJob(pPanel, pMsg, pKeys);
       }, 1000);
       return;
     }
 
-    const job = this.jobs.pop();
+    const job = pPanel.jobs.pop();
 
     const runnerJobsListJobPromise = this.api.getRunnerJobsListJob(job.id);
 
     runnerJobsListJobPromise.then((pRunnerJobsListJobData) => {
       StateIssues._handleJobRunnerJobsListJob(pPanel, pRunnerJobsListJobData, pKeys);
-      window.setTimeout(() => {
+      pPanel.issuesStateTimeout = window.setTimeout(() => {
+        pPanel.issuesStateTimeout = null;
         this._updateNextJob(pPanel, pMsg, pKeys);
       }, 100);
       return true;

saltgui/static/scripts/pages/HighState.js

@@ -23,4 +23,8 @@ export class HighStatePage extends Page {
       this.jobs.handleSaltJobRetEvent(pData);
     }
   }
+
+  onHide () {
+    this.highstate.onHide();
+  }
 }

saltgui/static/scripts/pages/Issues.js

@@ -23,4 +23,8 @@ export class IssuesPage extends Page {
       this.jobs.handleSaltJobRetEvent(pData);
     }
   }
+
+  onHide () {
+    this.issues.onHide();
+  }
 }

saltgui/static/scripts/pages/Job.js

@@ -15,4 +15,8 @@ export class JobPage extends Page {
   handleSaltJobRetEvent (pData) {
     this.job.handleSaltJobRetEvent(pData);
   }
+
+  onHide () {
+    this.job.onHide();
+  }
 }

saltgui/static/scripts/pages/Jobs.js

@@ -15,4 +15,8 @@ export class JobsPage extends Page {
   handleSaltJobRetEvent (pData) {
     this.jobs.handleSaltJobRetEvent(pData);
   }
+
+  onHide () {
+    this.jobs.onHide();
+  }
 }

saltgui/static/scripts/pages/Logout.js

@@ -12,7 +12,7 @@ export class LogoutPage extends Page {
   onRegister () {
     // don't verify for invalid sessions too often
     // this happens only when the server was reset
-    this.logoutTimer = window.setInterval(() => {
+    this.logoutInterval = window.setInterval(() => {
       this._logoutTimer();
     }, 60000);
 
@@ -51,9 +51,9 @@ export class LogoutPage extends Page {
         // not to any regular api functions
         // may happen due to https://github.com/saltstack/salt/issues/59620
         // repeating this is not so useful
-        if (this.logoutTimer) {
-          clearInterval(this.logoutTimer);
-          this.logoutTimer = null;
+        if (this.logoutInterval) {
+          clearInterval(this.logoutInterval);
+          this.logoutInterval = null;
         }
         return;
       }

saltgui/static/scripts/pages/Nodegroups.js

@@ -31,4 +31,8 @@ export class NodegroupsPage extends Page {
     const nodegroups = Utils.getStorageItemObject("session", "nodegroups");
     return Object.keys(nodegroups).length > 0;
   }
+
+  onHide () {
+    this.nodegroups.onHide();
+  }
 }

saltgui/static/scripts/panels/HighState.js

@@ -85,6 +85,14 @@ export class HighStatePanel extends Panel {
     });
   }
 
+  onHide () {
+    if (this.nextJobTimeout) {
+      // stop the timer when nobody is looking
+      window.clearTimeout(this.nextJobTimeout);
+      this.nextJobTimeout = null;
+    }
+  }
+
   _addMenuItemStateApply (pMenu, pMinionId) {
     pMenu.addMenuItem("Apply state...", () => {
       const cmdArr = ["state.apply"];
@@ -205,7 +213,8 @@ export class HighStatePanel extends Panel {
       this._handleJob(job);
     }
 
-    window.setTimeout(() => {
+    this.nextJobTimeout = window.setTimeout(() => {
+      this.nextJobTimeout = null;
       this._updateNextJob();
     }, 1000);
   }

saltgui/static/scripts/panels/Issues.js

@@ -66,4 +66,15 @@ export class IssuesPanel extends Panel {
       Utils.addToolTip(this.msgDiv, pErrorMsg);
     });
   }
+
+  onHide () {
+    // from StateIssues
+    this.jobs = null;
+
+    if (this.issuesStateTimeout) {
+      // stop the timer when nobody is looking
+      window.clearTimeout(this.issuesStateTimeout);
+      this.issuesStateTimeout = null;
+    }
+  }
 }

saltgui/static/scripts/panels/Job.js

@@ -74,7 +74,8 @@ export class JobPanel extends Panel {
       return;
     }
 
-    window.setTimeout(() => {
+    this.refreshJobTimeout = window.setTimeout(() => {
+      this.refreshJobTimeout = null;
       if (this.playOrPause === "play") {
         this.onShow();
       } else {
@@ -118,6 +119,14 @@ export class JobPanel extends Panel {
     this.setPlayPauseButton(jobRefresh);
   }
 
+  onHide () {
+    if (this.refreshJobTimeout) {
+      // stop the timer when nobody is looking
+      window.clearTimeout(this.refreshJobTimeout);
+      this.refreshJobTimeout = null;
+    }
+  }
+
   static _isResultOk (result) {
     if (!result.success) {
       return false;