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
prevent tenant users to edit their dedicated tenant collection name (#67180)
Nicolò Pretto88c9b0bf374d
diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsxindex c354dfcf26a..ffc99d96847 100644--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx@@ -1,6 +1,7 @@import { useCallback } from "react";import { t } from "ttag";+import { getCurrentUser } from "metabase/admin/datamodel/selectors";import {isEditableCollection,isInstanceAnalyticsCollection,@@ -31,7 +32,8 @@ export const CollectionCaption = ({collection,onUpdateCollection,}: CollectionCaptionProps): JSX.Element => {- const isEditable = isEditableCollection(collection);+ const currentUser = useSelector(getCurrentUser);+ const isEditable = isEditableCollection(collection, { currentUser });const hasDescription = Boolean(collection.description);const handleChangeName = useCallback(diff --git a/frontend/src/metabase/collections/utils.ts b/frontend/src/metabase/collections/utils.tsindex e771e9ddd12..dc15423e7a5 100644--- a/frontend/src/metabase/collections/utils.ts+++ b/frontend/src/metabase/collections/utils.ts@@ -9,6 +9,7 @@ import {type CollectionItem,type CollectionItemModel,type CollectionType,+ type User,isBaseEntityID,} from "metabase-types/api";@@ -44,6 +45,19 @@ export function isDedicatedTenantCollectionRoot(return collection.type === "tenant-specific-root-collection";}+export function isDedicatedTenantCollectionOfUser({+ user,+ collection,+}: {+ user: User;+ collection: Collection;+}): boolean {+ return (+ user.tenant_collection_id !== null &&+ user.tenant_collection_id === collection.id+ );+}+export function isPersonalCollection(collection: Pick<Collection, "is_personal">,) {@@ -68,13 +82,17 @@ export function isPublicCollection(return !isPersonalCollection(collection);}-export function isEditableCollection(collection: Collection) {+export function isEditableCollection(+ collection: Collection,+ { currentUser }: { currentUser: User },+) {return (collection.can_write &&!isRootCollection(collection) &&!isRootPersonalCollection(collection) &&!isTrashedCollection(collection) &&- !isLibraryCollection(collection)+ !isLibraryCollection(collection) &&+ !isDedicatedTenantCollectionOfUser({ user: currentUser, collection }));}