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
Match permissions URLs for databases without schemas (#81332)
Romeo Van Snick57ac36ff71c7
diff --git a/frontend/src/metabase/admin/permissions/routes.tsx b/frontend/src/metabase/admin/permissions/routes.tsxindex 8ce8b016152..e851ed50d80 100644--- a/frontend/src/metabase/admin/permissions/routes.tsx+++ b/frontend/src/metabase/admin/permissions/routes.tsx@@ -45,9 +45,12 @@ const collectionPermissions = () =>// (`database(/:databaseId)(/schema/:schemaName)`), which v7's matcher cannot// parse, so each depth is spelled out as its own route. One route matches per// URL, exactly as the optional groups did.-const DATABASES_PERMISSIONS_PATHS = [+export const DATABASES_PERMISSIONS_PATHS = ["database","database/:databaseId",+ // Databases with no schemas, such as MySQL or MongoDB, drill straight from+ // the database to the table.+ "database/:databaseId/table/:tableId","database/:databaseId/schema/:schemaName","database/:databaseId/schema/:schemaName/table/:tableId",];diff --git a/frontend/src/metabase/admin/permissions/test/DatabasesPermissionsPage/routes.unit.spec.tsx b/frontend/src/metabase/admin/permissions/test/DatabasesPermissionsPage/routes.unit.spec.tsxindex 8d61b583be7..b6e98ccb7df 100644--- a/frontend/src/metabase/admin/permissions/test/DatabasesPermissionsPage/routes.unit.spec.tsx+++ b/frontend/src/metabase/admin/permissions/test/DatabasesPermissionsPage/routes.unit.spec.tsx@@ -1,4 +1,5 @@import { renderWithProviders, screen } from "__support__/ui";+import { DATABASES_PERMISSIONS_PATHS } from "metabase/admin/permissions/routes";import { Outlet, Route, useParams } from "metabase/router";// Validates the restructured route shape (depth-enumerated siblings that replaced@@ -14,14 +15,6 @@ function ParamsProbe() {);}-// Mirrors DATABASES_PERMISSIONS_PATHS in routes.tsx.-const DATABASES_PERMISSIONS_PATHS = [- "database",- "database/:databaseId",- "database/:databaseId/schema/:schemaName",- "database/:databaseId/schema/:schemaName/table/:tableId",-];-function setup(initialRoute: string) {renderWithProviders(<Route path="/admin/permissions/data" element={<Outlet />}>@@ -37,6 +30,10 @@ describe("restructured databases permissions routes", () => {it.each([["/admin/permissions/data/database", {}],["/admin/permissions/data/database/1", { databaseId: "1" }],+ [+ "/admin/permissions/data/database/1/table/2",+ { databaseId: "1", tableId: "2" },+ ],["/admin/permissions/data/database/1/schema/PUBLIC",{ databaseId: "1", schemaName: "PUBLIC" },