Skip to content

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

Admins see personal collections for tenant users (#67949)

John Swanson0266970fffb2
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx
index ccdee7ccc60..926775cd295 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx
@@ -11,7 +11,10 @@ import { Tree } from "metabase/common/components/tree";
import { useSetting } from "metabase/common/hooks";
import { buildCollectionTree } from "metabase/entities/collections";
import { useSelector } from "metabase/lib/redux";
-import { tenantSpecificCollections } from "metabase/lib/urls";
+import {
+ tenantSpecificCollections,
+ tenantUsersPersonalCollections,
+} from "metabase/lib/urls";
import {
PaddedSidebarLink,
SidebarHeading,
@@ -144,6 +147,14 @@ export const MainNavSharedCollections = ({
{t`Tenant collections`}
</PaddedSidebarLink>
)}
+ {isAdmin && (
+ <PaddedSidebarLink
+ icon="group"
+ url={tenantUsersPersonalCollections()}
+ >
+ {t`Tenant users' personal collections`}
+ </PaddedSidebarLink>
+ )}
</SidebarSection>
)}
<Modal
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersList/TenantUsersList.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersList/TenantUsersList.tsx
new file mode 100644
index 00000000000..086e5432c6e
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersList/TenantUsersList.tsx
@@ -0,0 +1,32 @@
+import { t } from "ttag";
+
+import { CollectionListView } from "metabase/common/components/CollectionListView";
+import { ROOT_COLLECTION } from "metabase/entities/collections/constants";
+import * as Urls from "metabase/lib/urls";
+import type { IconName } from "metabase/ui";
+import { useListTenantsQuery } from "metabase-enterprise/api";
+
+export const TenantUsersList = () => {
+ const { data, isLoading } = useListTenantsQuery({ status: "active" });
+
+ const tenants = data?.data ?? [];
+
+ const crumbs = [
+ {
+ title: ROOT_COLLECTION.name,
+ to: Urls.collection({ id: "root", name: "" }),
+ },
+ { title: t`Tenant users' personal collections` },
+ ];
+
+ const items = tenants.map((tenant) => ({
+ key: tenant.id,
+ name: tenant.name,
+ icon: "group" as const satisfies IconName,
+ link: Urls.tenantUsersPersonalCollectionsForTenant(tenant.id),
+ }));
+
+ return (
+ <CollectionListView crumbs={crumbs} loading={isLoading} items={items} />
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersList/index.ts b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersList/index.ts
new file mode 100644
index 00000000000..111f459a081
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersList/index.ts
@@ -0,0 +1 @@
+export { TenantUsersList } from "./TenantUsersList";
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersPersonalCollectionList/TenantUsersPersonalCollectionList.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersPersonalCollectionList/TenantUsersPersonalCollectionList.tsx
new file mode 100644
index 00000000000..786841d14cc
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersPersonalCollectionList/TenantUsersPersonalCollectionList.tsx
@@ -0,0 +1,51 @@
+import { t } from "ttag";
+
+import { useListUsersQuery } from "metabase/api";
+import { CollectionListView } from "metabase/common/components/CollectionListView";
+import { ROOT_COLLECTION } from "metabase/entities/collections/constants";
+import * as Urls from "metabase/lib/urls";
+import type { IconName } from "metabase/ui";
+import { useGetTenantQuery } from "metabase-enterprise/api";
+
+interface TenantUsersPersonalCollectionListProps {
+ params: { tenantId: string };
+}
+
+export const TenantUsersPersonalCollectionList = ({
+ params,
+}: TenantUsersPersonalCollectionListProps) => {
+ const tenantId = parseInt(params.tenantId, 10);
+
+ const { data: tenant } = useGetTenantQuery(tenantId);
+ const { data, isLoading } = useListUsersQuery({ tenant_id: tenantId });
+
+ const users = data?.data ?? [];
+
+ const crumbs = [
+ {
+ title: ROOT_COLLECTION.name,
+ to: Urls.collection({ id: "root", name: "" }),
+ },
+ {
+ title: t`Tenant users' personal collections`,
+ to: Urls.tenantUsersPersonalCollections(),
+ },
+ { title: tenant?.name ?? "" },
+ ];
+
+ const items = users
+ .filter((user) => user.personal_collection_id)
+ .map((user) => ({
+ key: user.id,
+ name: user.common_name,
+ icon: "person" as const satisfies IconName,
+ link: Urls.collection({
+ id: user.personal_collection_id,
+ name: user.common_name,
+ }),
+ }));
+
+ return (
+ <CollectionListView crumbs={crumbs} loading={isLoading} items={items} />
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersPersonalCollectionList/index.ts b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersPersonalCollectionList/index.ts
new file mode 100644
index 00000000000..de42d9bdcb3
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersPersonalCollectionList/index.ts
@@ -0,0 +1 @@
+export { TenantUsersPersonalCollectionList } from "./TenantUsersPersonalCollectionList";
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx
index 80df49a7920..246c777f6a8 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx
@@ -46,6 +46,8 @@ import { TenantDisplayName } from "./components/TenantDisplayName";
import { FormTenantWidget } from "./components/TenantFormWidget";
import { TenantGroupHintIcon } from "./components/TenantGroupHintIcon";
import { TenantSpecificCollectionsItemList } from "./components/TenantSpecificCollectionsItemList";
+import { TenantUsersList } from "./components/TenantUsersList";
+import { TenantUsersPersonalCollectionList } from "./components/TenantUsersPersonalCollectionList";
import { EditTenantModal } from "./containers/EditTenantModal";
import { NewTenantModal } from "./containers/NewTenantModal";
import { TenantActivationModal } from "./containers/TenantActivationModal";
@@ -233,6 +235,9 @@ export function initializePlugin() {
PLUGIN_TENANTS.TenantSpecificCollectionsItemList =
TenantSpecificCollectionsItemList;
PLUGIN_TENANTS.TenantCollectionList = TenantCollectionList;
+ PLUGIN_TENANTS.TenantUsersList = TenantUsersList;
+ PLUGIN_TENANTS.TenantUsersPersonalCollectionList =
+ TenantUsersPersonalCollectionList;
// Category 1: UI Components
PLUGIN_TENANTS.GroupDescription = function GroupDescription({ group }) {
diff --git a/frontend/src/metabase-types/api/user.ts b/frontend/src/metabase-types/api/user.ts
index e9e0faf990a..8d8f7c3d86b 100644
--- a/frontend/src/metabase-types/api/user.ts
+++ b/frontend/src/metabase-types/api/user.ts
@@ -139,6 +139,7 @@ export type ListUsersRequest = {
group_id?: number;
include_deactivated?: boolean;
tenancy?: UserTenancy;
+ tenant_id?: number;
} & PaginationRequest;
export type ListUsersResponse = {
diff --git a/frontend/src/metabase/lib/urls/collections.ts b/frontend/src/metabase/lib/urls/collections.ts
index 635791b7f1c..e9890f59110 100644
--- a/frontend/src/metabase/lib/urls/collections.ts
+++ b/frontend/src/metabase/lib/urls/collections.ts
@@ -15,6 +15,11 @@ export const otherUsersPersonalCollections = () => "/collection/users";
export const tenantSpecificCollections = () => "/collection/tenant-specific";
+export const tenantUsersPersonalCollections = () => "/collection/tenant-users";
+
+export const tenantUsersPersonalCollectionsForTenant = (tenantId: number) =>
+ `/collection/tenant-users/${tenantId}`;
+
type Collection = Pick<
BaseCollection,
"id" | "name" | "originalName" | "personal_owner_id" | "type"
@@ -67,7 +72,12 @@ export function isCollectionPath(path: string) {
}
export function extractCollectionId(slug = ""): CollectionId | undefined {
- if (slug === "root" || slug === "users" || slug === "tenant-specific") {
+ if (
+ slug === "root" ||
+ slug === "users" ||
+ slug === "tenant-specific" ||
+ slug === "tenant-users"
+ ) {
return slug;
}
return extractEntityId(slug);
diff --git a/frontend/src/metabase/plugins/oss/tenants.ts b/frontend/src/metabase/plugins/oss/tenants.ts
index d67bcc14b01..af796b18934 100644
--- a/frontend/src/metabase/plugins/oss/tenants.ts
+++ b/frontend/src/metabase/plugins/oss/tenants.ts
@@ -47,6 +47,10 @@ const getDefaultPluginTenants = () => ({
TenantSpecificCollectionsItemList: (_props: CollectionItemListProps) =>
null as React.ReactElement | null,
TenantCollectionList: PluginPlaceholder,
+ TenantUsersList: PluginPlaceholder,
+ TenantUsersPersonalCollectionList: PluginPlaceholder as React.ComponentType<{
+ params: { tenantId: string };
+ }>,
GroupDescription: (_props: { group: Group }) =>
null as React.ReactElement | null,
EditUserStrategyModal: PluginPlaceholder,
@@ -112,6 +116,10 @@ export const PLUGIN_TENANTS: {
props: CollectionItemListProps,
) => React.ReactElement | null;
TenantCollectionList: React.ComponentType;
+ TenantUsersList: React.ComponentType;
+ TenantUsersPersonalCollectionList: React.ComponentType<{
+ params: { tenantId: string };
+ }>;
GroupDescription: (props: { group: Group }) => React.ReactElement | null;
EditUserStrategyModal: (props: {
onClose: () => void;
diff --git a/frontend/src/metabase/routes.jsx b/frontend/src/metabase/routes.jsx
index 52a7ba7caaf..00dd530aad1 100644
--- a/frontend/src/metabase/routes.jsx
+++ b/frontend/src/metabase/routes.jsx
@@ -189,6 +189,14 @@ export const getRoutes = (store) => {
<IndexRoute component={PLUGIN_TENANTS.TenantCollectionList} />
</Route>
+ <Route path="collection/tenant-users" component={IsAdmin}>
+ <IndexRoute component={PLUGIN_TENANTS.TenantUsersList} />
+ <Route
+ path=":tenantId"
+ component={PLUGIN_TENANTS.TenantUsersPersonalCollectionList}
+ />
+ </Route>
+
<Route path="collection/:slug" component={CollectionLanding}>
<ModalRoute path="move" modal={MoveCollectionModal} noWrap />
<ModalRoute path="archive" modal={ArchiveCollectionModal} noWrap />