The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
Remove org slug and project ref filter for GET notifications request (#43167)
Joshen Lim4f26af6259fa
diff --git a/apps/studio/components/layouts/AppLayout/AdvisorButton.tsx b/apps/studio/components/layouts/AppLayout/AdvisorButton.tsxindex 7dd855ae65d..1b4787d0600 100644--- a/apps/studio/components/layouts/AppLayout/AdvisorButton.tsx+++ b/apps/studio/components/layouts/AppLayout/AdvisorButton.tsx@@ -1,16 +1,29 @@-import { Lightbulb } from 'lucide-react'+import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'import { ButtonTooltip } from 'components/ui/ButtonTooltip'import { useProjectLintsQuery } from 'data/lint/lint-query'+import { Lightbulb } from 'lucide-react'+import { useMemo } from 'react'import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'-import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'import { cn } from 'ui'+import { useNotificationsV2Query } from '@/data/notifications/notifications-v2-query'+export const AdvisorButton = ({ projectRef }: { projectRef?: string }) => {const { toggleSidebar, activeSidebar } = useSidebarManagerSnapshot()- const { data: lints } = useProjectLintsQuery({ projectRef })+ const { data: lints } = useProjectLintsQuery({ projectRef })const hasCriticalIssues = Array.isArray(lints) && lints.some((lint) => lint.level === 'ERROR')+ const { data: notificationsData } = useNotificationsV2Query({+ status: 'new',+ filters: {},+ limit: 20,+ })+ const notifications = useMemo(() => {+ return notificationsData?.pages.flatMap((page) => page) ?? []+ }, [notificationsData?.pages])+ const hasUnreadNotifications = notifications.some((x) => x.status === 'new')+const isOpen = activeSidebar?.id === SIDEBAR_KEYS.ADVISOR_PANELconst handleClick = () => {@@ -43,9 +56,11 @@ export const AdvisorButton = ({ projectRef }: { projectRef?: string }) => {)}/></ButtonTooltip>- {hasCriticalIssues && (+ {hasCriticalIssues ? (<span className="absolute top-1.5 right-1.5 w-1.5 h-1.5 rounded-full bg-destructive" />- )}+ ) : hasUnreadNotifications ? (+ <span className="absolute top-1.5 right-1.5 w-1.5 h-1.5 rounded-full bg-brand" />+ ) : null}</div>)}diff --git a/apps/studio/components/ui/AdvisorPanel/AdvisorPanel.tsx b/apps/studio/components/ui/AdvisorPanel/AdvisorPanel.tsxindex 3b80bd22c0d..e3f8ec439b3 100644--- a/apps/studio/components/ui/AdvisorPanel/AdvisorPanel.tsx+++ b/apps/studio/components/ui/AdvisorPanel/AdvisorPanel.tsx@@ -1,6 +1,3 @@-import dayjs from 'dayjs'-import { useMemo, useRef } from 'react'-import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'import { Lint, useProjectLintsQuery } from 'data/lint/lint-query'import {@@ -9,12 +6,14 @@ import {useNotificationsV2Query,} from 'data/notifications/notifications-v2-query'import { useNotificationsV2UpdateMutation } from 'data/notifications/notifications-v2-update-mutation'-import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'+import dayjs from 'dayjs'import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'import { IS_PLATFORM } from 'lib/constants'import { useTrack } from 'lib/telemetry/track'+import { useMemo, useRef } from 'react'import { AdvisorSeverity, AdvisorTab, useAdvisorStateSnapshot } from 'state/advisor-state'import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'+import { AdvisorDetail } from './AdvisorDetail'import { AdvisorFilters } from './AdvisorFilters'import type { AdvisorItem } from './AdvisorPanel.types'@@ -66,7 +65,6 @@ export const AdvisorPanel = () => {resetNotificationFilters,} = useAdvisorStateSnapshot()const { data: project } = useSelectedProjectQuery()- const { data: selectedOrganization } = useSelectedOrganizationQuery()const { activeSidebar, closeSidebar } = useSidebarManagerSnapshot()const isSidebarOpen = activeSidebar?.id === SIDEBAR_KEYS.ADVISOR_PANEL@@ -98,12 +96,8 @@ export const AdvisorPanel = () => {// Memoize filters to prevent query key changes on every render// Use selected organization and project if they existconst notificationFilters = useMemo(- () => ({- priority: notificationFilterPriorities,- organizations: selectedOrganization?.slug ? [selectedOrganization.slug] : [],- projects: project?.ref ? [project.ref] : [],- }),- [notificationFilterPriorities, selectedOrganization?.slug, project?.ref]+ () => ({ priority: notificationFilterPriorities }),+ [notificationFilterPriorities])const {diff --git a/apps/studio/data/notifications/notifications-v2-query.ts b/apps/studio/data/notifications/notifications-v2-query.tsindex 3590a163d94..b79ebf6cc90 100644--- a/apps/studio/data/notifications/notifications-v2-query.ts+++ b/apps/studio/data/notifications/notifications-v2-query.ts@@ -1,8 +1,8 @@import { InfiniteData, useInfiniteQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { components } from 'data/api'+import { get, handleError } from 'data/fetchers'import type { ResponseError, UseCustomInfiniteQueryOptions } from 'types'+import { notificationKeys } from './keys'const NOTIFICATIONS_PAGE_LIMIT = 10@@ -12,9 +12,9 @@ export type NotificationVariables = {limit?: numberstatus?: 'new' | 'seen' | 'archived'filters: {- priority: readonly string[]- organizations: readonly string[]- projects: readonly string[]+ priority?: readonly string[]+ organizations?: readonly string[]+ projects?: readonly string[]}}@@ -37,16 +37,17 @@ export type NotificationData = {export async function getNotifications(options: NotificationVariables, signal?: AbortSignal) {const { status, filters, page = 0, limit = NOTIFICATIONS_PAGE_LIMIT } = options+ const { priority = [], organizations = [], projects = [] } = filters+const { data, error } = await get('/platform/notifications', {params: {query: {offset: page * limit,limit,- // [Alaister]: 'as any' is needed because the API types don't reflect an array of strings- ...(status !== undefined ? { status } : { status: ['new', 'seen'].join(',') as any }),- ...(filters.priority.length > 0 ? { priority: filters.priority.join(',') as any } : {}),- ...(filters.organizations.length > 0 ? { org_slug: filters.organizations.join(',') } : {}),- ...(filters.projects.length > 0 ? { project_ref: filters.projects.join(',') } : {}),+ ...(status !== undefined ? { status } : { status: ['new', 'seen'].join(',') }),+ ...(priority.length > 0 ? { priority: priority.join(',') } : {}),+ ...(organizations.length > 0 ? { org_slug: organizations.join(',') } : {}),+ ...(projects.length > 0 ? { project_ref: projects.join(',') } : {}),},},headers: { Version: '2' },