Merge develop into master (14 Nov)

.github/workflows/docker-image-saas.yml

@@ -54,6 +54,8 @@ jobs:
           tags: |
             ghcr.io/${{ github.repository_owner }}/verifywise-frontend-saas:${{ env.TAG }}
             ghcr.io/${{ github.repository_owner }}/verifywise-frontend-saas:latest
+          build-args: |
+            VITE_APP_VERSION=${{ env.TAG }}
 
       - name: Build and push Servers image
         uses: docker/build-push-action@v4

.github/workflows/docker-image.yml

@@ -51,6 +51,7 @@ jobs:
             ghcr.io/${{ github.repository_owner }}/verifywise-frontend:latest
           build-args: |
             VITE_SLACK_CLIENT_ID=${{ secrets.SLACK_CLIENT_ID }}
+            VITE_APP_VERSION=${{ env.TAG }}
 
       - name: Build and push Servers image
         uses: docker/build-push-action@v4

Clients/Dockerfile

@@ -16,6 +16,9 @@ COPY . .
 ARG VITE_SLACK_CLIENT_ID
 ENV VITE_SLACK_CLIENT_ID=$VITE_SLACK_CLIENT_ID
 
+ARG VITE_APP_VERSION
+ENV VITE_APP_VERSION=$VITE_APP_VERSION
+
 # Step 6: Build the application
 RUN npm run build
 

Clients/package.json

