The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Add EOL banners to the Updates settings page and Security Center (#83276)
Kevin Kelleherbce286329f5b
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.tsxindex f20e9b27ca0..18bd0776086 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@@ -174,7 +174,7 @@ export function SecurityCenterPage() {<Text c="text-secondary" data-testid="current-version">{t`Current version`}: {currentVersion}</Text>- {targetVersion && <UpgradeBanner targetVersion={targetVersion} />}+ <UpgradeBanner targetVersion={targetVersion} /></Stack><Stack gap="xxl" className={S.content}><AdvisoryFilterBardiff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.unit.spec.tsxindex 1897e2deaf7..1686f50e45f 100644--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/SecurityCenterPage/SecurityCenterPage.unit.spec.tsx@@ -1,12 +1,20 @@import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { setupRecentViewsAndSelectionsEndpoints } from "__support__/server-mocks";+import {+ setupRecentViewsAndSelectionsEndpoints,+ setupSettingEndpoint,+} from "__support__/server-mocks";import { createMockSettingsState } from "__support__/state";import { renderWithProviders, screen, within } from "__support__/ui";+import { getEolReachedMessage } from "metabase/admin/settings/components/widgets/VersionUpdateNotice/utils";import { Route } from "metabase/router";-import type { Advisory } from "metabase-types/api";-import { createMockVersion } from "metabase-types/api/mocks";+import type { Advisory, VersionInfo } from "metabase-types/api";+import {+ createMockMajorVersionSupport,+ createMockVersion,+ createMockVersionInfo,+} from "metabase-types/api/mocks";import { createAdvisory } from "metabase-types/api/mocks/security-center";import * as notificationHook from "../../hooks/use-notification-config";@@ -23,16 +31,20 @@ jest.mock("metabase/admin/components/AdminLayout/AdminSettingsLayout", () => ({const mockAcknowledge = jest.fn();const mockAcknowledgeAll = jest.fn();+const PAST_EOL = "2000-06-01";+function setup(advisories: Advisory[] = [],{lastCheckedAt = null,initialRoute = "/",isError = false,+ versionInfo,}: {lastCheckedAt?: string | null;initialRoute?: string;isError?: boolean;+ versionInfo?: VersionInfo;} = {},) {jest.spyOn(advisoriesHook, "useSecurityAdvisories").mockReturnValue({@@ -45,6 +57,10 @@ function setup(});setupRecentViewsAndSelectionsEndpoints([], ["selections"]);+ setupSettingEndpoint({+ settingKey: "version-info",+ settingValue: versionInfo ?? createMockVersionInfo(),+ });jest.spyOn(notificationHook, "useNotificationConfigState").mockReturnValue({config: {email: {@@ -428,6 +444,39 @@ describe("SecurityCenterPage", () => {});});+ describe("eol notice", () => {+ const pastEolVersionInfo = createMockVersionInfo({+ major_version_support: [+ createMockMajorVersionSupport({ major: 59, eol: PAST_EOL }),+ ],+ });++ it("shows the eol notice when the version is past eol and there is no upgrade target", async () => {+ setup([], { versionInfo: pastEolVersionInfo });++ const banner = await screen.findByTestId("upgrade-banner");+ expect(banner).toHaveTextContent(getEolReachedMessage());+ });++ it("does not show the eol notice when an upgrade target is available", () => {+ setup(+ [+ createAdvisory({+ advisory_id: "1",+ match_status: "active",+ affected_versions: [{ min: "0.58.0", fixed: "0.59.4" }],+ }),+ ],+ { versionInfo: pastEolVersionInfo },+ );++ expect(screen.getByTestId("upgrade-banner")).toBeInTheDocument();+ expect(+ screen.queryByText(getEolReachedMessage()),+ ).not.toBeInTheDocument();+ });+ });+describe("notification settings modal", () => {it("opens the modal when the 'open=notifications' query param is set", async () => {setup([], { initialRoute: "/?open=notifications" });diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/components/UpgradeBanner/UpgradeBanner.tsx b/enterprise/frontend/src/metabase-enterprise/security_center/components/UpgradeBanner/UpgradeBanner.tsxindex b8ce215012f..ece14328897 100644--- a/enterprise/frontend/src/metabase-enterprise/security_center/components/UpgradeBanner/UpgradeBanner.tsx+++ b/enterprise/frontend/src/metabase-enterprise/security_center/components/UpgradeBanner/UpgradeBanner.tsx@@ -1,7 +1,9 @@import { c, t } from "ttag";+import { getEolReachedMessage } from "metabase/admin/settings/components/widgets/VersionUpdateNotice/utils";import { ExternalLink } from "metabase/common/components/ExternalLink";import { useIsSmallScreen } from "metabase/common/hooks/use-is-small-screen";+import { useEolDate } from "metabase/settings";import { Anchor, Flex, Icon, Text } from "metabase/ui";import S from "./UpgradeBanner.module.css";@@ -11,16 +13,28 @@ const UPGRADE_DOCS_URL ="https://www.metabase.com/docs/latest/installation-and-operation/upgrading-metabase";interface UpgradeBannerProps {- targetVersion: string;+ targetVersion: string | null;}export function UpgradeBanner({ targetVersion }: UpgradeBannerProps) {const isSmallScreen = useIsSmallScreen();+ const { isEol } = useEolDate();++ const message = targetVersion+ ? c("{0} is a version number like v0.59.4")+ .t`A security update is available. Update to ${targetVersion} or later to resolve known issues.`+ : isEol+ ? getEolReachedMessage()+ : null;++ if (!message) {+ return null;+ }return (<FlexclassName={S.root}- gap="sm"+ gap="lg"wrap="nowrap"data-testid="upgrade-banner"direction={isSmallScreen ? "column" : "row"}@@ -28,8 +42,7 @@ export function UpgradeBanner({ targetVersion }: UpgradeBannerProps) {<Flex gap="lg" align="center"><Icon name="warning" className={S.icon} /><Text fw="bold" size="md" className={S.text}>- {c("{0} is a version number like v0.59.4")- .t`A security update is available. Update to ${targetVersion} or later to resolve known issues.`}+ {message}</Text></Flex><Anchordiff --git a/frontend/src/metabase-types/api/icon.ts b/frontend/src/metabase-types/api/icon.tsindex c226ccd56a6..2f95fe6c7af 100644--- a/frontend/src/metabase-types/api/icon.ts+++ b/frontend/src/metabase-types/api/icon.ts@@ -132,6 +132,7 @@ export type IconName =| "google"| "google_drive"| "google_sheet"+ | "heart_handshake"| "history"| "home"| "horizontal_bar"diff --git a/frontend/src/metabase-types/api/mocks/settings.ts b/frontend/src/metabase-types/api/mocks/settings.tsindex 898b66867e2..3b9b32201b8 100644--- a/frontend/src/metabase-types/api/mocks/settings.ts+++ b/frontend/src/metabase-types/api/mocks/settings.ts@@ -6,6 +6,7 @@ import type {EnterpriseSettingKey,EnterpriseSettings,FontFile,+ MajorVersionSupport,SettingDefinition,Settings,TokenFeatures,@@ -82,6 +83,16 @@ export const createMockVersionInfo = (...opts,});+export const createMockMajorVersionSupport = (+ opts?: Partial<MajorVersionSupport>,+): MajorVersionSupport => ({+ major: 56,+ released: "2025-04-15",+ lts: false,+ eol: "2027-06-01",+ ...opts,+});+export const createMockTokenStatus = (opts?: Partial<TokenStatus>,): TokenStatus => ({diff --git a/frontend/src/metabase-types/api/settings.ts b/frontend/src/metabase-types/api/settings.tsindex 9cebf64da5f..9e2c5420544 100644--- a/frontend/src/metabase-types/api/settings.ts+++ b/frontend/src/metabase-types/api/settings.ts@@ -213,12 +213,20 @@ export interface AlertUpgradeVersion {id?: string;}+export interface MajorVersionSupport {+ major: number;+ released: string;+ lts: boolean;+ eol: string;+}+export interface VersionInfo {nightly?: VersionInfoRecord;beta?: VersionInfoRecord;latest?: VersionInfoRecord;older?: VersionInfoRecord[];alert_upgrade_versions?: AlertUpgradeVersion[];+ major_version_support?: MajorVersionSupport[];}export type LocaleData = [string, string];diff --git a/frontend/src/metabase/admin/settings/components/SettingsPages/UpdatesSettingsPage.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/SettingsPages/UpdatesSettingsPage.unit.spec.tsxindex 2118431f110..31832a6c6e0 100644--- a/frontend/src/metabase/admin/settings/components/SettingsPages/UpdatesSettingsPage.unit.spec.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingsPages/UpdatesSettingsPage.unit.spec.tsx@@ -7,20 +7,27 @@ import {import { createMockSettingsState } from "__support__/state";import { renderWithProviders, screen } from "__support__/ui";import { UndoListing } from "metabase/common/components/UndoListing";-import type { SettingKey } from "metabase-types/api";+import { dayjs } from "metabase/dayjs";+import type { SettingKey, VersionInfo } from "metabase-types/api";import {+ createMockMajorVersionSupport,createMockSettingDefinition,createMockSettings,createMockTokenFeatures,createMockUser,+ createMockVersionInfo,} from "metabase-types/api/mocks";import { UpdatesSettingsPage } from "./UpdatesSettingsPage";+const FUTURE_EOL = "2099-06-01";+const setup = async (props: {isHosted: boolean;versionTag: string;isPro?: boolean;+ checkForUpdates?: boolean;+ versionInfo?: VersionInfo;}) => {// having any SSO feature is how we detect if you have a pro planconst tokenFeatures = createMockTokenFeatures(@@ -29,7 +36,7 @@ const setup = async (props: {const updatesSettings = {"is-hosted?": props.isHosted,- "check-for-updates": true,+ "check-for-updates": props.checkForUpdates ?? true,version: {date: "2025-03-19",src_hash: "4df5cf3e5e86b0cc7421d80e2a8835e2ce3afa7d",@@ -44,7 +51,7 @@ const setup = async (props: {setupUpdateSettingEndpoint();setupSettingEndpoint({settingKey: "version-info",- settingValue: {+ settingValue: props.versionInfo ?? {latest: {version: "v1.53.8",released: "2025-03-25",@@ -86,8 +93,8 @@ describe("UpdatesSettingsPage", () => {expect(screen.getByText("Check for updates")).toBeInTheDocument();expect(- screen.getByText(- "You're running Metabase 1.53.8 which is the latest and greatest!",+ await screen.findByText(+ "You're running Metabase 1.53.8, which is the latest and greatest.",),).toBeInTheDocument();});@@ -131,4 +138,50 @@ describe("UpdatesSettingsPage", () => {screen.queryByText("Migrate to Metabase Cloud"),).not.toBeInTheDocument();});++ it("should show the version notice and eol notice when checking for updates", async () => {+ await setup({+ isHosted: false,+ versionTag: "v1.53.8",+ versionInfo: createMockVersionInfo({+ latest: {+ version: "v1.53.8",+ released: "2025-03-25",+ patch: true,+ },+ major_version_support: [+ createMockMajorVersionSupport({ major: 53, eol: FUTURE_EOL }),+ ],+ }),+ });++ expect(+ await screen.findByText(+ "You're running Metabase 1.53.8, which is the latest and greatest.",+ ),+ ).toBeInTheDocument();+ expect(+ screen.getByText(dayjs.utc(FUTURE_EOL).format("ll")),+ ).toBeInTheDocument();+ });++ it("should not show the eol notice when check for updates is off", async () => {+ await setup({+ isHosted: false,+ versionTag: "v1.53.8",+ checkForUpdates: false,+ versionInfo: createMockVersionInfo({+ latest: {+ version: "v1.53.8",+ released: "2025-03-25",+ patch: true,+ },+ major_version_support: [+ createMockMajorVersionSupport({ major: 53, eol: FUTURE_EOL }),+ ],+ }),+ });++ expect(screen.queryByText(/end-of-life/)).not.toBeInTheDocument();+ });});diff --git a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.module.css b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.module.cssindex df752ad13ba..850e06775e7 100644--- a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.module.css+++ b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.module.css@@ -1,16 +1,3 @@-.container {- background-color: var(--mb-color-core-summarize);-}--.message {- padding: 1rem;- color: var(--mb-color-text-primary-inverse);- font-weight: bold;- border: 1px solid var(--mb-color-core-brand);- border-radius: 0.5rem;- background-color: var(--mb-color-core-brand);-}-.iframe {width: 100%;height: 600px;@@ -18,3 +5,18 @@border-radius: 0.5rem;margin-top: 1rem;}++.hoverCardTrigger {+ cursor: pointer;++ &:hover {+ background-color: var(--mb-color-core-brand-hover);+ }+}++.inlineInfoIcon {+ display: inline-block;+ vertical-align: text-bottom;+ margin-inline-start: var(--mantine-spacing-xs);+ cursor: pointer;+}diff --git a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.tsx b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.tsxindex f5a31865ff9..fd04e4c166a 100644--- a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.tsx@@ -1,15 +1,24 @@-import cx from "classnames";-import { c, t } from "ttag";+import { t } from "ttag";import { getCurrentVersion } from "metabase/admin/app/selectors";import { ExternalLink } from "metabase/common/components/ExternalLink";-import CS from "metabase/css/core/index.css";+import { dayjs } from "metabase/dayjs";import { useSelector } from "metabase/redux";-import { useGetVersionInfoQuery } from "metabase/settings";-import { Button, Tabs } from "metabase/ui";-import { newVersionAvailable, versionIsLatest } from "metabase/utils/version";+import { useEolDate, useGetVersionInfoQuery } from "metabase/settings";+import {+ Anchor,+ Button,+ Flex,+ HoverCard,+ Icon,+ Stack,+ Tabs,+ Text,+} from "metabase/ui";+import { getMajorVersion, newVersionAvailable } from "metabase/utils/version";import S from "./VersionUpdateNotice.module.css";+import { getEolMessage, getVersionMessage } from "./utils";const embedQueryParams = "?hide_nav=true&no_gdpr=true";@@ -17,93 +26,129 @@ export function VersionUpdateNotice() {const { data: versionInfo } = useGetVersionInfoQuery();const currentVersion = useSelector(getCurrentVersion);const latestVersion = versionInfo?.latest?.version;- const displayVersion = formatVersion(currentVersion);+ const { eolDate, isEol } = useEolDate();- if (latestVersion && versionIsLatest({ currentVersion, latestVersion })) {- return <OnLatestVersion currentVersion={displayVersion} />;- }-- if (latestVersion && newVersionAvailable({ currentVersion, latestVersion })) {- return (- <NewVersionAvailable- currentVersion={displayVersion}- latestVersion={latestVersion}- />- );- }- return <DefaultUpdateMessage currentVersion={displayVersion} />;-}--function OnLatestVersion({ currentVersion }: { currentVersion: string }) {return (- <div>- <div className={S.message}>- {c(`{0} is a version number`)- .t`You're running Metabase ${currentVersion} which is the latest and greatest!`}- </div>- </div>+ <VersionMessage+ currentVersion={currentVersion}+ latestVersion={latestVersion}+ eolDate={eolDate}+ isEol={isEol}+ />);}-function DefaultUpdateMessage({ currentVersion }: { currentVersion: string }) {- return (- <div>- <div className={S.message}>- {c(`{0} is a version number`)- .t`You're running Metabase ${currentVersion}`}- </div>- </div>- );+interface VersionMessageProps {+ currentVersion: string;+ latestVersion?: string;+ eolDate?: Date | null;+ isEol: boolean;}-function NewVersionAvailable({+function VersionMessage({currentVersion,latestVersion,-}: {- currentVersion: string;- latestVersion: string;-}) {+ eolDate,+ isEol,+}: VersionMessageProps) {+ const isNewVersionAvailable =+ latestVersion != null &&+ newVersionAvailable({ currentVersion, latestVersion });+ const message = getVersionMessage(currentVersion, latestVersion, isEol);+ const textColor = isEol ? "text-primary" : "text-primary-inverse";return (- <div>- <div- className={cx(- S.container,- CS.p2,- CS.bordered,- CS.rounded,- CS.borderSuccess,- CS.flex,- CS.flexRow,- CS.alignCenter,- CS.justifyBetween,+ <Flex+ align="center"+ justify="space-between"+ p="lg"+ bg={isEol ? "background_surface-warning" : "core-brand"}+ bd={isEol ? "1px solid var(--mb-color-feedback-warning)" : undefined}+ bdrs="sm"+ >+ <Text fw="bold" c={textColor} miw={0}>+ {message}+ {isNewVersionAvailable && eolDate && (+ <EolHoverCard+ currentVersion={currentVersion}+ eolDate={eolDate}+ isEol={isEol}+ >+ <Icon name="info" c={textColor} className={S.inlineInfoIcon} />+ </EolHoverCard>)}- >- <span className={cx(CS.textWhite, CS.textBold)}>- {t`Metabase ${formatVersion(latestVersion)} is available. You're running ${currentVersion}.`}- </span>+ </Text>+ {isNewVersionAvailable && (<Buttonvariant="on-dark-primary"component={ExternalLink}flex="0 0 auto"ml="sm"- href={- "https://www.metabase.com/docs/" +- latestVersion +- "/operations-guide/upgrading-metabase.html"- }+ href="https://www.metabase.com/docs/latest/installation-and-operation/upgrading-metabase">{t`Update`}</Button>- </div>- </div>+ )}+ {!isNewVersionAvailable && eolDate && (+ <EolHoverCard+ currentVersion={currentVersion}+ eolDate={eolDate}+ isEol={isEol}+ >+ <Flex+ align="center"+ gap="xs"+ p="xs"+ bdrs="sm"+ className={S.hoverCardTrigger}+ >+ <Icon name="heart_handshake" c={textColor} />+ <Text c={textColor} fw="bold">+ {dayjs(eolDate).utc().format("ll")}+ </Text>+ </Flex>+ </EolHoverCard>+ )}+ </Flex>+ );+}++interface EolHoverCardProps {+ currentVersion: string;+ eolDate: Date;+ isEol: boolean;+ children: React.ReactNode;+}++function EolHoverCard({+ currentVersion,+ eolDate,+ isEol,+ children,+}: EolHoverCardProps) {+ const eolMessage = getEolMessage(currentVersion, eolDate, isEol);+ return (+ <HoverCard>+ <HoverCard.Target>{children}</HoverCard.Target>+ <HoverCard.Dropdown>+ <Stack gap="sm" p="md" w="18rem">+ <Text>{eolMessage}</Text>+ <Anchor+ component={ExternalLink}+ href="https://www.metabase.com/version-support"+ fw="bold"+ >+ {t`Learn more`}+ </Anchor>+ </Stack>+ </HoverCard.Dropdown>+ </HoverCard>);}export function NewVersionInfo() {const { data: versionInfo } = useGetVersionInfoQuery();- const latestMajorVersion = getLatestMajorVersion(- versionInfo?.latest?.version,- );+ const latestMajorVersion =+ getMajorVersion(versionInfo?.latest?.version ?? "") ?? "";return (<Tabs mt="lg" defaultValue="whats-new">@@ -128,11 +173,3 @@ export function NewVersionInfo() {</Tabs>);}--function getLatestMajorVersion(version: string | null | undefined) {- return version?.split(".")[1] ?? "";-}--function formatVersion(versionLabel = "") {- return versionLabel.replace(/^v/, "");-}diff --git a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.unit.spec.tsxindex 621db9eea28..6c3a3f29f15 100644--- a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.unit.spec.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.unit.spec.tsx@@ -1,3 +1,5 @@+import userEvent from "@testing-library/user-event";+import {setupPropertiesEndpoints,setupSettingEndpoint,@@ -7,15 +9,36 @@ import {import { createMockSettingsState } from "__support__/state";import { renderWithProviders, screen } from "__support__/ui";import { UndoListing } from "metabase/common/components/UndoListing";-import type { SettingKey } from "metabase-types/api";+import { dayjs } from "metabase/dayjs";+import type { SettingKey, VersionInfo } from "metabase-types/api";import {+ createMockMajorVersionSupport,createMockSettingDefinition,createMockSettings,+ createMockVersionInfo,+ createMockVersionInfoRecord,} from "metabase-types/api/mocks";import { VersionUpdateNotice } from "./VersionUpdateNotice";+import { getEolReachedMessage } from "./utils";++const LATEST = "v1.53.9";+const CURRENT = "v1.53.8";+const FUTURE_EOL = "2099-06-01";+const PAST_EOL = "2000-06-01";-const setup = (props: { isHosted: boolean; versionTag: string }) => {+function versionInfoWithEol(eol: string): VersionInfo {+ return createMockVersionInfo({+ latest: createMockVersionInfoRecord({ version: LATEST }),+ major_version_support: [createMockMajorVersionSupport({ major: 53, eol })],+ });+}++const setup = (props: {+ isHosted: boolean;+ versionTag: string;+ versionInfo?: VersionInfo;+}) => {const versionNoticeSettings = {version: {date: "2025-03-19",@@ -31,14 +54,11 @@ const setup = (props: { isHosted: boolean; versionTag: string }) => {setupUpdateSettingEndpoint();setupSettingEndpoint({settingKey: "version-info",- settingValue: {- latest: {- version: "v1.53.9",- released: "2025-03-25",- patch: true,- highlights: [],- },- },+ settingValue:+ props.versionInfo ??+ createMockVersionInfo({+ latest: createMockVersionInfoRecord({ version: LATEST }),+ }),});setupSettingsEndpoints(@@ -63,21 +83,22 @@ const setup = (props: { isHosted: boolean; versionTag: string }) => {describe("VersionUpdateNotice", () => {it("should tell the user if they're on the latest version", async () => {- setup({ isHosted: false, versionTag: "v1.53.9" });+ setup({ isHosted: false, versionTag: LATEST });expect(await screen.findByText(- "You're running Metabase 1.53.9 which is the latest and greatest!",+ "You're running Metabase 1.53.9, which is the latest and greatest.",),).toBeInTheDocument();});it("should tell the user if there's a new version", async () => {- setup({ isHosted: false, versionTag: "v1.53.8" });+ setup({ isHosted: false, versionTag: CURRENT });expect(await screen.findByText("Metabase 1.53.9 is available. You're running 1.53.8.",),).toBeInTheDocument();+ expect(screen.getByRole("link", { name: "Update" })).toBeInTheDocument();});it("should display default message if bad data", async () => {@@ -86,7 +107,60 @@ describe("VersionUpdateNotice", () => {versionTag: "notaversion",});expect(- await screen.findByText("You're running Metabase notaversion"),+ await screen.findByText("You're running Metabase notaversion."),+ ).toBeInTheDocument();+ });++ it("should show the eol date when the current version is the latest", async () => {+ setup({+ isHosted: false,+ versionTag: LATEST,+ versionInfo: versionInfoWithEol(FUTURE_EOL),+ });++ expect(+ await screen.findByText(dayjs.utc(FUTURE_EOL).format("ll")),).toBeInTheDocument();+ expect(screen.getByLabelText("heart_handshake icon")).toBeInTheDocument();+ expect(+ screen.queryByRole("link", { name: "Update" }),+ ).not.toBeInTheDocument();+ });++ it("should show the pre-eol message on hover when no update is available", async () => {+ setup({+ isHosted: false,+ versionTag: LATEST,+ versionInfo: versionInfoWithEol(FUTURE_EOL),+ });++ await userEvent.hover(await screen.findByLabelText("heart_handshake icon"));++ expect(+ await screen.findByText(/will reach end-of-life on/),+ ).toBeInTheDocument();+ expect(screen.getByRole("link", { name: "Learn more" })).toHaveAttribute(+ "href",+ "https://www.metabase.com/version-support",+ );+ });++ it("should mention end-of-life when a new version is available after eol", async () => {+ setup({+ isHosted: false,+ versionTag: CURRENT,+ versionInfo: versionInfoWithEol(PAST_EOL),+ });++ expect(+ await screen.findByText(+ "Metabase 1.53.9 is available. You're running 1.53.8, which has reached end-of-life.",+ ),+ ).toBeInTheDocument();+ expect(screen.getByLabelText("info icon")).toBeInTheDocument();+ expect(screen.getByRole("link", { name: "Update" })).toBeInTheDocument();++ await userEvent.hover(screen.getByLabelText("info icon"));+ expect(await screen.findByText(getEolReachedMessage())).toBeInTheDocument();});});diff --git a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/utils.ts b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/utils.tsnew file mode 100644index 00000000000..672ee1ae280--- /dev/null+++ b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/utils.ts@@ -0,0 +1,55 @@+import { c, t } from "ttag";++import { dayjs } from "metabase/dayjs";+import {+ getMajorVersion,+ newVersionAvailable,+ versionIsLatest,+} from "metabase/utils/version";++export function getVersionMessage(+ currentVersion: string,+ latestVersion: string | undefined,+ isEol: boolean,+) {+ const formattedCurrentVersion = formatVersion(currentVersion);++ if (latestVersion && versionIsLatest({ currentVersion, latestVersion })) {+ return c(`{0} is a version number`)+ .t`You're running Metabase ${formattedCurrentVersion}, which is the latest and greatest.`;+ }++ if (latestVersion && newVersionAvailable({ currentVersion, latestVersion })) {+ const formattedLatestVersion = formatVersion(latestVersion);+ if (isEol) {+ return c(`{0} and {1} are version numbers`)+ .t`Metabase ${formattedLatestVersion} is available. You're running ${formattedCurrentVersion}, which has reached end-of-life.`;+ }+ return c(`{0} and {1} are version numbers`)+ .t`Metabase ${formattedLatestVersion} is available. You're running ${formattedCurrentVersion}.`;+ }++ return c(`{0} is a version number`)+ .t`You're running Metabase ${formattedCurrentVersion}.`;+}++export function getEolMessage(+ currentVersion: string,+ eolDate: Date,+ isEol: boolean,+) {+ if (isEol) {+ return getEolReachedMessage();+ }+ const currentMajorVersion = getMajorVersion(currentVersion) ?? "";+ return c(`{0} is a major version number, {1} is a date`)+ .t`Metabase ${currentMajorVersion} will reach end-of-life on ${dayjs(eolDate).utc().format("LL")} and will receive bug and security fixes until then.`;+}++export function getEolReachedMessage() {+ return t`Upgrade to a supported version as soon as possible to keep your Metabase secure. Your current version has reached end-of-life and won't get any more updates.`;+}++function formatVersion(version: string) {+ return version.replace(/^v/, "");+}diff --git a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/utils.unit.spec.ts b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/utils.unit.spec.tsnew file mode 100644index 00000000000..b0d591316a4--- /dev/null+++ b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/utils.unit.spec.ts@@ -0,0 +1,49 @@+import { dayjs } from "metabase/dayjs";++import {+ getEolMessage,+ getEolReachedMessage,+ getVersionMessage,+} from "./utils";++const CURRENT = "v1.53.8";+const LATEST = "v1.53.9";+const EOL_DATE = new Date("2099-06-01");++describe("getVersionMessage", () => {+ it("says the current version is the latest", () => {+ expect(getVersionMessage(LATEST, LATEST, false)).toBe(+ "You're running Metabase 1.53.9, which is the latest and greatest.",+ );+ });++ it("says a new version is available", () => {+ expect(getVersionMessage(CURRENT, LATEST, false)).toBe(+ "Metabase 1.53.9 is available. You're running 1.53.8.",+ );+ });++ it("says the current version has reached end-of-life when a new version is available", () => {+ expect(getVersionMessage(CURRENT, LATEST, true)).toBe(+ "Metabase 1.53.9 is available. You're running 1.53.8, which has reached end-of-life.",+ );+ });++ it("falls back when version data is not comparable", () => {+ expect(getVersionMessage("notaversion", LATEST, false)).toBe(+ "You're running Metabase notaversion.",+ );+ });+});++describe("getEolMessage", () => {+ it("uses the reached-eol copy after end-of-life", () => {+ expect(getEolMessage(CURRENT, EOL_DATE, true)).toBe(getEolReachedMessage());+ });++ it("includes the formatted date before end-of-life", () => {+ expect(getEolMessage(CURRENT, EOL_DATE, false)).toBe(+ `Metabase 53 will reach end-of-life on ${dayjs(EOL_DATE).utc().format("LL")} and will receive bug and security fixes until then.`,+ );+ });+});diff --git a/frontend/src/metabase/settings/index.ts b/frontend/src/metabase/settings/index.tsindex 71d776fea84..ddddb2bc53f 100644--- a/frontend/src/metabase/settings/index.ts+++ b/frontend/src/metabase/settings/index.ts@@ -22,6 +22,7 @@ export {getTokenFeature,} from "./selectors";export { useAdminSetting, useAdminSettings } from "./use-admin-setting";+export { useEolDate } from "./use-eol-date";export { useSetting, useUserSetting } from "./use-setting";export { useSettingSwitch } from "./use-setting-switch";export {diff --git a/frontend/src/metabase/settings/use-eol-date.ts b/frontend/src/metabase/settings/use-eol-date.tsnew file mode 100644index 00000000000..88d77cdbc6f--- /dev/null+++ b/frontend/src/metabase/settings/use-eol-date.ts@@ -0,0 +1,46 @@+import { useMemo } from "react";++import { getMajorVersion } from "metabase/utils/version";+import type { VersionInfo } from "metabase-types/api";++import { useGetVersionInfoQuery } from "./api";+import { useSetting } from "./use-setting";++interface UseEolDateResult {+ eolDate: Date | null;+ isEol: boolean;+}++export function useEolDate(): UseEolDateResult {+ const { data: versionInfo } = useGetVersionInfoQuery();+ const version = useSetting("version");++ return useMemo(() => {+ if (!versionInfo || !version.tag) {+ return { eolDate: null, isEol: false };+ }+ const eolDate = getEolDate(versionInfo, version.tag);+ return {+ eolDate,+ isEol: eolDate != null && new Date() > eolDate,+ };+ }, [versionInfo, version.tag]);+}++function getEolDate(versionInfo: VersionInfo, version: string): Date | null {+ const majorVersion = getMajorVersion(version);+ const eol = versionInfo.major_version_support+ ?.filter((support) => support.major === majorVersion)+ .reduce<string | null>(+ (maxEol, { eol }) => (maxEol == null || eol > maxEol ? eol : maxEol),+ null,+ );+ if (!eol) {+ return null;+ }+ const eolDate = new Date(eol);+ if (isNaN(eolDate.valueOf())) {+ return null;+ }+ return eolDate;+}diff --git a/frontend/src/metabase/settings/use-eol-date.unit.spec.ts b/frontend/src/metabase/settings/use-eol-date.unit.spec.tsnew file mode 100644index 00000000000..f1aa6e12f20--- /dev/null+++ b/frontend/src/metabase/settings/use-eol-date.unit.spec.ts@@ -0,0 +1,156 @@+import { setupSettingEndpoint } from "__support__/server-mocks";+import { createMockSettingsState } from "__support__/state";+import { renderHookWithProviders, waitFor } from "__support__/ui";+import type { VersionInfo } from "metabase-types/api";+import {+ createMockMajorVersionSupport,+ createMockSettings,+ createMockVersion,+ createMockVersionInfo,+} from "metabase-types/api/mocks";++import { useGetVersionInfoQuery } from "./api";+import { useEolDate } from "./use-eol-date";++const VERSION = "v1.56.3";+const NO_EOL = { eolDate: null, isEol: false };++async function setup({+ versionTag = VERSION,+ versionInfo,+}: {+ versionTag?: string;+ versionInfo: VersionInfo;+}) {+ setupSettingEndpoint({+ settingKey: "version-info",+ settingValue: versionInfo,+ });++ const { result } = renderHookWithProviders(+ () => ({+ eol: useEolDate(),+ isLoaded: useGetVersionInfoQuery().isSuccess,+ }),+ {+ storeInitialState: {+ settings: createMockSettingsState(+ createMockSettings({+ version: createMockVersion({ tag: versionTag }),+ }),+ ),+ },+ },+ );++ // Wait for version-info so a null result can't come from loading state+ await waitFor(() => expect(result.current.isLoaded).toBe(true));++ return result.current.eol;+}++describe("useEolDate", () => {+ it("returns null when major_version_support is missing", async () => {+ expect(await setup({ versionInfo: createMockVersionInfo() })).toEqual(+ NO_EOL,+ );+ });++ it("returns null when major_version_support is empty", async () => {+ expect(+ await setup({+ versionInfo: createMockVersionInfo({ major_version_support: [] }),+ }),+ ).toEqual(NO_EOL);+ });++ it("returns null when there is no row for the current major", async () => {+ expect(+ await setup({+ versionInfo: createMockVersionInfo({+ major_version_support: [+ createMockMajorVersionSupport({ major: 54, eol: "2027-06-01" }),+ ],+ }),+ }),+ ).toEqual(NO_EOL);+ });++ it("returns null when eol is not a valid date", async () => {+ expect(+ await setup({+ versionInfo: createMockVersionInfo({+ major_version_support: [+ createMockMajorVersionSupport({ major: 56, eol: "not-a-date" }),+ ],+ }),+ }),+ ).toEqual(NO_EOL);+ });++ it.each(["", "notaversion", "vLOCAL_DEV"])(+ "returns null for version tag %p",+ async (versionTag) => {+ expect(+ await setup({+ versionTag,+ versionInfo: createMockVersionInfo({+ major_version_support: [+ createMockMajorVersionSupport({ major: 56 }),+ ],+ }),+ }),+ ).toEqual(NO_EOL);+ },+ );++ it("returns UTC midnight of the matching eol date", async () => {+ const { eolDate } = await setup({+ versionInfo: createMockVersionInfo({+ major_version_support: [+ createMockMajorVersionSupport({ major: 56, eol: "2027-06-01" }),+ ],+ }),+ });++ expect(eolDate?.toISOString()).toBe("2027-06-01T00:00:00.000Z");+ });++ it("uses the latest eol when the same major appears more than once", async () => {+ const { eolDate } = await setup({+ versionInfo: createMockVersionInfo({+ major_version_support: [+ createMockMajorVersionSupport({ major: 56, eol: "2027-06-01" }),+ createMockMajorVersionSupport({ major: 54, eol: "2028-01-01" }),+ createMockMajorVersionSupport({ major: 56, eol: "2027-12-01" }),+ ],+ }),+ });++ expect(eolDate?.toISOString()).toBe("2027-12-01T00:00:00.000Z");+ });++ it("returns isEol false when the eol date is in the future", async () => {+ const { isEol } = await setup({+ versionInfo: createMockVersionInfo({+ major_version_support: [+ createMockMajorVersionSupport({ major: 56, eol: "2999-01-01" }),+ ],+ }),+ });++ expect(isEol).toBe(false);+ });++ it("returns isEol true when the eol date has passed", async () => {+ const { isEol } = await setup({+ versionInfo: createMockVersionInfo({+ major_version_support: [+ createMockMajorVersionSupport({ major: 56, eol: "2020-01-01" }),+ ],+ }),+ });++ expect(isEol).toBe(true);+ });+});diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/heart_handshake.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/heart_handshake.svgnew file mode 100644index 00000000000..6587cd29e32--- /dev/null+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/heart_handshake.svg@@ -0,0 +1 @@+<svg viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M10.384 5.365a2.205 2.205 0 0 1 1.559.646l1.173 1.173c.072.073.136.151.195.232.147-.324.219-.656.219-1.036a2.728 2.728 0 0 0-3.366-2.652 2.728 2.728 0 0 0-1.42.861L6.988 6.306l-.069.083a.546.546 0 0 0 .84.688L8.825 6.01l.161-.145a2.205 2.205 0 0 1 1.398-.5zM2.465 6.38c0 1.114.72 1.987 1.665 2.932h-.001l3.444 3.335.025.027a.547.547 0 0 0 .7.083l.085-.07a.62.62 0 0 0-.001-.877v-.002l-.025-.025a.701.701 0 0 1 1.014-.967l.025.027a.626.626 0 0 0 .903.023.622.622 0 0 0-.023-.903l-.025-.024a.701.701 0 0 1 .966-1.016l.025.025v-.001a.627.627 0 0 0 .882 0 .546.546 0 0 0 0-.77L10.95 7.002a.801.801 0 0 0-1.133 0L8.751 8.068a1.948 1.948 0 1 1-2.754-2.754l.006-.005.992-.973a2.726 2.726 0 0 0-4.53 2.044zm12.468 0c0 1.542-.804 2.545-1.817 3.559a2.028 2.028 0 0 1-1.237.583 2.025 2.025 0 0 1-1.268 1.783c-.21.084-.43.13-.654.14a2.022 2.022 0 0 1-.448 1.086l-.134.148a1.949 1.949 0 0 1-2.779-.026v.001l-3.45-3.342-.008-.008c-.924-.925-2.075-2.17-2.075-3.924A4.13 4.13 0 0 1 6.16 2.364a4.13 4.13 0 0 1 1.837.986 4.13 4.13 0 0 1 6.936 3.029z" fill="currentcolor" /></svg>diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts b/frontend/src/metabase/ui/components/icons/Icon/icons/index.tsindex 92d546b7537..138baafb936 100644--- a/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts@@ -133,6 +133,7 @@ import grid_component from "./grid.svg?component";import grid_2x2_component from "./grid_2x2.svg?component";import grid_bordered_component from "./grid_bordered.svg?component";import group_component from "./group.svg?component";+import heart_handshake_component from "./heart_handshake.svg?component";import history_component from "./history.svg?component";import home_component from "./home.svg?component";import horizontal_bar_component from "./horizontal_bar.svg?component";@@ -436,6 +437,7 @@ export const Icons: Record<IconName, React.VFC> = {google: google_component,google_drive: google_drive_component,google_sheet: google_sheet_component,+ heart_handshake: heart_handshake_component,history: history_component,home: home_component,horizontal_bar: horizontal_bar_component,