Skip to content

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

Convert `admin/permissions/utils/urls` to TypeScript (#69432)

Fraser51d7669d7d8e
diff --git a/frontend/src/metabase/admin/permissions/utils/data-entity-id.ts b/frontend/src/metabase/admin/permissions/utils/data-entity-id.ts
index 51dbe02cf17..5c8897425fd 100644
--- a/frontend/src/metabase/admin/permissions/utils/data-entity-id.ts
+++ b/frontend/src/metabase/admin/permissions/utils/data-entity-id.ts
@@ -32,7 +32,7 @@ export const isTableEntityId = (
export const isSchemaEntityId = (
entityId: Partial<EntityId>,
-): entityId is SchemaEntityId =>
+): entityId is SchemaEntityId & { schemaName: string } =>
entityId.schemaName != null &&
entityId.schemaName !== "" &&
!isTableEntityId(entityId);
diff --git a/frontend/src/metabase/admin/permissions/utils/urls.js b/frontend/src/metabase/admin/permissions/utils/urls.ts
similarity index 84%
rename from frontend/src/metabase/admin/permissions/utils/urls.js
rename to frontend/src/metabase/admin/permissions/utils/urls.ts
index 9025aa6bb92..c614413dc66 100644
--- a/frontend/src/metabase/admin/permissions/utils/urls.js
+++ b/frontend/src/metabase/admin/permissions/utils/urls.ts
@@ -1,3 +1,5 @@
+import type { EntityId } from "../types";
+
import {
isDatabaseEntityId,
isSchemaEntityId,
@@ -7,7 +9,9 @@ import {
export const DATABASES_BASE_PATH = `/admin/permissions/data/database`;
export const GROUPS_BASE_PATH = `/admin/permissions/data/group`;
-export const getDatabaseFocusPermissionsUrl = (entityId) => {
+export const getDatabaseFocusPermissionsUrl = (
+ entityId?: Partial<EntityId> | null,
+) => {
if (entityId == null) {
return DATABASES_BASE_PATH;
}
@@ -33,7 +37,10 @@ export const getDatabaseFocusPermissionsUrl = (entityId) => {
}
};
-export const getGroupFocusPermissionsUrl = (groupId, entityId) => {
+export const getGroupFocusPermissionsUrl = (
+ groupId?: number | null,
+ entityId?: Partial<EntityId> | null,
+) => {
if (groupId == null) {
return GROUPS_BASE_PATH;
}