mirror of
https://github.com/supabase/supabase.git
synced 2026-10-11 20:35:07 +03:00
## What kind of change does this PR introduce? UI improvement for self-debugging efforts. ## What is the current behavior? https://github.com/supabase/supabase/pull/40937 removed our gating on the feedback form (plus some related affordances) in an effort to concentrate support entry into the Help dropdown instead: | Before | After | | --- | --- | | <img width="1090" height="579" alt="Inventory Nuts Bolts Supabase" src="https://github.com/user-attachments/assets/c7dacf40-5ae8-401c-a167-5e56c4c0635d" /> | _Not applicable. This step is skipped in the new version._ | | <img width="1090" height="579" alt="Inventory Nuts Bolts Supabase" src="https://github.com/user-attachments/assets/9bd2489d-7e87-49e5-99af-13eb5f387f60" /> | <img width="1090" height="579" alt="Inventory Nuts Bolts Supabase" src="https://github.com/user-attachments/assets/fa499a40-6d70-4674-9eb6-c7bd96019b27" /> | | <img width="1090" height="579" alt="Inventory Nuts Bolts Supabase" src="https://github.com/user-attachments/assets/e253381b-e8ba-476c-bd36-9dd522209498" /> | <img width="1090" height="579" alt="Inventory Nuts Bolts Supabase" src="https://github.com/user-attachments/assets/b5cf614b-329c-4517-90e9-c4d1b49bd139" /> | Despite putting other measures in place such as client-side form detection, the result is that people are increasingly writing in to support via the Feedback form. ## What is the new behavior? - Restores the gating - But also reuses the same self-debugging help options from the Help dropdown Other: - Renames `HelpPopover` to `HelpDropdown` to match others - Adjusts font size of `CommandMenu` _Search..._ | Before | After | | --- | --- | | <img width="1024" height="756" alt="Spinner Toolshed Supabase" src="https://github.com/user-attachments/assets/12e3be32-743d-488a-a13d-bf400fd0fd8d" /> | <img width="1024" height="756" alt="Spinner Toolshed Supabase" src="https://github.com/user-attachments/assets/bb064ef1-a771-416d-9b5b-dbdd774efed3" /> | | _Not applicable. This step is skipped in the old version._ | <img width="1024" height="756" alt="Spinner Toolshed Supabase" src="https://github.com/user-attachments/assets/3bc0b1c2-7003-4973-8e9c-2c7ee93fb0b4" /> | | <img width="1024" height="756" alt="Spinner Toolshed Supabase" src="https://github.com/user-attachments/assets/0bb18df4-d093-4440-8379-680f6c5e3cf9" /> | <img width="1024" height="756" alt="Spinner Toolshed Supabase" src="https://github.com/user-attachments/assets/1ef801d3-9cd7-4005-9082-8d229b7cdd19" /> | | <img width="1090" height="579" alt="Inventory Nuts Bolts Supabase" src="https://github.com/user-attachments/assets/e253381b-e8ba-476c-bd36-9dd522209498" /> | <img width="1024" height="794" alt="Spinner Toolshed Supabase" src="https://github.com/user-attachments/assets/b80de142-2199-420f-9018-8622b6d24312" /> | ## To test To test the “thanks” end state, add something like the following to `feedback-send.ts`: ```ts if (MOCK_FEEDBACK_SUCCESS) { return {} as Awaited<ReturnType<typeof sendFeedback>> } ``` Where `MOCK_FEEDBACK_SUCCESS` is `true`. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit ## Release Notes * **New Features** * Introduced multi-stage feedback dropdown with Issue and Idea selection paths. * Added AI assistant integration in help menu for quick support access. * Enhanced help dropdown with expanded options: documentation, troubleshooting, Discord community, system status, and support links. * Added Community Support section featuring Discord community promotion. * **Style** * Refined command menu placeholder text sizing for improved visual hierarchy. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Joshen Lim <joshenlimek@gmail.com>
281 lines
11 KiB
TypeScript
281 lines
11 KiB
TypeScript
import { LOCAL_STORAGE_KEYS, useParams } from 'common'
|
|
import { useIsBranching2Enabled } from 'components/interfaces/App/FeaturePreview/FeaturePreviewContext'
|
|
import { LocalDropdown } from 'components/interfaces/LocalDropdown'
|
|
import { UserDropdown } from 'components/interfaces/UserDropdown'
|
|
import { AdvisorButton } from 'components/layouts/AppLayout/AdvisorButton'
|
|
import { AssistantButton } from 'components/layouts/AppLayout/AssistantButton'
|
|
import { BranchDropdown } from 'components/layouts/AppLayout/BranchDropdown'
|
|
import { InlineEditorButton } from 'components/layouts/AppLayout/InlineEditorButton'
|
|
import { OrganizationDropdown } from 'components/layouts/AppLayout/OrganizationDropdown'
|
|
import { ProjectDropdown } from 'components/layouts/AppLayout/ProjectDropdown'
|
|
import { getResourcesExceededLimitsOrg } from 'components/ui/OveragesBanner/OveragesBanner.utils'
|
|
import { useOrgUsageQuery } from 'data/usage/org-usage-query'
|
|
import { AnimatePresence, motion } from 'framer-motion'
|
|
import { useLocalStorageQuery } from 'hooks/misc/useLocalStorage'
|
|
import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
|
|
import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
|
|
import { IS_PLATFORM } from 'lib/constants'
|
|
import { ChevronLeft } from 'lucide-react'
|
|
import Link from 'next/link'
|
|
import { useRouter } from 'next/router'
|
|
import { ReactNode, useMemo } from 'react'
|
|
import { useAppStateSnapshot } from 'state/app-state'
|
|
import { Badge, cn } from 'ui'
|
|
import { CommandMenuTriggerInput } from 'ui-patterns'
|
|
import { DevToolbarTrigger } from 'dev-tools'
|
|
import { BreadcrumbsView } from './BreadcrumbsView'
|
|
import { FeedbackDropdown } from './FeedbackDropdown/FeedbackDropdown'
|
|
import { HelpDropdown } from './HelpDropdown/HelpDropdown'
|
|
import { HomeIcon } from './HomeIcon'
|
|
import { LocalVersionPopover } from './LocalVersionPopover'
|
|
import { MergeRequestButton } from './MergeRequestButton'
|
|
import { Connect } from '@/components/interfaces/Connect/Connect'
|
|
import { ConnectButton } from '@/components/interfaces/ConnectButton/ConnectButton'
|
|
import { ConnectSheet } from '@/components/interfaces/ConnectSheet/ConnectSheet'
|
|
import { usePHFlag } from '@/hooks/ui/useFlag'
|
|
|
|
const LayoutHeaderDivider = ({ className, ...props }: React.HTMLProps<HTMLSpanElement>) => (
|
|
<span className={cn('text-border-stronger pr-2', className)} {...props}>
|
|
<svg
|
|
viewBox="0 0 24 24"
|
|
width="16"
|
|
height="16"
|
|
stroke="currentColor"
|
|
strokeWidth="1"
|
|
strokeLinecap="round"
|
|
strokeLinejoin="round"
|
|
fill="none"
|
|
shapeRendering="geometricPrecision"
|
|
>
|
|
<path d="M16 3.549L7.12 20.600" />
|
|
</svg>
|
|
</span>
|
|
)
|
|
|
|
interface LayoutHeaderProps {
|
|
customHeaderComponents?: ReactNode
|
|
breadcrumbs?: any[]
|
|
headerTitle?: string
|
|
showProductMenu?: boolean
|
|
backToDashboardURL?: string
|
|
}
|
|
|
|
export const LayoutHeader = ({
|
|
customHeaderComponents,
|
|
breadcrumbs = [],
|
|
headerTitle,
|
|
showProductMenu,
|
|
backToDashboardURL,
|
|
}: LayoutHeaderProps) => {
|
|
const router = useRouter()
|
|
const { ref: projectRef, slug } = useParams()
|
|
const { data: selectedProject } = useSelectedProjectQuery()
|
|
const { data: selectedOrganization } = useSelectedOrganizationQuery()
|
|
const { setMobileMenuOpen } = useAppStateSnapshot()
|
|
const gitlessBranching = useIsBranching2Enabled()
|
|
|
|
const connectSheetFlag = usePHFlag<string | boolean>('connectSheet')
|
|
const isFlagResolved = connectSheetFlag !== undefined
|
|
const isConnectSheetEnabled = connectSheetFlag === true || connectSheetFlag === 'variation'
|
|
|
|
const [commandMenuEnabled] = useLocalStorageQuery(LOCAL_STORAGE_KEYS.HOTKEY_COMMAND_MENU, true)
|
|
|
|
const isAccountPage = router.pathname.startsWith('/account')
|
|
|
|
// We only want to query the org usage and check for possible over-ages for plans without usage billing enabled (free or pro with spend cap)
|
|
const { data: orgUsage } = useOrgUsageQuery(
|
|
{ orgSlug: selectedOrganization?.slug },
|
|
{ enabled: selectedOrganization?.usage_billing_enabled === false }
|
|
)
|
|
|
|
const exceedingLimits = useMemo(() => {
|
|
if (orgUsage) {
|
|
return getResourcesExceededLimitsOrg(orgUsage?.usages || []).length > 0
|
|
} else {
|
|
return false
|
|
}
|
|
}, [orgUsage])
|
|
|
|
// show org selection if we are on a project page or on a explicit org route
|
|
const showOrgSelection = slug || (selectedOrganization && projectRef)
|
|
|
|
return (
|
|
<>
|
|
<header className={cn('flex h-12 items-center flex-shrink-0 border-b')}>
|
|
{backToDashboardURL && isAccountPage && (
|
|
<div className="flex items-center justify-center border-r flex-0 md:hidden h-full aspect-square">
|
|
<Link
|
|
href={backToDashboardURL}
|
|
className="flex items-center justify-center border-none !bg-transparent rounded-md min-w-[30px] w-[30px] h-[30px] text-foreground-lighter hover:text-foreground transition-colors"
|
|
>
|
|
<ChevronLeft strokeWidth={1.5} size={16} />
|
|
</Link>
|
|
</div>
|
|
)}
|
|
{(showProductMenu || isAccountPage) && (
|
|
<div className="flex items-center justify-center border-r flex-0 md:hidden h-full aspect-square">
|
|
<button
|
|
title="Menu dropdown button"
|
|
className={cn(
|
|
'group/view-toggle ml-4 flex justify-center flex-col border-none space-x-0 items-start gap-1 !bg-transparent rounded-md min-w-[30px] w-[30px] h-[30px]'
|
|
)}
|
|
onClick={() => setMobileMenuOpen(true)}
|
|
>
|
|
<div className="h-px inline-block left-0 w-4 transition-all ease-out bg-foreground-lighter group-hover/view-toggle:bg-foreground p-0 m-0" />
|
|
<div className="h-px inline-block left-0 w-3 transition-all ease-out bg-foreground-lighter group-hover/view-toggle:bg-foreground p-0 m-0" />
|
|
</button>
|
|
</div>
|
|
)}
|
|
<div
|
|
className={cn(
|
|
'flex items-center justify-between h-full pr-3 flex-1 overflow-x-auto gap-x-8 pl-4'
|
|
)}
|
|
>
|
|
<div className="flex items-center text-sm">
|
|
<HomeIcon />
|
|
<div className="flex items-center md:pl-2">
|
|
{showOrgSelection && IS_PLATFORM ? (
|
|
<>
|
|
<LayoutHeaderDivider className="hidden md:block" />
|
|
<OrganizationDropdown />
|
|
</>
|
|
) : null}
|
|
<AnimatePresence>
|
|
{projectRef && (
|
|
<motion.div
|
|
className="flex items-center"
|
|
initial={{ opacity: 0, x: -20 }}
|
|
animate={{ opacity: 1, x: 0 }}
|
|
exit={{ opacity: 0, x: -20 }}
|
|
transition={{
|
|
duration: 0.15,
|
|
ease: 'easeOut',
|
|
}}
|
|
>
|
|
<LayoutHeaderDivider />
|
|
<ProjectDropdown />
|
|
|
|
{exceedingLimits && (
|
|
<div className="ml-2">
|
|
<Link href={`/org/${selectedOrganization?.slug}/usage`}>
|
|
<Badge variant="destructive">Exceeding usage limits</Badge>
|
|
</Link>
|
|
</div>
|
|
)}
|
|
|
|
{selectedProject && (
|
|
<>
|
|
<LayoutHeaderDivider />
|
|
{IS_PLATFORM && <BranchDropdown />}
|
|
</>
|
|
)}
|
|
</motion.div>
|
|
)}
|
|
</AnimatePresence>
|
|
|
|
<AnimatePresence>
|
|
{headerTitle && (
|
|
<motion.div
|
|
className="flex items-center"
|
|
initial={{ opacity: 0, x: -20 }}
|
|
animate={{ opacity: 1, x: 0 }}
|
|
exit={{ opacity: 0, x: -20 }}
|
|
transition={{
|
|
duration: 0.15,
|
|
ease: 'easeOut',
|
|
}}
|
|
>
|
|
<LayoutHeaderDivider />
|
|
<span className="text-foreground">{headerTitle}</span>
|
|
</motion.div>
|
|
)}
|
|
</AnimatePresence>
|
|
</div>
|
|
|
|
<AnimatePresence>
|
|
{projectRef && (
|
|
<motion.div
|
|
className="ml-3 items-center gap-x-2 flex"
|
|
initial={{ opacity: 0, x: -20 }}
|
|
animate={{ opacity: 1, x: 0 }}
|
|
exit={{ opacity: 0, x: -20 }}
|
|
transition={{
|
|
duration: 0.15,
|
|
ease: 'easeOut',
|
|
}}
|
|
>
|
|
{IS_PLATFORM && gitlessBranching && <MergeRequestButton />}
|
|
<ConnectButton />
|
|
</motion.div>
|
|
)}
|
|
</AnimatePresence>
|
|
<BreadcrumbsView defaultValue={breadcrumbs} />
|
|
</div>
|
|
<div className="flex items-center gap-x-2">
|
|
{customHeaderComponents && customHeaderComponents}
|
|
{IS_PLATFORM ? (
|
|
<>
|
|
<DevToolbarTrigger />
|
|
<FeedbackDropdown />
|
|
|
|
<div className="flex items-center gap-2">
|
|
<CommandMenuTriggerInput
|
|
showShortcut={commandMenuEnabled}
|
|
placeholder="Search..."
|
|
className={cn(
|
|
'hidden md:flex md:min-w-32 xl:min-w-32 rounded-full bg-transparent',
|
|
'[&_.command-shortcut>div]:border-none',
|
|
'[&_.command-shortcut>div]:pr-2',
|
|
'[&_.command-shortcut>div]:bg-transparent',
|
|
'[&_.command-shortcut>div]:text-foreground-lighter'
|
|
)}
|
|
/>
|
|
<HelpDropdown />
|
|
<AdvisorButton projectRef={projectRef} />
|
|
<AnimatePresence initial={false}>
|
|
{!!projectRef && (
|
|
<>
|
|
<InlineEditorButton />
|
|
<AssistantButton />
|
|
</>
|
|
)}
|
|
</AnimatePresence>
|
|
</div>
|
|
<UserDropdown />
|
|
</>
|
|
) : (
|
|
<>
|
|
<LocalVersionPopover />
|
|
<div className="flex items-center gap-2">
|
|
<CommandMenuTriggerInput
|
|
placeholder="Search..."
|
|
className="hidden md:flex md:min-w-32 xl:min-w-32 rounded-full bg-transparent
|
|
[&_.command-shortcut>div]:border-none
|
|
[&_.command-shortcut>div]:pr-2
|
|
[&_.command-shortcut>div]:bg-transparent
|
|
[&_.command-shortcut>div]:text-foreground-lighter
|
|
"
|
|
/>
|
|
<HelpDropdown />
|
|
<AdvisorButton projectRef={projectRef} />
|
|
<AnimatePresence initial={false}>
|
|
{!!projectRef && (
|
|
<>
|
|
<InlineEditorButton />
|
|
<AssistantButton />
|
|
</>
|
|
)}
|
|
</AnimatePresence>
|
|
</div>
|
|
<LocalDropdown />
|
|
</>
|
|
)}
|
|
</div>
|
|
</div>
|
|
</header>
|
|
|
|
{isFlagResolved && isConnectSheetEnabled ? <ConnectSheet /> : <Connect />}
|
|
</>
|
|
)
|
|
}
|