Merge pull request getredash#2268 from getredash/dashboard-refresh-in…

…terval Make dashboard refresh intervals configurable
KiiCorp · Jan 30, 2018 · e2042b1 · e2042b1
2 parents 817f2ba + a557d9f
commit e2042b1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/client/app/filters/index.js b/client/app/filters/index.js
@@ -9,16 +9,20 @@ export function durationHumanize(duration) {
     humanized = '-';
   } else if (duration < 60) {
     const seconds = Math.round(duration);
-    humanized = `${seconds}s`;
+    humanized = `${seconds} seconds`;
   } else if (duration > 3600 * 24) {
     const days = Math.round(parseFloat(duration) / 60.0 / 60.0 / 24.0);
-    humanized = `${days}days`;
+    humanized = `${days} days`;
+  } else if (duration === 3600) {
+    humanized = '1 hour';
   } else if (duration >= 3600) {
     const hours = Math.round(parseFloat(duration) / 60.0 / 60.0);
-    humanized = `${hours}h`;
+    humanized = `${hours} hours`;
+  } else if (duration === 60) {
+    humanized = '1 minute';
   } else {
     const minutes = Math.round(parseFloat(duration) / 60.0);
-    humanized = `${minutes}m`;
+    humanized = `${minutes} minutes`;
   }
   return humanized;
 }

diff --git a/client/app/pages/dashboards/dashboard.js b/client/app/pages/dashboards/dashboard.js
@@ -1,5 +1,6 @@
 import * as _ from 'underscore';
 import PromiseRejectionError from '@/lib/promise-rejection-error';
+import { durationHumanize } from '@/filters';
 import template from './dashboard.html';
 import shareDashboardTemplate from './share-dashboard.html';
 import './dashboard.less';
@@ -79,6 +80,9 @@ function DashboardCtrl(
     { name: '24 hour', rate: 24 * 60 * 60 },
   ];
 
+  this.refreshRates =
+    clientConfig.dashboardRefreshIntervals.map(interval => ({ name: durationHumanize(interval), rate: interval }));
+
   $rootScope.$on('gridster-mobile-changed', ($event, gridster) => {
     this.isGridDisabled = gridster.isMobile;
   });

diff --git a/redash/handlers/authentication.py b/redash/handlers/authentication.py
@@ -175,7 +175,8 @@ def client_config():
         'autoPublishNamedQueries': settings.FEATURE_AUTO_PUBLISH_NAMED_QUERIES,
         'dateFormat': date_format,
         'dateTimeFormat': "{0} HH:mm".format(date_format),
-        'mailSettingsMissing': settings.MAIL_DEFAULT_SENDER is None
+        'mailSettingsMissing': settings.MAIL_DEFAULT_SENDER is None,
+        'dashboardRefreshIntervals': settings.DASHBOARD_REFRESH_INTERVALS
     }
 
     client_config.update(defaults)

diff --git a/redash/settings/__init__.py b/redash/settings/__init__.py
@@ -202,6 +202,7 @@ def all_settings():
 # Client side toggles:
 ALLOW_SCRIPTS_IN_USER_INPUT = parse_boolean(os.environ.get("REDASH_ALLOW_SCRIPTS_IN_USER_INPUT", "false"))
 DATE_FORMAT = os.environ.get("REDASH_DATE_FORMAT", "DD/MM/YY")
+DASHBOARD_REFRESH_INTERVALS = map(int, array_from_string(os.environ.get("REDASH_DASHBOARD_REFRESH_INTERVALS", "60,300,600,1800,3600,43200,86400")))
 
 # Features:
 VERSION_CHECK = parse_boolean(os.environ.get("REDASH_VERSION_CHECK", "true"))