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
BOT-1427: link conversation user groups to filtered usage stats (#81869)
Andrei Simionescu66038ba6d015
diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.unit.spec.tsxindex a5b35be0940..d923db2ea49 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.unit.spec.tsx@@ -15,7 +15,11 @@ import type {ConversationDetail,ConversationFeedback,} from "metabase-enterprise/monitor/ai-auditing/metabot-analytics/types";-import { createMockUser } from "metabase-types/api/mocks";+import type {+ GroupListQuery,+ ListUserMembershipsResponse,+} from "metabase-types/api";+import { createMockGroup, createMockUser } from "metabase-types/api/mocks";import { ConversationDetailPage } from "./ConversationDetailPage";@@ -105,10 +109,14 @@ function createConversation(};}-function setup(conversation: ConversationDetail) {+function setup(+ conversation: ConversationDetail,+ groups: GroupListQuery[] = [],+ memberships: ListUserMembershipsResponse = {},+) {setupMetabotConversationEndpoint(conversation);- setupGroupsEndpoint([]);- setupPermissionMembershipEndpoint({});+ setupGroupsEndpoint(groups);+ setupPermissionMembershipEndpoint(memberships);return renderWithProviders(<Routepath="/conversations/:convoId"@@ -399,4 +407,35 @@ describe("ConversationDetailPage", () => {screen.queryByTestId("tool-call-details-sidebar"),).not.toBeInTheDocument();});++ it("links each of the user's groups to the usage page filtered by that group", async () => {+ const group = createMockGroup({+ id: 42,+ name: "Analysts",+ magic_group_type: null,+ });+ setup(+ {+ ...createConversation([userMessage("u1", null, "hi")]),+ user: {+ id: 7,+ first_name: "Ada",+ last_name: "Lovelace",+ tenant_id: null,+ },+ },+ [group],+ { 7: [{ user_id: 7, group_id: group.id, membership_id: 1 }] },+ );++ await userEvent.click(+ await screen.findByRole("button", { name: /Analysts/ }),+ );++ expect(screen.getByText("View a group's usage")).toBeInTheDocument();+ expect(screen.getByRole("menuitem", { name: /Analysts/ })).toHaveAttribute(+ "href",+ Urls.monitorAiAuditingUsage({ groupId: 42 }),+ );+ });});diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsxindex 6687e403336..dd1c8bb036a 100644--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsx@@ -2,7 +2,6 @@ import { useMemo } from "react";import { msgid, ngettext, t } from "ttag";import _ from "underscore";-import { getGroupFocusPermissionsUrl } from "metabase/admin/permissions/utils/urls";import {skipToken,useListPermissionsGroupsQuery,@@ -233,12 +232,12 @@ function UserGroupsMenu({</Anchor></Menu.Target><Menu.Dropdown miw="14rem">- <Menu.Label>{t`View a group's permissions`}</Menu.Label>+ <Menu.Label>{t`View a group's usage`}</Menu.Label>{userGroups.map((group) => (<Menu.Itemkey={group.id}component={ForwardRefLink}- to={getGroupFocusPermissionsUrl(group.id)}+ to={Urls.monitorAiAuditingUsage({ groupId: group.id })}leftSection={<Icon name="group" size={14} />}>{group.name}diff --git a/frontend/src/metabase/urls/monitor.ts b/frontend/src/metabase/urls/monitor.tsindex f5bb11848df..901816704ce 100644--- a/frontend/src/metabase/urls/monitor.ts+++ b/frontend/src/metabase/urls/monitor.ts@@ -1,4 +1,5 @@import type {+ GroupId,TaskRunDateFilterOption,TaskRunEntityType,TaskRunType,@@ -93,8 +94,9 @@ export function monitorAiAuditing() {return `${ROOT_URL}/ai-auditing`;}-export function monitorAiAuditingUsage() {- return `${monitorAiAuditing()}/usage`;+export function monitorAiAuditingUsage(opts?: { groupId?: GroupId }) {+ const path = `${monitorAiAuditing()}/usage`;+ return opts?.groupId == null ? path : `${path}?group=${opts.groupId}`;}export function monitorAiAuditingConversations() {