mirror of
https://github.com/supabase/supabase.git
synced 2026-10-05 17:35:10 +03:00
## What kind of change does this PR introduce? Refactor. Follow-up to #49871. ## What is the current behavior? Branded (green) text still uses the `text-brand` classname while the colour comes from `--primary`. ## What is the new behavior? **Rename-only:** `text-brand` → `text-primary` across callsites and docs. Leftover `bg-brand` / `border-brand` alias to `brand-default`. No intentional colour changes in this PR. This better matches how we treat our green in other components and props, like `variant="primary"` for green buttons. ## To test On light mode: smoke-test that branded text still looks like #49871 (readable green, not the bright fill). - [Homepage](https://zone-www-dot-com-git-dnywh-depr-316-text-brand-de2380-supabase.vercel.app/): “Scale to millions” uses `text-primary` - [Docs homepage](https://docs-git-dnywh-depr-316-text-brand-to-primary-supabase.vercel.app/docs): branded links like “More on self-hosting” are still readable - [Typography docs](https://design-system-git-dnywh-depr-316-text-brand-to-primary-supabase.vercel.app/design-system/docs/typography): documents `text-primary` - [Colour usage](https://design-system-git-dnywh-depr-316-text-brand-to-primary-supabase.vercel.app/design-system/docs/color-usage): `text-primary` is visibly darker than `bg-brand-default` _on light mode_ - [Studio auth providers](https://studio-staging-git-dnywh-depr-316-text-brand-to-60fa6c-supabase.vercel.app/dashboard/project/_/auth/providers): enabled provider badge text readable; status dot stays bright green <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Style** * Updated branded text, link hover states, icons, badges, indicators, and highlighted content across the Design System, Docs, Studio, Learn, UI Library, and marketing experiences to use the primary theme color. * Updated syntax highlighting and table-of-contents styling for consistent primary-color presentation. * Refined brand color fallback behavior for bright fills and borders. * **Documentation** * Updated color-usage and typography guidance to recommend the primary text utility. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
142 lines
5.2 KiB
TypeScript
142 lines
5.2 KiB
TypeScript
import { THRESHOLD_COUNT, type OptimizedSearchColumns } from '@supabase/pg-meta'
|
|
import { keepPreviousData } from '@tanstack/react-query'
|
|
import { useParams } from 'common'
|
|
import { HelpCircle, Loader2 } from 'lucide-react'
|
|
import { useEffect, useState } from 'react'
|
|
import { Button, Tooltip, TooltipContent, TooltipTrigger } from 'ui'
|
|
import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
|
|
|
|
import type { Filter, SpecificFilterColumn } from './Users.constants'
|
|
import { formatEstimatedCount } from '@/components/grid/components/footer/pagination/Pagination.utils'
|
|
import { useUsersCountQuery } from '@/data/auth/users-count-query'
|
|
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
|
|
|
|
interface UsersFooterProps {
|
|
filter: Filter
|
|
filterKeywords: string
|
|
selectedProviders: string[]
|
|
specificFilterColumn: SpecificFilterColumn
|
|
}
|
|
|
|
export const UsersFooter = ({
|
|
filter,
|
|
filterKeywords,
|
|
selectedProviders,
|
|
specificFilterColumn,
|
|
}: UsersFooterProps) => {
|
|
const { ref: projectRef } = useParams()
|
|
const { data: project } = useSelectedProjectQuery()
|
|
|
|
const [forceExactCount, setForceExactCount] = useState(false)
|
|
const [showFetchExactCountModal, setShowFetchExactCountModal] = useState(false)
|
|
|
|
const {
|
|
data: countData,
|
|
isPending: isLoadingCount,
|
|
isFetching: isFetchingCount,
|
|
isSuccess: isSuccessCount,
|
|
} = useUsersCountQuery(
|
|
{
|
|
projectRef,
|
|
connectionString: project?.connectionString,
|
|
keywords: filterKeywords,
|
|
filter: filter === 'all' ? undefined : filter,
|
|
providers: selectedProviders,
|
|
forceExactCount,
|
|
// Use optimized search when filtering by specific column
|
|
...(specificFilterColumn !== 'freeform'
|
|
? { column: specificFilterColumn as OptimizedSearchColumns }
|
|
: { column: undefined }),
|
|
},
|
|
{ placeholderData: keepPreviousData }
|
|
)
|
|
const totalUsers = countData?.count ?? 0
|
|
|
|
useEffect(() => {
|
|
if (isSuccessCount && specificFilterColumn === 'freeform') {
|
|
setForceExactCount(countData.is_estimate && countData.count <= THRESHOLD_COUNT)
|
|
}
|
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
}, [isSuccessCount, specificFilterColumn])
|
|
|
|
return (
|
|
<>
|
|
<div className="flex justify-between min-h-9 h-9 overflow-hidden items-center px-6 w-full border-t text-xs text-foreground-light">
|
|
<div className="flex items-center gap-x-2">
|
|
{isLoadingCount || isFetchingCount || countData === undefined ? (
|
|
<span className="flex items-center gap-2">
|
|
<Loader2 size={14} className="animate-spin" /> Loading...
|
|
</span>
|
|
) : (
|
|
<>
|
|
<span>
|
|
Total:{' '}
|
|
{countData?.is_estimate
|
|
? formatEstimatedCount(totalUsers)
|
|
: totalUsers.toLocaleString()}{' '}
|
|
user{totalUsers !== 1 ? 's' : ''}
|
|
{countData?.is_estimate && ' (estimated)'}
|
|
</span>
|
|
{countData?.is_estimate && (
|
|
<Tooltip>
|
|
<TooltipTrigger asChild>
|
|
<Button
|
|
size="tiny"
|
|
variant="text"
|
|
className="px-1.5"
|
|
icon={<HelpCircle />}
|
|
onClick={() => {
|
|
if (specificFilterColumn === 'freeform') {
|
|
setShowFetchExactCountModal(true)
|
|
}
|
|
}}
|
|
/>
|
|
</TooltipTrigger>
|
|
<TooltipContent side="top" className="w-80">
|
|
{specificFilterColumn === 'freeform' ? (
|
|
<>
|
|
This is an estimated value as your project has more than{' '}
|
|
{THRESHOLD_COUNT.toLocaleString()} users.
|
|
<br />
|
|
<span className="text-primary">
|
|
Click to retrieve the exact count.
|
|
</span>{' '}
|
|
</>
|
|
) : (
|
|
<>
|
|
<p className="mb-1">
|
|
This is an estimated value which may not be accurate.
|
|
</p>
|
|
<p>
|
|
If you'd like to retrieve the exact count, change the search to{' '}
|
|
<span className="text-warning">all columns</span> from the header.
|
|
</p>{' '}
|
|
</>
|
|
)}
|
|
</TooltipContent>
|
|
</Tooltip>
|
|
)}
|
|
</>
|
|
)}
|
|
</div>
|
|
</div>
|
|
<ConfirmationModal
|
|
variant="warning"
|
|
visible={showFetchExactCountModal}
|
|
title="Fetch exact user count"
|
|
confirmLabel="Fetch exact count"
|
|
onCancel={() => setShowFetchExactCountModal(false)}
|
|
onConfirm={() => {
|
|
setForceExactCount(true)
|
|
setShowFetchExactCountModal(false)
|
|
}}
|
|
>
|
|
<p className="text-sm text-foreground-light">
|
|
Your project has more than {THRESHOLD_COUNT.toLocaleString()} users, and fetching the
|
|
exact count may cause performance issues on your database.
|
|
</p>
|
|
</ConfirmationModal>
|
|
</>
|
|
)
|
|
}
|