Skip to content

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

feat(toast): add negative and warning variants (#83900)

Uladzimir Havenchykfa334dc0c44f
diff --git a/enterprise/frontend/src/metabase-enterprise/application_permissions/reducer.ts b/enterprise/frontend/src/metabase-enterprise/application_permissions/reducer.ts
index d315c716b82..c5742644564 100644
--- a/enterprise/frontend/src/metabase-enterprise/application_permissions/reducer.ts
+++ b/enterprise/frontend/src/metabase-enterprise/application_permissions/reducer.ts
@@ -93,7 +93,7 @@ export const saveApplicationPermissions = createThunkAction(
).catch((error) => {
dispatch(
addUndo({
- icon: "warning",
+ variant: "negative",
message: getErrorMessage(error, t`Error saving permissions`),
}),
);
diff --git a/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsJWTForm/JWTGroupMappingSection/use-group-mapping-settings.ts b/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsJWTForm/JWTGroupMappingSection/use-group-mapping-settings.ts
index 9c1c0515f6a..ed84097c750 100644
--- a/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsJWTForm/JWTGroupMappingSection/use-group-mapping-settings.ts
+++ b/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsJWTForm/JWTGroupMappingSection/use-group-mapping-settings.ts
@@ -56,8 +56,7 @@ export function useGroupMappingSettings(): GroupMappingSettingsState {
if (showErrorToast) {
sendToast({
message: error,
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
});
}
return { ok: false, error };
diff --git a/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/OidcGroupMappingSection/OidcGroupMappingSection.tsx b/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/OidcGroupMappingSection/OidcGroupMappingSection.tsx
index fecdc924998..3b700c065e5 100644
--- a/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/OidcGroupMappingSection/OidcGroupMappingSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/OidcGroupMappingSection/OidcGroupMappingSection.tsx
@@ -91,8 +91,7 @@ export function OidcGroupMappingSection({
if (showErrorToast) {
sendToast({
message: error,
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
});
}
return { ok: false, error };
diff --git a/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/SettingsOIDCForm.tsx b/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/SettingsOIDCForm.tsx
index a5601071952..ef347b35688 100644
--- a/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/SettingsOIDCForm.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/SettingsOIDCForm.tsx
@@ -240,7 +240,7 @@ export function SettingsOIDCForm() {
if (result.credentials?.verified === false) {
sendToast({
message: t`OIDC discovery succeeded, but credentials could not be verified. The identity provider does not support the grant type used for testing.`,
- icon: "warning",
+ variant: "warning",
});
} else {
sendToast({
@@ -251,7 +251,7 @@ export function SettingsOIDCForm() {
} catch (error) {
sendToast({
message: getErrorMessage(error, t`OIDC configuration check failed`),
- icon: "warning",
+ variant: "negative",
});
}
},
diff --git a/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/SettingsOIDCForm.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/SettingsOIDCForm.unit.spec.tsx
index e7f829de16a..ceb88908272 100644
--- a/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/SettingsOIDCForm.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsOIDCForm/SettingsOIDCForm.unit.spec.tsx
@@ -71,6 +71,11 @@ const setup = async ({
writeStatus,
writeMessage,
writeGate,
+ checkResponse = {
+ ok: true,
+ discovery: { step: "discovery", success: true },
+ credentials: { step: "credentials", success: true, verified: true },
+ },
}: {
providers?: CustomOidcConfig[];
configured?: boolean;
@@ -82,6 +87,7 @@ const setup = async ({
writeStatus?: number;
writeMessage?: string;
writeGate?: Promise<void>;
+ checkResponse?: object;
} = {}) => {
setupSettingsEndpoints(
providersEnvName == null
@@ -133,11 +139,7 @@ const setup = async ({
},
{ delay: writeDelay },
);
- fetchMock.post("path:/api/ee/sso/oidc/check", {
- ok: true,
- discovery: { step: "discovery", success: true },
- credentials: { step: "credentials", success: true, verified: true },
- });
+ fetchMock.post("path:/api/ee/sso/oidc/check", checkResponse);
renderWithProviders(<SettingsOIDCForm />, { withUndos: true });
@@ -287,6 +289,44 @@ describe("SettingsOIDCForm", () => {
});
});
+ describe("check connection", () => {
+ it("warns when discovery succeeds but the credentials cannot be verified", async () => {
+ await setup({
+ checkResponse: {
+ ok: true,
+ discovery: { step: "discovery", success: true },
+ credentials: { step: "credentials", success: true, verified: false },
+ },
+ });
+ await fillRequiredFields();
+
+ await clickWhenEnabled(
+ screen.getByRole("button", { name: "Check connection" }),
+ );
+
+ const toast = await screen.findByTestId("toast-undo");
+ expect(toast).toHaveTextContent(
+ "OIDC discovery succeeded, but credentials could not be verified.",
+ );
+ expect(toast).toHaveAttribute("data-variant", "warning");
+ });
+
+ it("shows a negative toast with the server message when the check fails", async () => {
+ await setup({
+ checkResponse: { status: 400, body: { message: "Invalid issuer" } },
+ });
+ await fillRequiredFields();
+
+ await clickWhenEnabled(
+ screen.getByRole("button", { name: "Check connection" }),
+ );
+
+ const toast = await screen.findByTestId("toast-undo");
+ expect(toast).toHaveTextContent("Invalid issuer");
+ expect(toast).toHaveAttribute("data-variant", "negative");
+ });
+ });
+
describe("layout", () => {
it("lays the cards out in the designed order", async () => {
await setup({ providers: [EXISTING_PROVIDER] });
diff --git a/enterprise/frontend/src/metabase-enterprise/auth/containers/OidcAuthCard/OidcAuthCard.tsx b/enterprise/frontend/src/metabase-enterprise/auth/containers/OidcAuthCard/OidcAuthCard.tsx
index 2695a3ab77a..467da805770 100644
--- a/enterprise/frontend/src/metabase-enterprise/auth/containers/OidcAuthCard/OidcAuthCard.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/auth/containers/OidcAuthCard/OidcAuthCard.tsx
@@ -38,7 +38,7 @@ export function OidcAuthCard() {
} catch (error) {
sendToast({
message: getErrorMessage(error, t`Failed to update OIDC provider`),
- icon: "warning",
+ variant: "negative",
});
}
},
@@ -53,7 +53,7 @@ export function OidcAuthCard() {
} catch (error) {
sendToast({
message: getErrorMessage(error, t`Failed to deactivate OIDC provider`),
- icon: "warning",
+ variant: "negative",
});
}
}, [providers, deleteProvider, sendToast]);
diff --git a/enterprise/frontend/src/metabase-enterprise/caching/components/DatabaseCachingEditor.tsx b/enterprise/frontend/src/metabase-enterprise/caching/components/DatabaseCachingEditor.tsx
index df7f52dd374..c47fe02a2c3 100644
--- a/enterprise/frontend/src/metabase-enterprise/caching/components/DatabaseCachingEditor.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/caching/components/DatabaseCachingEditor.tsx
@@ -194,7 +194,7 @@ export const DatabaseCachingEditor = () => {
} catch {
dispatch(
addUndo({
- icon: "warning",
+ variant: "negative",
message: t`Could not reset the caching policies.`,
}),
);
diff --git a/enterprise/frontend/src/metabase-enterprise/content_translation/components/ContentTranslationConfiguration/ContentTranslationConfiguration.tsx b/enterprise/frontend/src/metabase-enterprise/content_translation/components/ContentTranslationConfiguration/ContentTranslationConfiguration.tsx
index 937a4900783..7debdb97628 100644
--- a/enterprise/frontend/src/metabase-enterprise/content_translation/components/ContentTranslationConfiguration/ContentTranslationConfiguration.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/content_translation/components/ContentTranslationConfiguration/ContentTranslationConfiguration.tsx
@@ -275,7 +275,7 @@ const UploadForm = ({
if (errorMessages.length) {
return sendToast({
message: t`Could not upload dictionary`,
- icon: "warning",
+ variant: "negative",
});
}
},
diff --git a/enterprise/frontend/src/metabase-enterprise/custom_viz/custom-viz-plugins.tsx b/enterprise/frontend/src/metabase-enterprise/custom_viz/custom-viz-plugins.tsx
index ec7e3947ddf..428866051b6 100644
--- a/enterprise/frontend/src/metabase-enterprise/custom_viz/custom-viz-plugins.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/custom_viz/custom-viz-plugins.tsx
@@ -527,8 +527,7 @@ export async function loadCustomVizPluginForDisplay(
if (!plugin) {
onMessage?.({
- icon: "warning_triangle_filled",
- iconColor: "feedback-warning",
+ variant: "warning",
message: t`Custom visualization "${display}" was requested but no matching installed plugin was found. Check the name and that the plugin is uploaded.`,
});
return { status: "unavailable" };
diff --git a/enterprise/frontend/src/metabase-enterprise/custom_viz/utils/unavailable-toast.ts b/enterprise/frontend/src/metabase-enterprise/custom_viz/utils/unavailable-toast.ts
index c3c5f6af9b3..c0336a35fc3 100644
--- a/enterprise/frontend/src/metabase-enterprise/custom_viz/utils/unavailable-toast.ts
+++ b/enterprise/frontend/src/metabase-enterprise/custom_viz/utils/unavailable-toast.ts
@@ -55,8 +55,7 @@ function flushUnavailableCustomVizPluginReports() {
if (plugins.length > 0 && onMessage) {
onMessage({
- icon: "warning_triangle_filled",
- iconColor: "feedback-warning",
+ variant: "warning",
message: getUnavailableMessage(plugins),
});
}
diff --git a/enterprise/frontend/src/metabase-enterprise/custom_viz/utils/unavailable-toast.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/custom_viz/utils/unavailable-toast.unit.spec.ts
index 03d0907ac97..7aa7d954f66 100644
--- a/enterprise/frontend/src/metabase-enterprise/custom_viz/utils/unavailable-toast.unit.spec.ts
+++ b/enterprise/frontend/src/metabase-enterprise/custom_viz/utils/unavailable-toast.unit.spec.ts
@@ -14,8 +14,7 @@ const SDK_VERSION_WARNING = {
};
const warningToast = (message: string) => ({
- icon: "warning_triangle_filled",
- iconColor: "feedback-warning",
+ variant: "warning",
message,
});
diff --git a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/ManageDataAppGroupsPage.tsx b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/ManageDataAppGroupsPage.tsx
index 9017140bd11..8fec2c44aec 100644
--- a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/ManageDataAppGroupsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/ManageDataAppGroupsPage.tsx
@@ -68,7 +68,7 @@ const DataAppGroups = ({
const { error } = await addGroups({ name: appName, group_ids: groupIds });
if (error) {
- sendToast({ message: t`Failed to add groups`, icon: "warning" });
+ sendToast({ message: t`Failed to add groups`, variant: "negative" });
return false;
}
@@ -81,7 +81,7 @@ const DataAppGroups = ({
const { error } = await removeGroup({ name: appName, group_id: group.id });
if (error) {
- sendToast({ message: t`Failed to remove group`, icon: "warning" });
+ sendToast({ message: t`Failed to remove group`, variant: "negative" });
}
return !error;
diff --git a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppActionsMenu/DataAppActionsMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppActionsMenu/DataAppActionsMenu.tsx
index f391c0c28cc..8cb80cfe746 100644
--- a/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppActionsMenu/DataAppActionsMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data_apps/admin/components/DataAppActionsMenu/DataAppActionsMenu.tsx
@@ -26,7 +26,7 @@ export const DataAppActionsMenu = ({ app, canRemove = false }: Props) => {
try {
await setEnabled({ name: app.name, enabled: !app.enabled }).unwrap();
} catch {
- sendToast({ message: t`Failed to update this app`, icon: "warning" });
+ sendToast({ message: t`Failed to update this app`, variant: "negative" });
}
}, [app.name, app.enabled, setEnabled, sendToast]);
@@ -41,7 +41,7 @@ export const DataAppActionsMenu = ({ app, canRemove = false }: Props) => {
} catch {
sendToast({
message: t`Failed to remove this data app`,
- icon: "warning",
+ variant: "negative",
});
}
},
diff --git a/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.ts b/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.ts
index b144ff30b41..bb140d4f1f9 100644
--- a/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.ts
+++ b/enterprise/frontend/src/metabase-enterprise/license/use-upsell-flow.ts
@@ -82,7 +82,7 @@ export function useUpsellFlow({
useEffect(() => {
if (error) {
sendToast({
- icon: "warning",
+ variant: "negative",
message: error,
timeout: NOTIFICATION_TIMEOUT,
});
diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/components/MetabotVerifiedContentConfigurationPane.tsx b/enterprise/frontend/src/metabase-enterprise/moderation/components/MetabotVerifiedContentConfigurationPane.tsx
index e549856a734..7f0e2e19a81 100644
--- a/enterprise/frontend/src/metabase-enterprise/moderation/components/MetabotVerifiedContentConfigurationPane.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/moderation/components/MetabotVerifiedContentConfigurationPane.tsx
@@ -23,7 +23,7 @@ export function MetabotVerifiedContentConfigurationPane({
if (result.error) {
sendToast({
message: t`Error updating Metabot`,
- icon: "warning",
+ variant: "negative",
});
}
};
diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx
index efda17be2a4..d2df02e3a79 100644
--- a/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/monitor/ai-auditing/metabot-analytics/components/ConversationStatsPage/ConversationStatsPage.tsx
@@ -434,8 +434,7 @@ export function DataComplexityHeader() {
await refreshDataComplexityScores().unwrap();
} catch (error) {
sendToast({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: getErrorMessage(
error,
t`Could not recompute data complexity.`,
diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/ContentDiagnosticsBulkActionsBar/ContentDiagnosticsBulkDismissButton.tsx b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/ContentDiagnosticsBulkActionsBar/ContentDiagnosticsBulkDismissButton.tsx
index ee59264563a..a223ab68bba 100644
--- a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/ContentDiagnosticsBulkActionsBar/ContentDiagnosticsBulkDismissButton.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/ContentDiagnosticsBulkActionsBar/ContentDiagnosticsBulkDismissButton.tsx
@@ -57,7 +57,7 @@ export function ContentDiagnosticsBulkDismissButton({
});
dispatch(
addUndo({
- icon: "warning",
+ variant: "negative",
message: getErrorMessage(error, t`Couldn't dismiss findings`),
}),
);
diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/ContentDiagnosticsBulkActionsBar/use-bulk-trash-confirmation.ts b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/ContentDiagnosticsBulkActionsBar/use-bulk-trash-confirmation.ts
index cc8d8b7a69b..86fd1b4d7f5 100644
--- a/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/ContentDiagnosticsBulkActionsBar/use-bulk-trash-confirmation.ts
+++ b/enterprise/frontend/src/metabase-enterprise/monitor/content-diagnostics/components/ContentDiagnosticsBulkActionsBar/use-bulk-trash-confirmation.ts
@@ -53,7 +53,7 @@ export function useBulkTrashConfirmation({
if (failedFindings.length > 0) {
dispatch(
addUndo({
- icon: "warning",
+ variant: "negative",
message: ngettext(
msgid`Couldn't remove ${failedFindings.length} item`,
`Couldn't remove ${failedFindings.length} items`,
diff --git a/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionsPage/use-session-revocation.ts b/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionsPage/use-session-revocation.ts
index b6ed9ae7618..34fa5a05c91 100644
--- a/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionsPage/use-session-revocation.ts
+++ b/enterprise/frontend/src/metabase-enterprise/monitor/session-management/SessionsPage/use-session-revocation.ts
@@ -44,7 +44,7 @@ export function useSessionRevocation({
if (remaining > 0) {
dispatch(
addUndo({
- icon: "warning",
+ variant: "warning",
message: ngettext(
msgid`${remaining} new session started while revoking`,
`${remaining} new sessions started while revoking`,
@@ -57,7 +57,7 @@ export function useSessionRevocation({
} catch (error) {
dispatch(
addUndo({
- icon: "warning",
+ variant: "negative",
message: getErrorMessage(error, t`Could not revoke sessions.`),
}),
);
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/BranchDropdown.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/BranchDropdown.tsx
index 8a2ed274626..4a45e3df34b 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/BranchDropdown.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/BranchDropdown.tsx
@@ -91,7 +91,7 @@ export const BranchDropdown = ({
} catch {
sendToast({
message: t`Failed to create branch`,
- icon: "warning",
+ variant: "negative",
});
}
};
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.tsx
index 288c01104c6..bc24ad6a1a4 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.tsx
@@ -80,7 +80,7 @@ export const GitSyncControls = () => {
currentTask?.sync_task_type === "export"
) {
sendToast({
- icon: "warning",
+ variant: "negative",
message: t`The remote branch changed before your push finished. Pull the latest changes, then push again.`,
});
dispatch(taskCleared());
@@ -182,7 +182,7 @@ export const GitSyncControls = () => {
setConflictPreflight(null);
sendToast({
message: t`Couldn't check whether your changes can be merged. You can still force the pull or stash to a new branch.`,
- icon: "warning",
+ variant: "warning",
});
} finally {
setIsCheckingPreflight(false);
@@ -217,7 +217,7 @@ export const GitSyncControls = () => {
sendToast({
message: errorMessage || t`Failed to pull from remote`,
- icon: "warning",
+ variant: "negative",
});
}
}, [
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/BranchSwitcher.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/BranchSwitcher.tsx
index 0f21d35b841..28dd5dedc43 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/BranchSwitcher.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/BranchSwitcher.tsx
@@ -91,8 +91,7 @@ export const BranchSwitcher = ({
return;
}
sendToast({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: errorMessage ?? t`Sorry, we were unable to switch branches.`,
});
}
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/PullChangesButton.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/PullChangesButton.tsx
index ef7f4da9813..4a57af89830 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/PullChangesButton.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/PullChangesButton.tsx
@@ -40,7 +40,7 @@ export const PullChangesButton = (props: PullChangesButtonProps) => {
} catch (error) {
sendToast({
message: t`Failed to pull changes`,
- icon: "warning",
+ variant: "negative",
});
}
}, [importChanges, branch, forcePull, sendToast]);
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/hooks.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/hooks.ts
index b8ab6d4dd39..3ee73009eb4 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/hooks.ts
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/hooks.ts
@@ -49,7 +49,7 @@ export const usePushChangesAction = () => {
const { errorMessage } = parseSyncError(error as SyncError);
sendToast({
message: errorMessage || t`Failed to push changes`,
- icon: "warning",
+ variant: "negative",
timeout: 8000,
});
}
@@ -89,7 +89,7 @@ export const useMergeChangesAction = () => {
const { errorMessage } = parseSyncError(error as SyncError);
sendToast({
message: errorMessage || t`Failed to merge changes`,
- icon: "warning",
+ variant: "negative",
timeout: 8000,
});
}
@@ -126,7 +126,7 @@ export const useMergeImportAction = () => {
const { errorMessage } = parseSyncError(error as SyncError);
sendToast({
message: errorMessage || t`Failed to merge changes`,
- icon: "warning",
+ variant: "negative",
timeout: 8000,
});
}
@@ -153,7 +153,7 @@ export const useStashToNewBranchAction = (existingBranches: string[]) => {
if (!newBranchName) {
sendToast({
message: t`Please enter a valid branch name`,
- icon: "warning",
+ variant: "warning",
});
return;
}
@@ -161,7 +161,7 @@ export const useStashToNewBranchAction = (existingBranches: string[]) => {
if (existingBranches.includes(newBranchName)) {
sendToast({
message: t`This branch name already exists`,
- icon: "warning",
+ variant: "warning",
});
return;
}
@@ -187,7 +187,7 @@ export const useStashToNewBranchAction = (existingBranches: string[]) => {
} catch (error) {
sendToast({
message: t`Failed to push changes to new branch`,
- icon: "warning",
+ variant: "negative",
});
} finally {
setIsStashing(false);
@@ -228,7 +228,7 @@ export const useDiscardChangesAndImportAction = () => {
errorMessage ||
c("{0} is the GitHub branch name")
.t`Failed to import from branch ${targetBranch}`,
- icon: "warning",
+ variant: "negative",
});
}
},
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.tsx
index 5223fed876f..53fe888bc55 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.tsx
@@ -64,8 +64,7 @@ export function SyncProgressModal({
sendToast({
message,
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
timeout: 60000,
});
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-disable-remote-sync.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-disable-remote-sync.ts
index 9f8dc90f4e1..80413b15d63 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-disable-remote-sync.ts
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-disable-remote-sync.ts
@@ -33,7 +33,7 @@ export const useDisableRemoteSync = () => {
console.error(error);
sendToast({
message: t`Failed to disable Remote Sync`,
- icon: "warning",
+ variant: "negative",
});
}
},
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-remote-sync-submit.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-remote-sync-submit.ts
index 74776769438..cfffb631084 100644
--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-remote-sync-submit.ts
+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-remote-sync-submit.ts
@@ -80,7 +80,7 @@ export const useRemoteSyncSubmit = ({
} catch (error) {
sendToast({
message: t`Failed to create Library`,
- icon: "warning",
+ variant: "negative",
});
throw error;
}
@@ -138,7 +138,7 @@ export const useRemoteSyncSubmit = ({
} catch (error) {
sendToast({
message: getErrorMessage(error, t`Settings could not be saved`),
- icon: "warning",
+ variant: "negative",
});
throw isRemoteSyncDependencyError(error)
? { ...error, data: { ...error.data, errors: undefined } }
diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/NotificationChannelConfigModal/NotificationChannelConfigModal.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/NotificationChannelConfigModal/NotificationChannelConfigModal.tsx
index 1029437bc2e..dcd93bdd950 100644
--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/NotificationChannelConfigModal/NotificationChannelConfigModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/NotificationChannelConfigModal/NotificationChannelConfigModal.tsx
@@ -45,8 +45,7 @@ export function NotificationChannelConfigModal({
onClose();
} catch {
sendToast({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: t`Failed to save notification settings`,
});
} finally {
@@ -64,8 +63,7 @@ export function NotificationChannelConfigModal({
});
} catch {
sendToast({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: t`Failed to send test notification`,
});
} finally {
diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.tsx
index 370b2798d89..f20e9b27ca0 100644
--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.tsx
@@ -78,8 +78,7 @@ export function SecurityCenterPage() {
setIsPolling(true);
} catch {
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "feedback-warning",
+ variant: "negative",
message: t`Failed to check for security advisories`,
});
}
@@ -105,8 +104,7 @@ export function SecurityCenterPage() {
} else if (pollCountRef.current >= MAX_POLL_COUNT) {
setIsPolling(false);
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "feedback-warning",
+ variant: "warning",
message: t`Security advisory check is taking longer than expected. Results will appear when ready.`,
});
}
diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/MoveSnippetModal/MoveSnippetModal.tsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/MoveSnippetModal/MoveSnippetModal.tsx
index fe06e370173..5b1b692e236 100644
--- a/enterprise/frontend/src/metabase-enterprise/snippets/components/MoveSnippetModal/MoveSnippetModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/MoveSnippetModal/MoveSnippetModal.tsx
@@ -31,7 +31,7 @@ export function MoveSnippetModal({ snippet, onClose }: MoveSnippetModalProps) {
} catch (error) {
sendToast({
message: getErrorMessage(error, t`Failed to move snippet`),
- icon: "warning",
+ variant: "negative",
});
} finally {
setIsMoving(false);
diff --git a/enterprise/frontend/src/metabase-enterprise/storage/use-purchase-storage-add-on.ts b/enterprise/frontend/src/metabase-enterprise/storage/use-purchase-storage-add-on.ts
index 553dcc4b63d..29badc9b4b8 100644
--- a/enterprise/frontend/src/metabase-enterprise/storage/use-purchase-storage-add-on.ts
+++ b/enterprise/frontend/src/metabase-enterprise/storage/use-purchase-storage-add-on.ts
@@ -111,8 +111,7 @@ export function usePurchaseStorageAddOn() {
} catch {
setPhase("idle");
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "feedback-warning",
+ variant: "negative",
message: t`It looks like something went wrong. Please refresh the page and try again.`,
});
}
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsx
index ef37ab2ba5c..4bcc4764b0d 100644
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsx
@@ -68,12 +68,12 @@ export const ErrorUpdateToast = ({ error }: ErrorUpdateToastProps) => {
return (
<Group gap="2.5rem" w="20rem">
<Group gap="0.5rem">
- <Icon name="warning" c="feedback-negative" size={12} />
+ <Icon name="warning" c="feedback-negative-strong" size={12} />
<Text c="inherit" fw={700}>{t`Couldn't save table changes`}</Text>
</Group>
<Button
- variant="on-dark-secondary"
+ variant="default"
size="sm"
onClick={() => setShowDetails(true)}
>{t`More info`}</Button>
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/use-table-editing-toast-controller.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/use-table-editing-toast-controller.tsx
index a111272554e..eae1a1b72ce 100644
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/use-table-editing-toast-controller.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/use-table-editing-toast-controller.tsx
@@ -25,6 +25,7 @@ export function useTableEditingToastController() {
dispatch(
addUndo({
icon: null,
+ variant: "negative",
renderChildren: () => <ErrorUpdateToast error={error} />,
timeout: null, // removes automatic toast hide
onDismiss,
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/CreateTenantsOnboardingStep.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/CreateTenantsOnboardingStep.tsx
index 71164f2fbfc..c062ad67912 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/CreateTenantsOnboardingStep.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/CreateTenantsOnboardingStep/CreateTenantsOnboardingStep.tsx
@@ -108,8 +108,7 @@ export const CreateTenantsOnboardingStep = ({
onTenantsCreated?.(tenants);
} catch (error) {
sendToast({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: getErrorMessage(error, t`Failed to create tenants`),
});
}
diff --git a/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx b/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx
index beae1b98ab8..2d1fec940ab 100644
--- a/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx
@@ -119,8 +119,7 @@ export function UploadManagementTable() {
sendToast({
message,
- toastColor: "feedback-negative",
- icon: "warning",
+ variant: "negative",
});
} else if (result.length > 0) {
const message = ngettext(
diff --git a/frontend/src/metabase/account/notifications/containers/ArchiveAlertModal/DeleteAlertModal.tsx b/frontend/src/metabase/account/notifications/containers/ArchiveAlertModal/DeleteAlertModal.tsx
index f93146f0487..2288e52cf9b 100644
--- a/frontend/src/metabase/account/notifications/containers/ArchiveAlertModal/DeleteAlertModal.tsx
+++ b/frontend/src/metabase/account/notifications/containers/ArchiveAlertModal/DeleteAlertModal.tsx
@@ -46,8 +46,7 @@ export const DeleteAlertModal = ({
if (result.error) {
sendToast({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: t`An error occurred`,
});
return;
diff --git a/frontend/src/metabase/account/notifications/containers/UnsubscribeAlertModal/UnsubscribeAlertModal.tsx b/frontend/src/metabase/account/notifications/containers/UnsubscribeAlertModal/UnsubscribeAlertModal.tsx
index 4e47cbe1e66..2b8eed268f5 100644
--- a/frontend/src/metabase/account/notifications/containers/UnsubscribeAlertModal/UnsubscribeAlertModal.tsx
+++ b/frontend/src/metabase/account/notifications/containers/UnsubscribeAlertModal/UnsubscribeAlertModal.tsx
@@ -45,8 +45,7 @@ export const UnsubscribeAlertModal = ({
if (result.error) {
sendToast({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: t`An error occurred`,
});
return;
diff --git a/frontend/src/metabase/actions/components/DeleteObjectModal/DeleteObjectModal.tsx b/frontend/src/metabase/actions/components/DeleteObjectModal/DeleteObjectModal.tsx
index 688b56cc491..dd6fdfb5376 100644
--- a/frontend/src/metabase/actions/components/DeleteObjectModal/DeleteObjectModal.tsx
+++ b/frontend/src/metabase/actions/components/DeleteObjectModal/DeleteObjectModal.tsx
@@ -46,7 +46,7 @@ export const DeleteObjectModal: FunctionComponent<Props> = ({
onSuccess();
} catch (error) {
const message = getActionErrorMessage(error);
- sendToast({ icon: "warning", toastColor: "feedback-negative", message });
+ sendToast({ variant: "negative", message });
}
};
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsx b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsx
index 90ffc7c42be..27e16094b2d 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsx
@@ -91,7 +91,7 @@ export function ActionCreator({
onClose?.();
});
} catch (_error) {
- sendToast({ icon: "warning", message: t`Failed to create action` });
+ sendToast({ variant: "negative", message: t`Failed to create action` });
}
};
@@ -113,7 +113,7 @@ export function ActionCreator({
onClose?.();
});
} catch (_error) {
- sendToast({ icon: "warning", message: t`Failed to update action` });
+ sendToast({ variant: "negative", message: t`Failed to update action` });
}
};
diff --git a/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.tsx b/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.tsx
index 1f4d2bd1317..a8ea153d92c 100644
--- a/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.tsx
+++ b/frontend/src/metabase/admin/ai/MetabotAdminSuggestedPrompts.tsx
@@ -60,7 +60,7 @@ export const MetabotPromptSuggestionPane = ({
sendToast(
error
- ? { message: t`Error removing prompt`, icon: "warning" }
+ ? { message: t`Error removing prompt`, variant: "negative" }
: { message: t`Successfully removed prompt`, icon: "check" },
);
@@ -76,7 +76,10 @@ export const MetabotPromptSuggestionPane = ({
const handleRegeneratePrompts = async () => {
const { data, error } = await regeneratePrompts(metabot.id);
if (error || !data) {
- sendToast({ message: t`Error regenerating prompts`, icon: "warning" });
+ sendToast({
+ message: t`Error regenerating prompts`,
+ variant: "negative",
+ });
return;
}
setPage(0);
diff --git a/frontend/src/metabase/admin/ai/MetabotSettingsPanel.tsx b/frontend/src/metabase/admin/ai/MetabotSettingsPanel.tsx
index 9049f64fefc..3505c5deb11 100644
--- a/frontend/src/metabase/admin/ai/MetabotSettingsPanel.tsx
+++ b/frontend/src/metabase/admin/ai/MetabotSettingsPanel.tsx
@@ -180,7 +180,7 @@ function MetabotCollectionConfigurationPane({
if (result.error) {
sendToast({
message: t`Error setting ${newEntity.name}`,
- icon: "warning",
+ variant: "negative",
});
}
};
diff --git a/frontend/src/metabase/admin/people/components/GroupDetail.tsx b/frontend/src/metabase/admin/people/components/GroupDetail.tsx
index 36e3ff16cf8..cec531f1a45 100644
--- a/frontend/src/metabase/admin/people/components/GroupDetail.tsx
+++ b/frontend/src/metabase/admin/people/components/GroupDetail.tsx
@@ -89,7 +89,7 @@ export const GroupDetail = ({
} else {
const { error } = await updateMembership(membership);
if (error) {
- sendToast({ message: t`Failed to update user` });
+ sendToast({ message: t`Failed to update user`, variant: "negative" });
}
}
};
@@ -115,7 +115,10 @@ export const GroupDetail = ({
} else {
const { error } = await deleteMembership(membership);
if (error) {
- sendToast({ message: t`Failed to remove user from group` });
+ sendToast({
+ message: t`Failed to remove user from group`,
+ variant: "negative",
+ });
}
}
};
diff --git a/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.tsx b/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.tsx
index 5cfd8231452..01b3f0b3fdc 100644
--- a/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.tsx
+++ b/frontend/src/metabase/admin/performance/components/ModelPersistenceConfiguration.tsx
@@ -95,8 +95,7 @@ export const ModelPersistenceConfiguration = () => {
sendToast({ message: "Saved" });
} catch (e) {
sendToast({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: t`An error occurred`,
});
} finally {
diff --git a/frontend/src/metabase/admin/performance/hooks/useInvalidateTarget.tsx b/frontend/src/metabase/admin/performance/hooks/useInvalidateTarget.tsx
index 42fc6bf610c..d1f93a73e5d 100644
--- a/frontend/src/metabase/admin/performance/hooks/useInvalidateTarget.tsx
+++ b/frontend/src/metabase/admin/performance/hooks/useInvalidateTarget.tsx
@@ -33,9 +33,8 @@ export const useInvalidateTarget = (
if (isErrorWithMessage(e)) {
dispatch(
addUndo({
- icon: "warning",
+ variant: "negative",
message: e.data.message,
- toastColor: "feedback-negative",
}),
);
}
diff --git a/frontend/src/metabase/admin/settings/auth/components/GroupMappings/SettingsGroupMappingSection.unit.spec.tsx b/frontend/src/metabase/admin/settings/auth/components/GroupMappings/SettingsGroupMappingSection.unit.spec.tsx
index 96092af3e4a..0288b5be4b9 100644
--- a/frontend/src/metabase/admin/settings/auth/components/GroupMappings/SettingsGroupMappingSection.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/auth/components/GroupMappings/SettingsGroupMappingSection.unit.spec.tsx
@@ -523,11 +523,11 @@ describe("SettingsGroupMappingSection", () => {
screen.getByRole("button", { name: "Remove mapping and delete group" }),
);
- expect(
- await screen.findByText(
- "Mapping deleted, but its deleted group could not be removed from the other mappings",
- ),
- ).toBeInTheDocument();
+ const toast = await screen.findByTestId("toast-undo");
+ expect(toast).toHaveTextContent(
+ "Mapping deleted, but its deleted group could not be removed from the other mappings",
+ );
+ expect(toast).toHaveAttribute("data-variant", "warning");
expect(
screen.queryByText("Error saving group mapping"),
).not.toBeInTheDocument();
diff --git a/frontend/src/metabase/admin/settings/auth/components/GroupMappings/use-group-mappings.ts b/frontend/src/metabase/admin/settings/auth/components/GroupMappings/use-group-mappings.ts
index 5e5f3912004..44a317becec 100644
--- a/frontend/src/metabase/admin/settings/auth/components/GroupMappings/use-group-mappings.ts
+++ b/frontend/src/metabase/admin/settings/auth/components/GroupMappings/use-group-mappings.ts
@@ -58,8 +58,7 @@ export function useGroupMappings({
if (showErrorToast) {
sendToast({
message: error,
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
});
}
return { ok: false, error };
diff --git a/frontend/src/metabase/admin/settings/auth/components/GroupMappings/use-mapping-deletion.ts b/frontend/src/metabase/admin/settings/auth/components/GroupMappings/use-mapping-deletion.ts
index 1c54a3547ae..92ffa922bd7 100644
--- a/frontend/src/metabase/admin/settings/auth/components/GroupMappings/use-mapping-deletion.ts
+++ b/frontend/src/metabase/admin/settings/auth/components/GroupMappings/use-mapping-deletion.ts
@@ -99,8 +99,7 @@ export function useMappingDeletion({
if (failureCount > 0) {
sendToast({
message: t`Mapping deleted, but not all of its groups could be updated`,
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "warning",
});
return;
}
@@ -111,8 +110,7 @@ export function useMappingDeletion({
`Mapping deleted, but its deleted groups could not be removed from the other mappings`,
deletedIds.length,
),
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "warning",
});
return;
}
diff --git a/frontend/src/metabase/admin/settings/components/Email/BaseSMTPConnectionForm.tsx b/frontend/src/metabase/admin/settings/components/Email/BaseSMTPConnectionForm.tsx
index 6124381805c..dd026f4c629 100644
--- a/frontend/src/metabase/admin/settings/components/Email/BaseSMTPConnectionForm.tsx
+++ b/frontend/src/metabase/admin/settings/components/Email/BaseSMTPConnectionForm.tsx
@@ -122,8 +122,7 @@ export const BaseSMTPConnectionForm = ({
const result = await deleteMutation();
if (result.error) {
sendToast({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: isErrorWithMessage(result.error)
? result.error.data.message
: t`Error clearing email settings`,
@@ -149,8 +148,7 @@ export const BaseSMTPConnectionForm = ({
onClose();
} catch (error) {
sendToast({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: getErrorMessage(error, t`Error updating email settings`),
});
diff --git a/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.tsx b/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.tsx
index 9038a7a829b..75c4ebc086e 100644
--- a/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.tsx
+++ b/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.tsx
@@ -93,7 +93,7 @@ export function UploadSettingsFormView({
const showError = (msg: string) => {
setErrorMessage(msg);
setTimeout(() => setErrorMessage(null), FEEDBACK_TIMEOUT);
- sendToast({ icon: "warning", message: msg });
+ sendToast({ variant: "negative", message: msg });
};
const handleEnableUploads = async () => {
diff --git a/frontend/src/metabase/admin/settings/components/widgets/SendTestEmailWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/SendTestEmailWidget.tsx
index bc17a4f9bdd..737b402e60c 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/SendTestEmailWidget.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/SendTestEmailWidget.tsx
@@ -26,8 +26,7 @@ export function SendTestEmailWidget() {
});
} catch (error) {
sendToast({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: getTestEmailErrorMessage(error),
});
}
diff --git a/frontend/src/metabase/admin/settings/components/widgets/SendTestEmailWidget.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/widgets/SendTestEmailWidget.unit.spec.tsx
index 3925ef1b54f..e33b95b87f2 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/SendTestEmailWidget.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/SendTestEmailWidget.unit.spec.tsx
@@ -90,6 +90,10 @@ describe("SendTestEmailWidget", () => {
const toasts = screen.getAllByLabelText("warning icon");
expect(toasts).toHaveLength(1);
});
+ expect(screen.getByTestId("toast-undo")).toHaveAttribute(
+ "data-variant",
+ "negative",
+ );
expect(
screen.getByRole("alert", { name: "Error sending test email" }),
diff --git a/frontend/src/metabase/collections/components/CollectionBulkActions/ArchivedBulkActions.tsx b/frontend/src/metabase/collections/components/CollectionBulkActions/ArchivedBulkActions.tsx
index b261c648651..e7f6e70d6e7 100644
--- a/frontend/src/metabase/collections/components/CollectionBulkActions/ArchivedBulkActions.tsx
+++ b/frontend/src/metabase/collections/components/CollectionBulkActions/ArchivedBulkActions.tsx
@@ -98,6 +98,7 @@ export const ArchivedBulkActions = ({
dispatch(
addUndo({
message: t`There was an error permanently deleting these items.`,
+ variant: "negative",
}),
);
} finally {
diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx
index d9f3ddb35d4..068b6a0a0af 100644
--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx
+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx
@@ -147,8 +147,7 @@ export const CollectionContentView = ({
if (rejected.length > 1) {
sendToast({
message: t`Please upload files individually`,
- toastColor: "feedback-negative",
- icon: "warning",
+ variant: "warning",
});
return;
}
@@ -168,8 +167,7 @@ export const CollectionContentView = ({
sendToast({
message: errorMessage,
- toastColor: "feedback-negative",
- icon: "warning",
+ variant: "warning",
});
},
[sendToast],
@@ -270,6 +268,7 @@ export const CollectionContentView = ({
dispatch(
addUndo({
message: t`There was an error permanently deleting this item.`,
+ variant: "negative",
}),
);
}
diff --git a/frontend/src/metabase/collections/components/CollectionContent/use-collection-chart-paste.ts b/frontend/src/metabase/collections/components/CollectionContent/use-collection-chart-paste.ts
index 3516a9ae6cd..4e71747546a 100644
--- a/frontend/src/metabase/collections/components/CollectionContent/use-collection-chart-paste.ts
+++ b/frontend/src/metabase/collections/components/CollectionContent/use-collection-chart-paste.ts
@@ -52,8 +52,7 @@ export function useCollectionChartPaste(collection: Collection) {
dispatch(
addUndo({
id: PASTE_TOAST_ID,
- icon: "warning",
- toastColor: "error",
+ variant: "negative",
message: t`Couldn't save the chart to this collection`,
}),
);
diff --git a/frontend/src/metabase/comments/components/Comments/Comments.tsx b/frontend/src/metabase/comments/components/Comments/Comments.tsx
index e0a9986b727..18020ec48ea 100644
--- a/frontend/src/metabase/comments/components/Comments/Comments.tsx
+++ b/frontend/src/metabase/comments/components/Comments/Comments.tsx
@@ -174,8 +174,7 @@ export const Comments = ({
if (error) {
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "feedback-warning",
+ variant: "negative",
message: t`Failed to send comment`,
});
}
diff --git a/frontend/src/metabase/comments/components/Discussion/Discussion.tsx b/frontend/src/metabase/comments/components/Discussion/Discussion.tsx
index c234b95ee1a..1be6c8aa296 100644
--- a/frontend/src/metabase/comments/components/Discussion/Discussion.tsx
+++ b/frontend/src/metabase/comments/components/Discussion/Discussion.tsx
@@ -70,8 +70,7 @@ export const Discussion = ({
if (error) {
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "feedback-warning",
+ variant: "negative",
message: t`Failed to send comment`,
});
}
@@ -86,8 +85,7 @@ export const Discussion = ({
if (error) {
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "feedback-warning",
+ variant: "negative",
message: t`Failed to delete comment`,
});
}
@@ -101,8 +99,7 @@ export const Discussion = ({
if (error) {
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "feedback-warning",
+ variant: "negative",
message: t`Failed to resolve comment`,
});
}
@@ -116,8 +113,7 @@ export const Discussion = ({
if (error) {
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "feedback-warning",
+ variant: "negative",
message: t`Failed to unresolve comment`,
});
}
@@ -134,8 +130,7 @@ export const Discussion = ({
if (error) {
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "feedback-warning",
+ variant: "negative",
message: t`Failed to update comment`,
});
}
@@ -167,8 +162,7 @@ export const Discussion = ({
if (error) {
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "feedback-warning",
+ variant: "negative",
message: errorMessage,
});
}
diff --git a/frontend/src/metabase/common/collections/components/UnarchiveCollectionButton/UnarchiveCollectionButton.tsx b/frontend/src/metabase/common/collections/components/UnarchiveCollectionButton/UnarchiveCollectionButton.tsx
index 5fba8c39e12..3a8f83bb79b 100644
--- a/frontend/src/metabase/common/collections/components/UnarchiveCollectionButton/UnarchiveCollectionButton.tsx
+++ b/frontend/src/metabase/common/collections/components/UnarchiveCollectionButton/UnarchiveCollectionButton.tsx
@@ -38,7 +38,7 @@ export function UnarchiveCollectionButton({
void dispatch(
addUndo({
message: t`"${collection.name}" could not be archived`,
- icon: "warning",
+ variant: "negative",
}),
);
} else {
@@ -52,7 +52,7 @@ export function UnarchiveCollectionButton({
void dispatch(
addUndo({
message: t`"${collection.name}" could not be unarchived`,
- icon: "warning",
+ variant: "negative",
}),
);
}
diff --git a/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.tsx b/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.tsx
index adeb3cb67e6..fc108332429 100644
--- a/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.tsx
+++ b/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.tsx
@@ -112,7 +112,7 @@ export const ErrorDiagnosticModal = ({
dispatch(
addUndo({
message: t`Failed to send diagnostic information to Slack`,
- icon: "warning",
+ variant: "negative",
}),
);
}
@@ -121,7 +121,7 @@ export const ErrorDiagnosticModal = ({
dispatch(
addUndo({
message: t`Error sending diagnostic information to Slack`,
- icon: "warning",
+ variant: "negative",
}),
);
} finally {
diff --git a/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.tsx b/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.tsx
index 283de31435b..7adc143fc35 100644
--- a/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.tsx
+++ b/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.tsx
@@ -46,8 +46,7 @@ export function RevisionHistoryTimeline({
} catch (error) {
dispatch(
addUndo({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: getErrorMessage(
error,
t`Failed to revert to previous version.`,
diff --git a/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.unit.spec.tsx b/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.unit.spec.tsx
index 3178864d177..70c85794a2c 100644
--- a/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.unit.spec.tsx
@@ -53,8 +53,7 @@ describe("RevisionHistoryTimeline", () => {
expect(store.getState().undo).toHaveLength(1);
});
expect(store.getState().undo[0]).toMatchObject({
- toastColor: "feedback-negative",
- icon: "warning",
+ variant: "negative",
message: "Cannot revert: missing card",
});
});
@@ -72,8 +71,7 @@ describe("RevisionHistoryTimeline", () => {
expect(store.getState().undo).toHaveLength(1);
});
expect(store.getState().undo[0]).toMatchObject({
- toastColor: "feedback-negative",
- icon: "warning",
+ variant: "negative",
message: "Failed to revert to previous version.",
});
});
diff --git a/frontend/src/metabase/common/components/Toaster/Toaster.module.css b/frontend/src/metabase/common/components/Toaster/Toaster.module.css
index b8db8f50f12..14ad5c877fc 100644
--- a/frontend/src/metabase/common/components/Toaster/Toaster.module.css
+++ b/frontend/src/metabase/common/components/Toaster/Toaster.module.css
@@ -82,3 +82,34 @@
.dismiss:active {
background-color: var(--mb-color-button-on_dark-secondary-pressed);
}
+
+.toast[data-variant="negative"],
+.toast[data-variant="warning"] {
+ background-color: var(--mb-color-background_surface-primary);
+}
+
+.toast[data-variant="negative"] {
+ border: 0.5px solid var(--mb-color-feedback-negative-strong);
+}
+
+.toast[data-variant="warning"] {
+ border: 0.5px solid var(--mb-color-feedback-warning-strong);
+}
+
+.toast[data-variant="negative"] .icon {
+ color: var(--mb-color-feedback-negative-strong);
+}
+
+.toast[data-variant="warning"] .icon {
+ color: var(--mb-color-feedback-warning-strong);
+}
+
+.toast[data-variant="negative"] .dismiss,
+.toast[data-variant="warning"] .dismiss {
+ color: var(--mb-color-text-primary);
+}
+
+.toast[data-variant="negative"] .dismiss:hover,
+.toast[data-variant="warning"] .dismiss:hover {
+ background-color: var(--mb-color-background-hover);
+}
diff --git a/frontend/src/metabase/common/components/Toaster/Toaster.stories.tsx b/frontend/src/metabase/common/components/Toaster/Toaster.stories.tsx
index b2c639a4f25..b3ecfbc5e48 100644
--- a/frontend/src/metabase/common/components/Toaster/Toaster.stories.tsx
+++ b/frontend/src/metabase/common/components/Toaster/Toaster.stories.tsx
@@ -1,8 +1,10 @@
import type { StoryFn } from "@storybook/react";
+import type { UndoVariant } from "metabase/redux/store/undo";
import { Icon, Stack } from "metabase/ui";
import {
StoryJsx,
+ StoryRow,
StorySection,
StoryShowcase,
} from "metabase/ui/stories/showcase";
@@ -69,6 +71,13 @@ export const Default = {
const noop = () => undefined;
+const COLORED_VARIANTS: { variant: UndoVariant; title: string }[] = [
+ { variant: "negative", title: "Negative" },
+ { variant: "warning", title: "Warning" },
+];
+
+const BUTTON_COUNTS = [0, 1, 2] as const;
+
export const Overview = {
render: () => (
<StoryShowcase title="Toast">
@@ -154,9 +163,42 @@ export const Overview = {
/>
</Stack>
</StorySection>
+
+ {COLORED_VARIANTS.map(({ variant, title }) => (
+ <StorySection
+ key={variant}
+ title={title}
+ description={`<Toast variant="${variant}" ... />`}
+ >
+ {BUTTON_COUNTS.map((buttonCount) => (
+ <StoryRow
+ key={buttonCount}
+ label={buttonCount === 1 ? "1 button" : `${buttonCount} buttons`}
+ >
+ <Toast
+ show
+ variant={variant}
+ message="The title goes here"
+ leftSection={<Icon name="model" size={16} />}
+ confirmText="Button"
+ secondaryText="Button"
+ onConfirm={buttonCount > 0 ? noop : undefined}
+ onSecondary={buttonCount > 1 ? noop : undefined}
+ onDismiss={noop}
+ />
+ </StoryRow>
+ ))}
+ </StorySection>
+ ))}
</StoryShowcase>
),
+ args: { theme: "light" },
parameters: {
controls: { include: ["theme"] },
},
};
+
+export const OverviewDark = {
+ ...Overview,
+ args: { ...Overview.args, theme: "dark" },
+};
diff --git a/frontend/src/metabase/common/components/Toaster/Toaster.tsx b/frontend/src/metabase/common/components/Toaster/Toaster.tsx
index 419b16034e9..1792aacfc95 100644
--- a/frontend/src/metabase/common/components/Toaster/Toaster.tsx
+++ b/frontend/src/metabase/common/components/Toaster/Toaster.tsx
@@ -3,6 +3,7 @@ import type { HTMLAttributes, ReactNode } from "react";
import { useEffect, useState } from "react";
import { t } from "ttag";
+import type { UndoVariant } from "metabase/redux/store/undo";
import { Button, Group, Icon, Notification, Portal, Text } from "metabase/ui";
import S from "./Toaster.module.css";
@@ -24,6 +25,7 @@ export interface ToastProps extends Omit<
secondaryAriaLabel?: string;
leftSection?: ReactNode;
rightSection?: ReactNode;
+ variant?: UndoVariant;
onConfirm?: () => void;
onDismiss?: () => void;
onSecondary?: () => void;
@@ -42,6 +44,7 @@ export const Toast = ({
secondaryAriaLabel = t`Cancel`,
leftSection,
rightSection,
+ variant = "neutral",
onConfirm,
onDismiss,
onSecondary,
@@ -52,6 +55,7 @@ export const Toast = ({
const hasActions = Boolean(
onConfirm || (secondaryText && onSecondary) || rightSection,
);
+ const isColored = variant !== "neutral";
return (
<Notification
@@ -62,6 +66,7 @@ export const Toast = ({
closeButton: S.dismiss,
}}
data-testid={dataTestId}
+ data-variant={variant}
data-show={show ? true : undefined}
data-fixed={fixed ? true : undefined}
data-has-actions={hasActions ? true : undefined}
@@ -76,29 +81,35 @@ export const Toast = ({
{...divProps}
>
<Group gap="xl" align="center" wrap="nowrap">
- <Text className={S.message} flex={1} c="tooltip-text" fz="md">
+ <Text
+ className={S.message}
+ flex={1}
+ c={isColored ? "text-primary" : "tooltip-text"}
+ fz="md"
+ >
{message}
</Text>
{hasActions && (
<Group gap="sm" align="center" wrap="nowrap">
- {onConfirm && (
+ {secondaryText && onSecondary && (
<Button
- variant="on-dark-primary"
+ variant={isColored ? "default" : "on-dark-secondary"}
size="sm"
- onClick={onConfirm}
- aria-label={confirmAriaLabel}
+ onClick={onSecondary}
+ aria-label={secondaryAriaLabel}
>
- {confirmText}
+ {secondaryText}
</Button>
)}
- {secondaryText && onSecondary && (
+ {onConfirm && (
<Button
- variant="on-dark-secondary"
+ variant={isColored ? "filled" : "on-dark-primary"}
+ color={isColored ? variant : undefined}
size="sm"
- onClick={onSecondary}
- aria-label={secondaryAriaLabel}
+ onClick={onConfirm}
+ aria-label={confirmAriaLabel}
>
- {secondaryText}
+ {confirmText}
</Button>
)}
{rightSection}
@@ -116,6 +127,7 @@ export interface ToasterProps extends HTMLAttributes<HTMLDivElement> {
fixed?: boolean;
leftSection?: ReactNode;
rightSection?: ReactNode;
+ variant?: UndoVariant;
onConfirm: () => void;
onDismiss: () => void;
}
@@ -127,6 +139,7 @@ export const Toaster = ({
fixed,
leftSection,
rightSection,
+ variant,
onConfirm,
onDismiss,
className,
@@ -158,6 +171,7 @@ export const Toaster = ({
fixed={fixed}
leftSection={leftSection}
rightSection={rightSection}
+ variant={variant}
onConfirm={onConfirm}
onDismiss={onDismiss}
className={className}
diff --git a/frontend/src/metabase/common/components/Toaster/Toaster.unit.spec.tsx b/frontend/src/metabase/common/components/Toaster/Toaster.unit.spec.tsx
new file mode 100644
index 00000000000..638961b6585
--- /dev/null
+++ b/frontend/src/metabase/common/components/Toaster/Toaster.unit.spec.tsx
@@ -0,0 +1,72 @@
+import userEvent from "@testing-library/user-event";
+
+import { render, screen } from "__support__/ui";
+import type { UndoVariant } from "metabase/redux/store/undo";
+
+import { Toast } from "./Toaster";
+
+function setup({ variant }: { variant?: UndoVariant } = {}) {
+ const onConfirm = jest.fn();
+ const onSecondary = jest.fn();
+ const onDismiss = jest.fn();
+
+ render(
+ <Toast
+ show
+ variant={variant}
+ message="Something happened"
+ confirmText="Retry"
+ confirmAriaLabel="Retry"
+ secondaryText="Details"
+ secondaryAriaLabel="Details"
+ onConfirm={onConfirm}
+ onSecondary={onSecondary}
+ onDismiss={onDismiss}
+ />,
+ );
+
+ return { onConfirm, onSecondary, onDismiss };
+}
+
+describe("Toast", () => {
+ it("renders the neutral variant by default", () => {
+ setup();
+
+ expect(screen.getByTestId("toast")).toHaveAttribute(
+ "data-variant",
+ "neutral",
+ );
+ });
+
+ it("places the primary action after the secondary action", () => {
+ setup();
+
+ expect(
+ screen
+ .getAllByRole("button", { name: /Retry|Details/ })
+ .map((button) => button.textContent),
+ ).toEqual(["Details", "Retry"]);
+ });
+
+ it.each<UndoVariant>(["negative", "warning"])(
+ "renders the %s variant with working actions",
+ async (variant) => {
+ const { onConfirm, onSecondary, onDismiss } = setup({ variant });
+
+ expect(screen.getByTestId("toast")).toHaveAttribute(
+ "data-variant",
+ variant,
+ );
+ expect(screen.getByText("Something happened")).toBeInTheDocument();
+
+ await userEvent.click(screen.getByRole("button", { name: "Retry" }));
+ expect(onConfirm).toHaveBeenCalledTimes(1);
+
+ await userEvent.click(screen.getByRole("button", { name: "Details" }));
+ expect(onSecondary).toHaveBeenCalledTimes(1);
+
+ await userEvent.click(screen.getByRole("button", { name: "Close" }));
+ expect(onDismiss).toHaveBeenCalledTimes(1);
+ },
+ );
+});
diff --git a/frontend/src/metabase/common/components/UndoListing.module.css b/frontend/src/metabase/common/components/UndoListing.module.css
index 2aa9443df8a..10b47ab19d5 100644
--- a/frontend/src/metabase/common/components/UndoListing.module.css
+++ b/frontend/src/metabase/common/components/UndoListing.module.css
@@ -22,6 +22,14 @@
min-height: rem(56px);
}
+.toast[data-variant="negative"] {
+ border: 0.5px solid var(--mb-color-feedback-negative-strong);
+}
+
+.toast[data-variant="warning"] {
+ border: 0.5px solid var(--mb-color-feedback-warning-strong);
+}
+
.progress {
animation: animated-progress linear;
transform-origin: left;
diff --git a/frontend/src/metabase/common/components/UndoListing.tsx b/frontend/src/metabase/common/components/UndoListing.tsx
index 4219c135bc3..1202795e477 100644
--- a/frontend/src/metabase/common/components/UndoListing.tsx
+++ b/frontend/src/metabase/common/components/UndoListing.tsx
@@ -17,7 +17,7 @@ import { t } from "ttag";
import ZIndex from "metabase/css/core/z-index.module.css";
import { useDispatch, useSelector } from "metabase/redux";
-import type { Undo } from "metabase/redux/store/undo";
+import type { Undo, UndoVariant } from "metabase/redux/store/undo";
import {
dismissUndo,
pauseUndo,
@@ -34,6 +34,7 @@ import {
Progress,
Stack,
} from "metabase/ui";
+import type { ColorName } from "metabase/ui/colors/types";
import { isFocusVisible } from "metabase/utils/dom";
import { capitalize, inflect } from "metabase/utils/formatting";
@@ -115,11 +116,14 @@ function UndoToast({
}
};
+ const variant = undo.variant ?? "neutral";
+ const isColored = variant !== "neutral";
const dark = undo.dark ?? true;
const noBorder = undo.showProgress;
- const pausedProgressColor = dark
- ? "tooltip-text-secondary"
- : "background_page-tertiary-inverse";
+ const pausedProgressColor =
+ dark && !isColored
+ ? "tooltip-text-secondary"
+ : "background_page-tertiary-inverse";
return (
<Card
@@ -127,13 +131,14 @@ function UndoToast({
data-testid="toast-undo"
role="status"
className={S.toast}
+ data-variant={variant}
data-paused={undo.pausedAt != null || undefined}
onMouseEnter={() => updateInteraction({ isHovered: true })}
onMouseLeave={() => updateInteraction({ isHovered: false })}
onFocus={handleFocus}
onBlur={handleBlur}
- bg={dark ? "tooltip-background" : "background_page-primary"}
- c={dark ? "tooltip-text" : "text-primary"}
+ bg={getToastBackground(variant, dark)}
+ c={dark && !isColored ? "tooltip-text" : "text-primary"}
withBorder={!noBorder}
radius="sm"
p="lg"
@@ -168,7 +173,10 @@ function UndoToast({
<Icon
className={S.messageIcon}
name={undo.icon}
- c={undo.iconColor ?? "tooltip-text"}
+ c={
+ undo.iconColor ??
+ (isColored ? `feedback-${variant}-strong` : "tooltip-text")
+ }
mr="sm"
flex="0 0 auto"
/>
@@ -182,20 +190,10 @@ function UndoToast({
)}
</Flex>
<Flex className={S.controls} align="center" gap="sm" flex="0 0 auto">
- {undo.actions && undo.actions.length > 0 && (
- <Button
- className={S.actionButton}
- variant={dark ? "on-dark-primary" : "default"}
- size="sm"
- onClick={onUndo}
- >
- {undo.actionLabel ?? t`Undo`}
- </Button>
- )}
{undo.extraAction && (
<Button
className={S.actionButton}
- variant={dark ? "on-dark-secondary" : "default"}
+ variant={dark && !isColored ? "on-dark-secondary" : "default"}
size="sm"
onClick={() => {
undo.extraAction?.action();
@@ -207,10 +205,24 @@ function UndoToast({
{undo.extraAction.label}
</Button>
)}
+ {undo.actions && undo.actions.length > 0 && (
+ <Button
+ className={S.actionButton}
+ variant={getPrimaryButtonVariant(variant, dark)}
+ color={isColored ? variant : undefined}
+ size="sm"
+ onClick={onUndo}
+ >
+ {undo.actionLabel ?? t`Undo`}
+ </Button>
+ )}
{undo.canDismiss && (
<Icon
className={S.dismissIcon}
- color={undo.dismissIconColor || "tooltip-text"}
+ color={
+ undo.dismissIconColor ||
+ (isColored ? "text-primary" : "tooltip-text")
+ }
name="close"
onClick={onDismiss}
ml="sm"
@@ -222,6 +234,20 @@ function UndoToast({
);
}
+function getToastBackground(variant: UndoVariant, dark: boolean): ColorName {
+ if (variant !== "neutral") {
+ return "background_surface-primary";
+ }
+ return dark ? "tooltip-background" : "background_page-primary";
+}
+
+function getPrimaryButtonVariant(variant: UndoVariant, dark: boolean) {
+ if (variant !== "neutral") {
+ return "filled";
+ }
+ return dark ? "on-dark-primary" : "default";
+}
+
export function UndoListing() {
const dispatch = useDispatch();
const undos = useSelector((state) => state.undo);
diff --git a/frontend/src/metabase/common/components/UndoListing.unit.spec.tsx b/frontend/src/metabase/common/components/UndoListing.unit.spec.tsx
index 305417ad342..ea42dbcfa59 100644
--- a/frontend/src/metabase/common/components/UndoListing.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/UndoListing.unit.spec.tsx
@@ -94,6 +94,83 @@ describe("UndoListing", () => {
});
});
+ it("places the primary action after the extra action", async () => {
+ await setup(
+ makeUndo({
+ actions: [jest.fn()],
+ extraAction: { label: "See all", action: jest.fn() },
+ }),
+ );
+
+ expect(
+ screen.getAllByRole("button").map((button) => button.textContent),
+ ).toEqual(["See all", "Undo"]);
+ });
+
+ describe("variants", () => {
+ async function setupAdded(undo: Partial<Undo>) {
+ jest.useFakeTimers();
+ const user = userEvent.setup({ advanceTimers: jest.advanceTimersByTime });
+ const { store } = renderWithProviders(<UndoListing />);
+
+ await act(async () => {
+ store.dispatch(addUndo({ message: "Something happened", ...undo }));
+ });
+
+ const toast = await screen.findByRole("status");
+ return { user, toast };
+ }
+
+ it.each([
+ { variant: undefined, renderedVariant: "neutral", icon: "check_filled" },
+ { variant: "neutral", renderedVariant: "neutral", icon: "check_filled" },
+ { variant: "negative", renderedVariant: "negative", icon: "warning" },
+ {
+ variant: "warning",
+ renderedVariant: "warning",
+ icon: "warning_triangle_filled",
+ },
+ ] as const)(
+ "renders a $renderedVariant toast with the $icon icon (variant: $variant)",
+ async ({ variant, renderedVariant, icon }) => {
+ const { toast } = await setupAdded({ variant });
+
+ expect(toast).toHaveAttribute("data-variant", renderedVariant);
+ expect(screen.getByLabelText(`${icon} icon`)).toBeInTheDocument();
+ },
+ );
+
+ it.each(["Retry", "More info"] as const)(
+ "performs the %s action on a colored toast and dismisses it",
+ async (buttonName) => {
+ const handlers = { Retry: jest.fn(), "More info": jest.fn() };
+ const { user } = await setupAdded({
+ variant: "negative",
+ actions: [handlers.Retry],
+ actionLabel: "Retry",
+ extraAction: { label: "More info", action: handlers["More info"] },
+ });
+
+ await user.click(screen.getByRole("button", { name: buttonName }));
+
+ await waitFor(() => {
+ expect(screen.queryByRole("status")).not.toBeInTheDocument();
+ });
+ expect(handlers[buttonName]).toHaveBeenCalledTimes(1);
+ },
+ );
+
+ it("dismisses a colored toast with its close icon", async () => {
+ const { user } = await setupAdded({ variant: "warning" });
+
+ await user.click(screen.getByLabelText("close icon"));
+
+ await waitFor(() => {
+ expect(screen.queryByRole("status")).not.toBeInTheDocument();
+ });
+ });
+ });
+
describe("auto-dismiss", () => {
const TIMEOUT = 5000;
diff --git a/frontend/src/metabase/common/components/dnd/ItemDragSource.tsx b/frontend/src/metabase/common/components/dnd/ItemDragSource.tsx
index 75634026346..aa7a15f428f 100644
--- a/frontend/src/metabase/common/components/dnd/ItemDragSource.tsx
+++ b/frontend/src/metabase/common/components/dnd/ItemDragSource.tsx
@@ -156,8 +156,7 @@ export function ItemDragSource(props: ItemDragSourceProps) {
const onMoveError = (error: unknown) =>
sendToast({
message: getErrorMessage(error),
- icon: "warning_triangle_filled",
- iconColor: "feedback-warning",
+ variant: "negative",
});
return (
<DragSourceComponent
diff --git a/frontend/src/metabase/common/hooks/use-metadata-toasts.ts b/frontend/src/metabase/common/hooks/use-metadata-toasts.ts
index dc547e53c5c..5d5f674fccd 100644
--- a/frontend/src/metabase/common/hooks/use-metadata-toasts.ts
+++ b/frontend/src/metabase/common/hooks/use-metadata-toasts.ts
@@ -21,8 +21,7 @@ export const useMetadataToasts = () => {
const sendErrorToast = useCallback(
(message: string) => {
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "feedback-warning",
+ variant: "negative",
message,
});
},
diff --git a/frontend/src/metabase/dashboard/actions/actions.ts b/frontend/src/metabase/dashboard/actions/actions.ts
index d519588e6d5..bd0a1d78dca 100644
--- a/frontend/src/metabase/dashboard/actions/actions.ts
+++ b/frontend/src/metabase/dashboard/actions/actions.ts
@@ -76,8 +76,7 @@ export const executeRowAction = async ({
if (shouldToast) {
dispatch(
addUndo({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message,
}),
);
diff --git a/frontend/src/metabase/dashboard/components/Dashboard/use-dashboard-chart-paste.ts b/frontend/src/metabase/dashboard/components/Dashboard/use-dashboard-chart-paste.ts
index 88c3beae41d..ab26290065a 100644
--- a/frontend/src/metabase/dashboard/components/Dashboard/use-dashboard-chart-paste.ts
+++ b/frontend/src/metabase/dashboard/components/Dashboard/use-dashboard-chart-paste.ts
@@ -65,8 +65,7 @@ export function useDashboardChartPaste() {
dispatch(
addUndo({
id: PASTE_TOAST_ID,
- icon: "warning",
- toastColor: "error",
+ variant: "negative",
message: t`Couldn't add the chart to this dashboard`,
}),
);
diff --git a/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page/use-published-table-measure-page.ts b/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page/use-published-table-measure-page.ts
index 0757f369f61..0e76c309539 100644
--- a/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page/use-published-table-measure-page.ts
+++ b/frontend/src/metabase/data-studio/measures/hooks/use-published-table-measure-page/use-published-table-measure-page.ts
@@ -54,7 +54,7 @@ export function usePublishedTableMeasurePage(
});
if (error) {
- sendToast({ icon: "warning", message: t`Failed to remove measure` });
+ sendToast({ variant: "negative", message: t`Failed to remove measure` });
} else {
sendToast({ icon: "check", message: t`Measure removed` });
navigate(Urls.dataStudioTableMeasures(tableId));
diff --git a/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page/use-published-table-segment-page.ts b/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page/use-published-table-segment-page.ts
index cc2d39b7742..9febf189d5c 100644
--- a/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page/use-published-table-segment-page.ts
+++ b/frontend/src/metabase/data-studio/segments/hooks/use-published-table-segment-page/use-published-table-segment-page.ts
@@ -54,7 +54,7 @@ export function usePublishedTableSegmentPage(
});
if (error) {
- sendToast({ icon: "warning", message: t`Failed to remove segment` });
+ sendToast({ variant: "negative", message: t`Failed to remove segment` });
} else {
sendToast({ icon: "check", message: t`Segment removed` });
navigate(Urls.dataStudioTableSegments(tableId));
diff --git a/frontend/src/metabase/data-studio/settings/pages/SettingsPage/hooks.ts b/frontend/src/metabase/data-studio/settings/pages/SettingsPage/hooks.ts
index fd6ffd58afc..1fa58392432 100644
--- a/frontend/src/metabase/data-studio/settings/pages/SettingsPage/hooks.ts
+++ b/frontend/src/metabase/data-studio/settings/pages/SettingsPage/hooks.ts
@@ -24,8 +24,7 @@ export function useLocalSetting<
if (error) {
sendToast({
message: t`Failed to update setting`,
- icon: "warning_triangle_filled",
- iconColor: "warning",
+ variant: "negative",
});
setLocalValue(previousValueRef.current);
return;
diff --git a/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetHeader.tsx b/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetHeader.tsx
index 867a1d6d942..94e5ea62b31 100644
--- a/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetHeader.tsx
+++ b/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetHeader.tsx
@@ -111,7 +111,7 @@ function SnippetNameInput({ readOnly, snippet }: SnippetNameInputProps) {
if (error) {
sendToast({
message: getErrorMessage(error, t`Failed to update snippet name`),
- icon: "warning",
+ variant: "negative",
});
} else {
sendToast({
diff --git a/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx b/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx
index 43c987db907..207f0d9b252 100644
--- a/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx
+++ b/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetMoreMenu/SnippetModal/ArchiveSnippetModal.tsx
@@ -29,7 +29,7 @@ export function ArchiveSnippetModal(props: ArchiveSnippetModalProps) {
if (error) {
sendToast({
message: getErrorMessage(error, t`Failed to archive snippet`),
- icon: "warning",
+ variant: "negative",
});
} else {
sendToast({
diff --git a/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetMoreMenu/SnippetModal/UnarchiveSnippetModal.tsx b/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetMoreMenu/SnippetModal/UnarchiveSnippetModal.tsx
index 9942b9b7c00..7233cdcee4d 100644
--- a/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetMoreMenu/SnippetModal/UnarchiveSnippetModal.tsx
+++ b/frontend/src/metabase/data-studio/snippets/components/SnippetHeader/SnippetMoreMenu/SnippetModal/UnarchiveSnippetModal.tsx
@@ -25,7 +25,7 @@ export function UnarchiveSnippetModal(props: ArchiveSnippetModalProps) {
if (error) {
sendToast({
message: getErrorMessage(error, t`Failed to unarchive snippet`),
- icon: "warning",
+ variant: "negative",
});
} else {
sendToast({
diff --git a/frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.tsx b/frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.tsx
index 6392804fc02..8efe1c12b72 100644
--- a/frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.tsx
+++ b/frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.tsx
@@ -75,7 +75,7 @@ export function EditSnippetPage() {
if (error) {
sendToast({
message: getErrorMessage(error, t`Failed to update snippet content`),
- icon: "warning",
+ variant: "negative",
});
} else {
sendToast({
diff --git a/frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/SnippetDescriptionSection/SnippetDescriptionSection.tsx b/frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/SnippetDescriptionSection/SnippetDescriptionSection.tsx
index a42a35f5a4c..bb0893fa29e 100644
--- a/frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/SnippetDescriptionSection/SnippetDescriptionSection.tsx
+++ b/frontend/src/metabase/data-studio/snippets/pages/EditSnippetPage/SnippetDescriptionSection/SnippetDescriptionSection.tsx
@@ -26,7 +26,7 @@ export function SnippetDescriptionSection({
if (error) {
sendToast({
message: t`Failed to update snippet description`,
- icon: "warning",
+ variant: "negative",
});
} else {
sendToast({
diff --git a/frontend/src/metabase/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.tsx b/frontend/src/metabase/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.tsx
index 4ff74fd434b..a3e4003ee50 100644
--- a/frontend/src/metabase/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.tsx
+++ b/frontend/src/metabase/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.tsx
@@ -60,7 +60,7 @@ export function NewSnippetPage() {
if (error) {
sendToast({
message: getErrorMessage(error, t`Failed to create snippet`),
- icon: "warning",
+ variant: "negative",
});
} else if (snippet) {
setSavedSnippet(snippet);
diff --git a/frontend/src/metabase/documents/hooks/use-document-editor.ts b/frontend/src/metabase/documents/hooks/use-document-editor.ts
index db2d126b228..f2d9d3716aa 100644
--- a/frontend/src/metabase/documents/hooks/use-document-editor.ts
+++ b/frontend/src/metabase/documents/hooks/use-document-editor.ts
@@ -385,7 +385,7 @@ export function useDocumentEditor({
}
} catch (error) {
console.error("Failed to save document:", error);
- sendToast({ message: t`Error saving document`, icon: "warning" });
+ sendToast({ message: t`Error saving document`, variant: "negative" });
return {
error: error,
};
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/AuthenticationCard/EnableGuestEmbedsSection.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/AuthenticationCard/EnableGuestEmbedsSection.tsx
index cd07ca9b951..2a2fdc0752c 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/AuthenticationCard/EnableGuestEmbedsSection.tsx
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/AuthenticationCard/EnableGuestEmbedsSection.tsx
@@ -50,7 +50,7 @@ export const EnableGuestEmbedsSection = ({
...(!termsAccepted && { "show-static-embed-terms": false }),
});
} catch (error) {
- sendToast({ message: failedToEnableMessage });
+ sendToast({ message: failedToEnableMessage, variant: "negative" });
}
};
diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/AuthenticationCard/EnableModularEmbeddingSection.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/AuthenticationCard/EnableModularEmbeddingSection.tsx
index 9c47e73d29f..51fec6f47ed 100644
--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/AuthenticationCard/EnableModularEmbeddingSection.tsx
+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/AuthenticationCard/EnableModularEmbeddingSection.tsx
@@ -40,7 +40,10 @@ export const EnableModularEmbeddingSection = ({
...(!termsAccepted && { "show-modular-embed-terms": false }),
});
} catch (error) {
- sendToast({ message: t`Failed to enable modular embedding` });
+ sendToast({
+ message: t`Failed to enable modular embedding`,
+ variant: "negative",
+ });
}
};
diff --git a/frontend/src/metabase/embedding/mcp/hooks/useMcpFeedback.ts b/frontend/src/metabase/embedding/mcp/hooks/useMcpFeedback.ts
index a34bad288e4..bb95d18657d 100644
--- a/frontend/src/metabase/embedding/mcp/hooks/useMcpFeedback.ts
+++ b/frontend/src/metabase/embedding/mcp/hooks/useMcpFeedback.ts
@@ -92,7 +92,10 @@ export function useMcpFeedback({
submittedContext.prompt === feedbackContextRef.current.prompt &&
submittedContext.query === feedbackContextRef.current.query
) {
- sendToast({ icon: "warning", message: t`Failed to submit feedback` });
+ sendToast({
+ variant: "negative",
+ message: t`Failed to submit feedback`,
+ });
}
} finally {
setIsSubmittingFeedback(false);
diff --git a/frontend/src/metabase/embedding/setup-guide/components/SetupGuideXrayPickerModal.tsx b/frontend/src/metabase/embedding/setup-guide/components/SetupGuideXrayPickerModal.tsx
index 596db56f70c..d57ba1a74c3 100644
--- a/frontend/src/metabase/embedding/setup-guide/components/SetupGuideXrayPickerModal.tsx
+++ b/frontend/src/metabase/embedding/setup-guide/components/SetupGuideXrayPickerModal.tsx
@@ -67,8 +67,7 @@ export const SetupGuideXrayPickerModal = ({
});
} catch {
sendToast({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: t`Failed to create dashboard`,
});
}
diff --git a/frontend/src/metabase/embedding/setup-guide/components/SetupPermissionsAndTenantsPage/ConnectionImpersonationStepContent.tsx b/frontend/src/metabase/embedding/setup-guide/components/SetupPermissionsAndTenantsPage/ConnectionImpersonationStepContent.tsx
index dae9df5b0e6..0de7ce14c02 100644
--- a/frontend/src/metabase/embedding/setup-guide/components/SetupPermissionsAndTenantsPage/ConnectionImpersonationStepContent.tsx
+++ b/frontend/src/metabase/embedding/setup-guide/components/SetupPermissionsAndTenantsPage/ConnectionImpersonationStepContent.tsx
@@ -60,7 +60,7 @@ export const ConnectionImpersonationStepContent = ({
t`Failed to configure connection impersonation`,
);
- sendToast({ icon: "warning", toastColor: "feedback-negative", message });
+ sendToast({ variant: "negative", message });
} finally {
setUpdatingPermissions(false);
}
diff --git a/frontend/src/metabase/embedding/setup-guide/components/SetupPermissionsAndTenantsPage/EnableTenantsStepContent.tsx b/frontend/src/metabase/embedding/setup-guide/components/SetupPermissionsAndTenantsPage/EnableTenantsStepContent.tsx
index ac5558b3681..49691368270 100644
--- a/frontend/src/metabase/embedding/setup-guide/components/SetupPermissionsAndTenantsPage/EnableTenantsStepContent.tsx
+++ b/frontend/src/metabase/embedding/setup-guide/components/SetupPermissionsAndTenantsPage/EnableTenantsStepContent.tsx
@@ -53,8 +53,7 @@ export const EnableTenantsStepContent = ({
}
} catch (error) {
sendToast({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: getErrorMessage(
error,
t`Failed to enable tenants and create shared collection`,
diff --git a/frontend/src/metabase/embedding/setup-guide/components/SetupPermissionsAndTenantsPage/MoveDashboardStepContent.tsx b/frontend/src/metabase/embedding/setup-guide/components/SetupPermissionsAndTenantsPage/MoveDashboardStepContent.tsx
index 4bed2150e4a..7f1e1767a81 100644
--- a/frontend/src/metabase/embedding/setup-guide/components/SetupPermissionsAndTenantsPage/MoveDashboardStepContent.tsx
+++ b/frontend/src/metabase/embedding/setup-guide/components/SetupPermissionsAndTenantsPage/MoveDashboardStepContent.tsx
@@ -58,8 +58,7 @@ export const MoveDashboardStepContent = ({
onCompleted();
} catch (error) {
sendToast({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: getErrorMessage(
error,
t`Failed to move dashboard to the shared collection`,
@@ -84,8 +83,7 @@ export const MoveDashboardStepContent = ({
onCompleted();
} catch (error) {
sendToast({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: getErrorMessage(error, t`Failed to create a sample dashboard`),
});
}
diff --git a/frontend/src/metabase/embedding/setup-guide/components/SetupPermissionsAndTenantsPage/RlsDataSelector/RlsDataSelector.tsx b/frontend/src/metabase/embedding/setup-guide/components/SetupPermissionsAndTenantsPage/RlsDataSelector/RlsDataSelector.tsx
index b83dcf7e6a6..27c974a8fe8 100644
--- a/frontend/src/metabase/embedding/setup-guide/components/SetupPermissionsAndTenantsPage/RlsDataSelector/RlsDataSelector.tsx
+++ b/frontend/src/metabase/embedding/setup-guide/components/SetupPermissionsAndTenantsPage/RlsDataSelector/RlsDataSelector.tsx
@@ -61,8 +61,7 @@ export const RlsDataSelector = ({
});
} catch (error) {
sendToast({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: getErrorMessage(
error,
t`Failed to configure row-level security`,
diff --git a/frontend/src/metabase/embedding/setup-guide/components/SetupSsoPage/SetupJwtStep.tsx b/frontend/src/metabase/embedding/setup-guide/components/SetupSsoPage/SetupJwtStep.tsx
index 356bf22cafe..d1b00a99899 100644
--- a/frontend/src/metabase/embedding/setup-guide/components/SetupSsoPage/SetupJwtStep.tsx
+++ b/frontend/src/metabase/embedding/setup-guide/components/SetupSsoPage/SetupJwtStep.tsx
@@ -39,8 +39,7 @@ export const SetupJwtStep = ({ onSuccess }: { onSuccess: () => void }) => {
onSuccess();
} catch (error) {
sendToast({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: t`Failed to enable JWT authentication`,
});
}
diff --git a/frontend/src/metabase/embedding/setup-guide/components/SetupSsoPage/TestJwtStep.tsx b/frontend/src/metabase/embedding/setup-guide/components/SetupSsoPage/TestJwtStep.tsx
index 7713faabea9..3670e73b3ee 100644
--- a/frontend/src/metabase/embedding/setup-guide/components/SetupSsoPage/TestJwtStep.tsx
+++ b/frontend/src/metabase/embedding/setup-guide/components/SetupSsoPage/TestJwtStep.tsx
@@ -26,8 +26,7 @@ export const TestJwtStep = () => {
}).unwrap();
} catch (error) {
sendToast({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: t`Failed to save SSO test status`,
});
}
diff --git a/frontend/src/metabase/embedding/themes/components/ThemeListing/EmbeddingThemeListingApp.tsx b/frontend/src/metabase/embedding/themes/components/ThemeListing/EmbeddingThemeListingApp.tsx
index 104924b619f..5cc6c711d01 100644
--- a/frontend/src/metabase/embedding/themes/components/ThemeListing/EmbeddingThemeListingApp.tsx
+++ b/frontend/src/metabase/embedding/themes/components/ThemeListing/EmbeddingThemeListingApp.tsx
@@ -41,7 +41,7 @@ export function EmbeddingThemeListingApp({
sendToast({ message: t`Theme duplicated successfully`, icon: "check" });
} catch (error) {
console.error("Failed to duplicate theme:", error);
- sendToast({ message: t`Failed to duplicate theme`, icon: "warning" });
+ sendToast({ message: t`Failed to duplicate theme`, variant: "negative" });
}
};
diff --git a/frontend/src/metabase/embedding/themes/hooks/use-delete-theme-flow.tsx b/frontend/src/metabase/embedding/themes/hooks/use-delete-theme-flow.tsx
index 5c62e2b65b6..cec38e4f1a8 100644
--- a/frontend/src/metabase/embedding/themes/hooks/use-delete-theme-flow.tsx
+++ b/frontend/src/metabase/embedding/themes/hooks/use-delete-theme-flow.tsx
@@ -35,7 +35,7 @@ export function useDeleteThemeFlow({
onDeleted?.();
} catch (error) {
console.error("Failed to delete theme:", error);
- sendToast({ message: t`Failed to delete theme`, icon: "warning" });
+ sendToast({ message: t`Failed to delete theme`, variant: "negative" });
setIsDeleting(false);
}
};
diff --git a/frontend/src/metabase/embedding/themes/hooks/use-embedding-theme-editor.ts b/frontend/src/metabase/embedding/themes/hooks/use-embedding-theme-editor.ts
index f757b7a5e5a..59327c0dcf0 100644
--- a/frontend/src/metabase/embedding/themes/hooks/use-embedding-theme-editor.ts
+++ b/frontend/src/metabase/embedding/themes/hooks/use-embedding-theme-editor.ts
@@ -337,7 +337,7 @@ export function useEmbeddingThemeEditor(themeId: ThemeEditorId) {
return updated;
} catch (error) {
console.error("Failed to save theme:", error);
- sendToast({ message: t`Failed to save theme`, icon: "warning" });
+ sendToast({ message: t`Failed to save theme`, variant: "negative" });
return null;
}
}, [currentTheme, isDraft, themeId, createTheme, updateTheme, sendToast]);
diff --git a/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationTitle.tsx b/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationTitle.tsx
index 655b7c492df..292198be480 100644
--- a/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationTitle.tsx
+++ b/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationTitle.tsx
@@ -28,8 +28,7 @@ export function ExplorationTitle({
if (error) {
sendToast({
message: t`Failed to update name`,
- icon: "warning_triangle_filled",
- iconColor: "warning",
+ variant: "negative",
});
}
},
diff --git a/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationTreeNode.tsx b/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationTreeNode.tsx
index 3c6681f5b07..471791e0feb 100644
--- a/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationTreeNode.tsx
+++ b/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationTreeNode.tsx
@@ -229,8 +229,7 @@ function ExplorationGroupMenu({
return true;
} catch {
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "warning",
+ variant: "negative",
message: t`Failed to update ${groupName}`,
});
return false;
@@ -266,8 +265,7 @@ function ExplorationGroupMenu({
if (error) {
sendToast({
message: t`Failed to stop`,
- icon: "warning_triangle_filled",
- iconColor: "warning",
+ variant: "negative",
});
return;
}
@@ -285,8 +283,7 @@ function ExplorationGroupMenu({
if (error) {
sendToast({
message: t`Failed to restart`,
- icon: "warning_triangle_filled",
- iconColor: "warning",
+ variant: "negative",
});
return;
}
diff --git a/frontend/src/metabase/explorations/components/ExplorationVisualization/ActionToolbar.tsx b/frontend/src/metabase/explorations/components/ExplorationVisualization/ActionToolbar.tsx
index 1c1a902a331..d98d4ae2497 100644
--- a/frontend/src/metabase/explorations/components/ExplorationVisualization/ActionToolbar.tsx
+++ b/frontend/src/metabase/explorations/components/ExplorationVisualization/ActionToolbar.tsx
@@ -125,8 +125,7 @@ export function ActionToolbar({
);
} catch (error) {
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "warning",
+ variant: "negative",
message: t`Failed to update star`,
});
}
@@ -148,8 +147,7 @@ export function ActionToolbar({
return true;
} catch (error) {
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "warning",
+ variant: "negative",
message: t`Failed to update visibility`,
});
return false;
@@ -192,8 +190,7 @@ export function ActionToolbar({
if (error || !document) {
sendToast({
message: t`Failed to add to Summary`,
- icon: "warning_triangle_filled",
- iconColor: "warning",
+ variant: "negative",
});
return;
}
@@ -301,8 +298,7 @@ export function ActionToolbar({
if (error) {
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "warning",
+ variant: "negative",
message: t`Failed to send comment`,
});
} else {
diff --git a/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationComments.tsx b/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationComments.tsx
index f54f73a4d52..9fbe27c31dc 100644
--- a/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationComments.tsx
+++ b/frontend/src/metabase/explorations/components/ExplorationVisualization/ExplorationComments.tsx
@@ -190,8 +190,7 @@ export function ExplorationComments({
if (error) {
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "feedback-warning",
+ variant: "negative",
message: t`Failed to send comment`,
});
} else {
@@ -283,8 +282,7 @@ function ExplorationComment({
if (error) {
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "feedback-warning",
+ variant: "negative",
message: t`Failed to update comment`,
});
}
@@ -299,8 +297,7 @@ function ExplorationComment({
if (error) {
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "feedback-warning",
+ variant: "negative",
message: t`Failed to delete comment`,
});
}
@@ -327,8 +324,7 @@ function ExplorationComment({
if (error) {
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "feedback-warning",
+ variant: "negative",
message: errorMessage,
});
}
diff --git a/frontend/src/metabase/explorations/components/NewExplorationChat/NewExplorationChat.tsx b/frontend/src/metabase/explorations/components/NewExplorationChat/NewExplorationChat.tsx
index 0535a064ee2..c16108eefd8 100644
--- a/frontend/src/metabase/explorations/components/NewExplorationChat/NewExplorationChat.tsx
+++ b/frontend/src/metabase/explorations/components/NewExplorationChat/NewExplorationChat.tsx
@@ -139,8 +139,7 @@ export function NewExplorationChat({ selection }: NewExplorationChatProps) {
} catch (error) {
console.error(error);
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "warning",
+ variant: "negative",
message: t`Failed to add research groups`,
});
}
@@ -182,8 +181,7 @@ export function NewExplorationChat({ selection }: NewExplorationChatProps) {
} catch (error) {
console.error(error);
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "warning",
+ variant: "negative",
message: t`Failed to update research plan`,
});
}
@@ -227,8 +225,7 @@ export function NewExplorationChat({ selection }: NewExplorationChatProps) {
} catch (error) {
console.error(error);
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "warning",
+ variant: "negative",
message: t`Failed to add timelines`,
});
}
diff --git a/frontend/src/metabase/explorations/components/NewExplorationData/NewExplorationData.tsx b/frontend/src/metabase/explorations/components/NewExplorationData/NewExplorationData.tsx
index 5d4c01e473b..e1c748096fc 100644
--- a/frontend/src/metabase/explorations/components/NewExplorationData/NewExplorationData.tsx
+++ b/frontend/src/metabase/explorations/components/NewExplorationData/NewExplorationData.tsx
@@ -177,8 +177,7 @@ export function NewExplorationData({ selection }: NewExplorationDataProps) {
} catch (error) {
console.error(error);
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "warning",
+ variant: "negative",
message: t`Failed to start research`,
});
}
diff --git a/frontend/src/metabase/explorations/hooks/useCopyLink.ts b/frontend/src/metabase/explorations/hooks/useCopyLink.ts
index 7ed11af6e56..60a6446d792 100644
--- a/frontend/src/metabase/explorations/hooks/useCopyLink.ts
+++ b/frontend/src/metabase/explorations/hooks/useCopyLink.ts
@@ -17,7 +17,7 @@ export function useCopyLink() {
useEffect(() => {
if (clipboard.error) {
sendToast({
- icon: "warning_triangle_filled",
+ variant: "negative",
message: t`Couldn't copy link`,
});
}
diff --git a/frontend/src/metabase/explorations/hooks/useExplorationClickActionsMode.tsx b/frontend/src/metabase/explorations/hooks/useExplorationClickActionsMode.tsx
index 3ddfa4f620a..11b97f4920f 100644
--- a/frontend/src/metabase/explorations/hooks/useExplorationClickActionsMode.tsx
+++ b/frontend/src/metabase/explorations/hooks/useExplorationClickActionsMode.tsx
@@ -85,8 +85,7 @@ export function useExplorationClickActionsMode({
if (error) {
trackExplorationExploreFurtherClicked(explorationId, "failure");
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "warning",
+ variant: "negative",
message: t`Couldn't start a new exploration`,
});
} else {
@@ -129,8 +128,7 @@ export function useExplorationClickActionsMode({
});
if (error) {
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "warning",
+ variant: "negative",
message: t`Failed to add comment`,
});
} else {
diff --git a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AIProviderList.tsx b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AIProviderList.tsx
index 75f5419abb8..2c86e9907b9 100644
--- a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AIProviderList.tsx
+++ b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/AIProviderList.tsx
@@ -103,8 +103,7 @@ export function AIProviderList() {
if (error) {
sendToast({
message: getErrorMessage(error, t`Unable to remove this provider.`),
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
});
return;
}
diff --git a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/LlmModelPicker.unit.spec.tsx b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/LlmModelPicker.unit.spec.tsx
index 357b1436505..ee9fe33135d 100644
--- a/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/LlmModelPicker.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/components/AIProviderConfigurationForm/LlmModelPicker.unit.spec.tsx
@@ -56,7 +56,7 @@ describe("LlmModelPicker save feedback", () => {
expect(store.getState().undo).toContainEqual(
expect.objectContaining({
message: 'Invalid Azure model "nope".',
- toastColor: "feedback-negative",
+ variant: "negative",
}),
);
});
diff --git a/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.tsx b/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.tsx
index 23ed6e030d5..e80556dd82f 100644
--- a/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.tsx
+++ b/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.tsx
@@ -54,8 +54,7 @@ export function FixSqlQueryButton() {
}
sendToast({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: action.payload.error?.message ?? METABOT_ERR_MSG.default,
});
};
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataSourcePills.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataSourcePills.tsx
index e9a57995559..bdeec90d69c 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataSourcePills.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotAgentDataSourcePills.tsx
@@ -209,7 +209,7 @@ const SourceFeedbackButtons = ({
}).unwrap();
} catch {
setFeedback(previousFeedback);
- sendToast({ icon: "warning", message: t`Failed to submit feedback` });
+ sendToast({ variant: "negative", message: t`Failed to submit feedback` });
}
};
diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx
index b463d3a25ff..4a13d4d297b 100644
--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatMessage.tsx
@@ -710,7 +710,10 @@ export const Messages = ({
).unwrap();
sendToast({ icon: "check", message: t`Conversation forked` });
} catch {
- sendToast({ icon: "warning", message: t`Failed to fork conversation` });
+ sendToast({
+ variant: "negative",
+ message: t`Failed to fork conversation`,
+ });
} finally {
setForkingMessageId(null);
}
@@ -743,7 +746,7 @@ export const Messages = ({
modal: undefined,
}));
} catch (error) {
- sendToast({ icon: "warning", message: t`Failed to submit feedback` });
+ sendToast({ variant: "negative", message: t`Failed to submit feedback` });
}
};
diff --git a/frontend/src/metabase/metabot/state/actions.ts b/frontend/src/metabase/metabot/state/actions.ts
index 50a7eafa1eb..45424c03deb 100644
--- a/frontend/src/metabase/metabot/state/actions.ts
+++ b/frontend/src/metabase/metabot/state/actions.ts
@@ -926,8 +926,7 @@ export const fetchConversationSnapshot = createAsyncThunk(
if (error || !detail) {
dispatch(
addUndo({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: t`Sorry, we couldn't load that conversation.`,
}),
);
diff --git a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts
index 3f38e733ce9..b8542329458 100644
--- a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts
+++ b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts
@@ -143,8 +143,7 @@ export function useViewerUrl(
console.error(error);
setInitialLoadComplete(true);
sendToast({
- icon: "warning_triangle_filled",
- iconColor: "feedback-warning",
+ variant: "negative",
message: t`There was a problem restoring the page state`,
});
}
diff --git a/frontend/src/metabase/metrics/components/MetricDimensions/AddDimensionsPanel.tsx b/frontend/src/metabase/metrics/components/MetricDimensions/AddDimensionsPanel.tsx
index 05c1b2fca2c..6b8a361c686 100644
--- a/frontend/src/metabase/metrics/components/MetricDimensions/AddDimensionsPanel.tsx
+++ b/frontend/src/metabase/metrics/components/MetricDimensions/AddDimensionsPanel.tsx
@@ -77,7 +77,12 @@ export function AddDimensionsPanel({
trackMetricDimensionAdded(metricId, dimension.id, "success");
} catch {
trackMetricDimensionAdded(metricId, dimension.id, "failure");
- dispatch(addUndo({ message: t`Couldn't add ${dimension.display_name}` }));
+ dispatch(
+ addUndo({
+ message: t`Couldn't add ${dimension.display_name}`,
+ variant: "negative",
+ }),
+ );
}
};
diff --git a/frontend/src/metabase/metrics/components/MetricDimensions/MetricDimensions.tsx b/frontend/src/metabase/metrics/components/MetricDimensions/MetricDimensions.tsx
index 2d8930422e8..bb0b77a415d 100644
--- a/frontend/src/metabase/metrics/components/MetricDimensions/MetricDimensions.tsx
+++ b/frontend/src/metabase/metrics/components/MetricDimensions/MetricDimensions.tsx
@@ -91,7 +91,10 @@ export function MetricDimensions({
} catch {
trackRemoved("failure");
dispatch(
- addUndo({ message: t`Couldn't remove the selected dimensions` }),
+ addUndo({
+ message: t`Couldn't remove the selected dimensions`,
+ variant: "negative",
+ }),
);
}
};
@@ -102,7 +105,12 @@ export function MetricDimensions({
trackMetricDimensionsReordered(metricId, "success");
} catch {
trackMetricDimensionsReordered(metricId, "failure");
- dispatch(addUndo({ message: t`Couldn't reorder the dimensions` }));
+ dispatch(
+ addUndo({
+ message: t`Couldn't reorder the dimensions`,
+ variant: "negative",
+ }),
+ );
}
};
diff --git a/frontend/src/metabase/metrics/components/MetricPageShell/MetricPageShell.tsx b/frontend/src/metabase/metrics/components/MetricPageShell/MetricPageShell.tsx
index 2d1c3544a3f..463bb4a2a4d 100644
--- a/frontend/src/metabase/metrics/components/MetricPageShell/MetricPageShell.tsx
+++ b/frontend/src/metabase/metrics/components/MetricPageShell/MetricPageShell.tsx
@@ -65,6 +65,7 @@ export function MetricPageShell({
dispatch(
addUndo({
message: t`There was an error permanently deleting this item.`,
+ variant: "negative",
}),
);
}
diff --git a/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/useEnableImplicitActionsForModel.ts b/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/useEnableImplicitActionsForModel.ts
index 9a4cf5bd8de..dfe0d75001d 100644
--- a/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/useEnableImplicitActionsForModel.ts
+++ b/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/useEnableImplicitActionsForModel.ts
@@ -33,7 +33,7 @@ export function useEnableImplicitActionsForModel(modelId: CardId) {
}).unwrap();
} catch (_error) {
sendToast({
- icon: "warning",
+ variant: "negative",
message: t`Failed to create basic actions`,
});
}
diff --git a/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.tsx b/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.tsx
index e38f8f2ebb6..d13d43923b4 100644
--- a/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.tsx
+++ b/frontend/src/metabase/monitor/tools/notifications/NotificationsAdminPage/NotificationsAdminPage.tsx
@@ -204,7 +204,7 @@ export const NotificationsAdminPage = () => {
trackAlertsManagementAlertsDeleted(triggeredFrom, "failure", count);
dispatch(
addUndo({
- icon: "warning",
+ variant: "negative",
message: t`Could not delete alerts.`,
}),
);
@@ -266,7 +266,7 @@ export const NotificationsAdminPage = () => {
trackAlertsManagementOwnerChanged("failure", count);
dispatch(
addUndo({
- icon: "warning",
+ variant: "negative",
message: t`Could not change owner.`,
}),
);
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx
index 93bcab81600..eb6417180b8 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx
@@ -164,8 +164,7 @@ function MainNavbarContainer({
} catch (e) {
dispatch(
addUndo({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: t`Something went wrong`,
}),
);
diff --git a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.tsx b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.tsx
index 377e862822b..782cd8f12fe 100644
--- a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.tsx
+++ b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal.tsx
@@ -215,8 +215,7 @@ export const CreateOrEditQuestionAlertModal = ({
dispatch(
addUndo({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: t`Failed save alert. ${errorText}`,
}),
);
@@ -247,8 +246,7 @@ export const CreateOrEditQuestionAlertModal = ({
if (result.error) {
dispatch(
addUndo({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: t`Failed to send test alert. ${getResponseErrorMessage(result.error) ?? t`An error occurred`}`,
}),
);
diff --git a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/QuestionAlertListModal.tsx b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/QuestionAlertListModal.tsx
index 8b53f834783..88f64da64b9 100644
--- a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/QuestionAlertListModal.tsx
+++ b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/QuestionAlertListModal.tsx
@@ -95,8 +95,7 @@ export const QuestionAlertListModal = ({
if (result.error) {
sendToast({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: t`An error occurred`,
});
return;
@@ -118,8 +117,7 @@ export const QuestionAlertListModal = ({
if (result.error) {
sendToast({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: t`An error occurred`,
});
return;
diff --git a/frontend/src/metabase/notifications/pulse/actions.ts b/frontend/src/metabase/notifications/pulse/actions.ts
index 0eedfd86dd6..b4f3509ed6c 100644
--- a/frontend/src/metabase/notifications/pulse/actions.ts
+++ b/frontend/src/metabase/notifications/pulse/actions.ts
@@ -61,8 +61,7 @@ export const saveEditingPulse = createThunkAction(
dispatch(
addUndo({
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
message: isEdit
? t`Cannot edit subscription. ${errorMessage} Please contact your administrator.`
: t`Cannot create subscription. ${errorMessage} Please contact your administrator.`,
diff --git a/frontend/src/metabase/query_builder/components/view/ViewFooter/use-copy-results.ts b/frontend/src/metabase/query_builder/components/view/ViewFooter/use-copy-results.ts
index 809cada8fe9..49b7aa31975 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewFooter/use-copy-results.ts
+++ b/frontend/src/metabase/query_builder/components/view/ViewFooter/use-copy-results.ts
@@ -231,7 +231,8 @@ export const useCopyResults = ({
} catch (error) {
dispatch(
addUndo({
- icon: "warning",
+ variant:
+ error instanceof ResultsTooLargeError ? "warning" : "negative",
message:
error instanceof ResultsTooLargeError
? getTooLargeReason()
diff --git a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx
index 8ba36d1775a..a77e5e81f8f 100644
--- a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx
+++ b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx
@@ -79,6 +79,7 @@ export const MoveCardModal = ({ card, onClose }: MoveCardModalProps) => {
dispatch(
addUndo({
message: <MoveCardToast card={card} destination={destination} />,
+ variant: destination ? undefined : "negative",
}),
);
diff --git a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.tsx b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.tsx
index fdad2db12cd..4d3ad39a591 100644
--- a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.tsx
+++ b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.tsx
@@ -24,12 +24,7 @@ function MoveCardToast({ card, destination }: MoveCardToastProps) {
const type = card.type;
if (!destination) {
- return (
- <Flex align="center">
- <Icon name="warning" mr="sm" />
- {t`Something went wrong`}
- </Flex>
- );
+ return <Flex align="center">{t`Something went wrong`}</Flex>;
}
const link =
diff --git a/frontend/src/metabase/redux/store/undo.ts b/frontend/src/metabase/redux/store/undo.ts
index 0abe0d514b3..544476a0915 100644
--- a/frontend/src/metabase/redux/store/undo.ts
+++ b/frontend/src/metabase/redux/store/undo.ts
@@ -3,6 +3,8 @@ import type { CSSProperties, ReactNode, RefObject } from "react";
import type { ColorName } from "metabase/ui/colors/types";
import type { DashCardId, DashboardTabId, IconName } from "metabase-types/api";
+export type UndoVariant = "neutral" | "negative" | "warning";
+
export interface Undo {
id: string | number;
type?: string;
@@ -13,6 +15,7 @@ export interface Undo {
actions?: (() => void)[];
showProgress?: boolean;
icon?: IconName | null;
+ variant?: UndoVariant;
toastColor?: ColorName;
dark?: boolean;
iconColor?: ColorName;
diff --git a/frontend/src/metabase/redux/undo.ts b/frontend/src/metabase/redux/undo.ts
index 15e455a49b6..731896655c6 100644
--- a/frontend/src/metabase/redux/undo.ts
+++ b/frontend/src/metabase/redux/undo.ts
@@ -5,7 +5,8 @@ import _ from "underscore";
import { createAction, createThunkAction } from "metabase/redux";
import type { State } from "metabase/redux/store";
-import type { Undo } from "metabase/redux/store/undo";
+import type { Undo, UndoVariant } from "metabase/redux/store/undo";
+import type { IconName } from "metabase-types/api";
const ADD_UNDO = "metabase/questions/ADD_UNDO";
const DISMISS_UNDO = "metabase/questions/DISMISS_UNDO";
@@ -14,9 +15,24 @@ const PERFORM_UNDO = "metabase/questions/PERFORM_UNDO";
let nextUndoId = 0;
+function getDefaultIcon(variant: UndoVariant | undefined): IconName {
+ switch (variant) {
+ case "negative":
+ return "warning";
+ case "warning":
+ return "warning_triangle_filled";
+ default:
+ return "check_filled";
+ }
+}
+
export const addUndo = createThunkAction(ADD_UNDO, (undo: Partial<Undo>) => {
return (dispatch, getState) => {
- const { icon = "check_filled", timeout = 5000, canDismiss = true } = undo;
+ const {
+ icon = getDefaultIcon(undo.variant),
+ timeout = 5000,
+ canDismiss = true,
+ } = undo;
const id = undo.id ?? nextUndoId++;
// if we're overwriting an existing undo, clear its timeout
const currentUndo = getUndo(getState(), id);
diff --git a/frontend/src/metabase/redux/undo.unit.spec.ts b/frontend/src/metabase/redux/undo.unit.spec.ts
index c5e29fa0a77..faf6514f766 100644
--- a/frontend/src/metabase/redux/undo.unit.spec.ts
+++ b/frontend/src/metabase/redux/undo.unit.spec.ts
@@ -46,6 +46,16 @@ describe("metabase/redux/undo", () => {
expect(store.getState().undo).toHaveLength(1);
expect(store.getState().undo[0].message).toBe("Updated toast");
});
+
+ it("should keep an explicit icon regardless of the variant", async () => {
+ const store = createMockStore();
+
+ await store.dispatch(
+ addUndo({ id: MOCK_ID, variant: "negative", icon: "info" }),
+ );
+
+ expect(store.getState().undo[0].icon).toBe("info");
+ });
});
describe("performUndo", () => {
diff --git a/frontend/src/metabase/settings/use-admin-setting.ts b/frontend/src/metabase/settings/use-admin-setting.ts
index 78a2a322d8d..680bce0fe2a 100644
--- a/frontend/src/metabase/settings/use-admin-setting.ts
+++ b/frontend/src/metabase/settings/use-admin-setting.ts
@@ -65,8 +65,7 @@ export const useAdminSetting = <SettingName extends EnterpriseSettingKey>(
sendToast({
message,
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
});
} else {
sendToast({ message: t`Changes saved` });
@@ -97,8 +96,7 @@ export const useAdminSetting = <SettingName extends EnterpriseSettingKey>(
sendToast({
message,
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
});
} else {
sendToast({ message: t`Changes saved`, icon: "check_filled" });
@@ -162,8 +160,7 @@ export const useAdminSettings = <
sendToast({
message,
- icon: "warning",
- toastColor: "feedback-negative",
+ variant: "negative",
});
} else {
sendToast({ message: t`Changes saved`, icon: "check_filled" });
diff --git a/frontend/src/metabase/transforms/components/CreateTransformCollectionModal/CreateTransformCollectionModal.tsx b/frontend/src/metabase/transforms/components/CreateTransformCollectionModal/CreateTransformCollectionModal.tsx
index 8008e9db41b..237c24d4b66 100644
--- a/frontend/src/metabase/transforms/components/CreateTransformCollectionModal/CreateTransformCollectionModal.tsx
+++ b/frontend/src/metabase/transforms/components/CreateTransformCollectionModal/CreateTransformCollectionModal.tsx
@@ -51,7 +51,7 @@ export function CreateTransformCollectionModal({
} catch (error) {
sendToast({
message: getErrorMessage(error, t`Failed to create collection`),
- icon: "warning",
+ variant: "negative",
});
}
},
diff --git a/frontend/src/metabase/transforms/pages/TransformIndexesPage/IndexEditorModal/IndexEditorModal.tsx b/frontend/src/metabase/transforms/pages/TransformIndexesPage/IndexEditorModal/IndexEditorModal.tsx
index d03a943c235..19a91856eef 100644
--- a/frontend/src/metabase/transforms/pages/TransformIndexesPage/IndexEditorModal/IndexEditorModal.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformIndexesPage/IndexEditorModal/IndexEditorModal.tsx
@@ -123,7 +123,7 @@ export function IndexEditorModal({
trackFailure({ transformId: transform.id, kind, result: "failure" });
sendToast({
message: getErrorMessage(submitError, t`Failed to save index`),
- icon: "warning",
+ variant: "negative",
});
throw submitError;
}
diff --git a/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexesPage.tsx b/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexesPage.tsx
index 26b84622198..14de21cb9c6 100644
--- a/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexesPage.tsx
+++ b/frontend/src/metabase/transforms/pages/TransformIndexesPage/TransformIndexesPage.tsx
@@ -193,7 +193,7 @@ function useDeleteIndex() {
});
sendToast({
message: getErrorMessage(deleteError, t`Failed to delete index`),
- icon: "warning",
+ variant: "negative",
});
}
},