Merge branch 'staging' into CanvasAnalysisAndTests

Author: Anchel123

app/api/chat/[graph]/route.ts

@@ -2,9 +2,9 @@ import { NextRequest, NextResponse } from "next/server"
 import { getEnvVariables } from "../../utils"
 
 
-export async function POST(request: NextRequest, { params }: { params: { graph: string } }) {
+export async function POST(request: NextRequest, { params }: { params: Promise<{ graph: string }> }) {
 
-    const repo = params.graph
+    const repo = (await params).graph
     const msg = request.nextUrl.searchParams.get('msg')
 
     try {

app/api/repo/[graph]/[node]/route.ts

@@ -1,10 +1,12 @@
 import { getEnvVariables } from "@/app/api/utils";
 import { NextRequest, NextResponse } from "next/server";
 
-export async function POST(request: NextRequest, { params }: { params: { graph: string, node: string } }) {
+export async function POST(request: NextRequest, { params }: { params: Promise<{ graph: string, node: string }> }) {
 
-    const repo = params.graph;
-    const src = Number(params.node);
+    const p = await params;
+
+    const repo = p.graph;
+    const src = Number(p.node);
     const dest = Number(request.nextUrl.searchParams.get('targetId'))
 
     try {

app/api/repo/[graph]/commit/route.ts

@@ -1,10 +1,10 @@
 import { getEnvVariables } from "@/app/api/utils";
 import { NextRequest, NextResponse } from "next/server";
 
-export async function GET(request: NextRequest, { params }: { params: { graph: string } }) {
+export async function GET(request: NextRequest, { params }: { params: Promise<{ graph: string }> }) {
+
+    const repo = (await params).graph
 
-    const repo = params.graph
-    
     try {
 
         const { url, token } = getEnvVariables()
@@ -32,6 +32,6 @@ export async function GET(request: NextRequest, { params }: { params: { graph: s
     }
 }
 
-export async function POST(request: NextRequest, { params }: { params: { graph: string } }) {
+export async function POST(request: NextRequest, { params }: { params: Promise<{ graph: string }> }) {
 
 }

app/api/repo/[graph]/info/route.ts

@@ -1,12 +1,12 @@
 import { NextRequest, NextResponse } from "next/server";
 import { getEnvVariables } from "@/app/api/utils";
 
-export async function GET(request: NextRequest, { params }: { params: { graph: string } }) {
+export async function GET(request: NextRequest, { params }: { params: Promise<{ graph: string }> }) {
 
-    const repo = params.graph
+    const repo = (await params).graph
 
     try {
-        
+
         const { url, token } = getEnvVariables();
 
         const result = await fetch(`${url}/repo_info`, {

app/api/repo/[graph]/neighbors/route.ts

@@ -1,9 +1,9 @@
 import { NextRequest, NextResponse } from "next/server";
 import { getEnvVariables } from "@/app/api/utils";
 
-export async function POST(request: NextRequest, { params }: { params: { graph: string } }) {
+export async function POST(request: NextRequest, { params }: { params: Promise<{ graph: string }> }) {
 
-    const repo = params.graph;
+    const repo = (await params).graph;
     const node_ids = (await request.json()).nodeIds.map((id: string) => Number(id));
 
     try {
@@ -13,7 +13,7 @@ export async function POST(request: NextRequest, { params }: { params: { graph:
         if (node_ids.length === 0) {
             throw new Error("nodeIds is required");
         }
-        
+
         const result = await fetch(`${url}/get_neighbors`, {
             method: 'POST',
             body: JSON.stringify({ node_ids, repo }),

app/api/repo/[graph]/route.ts

@@ -1,9 +1,9 @@
 import { NextRequest, NextResponse } from "next/server"
 import { getEnvVariables } from "../../utils"
 
-export async function GET(request: NextRequest, { params }: { params: { graph: string } }) {
+export async function GET(request: NextRequest, { params }: { params: Promise<{ graph: string }> }) {
 
-    const graphName = params.graph
+    const graphName = (await params).graph
 
     try {
 
@@ -29,9 +29,9 @@ export async function GET(request: NextRequest, { params }: { params: { graph: s
     }
 }
 
-export async function POST(request: NextRequest, { params }: { params: { graph: string } }) {
+export async function POST(request: NextRequest, { params }: { params: Promise<{ graph: string }> }) {
 
-    const repo = params.graph
+    const repo = (await params).graph
     const prefix = request.nextUrl.searchParams.get('prefix')
 
     try {

app/components/Input.tsx

@@ -145,6 +145,14 @@ export default function Input({ value, onValueChange, handleSubmit, graph, icon,
                 value={value || ""}
                 onChange={(e) => {
                     const newVal = e.target.value
+                    const invalidChars = /[%*()\-\[\]{};:"|~]/;
+
+                    if (invalidChars.test(newVal)) {
+                        e.target.setCustomValidity(`The character "${newVal.match(invalidChars)?.[0]}" is not allowed in this field.`);
+                        e.target.reportValidity();
+                        return;
+                    }
+                    e.target.setCustomValidity('');
                     onValueChange({ name: newVal })
                 }}
                 {...props}

e2e/config/testData.ts

@@ -10,6 +10,6 @@ const categorizeCharacters = (characters: string[], expectedRes: boolean): { cha
 };
 
 export const specialCharacters: { character: string; expectedRes: boolean }[] = [
-  ...categorizeCharacters(['%', '*', '(', ')', '-', '[', ']', '{', '}', ';', ':', '"', '|', '~'], true),
-  ...categorizeCharacters(['!', '@', '$', '^', '_', '=', '+', "'", ',', '.', '<', '>', '/', '?', '\\', '`', '&', '#'], false)
+  ...categorizeCharacters(['%', '*', '(', ')', '-', '[', ']', '{', '}', ';', ':', '"', '|', '~'], false),
+  ...categorizeCharacters(['!', '@', '$', '^', '_', '=', '+', "'", ',', '.', '<', '>', '/', '?', '\\', '`', '&', '#'], true)
 ];

e2e/tests/codeGraph.spec.ts

@@ -62,7 +62,7 @@ test.describe("Code graph tests", () => {
       await codeGraph.selectGraph(GRAPH_ID);
       await codeGraph.fillSearchBar(character);
       await delay(1000);
-      expect(await codeGraph.isNotificationError()).toBe(expectedRes);
+      expect((await codeGraph.getSearchBarInputValue()).includes(character)).toBe(expectedRes);
     });
   });