Skip to content

Commit 37e7f5f

Browse files
Pfed-progPfed-prog
committed
fixed build errors and upgraded radix ui
1 parent 7856633 commit 37e7f5f

20 files changed

+1059
-1402
lines changed

‎package-lock.json‎

Lines changed: 894 additions & 1224 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"build": "next build",
88
"start": "next start",
99
"lint": "next lint",
10-
"format": "next lint --fix && prettier --write . --config ./.prettier.json",
10+
"format": "next lint --fix && prettier --write . --config .prettier.json",
1111
"format:check": "prettier --check . --config ./.prettier.json",
1212
"typecheck": "tsc --noEmit",
1313
"test": "jest",
@@ -19,13 +19,6 @@
1919
"dependencies": {
2020
"@anthropic-ai/sdk": "^0.30.1",
2121
"@octokit/rest": "^21.0.2",
22-
"@radix-ui/react-dialog": "^1.1.13",
23-
"@radix-ui/react-label": "^2.1.6",
24-
"@radix-ui/react-popover": "^1.1.2",
25-
"@radix-ui/react-select": "^2.1.3",
26-
"@radix-ui/react-toggle": "^1.1.1",
27-
"@radix-ui/react-toggle-group": "^1.1.1",
28-
"@radix-ui/react-tooltip": "^1.1.5",
2922
"@tremor/react": "^3.18.3",
3023
"@upstash/redis": "^1.34.3",
3124
"airtable": "^0.12.2",
@@ -42,6 +35,7 @@
4235
"node-fetch": "^2.6.1",
4336
"papaparse": "^5.4.1",
4437
"postcss": "^8.4.47",
38+
"radix-ui": "^1.4.2",
4539
"react": "^18.2.0",
4640
"react-day-picker": "^9.2.1",
4741
"react-dom": "^18.2.0",

‎src/components/dashboard/AIInsights.tsx‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
'use client';
22

3+
import type { EnhancedProcessedData } from '@/types/dashboard';
4+
import { Brain } from 'lucide-react';
35
import {
46
Card,
57
CardHeader,
68
CardTitle,
79
CardContent,
810
CardDescription,
9-
} from '../ui/card';
10-
import { Brain } from 'lucide-react';
11-
import { Tooltip, TooltipContent, TooltipTrigger } from '../ui/tooltip';
12-
import { EnhancedProcessedData } from '@/types/dashboard';
11+
} from '@/components/ui/card';
12+
import { TooltipRoot, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
13+
1314

1415
const METRIC_EXPLANATIONS = {
1516
engagementScore:
@@ -29,7 +30,7 @@ interface MetricCardProps {
2930
function MetricCard({ title, value, explanation }: MetricCardProps) {
3031
return (
3132
<div className="p-4 border rounded-lg">
32-
<Tooltip>
33+
<TooltipRoot>
3334
<TooltipTrigger asChild>
3435
<div className="space-y-2">
3536
<h4 className="text-sm font-medium text-muted-foreground capitalize">
@@ -41,7 +42,7 @@ function MetricCard({ title, value, explanation }: MetricCardProps) {
4142
<TooltipContent side="bottom" className="max-w-xs">
4243
{explanation}
4344
</TooltipContent>
44-
</Tooltip>
45+
</TooltipRoot>
4546
</div>
4647
);
4748
}

‎src/components/dashboard/CohortSelector.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import {
2-
Select,
2+
SelectRoot,
33
SelectContent,
44
SelectItem,
55
SelectTrigger,
66
SelectValue,
7-
} from '../ui/select';
7+
} from '@/components/ui/select';
88
import { CohortId, COHORT_DATA } from '@/types/cohort';
99

1010
interface CohortSelectorProps {
@@ -21,7 +21,7 @@ export function CohortSelector({
2121
<span className="text-sm font-medium max-sm:w-full max-sm:text-start">
2222
Cohort:
2323
</span>
24-
<Select
24+
<SelectRoot
2525
value={selectedCohort}
2626
onValueChange={(value: CohortId) => onCohortChange(value)}
2727
name="cohort-selector"
@@ -42,7 +42,7 @@ export function CohortSelector({
4242
</SelectItem>
4343
))}
4444
</SelectContent>
45-
</Select>
45+
</SelectRoot>
4646
</div>
4747
);
4848
}

‎src/components/dashboard/ExecutiveSummary.tsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
'use client';
22

3+
import type { ProcessedData } from '@/types/dashboard';
34
import { useState, useMemo } from 'react';
45
import { Card, CardHeader, CardTitle, CardContent } from '../ui/card';
5-
import { ProcessedData } from '@/types/dashboard';
66
import {
77
Download,
88
TrendingUp,
@@ -15,10 +15,10 @@ import {
1515
ThumbsUp,
1616
HelpCircle,
1717
} from 'lucide-react';
18-
import { Tooltip, TooltipContent, TooltipTrigger } from '../ui/tooltip';
19-
import { Button } from '../ui/button';
18+
import { Button } from '@/components/ui/button';
19+
import { TooltipRoot, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
20+
import { toast } from '@/components/ui/use-toast';
2021
import { exportDashboardAction } from '@/lib/actions';
21-
import { toast } from '../ui/use-toast';
2222

2323
interface Props {
2424
data: ProcessedData;
@@ -171,14 +171,14 @@ export default function ExecutiveSummary({ data }: Props) {
171171
<TrendingDown className="text-red-500" size={20} />
172172
)}
173173
<span>{Math.abs(insights.weeklyChange.issues)}% WoW</span>
174-
<Tooltip>
174+
<TooltipRoot>
175175
<TooltipTrigger>
176176
<HelpCircle className="h-4 w-4 text-muted-foreground" />
177177
</TooltipTrigger>
178178
<TooltipContent>
179179
{METRIC_EXPLANATIONS.weeklyChange}
180180
</TooltipContent>
181-
</Tooltip>
181+
</TooltipRoot>
182182
</div>
183183
</div>
184184
<div className="flex items-center gap-3">
@@ -205,14 +205,14 @@ export default function ExecutiveSummary({ data }: Props) {
205205
<div className="flex items-center gap-2">
206206
<Star className="text-yellow-500" size={20} />
207207
<span>NPS Score: {insights.programHealth.nps}</span>
208-
<Tooltip>
208+
<TooltipRoot>
209209
<TooltipTrigger>
210210
<HelpCircle className="h-4 w-4 text-muted-foreground" />
211211
</TooltipTrigger>
212212
<TooltipContent>
213213
{METRIC_EXPLANATIONS.npsScore}
214214
</TooltipContent>
215-
</Tooltip>
215+
</TooltipRoot>
216216
</div>
217217
</div>
218218
<div className="flex items-center gap-3">

‎src/components/dashboard/Filters.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { useState } from 'react';
22
import { Filter, X } from 'lucide-react';
33
import { Button } from '@/components/ui/button';
44
import {
5-
Popover,
5+
PopoverRoot,
66
PopoverContent,
77
PopoverTrigger,
88
} from '@/components/ui/popover';
@@ -50,7 +50,7 @@ export function Filters({
5050
className="min-w-[240px]"
5151
/>
5252

53-
<Popover open={isOpen} onOpenChange={setIsOpen}>
53+
<PopoverRoot open={isOpen} onOpenChange={setIsOpen}>
5454
<PopoverTrigger asChild>
5555
<Button
5656
variant="outline"
@@ -86,7 +86,7 @@ export function Filters({
8686
))}
8787
</div>
8888
</PopoverContent>
89-
</Popover>
89+
</PopoverRoot>
9090

9191
{(dateRange || selectedPartners.length > 0) && (
9292
<Button

‎src/components/dashboard/TechPartnerChart.tsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ import {
99
CardTitle,
1010
} from '@/components/ui/card';
1111
import {
12-
Select,
12+
SelectRoot,
1313
SelectContent,
1414
SelectItem,
1515
SelectTrigger,
1616
SelectValue,
1717
} from '@/components/ui/select';
18-
import { ToggleGroup, ToggleGroupItem } from '@/components/ui/toggle-group';
18+
import { ToggleGroupContent, ToggleGroupItem } from '@/components/ui/toggle-group';
1919
import { EnhancedTechPartnerData, ActionableInsight } from '@/types/dashboard';
2020
import { TimeSeriesView } from './views/TimeSeriesView';
2121
import { ContributorView } from './views/ContributorView';
2222
import { AlertCircle, CheckCircle, GitPullRequest } from 'lucide-react';
2323
import {
24-
Tooltip,
24+
TooltipRoot,
2525
TooltipContent,
2626
TooltipProvider,
2727
TooltipTrigger,
@@ -218,7 +218,7 @@ export function TechPartnerChart({ data }: TechPartnerChartProps) {
218218
View Issues
219219
</Button>
220220
)}
221-
<Select value={selectedPartner} onValueChange={setSelectedPartner}>
221+
<SelectRoot value={selectedPartner} onValueChange={setSelectedPartner}>
222222
<SelectTrigger className="w-[180px]">
223223
<SelectValue placeholder="Select Partner" />
224224
</SelectTrigger>
@@ -232,10 +232,10 @@ export function TechPartnerChart({ data }: TechPartnerChartProps) {
232232
)
233233
)}
234234
</SelectContent>
235-
</Select>
235+
</SelectRoot>
236236
</div>
237237
</div>
238-
<ToggleGroup
238+
<ToggleGroupContent
239239
type="single"
240240
value={view}
241241
onValueChange={(value: string) => value && setView(value as ViewType)}
@@ -250,7 +250,7 @@ export function TechPartnerChart({ data }: TechPartnerChartProps) {
250250
>
251251
Contributors
252252
</ToggleGroupItem>
253-
</ToggleGroup>
253+
</ToggleGroupContent>
254254

255255
<div className="flex flex-wrap gap-4 mt-6">
256256
{filteredData.map((partner) => {
@@ -274,7 +274,7 @@ export function TechPartnerChart({ data }: TechPartnerChartProps) {
274274
<TooltipProvider
275275
key={`${partner.partner}-${insight.title}-${index}`}
276276
>
277-
<Tooltip>
277+
<TooltipRoot>
278278
<TooltipTrigger asChild>
279279
<a
280280
href={insight.link}
@@ -297,7 +297,7 @@ export function TechPartnerChart({ data }: TechPartnerChartProps) {
297297
<TooltipContent side="top" className="max-w-xs">
298298
<p className="text-xs">{insight.description}</p>
299299
</TooltipContent>
300-
</Tooltip>
300+
</TooltipRoot>
301301
</TooltipProvider>
302302
))}
303303
</div>

‎src/components/dashboard/__tests__/CohortSwitching.test.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { render, screen, waitFor, within } from '@testing-library/react';
33
import userEvent from '@testing-library/user-event';
44
import DeveloperEngagementDashboard from '../DeveloperEngagementDashboard';
55
import { DashboardSystemProvider } from '@/context/DashboardSystemContext';
6-
import { TooltipProvider } from '@radix-ui/react-tooltip';
6+
import { Tooltip } from 'radix-ui';
77

88
// Mock ResizeObserver
99
class ResizeObserver {
@@ -177,11 +177,11 @@ describe('Cohort Switching', () => {
177177
// Helper functions for common setup and actions
178178
const renderDashboard = () => {
179179
return render(
180-
<TooltipProvider>
180+
<Tooltip.Provider>
181181
<DashboardSystemProvider>
182182
<DeveloperEngagementDashboard />
183183
</DashboardSystemProvider>
184-
</TooltipProvider>
184+
</Tooltip.Provider>
185185
);
186186
};
187187

‎src/components/dashboard/views/ContributorView.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { useMemo, useState } from 'react';
55
import { ExternalLink } from 'lucide-react';
66
import { Button } from '@/components/ui/button';
77
import {
8-
Dialog,
8+
DialogRoot,
99
DialogContent,
1010
DialogDescription,
1111
DialogFooter,
@@ -21,7 +21,7 @@ import {
2121
TableRow,
2222
} from '@/components/ui/table';
2323
import {
24-
Tooltip,
24+
TooltipRoot,
2525
TooltipContent,
2626
TooltipProvider,
2727
TooltipTrigger,
@@ -159,7 +159,7 @@ export function ContributorView({ data }: ContributorViewProps) {
159159
{contributor.contributions
160160
.slice(0, 3)
161161
.map((contribution, idx) => (
162-
<Tooltip key={idx}>
162+
<TooltipRoot key={idx}>
163163
<TooltipTrigger className="underline cursor-pointer text-blue-500">
164164
{contribution.title.length > 20
165165
? `${contribution.title.slice(0, 20)}...`
@@ -179,7 +179,7 @@ export function ContributorView({ data }: ContributorViewProps) {
179179
View on GitHub <ExternalLink className="h-3 w-3" />
180180
</a>
181181
</TooltipContent>
182-
</Tooltip>
182+
</TooltipRoot>
183183
))}
184184
{contributor.contributions.length > 3 && (
185185
<Button
@@ -201,7 +201,7 @@ export function ContributorView({ data }: ContributorViewProps) {
201201
</TableBody>
202202
</Table>
203203

204-
<Dialog open={isDialogOpen} onOpenChange={setIsDialogOpen}>
204+
<DialogRoot open={isDialogOpen} onOpenChange={setIsDialogOpen}>
205205
<DialogContent className="sm:max-w-[425px]">
206206
<DialogHeader>
207207
<DialogTitle>{dialogTitle}</DialogTitle>
@@ -239,7 +239,7 @@ export function ContributorView({ data }: ContributorViewProps) {
239239
</Button>
240240
</DialogFooter>
241241
</DialogContent>
242-
</Dialog>
242+
</DialogRoot>
243243
</TooltipProvider>
244244
);
245245
}

‎src/components/dashboard/views/TimeSeriesView.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use client';
22

3-
import { EnhancedTechPartnerData } from '@/types/dashboard';
3+
import type { EnhancedTechPartnerData } from '@/types/dashboard';
44
import { useMemo } from 'react';
55
import {
66
BarChart,

0 commit comments

Comments
 (0)