Merge remote-tracking branch 'origin/Tali-Dev' into Tali-Dev

Author: talizacks

.github/workflows/deployVercel.yml

@@ -16,10 +16,10 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '20'
+          node-version: "20"
 
       - name: Install dependencies
-        run: npm install
+        run: npm install --legacy-peer-deps
 
       - name: Build the project
         run: npm run build
@@ -29,4 +29,4 @@ jobs:
           VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}
         run: |
           npm install -g vercel
-          vercel --prod --confirm --token $VERCEL_TOKEN
+          vercel --prod --confirm --token $VERCEL_TOKEN

bun.lockb

@@ -27,6 +27,7 @@
     "@radix-ui/react-toggle-group": "^1.0.4",
     "@tanstack/react-query": "^5.62.2",
     "@tanstack/react-query-devtools": "^5.62.2",
+    "@types/d3-graphviz": "^2.6.10",
     "@types/express": "^4.17.21",
     "@types/lodash": "^4.17.1",
     "@types/papaparse": "^5.3.14",

package.json

@@ -25,12 +25,10 @@ function App() {
     const [selfLoops, setSelfLoops] = useState<boolean>(true);
     // State to manage the minimum number of visits for displaying edges in the graph
     const [minVisits, setMinVisits] = useState<number>(0);
-    const { resetData, loading, error, setError, top5Sequences, setSelectedSequence, selectedSequence, csvData, setCSVData } = useContext(Context);
+    const { resetData, loading, error, top5Sequences, setSelectedSequence, selectedSequence, csvData, setCSVData } = useContext(Context);
     const showControls = useMemo(() => {
-        if (loading == false && csvData.length > 0) {
-            return true;
-        }
-        return false;
+        return !loading && csvData.length > 0;
+
     }, [loading, csvData]);
 
 
@@ -44,10 +42,10 @@ function App() {
         }
 
     };
-
-    const handleError = (errorMessage: string) => {
-        setError(errorMessage);
-    }
+    // TODO: Implement error handling
+    // const handleError = (errorMessage: string) => {
+    //     setError(errorMessage);
+    // }
 
     /**
      * Toggles the self-loops inclusion in the graph by switching the state.

src/App.tsx

@@ -4,9 +4,9 @@ import {ParseResult} from '@/lib/types';
 import {parseData} from '@/lib/utils';
 import {Label} from "@/components/ui/label"
 import {RadioGroup, RadioGroupItem} from "@/components/ui/radio-group"
-
+type TODO = any;
 interface DropZoneProps {
-    afterDrop: (data:string) => void,
+    afterDrop: (data:TODO) => void,
     onLoadingChange: (loading: boolean) => void,
     onError: (error: string) => void,
 }

src/components/DropZone.tsx

@@ -4,7 +4,6 @@ import {
     SelectContent,
     SelectGroup,
     SelectItem,
-    SelectLabel,
     SelectTrigger,
     SelectValue,
 } from "@/components/ui/select"
@@ -20,7 +19,7 @@ const FilterComponent: React.FC<FilterComponentProps> = ({ onFilterChange }) =>
             </SelectTrigger>
             <SelectContent>
                 <SelectGroup>
-                    <SelectItem value="ALL STATUSES">All Statuses</SelectItem>
+                    <SelectItem value="ALL">All Statuses</SelectItem>
                     <SelectItem value="GRADUATED">Graduated</SelectItem>
                     <SelectItem value="PROMOTED">Promoted</SelectItem>
                 </SelectGroup>

src/components/FilterComponent.tsx

@@ -10,7 +10,7 @@ interface UploadProps {
 // Functional component for file upload
 function Upload({ onDataProcessed }: UploadProps) {
     // Access loading state and setter from Context
-    const { loading, setLoading } = useContext(Context);
+    const { setLoading } = useContext(Context);
 
     // Handle file upload event
     const handleFileUpload = (event: React.ChangeEvent<HTMLInputElement>) => {

src/components/Upload.tsx

@@ -1,16 +1,13 @@
-import React, {ChangeEventHandler} from 'react';
+import React, { ChangeEventHandler } from 'react';
 import './../../Switch.css';
 
-
 interface SwitchProps {
   isOn: boolean;
   handleToggle: () => void;
-  filter: string|null;
+  filter: string | null;
 
   isDisabled?: boolean;
-
   onChange?: ChangeEventHandler | undefined;
-
 }
 const Switch: React.FC<SwitchProps> = ({ isOn, handleToggle }) => {
   return (

src/components/ui/switch.tsx

@@ -1,6 +1,6 @@
-import Papa from 'papaparse';
-
-interface CSVRow {
+// import Papa from 'papaparse';
+//
+export interface CSVRow {
     'Session Id': string;
     'Time': string;
     'Step Name': string;

src/first3Last3.ts

@@ -1,14 +1,11 @@
-import {GlobalDataType} from "./types";
+import { GlobalDataType } from "./types";
 
 
-export function filterPromGrad(data: GlobalDataType[], promOrGrad: "GRADUATED" | "PROMOTED" | null| string): GlobalDataType[] {
-    // If no data has been imported into DropZone, do nothing
-    // if (data == null) {
-    // }
-    if (promOrGrad !== null) {
-        return data.filter(item => item["CF (Workspace Progress Status)"] === promOrGrad);
-    } else {
-        // Return the original data if promOrGrad is null
+export function filterPromGrad(data: GlobalDataType[], promOrGrad: "GRADUATED" | "PROMOTED" | "ALL" | null): GlobalDataType[] {
+    // Return all data if promOrGrad is null or "ALL"
+    if (promOrGrad === "ALL" || promOrGrad === null) {
         return data;
     }
+    // Only filter for GRADUATED or PROMOTED
+    return data.filter(item => item["CF (Workspace Progress Status)"] === promOrGrad);
 }