feat: 2262 fix for export data (#2279)

Author: xiaopeng0202

frontend/src/views/CONSEP/TestingActivities/TestSearch/constants.tsx

@@ -82,7 +82,10 @@ export const testRanks: string[] = [
   'A', 'B', 'C', 'P'
 ];
 
-const getResultValue = (row: TestingSearchResponseType) => {
+const getResultValue = (
+  row: TestingSearchResponseType,
+  defaultValue: string | number | null = null
+) => {
   if (row.activityId && row.activityId.startsWith('M')) {
     return row.moisturePct;
   }
@@ -94,7 +97,7 @@ const getResultValue = (row: TestingSearchResponseType) => {
     case 'PUR':
       return row.purityPct;
     default:
-      return null;
+      return defaultValue;
   }
 };
 
@@ -317,7 +320,7 @@ export const formatExportData = {
   },
   Result: {
     header: 'Result',
-    value: (row: TestingSearchResponseType) => getResultValue(row)
+    value: (row: TestingSearchResponseType) => getResultValue(row, '')
   },
   pv: {
     header: 'PV',

frontend/src/views/CONSEP/TestingActivities/TestSearch/definitions.ts

@@ -46,3 +46,13 @@ export type Sorting = {
   id: string;
   desc: boolean;
 };
+
+export interface ExportMutationVariables {
+  filter: ActivitySearchRequest;
+  sortBy?: string;
+  sortDirection?: 'asc' | 'desc';
+}
+
+export interface VisibilityConfig {
+  [key: string]: boolean;
+}

frontend/src/views/CONSEP/TestingActivities/TestSearch/index.tsx

@@ -41,7 +41,13 @@ import {
   formatExportData, columnVisibilityLocalStorageKey
 } from './constants';
 import { THREE_HALF_HOURS, THREE_HOURS } from '../../../../config/TimeUnits';
-import { ActivitySearchRequest, ActivitySearchValidation, Sorting } from './definitions';
+import {
+  ActivitySearchRequest,
+  ActivitySearchValidation,
+  Sorting,
+  ExportMutationVariables,
+  VisibilityConfig
+} from './definitions';
 import './styles.scss';
 
 const csvConfig = mkConfig({
@@ -114,64 +120,69 @@ const TestSearch = () => {
         pageSize: data.pageSize
       });
     },
-    onError: (error) => {
+    onError: (error: unknown) => {
+      let errorMessage = 'Search failed.';
+      if (error instanceof Error && error.message) {
+        errorMessage = `Search failed with the error: ${error.message}`;
+      } else if (typeof error === 'string') {
+        errorMessage = `Search failed with the error: ${error}`;
+      }
       setAlert({
         status: 'error',
-        message: `Search failed with the error: ${error.message}`
+        message: errorMessage
       });
     }
   });
 
   const exportMutation = useMutation({
-    mutationFn: (filter:
-      ActivitySearchRequest) => searchTestingActivities(filter, undefined, undefined, true, 0, 0),
+    mutationFn: ({
+      filter,
+      sortBy,
+      sortDirection
+    }: ExportMutationVariables) => searchTestingActivities(
+      filter,
+      sortBy,
+      sortDirection,
+      true,
+      0,
+      0
+    ),
 
-    onSuccess: (data) => {
-      const visibilityConfig = JSON.parse(
+    onSuccess: (data: PaginatedTestingSearchResponseType) => {
+      const visibilityConfig: VisibilityConfig = JSON.parse(
         localStorage.getItem(columnVisibilityLocalStorageKey) || '{}'
       );
 
       const isVisible = (key: string) => visibilityConfig[key] !== false;
 
-          type FilteredRow = Record<
-            keyof TestingSearchResponseType,
-            TestingSearchResponseType[keyof TestingSearchResponseType] | undefined
-          >;
-
-          const filterItem = (item: TestingSearchResponseType): FilteredRow => Object
-            .keys(item).reduce((acc, key) => {
-              if (!isVisible(key)) return acc;
-              if (!Object.hasOwnProperty.call(formatExportData, key)) return acc;
-
-              const k = key as keyof TestingSearchResponseType;
-              acc[k] = item[k];
-              return acc;
-            }, {} as FilteredRow);
-
-          const formatItem = (item: FilteredRow) => Object.entries(item).reduce((acc, [key]) => {
-            const config = formatExportData[key as keyof typeof formatExportData];
-
-            if (config) {
-              acc[config.header] = config.value(item as TestingSearchResponseType);
-            }
-
-            if (key === 'Result') {
-              acc.Result = formatExportData.Result.value(item as TestingSearchResponseType);
-            }
-
-            return acc;
-          }, {} as Record<string, any>);
-
-          const filteredContent: FilteredRow[] = data.content.map(filterItem);
-          const formattedContent = filteredContent.map(formatItem);
+      const formattedContent = data.content.map(
+        (row: TestingSearchResponseType) => {
+          const out: Record<string, string | number | null> = {};
+          (
+            Object.entries(formatExportData) as Array<
+              [
+                keyof typeof formatExportData,
+                (typeof formatExportData)[keyof typeof formatExportData]
+              ]
+            >
+          ).forEach(([key, cfg]) => {
+            if (!isVisible(String(key))) return;
+            out[cfg.header] = cfg.value(row);
+          });
+          return out;
+        }
+      );
 
-          const csv = generateCsv(csvConfig)(formattedContent);
-          download(csvConfig)(csv);
+      const csv = generateCsv(csvConfig)(formattedContent);
+      download(csvConfig)(csv);
     },
-    onError: (error) => {
+    onError: (error: unknown) => {
+      const message = error instanceof Error && error.message
+        ? error.message
+        : 'Unknown error';
       setAlert({
         status: 'error',
-        message: `Failed to export data: ${error?.message || 'Unknown error'}`
+        message: `Failed to export data: ${message}`
       });
     }
   });
@@ -190,7 +201,12 @@ const TestSearch = () => {
   };
 
   const handleExportData = () => {
-    exportMutation.mutate(searchParams);
+    const sort = sorting[0];
+    exportMutation.mutate({
+      filter: searchParams,
+      sortBy: sort?.id,
+      sortDirection: sort?.desc ? 'desc' : 'asc'
+    });
   };
 
   const testTypeQuery = useQuery({
@@ -221,7 +237,7 @@ const TestSearch = () => {
         sortDirection: sort?.desc ? 'desc' : 'asc'
       },
       {
-        onSuccess: (data) => {
+        onSuccess: (data: PaginatedTestingSearchResponseType) => {
           setSearchResults(data.content);
           setPaginationInfo({
             totalElements: data.totalElements,