Draft
-
diff --git a/snprc_scheduler/src/client/components/TimelineGrid.jsx b/snprc_scheduler/src/client/components/TimelineGrid.jsx
index 03d0b639e..d576b289f 100644
--- a/snprc_scheduler/src/client/components/TimelineGrid.jsx
+++ b/snprc_scheduler/src/client/components/TimelineGrid.jsx
@@ -1,7 +1,7 @@
import React from "react";
import ReactDataGrid from "react-data-grid";
-import {Button, Modal, OverlayTrigger, Tooltip} from "react-bootstrap";
-// import DraggableContainer from "./dnd/DraggableContainer";
+import { Button, Modal, OverlayTrigger, Tooltip } from "react-bootstrap";
+import { DraggableContainer } from "./dnd/DraggableContainer";
import Moment from 'react-moment';
import {
addTimelineItem,
@@ -89,10 +89,15 @@ class TimelineGrid extends React.Component {
procNote: "",
rowId: undefined,
revisionNum: undefined,
- day0: ""
+ day0: "",
+ key: 0
}
}
+ getGridKey = () => {
+ return Math.random();
+ };
+
CheckBoxFormatter = (colKey) => {
return ((props) => {
@@ -277,7 +282,8 @@ class TimelineGrid extends React.Component {
})
this.setState(Object.assign({}, this.state, {
- rows: newRows
+ rows: newRows,
+ key: this.getGridKey()
}));
this.props.selectedTimeline.forceReload = false;
@@ -412,6 +418,7 @@ class TimelineGrid extends React.Component {
allRows = newState.rows;
newState.columns = sortedCols;
+ newState.key = this.getGridKey();
this.setState(Object.assign({}, this.state, newState));
}
@@ -488,6 +495,7 @@ class TimelineGrid extends React.Component {
stateCopy.showProcNote = false;
stateCopy.procNoteName = "";
stateCopy.rows = newRows;
+ stateCopy.key = this.getGridKey();
this.setState(stateCopy);
@@ -524,6 +532,7 @@ class TimelineGrid extends React.Component {
this.setState(state => {
state.rows = filteredRows;
+ state.key = this.getGridKey();
return state;
});
@@ -563,8 +572,9 @@ class TimelineGrid extends React.Component {
}
state.rows = newRows;
+ state.key = this.getGridKey();
return state;
- })
+ });
this.props.onAssignTimelineProcedure({
Value: rowCopy[column.key],
@@ -590,7 +600,7 @@ class TimelineGrid extends React.Component {
this.props.onUpdateTimelineDayZero(selectedTimeline.StudyDay0, true, true);
}
- const stateCopy = {rows: [...rows]};
+ const stateCopy = {rows: [...rows], key: this.getGridKey()};
this.setState(stateCopy);
};
@@ -614,6 +624,7 @@ class TimelineGrid extends React.Component {
this.props.onAddTimelineItem(newRow);
stateCopy.rows.push(newRow);
+ stateCopy.key = this.getGridKey();
this.setState(stateCopy);
@@ -645,7 +656,8 @@ class TimelineGrid extends React.Component {
this.setState(emptyColumns);
const reorderedColumns = Object.assign({}, this.state, {
- columns: stateCopy.columns
+ columns: stateCopy.columns,
+ key: this.getGridKey()
});
this.setState(reorderedColumns);
@@ -668,7 +680,7 @@ class TimelineGrid extends React.Component {
};
setSort = (sortColumn, sortDirection) => {
- this.sortRows(this.state.rows, sortColumn, sortDirection, true);
+ this.sortRows(this.state.rows, sortColumn, undefined, sortDirection, true);
};
sortRows = (initialRows, sortColumn, sortMinorColumn, sortDirection, setState) => {
@@ -724,7 +736,8 @@ class TimelineGrid extends React.Component {
this.setState(Object.assign({}, this.state, {
rows: sortedRows,
sortDirection: sortDirection,
- sortColumn: sortColumn
+ sortColumn: sortColumn,
+ key: this.getGridKey()
}));
}
@@ -778,7 +791,7 @@ class TimelineGrid extends React.Component {