Merge pull request #2061 from bluewave-labs/develop

Merging Develop into Master: Sept 7th 2025

Author: HarshP4585

.claude/settings.local.json

@@ -0,0 +1,42 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(npm run build:*)",
+      "Bash(mkdir:*)",
+      "Bash(npm run lint)",
+      "Bash(npm run lint:*)",
+      "Bash(npx tsc:*)",
+      "Bash(npx eslint:*)",
+      "Bash(git checkout:*)",
+      "Bash(git add:*)",
+      "Bash(git commit:*)",
+      "Bash(git push:*)",
+      "Bash(gh pr create:*)",
+      "Bash(grep:*)",
+      "Bash(git pull:*)",
+      "Bash(node:*)",
+      "Bash(npm start)",
+      "Bash(npx swagger-jsdoc:*)",
+      "Bash(gh pr list:*)",
+      "Bash(find:*)",
+      "Bash(cat:*)",
+      "Bash(git fetch:*)",
+      "Bash(git merge:*)",
+      "Bash(git stash:*)",
+      "Bash(gh pr view:*)",
+      "Read(/A:\\VerifyWiseRepository\\verifywise\\Clients\\src\\presentation\\components\\AddNewRiskForm\\MitigationSection/**)",
+      "Read(/A:\\VerifyWiseRepository\\verifywise\\Clients\\src\\presentation\\components\\AddNewRiskForm/**)",
+      "Read(/A:\\VerifyWiseRepository\\verifywise\\Clients\\src\\presentation\\components\\AddNewRiskForm\\MitigationSection/**)",
+      "Read(/A:\\VerifyWiseRepository\\verifywise\\Clients\\src\\presentation\\components\\AddNewRiskForm\\MitigationSection/**)",
+      "Read(/A:\\VerifyWiseRepository\\verifywise\\Clients\\src\\presentation\\components\\AddNewRiskForm\\MitigationSection/**)",
+      "Read(/A:\\VerifyWiseRepository\\verifywise\\Clients\\src\\presentation\\components\\AddNewRiskForm\\MitigationSection/**)",
+      "Read(/A:\\VerifyWiseRepository\\verifywise\\Clients\\src\\presentation\\components\\AddNewRiskForm\\MitigationSection/**)",
+      "mcp__ide__getDiagnostics",
+      "Read(/A:\\VerifyWiseRepository\\verifywise\\Clients\\src\\presentation\\components\\AddNewRiskForm\\MitigationSection/**)",
+      "Read(/A:\\VerifyWiseRepository\\verifywise\\Clients\\src\\presentation\\components\\AddNewRiskForm\\MitigationSection/**)",
+      "WebFetch(domain:github.com)"
+    ],
+    "deny": [],
+    "ask": []
+  }
+}

Clients/Dockerfile

@@ -22,11 +22,14 @@ FROM nginx:1.25-alpine
 # Step 8: Copy the build output to NGINX's default public directory
 COPY --from=build /app/dist /usr/share/nginx/html
 
-# Step 9: Copy the custom NGINX configuration
+# Step 9: Copy the custom error page
+# COPY upgrade.html /usr/share/nginx/html/upgrade.html
+
+# Step 10: Copy the custom NGINX configuration
 COPY nginx.conf /etc/nginx/conf.d/default.conf
 
-# Step 10: Expose port 80
+# Step 11: Expose port 80
 EXPOSE 80
 
-# Step 11: Start NGINX server
+# Step 12: Start NGINX server
 CMD ["nginx", "-g", "daemon off;"]

Clients/nginx.conf

@@ -9,6 +9,7 @@ server {
     }
 
     error_page 404 /index.html;
