20219: Perform log file root path filtering in listLogFiles

Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen@curii.com>

diff --git a/src/services/log-service/log-service.ts b/src/services/log-service/log-service.ts
index f2424715f1c3a575166c9e95ce88c669f5609df1..4ba02befc336519d17bc7584cd70b6432fcde160 100644 (file)
--- 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<LogResource> {
     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 ea082cd9b8c672040ea5a77e19ed2a6fa9d42e2f..23aeb96a10b34e561490fec81747120a2ba1f65d 100644 (file)
--- 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
     ));