fixed auto refresh based on comments

client/src/actions/RefreshActions.ts

@@ -2,7 +2,7 @@ import alt, { AbstractActions } from '../alt';
 import * as request from 'xhr-request';
 
 interface IRefreshActions {
-  updateInterval(newInterval: number): any;
+  updateInterval(newInterval: number): { refreshInterval: number };
   setRefreshTimer(newInterval: any, cb: any): void;
 }
 
@@ -22,25 +22,25 @@ class RefreshActions extends AbstractActions implements IRefreshActions {
   }
 
   setRefreshTimer(newInterval: any, cb: any) {
+    return (dispatch) => {
+      // clear any previously scheduled interval
+      if (this.runningRefreshInterval) {
+        clearInterval(this.runningRefreshInterval);
+        this.runningRefreshInterval = null;
+      }
 
-    // clear any previously scheduled interval
-    if (this.runningRefreshInterval) {
-      clearInterval(this.runningRefreshInterval);
-      this.runningRefreshInterval = null;
-    }
+      if (!newInterval || newInterval === -1) {
+        // don't auto refresh
+        return;
+      }
 
-    if (!newInterval || newInterval === -1) {
-      // don't auto refresh
-      return {};
-    }
+      // setup a new interval
+      var interval = setInterval(
+        cb,
+        newInterval);
 
-    // setup a new interval
-    var interval = setInterval(
-      cb,
-      newInterval);
-
-    this.runningRefreshInterval = interval;
-    return {};
+      this.runningRefreshInterval = interval;
+    };
   }
 }
 const refreshActions = alt.createActions<IRefreshActions>(RefreshActions);

client/src/components/Dashboard/index.tsx

@@ -61,6 +61,19 @@ interface IDashboardState {
 
 export default class Dashboard extends React.Component<IDashboardProps, IDashboardState> {
 
+  oneSecInMs = 1000;
+  oneMinInMs = 60 * this.oneSecInMs;
+  refreshIntervals = [
+    {text: 'None', intervalMs: -1},
+    {text: '30 Sec', intervalMs: 30 * this.oneSecInMs},
+    {text: '60 Sec', intervalMs: 60 * this.oneSecInMs},
+    {text: '90 Sec', intervalMs: 90 * this.oneSecInMs},
+    {text: '2 Min', intervalMs: 2 * this.oneMinInMs},
+    {text: '5 Min', intervalMs: 5 * this.oneMinInMs},
+    {text: '15 Min', intervalMs: 15 * this.oneMinInMs},
+    {text: '30 Min', intervalMs: 30 * this.oneMinInMs},
+  ];
+
   layouts = {};
 
   state = {
@@ -111,28 +124,8 @@ export default class Dashboard extends React.Component<IDashboardProps, IDashboa
   }
 
   handleRefreshIntervalChange = (refreshInterval: string) => {
-    var interval = -1; // default none
     var oneSec = 1000;
-    switch (refreshInterval) {
-      case '30 Sec': 
-        interval = 30 * oneSec;
-        break;
-      case '60 Sec': 
-        interval = 60 * oneSec;
-        break;
-      case '2 Min': 
-        interval = 2 * 60 * oneSec;
-        break;
-      case '5 Min': 
-        interval = 5 * 60 * oneSec;
-        break;
-      case '30 Min': 
-        interval = 30 * 60 * oneSec;
-        break;
-      default: 
-        interval = -1;
-        break;
-    }
+    var interval = this.refreshIntervals.find((x) => { return x.text === refreshInterval; }).intervalMs;
     
     RefreshActions.updateInterval(interval);
     RefreshActions.setRefreshTimer(
@@ -331,6 +324,7 @@ export default class Dashboard extends React.Component<IDashboardProps, IDashboa
     // Actions to perform on an active dashboard
     let toolbarActions = [];
 
+    let refreshDropDownTexts = this.refreshIntervals.map((x) => { return x.text; });
     if (!editMode) {
       toolbarActions.push(
         (
@@ -341,7 +335,7 @@ export default class Dashboard extends React.Component<IDashboardProps, IDashboa
               placeholder="0"
               defaultValue={'None'}
               position={SelectField.Positions.BELOW}
-              menuItems={['None', '30 Sec', '60 Sec', '2 Min', '5 Min', '30 Min']}
+              menuItems={refreshDropDownTexts}
               toolbar={false}
               onChange={this.handleRefreshIntervalChange}
               className="md-select-field--toolbar"