CEC-2545 Fix/can signals context (#210)

src/components/Controls/SendCommand/Parameters.jsx

@@ -1,36 +1,6 @@
 import PropTypes from "prop-types";
 import {FormControl} from "@material-ui/core";
 import useStyles from "../../useStyles";
-import {MuiPickersUtilsProvider} from "@material-ui/pickers";
-import DateFnsUtils from "@date-io/date-fns";
-
-export const Dates = (
-  {
-    startDateFunc,
-    endDateFunc,
-    startDate,
-    handleStartChange,
-    endDate,
-    handleEndChange,
-  }) => {
-  if (startDateFunc && endDateFunc) {
-    return (<MuiPickersUtilsProvider utils={DateFnsUtils}>
-      {startDateFunc(startDate, handleStartChange)}
-      {endDateFunc(endDate, handleEndChange, startDate)}
-    </MuiPickersUtilsProvider>);
-  }
-
-  return null;
-}
-
-Dates.propTypes = {
-  startDateFunc: PropTypes.func,
-  endDateFunc: PropTypes.func,
-  startDate: PropTypes.instanceOf(Date),
-  handleStartChange: PropTypes.func,
-  endDate: PropTypes.instanceOf(Date),
-  handleEndChange: PropTypes.func
-}
 
 export const Parameters = (props) => {
   const {params} = props;
@@ -42,22 +12,12 @@ export const Parameters = (props) => {
   }
 
   const {data, handleDataChange} = props;
-  const {startDate, handleStartChange} = props;
-  const {endDate, handleEndChange} = props;
 
   return (
     <FormControl size="small" className={classes.formControl}>
       <div style={{width: "300px", marginTop: "1em"}}>
         {params.dataFunc(data, handleDataChange)}
       </div>
-      <Dates
-        startDateFunc={params.startDateFunc}
-        endDateFunc={params.endDateFunc}
-        startDate={startDate}
-        handleStartChange={handleStartChange}
-        endDate={endDate}
-        handleEndChange={handleEndChange}
-      ></Dates>
     </FormControl>
   )
 }
@@ -66,8 +26,4 @@ Parameters.propTypes = {
   params: PropTypes.any,
   data: PropTypes.any,
   handleDataChange: PropTypes.func,
-  startDate: PropTypes.instanceOf(Date),
-  handleStartChange: PropTypes.func,
-  endDate: PropTypes.instanceOf(Date),
-  handleEndChange: PropTypes.func
 };

src/components/Controls/SendCommand/Parameters.test.jsx

@@ -1,75 +1,10 @@
-jest.mock("@material-ui/pickers/MuiPickersUtilsProvider")
-
-
 import {render, waitFor} from "@testing-library/react";
-import {Dates, Parameters} from "./Parameters";
+import {Parameters} from "./Parameters";
 import addSnapshotSerializer from "../../../utils/snapshot";
 
-
-const date = Date.parse("2011-10-10T14:48:00")
-
-const renderDates = async (empty) => {
-  if (empty) {
-    await waitFor(() => {
-      /* render */
-    });
-    const { container } = render(<Dates startDateFunc={null} endDateFunc={null}/>)
-
-    return container;
-  }
-
-
-  const [start, setStart] = [date, (_) => {}];
-  const [end, setEnd] = [date, (_) => {}];
-
-  const handleStartChange = (val) => {
-    setStart(val)
-  }
-
-  const handleEndChange = (val) => {
-    setEnd(val)
-  }
-
-  await waitFor(() => {
-    /* render */
-  });
-
-  const {container} = render(
-    <div>
-      <Dates
-        startDateFunc={(val, handleValChange) => <div>{val.toString()}</div>}
-        endDateFunc={(val, handleValChange, prevVal) => <div>{val.toString()}, {prevVal.toString()}</div>}
-        startDate={start}
-        endDate={end}
-        handleStartChange={handleStartChange}
-        handleEndChange={handleEndChange}
-      />
-    </div>
-  )
-
-  return container
-}
-
-describe("Dates", () => {
-  beforeAll(() => {
-    addSnapshotSerializer(expect);
-  })
-
-  it("Render empty", async () => {
-    const container = await renderDates(true);
-    expect(container).toMatchSnapshot();
-  })
-
-  it("Render filled", async () => {
-    const container = await renderDates(false);
-    expect(container).toMatchSnapshot();
-  })
-})
-
 const renderState = {
   EMPTY: 0,
   JUST_DATA: 1,
-  WITH_DATE: 2,
 }
 
 const renderParameters = async (rs) => {
@@ -94,27 +29,6 @@ const renderParameters = async (rs) => {
 
     return container;
   }
-
-  params.startDateFunc = (val, handleValChange) => (<div>val.toString()</div>)
-  params.endDateFunc = (val, handleValChange, prevVal) => (<div>val.toString(), prevVal.toString()</div>)
-
-  const [start, handleStartChange] = [date, (_)=>{}];
-  const [end, handleEndChange] = [date, (_)=>{}];
-
-  if (rs===renderState.WITH_DATE) {
-    const {container} = render(<Parameters
-        params={params}
-        data={data}
-        handleDataChange={handleDataChange}
-        start={start}
-        handleStartChange={handleStartChange}
-        end={end}
-        handleEndChange={handleEndChange}
-      />
-    )
-
-    return container
-  }
 }
 
 
@@ -129,12 +43,7 @@ describe("Params", () => {
   })
 
   it("Render just data", async () => {
-    const container = await renderDates(renderState.JUST_DATA);
-    expect(container).toMatchSnapshot();
-  })
-
-  it("Render with date", async () => {
-    const container = await renderDates(renderState.WITH_DATE);
+    const container = await renderParameters(renderState.JUST_DATA);
     expect(container).toMatchSnapshot();
   })
 })

src/components/Controls/SendCommand/__snapshots__/Parameters.test.jsx.snap

@@ -1,24 +1,19 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Dates Render empty 1`] = `<div />`;
+exports[`Params Render empty 1`] = `<div />`;
 
-exports[`Dates Render filled 1`] = `
+exports[`Params Render just data 1`] = `
 <div>
-  <div>
-    <div>
-      1318258080000
-    </div>
-    <div>
-      1318258080000
-      , 
-      1318258080000
+  <div
+    class="MuiFormControl-root makeStyles-formControl-0"
+  >
+    <div
+      style="width: 300px; margin-top: 1em;"
+    >
+      <div>
+        val.toString()
+      </div>
     </div>
   </div>
 </div>
 `;
-
-exports[`Params Render empty 1`] = `<div />`;
-
-exports[`Params Render just data 1`] = `<div />`;
-
-exports[`Params Render with date 1`] = `<div />`;