Skip to content

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

Address a few AI Controls UI follow-up items (#72482)

Anderson175846d975b5
diff --git a/e2e/test/scenarios/metabot/ai-controls.cy.spec.ts b/e2e/test/scenarios/metabot/ai-controls.cy.spec.ts
index 22f6234d453..1edb3126ba3 100644
--- a/e2e/test/scenarios/metabot/ai-controls.cy.spec.ts
+++ b/e2e/test/scenarios/metabot/ai-controls.cy.spec.ts
@@ -381,7 +381,9 @@ describe("AI controls > AI usage limits", () => {
cy.visit(AI_USAGE_LIMITS_URL);
cy.wait("@getInstanceLimit");
- cy.findByDisplayValue("100").clear();
+ cy.findByRole("textbox", {
+ name: /Total monthly instance limit/,
+ }).clear();
cy.wait("@updateInstanceLimit").then(({ request }) => {
expect(request.body).to.deep.equal({ max_usage: null });
});
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/GroupPermissionRow.module.css b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/GroupPermissionRow.module.css
index 5b697f29ce9..456eb78c047 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/GroupPermissionRow.module.css
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/GroupPermissionRow.module.css
@@ -2,7 +2,7 @@
background: var(--mb-color-background-primary);
box-sizing: border-box;
padding: 0.5rem 1rem;
- text-align: center;
+ text-align: left;
vertical-align: middle;
&.CenterText {
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/GroupPermissionRow.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/GroupPermissionRow.tsx
index f991d6e73d2..e1b536871b5 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/GroupPermissionRow.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotFeatureAccessPage/GroupPermissionRow.tsx
@@ -129,7 +129,7 @@ export function GroupPermissionRow(props: GroupPermissionRowProps) {
}
return (
- <td key={key} className={S.Cell}>
+ <td key={key} className={cx(S.Cell, S.CenterText)}>
<Box className={S.CellContent}>
<Checkbox
aria-label={t`Allow ${group.name} user group to access ${label} AI tool.`}
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GeneralLimitsSettingsSection.module.css b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GeneralLimitsSettingsSection.module.css
index 542d9ab24b8..5babd997a5a 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GeneralLimitsSettingsSection.module.css
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GeneralLimitsSettingsSection.module.css
@@ -10,11 +10,11 @@
max-width: 15rem;
}
-.QuotaMessageInput {
- max-width: 26rem;
-}
-
.InputDescription {
color: var(--mb-color-text-secondary);
line-height: 1rem;
}
+
+.QuotaMessageInputWrapper {
+ width: 100%;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GeneralLimitsSettingsSection.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GeneralLimitsSettingsSection.tsx
index 9a172a7bf47..971de76bfaf 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GeneralLimitsSettingsSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GeneralLimitsSettingsSection.tsx
@@ -1,7 +1,13 @@
import { t } from "ttag";
import { SettingsSection } from "metabase/admin/components/SettingsSection";
-import { SegmentedControl, Stack, Text, TextInput } from "metabase/ui";
+import {
+ NumberInput,
+ SegmentedControl,
+ Stack,
+ Text,
+ TextInput,
+} from "metabase/ui";
import type { MetabotLimitPeriod, MetabotLimitType } from "metabase-types/api";
import S from "./GeneralLimitsSettingsSection.module.css";
@@ -11,6 +17,7 @@ import {
} from "./hooks";
import {
getInstanceLimitInputLabel,
+ getMaxUsageInputSuffix,
getQuotaMessageInputDescription,
limitTypeOptions,
resetPeriodOptions,
@@ -66,7 +73,7 @@ export function GeneralLimitsSettingsSection() {
onChange={handleLimitPeriodChange}
/>
</Stack>
- <TextInput
+ <NumberInput
label={getInstanceLimitInputLabel(
limitType || "tokens",
limitPeriod || "monthly",
@@ -77,12 +84,13 @@ export function GeneralLimitsSettingsSection() {
input: S.InstanceTokenLimitInput,
description: S.InputDescription,
}}
- type="number"
- min={1}
+ suffix={getMaxUsageInputSuffix(limitType, instanceLimit)}
+ min={0}
+ decimalScale={0}
value={instanceLimit != null ? instanceLimit : ""}
- onChange={(e) =>
+ onChange={(value) =>
handleInstanceLimitInputChange(
- sanitizeUsageLimitValue(e.target.value),
+ sanitizeUsageLimitValue(String(value)),
)
}
/>
@@ -91,8 +99,8 @@ export function GeneralLimitsSettingsSection() {
description={getQuotaMessageInputDescription(limitPeriod)}
placeholder={t`You have reached your AI usage limit for the current period. Please contact your administrator.`}
classNames={{
- input: S.QuotaMessageInput,
description: S.InputDescription,
+ root: S.QuotaMessageInputWrapper,
}}
value={quotaMessage || ""}
onChange={(e) => handleQuotaMessageChange(e.target.value)}
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GeneralLimitsSettingsSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GeneralLimitsSettingsSection.unit.spec.tsx
index 26d8e9cbeee..ecf034debd3 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GeneralLimitsSettingsSection.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GeneralLimitsSettingsSection.unit.spec.tsx
@@ -104,7 +104,7 @@ describe("GeneralLimitsSettingsSection", () => {
await screen.findByText("How do you want to limit AI usage?");
await waitFor(() => {
- expect(screen.getByDisplayValue("500")).toBeInTheDocument();
+ expect(screen.getByDisplayValue("500 million")).toBeInTheDocument();
});
});
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsTab/GroupLimitsTab.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsTab/GroupLimitsTab.tsx
index 9eefab51753..e8d5fd308cf 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsTab/GroupLimitsTab.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsTab/GroupLimitsTab.tsx
@@ -5,7 +5,7 @@ import { isEmpty } from "underscore";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useMetadataToasts } from "metabase/metadata/hooks";
-import { Box, Stack, Text, TextInput } from "metabase/ui";
+import { Box, NumberInput, Stack, Text } from "metabase/ui";
import { isDefaultGroup } from "metabase/utils/groups";
import { AllUsersHigherAccessTooltipIcon } from "metabase-enterprise/ai-controls/components/AllUsersHigherAccessTooltipIcon";
import { useUpdateAIControlsGroupLimitMutation } from "metabase-enterprise/api";
@@ -20,6 +20,7 @@ import {
getDescription,
getErrorMessage,
getGroupLimitAriaLabel,
+ getMaxUsageInputSuffix,
sanitizeUsageLimitValue,
} from "./utils";
@@ -104,12 +105,12 @@ export function GroupLimitsTab(props: GroupLimitsTabProps) {
const placeholder =
instanceLimit != null ? String(instanceLimit) : t`Unlimited`;
- const handleChange = (group: GroupInfo, inputValue: string) => {
+ const handleChange = (group: GroupInfo, inputValue: string | number) => {
const maxUsage = sanitizeUsageLimitValue(inputValue);
setLocalLimitsMap((prev) => ({ ...prev, [group.id]: maxUsage }));
const isOverInstanceLimit =
- Number(maxUsage || 0) > Number(instanceLimit || 0);
+ maxUsage != null && instanceLimit != null && maxUsage > instanceLimit;
if (!isOverInstanceLimit) {
debouncedSaveGroupLimit(group, maxUsage);
@@ -154,15 +155,17 @@ export function GroupLimitsTab(props: GroupLimitsTabProps) {
<td className={S.BodyCell}>{group.name}</td>
<td className={S.BodyCell}>
<div className={S.InputWrapper}>
- <TextInput
+ <NumberInput
placeholder={placeholder}
value={inputValue}
- onChange={(e) =>
- handleChange(group, e.target.value)
- }
+ onChange={(value) => handleChange(group, value)}
classNames={{ input: S.LimitInput }}
- type="number"
- min={1}
+ suffix={getMaxUsageInputSuffix(
+ limitType,
+ localLimitsMap?.[group.id],
+ )}
+ min={0}
+ decimalScale={0}
aria-label={getGroupLimitAriaLabel(
limitType,
group.name,
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsTab/GroupLimitsTab.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsTab/GroupLimitsTab.unit.spec.tsx
index f98ade8be93..9f0a00f40ef 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsTab/GroupLimitsTab.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsTab/GroupLimitsTab.unit.spec.tsx
@@ -79,7 +79,7 @@ describe("GroupLimitsTab", () => {
expect(screen.getByText("Administrators")).toBeInTheDocument();
expect(screen.getByText("Marketing")).toBeInTheDocument();
- const adminInput = screen.getByRole("spinbutton", {
+ const adminInput = screen.getByRole("textbox", {
name: /Administrators/,
});
expect(adminInput).toBeInTheDocument();
@@ -115,8 +115,8 @@ describe("GroupLimitsTab", () => {
],
});
- expect(screen.getByDisplayValue("100")).toBeInTheDocument();
- expect(screen.getByDisplayValue("50")).toBeInTheDocument();
+ expect(screen.getByDisplayValue("100 million")).toBeInTheDocument();
+ expect(screen.getByDisplayValue("50 million")).toBeInTheDocument();
});
it("shows 'Unlimited' placeholder when instance limit is null", () => {
@@ -136,12 +136,14 @@ describe("GroupLimitsTab", () => {
it("updates the input value when user types", async () => {
setup();
- const adminInput = screen.getByRole("spinbutton", {
+ const adminInput = screen.getByRole("textbox", {
name: /Administrators/,
});
- await userEvent.type(adminInput, "250");
-
- expect(adminInput).toHaveValue(250);
+ await userEvent.type(adminInput, "1");
+ expect(adminInput).toHaveValue("1 million");
+ await userEvent.clear(adminInput);
+ await userEvent.type(adminInput, "10");
+ expect(adminInput).toHaveValue("10 million");
});
it("shows error message when error is present", () => {
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsTab/utils.ts b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsTab/utils.ts
index 67565c399ec..d2e216b10f5 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsTab/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/GroupLimitsTab/utils.ts
@@ -6,7 +6,11 @@ import type {
MetabotLimitPeriod,
MetabotLimitType,
} from "metabase-types/api";
-export { SAVE_DEBOUNCE_MS, sanitizeUsageLimitValue } from "../../utils";
+export {
+ SAVE_DEBOUNCE_MS,
+ sanitizeUsageLimitValue,
+ getMaxUsageInputSuffix,
+} from "../../utils";
export type GroupLimitsTabProps = {
groupLimits: MetabotGroupLimit[];
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/TenantLimitsTab/TenantLimitsTab.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/TenantLimitsTab/TenantLimitsTab.tsx
index 2a6c825a73b..74b8afea663 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/TenantLimitsTab/TenantLimitsTab.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/TenantLimitsTab/TenantLimitsTab.tsx
@@ -5,7 +5,15 @@ import { isEmpty } from "underscore";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useMetadataToasts } from "metabase/metadata/hooks";
-import { Alert, Box, Icon, Stack, Text, TextInput } from "metabase/ui";
+import {
+ Alert,
+ Box,
+ Icon,
+ NumberInput,
+ Stack,
+ Text,
+ TextInput,
+} from "metabase/ui";
import { useUpdateAIControlsTenantLimitMutation } from "metabase-enterprise/api";
import type { Tenant } from "metabase-types/api";
@@ -18,6 +26,7 @@ import {
getColumnName,
getDescription,
getInputLabel,
+ getMaxUsageInputSuffix,
sanitizeUsageLimitValue,
} from "./utils";
@@ -73,7 +82,7 @@ export function TenantLimitsTab(props: SpecificTenantsTabProps) {
SAVE_DEBOUNCE_MS,
);
- const handleChange = (tenant: Tenant, inputValue: string) => {
+ const handleChange = (tenant: Tenant, inputValue: string | number) => {
const maxUsage = sanitizeUsageLimitValue(inputValue);
setLocalLimitsMap((prev: Record<number, number | null>) => ({
...prev,
@@ -153,25 +162,27 @@ export function TenantLimitsTab(props: SpecificTenantsTabProps) {
<tr key={tenant.id} className={S.BodyRow}>
<td className={S.BodyCell}>{tenant.name}</td>
<td className={S.BodyCell}>
- <TextInput
+ <NumberInput
placeholder={placeholder}
value={inputValue}
- onChange={(e) =>
- handleChange(tenant, e.target.value)
- }
+ onChange={(value) => handleChange(tenant, value)}
classNames={{ input: S.LimitInput }}
error={
isOverInstanceLimit
? t`Can't be higher than the instance limit`
: undefined
}
- type="number"
- min={1}
+ min={0}
+ decimalScale={0}
aria-label={getInputLabel(
tenant.name,
limitType,
limitPeriod,
)}
+ suffix={getMaxUsageInputSuffix(
+ limitType,
+ localLimitsMap?.[tenant.id],
+ )}
/>
</td>
</tr>
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/TenantLimitsTab/TenantLimitsTab.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/TenantLimitsTab/TenantLimitsTab.unit.spec.tsx
index 1ecf9d19a07..66e655f0d45 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/TenantLimitsTab/TenantLimitsTab.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/TenantLimitsTab/TenantLimitsTab.unit.spec.tsx
@@ -87,13 +87,13 @@ describe("TenantLimitsTab", () => {
it("populates inputs from existing tenant limits", () => {
setup({
tenantLimits: [
- { tenant_id: 1, max_usage: 200 },
- { tenant_id: 2, max_usage: 75 },
+ { tenant_id: 1, max_usage: 1 },
+ { tenant_id: 2, max_usage: 10 },
],
});
- expect(screen.getByDisplayValue("200")).toBeInTheDocument();
- expect(screen.getByDisplayValue("75")).toBeInTheDocument();
+ expect(screen.getByDisplayValue("1 million")).toBeInTheDocument();
+ expect(screen.getByDisplayValue("10 million")).toBeInTheDocument();
});
it("shows 'Unlimited' placeholder when instance limit is null", () => {
@@ -138,12 +138,12 @@ describe("TenantLimitsTab", () => {
it("updates input value when user types", async () => {
setup();
- const acmeInput = screen.getByRole("spinbutton", {
+ const acmeInput = screen.getByRole("textbox", {
name: /Acme Corp/,
});
await userEvent.type(acmeInput, "300");
- expect(acmeInput).toHaveValue(300);
+ expect(acmeInput).toHaveValue("300 million");
});
it("shows error when value exceeds the instance limit", async () => {
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/TenantLimitsTab/utils.ts b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/TenantLimitsTab/utils.ts
index f712a480b04..199c95795e2 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/TenantLimitsTab/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/GroupLimitsSettingsSection/TenantLimitsTab/utils.ts
@@ -7,7 +7,11 @@ import type {
Tenant,
} from "metabase-types/api";
-export { SAVE_DEBOUNCE_MS, sanitizeUsageLimitValue } from "../../utils";
+export {
+ SAVE_DEBOUNCE_MS,
+ sanitizeUsageLimitValue,
+ getMaxUsageInputSuffix,
+} from "../../utils";
export type SpecificTenantsTabProps = {
hasTenantsError: boolean;
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/hooks/useInstanceLimitDebouncedInput.ts b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/hooks/useInstanceLimitDebouncedInput.ts
index e946292853c..bdbc25732de 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/hooks/useInstanceLimitDebouncedInput.ts
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/hooks/useInstanceLimitDebouncedInput.ts
@@ -37,8 +37,13 @@ export function useInstanceLimitDebouncedInput() {
const handleInstanceLimitInputChange = useCallback(
(maxUsage: number | null) => {
- setInstanceLimit(maxUsage);
- debouncedSaveInstanceLimit(maxUsage);
+ setInstanceLimit((prev) => {
+ if (prev !== maxUsage) {
+ void debouncedSaveInstanceLimit(maxUsage);
+ }
+
+ return maxUsage;
+ });
},
[debouncedSaveInstanceLimit],
);
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/utils.ts
index efa115f8a25..e828ae84f25 100644
--- a/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/ai-controls/pages/MetabotUsageLimitsPage/utils.ts
@@ -1,4 +1,4 @@
-import { t } from "ttag";
+import { c, msgid, t } from "ttag";
import type { SegmentedControlItem } from "metabase/ui";
import type { MetabotLimitPeriod, MetabotLimitType } from "metabase-types/api";
@@ -10,8 +10,8 @@ export const MAX_LIMIT_INPUT = 999999999;
* Sanitizes the input value for a usage limit.
* Return an integer value or null if the input is empty.
*/
-export const sanitizeUsageLimitValue = (inputValue: string) => {
- let sanitizedStrValue = inputValue.trim();
+export const sanitizeUsageLimitValue = (inputValue: string | number) => {
+ let sanitizedStrValue = String(inputValue).trim();
if (sanitizedStrValue !== "") {
sanitizedStrValue = Math.min(
@@ -106,3 +106,21 @@ export function getQuotaMessageInputDescription(
) {
return messageDescriptionMap[limitPeriod];
}
+
+export function getMaxUsageInputSuffix(
+ limitType: MetabotLimitType,
+ value?: number | null,
+) {
+ if (limitType === "tokens" && !!value) {
+ return (
+ " " +
+ c("suffix after a numeral, e.g. '10 million'").ngettext(
+ msgid`million`,
+ `million`,
+ value,
+ )
+ );
+ }
+
+ return undefined;
+}