Merge pull request #2105 from kravets-levko/fix/visualization-filters

Fixes related to filters panel
getredash · Nov 28, 2017 · 4a06e62 · 4a06e62
2 parents 01cf6de + 0d1ad21
commit 4a06e62
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/client/app/components/filters.html b/client/app/components/filters.html
@@ -1,10 +1,10 @@
-<div class="container bg-white p-5" ng-show="$ctrl.filters | notEmpty">
-  <div class="row">
+<div class="container bg-white" ng-show="$ctrl.filters | notEmpty" style="padding: 5px;">
+  <div class="row" style="margin-left: -5px; margin-right: -5px;">
     <div class="col-sm-6 m-t-5" ng-repeat="filter in $ctrl.filters">
       <label>{{filter.friendlyName}}</label>
     </div>
   </div>
-  <div class="row">
+  <div class="row" style="margin-left: -5px; margin-right: -5px;">
     <div class="col-sm-6 m-t-5" ng-repeat="filter in $ctrl.filters">
       <ui-select ng-model="filter.current" ng-if="!filter.multiple" on-select="$ctrl.filterChangeListener(filter, $model)" on-remove="$ctrl.filterChangeListener(filter, $model)"
         remove-selected="false">
@@ -31,4 +31,4 @@
       </ui-select>
     </div>
   </div>
-</div>
+</div>
diff --git a/client/app/pages/dashboards/dashboard.less b/client/app/pages/dashboards/dashboard.less
@@ -56,6 +56,26 @@
     }
 
     .gridster-item:not(.gridster-auto-height-enabled) {
+      visualization-renderer {
+        display: flex;
+        flex-direction: column;
+        position: absolute;
+        left: 0;
+        top: 0;
+        right: 0;
+        bottom: 0;
+
+        > filters {
+          flex-grow: 0;
+        }
+
+        > div {
+          flex-grow: 1;
+          position: relative;
+        }
+      }
+
+      .dynamic-table-container,
       .sunburst-visualization-container,
       .sankey-visualization-container,
       .map-visualization-container,