diff --git a/package-lock.json b/package-lock.json index ea0312a..8b3fc11 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "clsx": "^1.1.1", "email-validator": "^2.0.4", "env-cmd": "^10.1.0", - "leaflet": "^1.7.1", + "leaflet": "^1.8.0", "material-ui-dropzone": "^3.5.0", "react": "^17.0.2", "react-dom": "^17.0.2", @@ -6505,13 +6505,19 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001314", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001314.tgz", - "integrity": "sha512-0zaSO+TnCHtHJIbpLroX7nsD+vYuOVjl3uzFbJO1wMVbuveJA0RK2WcQA9ZUIOiO0/ArMiMgHJLxfEZhQiC0kw==", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - } + "version": "1.0.30001387", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001387.tgz", + "integrity": "sha512-fKDH0F1KOJvR+mWSOvhj8lVRr/Q/mc5u5nabU2vi1/sgvlSqEsE8dOq0Hy/BqVbDkCYQPRRHB1WRjW6PGB/7PA==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + } + ] }, "node_modules/case-sensitive-paths-webpack-plugin": { "version": "2.4.0", @@ -11593,9 +11599,9 @@ } }, "node_modules/leaflet": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.7.1.tgz", - "integrity": "sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw==" + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.8.0.tgz", + "integrity": "sha512-gwhMjFCQiYs3x/Sf+d49f10ERXaEFCPr+nVTryhAW8DWbMGqJqt9G4XuIaHmFW08zYvhgdzqXGr8AlW8v8dQkA==" }, "node_modules/leven": { "version": "3.1.0", @@ -21996,9 +22002,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001314", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001314.tgz", - "integrity": "sha512-0zaSO+TnCHtHJIbpLroX7nsD+vYuOVjl3uzFbJO1wMVbuveJA0RK2WcQA9ZUIOiO0/ArMiMgHJLxfEZhQiC0kw==" + "version": "1.0.30001387", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001387.tgz", + "integrity": "sha512-fKDH0F1KOJvR+mWSOvhj8lVRr/Q/mc5u5nabU2vi1/sgvlSqEsE8dOq0Hy/BqVbDkCYQPRRHB1WRjW6PGB/7PA==" }, "case-sensitive-paths-webpack-plugin": { "version": "2.4.0", @@ -25739,9 +25745,9 @@ } }, "leaflet": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.7.1.tgz", - "integrity": "sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw==" + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.8.0.tgz", + "integrity": "sha512-gwhMjFCQiYs3x/Sf+d49f10ERXaEFCPr+nVTryhAW8DWbMGqJqt9G4XuIaHmFW08zYvhgdzqXGr8AlW8v8dQkA==" }, "leven": { "version": "3.1.0", diff --git a/package.json b/package.json index c1c5967..11daec5 100644 --- a/package.json +++ b/package.json @@ -4,19 +4,24 @@ "private": true, "dependencies": { "@datadog/browser-logs": "^3.11.0", + "@date-io/date-fns": "1.x", + "@date-io/moment": "1.x", "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@material-ui/core": "^4.12.4", "@material-ui/icons": "^4.11.3", + "@material-ui/pickers": "^3.3.10", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^12.1.4", "@testing-library/user-event": "^13.5.0", "axios": "^0.26.1", "clsx": "^1.1.1", + "date-fns": "^2.29.2", "email-validator": "^2.0.4", "env-cmd": "^10.1.0", - "leaflet": "^1.7.1", + "leaflet": "^1.8.0", "material-ui-dropzone": "^3.5.0", + "moment": "^2.29.4", "react": "^17.0.2", "react-dom": "^17.0.2", "react-leaflet": "^3.2.5", @@ -62,7 +67,7 @@ "coverageThreshold": { "global": { "branches": 39, - "functions": 47, + "functions": 45.5, "lines": 50, "statements": 49 } diff --git a/src/components/App/App.test.js b/src/components/App/App.test.js index 1c40617..f5de9f0 100644 --- a/src/components/App/App.test.js +++ b/src/components/App/App.test.js @@ -1,7 +1,6 @@ jest.mock("../Contexts/CarUpdatesContext"); jest.mock("../Contexts/FileUploadContext"); jest.mock("../Contexts/VehicleContext"); -jest.mock("../Contexts/ManifestCreateContext"); jest.mock("../Contexts/ManifestsContext"); jest.mock("../Contexts/UserContext"); jest.mock("../../services/monitoring"); @@ -73,10 +72,6 @@ describe("App", () => { await check("/package-deploy/1", "span.MuiButton-label", "Sign In"); }); - it("Route /package-create unauthenticated", async () => { - await check("/package-create", "span.MuiButton-label", "Sign In"); - }); - it("Route /vehicle-add unauthenticated", async () => { await check("/vehicle-add", "span.MuiButton-label", "Sign In"); }); @@ -146,11 +141,6 @@ describe("App", () => { await check("/package-deploy/1", "h6", "Deploy Test Manifest 1.0"); }); - it("Route /package-create authenticated", async () => { - setToken(TEST_AUTH_OBJECT); - await check("/package-create", "h6", "Create Deployments"); - }); - it("Route /vehicle-add authenticated", async () => { setToken(TEST_AUTH_OBJECT); await check("/vehicle-add", "h6", "Add Vehicle"); diff --git a/src/components/App/__snapshots__/App.test.js.snap b/src/components/App/__snapshots__/App.test.js.snap index b642c4e..e2a4fa3 100644 --- a/src/components/App/__snapshots__/App.test.js.snap +++ b/src/components/App/__snapshots__/App.test.js.snap @@ -350,7 +350,7 @@ exports[`App Route / authenticated 1`] = ` data-testid="mocked-vehicleprovider" >
@@ -380,10 +380,10 @@ exports[`App Route / authenticated 1`] = `
@@ -438,11 +448,17 @@ exports[`App Route / authenticated 1`] = ` > Leaflet - | © + + + © @@ -868,7 +884,7 @@ exports[`App Route /home authenticated 1`] = ` data-testid="mocked-vehicleprovider" >
@@ -898,10 +914,10 @@ exports[`App Route /home authenticated 1`] = `
@@ -956,11 +982,17 @@ exports[`App Route /home authenticated 1`] = ` > Leaflet - | © + + + © @@ -1036,1523 +1068,6 @@ exports[`App Route /home unauthenticated 1`] = `
`; -exports[`App Route /package-create authenticated 1`] = ` -
-
-
-
- -
- -
-
-
-
-
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
-