Add: ability to set dashboard level filters from UI

Closes getredash#1855.
karthikrk1 · Jun 29, 2017 · 248c540 · 248c540
1 parent 019a099
commit 248c540
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/client/app/pages/dashboards/dashboard.js b/client/app/pages/dashboards/dashboard.js
@@ -155,12 +155,20 @@ function DashboardCtrl($rootScope, $routeParams, $location, $timeout, $q, $uibMo
   };
 
   this.editDashboard = () => {
+    const previousFiltersState = this.dashboard.dashboard_filters_enabled;
     $uibModal.open({
       component: 'editDashboardDialog',
       resolve: {
         dashboard: () => this.dashboard,
       },
-    }).result.then((dashboard) => { this.dashboard = dashboard; });
+    }).result.then((dashboard) => {
+      const shouldRenderDashboard = !previousFiltersState && dashboard.dashboard_filters_enabled;
+      this.dashboard = dashboard;
+
+      if (shouldRenderDashboard) {
+        renderDashboard(this.dashboard);
+      }
+    });
   };
 
   this.addWidget = () => {

diff --git a/client/app/pages/dashboards/edit-dashboard-dialog.html b/client/app/pages/dashboards/edit-dashboard-dialog.html
@@ -7,6 +7,13 @@ <h4 class="modal-title">Edit: {{$ctrl.dashboard.name}}</h4>
     <input type="text" class="form-control" placeholder="Dashboard Name" ng-model="$ctrl.dashboard.name">
   </p>
 
+  <p ng-if="$ctrl.dashboard.id">
+    <label>
+        <input name="input" type="checkbox" ng-model="$ctrl.dashboard.dashboard_filters_enabled">
+        Use Dashboard Level Filters
+    </label>
+  </p>
+
   <div gridster="$ctrl.gridsterOptions" ng-if="$ctrl.items | notEmpty">
     <ul>
       <li gridster-item="item" ng-repeat="item in $ctrl.items" class="widget panel panel-default gs-w">

diff --git a/client/app/pages/dashboards/edit-dashboard-dialog.js b/client/app/pages/dashboards/edit-dashboard-dialog.js
@@ -67,6 +67,7 @@ const EditDashboardDialog = {
           slug: this.dashboard.id,
           name: this.dashboard.name,
           version: this.dashboard.version,
+          dashboard_filters_enabled: this.dashboard.dashboard_filters_enabled,
           layout: JSON.stringify(layout),
         };
 

diff --git a/redash/handlers/dashboards.py b/redash/handlers/dashboards.py
@@ -129,7 +129,7 @@ def post(self, dashboard_slug):
         require_object_modify_permission(dashboard, self.current_user)
 
         updates = project(dashboard_properties, ('name', 'layout', 'version',
-                                                 'is_draft'))
+                                                 'is_draft', 'dashboard_filters_enabled'))
 
         # SQLAlchemy handles the case where a concurrent transaction beats us
         # to the update. But we still have to make sure that we're not starting