@@ -1,7 +1,7 @@
 {
   "name": "verifywise",
   "private": true,
-  "version": "1.0.0",
+  "version": "v1.6.1",
   "type": "module",
   "scripts": {
     "dev": "vite --host",

Clients/src/App.tsx

@@ -25,6 +25,7 @@ import { DeploymentManager } from "./application/utils/deploymentHelpers";
 import CommandPalette from "./presentation/components/CommandPalette";
 import CommandPaletteErrorBoundary from "./presentation/components/CommandPalette/ErrorBoundary";
 import useCommandPalette from "./application/hooks/useCommandPalette";
+import useUserPreferences from "./application/hooks/useUserPreferences";
 
 // Component to conditionally apply theme based on route
 const ConditionalThemeWrapper = ({ children }: { children: React.ReactNode }) => {
@@ -54,6 +55,7 @@ function App() {
   const { token, userRoleName, organizationId, userId } = useAuth();
   const [alert, setAlert] = useState<AlertProps | null>(null);
   const { users, refreshUsers } = useUsers();
+  const {userPreferences} = useUserPreferences();
   const commandPalette = useCommandPalette();
 
   useEffect(() => {
@@ -68,6 +70,12 @@ function App() {
     return () => setShowAlertCallback(() => {});
   }, []);
 
+  useEffect(() => {
+    if (userPreferences) {
+      localStorage.setItem("verifywise_preferences", JSON.stringify(userPreferences));
+    }
+  }, [userPreferences]);
+
   const [uiValues, setUiValues] = useState<UIValues>({});
   const [authValues, setAuthValues] = useState<AuthValues>({});
   const [dashboardValues, setDashboardValues] = useState<DashboardState>({

Clients/src/application/hooks/useDashboardMetrics.ts

@@ -131,6 +131,19 @@ export interface PolicyMetrics {
   statusDistribution?: Array<{ name: string; value: number; color: string }>;
 }
 
+export interface IncidentMetrics {
+  total: number;
+  recent: Array<{
+    id: number;
+    incident_id: string;
+    description: string;
+    severity: string;
+    status: string;
+    created_at: string;
+  }>;
+  statusDistribution?: Array<{ name: string; value: number; color: string }>;
+}
+
 export interface AITrustCenterStatus {
   enabled: boolean;
   last_updated: string;
@@ -163,6 +176,9 @@ export const useDashboardMetrics = () => {
   const [policyMetrics, setPolicyMetrics] = useState<PolicyMetrics | null>(
     null
   );
+  const [incidentMetrics, setIncidentMetrics] = useState<IncidentMetrics | null>(
+    null
+  );
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
 
@@ -399,6 +415,33 @@ export const useDashboardMetrics = () => {
     }
   }, []);
 
+  // Fetch incident metrics
+  const fetchIncidentMetrics = useCallback(async () => {
+    try {
+      const response = await getAllEntities({ routeUrl: "/ai-incident-managements" });
+
+      // Handle the API response structure
+      const incidentsData = response.data || response.incidents || response;
+      const incidentsArray = Array.isArray(incidentsData) ? incidentsData : [];
+
+      const incidentMetrics = {
+        total: incidentsArray.length,
+        recent: incidentsArray.slice(0, 5).map((incident: any, index: number) => ({
+          id: incident.id || index + 1,
+          incident_id: incident.incident_id || `INC-${index + 1}`,
+          description: incident.description || incident.title || "Incident",
+          severity: incident.severity || "Unknown",
+          status: incident.status || "Unknown",
+          created_at: incident.created_at || incident.createdAt || new Date().toISOString(),
+        })),
+      };
+
+      setIncidentMetrics(incidentMetrics);
+    } catch (err) {
+      setIncidentMetrics(null);
+    }
+  }, []);
+
   // Fetch all dashboard metrics safely
   const fetchAllMetrics = useCallback(async () => {
     setLoading(true);
@@ -419,6 +462,7 @@ export const useDashboardMetrics = () => {
         fetchVendorMetrics(),
         fetchUsersMetrics(),
         fetchPolicyMetrics(),
+        fetchIncidentMetrics(),
       ]);
 
       // Log which ones failed
@@ -436,6 +480,7 @@ export const useDashboardMetrics = () => {
           "vendorMetrics",
           "usersMetrics",
           "policyMetrics",
+          "incidentMetrics",
         ];
 
         if (result.status === "rejected") {
@@ -461,6 +506,7 @@ export const useDashboardMetrics = () => {
     fetchVendorMetrics,
     fetchUsersMetrics,
     fetchPolicyMetrics,
+    fetchIncidentMetrics,
   ]);
 
   // Initialize data on mount
@@ -482,6 +528,7 @@ export const useDashboardMetrics = () => {
     vendorMetrics,
     usersMetrics,
     policyMetrics,
+    incidentMetrics,
 
     // State
     loading,
@@ -501,5 +548,6 @@ export const useDashboardMetrics = () => {
     fetchVendorMetrics,
     fetchUsersMetrics,
     fetchPolicyMetrics,
+    fetchIncidentMetrics,
   };
 };

Clients/src/application/hooks/useUserFilesMetaData.ts

@@ -2,20 +2,20 @@
  * Custom hook to fetch and manage user files metadata
  *
  * @returns {{
- *   filesData: FileData[],
+ *   filesData: FileModel[],
  *   loading: boolean,
  *   error: Error | null,
  *   refetch: () => void
  * }} - An object containing the files data, loading state, error, and refetch function
  */
 
 import { useState, useEffect, useCallback } from "react";
-import { FileData } from "../../domain/types/File";
+import { FileModel } from "../../domain/models/Common/file/file.model";
 import { getUserFilesMetaData } from "../repository/file.repository";
 import { transformFilesData } from "../utils/fileTransform.utils";
 
 export const useUserFilesMetaData = () => {
-  const [filesData, setFilesData] = useState<FileData[]>([]);
+  const [filesData, setFilesData] = useState<FileModel[]>([]);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<Error | null>(null);
   const [refetchTrigger, setRefetchTrigger] = useState(0);

Clients/src/application/hooks/useUserPreferences.tsx

@@ -0,0 +1,51 @@
+import { useState, useEffect } from "react";
+import { UserPreferencesModel } from "../../domain/models/Common/userPreferences/userPreferences.model";
+import { getUserPreferencesByUserId } from "../repository/userPreferences.repository";
+import { useAuth } from "./useAuth";
+import { UserDateFormat } from "../../domain/enums/userDateFormat.enum";
+
+const defaultUserPreferences: Omit<UserPreferencesModel, "id" | "user_id"> = {
+  date_format: UserDateFormat.DD_MM_YYYY_DASH,
+};
+
+const useUserPreferences = () => {
+  const { userId } = useAuth();
+  const [userPreferences, setUserPreferences] = useState<
+    Omit<UserPreferencesModel, "id" | "user_id">
+  >(defaultUserPreferences);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
+  const [isDefault, setIsDefault] = useState<boolean>(false);
+
+  const fetchUserPreferences = async () => {
+    try {
+      setLoading(true);
+      const response = await getUserPreferencesByUserId(userId!);
+
+      setUserPreferences(response.data);
+      setError(null);
+      setIsDefault(false);
+    } catch (err) {
+      setIsDefault(true);
+      setError(
+        err instanceof Error ? err.message : "Failed to fetch user preferences",
+      );
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  useEffect(() => {
+    fetchUserPreferences();
+  }, []);
+
+  return {
+    userPreferences,
+    isDefault,
+    loading,
+    error,
+    refreshUserPreferences: fetchUserPreferences,
+  };
+};
+
+export default useUserPreferences;

Clients/src/application/repository/file.repository.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { apiServices } from "../../infrastructure/api/networkServices";
 
 // Type definitions for API responses
@@ -40,6 +41,7 @@ export interface FileUploadResponse {
     mimetype: string;
     upload_date: string;
     uploaded_by: number;
+    modelId?: string; // optional
   };
 }
 
@@ -71,30 +73,31 @@ export async function getUserFilesMetaData({
 }: {
   signal?: AbortSignal;
 } = {}): Promise<FileMetadata[]> {
-  const response = await apiServices.get<FileManagerResponse>("/file-manager", {
-    signal,
-  });
+    const [fileManageResponse, fileResponse] = await Promise.all([
+      apiServices.get<FileManagerResponse>("/file-manager", { signal }),
+      apiServices.get<any[]>("/files", { signal })
+    ]);
 
     // Extract and return all file data from API
     // Keep all fields intact so transformFileData can process them
-    const rawFiles = response.data?.data?.files ?? [];
+    const rawFiles = [...(fileManageResponse.data?.data?.files ?? []), ...(fileResponse.data ?? [])];
 
     return rawFiles.map((f: any) => ({
         id: String(f.id),
         filename: f.filename,
-        size: f.size,
-        mimetype: f.mimetype,
-        upload_date: f.upload_date,
-        uploaded_by: String(f.uploaded_by),
-        uploader_name: f.uploader_name,         // Include uploader name
-        uploader_surname: f.uploader_surname,   // Include uploader surname
-        source: f.source,
-        project_title: f.project_title,
-        project_id: f.project_id,
-        parent_id: f.parent_id,
-        sub_id: f.sub_id,
-        meta_id: f.meta_id,
-        is_evidence: f.is_evidence,
+        size: f?.size,
+        mimetype: f?.mimetype,
+        upload_date: f?.upload_date || f?.uploaded_time,
+        uploaded_by: String(f?.uploaded_by),
+        uploader_name: f?.uploader_name,         // Include uploader name
+        uploader_surname: f?.uploader_surname,   // Include uploader surname
+        source: f?.source,
+        project_title: f?.project_title,
+        project_id: f?.project_id,
+        parent_id: f?.parent_id,
+        sub_id: f?.sub_id,
+        meta_id: f?.meta_id,
+        is_evidence: f?.is_evidence,
     })) as FileMetadata[];
 }
 
@@ -109,14 +112,20 @@ export async function getUserFilesMetaData({
  */
 export async function uploadFileToManager({
   file,
+  model_id, // add this
   signal,
 }: {
   file: File;
+  model_id?: string | number | undefined | null; // allow all safe cases
   signal?: AbortSignal;
 }): Promise<FileUploadResponse> {
   const formData = new FormData();
   formData.append("file", file);
 
+   // Append model_id only if it's defined and valid
+  formData.append("model_id", model_id ? String(model_id) : ""); // ✅ always present
+
+
   // Delete Content-Type header to let axios auto-detect and set the proper boundary
   const response = await apiServices.post<FileUploadResponse>("/file-manager", formData, {
     signal,
@@ -139,11 +148,13 @@ export async function uploadFileToManager({
 export async function downloadFileFromManager({
   id,
   signal,
+  source,
 }: {
   id: string;
   signal?: AbortSignal;
+  source?: string;
 }): Promise<Blob> {
-  const response = await apiServices.get<Blob>(`/file-manager/${id}`, {
+  const response = await apiServices.get<Blob>(`/file-manager/${id}?isFileManagerFile=${source === "File Manager"}`, {
     signal,
     responseType: "blob",
   });
@@ -161,11 +172,13 @@ export async function downloadFileFromManager({
 export async function deleteFileFromManager({
   id,
   signal,
+  source,
 }: {
   id: string;
   signal?: AbortSignal;
+  source?: string;
 }): Promise<any> {
-  const response = await apiServices.delete<any>(`/file-manager/${id}`, {
+  const response = await apiServices.delete<any>(`/file-manager/${id}?isFileManagerFile=${source === "File Manager"}`, {
     signal,
   });
   return response.data;