#905 Dashboard edit mode - keeping order & placeholders

metasfresh · Jun 26, 2017 · c17f1ed · c17f1ed
1 parent 4465ad7
commit c17f1ed
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/src/actions/BoardActions.js b/src/actions/BoardActions.js
@@ -39,11 +39,12 @@ export function filterCards(boardId, viewId) {
     );
 }
 
-export function addDashboardWidget(entity, id) {
+export function addDashboardWidget(entity, id, pos) {
     return axios.post(
         config.API_URL +
         '/dashboard/' + entity + '/new', {
-            'kpiId': id
+            'kpiId': id,
+            'position': pos
         }
     );
 }

diff --git a/src/components/charts/RawChart.js b/src/components/charts/RawChart.js
@@ -120,7 +120,7 @@ class RawChart extends Component {
                     <BarChart
                         {...{
                             data, groupBy, caption, chartType, height,
-                            fields, isMaximized, chartTitle
+                            fields, isMaximized, chartTitle, noData
                         }}
                         chartClass={'chart-' + id}
                         reRender={forceChartReRender}
@@ -134,7 +134,7 @@ class RawChart extends Component {
             case 'PieChart':
                 return(
                     <PieChart
-                        {...{data, fields, groupBy, height,
+                        {...{data, fields, groupBy, height, noData,
                             isMaximized, chartTitle}}
                         chartClass={'chart-' + id}
                         responsive={true}

diff --git a/src/components/dashboard/DraggableWrapper.js b/src/components/dashboard/DraggableWrapper.js
@@ -58,7 +58,7 @@ export class DraggableWrapper extends Component {
 
     addCard = (entity, id) => {
         const tmpItemIndex = this.state[entity].findIndex(i => i.id === id);
-        addDashboardWidget(this.getType(entity), id).then(res => {
+        addDashboardWidget(this.getType(entity), id, tmpItemIndex).then(res => {
             this.setState(prev => update(prev, {
                 [entity]: {
                     [tmpItemIndex]: {$set: res.data}
@@ -84,15 +84,16 @@ export class DraggableWrapper extends Component {
             const newItem = {
                 id: item.id,
                 fetchOnDrop: true,
-                text: "Metric",
-                caption: "New",
-                kpi: {chartType: "Indicator"}
+                kpi: {chartType: this.getType(entity)}
             };
             this.setState(prev => update(prev, {
                 [entity]: prev[entity].length === 0 ? {
                     $set: [newItem]
                 } : {
-                    $splice: [[dragIndex, 0, newItem]]
+                    $splice: [
+                        [dragIndex, 1],
+                        [hoverIndex, 0, newItem]
+                    ]
                 }
             }));
         }
@@ -222,7 +223,7 @@ export class DraggableWrapper extends Component {
                                 idMaximized={idMaximized}
                                 maximizeWidget={this.maximizeWidget}
                                 text={item.caption}
-                                noData={false}
+                                noData={item.fetchOnDrop}
                                 {...{editmode}}
                             />
                         </DndWidget>