tango-app-api-trax 3.9.65 → 3.9.67

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.9.65",
+    "version": "3.9.67",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/teaxFlag.controller.js

@@ -925,8 +925,6 @@ export const flagTablesV1 = async ( req, res ) => {
 
 // Lamda Service Call //
 async function LamdaServiceCall( url, data, timeoutMs = 8000 ) {
-  const controller = new AbortController();
-  const timer = setTimeout( () => controller.abort(), timeoutMs );
   try {
     const requestOptions = {
       method: 'POST',
@@ -934,8 +932,6 @@ async function LamdaServiceCall( url, data, timeoutMs = 8000 ) {
         'Content-Type': 'application/json',
       },
       body: JSON.stringify( data ),
-      keepalive: true,
-      signal: controller.signal,
     };
     const response = await fetch( url, requestOptions );
     if ( !response.ok ) {
@@ -946,8 +942,6 @@ async function LamdaServiceCall( url, data, timeoutMs = 8000 ) {
   } catch ( error ) {
     logger.error( { error: error, message: data, function: 'LamdaServiceCall' } );
     return false;
-  } finally {
-    clearTimeout( timer );
   }
 }
 
@@ -2306,6 +2300,8 @@ export const flagTablesV2 = async ( req, res ) => {
       mayNeedLambda ? LamdaServiceCall( LamdaURL, detectionPayload ) : Promise.resolve( null ),
     ] );
 
+    console.log( lambdaResultData );
+
     if ( !getChecklistPerformanceData?.length ) {
       return res.sendError( 'No data found', 204 );
     }
@@ -2364,7 +2360,20 @@ export const flagTablesV2 = async ( req, res ) => {
     // their real (merged) flaggedStores / flagCount / complianceRate / assignedStores
     // instead of the stale pre-merge values. Numeric columns (incl. complianceRate,
     // which is a fixed-point string) compare numerically; text columns fall back to locale.
-    const sortColumnName = requestData.sortColumnName;
+    // The UI sends some columns as display labels (e.g. 'Compliance') rather than the
+    // data field name, so map those to the real keys; raw field names pass through.
+    const SORT_FIELD_MAP = {
+      'Compliance': 'complianceRate',
+      'Checklist Name': 'checkListName',
+      'Coverage': 'coverage',
+      'Assigned Stores': 'assignedStores',
+      'Flagged Stores': 'flaggedStores',
+      'Question Flags': 'customQuestionFlagCount',
+      'Not Submitted Flags': 'customTimeFlagCount',
+      'Detection Flags': 'flagCount',
+      'Flags': 'flagCount',
+    };
+    const sortColumnName = SORT_FIELD_MAP[requestData.sortColumnName] || requestData.sortColumnName;
     if ( sortColumnName && sortColumnName != '' && requestData.sortBy && requestData.sortBy != '' ) {
       const sortDir = parseInt( requestData.sortBy, 10 ) === -1 ? -1 : 1;
       getChecklistPerformanceData.sort( ( a, b ) => {