From 33b725526a0a16c6006d1ceaa89039d263024bc1 Mon Sep 17 00:00:00 2001 From: Stephen Smith Date: Tue, 1 Aug 2023 21:20:49 -0400 Subject: [PATCH] 20219: Perform log file root path filtering in listLogFiles Arvados-DCO-1.1-Signed-off-by: Stephen Smith --- src/services/log-service/log-service.ts | 5 ++++- src/store/process-logs-panel/process-logs-panel-actions.ts | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/services/log-service/log-service.ts b/src/services/log-service/log-service.ts index f2424715f1..4ba02befc3 100644 --- a/src/services/log-service/log-service.ts +++ b/src/services/log-service/log-service.ts @@ -23,7 +23,10 @@ export class LogService extends CommonResourceService { async listLogFiles(containerRequestUuid: string) { const request = await this.apiWebdavClient.propfind(`container_requests/${containerRequestUuid}/log`); if (request.responseXML != null) { - return extractFilesData(request.responseXML); + return extractFilesData(request.responseXML) + .filter((file) => ( + file.path === `/arvados/v1/container_requests/${containerRequestUuid}/log` + )); } return Promise.reject(); } diff --git a/src/store/process-logs-panel/process-logs-panel-actions.ts b/src/store/process-logs-panel/process-logs-panel-actions.ts index ea082cd9b8..23aeb96a10 100644 --- a/src/store/process-logs-panel/process-logs-panel-actions.ts +++ b/src/store/process-logs-panel/process-logs-panel-actions.ts @@ -104,7 +104,6 @@ const loadContainerLogFileList = async (containerUuid: string, logService: LogSe // Filter only root directory files matching log event types which have bytes return logCollectionContents.filter((file): file is CollectionFile => ( file.type === CollectionFileType.FILE && - file.path === `/arvados/v1/container_requests/${containerUuid}/log` && PROCESS_PANEL_LOG_EVENT_TYPES.indexOf(logFileToLogType(file)) > -1 && file.size > 0 )); -- 2.39.5