diff --git a/apps/studio/components/layouts/AppLayout/NoticeBanner.tsx b/apps/studio/components/layouts/AppLayout/NoticeBanner.tsx
index ccd6fee5974..d4c42b213e4 100644
--- a/apps/studio/components/layouts/AppLayout/NoticeBanner.tsx
+++ b/apps/studio/components/layouts/AppLayout/NoticeBanner.tsx
@@ -1,43 +1,62 @@
-import { LOCAL_STORAGE_KEYS } from 'common'
+import { LOCAL_STORAGE_KEYS, useParams } from 'common'
+import dayjs from 'dayjs'
import { useRouter } from 'next/router'
-import {
- Button,
- cn,
- Dialog,
- DialogClose,
- DialogContent,
- DialogDescription,
- DialogFooter,
- DialogHeader,
- DialogSection,
- DialogSectionSeparator,
- DialogTitle,
- DialogTrigger,
-} from 'ui'
+import { TimestampInfo } from 'ui-patterns'
import { HeaderBanner } from '@/components/interfaces/Organization/HeaderBanner'
-import { InlineLink, InlineLinkClassName } from '@/components/ui/InlineLink'
import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage'
+import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
// Update this whenever the banner content below changes so old client bundles
// stop displaying outdated notices after the relevant date passes.
-const BANNER_EXPIRES_AT = new Date('2026-07-04T00:00:00Z')
+const BANNER_EXPIRES_AT = new Date('2026-06-01T15:00:00Z')
+
+const SUPAVISOR_UPDATE_REGIONS = {
+ 'eu-central-1': {
+ start: Date.UTC(2026, 4, 26, 13, 0, 0),
+ end: Date.UTC(2026, 4, 26, 15, 0, 0),
+ url: 'https://status.supabase.com/incidents/jy1tm4wfs68t',
+ },
+ 'eu-west-1': {
+ start: Date.UTC(2026, 4, 27, 13, 0, 0),
+ end: Date.UTC(2026, 4, 27, 15, 0, 0),
+ url: 'https://status.supabase.com/incidents/3t293hpd545z',
+ },
+ 'us-west-1': {
+ start: Date.UTC(2026, 4, 28, 13, 0, 0),
+ end: Date.UTC(2026, 4, 28, 15, 0, 0),
+ url: 'https://status.supabase.com/incidents/8f72bnv3xs8r',
+ },
+ 'us-east-1': {
+ start: Date.UTC(2026, 5, 1, 13, 0, 0),
+ end: Date.UTC(2026, 5, 1, 15, 0, 0),
+ url: 'https://status.supabase.com/incidents/7zgmgh2p343n',
+ },
+}
/**
* Used to display urgent notices that apply for all users, such as maintenance windows.
*/
export const NoticeBanner = () => {
const router = useRouter()
+ const { ref } = useParams()
+ const { data: project } = useSelectedProjectQuery()
const [bannerAcknowledged, setBannerAcknowledged, { isSuccess }] = useLocalStorageQuery(
- LOCAL_STORAGE_KEYS.TERMS_OF_SERVICE_UPDATE,
+ LOCAL_STORAGE_KEYS.SUPAVISOR_MAINTENANCE(ref ?? ''),
false
)
+ const region = project?.region ?? ''
+ const maintenanceWindow =
+ SUPAVISOR_UPDATE_REGIONS[region as keyof typeof SUPAVISOR_UPDATE_REGIONS]
+
if (
Date.now() >= BANNER_EXPIRES_AT.getTime() ||
router.pathname.includes('sign-in') ||
!isSuccess ||
+ !project ||
+ !maintenanceWindow ||
bannerAcknowledged
) {
return null
@@ -46,65 +65,23 @@ export const NoticeBanner = () => {
return (
setBannerAcknowledged(true)} />}
+ title="Upcoming maintenance"
+ description={
+ <>
+ Shared pooler maintenance in{' '}
+
+ {project.region}
+ {' '}
+ on{' '}
+
+ .
+
+ }
onDismiss={() => setBannerAcknowledged(true)}
/>
)
}
-
-const UpdatedTermsOfServiceDialog = ({ onDismiss }: { onDismiss: () => void }) => {
- return (
-
- )
-}
diff --git a/apps/studio/components/ui/BannerStack/BannerStackProvider.tsx b/apps/studio/components/ui/BannerStack/BannerStackProvider.tsx
index 2a9d5526b63..eef631513f0 100644
--- a/apps/studio/components/ui/BannerStack/BannerStackProvider.tsx
+++ b/apps/studio/components/ui/BannerStack/BannerStackProvider.tsx
@@ -7,6 +7,7 @@ export const BANNER_ID = {
RLS_EVENT_TRIGGER: 'rls-event-trigger-banner',
RLS_TESTER: 'rls-tester-banner',
FREE_MICRO_UPGRADE: 'free-micro-upgrade-banner',
+ TOS_UPDATE: 'tos-update-banner',
} as const
export type BannerId = (typeof BANNER_ID)[keyof typeof BANNER_ID]
diff --git a/apps/studio/components/ui/BannerStack/Banners/BannerTOSUpdate.tsx b/apps/studio/components/ui/BannerStack/Banners/BannerTOSUpdate.tsx
new file mode 100644
index 00000000000..582b07a8a14
--- /dev/null
+++ b/apps/studio/components/ui/BannerStack/Banners/BannerTOSUpdate.tsx
@@ -0,0 +1,123 @@
+import { LOCAL_STORAGE_KEYS } from 'common'
+import {
+ Badge,
+ Button,
+ Dialog,
+ DialogClose,
+ DialogContent,
+ DialogDescription,
+ DialogFooter,
+ DialogHeader,
+ DialogSection,
+ DialogSectionSeparator,
+ DialogTitle,
+ DialogTrigger,
+} from 'ui'
+
+import { InlineLink } from '../../InlineLink'
+import { BannerCard } from '../BannerCard'
+import { useBannerStack } from '../BannerStackProvider'
+import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage'
+
+/**
+ * [Joshen] TOS update takes place from 6th June onwards, can remove from 4th July onwards as
+ * previously stated in the NoticeBanner
+ */
+
+export const BannerTOSUpdate = () => {
+ const { dismissBanner } = useBannerStack()
+ const [, setTOSUpdateAcknowledged] = useLocalStorageQuery(
+ LOCAL_STORAGE_KEYS.TERMS_OF_SERVICE_UPDATE,
+ false
+ )
+
+ return (
+ {
+ setTOSUpdateAcknowledged(true)
+ dismissBanner('tos-update-banner')
+ }}
+ >
+
+
+ Notice
+
+
+
+
We've updated our Terms of Service
+
+ Updates define the responsibilities of both you and Supabase in the use of AI.
+
+
+
+