diff --git a/.env.dev b/.env.dev index add2ed2..b51cbe0 100644 --- a/.env.dev +++ b/.env.dev @@ -2,4 +2,4 @@ REACT_APP_CERT_SERVICE_URL=https://dev-gw.cloud.fiskerinc.com/certificate REACT_APP_AUTH_SERVICE_URL=https://dev-gw.cloud.fiskerinc.com/compute_auth REACT_APP_UPLOAD_SERVICE_URL=https://dev-gw.cloud.fiskerinc.com/ota_update REACT_APP_AUTH_CALLBACK_URL=https://dev-ota-admin.cloud.fiskerinc.com -REACT_APP_SUPERSET_URL=https://dev-superset.cloud.fiskerinc.com +REACT_APP_SUPERSET_URL=https://superset-dev.cloud.fiskerinc.com/superset/dashboard/8/?native_filters_key=KPnPthpLQ8rT--6PUdsPzQAcwnleRGHk_3dg0PVYfrXc3SE6zZ2x0p7JuerAZ0Pg diff --git a/.env.local b/.env.local index e8d2226..5b55344 100644 --- a/.env.local +++ b/.env.local @@ -2,4 +2,4 @@ REACT_APP_AUTH_SERVICE_URL=http://localhost/compute_auth REACT_APP_CERT_SERVICE_URL=http://localhost/certificate REACT_APP_UPLOAD_SERVICE_URL=http://localhost/ota_update REACT_APP_AUTH_CALLBACK_URL=http://localhost:3000 -REACT_APP_SUPERSET_URL=https://dev-superset.cloud.fiskerinc.com +REACT_APP_SUPERSET_URL=https://superset-dev.cloud.fiskerinc.com/superset/dashboard/8/?native_filters_key=KPnPthpLQ8rT--6PUdsPzQAcwnleRGHk_3dg0PVYfrXc3SE6zZ2x0p7JuerAZ0Pg diff --git a/.env.prd b/.env.prd index d8ce7fe..b8da28c 100644 --- a/.env.prd +++ b/.env.prd @@ -2,4 +2,4 @@ REACT_APP_AUTH_SERVICE_URL=https://gw.cloud.fiskerinc.com/compute_auth REACT_APP_CERT_SERVICE_URL=https://gw.cloud.fiskerinc.com/certificate REACT_APP_UPLOAD_SERVICE_URL=https://gw.cloud.fiskerinc.com/ota_update REACT_APP_AUTH_CALLBACK_URL=https://ota-admin.cloud.fiskerinc.com -REACT_APP_SUPERSET_URL=https://superset.cloud.fiskerinc.com +REACT_APP_SUPERSET_URL=https://superset.cloud.fiskerinc.com/superset/dashboard/9/?native_filters_key=mfJ1VjGTcLUKz7gQs_DgClZhjcdNucYMrPruNibcyDnhkDwdHbAumBRVTpA5tFH_ diff --git a/.env.stg b/.env.stg index 70fac71..224b2c2 100644 --- a/.env.stg +++ b/.env.stg @@ -2,4 +2,4 @@ REACT_APP_AUTH_SERVICE_URL=https://stg-gw.cloud.fiskerinc.com/compute_auth REACT_APP_CERT_SERVICE_URL=https://stg-gw.cloud.fiskerinc.com/certificate REACT_APP_UPLOAD_SERVICE_URL=https://stg-gw.cloud.fiskerinc.com/ota_update REACT_APP_AUTH_CALLBACK_URL=https://stg-ota-admin.cloud.fiskerinc.com -REACT_APP_SUPERSET_URL=https://stg-superset.cloud.fiskerinc.com +REACT_APP_SUPERSET_URL=https://stg-superset.cloud.fiskerinc.com/superset/dashboard/6/?native_filters_key=XBwRgJIvmxhqBhqlz45kuTnXc1iUY_M_ovzXCzXy5_l-AOFAXEaGLWpYIsfrEHGR diff --git a/src/components/App/App.test.js b/src/components/App/App.test.js index b78ce25..1c40617 100644 --- a/src/components/App/App.test.js +++ b/src/components/App/App.test.js @@ -17,6 +17,7 @@ import { import { setToken } from "../Contexts/UserContext"; import { TEST_AUTH_OBJECT } from "../../utils/testing"; import App from "."; +import addSnapshotSerializer from "../../utils/snapshot"; const LOADING_STATUS = "Loading..."; @@ -43,32 +44,8 @@ const sleepAndCheck = async (path, selector, compare) => { }; describe("App", () => { - const rxMakeStyles = /makeStyles-(\w+)-(\d+)/gi; - beforeAll(() => { - // Stablize Table Pagination control ids - expect.addSnapshotSerializer({ - test: function (val) { - return val && typeof val === "string" && val.indexOf("mui-") > -1; - }, - print: function (val) { - let str = val; - str = str.replace(/mui-\d*/g, "mui-00000"); - - return `"${str}"`; - }, - }); - expect.addSnapshotSerializer({ - test: (val) => { - return val && typeof val === "string" && val.search(rxMakeStyles) > -1; - }, - print: function (val) { - let str = val; - str = str.replace(rxMakeStyles, "makeStyles-$1-0000"); - - return `"${str}"`; - }, - }); + addSnapshotSerializer(expect); }, 60000); afterEach(() => { @@ -132,6 +109,10 @@ describe("App", () => { await check("/tools/certificates/add", "span.MuiButton-label", "Sign In"); }); + it("Route /tools/sms/send unauthenticated", async () => { + await check("/tools/sms/send", "span.MuiButton-label", "Sign In"); + }); + it("Route /page-not-found unauthenticated", async () => { await check("/page-not-found", "h1", "Page Not Found"); }); @@ -189,4 +170,9 @@ describe("App", () => { setToken(TEST_AUTH_OBJECT); await check("/tools/certificates/add", "h6", "Create Certificate"); }); + + it("Route /tools/sms/send authenticated", async () => { + setToken(TEST_AUTH_OBJECT); + await check("/tools/sms/send", "h6", "Send SMS"); + }); }); diff --git a/src/components/App/__snapshots__/App.test.js.snap b/src/components/App/__snapshots__/App.test.js.snap index e5d83d8..ed2846f 100644 --- a/src/components/App/__snapshots__/App.test.js.snap +++ b/src/components/App/__snapshots__/App.test.js.snap @@ -6,10 +6,10 @@ exports[`App Route / authenticated 1`] = ` data-testid="mocked-userprovider" >
Fisker Admin Portal
@@ -212,12 +212,10 @@ exports[`App Route / authenticated 1`] = `
    • +
  • + +
    + + SMS + +
    + +     +
    • Leaflet - | © + | © @@ -448,10 +468,10 @@ exports[`App Route / unauthenticated 1`] = ` data-testid="mocked-userprovider" >
    @@ -504,10 +524,10 @@ exports[`App Route /home authenticated 1`] = ` data-testid="mocked-userprovider" >
    Fisker Admin Portal
    @@ -710,12 +730,10 @@ exports[`App Route /home authenticated 1`] = `
    • +
  • + +
    + + SMS + +
    + +     +
    • Leaflet - | © + | © @@ -946,10 +986,10 @@ exports[`App Route /home unauthenticated 1`] = ` data-testid="mocked-userprovider" >
    @@ -1002,10 +1042,10 @@ exports[`App Route /package-create authenticated 1`] = ` data-testid="mocked-userprovider" >
    Fisker Admin Portal
    @@ -1244,12 +1284,10 @@ exports[`App Route /package-create authenticated 1`] = `
    • +
  • + +
    + + SMS + +
    + +     +
    • VIN sorted ascending @@ -3172,7 +3252,7 @@ exports[`App Route /package-deploy authenticated 1`] = ` />

    Rows per page:

    @@ -3182,7 +3262,7 @@ exports[`App Route /package-deploy authenticated 1`] = `

    Rows per page:

    @@ -3845,7 +3945,7 @@ exports[`App Route /package-status authenticated 1`] = `
    ID sorted ascending @@ -4648,7 +4768,7 @@ exports[`App Route /packages authenticated 1`] = ` />

    Rows per page:

    @@ -4658,7 +4778,7 @@ exports[`App Route /packages authenticated 1`] = `
    +
    +`; + +exports[`App Route /tools/sms/send authenticated 1`] = ` +
    +
    +
    +
    +
    +
    +
    + Send SMS +
    + +
    +
    + +
    +
    +
    +
    +
    +
    + Fisker Admin Portal +
    +
    + +
    +
    +
    +
    +
    +
    + +
    + +
    + + +
    +
    +
    + +
    + + +
    +
    + + + +
    +
    +
    +
    +
    +
    +`; + +exports[`App Route /tools/sms/send unauthenticated 1`] = ` +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + @@ -5925,10 +6681,10 @@ exports[`App Route /vehicle-add authenticated 1`] = ` data-testid="mocked-userprovider" >
    Fisker Admin Portal
    @@ -6167,12 +6923,10 @@ exports[`App Route /vehicle-add authenticated 1`] = `
    • +
  • + +
    + + SMS + +
    + +     +
    • @@ -7672,10 +8444,10 @@ exports[`App Route /vehicle-status unauthenticated 1`] = ` data-testid="mocked-userprovider" >
    @@ -7728,10 +8500,10 @@ exports[`App Route /vehicle-status/vin/carupdateid unauthenticated 1`] = ` data-testid="mocked-userprovider" >
    @@ -7784,10 +8556,10 @@ exports[`App Route /vehicles authenticated 1`] = ` data-testid="mocked-userprovider" >
    Fisker Admin Portal
    @@ -7990,12 +8762,10 @@ exports[`App Route /vehicles authenticated 1`] = `
    • +
  • + +
    + + SMS + +
    + +     +
    • VIN sorted ascending @@ -8365,7 +9157,7 @@ exports[`App Route /vehicles authenticated 1`] = ` />

    Rows per page:

    @@ -8375,7 +9167,7 @@ exports[`App Route /vehicles authenticated 1`] = `
    + + + Timestamp + Signal + Value + + + + {signals.map((signal, i) => ( + + {signal.timestamp} + {signal.signal} + {signal.value} + + ))} + +
    + ); +}; + +export default CANSignals; diff --git a/src/components/Cars/List/__snapshots__/index.test.jsx.snap b/src/components/Cars/List/__snapshots__/index.test.jsx.snap index a85e3fe..11f684d 100644 --- a/src/components/Cars/List/__snapshots__/index.test.jsx.snap +++ b/src/components/Cars/List/__snapshots__/index.test.jsx.snap @@ -15,13 +15,13 @@ exports[`VehicleTable Render 1`] = ` data-testid="mocked-vehicleprovider" >
    VIN sorted ascending diff --git a/src/components/Cars/List/index.test.jsx b/src/components/Cars/List/index.test.jsx index 64cf8db..08b6335 100644 --- a/src/components/Cars/List/index.test.jsx +++ b/src/components/Cars/List/index.test.jsx @@ -1,8 +1,8 @@ jest.mock("../../Contexts/VehicleContext"); jest.mock("../../Contexts/StatusContext"); jest.mock("../../Contexts/UserContext"); -jest.mock('@material-ui/core/utils/unstable_useId', () => - jest.fn().mockReturnValue('mui-test-id'), +jest.mock("@material-ui/core/utils/unstable_useId", () => + jest.fn().mockReturnValue("mui-test-id") ); import { render, waitFor } from "@testing-library/react"; @@ -12,7 +12,8 @@ import { VehicleProvider } from "../../Contexts/VehicleContext"; import { StatusProvider } from "../../Contexts/StatusContext"; import { UserProvider, setToken } from "../../Contexts/UserContext"; import { TEST_AUTH_OBJECT } from "../../../utils/testing"; -import MainForm from "./index" +import MainForm from "./index"; +import addSnapshotSerializer from "../../../utils/snapshot"; const renderVehicleTable = async () => { const { container } = render( @@ -26,11 +27,17 @@ const renderVehicleTable = async () => { ); - await waitFor(() => { /* render */ }); + await waitFor(() => { + /* render */ + }); return container; }; describe("VehicleTable", () => { + beforeAll(() => { + addSnapshotSerializer(expect); + }); + it("Render", async () => { setToken(TEST_AUTH_OBJECT); const container = await renderVehicleTable(); diff --git a/src/components/Cars/Status/CANFiltersTab.test.jsx b/src/components/Cars/Status/CANFiltersTab.test.jsx index e292f95..f7ac32d 100644 --- a/src/components/Cars/Status/CANFiltersTab.test.jsx +++ b/src/components/Cars/Status/CANFiltersTab.test.jsx @@ -1,8 +1,8 @@ jest.mock("../../Contexts/CANFiltersContext"); jest.mock("../../Contexts/StatusContext"); jest.mock("../../Contexts/UserContext"); -jest.mock('@material-ui/core/utils/unstable_useId', () => - jest.fn().mockReturnValue('mui-test-id'), +jest.mock("@material-ui/core/utils/unstable_useId", () => + jest.fn().mockReturnValue("mui-test-id") ); import { render, waitFor } from "@testing-library/react"; @@ -10,7 +10,8 @@ import { BrowserRouter } from "react-router-dom"; import { setToken } from "../../Contexts/UserContext"; import { TEST_AUTH_OBJECT } from "../../../utils/testing"; -import CANFiltersTab from "./CANFiltersTab" +import CANFiltersTab from "./CANFiltersTab"; +import addSnapshotSerializer from "../../../utils/snapshot"; const renderCANFiltersTab = async () => { const { container } = render( @@ -18,11 +19,17 @@ const renderCANFiltersTab = async () => { ); - await waitFor(() => { /* render */ }); + await waitFor(() => { + /* render */ + }); return container; }; describe("CANFiltersTab", () => { + beforeAll(() => { + addSnapshotSerializer(expect); + }); + it("Render", async () => { setToken(TEST_AUTH_OBJECT); const container = await renderCANFiltersTab(); diff --git a/src/components/Cars/Status/CANSignalsTab.jsx b/src/components/Cars/Status/CANSignalsTab.jsx new file mode 100644 index 0000000..ad35df1 --- /dev/null +++ b/src/components/Cars/Status/CANSignalsTab.jsx @@ -0,0 +1,35 @@ +import React from "react"; +import clsx from "clsx"; +import { Typography } from "@material-ui/core"; + +import useStyles from "../../useStyles"; +import { useUserContext } from "../../Contexts/UserContext"; +import CANSignals from "../CANSignals"; +import { VehicleProvider } from "../../Contexts/VehicleContext"; + +const Main = (props) => { + const { + token: { + idToken: { jwtToken: token }, + }, + } = useUserContext(); + const classes = useStyles(); + const { vin } = props; + + return ( +
    + + CAN Signals + + +
    + ); +}; + +const CANSignalsTab = (props) => ( + +
    + +); + +export default CANSignalsTab; diff --git a/src/components/Cars/Status/CarUpdatesTab.test.jsx b/src/components/Cars/Status/CarUpdatesTab.test.jsx index 436dea2..291be4b 100644 --- a/src/components/Cars/Status/CarUpdatesTab.test.jsx +++ b/src/components/Cars/Status/CarUpdatesTab.test.jsx @@ -1,8 +1,8 @@ jest.mock("../../Contexts/CANFiltersContext"); jest.mock("../../Contexts/StatusContext"); jest.mock("../../Contexts/UserContext"); -jest.mock('@material-ui/core/utils/unstable_useId', () => - jest.fn().mockReturnValue('mui-test-id'), +jest.mock("@material-ui/core/utils/unstable_useId", () => + jest.fn().mockReturnValue("mui-test-id") ); import { render, waitFor } from "@testing-library/react"; @@ -12,7 +12,8 @@ import { CANFiltersProvider } from "../../Contexts/CANFiltersContext"; import { StatusProvider } from "../../Contexts/StatusContext"; import { UserProvider, setToken } from "../../Contexts/UserContext"; import { TEST_AUTH_OBJECT } from "../../../utils/testing"; -import MainForm from "./CarUpdatesTab" +import MainForm from "./CarUpdatesTab"; +import addSnapshotSerializer from "../../../utils/snapshot"; const renderCarUpdatesTab = async () => { const { container } = render( @@ -26,11 +27,17 @@ const renderCarUpdatesTab = async () => { ); - await waitFor(() => { /* render */ }); + await waitFor(() => { + /* render */ + }); return container; }; describe("CarUpdatesTab", () => { + beforeAll(() => { + addSnapshotSerializer(expect); + }); + it("Render", async () => { setToken(TEST_AUTH_OBJECT); const container = await renderCarUpdatesTab(); diff --git a/src/components/Cars/Status/Details/__snapshots__/index.test.jsx.snap b/src/components/Cars/Status/Details/__snapshots__/index.test.jsx.snap index ae78611..3dcc0a7 100644 --- a/src/components/Cars/Status/Details/__snapshots__/index.test.jsx.snap +++ b/src/components/Cars/Status/Details/__snapshots__/index.test.jsx.snap @@ -15,13 +15,13 @@ exports[`VehicleDetailsTab Render 1`] = ` data-testid="mocked-vehicleprovider" >

    @@ -38,7 +38,7 @@ exports[`VehicleDetailsTab Render 1`] = `

    CANBus @@ -80,7 +80,7 @@ exports[`VehicleDetailsTab Render 1`] = `

    { const { container } = render( @@ -23,11 +24,17 @@ const renderVehicleDetailsTab = async () => { ); - await waitFor(() => { /* render */ }); + await waitFor(() => { + /* render */ + }); return container; }; describe("VehicleDetailsTab", () => { + beforeAll(() => { + addSnapshotSerializer(expect); + }); + it("Render", async () => { setToken(TEST_AUTH_OBJECT); const container = await renderVehicleDetailsTab(); diff --git a/src/components/Cars/Status/DetailsTab.test.jsx b/src/components/Cars/Status/DetailsTab.test.jsx index 06c7a1f..4057a10 100644 --- a/src/components/Cars/Status/DetailsTab.test.jsx +++ b/src/components/Cars/Status/DetailsTab.test.jsx @@ -1,8 +1,8 @@ jest.mock("../../Contexts/VehicleContext"); jest.mock("../../Contexts/StatusContext"); jest.mock("../../Contexts/UserContext"); -jest.mock('@material-ui/core/utils/unstable_useId', () => - jest.fn().mockReturnValue('mui-test-id'), +jest.mock("@material-ui/core/utils/unstable_useId", () => + jest.fn().mockReturnValue("mui-test-id") ); import { render, waitFor } from "@testing-library/react"; @@ -12,27 +12,34 @@ import { VehicleProvider } from "../../Contexts/VehicleContext"; import { StatusProvider } from "../../Contexts/StatusContext"; import { UserProvider, setToken } from "../../Contexts/UserContext"; import { TEST_AUTH_OBJECT } from "../../../utils/testing"; -import MainForm from "./DetailsTab" +import MainForm from "./DetailsTab"; +import addSnapshotSerializer from "../../../utils/snapshot"; const renderDetailsTab = async () => { const { container } = render( - + - + ); - await waitFor(() => { /* render */ }); + await waitFor(() => { + /* render */ + }); return container; }; describe("DetailsTab", () => { + beforeAll(() => { + addSnapshotSerializer(expect); + }); + it("Render", async () => { setToken(TEST_AUTH_OBJECT); const container = await renderDetailsTab(); diff --git a/src/components/Cars/Status/DigitalTwinTab.test.jsx b/src/components/Cars/Status/DigitalTwinTab.test.jsx index 164d5d0..aa9c27a 100644 --- a/src/components/Cars/Status/DigitalTwinTab.test.jsx +++ b/src/components/Cars/Status/DigitalTwinTab.test.jsx @@ -12,6 +12,7 @@ import { StatusProvider } from "../../Contexts/StatusContext"; import { UserProvider, setToken } from "../../Contexts/UserContext"; import { TEST_AUTH_OBJECT } from "../../../utils/testing"; import DigitalTwinTab from "./DigitalTwinTab"; +import addSnapshotSerializer from "../../../utils/snapshot"; const renderDetailsTab = async () => { const { container } = render( @@ -28,6 +29,10 @@ const renderDetailsTab = async () => { }; describe("DigitalTwinTab", () => { + beforeAll(() => { + addSnapshotSerializer(expect); + }); + it("Render", async () => { setToken(TEST_AUTH_OBJECT); const container = await renderDetailsTab(); diff --git a/src/components/Cars/Status/__snapshots__/CANFiltersTab.test.jsx.snap b/src/components/Cars/Status/__snapshots__/CANFiltersTab.test.jsx.snap index 9262594..5aca30a 100644 --- a/src/components/Cars/Status/__snapshots__/CANFiltersTab.test.jsx.snap +++ b/src/components/Cars/Status/__snapshots__/CANFiltersTab.test.jsx.snap @@ -3,7 +3,7 @@ exports[`CANFiltersTab Render 1`] = `
    Car ECUs
    ECU sorted descending diff --git a/src/components/Cars/Status/__snapshots__/DetailsTab.test.jsx.snap b/src/components/Cars/Status/__snapshots__/DetailsTab.test.jsx.snap index 0c0ee83..3c50755 100644 --- a/src/components/Cars/Status/__snapshots__/DetailsTab.test.jsx.snap +++ b/src/components/Cars/Status/__snapshots__/DetailsTab.test.jsx.snap @@ -12,7 +12,7 @@ exports[`DetailsTab Render 1`] = ` data-testid="mocked-userprovider" >

    @@ -47,7 +47,7 @@ exports[`DetailsTab Render 1`] = `

    CANBus @@ -89,7 +89,7 @@ exports[`DetailsTab Render 1`] = `

    -
    -
    -
    -
    -
    - Digital Twin -
    -
    - - Connected - - : - false -
    -
    -

    - - Battery - - : - 95% -

    -
    -

    - Doors -

    -

    - - hood - - : - closed -

    -

    - - left_front - - : - closed -

    -

    - - left_rear - - : - closed -

    -

    - - right_front - - : - closed -

    -

    - - right_rear - - : - closed -

    -

    - - trunk - - : - closed -

    -
    -
    -

    - Location -

    -

    - - altitude - - : - 17 -

    -

    - - longitude - - : - -122.414° -

    -

    - - latitude - - : - 37.764° -

    -
    -
    -

    - - Trex Version - - : - 1000000 -

    -
    -
    -

    - - Updated at - - : - 7/26/2022 12:26:38 AM -

    -
    -
    -
    -
    -
    -
    -
    -`; diff --git a/src/components/Cars/Status/__snapshots__/index.test.jsx.snap b/src/components/Cars/Status/__snapshots__/index.test.jsx.snap index 90b88f5..1bbe08a 100644 --- a/src/components/Cars/Status/__snapshots__/index.test.jsx.snap +++ b/src/components/Cars/Status/__snapshots__/index.test.jsx.snap @@ -12,10 +12,10 @@ exports[`CarStatus Render 1`] = ` data-testid="mocked-userprovider" >
    -
    @@ -115,10 +97,10 @@ exports[`CarStatus Render 1`] = ` role="tabpanel" >

    VIN - : + :

    -
    diff --git a/src/components/Cars/Status/index.jsx b/src/components/Cars/Status/index.jsx index 3086a59..97f6122 100644 --- a/src/components/Cars/Status/index.jsx +++ b/src/components/Cars/Status/index.jsx @@ -11,6 +11,7 @@ import DigitalTwinTab from "./DigitalTwinTab"; import TabPanel from "../../Controls/TabPanel"; import { useStatusContext } from "../../Contexts/StatusContext"; import useStyles from "../../useStyles"; +import CANSignalsTab from "./CANSignalsTab"; const tabHashes = ["details", "updates", "filters"]; @@ -62,6 +63,7 @@ const CarStatus = () => { + @@ -80,6 +82,10 @@ const CarStatus = () => { + + + +
    ); }; diff --git a/src/components/Cars/Status/index.test.jsx b/src/components/Cars/Status/index.test.jsx index e92b00a..9eaed1a 100644 --- a/src/components/Cars/Status/index.test.jsx +++ b/src/components/Cars/Status/index.test.jsx @@ -1,8 +1,8 @@ jest.mock("../../Contexts/CANFiltersContext"); jest.mock("../../Contexts/StatusContext"); jest.mock("../../Contexts/UserContext"); -jest.mock('@material-ui/core/utils/unstable_useId', () => - jest.fn().mockReturnValue('mui-test-id'), +jest.mock("@material-ui/core/utils/unstable_useId", () => + jest.fn().mockReturnValue("mui-test-id") ); import { render, waitFor } from "@testing-library/react"; @@ -12,7 +12,8 @@ import { CANFiltersProvider } from "../../Contexts/CANFiltersContext"; import { StatusProvider } from "../../Contexts/StatusContext"; import { UserProvider, setToken } from "../../Contexts/UserContext"; import { TEST_AUTH_OBJECT } from "../../../utils/testing"; -import CarStatus from "./index" +import CarStatus from "./index"; +import addSnapshotSerializer from "../../../utils/snapshot"; const renderCarStatus = async () => { const { container } = render( @@ -26,11 +27,17 @@ const renderCarStatus = async () => { ); - await waitFor(() => { /* render */ }); + await waitFor(() => { + /* render */ + }); return container; }; describe("CarStatus", () => { + beforeAll(() => { + addSnapshotSerializer(expect); + }); + it("Render", async () => { setToken(TEST_AUTH_OBJECT); const container = await renderCarStatus(); diff --git a/src/components/Cars/Update/__snapshots__/index.test.jsx.snap b/src/components/Cars/Update/__snapshots__/index.test.jsx.snap index 86ff5c7..78c7610 100644 --- a/src/components/Cars/Update/__snapshots__/index.test.jsx.snap +++ b/src/components/Cars/Update/__snapshots__/index.test.jsx.snap @@ -15,11 +15,11 @@ exports[`VehicleUpdate Render 1`] = ` data-testid="mocked-vehicleprovider" >
    { - const [pageSize, setPageSize] = useState(10); + const [pageSize, setPageSize] = useLocalStorage(PAGE_SIZE, 10); const [pageIndex, setPageIndex] = useState(0); const [orderBy, setOrderBy] = useState("id"); const [order, setOrder] = useState("desc"); diff --git a/src/components/Fleets/Table/index.test.jsx b/src/components/Fleets/Table/index.test.jsx index c8bf957..31d2b6b 100644 --- a/src/components/Fleets/Table/index.test.jsx +++ b/src/components/Fleets/Table/index.test.jsx @@ -1,8 +1,8 @@ jest.mock("../../Contexts/FleetContext"); jest.mock("../../Contexts/StatusContext"); jest.mock("../../Contexts/UserContext"); -jest.mock('@material-ui/core/utils/unstable_useId', () => - jest.fn().mockReturnValue('mui-test-id'), +jest.mock("@material-ui/core/utils/unstable_useId", () => + jest.fn().mockReturnValue("mui-test-id") ); import { render, waitFor } from "@testing-library/react"; @@ -12,7 +12,8 @@ import { FleetProvider } from "../../Contexts/FleetContext"; import { StatusProvider } from "../../Contexts/StatusContext"; import { UserProvider, setToken } from "../../Contexts/UserContext"; import { TEST_AUTH_OBJECT } from "../../../utils/testing"; -import MainForm from "./index" +import MainForm from "./index"; +import addSnapshotSerializer from "../../../utils/snapshot"; const renderFleetTable = async () => { const { container } = render( @@ -26,11 +27,17 @@ const renderFleetTable = async () => { ); - await waitFor(() => { /* render */ }); + await waitFor(() => { + /* render */ + }); return container; }; describe("FleetTable", () => { + beforeAll(() => { + addSnapshotSerializer(expect); + }); + it("Render", async () => { setToken(TEST_AUTH_OBJECT); const container = await renderFleetTable(); diff --git a/src/components/Fleets/Update/__snapshots__/index.test.jsx.snap b/src/components/Fleets/Update/__snapshots__/index.test.jsx.snap index 096bdca..24169cd 100644 --- a/src/components/Fleets/Update/__snapshots__/index.test.jsx.snap +++ b/src/components/Fleets/Update/__snapshots__/index.test.jsx.snap @@ -15,11 +15,11 @@ exports[`FleetUpdate Render 1`] = ` data-testid="mocked-fleetprovider" >
    Registered sorted ascending diff --git a/src/components/Suppliers/List/index.test.jsx b/src/components/Suppliers/List/index.test.jsx index eda2fd9..520e896 100644 --- a/src/components/Suppliers/List/index.test.jsx +++ b/src/components/Suppliers/List/index.test.jsx @@ -12,6 +12,7 @@ import { StatusProvider } from "../../Contexts/StatusContext"; import { UserProvider, setToken } from "../../Contexts/UserContext"; import { TEST_AUTH_OBJECT } from "../../../utils/testing"; import MainForm from "./index"; +import addSnapshotSerializer from "../../../utils/snapshot"; const renderSuppliersPage = async () => { const { container } = render( @@ -32,6 +33,10 @@ const renderSuppliersPage = async () => { }; describe("Suppliers page", () => { + beforeAll(() => { + addSnapshotSerializer(expect); + }); + it("Render", async () => { setToken(TEST_AUTH_OBJECT); const container = await renderSuppliersPage(); diff --git a/src/components/Suppliers/Table/index.jsx b/src/components/Suppliers/Table/index.jsx index 2de71e7..4be3ef8 100644 --- a/src/components/Suppliers/Table/index.jsx +++ b/src/components/Suppliers/Table/index.jsx @@ -16,6 +16,7 @@ import { useStatusContext } from "../../Contexts/StatusContext"; import { LocalDateTimeString } from "../../../utils/dates"; import TableHeaderSortable from "../../Table/HeaderSortable"; import { logger } from "../../../services/monitoring"; +import {useLocalStorage} from "../../useLocalStorage"; const tableColumns = [ { @@ -48,9 +49,11 @@ const tableColumns = [ }, ]; +const PAGE_SIZE="SUPPLIER_TABLE_PAGE_SIZE"; + const SupplierTable = (props) => { const { token, classes } = props; - const [pageSize, setPageSize] = useState(10); + const [pageSize, setPageSize] = useLocalStorage(PAGE_SIZE, 10); const [pageIndex, setPageIndex] = useState(0); const [orderBy, setOrderBy] = useState("created_at"); const [order, setOrder] = useState("asc"); diff --git a/src/components/useLocalStorage.js b/src/components/useLocalStorage.js new file mode 100644 index 0000000..28b6dc4 --- /dev/null +++ b/src/components/useLocalStorage.js @@ -0,0 +1,21 @@ +import { useState, useEffect } from "react"; + +export function getStorageValue(key, defaultValue) { + // getting stored value + const saved = localStorage.getItem(key); + const initial = JSON.parse(saved); + return initial || defaultValue; +} + +export const useLocalStorage = (key, defaultValue) => { + const [value, setValue] = useState(() => { + return getStorageValue(key, defaultValue); + }); + + useEffect(() => { + // storing input name + localStorage.setItem(key, JSON.stringify(value)); + }, [key, value]); + + return [value, setValue]; +}; \ No newline at end of file diff --git a/src/components/useLocalStorage.test.js b/src/components/useLocalStorage.test.js new file mode 100644 index 0000000..04e9f51 --- /dev/null +++ b/src/components/useLocalStorage.test.js @@ -0,0 +1,41 @@ +import {getStorageValue, useLocalStorage} from './useLocalStorage' +import {cleanup, render, screen} from "@testing-library/react"; + +describe('getStorageValue', () => { + it('getting stored value', () => { + let val = getStorageValue('key', 'defaultValue'); + expect(val).toBe('defaultValue'); + + localStorage.setItem('key', JSON.stringify('value')); + val = getStorageValue('key', 'defaultValue'); + expect(val).toBe('value'); + }); +}) + + +describe('useLocalStorage', () => { + beforeEach(() => { + const TestComponent = () => { + const [value, setValue] = useLocalStorage('key2', 'defaultValue'); + return ( +
    + +
    {value}
    +
    + ); + } + + render(); + }); + + afterEach(() => { + cleanup(); + }); + + + it('getting default value and setting it', () => { + expect(screen.getByTestId('val').innerHTML).toEqual('defaultValue'); + screen.getByTestId('setVal').click(); + expect(screen.getByTestId('val').innerHTML).toEqual('newValue'); + }); +}) \ No newline at end of file diff --git a/src/components/useStyles.jsx b/src/components/useStyles.jsx index bb18d22..df12ed4 100644 --- a/src/components/useStyles.jsx +++ b/src/components/useStyles.jsx @@ -171,6 +171,15 @@ const useStyles = makeStyles((theme) => ({ grow: { flexGrow: 1, }, + iframeResponsive: { + position: "absolute", + top: 0, + left: 0, + bottom: 0, + right: 0, + width: "100%", + height: "100%", + }, embeddedWrapper: { marginTop: 10, position: "relative", diff --git a/src/services/smsAPI.js b/src/services/smsAPI.js new file mode 100644 index 0000000..396d50f --- /dev/null +++ b/src/services/smsAPI.js @@ -0,0 +1,27 @@ +import { + errorHandler, + getAuthHeaderOptions, + fetchRespHandler, +} from "../utils/http"; + +const API_ENDPOINT = process.env.REACT_APP_UPLOAD_SERVICE_URL; + +const smsAPI = { + /** + * Sends a SMS to an ICCID + * @param {*} data + * @param {*} token + * @returns + */ + send: async (data, token) => + fetch(`${API_ENDPOINT}/sms`, { + method: "POST", + headers: Object.assign( + { "Content-Type": "application/json" }, + getAuthHeaderOptions(token) + ), + body: JSON.stringify(data), + }).then(fetchRespHandler).catch(errorHandler), +}; + +export default smsAPI; \ No newline at end of file diff --git a/src/services/vehiclesAPI.js b/src/services/vehiclesAPI.js index ea1d408..d57c1d0 100644 --- a/src/services/vehiclesAPI.js +++ b/src/services/vehiclesAPI.js @@ -152,6 +152,17 @@ const vehiclesAPI = { }) .then(fetchRespHandler) .catch(errorHandler), + + getCANSignals: async (vin, token) => + fetch(`${API_ENDPOINT}/cansignals/${vin}`, { + method: "GET", + headers: Object.assign( + { "Content-Type": "application/json" }, + getAuthHeaderOptions(token) + ), + }) + .then(fetchRespHandler) + .catch(errorHandler), }; export default vehiclesAPI; diff --git a/src/utils/snapshot.js b/src/utils/snapshot.js new file mode 100644 index 0000000..54395e8 --- /dev/null +++ b/src/utils/snapshot.js @@ -0,0 +1,35 @@ +const rxMakeStyles = /makeStyles-(\w+)-(\d+)/gi; +const rxMUIStyles = /mui-\d*/g; + +const snapshotSerializers = [ + { + test: (val) => { + return val && typeof val === "string" && val.indexOf("mui-") > -1; + }, + print: (val) => { + let str = val; + str = str.replace(rxMUIStyles, "mui-0"); + + return `"${str}"`; + }, + }, + { + test: (val) => { + return val && typeof val === "string" && val.search(rxMakeStyles) > -1; + }, + print: (val) => { + let str = val; + str = str.replace(rxMakeStyles, "makeStyles-$1-0"); + + return `"${str}"`; + }, + }, +]; + +const addSnapshotSerializer = (expect) => { + snapshotSerializers.forEach((serializer) => { + expect.addSnapshotSerializer(serializer); + }); +}; + +export default addSnapshotSerializer;