Skip to content

Commit 56ba51b

Browse files
gkorlandgkorland
authored
Merge branch 'staging' into dependabot/npm_and_yarn/staging/lucide-react-0.468.0
2 parents 7f6b3e7 + a8dd85d commit 56ba51b

File tree

14 files changed

+489
-70
lines changed

14 files changed

+489
-70
lines changed

‎app/components/chat.tsx‎

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -209,25 +209,27 @@ export function Chat({ repo, path, setPath, graph, chartRef, selectedPathId, isP
209209
chart.elements().filter(el => [...p.nodes, ...p.edges].some(e => e.id == el.id())).layout(LAYOUT).run();
210210
} else {
211211
const elements: any = { nodes: [], edges: [] };
212-
213212
[...p.nodes, ...p.edges].forEach(e => {
214213
let element = chart.elements(`#${e.id}`)
215214
if (element.length === 0) {
216-
const type = "src_node" in e
215+
const type = e.id.startsWith("_")
217216
e = type ? { ...e, id: e.id.slice(1) } : e
218217
type
219218
? elements.edges.push(e)
220219
: elements.nodes.push(e)
221220
}
222221
})
223222

224-
chart.add(graph.extend(elements))
225-
chart.elements().filter((e) => [...p.nodes, ...p.edges].some((el) => el.id == e.id())).forEach((e) => {
223+
chart.elements().filter((e) => {
224+
console.log(e.id());
225+
return [...p.nodes, ...p.edges].some((el) => el.id == e.id())
226+
}).forEach((e) => {
226227
if (e.id() == p.nodes[0].id || e.id() == p.nodes[p.nodes.length - 1].id) {
227228
e.removeStyle().style(SELECTED_PATH_NODE_STYLE);
228229
} else if (e.isNode()) {
229230
e.removeStyle().style(PATH_NODE_STYLE);
230231
}
232+
231233
if (e.isEdge()) {
232234
e.removeStyle().style(SELECTED_PATH_EDGE_STYLE);
233235
}
@@ -455,13 +457,22 @@ export function Chat({ repo, path, setPath, graph, chartRef, selectedPathId, isP
455457
key={i}
456458
className={cn(
457459
"flex text-wrap border p-2 gap-2 rounded-md",
458-
p.nodes.length === selectedPath?.nodes.length &&
459-
selectedPath?.nodes.every(node => p?.nodes.some((n) => n.id === node.id)) && selectedPath.nodes.length === p.nodes.length && "border-[#FF66B3] bg-[#FFF0F7]",
460+
p.nodes.length === selectedPath?.nodes.length
461+
&& selectedPath?.nodes.every(node => p?.nodes.some((n) => n.id === node.id))
462+
&& "border-[#FF66B3] bg-[#FFF0F7]",
460463
message.graphName !== graph.Id && "opacity-50 bg-gray-200"
461464
)}
462465
title={message.graphName !== graph.Id ? `Move to graph ${message.graphName} to use this path` : undefined}
463466
disabled={message.graphName !== graph.Id}
464467
onClick={() => {
468+
if (message.graphName !== graph.Id) {
469+
toast({
470+
title: "Path Disabled",
471+
description: "The path is disabled because it is not from this graph.",
472+
});
473+
return;
474+
}
475+
465476
if (p.nodes.length === selectedPath?.nodes.length &&
466477
selectedPath?.nodes.every(node => p?.nodes.some((n) => n.id === node.id))) return;
467478
handleSetSelectedPath(p);
@@ -470,13 +481,11 @@ export function Chat({ repo, path, setPath, graph, chartRef, selectedPathId, isP
470481
>
471482
<p className="font-bold">#{i + 1}</p>
472483
<div className="flex flex-wrap">
473-
{
474-
p.nodes.map((node: any, j: number) => (
475-
<span key={j} className={cn((j === 0 || j === p.nodes.length - 1) && "font-bold")}>
476-
{` - ${node.properties.name}`}
477-
</span>
478-
))
479-
}
484+
{p.nodes.map((node: any, j: number) => (
485+
<span key={j} className={cn((j === 0 || j === p.nodes.length - 1) && "font-bold")}>
486+
{` - ${node.properties.name}`}
487+
</span>
488+
))}
480489
</div>
481490
</button>
482491
))
@@ -528,7 +537,7 @@ export function Chat({ repo, path, setPath, graph, chartRef, selectedPathId, isP
528537
</button>
529538
<form className="grow flex items-center border rounded-md px-2" onSubmit={sendQuery}>
530539
<DropdownMenuTrigger asChild>
531-
<button className="bg-gray-200 p-2 rounded-md hover:bg-gray-300">
540+
<button data-name="questionOptionsMenu" className="bg-gray-200 p-2 rounded-md hover:bg-gray-300">
532541
<ArrowDown color="white" />
533542
</button>
534543
</DropdownMenuTrigger>

‎app/components/code-graph.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,8 @@ export function CodeGraph({
435435
</button>
436436
}
437437
</div>
438-
<div className="w-full absolute bottom-0 left-0 flex justify-between items-center p-4 z-10 pointer-events-none">
439-
<div className="flex gap-4 text-gray-500">
438+
<div data-name="canvas-info-panel" className="w-full absolute bottom-0 left-0 flex justify-between items-center p-4 z-10 pointer-events-none">
439+
<div data-name="metrics-panel" className="flex gap-4 text-gray-500">
440440
<p>{nodesCount} Nodes</p>
441441
<p>{edgesCount} Edges</p>
442442
</div>

‎app/components/dataPanel.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export default function DataPanel({ obj, setObj, url }: Props) {
3636
const object = Object.entries(obj).filter(([k]) => !excludedProperties.includes(k))
3737

3838
return (
39-
<div className="z-20 absolute -top-10 left-20 bg-[#343434] text-white shadow-lg rounded-lg flex flex-col max-h-[88%] max-w-[56%] overflow-hidden" >
39+
<div data-name="node-details-panel" className="z-20 absolute -top-10 left-20 bg-[#343434] text-white shadow-lg rounded-lg flex flex-col max-h-[88%] max-w-[56%] overflow-hidden" >
4040
<header className="bg-[#191919] flex items-center gap-8 justify-between p-8">
4141
<p title={label} className="truncate font-bold">{label.toUpperCase()}</p>
4242
<button onClick={() => setObj(undefined)}>
@@ -74,7 +74,7 @@ export default function DataPanel({ obj, setObj, url }: Props) {
7474
<button
7575
className="flex items-center gap-2 p-2"
7676
title="Copy src to clipboard"
77-
onClick={() => navigator.clipboard.writeText(obj.src)}
77+
onClick={() => navigator.clipboard.writeText(obj.src || "")}
7878
>
7979
<Copy color="white" />
8080
Copy

‎e2e/config/constants.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export const GRAPH_ID = "1";
1+
export const GRAPH_ID = "GraphRAG-SDK";
22
export const PROJECT_NAME = "GraphRAG-SDK";
33
export const CHAT_OPTTIONS_COUNT = 1;
44
export const Node_Question = "how many nodes do we have?";

‎e2e/config/testData.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,8 @@ export const specialCharacters: { character: string; expectedRes: boolean }[] =
1313
...categorizeCharacters(['%', '*', '(', ')', '-', '[', ']', '{', '}', ';', ':', '"', '|', '~'], false),
1414
...categorizeCharacters(['!', '@', '$', '^', '_', '=', '+', "'", ',', '.', '<', '>', '/', '?', '\\', '`', '&', '#'], true)
1515
];
16+
17+
export const nodesPath: { firstNode: string; secondNode: string }[] = [
18+
{ firstNode: "import_data", secondNode: "add_edge" },
19+
{ firstNode: "test_kg_delete", secondNode: "list_graphs" },
20+
];

‎e2e/infra/ui/browserWrapper.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ export default class BrowserWrapper {
1313
if (!this.browser) {
1414
this.browser = await chromium.launch();
1515
}
16-
if (!this.context) {
17-
this.context = await this.browser.newContext();
18-
}
16+
this.context = await this.browser.newContext({
17+
permissions: ['clipboard-read', 'clipboard-write'],
18+
});
1919
if (!this.page) {
2020
this.page = await this.context.newPage();
2121
}

0 commit comments

Comments
 (0)