Files
supabase/apps/studio/components/interfaces/BranchManagement/EdgeFunctionsDiffPanel.tsx
T
ea38c6d153 Review and merge branch (#36795)
* allow creating branching without git

* update branching modals

* add account connections

* edit branch

* copy

* update copy

* enable branch modal changes

* add gitless branching flag

* update account connections

* merge page

* merge experiment

* update merge

* update pull requests empty state

* use diff query

* branch diffing

* diff query

* Clean up

* refinements to gitless branching

* branching merge and status

* link

* branch function diffing

* update styling

* refactor

* remove hook

* error handling

* move

* remove enable branching modal

* re-add github linker

* abstract away enable and disable

* toggle fixes

* update logic to lean on connection status

* update form logic

* sheet layout

* gitless flag

* style and workflow updates

* fix side panel size

* fix duplicate onerror

* copy changes

* refetch

* merge mutation copy

* remove import

* add cost

* allow connection details on create

* initial queries

* push button

* merge cleanup

* Fix TS issues

* Fix TS issues

* Couple of clean ups

* Revert hardcode in useFlag

* Fix TS

* layout issues and github check

* refactor

* refactor to use new field

* cleanup

* style

* failed merge

* error positioning

* refactoring merge

* workflow refactor

* hook move

* clarification with github integration

* replace branch dropdown button

* update repo picker

* updates

* remove modal

* fix small nits

* change defaults

* clean up

* disable if not gitless and no connection

* clean up

* always show workflow run id

* optimistic

* fix branch query

* fix issues

* fetch edge diff

* confirm merge

* update edge functions key

---------

Co-authored-by: Joshen Lim <joshenlimek@gmail.com>
Co-authored-by: Kevin Grüneberg <k.grueneberg1994@gmail.com>
Co-authored-by: Alaister Young <a@alaisteryoung.com>
2025-07-04 14:57:59 +10:00

218 lines
6.8 KiB
TypeScript

import { Code, Wind } from 'lucide-react'
import Link from 'next/link'
import { useEffect, useMemo, useState } from 'react'
import DiffViewer from 'components/ui/DiffViewer'
import type { EdgeFunctionBodyData } from 'data/edge-functions/edge-function-body-query'
import type {
EdgeFunctionsDiffResult,
FileInfo,
FileStatus,
} from 'hooks/branches/useEdgeFunctionsDiff'
import { EMPTY_ARR } from 'lib/void'
import { basename } from 'path'
import { Card, CardContent, CardHeader, CardTitle, cn, Skeleton } from 'ui'
interface EdgeFunctionsDiffPanelProps {
diffResults: EdgeFunctionsDiffResult
currentBranchRef?: string
mainBranchRef?: string
}
interface FunctionDiffProps {
functionSlug: string
currentBody: EdgeFunctionBodyData
mainBody: EdgeFunctionBodyData
currentBranchRef?: string
fileInfos: FileInfo[]
}
// Helper to canonicalize file identifiers to prevent mismatch due to differing root paths
const fileKey = (fullPath: string) => basename(fullPath)
// Helper to get the status color for file indicators
const getStatusColor = (status: FileStatus): string => {
switch (status) {
case 'added':
return 'bg-brand'
case 'removed':
return 'bg-destructive'
case 'modified':
return 'bg-warning'
case 'unchanged':
return 'bg-muted'
default:
return 'bg-muted'
}
}
const FunctionDiff = ({
functionSlug,
currentBody,
mainBody,
currentBranchRef,
fileInfos,
}: FunctionDiffProps) => {
// Get all file keys from fileInfos
const allFileKeys = useMemo(() => fileInfos.map((info) => info.key), [fileInfos])
const [activeFileKey, setActiveFileKey] = useState<string | undefined>(() => allFileKeys[0])
// Keep active tab in sync when allFileKeys changes (e.g. data fetch completes)
useEffect(() => {
if (!activeFileKey || !allFileKeys.includes(activeFileKey)) {
setActiveFileKey(allFileKeys[0])
}
}, [allFileKeys, activeFileKey])
const currentFile = currentBody.find((f) => fileKey(f.name) === activeFileKey)
const mainFile = mainBody.find((f) => fileKey(f.name) === activeFileKey)
const language = useMemo(() => {
if (!activeFileKey) return 'plaintext'
if (activeFileKey.endsWith('.ts') || activeFileKey.endsWith('.tsx')) return 'typescript'
if (activeFileKey.endsWith('.js') || activeFileKey.endsWith('.jsx')) return 'javascript'
if (activeFileKey.endsWith('.json')) return 'json'
if (activeFileKey.endsWith('.sql')) return 'sql'
return 'plaintext'
}, [activeFileKey])
if (allFileKeys.length === 0) return null
return (
<Card>
<CardHeader className="space-y-0 px-4">
{/* Function title */}
<CardTitle>
<Link
href={`/project/${currentBranchRef}/functions/${functionSlug}`}
className="flex items-center gap-2"
>
<Code strokeWidth={1.5} size={16} className="text-foreground-light" />
{functionSlug}
</Link>
</CardTitle>
{/* File list sidebar will be shown instead of top tabs */}
</CardHeader>
<CardContent className="p-0 h-96">
<div className="flex h-full min-h-0">
{/* Sidebar file list */}
<div className="w-48 border-r bg-surface-200 flex flex-col overflow-y-auto">
<ul className="divide-y divide-border">
{fileInfos.map((fileInfo) => (
<li key={fileInfo.key} className="flex">
<button
type="button"
onClick={() => setActiveFileKey(fileInfo.key)}
className={cn(
'flex-1 text-left text-xs px-4 py-2 flex items-center gap-2',
activeFileKey === fileInfo.key
? 'bg-surface-300 text-foreground'
: 'text-foreground-light hover:bg-surface-300'
)}
>
<div
className={cn(
'w-1 h-1 rounded-full flex-shrink-0',
getStatusColor(fileInfo.status)
)}
/>
<span className="truncate">{fileInfo.key}</span>
</button>
</li>
))}
</ul>
</div>
{/* Diff viewer */}
<div className="flex-1 min-h-0">
<DiffViewer
language={language}
original={mainFile?.content || ''}
modified={currentFile?.content || ''}
/>
</div>
</div>
</CardContent>
</Card>
)
}
const EdgeFunctionsDiffPanel = ({
diffResults,
currentBranchRef,
mainBranchRef,
}: EdgeFunctionsDiffPanelProps) => {
if (diffResults.isLoading) {
return <Skeleton className="h-64" />
}
if (!diffResults.hasChanges) {
return (
<div className="p-6 text-center">
<Wind size={32} strokeWidth={1.5} className="text-foreground-muted mx-auto mb-8" />
<h3 className="mb-1">No changes detected between branches</h3>
<p className="text-sm text-foreground-light">
Any changes to your edge functions will be shown here for review
</p>
</div>
)
}
return (
<div className="space-y-6">
{diffResults.addedSlugs.length > 0 && (
<div>
<div className="space-y-4">
{diffResults.addedSlugs.map((slug) => (
<FunctionDiff
key={slug}
functionSlug={slug}
currentBody={diffResults.addedBodiesMap[slug]!}
mainBody={EMPTY_ARR}
currentBranchRef={currentBranchRef}
fileInfos={diffResults.functionFileInfo[slug] || EMPTY_ARR}
/>
))}
</div>
</div>
)}
{diffResults.removedSlugs.length > 0 && (
<div>
<div className="space-y-4">
{diffResults.removedSlugs.map((slug) => (
<FunctionDiff
key={slug}
functionSlug={slug}
currentBody={EMPTY_ARR}
mainBody={diffResults.removedBodiesMap[slug]!}
currentBranchRef={mainBranchRef}
fileInfos={diffResults.functionFileInfo[slug] || EMPTY_ARR}
/>
))}
</div>
</div>
)}
{diffResults.modifiedSlugs.length > 0 && (
<div className="space-y-4">
{diffResults.modifiedSlugs.map((slug) => (
<FunctionDiff
key={slug}
functionSlug={slug}
currentBody={diffResults.currentBodiesMap[slug]!}
mainBody={diffResults.mainBodiesMap[slug]!}
currentBranchRef={currentBranchRef}
fileInfos={diffResults.functionFileInfo[slug] || EMPTY_ARR}
/>
))}
</div>
)}
</div>
)
}
export default EdgeFunctionsDiffPanel