Merge pull request #1602 from FalkorDB/staging

staging

Author: Anchel123

.github/workflows/playwright.yml

@@ -47,8 +47,9 @@ jobs:
             ~/.npm
             node_modules
             ~/.cache/ms-playwright
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/playwright.config.ts') }}
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/playwright.config.ts') }}-${{ hashFiles('.github/workflows/playwright.yml') }}
           restore-keys: |
+            ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/playwright.config.ts') }}-
             ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-
             ${{ runner.os }}-node-
       - name: Install dependencies with enhanced retry logic
@@ -82,7 +83,7 @@ jobs:
             fi
           done
       - name: Install Playwright Browsers
-        run: npx playwright install --with-deps chromium
+        run: npx playwright install --with-deps chromium firefox
       - name: Build application
         run: npm run build
       - name: Upload build output
@@ -127,8 +128,9 @@ jobs:
             ~/.npm
             node_modules
             ~/.cache/ms-playwright
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/playwright.config.ts') }}
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/playwright.config.ts') }}-${{ hashFiles('.github/workflows/playwright.yml') }}
           restore-keys: |
+            ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/playwright.config.ts') }}-
             ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-
             ${{ runner.os }}-node-
       - name: Download build output
@@ -204,8 +206,9 @@ jobs:
             ~/.npm
             node_modules
             ~/.cache/ms-playwright
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/playwright.config.ts') }}
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/playwright.config.ts') }}-${{ hashFiles('.github/workflows/playwright.yml') }}
           restore-keys: |
+            ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/playwright.config.ts') }}-
             ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-
             ${{ runner.os }}-node-
       - name: Download build output
@@ -340,8 +343,9 @@ jobs:
             ~/.npm
             node_modules
             ~/.cache/ms-playwright
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/playwright.config.ts') }}
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/playwright.config.ts') }}-${{ hashFiles('.github/workflows/playwright.yml') }}
           restore-keys: |
+            ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/playwright.config.ts') }}-
             ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-
             ${{ runner.os }}-node-
       - name: Download build output

.github/workflows/release-image.yml

@@ -69,7 +69,7 @@ jobs:
         uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
 
       - name: Login to DockerHub
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
@@ -106,7 +106,7 @@ jobs:
         uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
 
       - name: Login to DockerHub
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

app/api/graph/model.ts

@@ -2,7 +2,6 @@
 /* eslint-disable one-var */
 /* eslint-disable no-param-reassign */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-
 import { Data, getMetaStats, GraphData, InfoLabel, InfoRelationship, Label, Link, LinkCell, MemoryValue, Node, NodeCell, Relationship, ToastFn, Value } from "@/lib/utils";
 
 // Color palette for node customization

app/api/upload/route.ts

@@ -4,32 +4,53 @@ import { promisify } from "util";
 import { pipeline } from "stream";
 import fs from "fs";
 import { getCorsHeaders } from "../utils";
