mirror of
https://github.com/supabase/supabase.git
synced 2026-10-06 01:45:10 +03:00
Follow-up to #48344: collapses the two resolution paths for the Admonition module into one. `src/admonition.tsx` was a back-compat shim re-exporting `src/Admonition/`. Two ways to resolve one module is exactly what produced the macOS self-import bug fixed in #48344, and the local typecheck errors that #48374 worked around. This removes the shim and standardizes on the PascalCase subpath, matching every other export in the package. **Changed:** - Codemodded all 246 `ui-patterns/admonition` imports to `ui-patterns/Admonition` (240 `.tsx`, 5 `.mdx`, 1 `.ts` across studio, docs, www, design-system, and lite-studio) - Pointed the 5 internal `'../admonition'` imports back at the `'../Admonition'` directory **Removed:** - `packages/ui-patterns/src/admonition.tsx`, and its `./admonition` entry in the exports map (regenerated with `pnpm gen:exports`) ## To test - `grep -r "ui-patterns/admonition" --include='*.ts*'` → no hits - `pnpm test:case-hazards` → passes - `pnpm typecheck` → all 15 tasks green - `pnpm --filter studio run lint:ratchet` → passes - `pnpm --filter ui-patterns vitest run src/Admonition` → 11 tests pass <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Bug Fixes** * Standardized Admonition component imports across the application and documentation. * Improved compatibility with case-sensitive environments by using the canonical component path. * Removed the legacy Admonition import entry point. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Alaister Young <10985857+alaister@users.noreply.github.com>
78 lines
2.7 KiB
TypeScript
78 lines
2.7 KiB
TypeScript
import type { ComponentType, ReactNode } from 'react'
|
|
import { Admonition } from 'ui-patterns/Admonition'
|
|
|
|
import type { Filter, Sort } from './types'
|
|
import { isMsSqlForeignTable, type Entity } from '@/data/table-editor/table-editor-types'
|
|
|
|
type ValidateMsSqlSortingParams = {
|
|
filters: Filter[]
|
|
sorts: Sort[]
|
|
table: Entity
|
|
}
|
|
|
|
type MsSqlWarning = 'ConflictingSort' | 'NoValidSortPossible'
|
|
|
|
/**
|
|
* There is an edge case with the Postgres query planner and MS SQL foreign
|
|
* tables, where the Postgres query planner will drop sort clauses that are
|
|
* redundant with filters, resulting in invalid MS SQL syntax. We want to
|
|
* detect any conflicting or impossible sorts on filtered columns when the
|
|
* table is an MS SQL foreign table, and warn the user.
|
|
*/
|
|
export const validateMsSqlSorting = ({
|
|
filters,
|
|
sorts,
|
|
table,
|
|
}: ValidateMsSqlSortingParams):
|
|
| { warning: MsSqlWarning; Component: ComponentType }
|
|
| { warning: null } => {
|
|
const isMsSql = isMsSqlForeignTable(table)
|
|
if (!isMsSql) return { warning: null }
|
|
|
|
const equalityFilterColumns = new Set(
|
|
filters
|
|
.filter((filter) => filter.operator === '=' || filter.operator === 'is')
|
|
.map((filter) => filter.column)
|
|
)
|
|
|
|
const conflictingSort =
|
|
sorts.length > 0 && sorts.every((sort) => equalityFilterColumns.has(sort.column))
|
|
const showMsSqlSortWarning = equalityFilterColumns.size > 0 && !!conflictingSort
|
|
if (showMsSqlSortWarning)
|
|
return { warning: 'ConflictingSort', Component: MsSqlSortWarningAdmonition }
|
|
|
|
const noSortColumnsRemaining =
|
|
table.columns.length > 0 &&
|
|
table.columns.every((col) => col.data_type === 'json' || equalityFilterColumns.has(col.name))
|
|
const showMsSqlNoValidSortWarning = filters.length > 0 && noSortColumnsRemaining
|
|
if (showMsSqlNoValidSortWarning)
|
|
return { warning: 'NoValidSortPossible', Component: MsSqlNoValidSortAdmonition }
|
|
|
|
return { warning: null }
|
|
}
|
|
|
|
type MsSqlAdmonitionProps = {
|
|
title: string
|
|
children: string
|
|
}
|
|
|
|
const MsSqlAdmonition = ({ title, children }: MsSqlAdmonitionProps): ReactNode => (
|
|
<div className="mt-2 px-3 pb-2">
|
|
<Admonition type="warning" title={title} description={children} />
|
|
</div>
|
|
)
|
|
|
|
const MsSqlSortWarningAdmonition = (): ReactNode => (
|
|
<MsSqlAdmonition title="Cannot sort by filtered column">
|
|
Sorting only by columns filtered with "=" or "is" doesn't work on MSSQL tables. Pick a different
|
|
sorting column, or add a column not in your filter.
|
|
</MsSqlAdmonition>
|
|
)
|
|
|
|
const MsSqlNoValidSortAdmonition = (): ReactNode => (
|
|
<MsSqlAdmonition title="No valid sort column remaining">
|
|
All columns that can be sorted have been filtered with "=" or "is", which doesn't work on MSSQL
|
|
tables. Remove a column from your filter to continue.
|
|
</MsSqlAdmonition>
|
|
)
|