fix(comms): change LogCategory filter based upon searchField

The filter passed to WsLogaccess.GetLogs should change the "LogCategory" request parameter based upon the field that is being searched. (eg, HPCC-31896) Also, corrects TargetAudience.Programmer value to "PRO", see https://github.com/hpcc-systems/HPCC-Platform/blob/master/esp/scm/ws_logaccess.ecm#L145 Signed-off-by: Jeremy Clements <[email protected]>
hpcc-systems · Jun 12, 2024 · 0d30644 · 0d30644
1 parent 492a0c7
commit 0d30644
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/packages/comms/src/services/wsLogaccess.ts b/packages/comms/src/services/wsLogaccess.ts
@@ -36,7 +36,7 @@ export const enum LogType {
 export const enum TargetAudience {
     Operator = "OPR",
     User = "USR",
-    Programmer = "PRG",
+    Programmer = "PRO",
     Audit = "ADT"
 }
 
@@ -112,18 +112,24 @@ export class LogaccessService extends LogaccessServiceBase {
             if (key in columnMap) {
                 searchField = columnMap[key];
             }
+            let logCategory = WsLogaccess.LogAccessType.ByFieldName;
             if (searchField) {
+                switch (searchField) {
+                    case "hpcc.log.audience":
+                        logCategory = WsLogaccess.LogAccessType.ByTargetAudience;
+                        break;
+                }
                 if (Array.isArray(request[key])) {
                     request[key].forEach(value => {
                         filters.push({
-                            LogCategory: WsLogaccess.LogAccessType.ByFieldName,
+                            LogCategory: logCategory,
                             SearchField: searchField,
                             SearchByValue: value
                         });
                     });
                 } else {
                     filters.push({
-                        LogCategory: WsLogaccess.LogAccessType.ByFieldName,
+                        LogCategory: logCategory,
                         SearchField: searchField,
                         SearchByValue: request[key]
                     });
@@ -173,7 +179,7 @@ export class LogaccessService extends LogaccessServiceBase {
                     getLogsRequest.Filter.Operator = WsLogaccess.LogAccessFilterOperator.OR;
                 }
                 getLogsRequest.Filter.rightFilter = {
-                    LogCategory: filters[0]?.LogCategory,
+                    LogCategory: filters[1]?.LogCategory,
                     SearchField: filters[1]?.SearchField,
                     SearchByValue: filters[1]?.SearchByValue
                 };