Merge pull request #122 from InetIntel/113-date-picker

Remove time selection form RangePicker to only select dates

Author: salcock

assets/js/Ioda/components/controlPanel/ControlPanel.js

@@ -54,15 +54,22 @@ class ControlPanel extends Component {
     this.setState({ customUnit: val });
   };
 
-  handleRangeChange = ([fromDayjs, untilDayjs]) => {
+  handleRangeChange = ([fromDayjs, untilDayjs], fromRangePicker = false) => {
+    if (fromRangePicker) {
+      // Adjust fromDayjs and untilDayjs to start of the day in UTC
+      fromDayjs = fromDayjs.startOf('day').utc();
+      untilDayjs = untilDayjs.startOf('day').utc();
+    }
+
     this.setState({ range: [fromDayjs, untilDayjs] }, () => {
       this.props.onTimeFrameChange({
-        from: getSeconds(fromDayjs.add(fromDayjs.utcOffset(), "minute")),
-        until: getSeconds(untilDayjs.add(untilDayjs.utcOffset(), "minute")),
+        from: getSeconds(fromDayjs.add(fromDayjs.utcOffset(), 'minute')),
+        until: getSeconds(untilDayjs.add(untilDayjs.utcOffset(), 'minute')),
       });
     });
   };
 
+
   handleCustomRange = () => {
     const { customDuration, customUnit } = this.state;
     const from = getNowAsUTC().subtract(customDuration, customUnit);
@@ -235,10 +242,7 @@ class ControlPanel extends Component {
             <RangePicker
               className="col"
               value={this.state.range}
-              showTime={{ format: "h:mmA" }}
-              format="MMM D YYYY h:mma UTC"
-              onChange={this.handleRangeChange}
-              onOk={this.handleRangeChange}
+              onChange={(dates) => this.handleRangeChange(dates, true)}
             />
           </div>
         </div>