Merge branch 'Tali-Dev'

# Conflicts:
#	bun.lockb
#	src/components/GraphvizParent.tsx

Author: tzacks-cl

package.json

@@ -32,7 +32,7 @@
     "@types/lodash": "^4.17.1",
     "@types/papaparse": "^5.3.14",
     "@types/timsort": "^0.3.3",
-    "caniuse-lite": "^1.0.30001688",
+    "caniuse-lite": "^1.0.30001699",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "d3": "^7.9.0",

src/components/GraphvizParent.tsx

@@ -1,5 +1,5 @@
 // React component code
-import {FC, RefObject, useContext, useEffect, useRef, useState} from 'react';
+import React, {RefObject, useContext, useEffect, useRef, useState} from 'react';
 import {graphviz} from 'd3-graphviz';
 import {
     generateDotString,
@@ -21,7 +21,12 @@ interface GraphvizParentProps {
     minVisits: number;
 }
 
-const GraphvizParent: FC<GraphvizParentProps> = ({csvData, filter, selfLoops, minVisits}) => {
+const GraphvizParent: React.FC<GraphvizParentProps> = ({
+                                                           csvData,
+                                                           filter,
+                                                           selfLoops,
+                                                           minVisits,
+                                                       }) => {
     const [dotString, setDotString] = useState<string | null>(null);
     const [filteredDotString, setFilteredDotString] = useState<string | null>(null);
     const [topDotString, setTopDotString] = useState<string | null>(null);
@@ -120,34 +125,8 @@ const GraphvizParent: FC<GraphvizParentProps> = ({csvData, filter, selfLoops, mi
             setFilteredDotString(null);
         }
     }, [csvData, filter, selfLoops, minVisits, selectedSequence]);
-
-    // Render Graphviz graphs using d3-graphviz
-    const renderGraph = (
-        dot: string | null,
-        ref: React.RefObject<HTMLDivElement>,
-        filename: string,
-        numberOfGraphs: number
-    ) => {
-        if (dot && ref.current) {
-            // Dynamically adjust width based on the number of graphs
-            const width = numberOfGraphs === 3 ? 325 : 425; // Adjust the width for 3 graphs or 2 graphs
-            const height = 530; // Fixed height (or adjust dynamically if needed)
-
-            graphviz(ref.current)
-                .width(width)
-                .height(height)
-                .renderDot(dot)
-                .on('end', () => {
-                    const svgElement = ref.current?.querySelector('svg');
-                    if (svgElement) {
-                        exportGraphAsPNG(ref, filename);
-                    }
-                });
-        }
-    };
-
-    // Export a graph as high-quality PNG
-    const exportGraphAsPNG = (graphRef: RefObject<HTMLDivElement>, filename: string) => {
+// Export a graph as high-quality PNG
+    const exportGraphAsPNG = (graphRef: React.RefObject<HTMLDivElement>, filename: string) => {
         if (!graphRef.current) return;
 
         const svgElement = graphRef.current.querySelector('svg');
@@ -197,17 +176,43 @@ const GraphvizParent: FC<GraphvizParentProps> = ({csvData, filter, selfLoops, mi
 
     const numberOfGraphs = [topDotString, dotString, filteredDotString].filter(Boolean).length;
 
+    // Render Graphviz graphs using d3-graphviz
+    const renderGraph = (
+        dot: string | null,
+        ref: React.RefObject<HTMLDivElement>,
+        filename: string,
+        numberOfGraphs: number
+    ) => {
+        if (dot && ref.current) {
+            // Dynamically adjust width based on the number of graphs
+            const width = numberOfGraphs === 3 ? 325 : 425; // Adjust the width for 3 graphs or 2 graphs
+            const height = 530; // Fixed height (or adjust dynamically if needed)
+
+            graphviz(ref.current)
+                .width(width)
+                .height(height)
+                .renderDot(dot)
+                .on('end', () => {
+                    const svgElement:RefObject<HTMLDivElement>|SVGSVGElement|null|undefined= ref.current?.querySelector('svg');
+                    if (svgElement) {
+                        exportGraphAsPNG(svgElement as unknown as RefObject<HTMLDivElement>, filename);
+                    }
+                });
+        }
+    };
+
+
     useEffect(() => {
         renderGraph(filteredDotString, graphRefFiltered, 'filtered_graph', numberOfGraphs);
-    }, [topDotString]);
+    }, [filteredDotString]);
 
     useEffect(() => {
         renderGraph(topDotString, graphRefTop, 'selected_sequence', numberOfGraphs);
-    }, [dotString]);
+    }, [topDotString]);
 
     useEffect(() => {
         renderGraph(dotString, graphRefMain, 'all_students', numberOfGraphs);
-    }, [filteredDotString]);
+    }, [dotString]);
 
 
     return (
@@ -263,4 +268,4 @@ function ExportButton({onClick, label = "Export Image"}: ExportButtonProps) {
             {label}
         </Button>
     );
-};
+}

src/components/GraphvizProcessing.ts

@@ -1,5 +1,6 @@
 import Papa from 'papaparse';
 import {SequenceCount} from "@/Context";
+// import {autoType} from "d3";
 
 interface CSVRow {
     'Session Id': string;
@@ -20,7 +21,8 @@ interface CSVRow {
 export const loadAndSortData = (csvData: string): CSVRow[] => {
     const parsedData = Papa.parse<CSVRow>(csvData, {
         header: true,
-        skipEmptyLines: true
+        skipEmptyLines: true,
+        delimiter: ',',
     }).data;
 
     const transformedData = parsedData.map(row => ({