Skip to content

Commit c36a878

Browse files
prince3235prince3235
committed
fix: resolve TypeScript errors from upstream type changes
Signed-off-by: Prince Patel <princebpatel2005@gmail.com>
1 parent db1c50c commit c36a878

19 files changed

Lines changed: 66 additions & 120 deletions

‎client/src/components/gateways/GatewayCards.test.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ describe("ConnectSourceCard", () => {
5959
// VirtualServerCard tests
6060
// ─────────────────────────────────────────────
6161

62-
const mockServer: VirtualServer = {
62+
const mockServer = {
6363
id: "vs-1",
6464
name: "My Test Server",
6565
enabled: true,
@@ -72,9 +72,9 @@ const mockServer: VirtualServer = {
7272
associatedPrompts: [],
7373
createdAt: "2024-01-01T00:00:00Z",
7474
updatedAt: "2024-06-01T00:00:00Z",
75-
};
75+
} as unknown as VirtualServer;
7676

77-
const emptyServer: VirtualServer = {
77+
const emptyServer = {
7878
...mockServer,
7979
id: "vs-empty",
8080
name: "Empty Server",
@@ -84,7 +84,7 @@ const emptyServer: VirtualServer = {
8484
associatedResources: [],
8585
associatedPrompts: [],
8686
tags: [],
87-
};
87+
} as unknown as VirtualServer;
8888

8989
describe("VirtualServerCard", () => {
9090
it("renders the server name", () => {

‎client/src/components/gateways/VirtualServerCard.test.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { describe, it, expect, vi } from "vitest";
2-
import { render, screen, fireEvent } from "@testing-library/react";
2+
import { screen, fireEvent } from "@testing-library/react";
33
import userEvent from "@testing-library/user-event";
44
import { renderWithProviders } from "@/test/test-utils";
55
import { VirtualServerCard } from "./VirtualServerCard";
66
import { ConnectSourceCard } from "./ConnectSourceCard";
77
import type { VirtualServer } from "@/types/server";
88

9-
const makeServer = (overrides: Partial<VirtualServer> = {}): VirtualServer => ({
9+
const makeServer = (overrides: Partial<VirtualServer> = {}) => ({
1010
id: "vs-1",
1111
name: "My Server",
1212
enabled: true,
@@ -19,7 +19,7 @@ const makeServer = (overrides: Partial<VirtualServer> = {}): VirtualServer => ({
1919
createdAt: "2024-01-01T00:00:00Z",
2020
updatedAt: "2024-06-01T00:00:00Z",
2121
...overrides,
22-
});
22+
} as unknown as VirtualServer);
2323

2424
// ─── ConnectSourceCard ────────────────────────────────────────────────────────
2525
describe("ConnectSourceCard", () => {

‎client/src/components/gateways/VirtualServerDetailsPanel.test.tsx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
1+
import { describe, it, expect, vi, beforeEach } from "vitest";
22
import { renderWithProviders } from "@/test/test-utils";
33
import { screen, fireEvent, waitFor } from "@testing-library/react";
44
import userEvent from "@testing-library/user-event";
@@ -20,7 +20,7 @@ vi.mock("@/components/gateways/utils", async (importOriginal) => {
2020
};
2121
});
2222

23-
const mockServer: VirtualServer = {
23+
const mockServer = {
2424
id: "vs-1",
2525
name: "My Virtual Server",
2626
enabled: true,
@@ -33,7 +33,8 @@ const mockServer: VirtualServer = {
3333
createdAt: "2024-01-01T00:00:00Z",
3434
updatedAt: "2024-06-01T00:00:00Z",
3535
description: "Test description",
36-
};
36+
} as unknown as VirtualServer;
37+
3738

3839
describe("VirtualServerDetailsPanel", () => {
3940
beforeEach(() => {
@@ -78,7 +79,7 @@ describe("VirtualServerDetailsPanel", () => {
7879
it("handles empty description and different visibility types", () => {
7980
renderWithProviders(
8081
<VirtualServerDetailsPanel
81-
server={{ ...mockServer, description: undefined, visibility: "public" }}
82+
server={{ ...mockServer, description: "", visibility: "public" } as unknown as VirtualServer}
8283
open={true}
8384
error={null}
8485
onClose={vi.fn()}

‎client/src/components/resources/ResourceDetailsPanel.test.tsx‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,15 @@ const mockResources: ResourceRead[] = [
1313
enabled: true,
1414
description: "First resource",
1515
mimeType: "text/plain",
16-
size: 1024,
17-
tags: ["tag1", "tag2"],
18-
createdAt: "2024-01-01",
19-
updatedAt: "2024-01-01",
20-
},
16+
} as unknown as ResourceRead,
2117
{
2218
id: "r2",
2319
name: "Resource 2",
2420
uri: "file:///test/2",
2521
enabled: false,
2622
createdAt: "2024-01-01",
2723
updatedAt: "2024-01-01",
28-
},
24+
} as unknown as ResourceRead,
2925
];
3026

3127
describe("ResourceDetailsPanel", () => {

‎client/src/components/resources/ResourceDetailsPanel.tsx‎

Lines changed: 3 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
22
import type { ReactNode } from "react";
33
import { useIntl } from "react-intl";
4-
import { Activity, Copy, FileText, Globe, PanelRightClose, Plus } from "lucide-react";
5-
import { Badge } from "@/components/ui/badge";
4+
import { Activity, Copy, FileText, Globe, PanelRightClose } from "lucide-react";
65
import { Button } from "@/components/ui/button";
76
import { cn } from "@/lib/utils";
87
import type { ResourceRead } from "@/generated/types";
98
import { copyToClipboard, truncateMiddle } from "@/components/gateways/utils";
10-
import { formatBytes, formatDateTime } from "@/utils/format";
9+
import { formatDateTime } from "@/utils/format";
1110
import { ResourcesTable } from "@/components/resources/ResourcesTable";
1211

1312
function DetailRow({
@@ -233,54 +232,7 @@ export function ResourceDetailsPanel({
233232
value={selectedResource.uriTemplate || selectedResource.uri}
234233
/>
235234
</DetailRow>
236-
{selectedResource.size != null && (
237-
<DetailRow
238-
label={intl.formatMessage({ id: "resources.details.label.size" })}
239-
>
240-
<span className="text-foreground">
241-
{formatBytes(selectedResource.size)}
242-
</span>
243-
</DetailRow>
244-
)}
245-
<DetailRow
246-
label={intl.formatMessage({ id: "resources.details.label.tags" })}
247-
className="items-center"
248-
>
249-
<div className="flex min-w-0 flex-wrap items-center gap-2">
250-
{(selectedResource.tags || []).length > 0 ? (
251-
<>
252-
{(selectedResource.tags || []).map((tag, index) => (
253-
<Badge
254-
key={`${tag}-${index}`}
255-
variant="outline"
256-
className="rounded-full px-2 py-0 text-[11px] font-medium text-muted-foreground"
257-
>
258-
{tag}
259-
</Badge>
260-
))}
261-
<button
262-
type="button"
263-
tabIndex={-1}
264-
aria-hidden="true"
265-
className="flex items-center gap-1 text-[12px] text-muted-foreground hover:text-foreground"
266-
>
267-
<Plus className="size-3" aria-hidden="true" />
268-
{intl.formatMessage({ id: "resources.details.addTag" })}
269-
</button>
270-
</>
271-
) : (
272-
<button
273-
type="button"
274-
tabIndex={-1}
275-
aria-hidden="true"
276-
className="flex items-center gap-1 text-[12px] text-muted-foreground hover:text-foreground"
277-
>
278-
<Plus className="size-3" aria-hidden="true" />
279-
{intl.formatMessage({ id: "resources.details.addTag" })}
280-
</button>
281-
)}
282-
</div>
283-
</DetailRow>
235+
284236
</dl>
285237
</div>
286238

‎client/src/components/resources/ResourcesTable.test.tsx‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,16 @@ function createMockResource(id: number, overrides?: Partial<Resource>): Resource
1414
id: `resource-${id}`,
1515
name: `Resource ${id}`,
1616
description: `Description for resource ${id}`,
17-
title: `Resource ${id} Title`,
1817
gatewayId: "gateway-id",
1918
enabled: true,
2019
uri: `resource://example/${id}`,
2120
uriTemplate: undefined,
2221
mimeType: "application/json",
23-
size: 0,
24-
version: 1,
2522
visibility: "public",
26-
tags: ["tag1", "tag2"],
27-
createdAt: "2024-01-01T00:00:00",
28-
updatedAt: "2024-01-02T00:00:00",
23+
createdAt: "2024-01-01T00:00:00Z",
24+
updatedAt: "2024-01-01T00:00:00Z",
2925
...overrides,
30-
};
26+
} as unknown as Resource;
3127
}
3228

3329
describe("ResourcesTable", () => {
@@ -58,14 +54,14 @@ describe("ResourcesTable", () => {
5854
});
5955

6056
it("displays title when available", () => {
61-
const resources = [createMockResource(1, { title: "Custom Title" })];
57+
const resources = [createMockResource(1, { name: "Custom Title" })];
6258
render(<ResourcesTable resources={resources} onSelectResource={mockOnSelectResource} />);
6359

6460
expect(screen.getByText("Custom Title")).toBeInTheDocument();
6561
});
6662

6763
it("falls back to name when title is not available", () => {
68-
const resources = [createMockResource(1, { title: null, name: "Resource Name" })];
64+
const resources = [createMockResource(1, { name: "Resource Name" })];
6965
render(<ResourcesTable resources={resources} onSelectResource={mockOnSelectResource} />);
7066

7167
expect(screen.getByText("Resource Name")).toBeInTheDocument();
@@ -204,7 +200,7 @@ describe("ResourcesTable", () => {
204200
it("handles very long resource names with line-clamp", () => {
205201
const resources = [
206202
createMockResource(1, {
207-
title: "This is a very long resource title that should be clamped to one line",
203+
name: "This is a very long resource title that should be clamped to one line",
208204
}),
209205
];
210206
render(<ResourcesTable resources={resources} onSelectResource={mockOnSelectResource} />);

‎client/src/components/resources/ResourcesTable.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export function ResourcesTable({
6363
className="cursor-pointer focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-inset"
6464
>
6565
<TableCell className="px-4 py-3 text-sm text-foreground">
66-
<span className="line-clamp-1">{resource.title || resource.name}</span>
66+
<span className="line-clamp-1">{resource.name}</span>
6767
</TableCell>
6868

6969
<TableCell className="px-4 py-3">

‎client/src/components/tools/ToolForm.test.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ describe("ToolForm", () => {
371371
requestType: "GET",
372372
enabled: true,
373373
reachable: true,
374-
tags: undefined,
374+
tags: [],
375375
createdAt: "2026-01-01T00:00:00",
376376
updatedAt: "2026-01-02T00:00:00",
377377
url: undefined as any,

‎client/src/components/ui/missing-ui-components.test.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { describe, it, expect, vi, beforeEach } from "vitest";
1+
import { describe, it, expect, vi } from "vitest";
22
import { render, screen, fireEvent } from "@testing-library/react";
33
import { Checkbox } from "./checkbox";
44
import { Switch } from "./switch";

‎client/src/components/users/UserActionsMenu.test.tsx‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,11 @@ import { renderWithProviders } from "@/test/test-utils";
33
import { screen } from "@testing-library/react";
44
import userEvent from "@testing-library/user-event";
55
import { UserActionsMenu } from "./UserActionsMenu";
6-
import type { User } from "@/types/user";
7-
8-
const mockUser: User = {
6+
const mockUser = {
97
email: "alice@example.com",
10-
username: "alice",
118
is_admin: false,
129
is_active: true,
13-
role: "developer",
14-
teams: [],
15-
};
10+
} as unknown as User;
1611

1712
describe("UserActionsMenu", () => {
1813
it("renders trigger button with aria-label", () => {

0 commit comments

Comments
 (0)