Merge pull request getredash#2349 from kravets-levko/fix/dashboard-is…

…sues Fix/dashboard issues
imloama · Feb 27, 2018 · 0e4313d · 0e4313d
2 parents e76e29d + 7d6244a
commit 0e4313d
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 33 deletions.
diff --git a/client/app/config/dashboard-grid-options.js b/client/app/config/dashboard-grid-options.js
@@ -2,7 +2,7 @@ const dashboardGridOptions = {
   columns: 6,
   pushing: true,
   floating: true,
-  swapping: true,
+  swapping: false,
   width: 'auto',
   colWidth: 'auto',
   rowHeight: 50,
@@ -12,9 +12,9 @@ const dashboardGridOptions = {
   isMobile: false,
   mobileBreakPoint: 800,
   mobileModeEnabled: true,
-  minColumns: 1,
+  minColumns: 6,
   minRows: 1,
-  maxRows: 100,
+  maxRows: 1000,
   defaultSizeX: 3,
   defaultSizeY: 3,
   minSizeX: 1,

diff --git a/client/app/directives/gridster-auto-height.js b/client/app/directives/gridster-auto-height.js
@@ -9,34 +9,36 @@ function gridsterAutoHeight($timeout) {
       let destroyed = false;
 
       function updateHeight() {
-        const wrapper = $element[0];
-        // Query element, but keep selector order
-        const element = _.chain(attr.gridsterAutoHeight.split(','))
-          .map(selector => wrapper.querySelector(selector))
-          .filter(_.isObject)
-          .first()
-          .value();
-        if (element) {
-          const childrenBounds = _.chain(element.children)
-            .map(child => child.getBoundingClientRect())
-            .reduce((result, bounds) => ({
-              left: Math.min(result.left, bounds.left),
-              top: Math.min(result.top, bounds.top),
-              right: Math.min(result.right, bounds.right),
-              bottom: Math.min(result.bottom, bounds.bottom),
-            }))
+        if (controller.gridster) {
+          const wrapper = $element[0];
+          // Query element, but keep selector order
+          const element = _.chain(attr.gridsterAutoHeight.split(','))
+            .map(selector => wrapper.querySelector(selector))
+            .filter(_.isObject)
+            .first()
             .value();
+          if (element) {
+            const childrenBounds = _.chain(element.children)
+              .map(child => child.getBoundingClientRect())
+              .reduce((result, bounds) => ({
+                left: Math.min(result.left, bounds.left),
+                top: Math.min(result.top, bounds.top),
+                right: Math.min(result.right, bounds.right),
+                bottom: Math.min(result.bottom, bounds.bottom),
+              }))
+              .value();
 
-          const additionalHeight = 100 + _.last(controller.gridster.margins);
-          const contentsHeight = childrenBounds.bottom - childrenBounds.top;
-          $timeout(() => {
-            controller.sizeY = Math.ceil((contentsHeight + additionalHeight) /
-              controller.gridster.curRowHeight);
-          });
-        }
+            const additionalHeight = 100 + _.last(controller.gridster.margins);
+            const contentsHeight = childrenBounds.bottom - childrenBounds.top;
+            $timeout(() => {
+              controller.sizeY = Math.ceil((contentsHeight + additionalHeight) /
+                controller.gridster.curRowHeight);
+            });
+          }
 
-        if (!destroyed) {
-          requestAnimationFrame(updateHeight);
+          if (!destroyed) {
+            requestAnimationFrame(updateHeight);
+          }
         }
       }
 

diff --git a/client/app/visualizations/cohort/index.js b/client/app/visualizations/cohort/index.js
@@ -19,6 +19,8 @@ const DEFAULT_OPTIONS = {
   stageColumn: 'day_number',
   totalColumn: 'total',
   valueColumn: 'value',
+
+  defaultRows: -1,
 };
 
 function groupData(sortedData) {
@@ -221,16 +223,13 @@ export default function init(ngModule) {
 
   ngModule.config((VisualizationProvider) => {
     const editTemplate = '<cohort-editor></cohort-editor>';
-    const defaultOptions = {
-      timeInterval: 'daily',
-    };
 
     VisualizationProvider.registerVisualization({
       type: 'COHORT',
       name: 'Cohort',
       renderTemplate: '<cohort-renderer options="visualization.options" query-result="queryResult"></cohort-renderer>',
       editorTemplate: editTemplate,
-      defaultOptions,
+      defaultOptions: DEFAULT_OPTIONS,
     });
   });
 }
diff --git a/client/app/visualizations/table/index.js b/client/app/visualizations/table/index.js
@@ -19,7 +19,7 @@ const DISPLAY_AS_OPTIONS = [
 
 const DEFAULT_OPTIONS = {
   itemsPerPage: 15,
-  defaultRows: 14,
+  defaultRows: -1,
   defaultColumns: 4,
   minColumns: 2,
 };

diff --git a/client/app/visualizations/word-cloud/index.js b/client/app/visualizations/word-cloud/index.js
@@ -97,12 +97,17 @@ export default function init(ngModule) {
   ngModule.directive('wordCloudEditor', wordCloudEditor);
   ngModule.directive('wordCloudRenderer', wordCloudRenderer);
 
+  const defaultOptions = {
+    defaultRows: -1,
+  };
+
   ngModule.config((VisualizationProvider) => {
     VisualizationProvider.registerVisualization({
       type: 'WORD_CLOUD',
       name: 'Word Cloud',
       renderTemplate: '<word-cloud-renderer options="visualization.options" query-result="queryResult"></word-cloud-renderer>',
       editorTemplate: '<word-cloud-editor></word-cloud-editor>',
+      defaultOptions,
     });
   });
 }