diff --git a/.env.dev b/.env.dev index e10c5e0..25e82f6 100644 --- a/.env.dev +++ b/.env.dev @@ -1,13 +1,4 @@ REACT_APP_AUTH_SERVICE_URL=https://gw-dev.fiskerdps.com/compute_auth REACT_APP_UPLOAD_SERVICE_URL=https://gw-dev.fiskerdps.com/ota_update REACT_APP_AUTH_CALLBACK_URL=https://dev-ota-admin.fiskerdps.com -REACT_APP_GRAFANA_BASE_URL=https://dev-grafana.fiskerdps.com -REACT_APP_GRAFANA_HOME_CHART_PATH=/d-solo/1VTVJ_qGk/dashboard?orgId=2&refresh=30s&panelId=12 -REACT_APP_GRAFANA_VOLTAGE_CHART_PATH=/d-solo/LVI-aQGnz/diagnostics?orgId=2&var-VIN={vin}&var-Signal=BMS_CellVolt{cellNum}&panelId=2 -REACT_APP_GRAFANA_CELLTEMP_CHART_PATH=/d-solo/LVI-aQGnz/diagnostics?orgId=2&var-VIN={vin}&var-Signal=BMS_CellT{cellNum}&panelId=2 -REACT_APP_GRAFANA_BATTERYTEMP_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN={vin}&refresh=1m&panelId=4 -REACT_APP_GRAFANA_BATTERYCAP_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN={vin}&refresh=1m&panelId=6 -REACT_APP_GRAFANA_BATTERYPERCENT_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN={vin}&panelId=12 -REACT_APP_GRAFANA_BATTERY12VPERCENT_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN={vin}&refresh=1m&panelId=2 -REACT_APP_GRAFANA_BATTERY12VVOLTAGE_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN={vin}&refresh=1m&panelId=9 -REACT_APP_GRAFANA_API=https://dev-grafana.fiskerdps.com/api/datasources/proxy/2 +REACT_APP_SUPERSET_URL=http://superset-dev.fisker.internal diff --git a/.env.local b/.env.local index a8277e3..2d4b6dd 100644 --- a/.env.local +++ b/.env.local @@ -1,13 +1,4 @@ REACT_APP_AUTH_SERVICE_URL=http://localhost/compute_auth REACT_APP_UPLOAD_SERVICE_URL=http://localhost/ota_update REACT_APP_AUTH_CALLBACK_URL=http://localhost:3000 -REACT_APP_GRAFANA_BASE_URL=https://dev-grafana.fiskerdps.com -REACT_APP_GRAFANA_HOME_CHART_PATH=/d-solo/1VTVJ_qGk/dashboard?orgId=2&refresh=30s&panelId=12 -REACT_APP_GRAFANA_VOLTAGE_CHART_PATH=/d-solo/LVI-aQGnz/diagnostics?orgId=2&var-VIN={vin}&var-Signal=BMS_CellVolt{cellNum}&panelId=2 -REACT_APP_GRAFANA_CELLTEMP_CHART_PATH=/d-solo/LVI-aQGnz/diagnostics?orgId=2&var-VIN={vin}&var-Signal=BMS_CellT{cellNum}&panelId=2 -REACT_APP_GRAFANA_BATTERYTEMP_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN={vin}&refresh=1m&panelId=4 -REACT_APP_GRAFANA_BATTERYCAP_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN={vin}&refresh=1m&panelId=6 -REACT_APP_GRAFANA_BATTERYPERCENT_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN={vin}&panelId=12 -REACT_APP_GRAFANA_BATTERY12VPERCENT_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN={vin}&refresh=1m&panelId=2 -REACT_APP_GRAFANA_BATTERY12VVOLTAGE_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN={vin}&refresh=1m&panelId=9 -REACT_APP_GRAFANA_API=https://dev-grafana.fiskerdps.com/api/datasources/proxy/2 +REACT_APP_SUPERSET_URL=http://superset-dev.fisker.internal diff --git a/.env.prd b/.env.prd index 245bab4..f01806e 100644 --- a/.env.prd +++ b/.env.prd @@ -1,13 +1,4 @@ REACT_APP_AUTH_SERVICE_URL=https://gw.fiskerdps.com/compute_auth REACT_APP_UPLOAD_SERVICE_URL=https://gw.fiskerdps.com/ota_update REACT_APP_AUTH_CALLBACK_URL=https://ota-admin.fiskerdps.com -REACT_APP_GRAFANA_BASE_URL=https://grafana.fiskerdps.com -REACT_APP_GRAFANA_HOME_CHART_PATH=/d-solo/1VTVJ_qGk/dashboard?orgId=2&refresh=30s&panelId=12 -REACT_APP_GRAFANA_VOLTAGE_CHART_PATH=/d-solo/LVI-aQGnz/diagnostics?orgId=2&var-VIN={vin}&var-Signal=BMS_CellVolt{cellNum}&panelId=2 -REACT_APP_GRAFANA_CELLTEMP_CHART_PATH=/d-solo/LVI-aQGnz/diagnostics?orgId=2&var-VIN={vin}&var-Signal=BMS_CellT{cellNum}&panelId=2 -REACT_APP_GRAFANA_BATTERYTEMP_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN={vin}&refresh=1m&panelId=4 -REACT_APP_GRAFANA_BATTERYCAP_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN={vin}&refresh=1m&panelId=6 -REACT_APP_GRAFANA_BATTERYPERCENT_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN={vin}&panelId=12 -REACT_APP_GRAFANA_BATTERY12VPERCENT_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN={vin}&refresh=1m&panelId=2 -REACT_APP_GRAFANA_BATTERY12VVOLTAGE_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN={vin}&refresh=1m&panelId=9 -REACT_APP_GRAFANA_API=https://grafana.fiskerdps.com/api/datasources/proxy/1 +REACT_APP_SUPERSET_URL=http://superset.fisker.internal diff --git a/.env.stg b/.env.stg index 3d93495..c4d7a20 100644 --- a/.env.stg +++ b/.env.stg @@ -1,13 +1,4 @@ REACT_APP_AUTH_SERVICE_URL=https://gw-stg.fiskerdps.com/compute_auth REACT_APP_UPLOAD_SERVICE_URL=https://gw-stg.fiskerdps.com/ota_update REACT_APP_AUTH_CALLBACK_URL=https://stg-ota-admin.fiskerdps.com -REACT_APP_GRAFANA_BASE_URL=https://stg-grafana.fiskerdps.com -REACT_APP_GRAFANA_HOME_CHART_PATH=/d-solo/1VTVJ_qGk/dashboard?orgId=2&refresh=30s&panelId=12 -REACT_APP_GRAFANA_VOLTAGE_CHART_PATH=/d-solo/LVI-aQGnz/diagnostics?orgId=2&var-VIN={vin}&var-Signal=BMS_CellVolt{cellNum}&panelId=2 -REACT_APP_GRAFANA_CELLTEMP_CHART_PATH=/d-solo/LVI-aQGnz/diagnostics?orgId=2&var-VIN={vin}&var-Signal=BMS_CellT{cellNum}&panelId=2 -REACT_APP_GRAFANA_BATTERYTEMP_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN={vin}&refresh=1m&panelId=4 -REACT_APP_GRAFANA_BATTERYCAP_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN={vin}&refresh=1m&panelId=6 -REACT_APP_GRAFANA_BATTERYPERCENT_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN={vin}&panelId=12 -REACT_APP_GRAFANA_BATTERY12VPERCENT_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN={vin}&refresh=1m&panelId=2 -REACT_APP_GRAFANA_BATTERY12VVOLTAGE_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN={vin}&refresh=1m&panelId=9 -REACT_APP_GRAFANA_API=https://stg-grafana.fiskerdps.com/api/datasources/proxy/1 +REACT_APP_SUPERSET_URL=http://superset-stg.fisker.internal diff --git a/.env.template b/.env.template index ba07826..2d4b6dd 100644 --- a/.env.template +++ b/.env.template @@ -1,13 +1,4 @@ REACT_APP_AUTH_SERVICE_URL=http://localhost/compute_auth REACT_APP_UPLOAD_SERVICE_URL=http://localhost/ota_update REACT_APP_AUTH_CALLBACK_URL=http://localhost:3000 -REACT_APP_GRAFANA_BASE_URL=https://grafana.fiskerdps.com -REACT_APP_GRAFANA_HOME_CHART_PATH=/d-solo/1VTVJ_qGk/dashboard?orgId=2&refresh=30s&panelId=12 -REACT_APP_GRAFANA_VOLTAGE_CHART_PATH=/d-solo/LVI-aQGnz/diagnostics?orgId=2&var-VIN={vin}&var-Signal=BMS_CellVolt{cellNum}&panelId=2 -REACT_APP_GRAFANA_CELLTEMP_CHART_PATH=/d-solo/LVI-aQGnz/diagnostics?orgId=2&var-VIN={vin}&var-Signal=BMS_CellT{cellNum}&panelId=2 -REACT_APP_GRAFANA_BATTERYTEMP_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN={vin}&refresh=1m&panelId=4 -REACT_APP_GRAFANA_BATTERYCAP_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN={vin}&refresh=1m&panelId=6 -REACT_APP_GRAFANA_BATTERYPERCENT_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN={vin}&panelId=12 -REACT_APP_GRAFANA_BATTERY12VPERCENT_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN={vin}&refresh=1m&panelId=2 -REACT_APP_GRAFANA_BATTERY12VVOLTAGE_CHART=/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN={vin}&refresh=1m&panelId=9 -REACT_APP_GRAFANA_API=https://grafana.fiskerdps.com/api/datasources/proxy/1 +REACT_APP_SUPERSET_URL=http://superset-dev.fisker.internal diff --git a/src/components/App/App.test.js b/src/components/App/App.test.js index 33b158c..2cc4738 100644 --- a/src/components/App/App.test.js +++ b/src/components/App/App.test.js @@ -4,7 +4,6 @@ jest.mock("../Contexts/VehicleContext"); jest.mock("../Contexts/ManifestCreateContext"); jest.mock("../Contexts/ManifestsContext"); jest.mock("../Contexts/UserContext"); -jest.mock("../../services/grafanaAPI"); jest.mock("../../services/monitoring"); jest.mock("../../services/vehiclesAPI"); @@ -38,7 +37,7 @@ const check = async (path, selector, compare) => { const sleepAndCheck = async (path, selector, compare) => { const container = await renderRoute(path); - await waitFor(() => {}); + await waitFor(() => { }); expect(container.querySelector(selector).innerHTML).toEqual(compare); expect(container).toMatchSnapshot(); }; @@ -72,14 +71,6 @@ describe("App", () => { await sleepAndCheck("/home", "span.MuiButton-label", "Sign In"); }); - it("Route /datascope unauthenticated", async () => { - await sleepAndCheck("/datascope", "span.MuiButton-label", "Sign In"); - }); - - it("Route /datascope/battery unauthenticated", async () => { - await check("/datascope/battery", "span.MuiButton-label", "Sign In"); - }); - it("Route /packages unauthenticated", async () => { await check("/packages", "span.MuiButton-label", "Sign In"); }); @@ -134,16 +125,6 @@ describe("App", () => { await check("/page-not-found", "h1", "Page Not Found"); }); - it("Route /datascope authenticated", async () => { - setToken(TEST_AUTH_OBJECT); - await sleepAndCheck("/datascope", "h6", "Datascope"); - }); - - it("Route /datascope/battery authenticated", async () => { - setToken(TEST_AUTH_OBJECT); - await check("/datascope/battery", "h6", "Battery"); - }); - it("Route /packages authenticated", async () => { setToken(TEST_AUTH_OBJECT); await check("/packages", "h6", "Deployments"); diff --git a/src/components/App/__snapshots__/App.test.js.snap b/src/components/App/__snapshots__/App.test.js.snap index 1e56e57..f041185 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" >