+    # error_page 502 503 504 /upgrade.html;
 
     location ~* \.(?:ico|css|js|gif|jpe?g|png|woff2?|eot|ttf|svg|map)$ {
         expires max;

Clients/src/application/config/routes.tsx

@@ -29,6 +29,7 @@ import Training from "../../presentation/pages/TrainingRegistar";
 import PolicyDashboard from "../../presentation/pages/PolicyDashboard/PoliciesDashboard";
 import WatchTower from "../../presentation/pages/WatchTower";
 import ModelInventory from "../../presentation/pages/ModelInventory";
+import Framework from "../../presentation/pages/Framework";
 
 export const createRoutes = (
   triggerSidebar: boolean,
@@ -52,6 +53,8 @@ export const createRoutes = (
     <Route path="/file-manager" element={<FileManager />} />
     <Route path="/reporting" element={<Reporting />} />
     <Route path="/" element={<VWHome />} />
+    <Route path="/overview" element={<VWHome />} />
+    <Route path="/framework" element={<Framework />} />
     <Route path="/project-view" element={<VWProjectView />} />
     <Route path="/fairness-dashboard" element={<FairnessDashboard />} />
     <Route path="/fairness-results/:id" element={<FairnessResultsPage />} />

Clients/src/application/constants/permissions.ts

@@ -22,7 +22,7 @@ const allowedRoles = {
     view: ["Admin", "Editor", "Auditor"],
     edit: ["Admin", "Editor"],
     manage: ["Admin", "Editor"],
-    audit: ["Auditor"],
+    audit: ["Admin", "Editor", "Auditor"],
   },
   organizations: {
     view: ["Admin", "Editor", "Auditor"],

Clients/src/application/hooks/useFrameworks.ts

@@ -29,7 +29,7 @@ const useFrameworks = ({
   } = useQuery({
     queryKey: ['frameworks', 'all'],
     queryFn: async () => {
-      const response = await getAllFrameworks({ routeUrl: "/frameworks" });
+      const response = await getAllFrameworks();
       if (response?.data) {
         return response.data;
       } else {

Clients/src/application/hooks/useIsMultiTenant.ts

@@ -7,7 +7,12 @@ export const useIsMultiTenant = () => {
   useEffect(() => {
     const fetchOrganizationCount = async () => {
       const response = await CustomAxios.get("/organizations/exists")
-      if (!response.data.data.exists || window.location.host === "app.verifywise.ai") {
+      if (
+        !response.data.data.exists || (
+          window.location.host === "app.verifywise.ai" ||
+          window.location.hostname === "test.verifywise.ai"
+        )
+      ) {
         setIsMultiTenant(true);
       }
     }

Clients/src/application/hooks/useProjects.ts

@@ -1,29 +1,25 @@
-import { Project } from '../../domain/types/Project';
-import { useCallback, useEffect, useState } from 'react';
+import { useQuery } from '@tanstack/react-query';
 import { getAllProjects } from '../repository/project.repository';
+import { Project } from '../../domain/types/Project';
 
-export const useProjects = () => {
-  const [projects, setProjects] = useState<Project[]>([]);
-  const [loading, setLoading] = useState(true);
+// Query keys for projects
+export const projectQueryKeys = {
+  all: ['projects'] as const,
+  lists: () => [...projectQueryKeys.all, 'list'] as const,
+  list: () => [...projectQueryKeys.lists()] as const,
+  details: () => [...projectQueryKeys.all, 'detail'] as const,
+  detail: (id: string) => [...projectQueryKeys.details(), id] as const,
+};
 
-  const fetchProjects = useCallback(async () => {
-    try {
+// Hook to fetch all projects
+export const useProjects = () => {
+  return useQuery({
+    queryKey: projectQueryKeys.list(),
+    queryFn: async (): Promise<Project[]> => {
       const response = await getAllProjects();
-      setProjects(response.data);
-    } catch (error) {
-      // Handle error
-      console.error("Error fetching projects:", error);
-    } finally {
-      setLoading(false);
-    }
-  }, []);
-
-  // Fetch projects when the component mounts
-  useEffect(() => {
-    fetchProjects();
-  }, [fetchProjects]);
-
-
-
-  return { projects, loading, fetchProjects };
+      return response?.data || [];
+    },
+    staleTime: 5 * 60 * 1000, // 5 minutes
+    gcTime: 10 * 60 * 1000,   // 10 minutes
+  });
 };

Clients/src/application/hooks/useVendorRiskMutations.ts

@@ -0,0 +1,71 @@
+import { useMutation, useQueryClient, useQuery } from '@tanstack/react-query';
+import {
+  createVendorRisk,
+  updateVendorRisk,
+  deleteVendorRisk,
+  getVendorRiskById
+} from '../repository/vendorRisk.repository';
+import { vendorRiskQueryKeys } from './useVendorRisks';
+
+// Hook to create a new vendor risk
+export const useCreateVendorRisk = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: async (riskData: any) => {
+      const response = await createVendorRisk({ body: riskData });
+      return response;
+    },
+    onSuccess: () => {
+      // Invalidate and refetch vendor risks
+      queryClient.invalidateQueries({ queryKey: vendorRiskQueryKeys.lists() });
+    },
+  });
+};
+
+// Hook to update a vendor risk
+export const useUpdateVendorRisk = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: async ({ id, data }: { id: number; data: any }) => {
+      const response = await updateVendorRisk({ id, body: data });
+      return response;
+    },
+    onSuccess: () => {
+      // Invalidate and refetch vendor risks
+      queryClient.invalidateQueries({ queryKey: vendorRiskQueryKeys.lists() });
+    },
+  });
+};
+
+// Hook to delete a vendor risk
+export const useDeleteVendorRisk = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: async (id: number) => {
+      const response = await deleteVendorRisk({ id });
+      return response;
+    },
+    onSuccess: () => {
+      // Invalidate and refetch vendor risks
+      queryClient.invalidateQueries({ queryKey: vendorRiskQueryKeys.lists() });
+    },
+  });
+};
+
+// Hook to fetch a single vendor risk by ID
+export const useVendorRisk = (id: number) => {
+  return useQuery({
+    queryKey: [...vendorRiskQueryKeys.all, 'detail', id],
+    queryFn: async () => {
+      const response = await getVendorRiskById({ id });
+      return response?.data;
+    },
+    enabled: !!id,
+    staleTime: 5 * 60 * 1000,
+    gcTime: 10 * 60 * 1000,
+  });
+};
+

Clients/src/application/hooks/useVendorRisks.tsx

@@ -1,5 +1,5 @@
 /**
- * Custom hook to fetch and manage vendor risks data.
+ * Custom hook to fetch and manage vendor risks data using TanStack Query.
  *
  * @param {Object} params - The parameters object.
  * @param {string} [params.projectId] - The optional project ID to filter vendor risks.
@@ -11,37 +11,35 @@
  *   - `vendorRisksSummary` {Object} - The summary of vendor risks categorized by risk levels.
  *   - `refetchVendorRisks` {Function} - Function to manually refetch vendor risks data.
  */
-import { useEffect, useState, useCallback, useMemo } from "react";
+import { useQuery } from "@tanstack/react-query";
+import { useMemo } from "react";
 import { convertToCamelCaseRiskKey } from "../tools/stringUtil";
 import { VendorRisk } from "../../domain/types/VendorRisk";
 import { getAllVendorRisks } from "../repository/vendorRisk.repository";
 
-const useVendorRisks = ({ projectId, vendorId }: { projectId?: string | null; vendorId?: string | null }) => {
-  const [vendorRisks, setVendorRisks] = useState<VendorRisk[]>([]);
-  const [loadingVendorRisks, setLoadingVendorRisks] = useState<boolean>(true);
-  const [error, setError] = useState<string | boolean>(false);
+// Query keys for vendor risks
+export const vendorRiskQueryKeys = {
+  all: ['vendorRisks'] as const,
+  lists: () => [...vendorRiskQueryKeys.all, 'list'] as const,
+  list: (filters: { projectId?: string | null; vendorId?: string | null }) =>
+    [...vendorRiskQueryKeys.lists(), filters] as const,
+};
 
-  const fetchVendorRisks = useCallback(async () => {
-    setLoadingVendorRisks(true);
-    try {
+const useVendorRisks = ({ projectId, vendorId }: { projectId?: string | null; vendorId?: string | null }) => {
+  const {
+    data: vendorRisks = [],
+    isLoading: loadingVendorRisks,
+    error,
+    refetch: refetchVendorRisks,
+  } = useQuery({
+    queryKey: vendorRiskQueryKeys.list({ projectId, vendorId }),
+    queryFn: async (): Promise<VendorRisk[]> => {
       const response = await getAllVendorRisks();
-      if (response?.data) {
-        setVendorRisks(response?.data);
-      }
-    } catch (err) {
-      if (err instanceof Error) {
-        setError(`Request failed: ${err.message}`);
-      } else {
-        setError(`Request failed`);
-      }
-    } finally {
-      setLoadingVendorRisks(false);
-    }
-  }, []);
-
-  useEffect(() => {
-    fetchVendorRisks();
-  }, [fetchVendorRisks]);
+      return response?.data || [];
+    },
+    staleTime: 5 * 60 * 1000, // 5 minutes
+    gcTime: 10 * 60 * 1000,   // 10 minutes
+  });
 
   // Filter risks based on projectId and vendorId
   const filteredVendorRisks = useMemo(() => {
@@ -72,10 +70,10 @@ const useVendorRisks = ({ projectId, vendorId }: { projectId?: string | null; ve
 
   return {
     loadingVendorRisks,
-    error,
+    error: error ? `Request failed: ${error.message}` : false,
     vendorRisks: filteredVendorRisks,
     vendorRisksSummary,
-    refetchVendorRisks: fetchVendorRisks,
+    refetchVendorRisks,
   };
 };