Merge pull request #67 from abaali/main

Deleted duplicated code

Author: Rperry2174

webapp/javascript/components/CustomDatePicker.jsx

@@ -2,20 +2,17 @@ import React, { useState, useEffect } from "react";
 import moment from "moment";
 import { useSelector } from "react-redux";
 import DatePicker from "react-datepicker";
-import {
-  readableRange,
-  fromConverter,
-  untilConverter,
-} from "../util/formatDate";
+import { readableRange, formatAsOBject } from "../util/formatDate";
 
 function CustomDatePicker({ setRange, dispatch, setDateRange }) {
   const from = useSelector((state) => state.from);
   const until = useSelector((state) => state.until);
+  const [warning, setWarning] = useState(false);
   const [selectedDate, setSelectedDate] = useState({
-    from: fromConverter(from).from,
-    until: untilConverter(until).until,
+    from: formatAsOBject(from),
+    until: formatAsOBject(until),
   });
-  const [warning, setWarning] = useState(false);
+
   const updateDateRange = () => {
     if (moment(selectedDate.from).isSameOrAfter(selectedDate.until)) {
       return setWarning(true);
@@ -32,11 +29,12 @@ function CustomDatePicker({ setRange, dispatch, setDateRange }) {
   useEffect(() => {
     setSelectedDate({
       ...selectedDate,
-      from: fromConverter(from).from,
-      until: untilConverter(until).until,
+      from: formatAsOBject(from),
+      until: formatAsOBject(until),
     });
     setRange(readableRange(from, until));
   }, [from, until]);
+
   return (
     <div>
       <h4>Custom Date Range</h4>

webapp/javascript/util/formatDate.js

@@ -47,24 +47,22 @@ export function readableRange(from, until) {
 }
 
 /**
- * taking state.from and state.until values
- * and converting it to a date object
+ * formateAsOBject() returns a Date object
+ * based on the passed-in parameter value
+ * which is either a Number repsenting a date
+ * or a default preset(example: "now-1h")
  * this is neccessary because the DatePicker component
  * from react-datepicker package has a property (selected)
  * that requires an input of type Date if we passed another
- * type the Component will give back an error and the app will crash
+ * type the Component will throw an error and the app will crash
  */
-export function fromConverter(from) {
-  if (/^now-/.test(from)) {
-    const { _from } = convertPresetsToDate(from);
-    return { from: _from * 1000 };
+export function formatAsOBject(value) {
+  if (/^now-/.test(value)) {
+    const { _from } = convertPresetsToDate(value);
+    return _from * 1000;
   }
-  return { from: moment(from * 1000).toDate() };
-}
-
-export function untilConverter(until) {
-  if (until === "now") {
-    return { until: moment().toDate() };
+  if (value === "now") {
+    return moment().toDate();
   }
-  return { until: moment(until * 1000).toDate() };
+  return moment(value * 1000).toDate();
 }