Skip to content

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

[AI Analytics] General improvements (#74318)

Sloan Spargere133a76ca5bc
diff --git a/e2e/test/scenarios/metabot/usage-auditing.cy.spec.ts b/e2e/test/scenarios/metabot/usage-auditing.cy.spec.ts
index e55081edffe..0b4f0a38bad 100644
--- a/e2e/test/scenarios/metabot/usage-auditing.cy.spec.ts
+++ b/e2e/test/scenarios/metabot/usage-auditing.cy.spec.ts
@@ -94,20 +94,14 @@ const ROBERT_CHART_LABELS: CompleteChartLabels = {
ip: ["10.0.0.3", "10.0.0.4", "10.0.0.5"],
};
-const DATE_FILTER_SHORTCUTS = [
- "Today",
- "Yesterday",
- "Previous week",
- "Previous 7 days",
- "Previous 30 days",
- "Previous month",
- "Previous 3 months",
- "Previous 12 months",
-] as const;
-
-type DateFilterLabel = (typeof DATE_FILTER_SHORTCUTS)[number];
-
-const DATE_FILTER_BUTTON_LABEL = new RegExp(DATE_FILTER_SHORTCUTS.join("|"));
+type DateFilterLabel =
+ | "Today"
+ | "Yesterday"
+ | "Last 7 days"
+ | "Last 30 days"
+ | "Previous month"
+ | "Previous 3 months"
+ | "Previous 12 months";
const TODAY_CHART_LABELS: CompleteChartLabels = {
source: ["Slackbot", "Metabot"],
@@ -118,7 +112,7 @@ const TODAY_CHART_LABELS: CompleteChartLabels = {
const PREVIOUS_WEEK_CHART_LABELS: CompleteChartLabels = {
source: ["Metabot"],
- profile: ["NLQ"],
+ profile: ["Slackbot"],
user: ["Bobby Tables"],
ip: ["10.0.0.1"],
};
@@ -139,7 +133,7 @@ const DATE_FILTER_CASES: Array<{
chartLabels: ChartLabels;
}> = [
{ label: "Today", chartLabels: TODAY_CHART_LABELS },
- { label: "Previous week", chartLabels: PREVIOUS_WEEK_CHART_LABELS },
+ { label: "Last 7 days", chartLabels: PREVIOUS_WEEK_CHART_LABELS },
];
const MAIN_PROFILE_LABELS: string[] = [
@@ -540,9 +534,11 @@ function selectDateFilter(
dateLabel: DateFilterLabel,
waitAlias = "@dataset",
): void {
- H.main().findByRole("button", { name: DATE_FILTER_BUTTON_LABEL }).realClick();
- H.popover().findByRole("button", { name: dateLabel }).realClick();
- H.main().findByRole("button", { name: dateLabel }).should("be.visible");
+ H.main().findByTestId("conversation-filters-date-select").realClick();
+ H.selectDropdown().findByText(dateLabel).realClick();
+ H.main()
+ .findByTestId("conversation-filters-date-select")
+ .should("have.value", dateLabel);
cy.wait(waitAlias);
}
diff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/hooks/use-metabot.unit.spec.tsx b/enterprise/frontend/src/embedding-sdk-ee/metabot/hooks/use-metabot.unit.spec.tsx
index 66d958b731a..db0d0841bfc 100644
--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/hooks/use-metabot.unit.spec.tsx
+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/hooks/use-metabot.unit.spec.tsx
@@ -272,7 +272,7 @@ describe("useMetabot", () => {
});
});
- it("filters out internal-only variants (tool_call, edit_suggestion, user action, todo_list)", async () => {
+ it("filters out internal-only variants (tool_call, edit_suggestion, todo_list)", async () => {
const { store } = setup({ ui: <TestMessages /> });
act(() => {
@@ -285,15 +285,6 @@ describe("useMetabot", () => {
status: "started",
} as any),
);
- store.dispatch(
- metabotActions.addUserMessage({
- agentId: "omnibot",
- id: "u-action",
- type: "action",
- message: "5 rows",
- userMessage: "Run Query",
- } as any),
- );
store.dispatch(
metabotActions.addAgentMessage({
agentId: "omnibot",
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx
index 91e1c9ec91f..00946fe0b73 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationDetailPage.tsx
@@ -214,7 +214,7 @@ function FeedbackCard({
debug
readonly
hideActions
- onCopy={noopCopy}
+ getCopyText={noopGetCopyText}
showFeedbackButtons={false}
submittedFeedback={undefined}
bg="background-secondary"
@@ -409,4 +409,6 @@ function noopUpdateQuestion(): Promise<void> {
return Promise.resolve();
}
-function noopCopy() {}
+function noopGetCopyText() {
+ return "";
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsx
index 9f133b32923..02a75324d0f 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationDetailPage/ConversationHeader.tsx
@@ -1,5 +1,6 @@
import { useMemo } from "react";
import { msgid, ngettext, t } from "ttag";
+import _ from "underscore";
import { getGroupFocusPermissionsUrl } from "metabase/admin/permissions/utils/urls";
import { isAdminGroup, isDefaultGroup } from "metabase/admin/utils/groups";
@@ -8,7 +9,10 @@ import {
useListPermissionsGroupsQuery,
useListUserMembershipsQuery,
} from "metabase/api";
-import { Breadcrumbs } from "metabase/common/components/Breadcrumbs";
+import {
+ Breadcrumbs,
+ type Crumb,
+} from "metabase/common/components/Breadcrumbs";
import { DateTime } from "metabase/common/components/DateTime";
import { ForwardRefLink } from "metabase/common/components/Link";
import { renderMetabotProfileLabel } from "metabase/metabot/constants";
@@ -49,16 +53,22 @@ export function ConversationHeader({
const firstName = conversation.user?.first_name?.trim() || userName;
const firstProfile = conversation.profile_id ?? undefined;
+ const crumbs = useMemo<Crumb[]>(
+ () =>
+ _.compact([
+ [t`Conversations`, "/admin/metabot/usage-auditing/conversations"],
+ conversation.user && [
+ userName,
+ `/admin/metabot/usage-auditing/conversations?user=${conversation.user.id}`,
+ ],
+ <DateTime key="created_at" value={conversation.created_at} />,
+ ]),
+ [conversation.user, conversation.created_at, userName],
+ );
+
return (
<>
- <Breadcrumbs
- crumbs={[
- [t`Conversations`, "/admin/metabot/usage-auditing/conversations"],
- <>
- {userName}, <DateTime value={conversation.created_at} />
- </>,
- ]}
- />
+ <Breadcrumbs crumbs={crumbs} />
<Flex justify="space-between" align="flex-start" gap="md">
<Stack gap="sm">
@@ -76,12 +86,6 @@ export function ConversationHeader({
</ActionIcon>
</Menu.Target>
<Menu.Dropdown>
- <Menu.Item
- component={ForwardRefLink}
- to={`/admin/metabot/usage-auditing/conversations?user=${conversation.user.id}`}
- >
- {t`See all of ${firstName}'s conversations`}
- </Menu.Item>
<Menu.Item
component={ForwardRefLink}
to={Urls.editUser(conversation.user)}
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/ConversationFilters.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/ConversationFilters.tsx
index 65be1fad8a3..defc2fcdcb0 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/ConversationFilters.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/ConversationFilters.tsx
@@ -1,13 +1,120 @@
-import { useState } from "react";
+import { useMemo, useState } from "react";
+import { P, match } from "ts-pattern";
import { t } from "ttag";
+import { getOperatorDefaultValue } from "metabase/querying/common/components/DatePicker/SpecificDatePicker/utils";
import type { DatePickerOperator } from "metabase/querying/common/types";
import { DateAllOptionsWidget } from "metabase/querying/parameters/components/DateAllOptionsWidget";
-import { Button, Flex, Popover, Select } from "metabase/ui";
+import { serializeDateParameterValue } from "metabase/querying/parameters/utils/parsing";
+import { Flex, Icon, Popover, Select } from "metabase/ui";
-import { getDateLabel } from "../ConversationStatsPage/utils";
+// width needed to show Previous 12 months option w/ clipping
+const FILTER_WIDTH = 205;
const DATE_OPERATORS: DatePickerOperator[] = ["=", ">", "<", "between"];
+const FIXED_TYPE_VALUE = "__date_filter_fixed__" as const;
+const RELATIVE_TYPE_VALUE = "__date_filter_relative__" as const;
+
+type ActiveDropdown = "default" | "fixed" | "relative";
+
+type ConversationDateFilterProps = {
+ value: string | null;
+ onChange: (val: string) => void;
+};
+
+function ConversationDateFilter({
+ value,
+ onChange,
+}: ConversationDateFilterProps) {
+ const [activeDropdown, setActiveDropdown] =
+ useState<ActiveDropdown>("default");
+
+ // `~` includes the current period by incrementing the day count, so `pastNdays~` spans N+1 days.
+ // To get an N-day window ending today, use `past(N-1)days~`.
+ const data = useMemo(
+ () => [
+ {
+ group: "",
+ items: [
+ { label: t`Today`, value: "thisday" },
+ { label: t`Yesterday`, value: "past1days" },
+ { label: t`Last 7 days`, value: "past6days~" },
+ { label: t`Last 30 days`, value: "past29days~" },
+ ],
+ },
+ {
+ group: "",
+ items: [
+ { label: t`Previous month`, value: "past1months" },
+ { label: t`Previous 3 months`, value: "past3months" },
+ { label: t`Previous 12 months`, value: "past12months" },
+ ],
+ },
+ {
+ group: "",
+ items: [
+ { label: t`Fixed date range…`, value: FIXED_TYPE_VALUE },
+ { label: t`Relative date range…`, value: RELATIVE_TYPE_VALUE },
+ ],
+ },
+ ],
+ [],
+ );
+
+ const handleSelect = (val: string | null) => {
+ match(val)
+ .with(FIXED_TYPE_VALUE, () => setActiveDropdown("fixed"))
+ .with(RELATIVE_TYPE_VALUE, () => setActiveDropdown("relative"))
+ .with(P.string, onChange)
+ .with(null, () => {})
+ .exhaustive();
+ };
+
+ const customRangeSeed = match(activeDropdown)
+ .with("fixed", () =>
+ serializeDateParameterValue(getOperatorDefaultValue("between")),
+ )
+ .with("relative", () => "past30days~")
+ .with("default", () => null)
+ .exhaustive();
+
+ return (
+ <Popover
+ opened={activeDropdown !== "default"}
+ onChange={(opened) => {
+ if (!opened) {
+ setActiveDropdown("default");
+ }
+ }}
+ position="bottom-start"
+ >
+ <Popover.Target>
+ <Select
+ data={data}
+ value={value}
+ onChange={handleSelect}
+ onDropdownOpen={() => setActiveDropdown("default")}
+ w={FILTER_WIDTH}
+ bdrs="sm"
+ allowDeselect={false}
+ leftSection={<Icon name="calendar" />}
+ data-testid="conversation-filters-date-select"
+ />
+ </Popover.Target>
+ <Popover.Dropdown>
+ <DateAllOptionsWidget
+ key={activeDropdown}
+ value={customRangeSeed}
+ availableOperators={DATE_OPERATORS}
+ onChange={(val) => {
+ onChange(val);
+ setActiveDropdown("default");
+ }}
+ />
+ </Popover.Dropdown>
+ </Popover>
+ );
+}
type ConversationFiltersProps = {
date: string | null;
@@ -40,38 +147,15 @@ export function ConversationFilters({
tenantOptions,
hasTenants,
}: ConversationFiltersProps) {
- const [dateOpened, setDateOpened] = useState(false);
-
return (
<Flex gap="sm" wrap="wrap" align="center">
- <Popover
- opened={dateOpened}
- onChange={setDateOpened}
- position="bottom-start"
- >
- <Popover.Target>
- <Button variant="default" onClick={() => setDateOpened((o) => !o)}>
- {getDateLabel(date)}
- </Button>
- </Popover.Target>
- <Popover.Dropdown>
- <DateAllOptionsWidget
- value={null}
- availableOperators={DATE_OPERATORS}
- onChange={(val) => {
- onDateChange(val);
- setDateOpened(false);
- }}
- />
- </Popover.Dropdown>
- </Popover>
{hasTenants && (
<Select
data={[{ value: "", label: t`All tenants` }, ...tenantOptions]}
value={tenant ?? ""}
onChange={(val) => onTenantChange(val === "" ? null : val)}
searchable
- w={180}
+ w={FILTER_WIDTH}
bdrs="sm"
data-testid="conversation-filters-tenant-select"
/>
@@ -84,7 +168,7 @@ export function ConversationFilters({
onGroupChange(val === groupNoFilterValue ? null : val)
}
searchable
- w={180}
+ w={FILTER_WIDTH}
bdrs="sm"
data-testid="conversation-filters-group-select"
/>
@@ -93,10 +177,11 @@ export function ConversationFilters({
value={user ?? ""}
onChange={(val) => onUserChange(val === "" ? null : val)}
searchable
- w={180}
+ w={FILTER_WIDTH}
bdrs="sm"
data-testid="conversation-filters-user-select"
/>
+ <ConversationDateFilter value={date} onChange={onDateChange} />
</Flex>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/useFilterOptions.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/useFilterOptions.ts
index 5be841f1498..67e1b9e8bbd 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/useFilterOptions.ts
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/useFilterOptions.ts
@@ -2,6 +2,7 @@ import { useMemo } from "react";
import { t } from "ttag";
import { useListPermissionsGroupsQuery, useListUsersQuery } from "metabase/api";
+import { useSetting } from "metabase/common/hooks";
import type { DateFilterValue } from "metabase/querying/common/types";
import { deserializeDateParameterValue } from "metabase/querying/parameters/utils/parsing";
import { getUserName } from "metabase/utils/user";
@@ -11,13 +12,13 @@ import type { GroupListQuery } from "metabase-types/api";
import type { FilterUrlState } from "./url-state";
-export const DEFAULT_DATE = "past30days";
+export const DEFAULT_DATE = "past29days~";
export const DEFAULT_GROUP = "1"; // All Users group
export const ALL_USERS_SYNTHETIC = "all";
export const DEFAULT_DATE_FILTER: DateFilterValue = {
type: "relative",
- value: -30,
+ value: -29,
unit: "day",
options: { includeCurrent: true },
};
@@ -67,7 +68,9 @@ export function useFilterOptions({
group,
tenant,
}: FilterUrlState) {
- const tenantsFeatureEnabled = !!hasPremiumFeature("tenants");
+ const useTenantsSetting = useSetting("use-tenants");
+ const tenantsFeatureEnabled =
+ !!hasPremiumFeature("tenants") && !!useTenantsSetting;
const { data: usersData, isLoading: isLoadingUsers } = useListUsersQuery({});
const { data: groupsData, isLoading: isLoadingGroups } =
useListPermissionsGroupsQuery(undefined);
@@ -90,10 +93,13 @@ export function useFilterOptions({
: sortGroupsTenantsDisabled(rawGroups);
const options = ordered.map((g) => ({
value: String(g.id),
- label: g.name,
+ label:
+ !tenantsFeatureEnabled && String(g.id) === DEFAULT_GROUP
+ ? t`All groups`
+ : g.name,
}));
return tenantsFeatureEnabled
- ? [{ value: ALL_USERS_SYNTHETIC, label: t`All users` }, ...options]
+ ? [{ value: ALL_USERS_SYNTHETIC, label: t`All groups` }, ...options]
: options;
}, [groupsData, tenantsFeatureEnabled]);
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/useFilterOptions.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/useFilterOptions.unit.spec.ts
new file mode 100644
index 00000000000..8a1b3dacaff
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationFilters/useFilterOptions.unit.spec.ts
@@ -0,0 +1,92 @@
+import fetchMock from "fetch-mock";
+
+import {
+ setupGroupsEndpoint,
+ setupUsersEndpoints,
+} from "__support__/server-mocks";
+import { mockSettings } from "__support__/settings";
+import { renderHookWithProviders, waitFor } from "__support__/ui";
+import { createMockState } from "metabase/redux/store/mocks";
+import type { Group } from "metabase-types/api";
+import {
+ createMockGroup,
+ createMockTokenFeatures,
+} from "metabase-types/api/mocks";
+
+import { useFilterOptions } from "./useFilterOptions";
+
+const setup = ({
+ tenantsEnabled,
+ groups,
+}: {
+ tenantsEnabled: boolean;
+ groups: Partial<Group>[];
+}) => {
+ setupUsersEndpoints([]);
+ setupGroupsEndpoint(groups.map(createMockGroup));
+ fetchMock.get("path:/api/ee/tenant", { data: [] });
+
+ return renderHookWithProviders(
+ () =>
+ useFilterOptions({ date: null, user: null, group: null, tenant: null }),
+ {
+ storeInitialState: createMockState({
+ settings: mockSettings({
+ "use-tenants": tenantsEnabled,
+ "token-features": createMockTokenFeatures({
+ tenants: tenantsEnabled,
+ }),
+ }),
+ }),
+ },
+ );
+};
+
+describe("useFilterOptions", () => {
+ it("shows All groups, All internal/external users when tenants enabled", async () => {
+ const { result } = setup({
+ tenantsEnabled: true,
+ groups: [
+ {
+ id: 1,
+ name: "All internal users",
+ magic_group_type: "all-internal-users",
+ },
+ {
+ id: 4,
+ name: "All external users",
+ magic_group_type: "all-external-users",
+ },
+ ],
+ });
+
+ await waitFor(() => {
+ const labels = result.current.groupOptions.map((o) => o.label);
+ expect(labels).toEqual(
+ expect.arrayContaining([
+ "All groups",
+ "All internal users",
+ "All external users",
+ ]),
+ );
+ });
+ });
+
+ it("renames All Users to All groups when tenants disabled", async () => {
+ const { result } = setup({
+ tenantsEnabled: false,
+ groups: [
+ { id: 1, name: "All Users", magic_group_type: "all-internal-users" },
+ { id: 2, name: "Admins", magic_group_type: "admin" },
+ ],
+ });
+
+ await waitFor(() => {
+ expect(result.current.groupOptions.length).toBeGreaterThan(0);
+ });
+
+ const labels = result.current.groupOptions.map((o) => o.label);
+ expect(labels).toContain("All groups");
+ expect(labels).not.toContain("All Users");
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx
index 98a3ea375d9..005ceb5e51f 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx
@@ -153,6 +153,8 @@ export function ConversationStatsPage({ location }: WithRouterProps) {
const usageLogAudit = useAuditTable(VIEW_USAGE_LOG);
const groupMembersAudit = useAuditTable(VIEW_GROUP_MEMBERS);
+ const hasDataComplexityFeature = hasPremiumFeature("data-complexity-score");
+
const sharedChartProps: ChartProps = {
provider: conversationsAudit.provider,
table: tableForMetric(
@@ -254,12 +256,21 @@ export function ConversationStatsPage({ location }: WithRouterProps) {
return (
<MetabotAdminLayout fullWidth>
- <SettingsPageWrapper mt="sm" title={t`Usage stats`}>
+ <SettingsPageWrapper
+ mt="sm"
+ title={hasDataComplexityFeature ? t`Usage stats` : undefined}
+ >
<DataComplexitySection />
<Flex align="center" justify="space-between">
- <Title order={3} display="flex" style={{ alignItems: "center" }}>
- {t`Usage metrics`}
- </Title>
+ {hasDataComplexityFeature ? (
+ <Title order={3} display="flex" style={{ alignItems: "center" }}>
+ {t`Usage metrics`}
+ </Title>
+ ) : (
+ <Title order={2} display="flex" style={{ alignItems: "center" }}>
+ {t`Usage stats`}
+ </Title>
+ )}
<ConversationFilters
date={date}
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationsByDayChart.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationsByDayChart.tsx
index 4bc4c385dba..f3293cd5b35 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationsByDayChart.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/ConversationsByDayChart.tsx
@@ -219,7 +219,6 @@ function toTimeseriesRawSeries(
"graph.x_axis.scale": "timeseries",
"graph.x_axis.title_text": "",
"graph.y_axis.title_text": "",
- "line.interpolate": "cardinal",
...getMetricSeriesSettings(metric, getColor, aggregationColumnNames, {
dualAxis: true,
}),
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/utils.ts
index fb1ae7d9002..b7ec39d4048 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/metabot-analytics/components/ConversationStatsPage/utils.ts
@@ -1,11 +1,8 @@
-import { t } from "ttag";
-
import {
type QueryParam,
type UrlStateConfig,
getFirstParamValue,
} from "metabase/common/hooks/use-url-state";
-import { getDateFilterDisplayName } from "metabase/querying/common/utils/dates";
import { deserializeDateParameterValue } from "metabase/querying/parameters/utils/parsing";
import {
@@ -16,13 +13,6 @@ import {
import type { UsageStatsMetric } from "./query-utils";
-export function getDateLabel(value: string | null): string {
- const parsed = value ? deserializeDateParameterValue(value) : undefined;
- return parsed
- ? getDateFilterDisplayName(parsed, { withPrefix: false })
- : t`Date`;
-}
-
export function getFilterDays(dateValue: string): number {
const parsed = deserializeDateParameterValue(dateValue);
if (parsed?.type === "relative" && parsed.value < 0) {
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataPartMessage.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataPartMessage.tsx
index d97f4b60d94..8fb73d5682d 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataPartMessage.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataPartMessage.tsx
@@ -1,4 +1,5 @@
import { useClipboard } from "@mantine/hooks";
+import cx from "classnames";
import { useMemo } from "react";
import { match } from "ts-pattern";
import { t } from "ttag";
@@ -6,16 +7,7 @@ import { t } from "ttag";
import { CodeEditor } from "metabase/common/components/CodeEditor";
import { ForwardRefLink } from "metabase/common/components/Link";
import type { MetabotAgentDataPartMessage } from "metabase/metabot/state";
-import {
- ActionIcon,
- Badge,
- Box,
- Button,
- Flex,
- Icon,
- Stack,
- Text,
-} from "metabase/ui";
+import { ActionIcon, Badge, Box, Flex, Icon, Stack, Text } from "metabase/ui";
import type { MetabotCodeEdit } from "metabase-types/api";
import {
@@ -24,6 +16,7 @@ import {
} from "./MetabotAgentDataSourcePills";
import { AgentSuggestionMessage } from "./MetabotAgentSuggestionMessage";
import { AgentTodoListMessage } from "./MetabotAgentTodoMessage";
+import Styles from "./MetabotChat.module.css";
type AgentDataPartMessageProps = {
message: MetabotAgentDataPartMessage;
@@ -103,9 +96,9 @@ const DataPartJsonCard = ({
return (
<Box
- bg="background-secondary"
bd="1px solid var(--mb-color-border)"
bdrs="sm"
+ className={Styles.agentPartCard}
>
<Flex
py="sm"
@@ -118,7 +111,11 @@ const DataPartJsonCard = ({
<Icon name="document" c="text-secondary" mr="sm" />
<Text fw="bold">{type}</Text>
</Flex>
- <ActionIcon h="sm" onClick={() => clipboard.copy(formatted)}>
+ <ActionIcon
+ h="sm"
+ onClick={() => clipboard.copy(formatted)}
+ className={cx(Styles.agentPartActions, Styles.agentPartActionIcon)}
+ >
<Icon name="copy" size="1rem" />
</ActionIcon>
</Flex>
@@ -151,27 +148,29 @@ const DataPartJsonCard = ({
const NavigateToDataPart = ({ type, path }: { type: string; path: string }) => (
<Flex
- py="sm"
- px="md"
- bg="background-secondary"
- bd="1px solid var(--mb-color-border)"
- bdrs="sm"
direction="row"
align="center"
justify="space-between"
- gap="sm"
+ bd="1px solid var(--mb-color-border)"
+ bdrs="sm"
+ className={Styles.agentPartCard}
+ p="sm"
+ pl="md"
>
- <Flex align="center" gap="sm" style={{ minWidth: 0, flex: 1 }}>
- <Icon name="document" c="text-secondary" />
+ <Flex align="center">
+ <Icon name="document" c="text-secondary" mr="sm" />
<Text fw="bold">{type}</Text>
</Flex>
- <Button
+ <ActionIcon
component={ForwardRefLink}
to={path}
target="_blank"
- variant="light"
- size="compact-xs"
- >{t`Visit`}</Button>
+ h="sm"
+ aria-label={t`Visit`}
+ className={cx(Styles.agentPartActions, Styles.agentPartActionIcon)}
+ >
+ <Icon name="external" size="1rem" />
+ </ActionIcon>
</Flex>
);
@@ -186,9 +185,9 @@ const CodeEditDataPart = ({
return (
<Box
- bg="background-secondary"
bd="1px solid var(--mb-color-border)"
bdrs="sm"
+ className={Styles.agentPartCard}
>
<Flex
py="sm"
@@ -205,12 +204,15 @@ const CodeEditDataPart = ({
{value.mode}
</Badge>
</Flex>
- <ActionIcon h="sm" onClick={() => clipboard.copy(value.value)}>
+ <ActionIcon
+ h="sm"
+ onClick={() => clipboard.copy(value.value)}
+ className={cx(Styles.agentPartActions, Styles.agentPartActionIcon)}
+ >
<Icon name="copy" size="1rem" />
</ActionIcon>
</Flex>
<Box
- bg="background-primary"
style={{
borderTop: "1px solid var(--mb-color-border)",
borderBottomLeftRadius: "var(--mantine-radius-sm)",
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentToolCallMessage.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentToolCallMessage.tsx
index 6b54bf7319f..5444ceb2493 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentToolCallMessage.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentToolCallMessage.tsx
@@ -1,4 +1,5 @@
import { useClipboard, useDisclosure } from "@mantine/hooks";
+import cx from "classnames";
import { useMemo } from "react";
import { t } from "ttag";
@@ -8,7 +9,6 @@ import {
ActionIcon,
Badge,
Box,
- Button,
Flex,
Icon,
Modal,
@@ -16,6 +16,8 @@ import {
Text,
} from "metabase/ui";
+import Styles from "./MetabotChat.module.css";
+
const ToolCallDetailsModal = ({
message,
onClose,
@@ -118,24 +120,35 @@ export const AgentToolCallMessage = ({
<Flex
p="sm"
pl="md"
- bg="background-secondary"
bd="1px solid var(--mb-color-border)"
bdrs="sm"
direction="row"
align="center"
justify="space-between"
+ className={cx(Styles.agentPartCard, Styles.agentPartClickable)}
+ role="button"
+ tabIndex={0}
+ onClick={open}
+ onKeyDown={(e) => {
+ if (e.key === "Enter" || e.key === " ") {
+ e.preventDefault();
+ open();
+ }
+ }}
>
<Flex align="center">
<Icon name="gear" c="text-secondary" mr="sm" />
<Text fw="bold">{message.name}</Text>
</Flex>
- <Flex align="center" gap="xs">
- <Button
- variant="light"
- size="compact-xs"
- onClick={open}
- >{t`View`}</Button>
- <ActionIcon h="sm" onClick={handleCopy}>
+ <Flex align="center" gap="xs" className={Styles.agentPartActions}>
+ <ActionIcon
+ h="sm"
+ onClick={(e) => {
+ e.stopPropagation();
+ handleCopy();
+ }}
+ className={Styles.agentPartActionIcon}
+ >
<Icon name="copy" size="1rem" />
</ActionIcon>
</Flex>
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.module.css b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.module.css
index 76589ba85a2..a08291a1778 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.module.css
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChat.module.css
@@ -83,14 +83,6 @@
overflow: hidden;
}
-.messageUserAction {
- padding: 0.5rem 1rem;
- border-radius: 0.5rem;
- background: var(--mb-color-background-secondary);
- border: 1px solid var(--mb-color-background-tertiary);
- font-weight: bold;
-}
-
.messageActions {
opacity: 0;
transition: all 150ms linear;
@@ -102,6 +94,32 @@
opacity: 1;
}
+.agentPartCard {
+ transition: background 150ms ease;
+}
+
+.agentPartClickable {
+ cursor: pointer;
+}
+
+.agentPartClickable:hover {
+ background: var(--mb-color-background-secondary);
+}
+
+.agentPartActions {
+ opacity: 0;
+ transition: opacity 150ms linear;
+}
+
+.agentPartActionIcon:hover {
+ background-color: var(--mb-color-background-tertiary) !important;
+}
+
+.agentPartCard:hover .agentPartActions,
+.agentPartCard:focus-within .agentPartActions {
+ opacity: 1;
+}
+
.messageContainerAgent + .messageContainerAgent {
margin-top: var(--mantine-spacing-md);
}
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx
index 5b1a88c922e..417fb302e27 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx
@@ -61,7 +61,6 @@ const isUserVisibleDataPartMessage = (
const isUserVisibleMessage = (message: MetabotChatMessage): boolean =>
match(message)
.with({ type: "text" }, () => true)
- .with({ type: "action" }, () => true)
.with({ type: "data_part" }, (message) =>
isUserVisibleDataPartMessage(message),
)
@@ -98,49 +97,43 @@ export const MessageContainer = ({
interface UserMessageProps extends Omit<BaseMessageProps, "message"> {
message: MetabotUserChatMessage;
- onCopy: () => void;
}
export const UserMessage = ({
message,
className,
hideActions,
- onCopy,
...props
-}: UserMessageProps) => (
- <MessageContainer chatRole={message.role} {...props}>
- {message.type === "text" && (
- <AIMarkdown
- className={cx(Styles.message, Styles.messageUser)}
- singleNewlinesAreParagraphs
- >
- {message.message}
- </AIMarkdown>
- )}
-
- {message.type === "action" && (
- <Flex direction="column" gap="xs">
- <Flex align="center" gap="xs">
- <Text className={cx(Styles.message, Styles.messageUserAction)}>
- {message.userMessage}
- </Text>
- </Flex>
- </Flex>
- )}
+}: UserMessageProps) => {
+ const clipboard = useClipboard({ timeout: 2000 });
- <Flex className={Styles.messageActions}>
- {!hideActions && (
- <ActionIcon
- h="sm"
- data-testid="metabot-chat-message-copy"
- onClick={onCopy}
+ return (
+ <MessageContainer chatRole={message.role} {...props}>
+ {message.type === "text" && (
+ <AIMarkdown
+ className={cx(Styles.message, Styles.messageUser)}
+ singleNewlinesAreParagraphs
>
- <Icon name="copy" size="1rem" />
- </ActionIcon>
+ {message.message}
+ </AIMarkdown>
)}
- </Flex>
- </MessageContainer>
-);
+
+ <Flex className={Styles.messageActions}>
+ {!hideActions && (
+ <Tooltip label={clipboard.copied ? t`Copied!` : t`Copy`}>
+ <ActionIcon
+ h="sm"
+ data-testid="metabot-chat-message-copy"
+ onClick={() => clipboard.copy(message.message)}
+ >
+ <Icon name="copy" size="1rem" />
+ </ActionIcon>
+ </Tooltip>
+ )}
+ </Flex>
+ </MessageContainer>
+ );
+};
interface FeedbackButtonProps {
disabled: boolean;
@@ -177,7 +170,7 @@ interface AgentMessageProps extends Omit<BaseMessageProps, "message"> {
debug: boolean;
readonly: boolean;
onRetry?: (messageId: string) => void;
- onCopy: (messageId: string) => void;
+ getCopyText: () => string;
showFeedbackButtons: boolean;
setFeedbackMessage?: (data: { messageId: string; positive: boolean }) => void;
submittedFeedback: "positive" | "negative" | undefined;
@@ -189,7 +182,7 @@ export const AgentMessage = ({
className,
debug,
readonly,
- onCopy,
+ getCopyText,
onRetry,
showFeedbackButtons,
setFeedbackMessage,
@@ -204,6 +197,7 @@ export const AgentMessage = ({
setFeedbackMessage &&
messageId
);
+ const clipboard = useClipboard({ timeout: 2000 });
return (
<MessageContainer chatRole={message.role} {...props}>
@@ -231,11 +225,11 @@ export const AgentMessage = ({
.exhaustive()}
{!hideActions && (
<Flex className={Styles.messageActions}>
- <Tooltip label={t`Copy`}>
+ <Tooltip label={clipboard.copied ? t`Copied!` : t`Copy`}>
<ActionIcon
h="sm"
data-testid="metabot-chat-message-copy"
- onClick={() => onCopy(message.id)}
+ onClick={() => clipboard.copy(getCopyText())}
>
<Icon name="copy" size="1rem" />
</ActionIcon>
@@ -266,7 +260,6 @@ export const AgentMessage = ({
</Tooltip>
</>
)}
-
{onRetry && (
<Tooltip label={t`Retry`}>
<ActionIcon
@@ -437,7 +430,6 @@ export const Messages = ({
() => (debug ? messages : messages.filter(isUserVisibleMessage)),
[debug, messages],
);
- const clipboard = useClipboard();
const [sendToast] = useToast();
const [feedbackState, setFeedbackState] = useState<{
@@ -469,16 +461,16 @@ export const Messages = ({
}
};
- const onAgentMessageCopy = useCallback(
+ const getAgentReplyCopyText = useCallback(
(messageId: string) => {
const allMessages = getFullAgentReply(messages, messageId);
const textMessages = allMessages.filter(
(msg): msg is MetabotAgentTextChatMessage =>
msg.role === "agent" && msg.type === "text",
);
- clipboard.copy(textMessages.map((msg) => msg.message).join("\n\n"));
+ return textMessages.map((msg) => msg.message).join("\n\n");
},
- [messages, clipboard],
+ [messages],
);
const setFeedbackModal = useCallback(
@@ -504,7 +496,7 @@ export const Messages = ({
debug={debug}
readonly={readonly}
onRetry={onRetryMessage}
- onCopy={onAgentMessageCopy}
+ getCopyText={() => getAgentReplyCopyText(message.id)}
showFeedbackButtons={showFeedbackButtons}
setFeedbackMessage={setFeedbackModal}
submittedFeedback={
@@ -521,13 +513,6 @@ export const Messages = ({
data-testid="metabot-chat-message"
message={message}
hideActions={isDoingScience && visibleMessages.length === index + 1}
- onCopy={() => {
- const copyText =
- message.type === "action"
- ? `${message.userMessage}: ${message.message}`
- : message.message;
- clipboard.copy(copyText);
- }}
/>
);
})}
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.unit.spec.tsx
index d5fd99c5474..1abffaa3bd4 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.unit.spec.tsx
@@ -12,7 +12,7 @@ const setup = (message: MetabotAgentChatMessage) =>
showFeedbackButtons={false}
setFeedbackMessage={() => {}}
submittedFeedback={undefined}
- onCopy={() => {}}
+ getCopyText={() => ""}
message={message}
/>,
);
@@ -99,7 +99,7 @@ describe("AgentMessage", () => {
showFeedbackButtons={false}
setFeedbackMessage={() => {}}
submittedFeedback={undefined}
- onCopy={() => {}}
+ getCopyText={() => ""}
message={{
id: "msg",
role: "agent",
diff --git a/frontend/src/metabase/metabot/state/types.ts b/frontend/src/metabase/metabot/state/types.ts
index 81de99457bd..7af33aec29c 100644
--- a/frontend/src/metabase/metabot/state/types.ts
+++ b/frontend/src/metabase/metabot/state/types.ts
@@ -29,14 +29,6 @@ export type MetabotUserTextChatMessage = {
message: string;
};
-export type MetabotUserActionChatMessage = {
- id: string;
- role: "user";
- type: "action";
- message: string;
- userMessage: string;
-};
-
export type MetabotAgentTextChatMessage = {
id: string;
role: "agent";
@@ -93,9 +85,7 @@ export type MetabotAgentChatMessage =
| MetabotAgentTurnAbortedMessage
| MetabotAgentTurnErroredMessage;
-export type MetabotUserChatMessage =
- | MetabotUserTextChatMessage
- | MetabotUserActionChatMessage;
+export type MetabotUserChatMessage = MetabotUserTextChatMessage;
export type MetabotDebugChatMessage = MetabotDebugToolCallMessage;
diff --git a/frontend/src/metabase/metabot/utils/slack-mrkdwn.ts b/frontend/src/metabase/metabot/utils/slack-mrkdwn.ts
index f73113a6d8f..1203263c8bf 100644
--- a/frontend/src/metabase/metabot/utils/slack-mrkdwn.ts
+++ b/frontend/src/metabase/metabot/utils/slack-mrkdwn.ts
@@ -29,11 +29,6 @@ export function convertSlackChatMessage(
...m,
message: slackMrkdwnToMarkdown(m.message),
}))
- .with({ role: "user", type: "action" }, (m) => ({
- ...m,
- message: slackMrkdwnToMarkdown(m.message),
- userMessage: slackMrkdwnToMarkdown(m.userMessage),
- }))
.with({ role: "agent", type: "text" }, (m) => ({
...m,
message: slackMrkdwnToMarkdown(m.message),