Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Make route-guards app tier (#73426)

Fraserf623b2e25da1
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/routes.tsx
index 0fadd506029..18b79d47199 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/routes.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/routes.tsx
@@ -1,3 +1,4 @@
+import type { ComponentType } from "react";
import { IndexRoute, Route } from "react-router";
import { getDataStudioSegmentRoutes } from "metabase/data-studio/segments/routes";
@@ -8,11 +9,11 @@ import { getDataStudioMetricRoutes } from "./metrics/routes";
import { getDataStudioSnippetRoutes } from "./snippets/routes";
import { getDataStudioTableRoutes } from "./tables/routes";
-export const getDataStudioLibraryRoutes = () => {
+export const getDataStudioLibraryRoutes = (IsAdmin: ComponentType) => {
return (
<Route path="library" component={LibrarySectionLayout}>
<IndexRoute component={LibraryPage} />
- {getDataStudioTableRoutes()}
+ {getDataStudioTableRoutes(IsAdmin)}
{getDataStudioMetricRoutes()}
{getDataStudioSegmentRoutes()}
{getDataStudioSnippetRoutes()}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/routes.tsx
index 6c7805fd407..8c800c18d28 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/routes.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/routes.tsx
@@ -1,3 +1,4 @@
+import type { ComponentType } from "react";
import { IndexRoute, Route } from "react-router";
import { PublishedTableMeasureDependenciesPage } from "metabase/data-studio/measures/pages/PublishedTableMeasureDependenciesPage";
@@ -9,7 +10,6 @@ import { PublishedTableSegmentDependenciesPage } from "metabase/data-studio/segm
import { PublishedTableSegmentDetailPage } from "metabase/data-studio/segments/pages/PublishedTableSegmentDetailPage";
import { PublishedTableSegmentRevisionHistoryPage } from "metabase/data-studio/segments/pages/PublishedTableSegmentRevisionHistoryPage";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
-import { IsAdmin } from "metabase/route-guards";
import { TableDependenciesPage } from "./pages/TableDependenciesPage";
import { TableFieldsPage } from "./pages/TableFieldsPage";
@@ -17,7 +17,7 @@ import { TableMeasuresPage } from "./pages/TableMeasuresPage";
import { TableOverviewPage } from "./pages/TableOverviewPage";
import { TableSegmentsPage } from "./pages/TableSegmentsPage";
-export function getDataStudioTableRoutes() {
+export function getDataStudioTableRoutes(IsAdmin: ComponentType) {
return (
<Route path="tables">
<Route path=":tableId" component={TableOverviewPage} />
diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjs
index c6f84396212..3ecf7f31826 100644
--- a/frontend/lint/module-boundaries.mjs
+++ b/frontend/lint/module-boundaries.mjs
@@ -148,6 +148,7 @@ const elements = [
"frontend/src/metabase/reducers-main.ts",
"frontend/src/metabase/routes.jsx",
"frontend/src/metabase/routes-embed.tsx",
+ "frontend/src/metabase/route-guards.tsx",
"frontend/src/metabase/routes-public.tsx",
"frontend/src/metabase/AppThemeProvider.tsx",
"frontend/src/metabase/AppColorSchemeProvider.tsx",
diff --git a/frontend/src/metabase/data-studio/data-model/routes.tsx b/frontend/src/metabase/data-studio/data-model/routes.tsx
index 498aca572f1..32d26be1052 100644
--- a/frontend/src/metabase/data-studio/data-model/routes.tsx
+++ b/frontend/src/metabase/data-studio/data-model/routes.tsx
@@ -1,3 +1,4 @@
+import type { ComponentType } from "react";
import { IndexRoute, Redirect, Route } from "react-router";
import { DataModelMeasureDependenciesPage } from "metabase/data-studio/measures/pages/DataModelMeasureDependenciesPage";
@@ -9,11 +10,10 @@ import { DataModelSegmentDependenciesPage } from "metabase/data-studio/segments/
import { DataModelSegmentDetailPage } from "metabase/data-studio/segments/pages/DataModelSegmentDetailPage";
import { DataModelSegmentRevisionHistoryPage } from "metabase/data-studio/segments/pages/DataModelSegmentRevisionHistoryPage";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
-import { IsAdmin } from "metabase/route-guards";
import { DataModel } from "./pages/DataModel";
-export function getDataStudioMetadataRoutes() {
+export function getDataStudioMetadataRoutes(IsAdmin: ComponentType) {
return (
<>
<IndexRoute component={DataModel} />
diff --git a/frontend/src/metabase/data-studio/routes.tsx b/frontend/src/metabase/data-studio/routes.tsx
index 9e465d0deae..bc43389d9e3 100644
--- a/frontend/src/metabase/data-studio/routes.tsx
+++ b/frontend/src/metabase/data-studio/routes.tsx
@@ -31,6 +31,7 @@ export function getDataStudioRoutes(
CanAccessDataStudio: ComponentType,
CanAccessDataModel: ComponentType,
_CanAccessTransforms: ComponentType,
+ IsAdmin: ComponentType,
) {
return (
<Route component={CanAccessDataStudio}>
@@ -42,7 +43,7 @@ export function getDataStudioRoutes(
/>
<Route path="data" component={CanAccessDataModel}>
<Route component={DataSectionLayout}>
- {getDataStudioMetadataRoutes()}
+ {getDataStudioMetadataRoutes(IsAdmin)}
</Route>
</Route>
<Route path="transforms" component={TransformsSectionLayout}>
@@ -50,7 +51,7 @@ export function getDataStudioRoutes(
</Route>
{getDataStudioGlossaryRoutes()}
{PLUGIN_LIBRARY.isEnabled ? (
- PLUGIN_LIBRARY.getDataStudioLibraryRoutes()
+ PLUGIN_LIBRARY.getDataStudioLibraryRoutes(IsAdmin)
) : (
<Route path="library" component={LibraryUpsellPage} />
)}
diff --git a/frontend/src/metabase/plugins/oss/library.ts b/frontend/src/metabase/plugins/oss/library.ts
index bf894f2ddf5..c9590cb37d8 100644
--- a/frontend/src/metabase/plugins/oss/library.ts
+++ b/frontend/src/metabase/plugins/oss/library.ts
@@ -42,7 +42,7 @@ export type UnpublishTablesModalProps = {
type LibraryPlugin = {
isEnabled: boolean;
- getDataStudioLibraryRoutes: () => ReactNode;
+ getDataStudioLibraryRoutes: (IsAdmin: ComponentType) => ReactNode;
useGetLibraryCollection: (params?: { skip?: boolean }) => {
data: undefined | LibraryCollection;
isLoading: boolean;
diff --git a/frontend/src/metabase/routes.jsx b/frontend/src/metabase/routes.jsx
index 7e70e2c8ee5..f5886092244 100644
--- a/frontend/src/metabase/routes.jsx
+++ b/frontend/src/metabase/routes.jsx
@@ -394,6 +394,7 @@ export const getRoutes = (store) => {
CanAccessDataStudio,
CanAccessDataModel,
CanAccessTransforms,
+ IsAdmin,
)}
</Route>
</Route>