The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Rename App to AppComponent to resolve import conflict with app.js (#75473)
Stas Gavrylov94ce9b37dfa8
diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjsindex 02592772f36..9d2355e6751 100644--- a/frontend/lint/module-boundaries.mjs+++ b/frontend/lint/module-boundaries.mjs@@ -147,7 +147,7 @@ const elements = ["frontend/src/metabase/app-main.js","frontend/src/metabase/app-embed.ts","frontend/src/metabase/app-public.ts",- "frontend/src/metabase/App.tsx",+ "frontend/src/metabase/AppComponent.tsx","frontend/src/metabase/App.styled.tsx","frontend/src/metabase/AppKBarProvider.tsx","frontend/src/metabase/reducers-main.ts",diff --git a/frontend/src/metabase/App.tsx b/frontend/src/metabase/AppComponent.tsxsimilarity index 100%rename from frontend/src/metabase/App.tsxrename to frontend/src/metabase/AppComponent.tsxdiff --git a/frontend/src/metabase/app/nav/Navbar.unit.spec.tsx b/frontend/src/metabase/app/nav/Navbar.unit.spec.tsxindex 42668803809..9fe8f4a66ad 100644--- a/frontend/src/metabase/app/nav/Navbar.unit.spec.tsx+++ b/frontend/src/metabase/app/nav/Navbar.unit.spec.tsx@@ -252,7 +252,7 @@ describe("nav > containers > Navbar > Core App", () => {});});- // the current state of App.tsx is such that this should never even happen because we don't even render the parent component+ // the current state of AppComponent.tsx is such that this should never even happen because we don't even render the parent component// but this test will cover any future changes in the component treeallRoutes.forEach((route) => {it(`should not be visible when embedded and on ${route} with side_nav=false`, async () => {diff --git a/frontend/src/metabase/routes.tsx b/frontend/src/metabase/routes.tsxindex a8f9f3936f8..764fc52e2b2 100644--- a/frontend/src/metabase/routes.tsx+++ b/frontend/src/metabase/routes.tsx@@ -1,7 +1,7 @@import type { Store, ThunkDispatch, UnknownAction } from "@reduxjs/toolkit";import { IndexRedirect, IndexRoute, Redirect, Route } from "react-router";-import App from "metabase/App";+import App from "metabase/AppComponent";import { getAccountRoutes } from "metabase/account/routes";import CollectionPermissionsModal from "metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal";import { getRoutes as getAdminRoutes } from "metabase/admin/routes";diff --git a/tsconfig.json b/tsconfig.jsonindex 79f63e3018d..8dab10165f3 100644--- a/tsconfig.json+++ b/tsconfig.json@@ -45,7 +45,7 @@// type-checking; the surrounding story/helper handles the typing."frontend/test/__support__/custom-viz-fixtures/**/*.js",// The following files will load `frontend/src/metabase/app` which will conflict with- // `frontend/src/metabase/App.tsx`, since now we're loading both JS and TS files.+ // `frontend/src/metabase/AppComponent.tsx`, since now we're loading both JS and TS files."frontend/src/metabase/app-main.js","frontend/src/metabase/app-public.ts","frontend/src/metabase/app-embed.ts"