From 973537fd9a60766a6ee99bd2e7080aa7db21f540 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Wed, 9 Nov 2016 14:52:39 -0800 Subject: [PATCH] [hotfix] resizing widgets --- caravel/assets/javascripts/dashboard/Dashboard.jsx | 6 +++--- .../assets/javascripts/dashboard/components/GridLayout.jsx | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/caravel/assets/javascripts/dashboard/Dashboard.jsx b/caravel/assets/javascripts/dashboard/Dashboard.jsx index b8e297b169b3f..06a4f3f547614 100644 --- a/caravel/assets/javascripts/dashboard/Dashboard.jsx +++ b/caravel/assets/javascripts/dashboard/Dashboard.jsx @@ -259,10 +259,10 @@ function dashboardContainer(dashboard) { const id = parseInt(sliceId, 10); let i = 0; let slice = null; - while (i < this.slices.length) { + while (i < this.sliceObjects.length) { // when the slice is found, assign to slice and break; - if (this.slices[i].data.slice_id === id) { - slice = this.slices[i]; + if (this.sliceObjects[i].data.slice_id === id) { + slice = this.sliceObjects[i]; break; } i++; diff --git a/caravel/assets/javascripts/dashboard/components/GridLayout.jsx b/caravel/assets/javascripts/dashboard/components/GridLayout.jsx index c29fb47596ef1..09057080d7906 100644 --- a/caravel/assets/javascripts/dashboard/components/GridLayout.jsx +++ b/caravel/assets/javascripts/dashboard/components/GridLayout.jsx @@ -5,7 +5,6 @@ import SliceCell from './SliceCell'; require('react-grid-layout/css/styles.css'); require('react-resizable/css/styles.css'); - const ResponsiveReactGridLayout = WidthProvider(Responsive); const propTypes = { @@ -47,7 +46,7 @@ class GridLayout extends React.Component { onResizeStop(layout, oldItem, newItem) { const newSlice = this.props.dashboard.getSlice(newItem.i); if (oldItem.w !== newItem.w || oldItem.h !== newItem.h) { - this.setState({ layout }, () => { newSlice.resize(); }); + this.setState({ layout }, () => newSlice.resize() ); } }