Skip to content

Commit 492ec0d

Browse files
hotlonghotlong
authored
Merge pull request #440 from objectstack-ai/copilot/fix-ci-build-vercel-errors
2 parents 371503a + 8919d83 commit 492ec0d

13 files changed

Lines changed: 67 additions & 84 deletions

File tree

‎packages/plugin-designer/src/DataModelDesigner.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import React, { useState, useCallback } from 'react';
10-
import type { DataModelEntity, DataModelRelationship, DesignerCanvasConfig } from '@object-ui/types';
10+
import type { DataModelEntity, DataModelField, DataModelRelationship, DesignerCanvasConfig } from '@object-ui/types';
1111
import { Database, Plus, Trash2, Link2 } from 'lucide-react';
1212
import { clsx } from 'clsx';
1313
import { twMerge } from 'tailwind-merge';
@@ -202,7 +202,7 @@ export function DataModelDesigner({
202202
</div>
203203
{/* Fields */}
204204
<div className="px-3 py-1 divide-y">
205-
{entity.fields.map((field) => (
205+
{entity.fields.map((field: DataModelField) => (
206206
<div
207207
key={field.name}
208208
className="flex items-center gap-2 py-1 text-xs"

‎packages/plugin-designer/src/PageDesigner.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import type {
1111
DesignerComponent,
1212
DesignerCanvasConfig,
1313
DesignerPaletteCategory,
14+
DesignerPaletteItem,
1415
} from '@object-ui/types';
1516
import { GripVertical, Undo2, Redo2, Eye, Layers, Plus, Trash2 } from 'lucide-react';
1617
import { clsx } from 'clsx';
@@ -105,7 +106,7 @@ export function PageDesigner({
105106
<div className="text-xs font-medium text-muted-foreground px-2 py-1 uppercase">
106107
{category.label}
107108
</div>
108-
{category.items.map((item) => (
109+
{category.items.map((item: DesignerPaletteItem) => (
109110
<button
110111
key={item.type}
111112
onClick={() => handleAddComponent(item.type, item.label)}

‎packages/plugin-designer/src/ReportDesigner.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ export function ReportDesigner({
112112
if (readOnly) return;
113113
const updated = sections.map((section) => ({
114114
...section,
115-
elements: section.elements.filter((e) => e.id !== elementId),
115+
elements: section.elements.filter((e: ReportDesignerElement) => e.id !== elementId),
116116
}));
117117
setSections(updated);
118118
if (selectedElement === elementId) setSelectedElement(null);
@@ -217,7 +217,7 @@ export function ReportDesigner({
217217

218218
{/* Elements */}
219219
<div className="relative" style={{ minHeight: section.height, paddingTop: 24 }}>
220-
{section.elements.map((element) => (
220+
{section.elements.map((element: ReportDesignerElement) => (
221221
<div
222222
key={element.id}
223223
className={cn(

‎packages/plugin-designer/tsconfig.json‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33
"compilerOptions": {
44
"outDir": "dist",
55
"jsx": "react-jsx",
6-
"baseUrl": ".",
7-
"paths": {
8-
"@/*": ["src/*"]
9-
},
10-
"noEmit": false,
11-
"declaration": true,
12-
"composite": true,
13-
"declarationMap": true,
146
"skipLibCheck": true
157
},
168
"include": ["src"],

‎packages/plugin-report/src/LiveReportExporter.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ export function exportExcelWithFormulas(
189189

190190
// Optional aggregation row
191191
if (includeAggregationRow && data.length > 0) {
192-
const aggRow = cols.map((col, colIndex) => {
192+
const aggRow = cols.map((col: ExcelColumnConfig, colIndex: number) => {
193193
const field = (report.fields || []).find(f => f.name === col.name);
194194
if (field?.aggregation) {
195195
const colLetter = getExcelColumnLetter(colIndex);

‎packages/plugin-report/src/ReportBuilder.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import React, { useState } from 'react';
1010
import { Card, CardContent, CardHeader, CardTitle, CardDescription, Button, Input, Label, Tabs, TabsContent, TabsList, TabsTrigger } from '@object-ui/components';
11-
import type { ReportBuilderSchema, ReportSchema, ReportField, ReportFilter, ReportGroupBy, ReportSection } from '@object-ui/types';
11+
import type { ReportBuilderSchema, ReportSchema, ReportField, ReportFilter, ReportGroupBy, ReportSection, DataSource } from '@object-ui/types';
1212
import { Plus, Trash2, Save, X, Settings, Filter, Layers, Calendar } from 'lucide-react';
1313
import { ReportViewer } from './ReportViewer';
1414
import { ScheduleConfig } from './ScheduleConfig';
@@ -51,7 +51,7 @@ export const ReportBuilder: React.FC<ReportBuilderProps> = ({ schema }) => {
5151
const handleAddField = () => {
5252
if (availableFields.length > 0 && selectedFields.length < availableFields.length) {
5353
const nextField = availableFields.find(
54-
f => !selectedFields.some(sf => sf.name === f.name)
54+
(f: ReportField) => !selectedFields.some(sf => sf.name === f.name)
5555
);
5656
if (nextField) {
5757
const newFields = [...selectedFields, nextField];
@@ -226,7 +226,7 @@ export const ReportBuilder: React.FC<ReportBuilderProps> = ({ schema }) => {
226226
<Label>Data Source</Label>
227227
<select className="w-full border rounded-md p-2">
228228
<option value="">Select a data source</option>
229-
{dataSources.map((_ds, idx) => (
229+
{dataSources.map((_ds: DataSource, idx: number) => (
230230
<option key={idx} value={idx}>
231231
Data Source {idx + 1}
232232
</option>
@@ -364,7 +364,7 @@ export const ReportBuilder: React.FC<ReportBuilderProps> = ({ schema }) => {
364364
value={filter.field}
365365
onChange={(e) => handleFilterChange(index, { ...filter, field: e.target.value })}
366366
>
367-
{availableFields.map((f, i) => (
367+
{availableFields.map((f: ReportField, i: number) => (
368368
<option key={i} value={f.name}>{f.label || f.name}</option>
369369
))}
370370
</select>
@@ -432,7 +432,7 @@ export const ReportBuilder: React.FC<ReportBuilderProps> = ({ schema }) => {
432432
value={group.field}
433433
onChange={(e) => handleGroupByChange(index, { ...group, field: e.target.value })}
434434
>
435-
{availableFields.map((f, i) => (
435+
{availableFields.map((f: ReportField, i: number) => (
436436
<option key={i} value={f.name}>{f.label || f.name}</option>
437437
))}
438438
</select>
@@ -557,7 +557,7 @@ export const ReportBuilder: React.FC<ReportBuilderProps> = ({ schema }) => {
557557
})}
558558
>
559559
<option value="">Select Field...</option>
560-
{availableFields.map(f => (
560+
{availableFields.map((f: ReportField) => (
561561
<option key={f.name} value={f.name}>{f.label || f.name}</option>
562562
))}
563563
{/* Use mock fields if no available fields provided */}

‎packages/plugin-report/src/ReportExportEngine.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* LICENSE file in the root directory of this source tree.
77
*/
88

9-
import type { ReportSchema, ReportExportConfig, ReportExportFormat } from '@object-ui/types';
9+
import type { ReportSchema, ReportExportConfig, ReportExportFormat, ReportField } from '@object-ui/types';
1010

1111
/**
1212
* Report Export Engine
@@ -18,8 +18,8 @@ import type { ReportSchema, ReportExportConfig, ReportExportFormat } from '@obje
1818
*/
1919
export function exportAsCSV(report: ReportSchema, data: any[], config?: ReportExportConfig): void {
2020
const fields = report.fields || [];
21-
const headers = fields.map(f => f.label || f.name);
22-
const rows = data.map(row => fields.map(f => {
21+
const headers = fields.map((f: ReportField) => f.label || f.name);
22+
const rows = data.map((row: Record<string, any>) => fields.map((f: ReportField) => {
2323
let val = row[f.name];
2424
val = sanitizeCSVValue(val);
2525
// Escape CSV values
@@ -81,8 +81,8 @@ export function exportAsHTML(report: ReportSchema, data: any[], config?: ReportE
8181
${report.description ? `<p class="description">${escapeHTML(report.description)}</p>` : ''}
8282
<p class="meta">Generated: ${new Date().toLocaleString()}</p>
8383
<table>
84-
<thead><tr>${fields.map(f => `<th>${escapeHTML(f.label || f.name)}</th>`).join('')}</tr></thead>
85-
<tbody>${data.map(row => `<tr>${fields.map(f => `<td>${escapeHTML(String(row[f.name] ?? ''))}</td>`).join('')}</tr>`).join('')}</tbody>
84+
<thead><tr>${fields.map((f: ReportField) => `<th>${escapeHTML(f.label || f.name)}</th>`).join('')}</tr></thead>
85+
<tbody>${data.map((row: Record<string, any>) => `<tr>${fields.map((f: ReportField) => `<td>${escapeHTML(String(row[f.name] ?? ''))}</td>`).join('')}</tr>`).join('')}</tbody>
8686
</table>
8787
</body>
8888
</html>`;
@@ -133,8 +133,8 @@ export function exportAsPDF(report: ReportSchema, data: any[], config?: ReportEx
133133
${report.description ? `<p class="description">${escapeHTML(report.description)}</p>` : ''}
134134
<p class="meta">Generated: ${new Date().toLocaleString()}</p>
135135
<table>
136-
<thead><tr>${fields.map(f => `<th>${escapeHTML(f.label || f.name)}</th>`).join('')}</tr></thead>
137-
<tbody>${data.map(row => `<tr>${fields.map(f => `<td>${escapeHTML(String(row[f.name] ?? ''))}</td>`).join('')}</tr>`).join('')}</tbody>
136+
<thead><tr>${fields.map((f: ReportField) => `<th>${escapeHTML(f.label || f.name)}</th>`).join('')}</tr></thead>
137+
<tbody>${data.map((row: Record<string, any>) => `<tr>${fields.map((f: ReportField) => `<td>${escapeHTML(String(row[f.name] ?? ''))}</td>`).join('')}</tr>`).join('')}</tbody>
138138
</table>
139139
</body>
140140
</html>`);
@@ -150,8 +150,8 @@ ${report.description ? `<p class="description">${escapeHTML(report.description)}
150150
*/
151151
export function exportAsExcel(report: ReportSchema, data: any[], config?: ReportExportConfig): void {
152152
const fields = report.fields || [];
153-
const headers = fields.map(f => f.label || f.name);
154-
const rows = data.map(row => fields.map(f => {
153+
const headers = fields.map((f: ReportField) => f.label || f.name);
154+
const rows = data.map((row: Record<string, any>) => fields.map((f: ReportField) => {
155155
let val = row[f.name];
156156
val = sanitizeCSVValue(val);
157157
if (typeof val === 'string' && (val.includes(',') || val.includes('"') || val.includes('\n') || val.includes('\t'))) {

‎packages/plugin-report/src/ReportViewer.tsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ export const ReportViewer: React.FC<ReportViewerProps> = ({ schema, onRefresh })
5454

5555
const computeAggregation = (fieldName: string, aggregation?: string): string | number => {
5656
if (!data) return 0;
57-
const values = data.map(item => Number(item[fieldName]) || 0);
57+
const values = data.map((item: Record<string, any>) => Number(item[fieldName]) || 0);
5858
switch (aggregation) {
5959
case 'count': return data.length;
60-
case 'sum': return values.reduce((sum, v) => sum + v, 0);
60+
case 'sum': return values.reduce((sum: number, v: number) => sum + v, 0);
6161
case 'avg': return values.length > 0
62-
? (values.reduce((sum, v) => sum + v, 0) / values.length).toFixed(2)
62+
? (values.reduce((sum: number, v: number) => sum + v, 0) / values.length).toFixed(2)
6363
: 0;
6464
case 'min': return values.length > 0 ? Math.min(...values) : 0;
6565
case 'max': return values.length > 0 ? Math.max(...values) : 0;
@@ -167,8 +167,8 @@ export const ReportViewer: React.FC<ReportViewerProps> = ({ schema, onRefresh })
167167
{section.type === 'summary' && (
168168
<div className="grid grid-cols-1 md:grid-cols-3 gap-4">
169169
{report.fields
170-
?.filter(f => f.showInSummary)
171-
.map((field, idx) => (
170+
?.filter((f: ReportField) => f.showInSummary)
171+
.map((field: ReportField, idx: number) => (
172172
<Card key={idx}>
173173
<CardContent className="p-4">
174174
<div className="text-sm text-muted-foreground">{field.label || field.name}</div>
@@ -232,17 +232,17 @@ export const ReportViewer: React.FC<ReportViewerProps> = ({ schema, onRefresh })
232232
<table className="w-full text-sm">
233233
<thead className="bg-muted">
234234
<tr>
235-
{section.columns?.map((col, idx) => (
235+
{section.columns?.map((col: ReportField, idx: number) => (
236236
<th key={idx} className="px-4 py-2 text-left font-medium">
237237
{col.label || col.name}
238238
</th>
239239
))}
240240
</tr>
241241
</thead>
242242
<tbody>
243-
{data?.map((row, rowIdx) => (
243+
{data?.map((row: Record<string, any>, rowIdx: number) => (
244244
<tr key={rowIdx} className="border-t">
245-
{section.columns?.map((col, colIdx) => (
245+
{section.columns?.map((col: ReportField, colIdx: number) => (
246246
<td key={colIdx} className="px-4 py-2">
247247
{row[col.name]}
248248
</td>

‎packages/plugin-report/tsconfig.json‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33
"compilerOptions": {
44
"outDir": "dist",
55
"jsx": "react-jsx",
6-
"baseUrl": ".",
7-
"paths": {
8-
"@/*": ["src/*"]
9-
},
10-
"noEmit": false,
11-
"declaration": true,
12-
"composite": true,
13-
"declarationMap": true,
146
"skipLibCheck": true
157
},
168
"include": ["src"],

‎packages/plugin-view/src/__tests__/FilterUI.test.tsx‎

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ import type { FilterUISchema } from '@object-ui/types';
1515
// Mock @object-ui/components – provide lightweight stand-ins for Shadcn
1616
// primitives so tests render without a full component tree.
1717
// ---------------------------------------------------------------------------
18-
vi.mock('@object-ui/components', () => {
18+
vi.mock('@object-ui/components', async () => {
19+
const React = await import('react');
1920
const cn = (...args: any[]) => args.filter(Boolean).join(' ');
2021

2122
const Button = ({ children, onClick, variant, size, type, ...rest }: any) => (
@@ -48,15 +49,16 @@ vi.mock('@object-ui/components', () => {
4849
/>
4950
);
5051

51-
// Store onValueChange callbacks by a global map keyed on a unique id
52-
let selectCallback: ((v: string) => void) | undefined;
52+
// Share onValueChange from Select to SelectItem via React Context
53+
const SelectCtx = React.createContext<((v: string) => void) | undefined>(undefined);
5354

5455
const Select = ({ children, value, onValueChange }: any) => {
55-
selectCallback = onValueChange;
5656
return (
57-
<div data-testid="select-root" data-value={value}>
58-
{children}
59-
</div>
57+
<SelectCtx.Provider value={onValueChange}>
58+
<div data-testid="select-root" data-value={value}>
59+
{children}
60+
</div>
61+
</SelectCtx.Provider>
6062
);
6163
};
6264

@@ -72,16 +74,19 @@ vi.mock('@object-ui/components', () => {
7274
<div data-testid="select-content">{children}</div>
7375
);
7476

75-
const SelectItem = ({ children, value }: any) => (
76-
<div
77-
data-testid="select-item"
78-
data-value={value}
79-
role="option"
80-
onClick={() => selectCallback?.(String(value))}
81-
>
82-
{children}
83-
</div>
84-
);
77+
const SelectItem = ({ children, value }: any) => {
78+
const onValueChange = React.useContext(SelectCtx);
79+
return (
80+
<div
81+
data-testid="select-item"
82+
data-value={value}
83+
role="option"
84+
onClick={() => onValueChange?.(String(value))}
85+
>
86+
{children}
87+
</div>
88+
);
89+
};
8590

8691
const Popover = ({ children, open }: any) => (
8792
<div data-testid="popover" data-open={open}>

0 commit comments

Comments
 (0)