+import { getClient } from "../auth/[...nextauth]/options";
 
 const pump = promisify(pipeline);
 
 // eslint-disable-next-line import/prefer-default-export
 export async function POST(request: NextRequest) {
-  const formData = await request.formData();
+  try {
+    const session = await getClient(request);
 
-  const file = formData.get("file") as File;
+    if (session instanceof NextResponse) {
+      return session;
+    }
 
-  if (!file) {
-    return NextResponse.json({ error: "No files received." }, { status: 400, headers: getCorsHeaders(request) });
-  }
+    const formData = await request.formData();
 
-  const filename = file.name.replaceAll(" ", "_");
-  const filePath = path.join(process.cwd(), `public/assets/${filename}`);
+    const file = formData.get("file") as File;
 
-  try {
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    await pump(file.stream(), fs.createWriteStream(filePath));
-    return NextResponse.json({ path: filePath, status: 200 }, { headers: getCorsHeaders(request) });
-  } catch (error) {
-    console.error(error);
+    if (!file) {
+      return NextResponse.json({ error: "No files received." }, { status: 400, headers: getCorsHeaders(request) });
+    }
+
+    const filename = path.basename(file.name).replaceAll(" ", "_");
+    const filePath = path.join(process.cwd(), "public", "assets", filename);
+
+    // Guard against path traversal
+    const assetsDir = path.join(process.cwd(), "public", "assets");
+    if (!filePath.startsWith(assetsDir)) {
+      return NextResponse.json({ error: "Invalid file name." }, { status: 400, headers: getCorsHeaders(request) });
+    }
+
+    try {
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      await pump(file.stream(), fs.createWriteStream(filePath));
+      return NextResponse.json({ path: filePath, status: 200 }, { headers: getCorsHeaders(request) });
+    } catch (error) {
+      console.error(error);
+      return NextResponse.json(
+        { message: (error as Error).message },
+        { status: 400, headers: getCorsHeaders(request) }
+      );
+    }
+  } catch (err) {
+    console.error(err);
     return NextResponse.json(
-      { message: (error as Error).message },
-      { status: 400, headers: getCorsHeaders(request) }
+      { message: (err as Error).message },
+      { status: 500, headers: getCorsHeaders(request) }
     );
   }
 }

app/components/provider.ts

@@ -54,6 +54,8 @@ type BrowserSettingsContextType = {
     graphInfo: {
       newRefreshInterval: number;
       setNewRefreshInterval: Dispatch<SetStateAction<number>>;
+      newMaxItemsForSearch: number;
+      setNewMaxItemsForSearch: Dispatch<SetStateAction<number>>;
     };
   };
   settings: {
@@ -109,6 +111,8 @@ type BrowserSettingsContextType = {
       showMemoryUsage: boolean;
       refreshInterval: number;
       setRefreshInterval: Dispatch<SetStateAction<number>>;
+      maxItemsForSearch: number;
+      setMaxItemsForSearch: Dispatch<SetStateAction<number>>;
     };
   };
   hasChanges: boolean;
@@ -257,6 +261,8 @@ export const BrowserSettingsContext = createContext<BrowserSettingsContextType>(
       graphInfo: {
         newRefreshInterval: 0,
         setNewRefreshInterval: () => { },
+        newMaxItemsForSearch: 0,
+        setNewMaxItemsForSearch: () => { },
       },
     },
     settings: {
@@ -306,6 +312,8 @@ export const BrowserSettingsContext = createContext<BrowserSettingsContextType>(
         showMemoryUsage: false,
         refreshInterval: 0,
         setRefreshInterval: () => { },
+        maxItemsForSearch: 0,
+        setMaxItemsForSearch: () => { },
       },
     },
     hasChanges: false,

app/graph/Chat.tsx

@@ -14,6 +14,7 @@ import { GraphContext, IndicatorContext, QueryLoadingContext, BrowserSettingsCon
 import { EventType } from "../api/chat/route";
 import ToastButton from "../components/ToastButton";
 import { ShineBorder } from "@/components/ui/shine-border";
+import { getConnectionItem, setConnectionItem, getConnectionPrefix } from "@/lib/connection-storage";
 
 // Function to get the last maxSavedMessages user messages and all messages in between
 const getLastUserMessagesWithContext = (allMessages: Message[], maxUserMessages: number) => {
@@ -108,19 +109,20 @@ export default function Chat({ onClose }: Props) {
 
     // Load messages and cypher only preference for current graph on mount
     useEffect(() => {
-        const savedMessages = localStorage.getItem(`chat-${graphName}`);
+        if (!getConnectionPrefix()) return;
+        const savedMessages = getConnectionItem(`chat-${graphName}`);
         const currentMessages = JSON.parse(savedMessages || "[]");
         setMessages(currentMessages);
 
-        const savedCypherOnly = localStorage.getItem(`cypherOnly-${graphName}`);
+        const savedCypherOnly = getConnectionItem(`cypherOnly-${graphName}`);
         setCypherOnly(savedCypherOnly === "true");
     }, [graphName, maxSavedMessages]);
 
     useEffect(() => {
         let statusGroup: Message[];
 
         if (messages.length > 0) {
-            localStorage.setItem(`chat-${graphName}`, JSON.stringify(getLastUserMessagesWithContext(messages, maxSavedMessages)));
+            setConnectionItem(`chat-${graphName}`, JSON.stringify(getLastUserMessagesWithContext(messages, maxSavedMessages)));
         }
 
         const newMessagesList = messages.map((message, i): Message | [Message[], boolean] | undefined => {
@@ -536,7 +538,7 @@ export default function Chat({ onClose }: Props) {
                                 onClick={() => {
                                     const next = !cypherOnly;
                                     setCypherOnly(next);
-                                    localStorage.setItem(`cypherOnly-${graphName}`, String(next));
+                                    setConnectionItem(`cypherOnly-${graphName}`, String(next));
                                 }}
                                 className={cn(
                                     "shrink-0 flex items-center justify-center rounded-md transition-all duration-150 active:scale-[0.96]",

app/graph/GraphView.tsx

@@ -8,6 +8,7 @@ import { cn, GraphRef, Tab, Label, Link, Node, Relationship, HistoryQuery } from
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { GraphContext, ForceGraphContext } from "@/app/components/provider";
 import ForceGraph from "@/app/components/ForceGraph";
+import { setConnectionItem } from "@/lib/connection-storage";
 import Button from "../components/ui/Button";
 import TableView from "./TableView";
 import Toolbar from "./toolbar";
@@ -283,7 +284,7 @@ function GraphView({
 
                             const newQueries = prev.queries.map(q => q.text === newQuery.text ? newQuery : q);
 
-                            localStorage.setItem("query history", JSON.stringify(newQueries));
+                            setConnectionItem("query history", JSON.stringify(newQueries));
 
                             return {
                                 ...prev,

app/graph/Selector.tsx

@@ -12,6 +12,7 @@ import { useTheme } from "next-themes";
 import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
 import Button from "../components/ui/Button";
 import { BrowserSettingsContext, GraphContext, IndicatorContext } from "../components/provider";
+import { setConnectionItem, removeConnectionItem } from "@/lib/connection-storage";
 import CypherEditor, { CYPHER_LANGUAGE_NAME } from "../components/CypherEditor";
 import EditorComponent from "../components/EditorComponent";
 import DialogComponent from "../components/DialogComponent";
@@ -319,8 +320,8 @@ export default function Selector<T extends "Graph" | "Schema" = "Graph" | "Schem
 
         const newQueries = historyQuery.queries.filter((_, idx) => !deleteElements.some((removeIndex) => idx === removeIndex));
 
-        if (newQueries.length === 0) localStorage.removeItem("query history");
-        else localStorage.setItem("query history", JSON.stringify(newQueries));
+        if (newQueries.length === 0) removeConnectionItem("query history");
+        else setConnectionItem("query history", JSON.stringify(newQueries));
 
         // Check if counter points to a deleted query (counter is 1-indexed, so counter - 1 is the index)
         const isCounterDeleted = historyQuery.counter > 0 && deleteElements.includes(historyQuery.counter - 1);
@@ -359,7 +360,7 @@ export default function Selector<T extends "Graph" | "Schema" = "Graph" | "Schem
             q.timestamp === item.timestamp ? { ...q, fav: !q.fav, name } : q
         );
 
-        localStorage.setItem("query history", JSON.stringify(newQueries));
+        setConnectionItem("query history", JSON.stringify(newQueries));
 
         setHistoryQuery(prev => ({
             ...prev,
@@ -559,7 +560,7 @@ export default function Selector<T extends "Graph" | "Schema" = "Graph" | "Schem
                                                     data-testid="queryHistoryDelete"
                                                     title="Remove all queries from history"
                                                     onClick={() => {
-                                                        localStorage.removeItem("query history");
+                                                        removeConnectionItem("query history");
                                                         setHistoryQuery(prev => ({
                                                             ...prev,
                                                             queries: [],
@@ -580,7 +581,7 @@ export default function Selector<T extends "Graph" | "Schema" = "Graph" | "Schem
                                                     title="Clear all favorites"
                                                     onClick={() => {
                                                         const newQueries = historyQuery.queries.map(q => ({ ...q, fav: false, name: undefined }));
-                                                        localStorage.setItem("query history", JSON.stringify(newQueries));
+                                                        setConnectionItem("query history", JSON.stringify(newQueries));
                                                         setHistoryQuery(prev => ({
                                                             ...prev,
                                                             queries: newQueries,