From 082aca1597dc6a1192b95379aeed8c348d7e074b Mon Sep 17 00:00:00 2001 From: hefanli <76611805+hefanli@users.noreply.github.com> Date: Tue, 16 Dec 2025 11:31:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20the=20interface=20for=20querying=20data?= =?UTF-8?q?=20set=20files=20is=20compatible=20with=20ret=E2=80=A6=20(#171)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix: the interface for querying data set files is compatible with returns in file system format and list returns. --- .../interfaces/rest/DatasetFileController.java | 9 +++++++-- .../src/pages/DataManagement/Detail/useFilesOperation.ts | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/interfaces/rest/DatasetFileController.java b/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/interfaces/rest/DatasetFileController.java index d1ac0bd..a3dfecb 100644 --- a/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/interfaces/rest/DatasetFileController.java +++ b/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/interfaces/rest/DatasetFileController.java @@ -44,12 +44,17 @@ public class DatasetFileController { @GetMapping public Response> getDatasetFiles( @PathVariable("datasetId") String datasetId, + @RequestParam(value = "isWithDirectory", required = false) boolean isWithDirectory, @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, @RequestParam(value = "size", required = false, defaultValue = "20") Integer size, @RequestParam(value = "prefix", required = false, defaultValue = "") String prefix) { PagingQuery pagingQuery = new PagingQuery(page, size); - PagedResponse filesPage = datasetFileApplicationService.getDatasetFilesWithDirectory( - datasetId, prefix, pagingQuery); + PagedResponse filesPage; + if (isWithDirectory) { + filesPage = datasetFileApplicationService.getDatasetFilesWithDirectory(datasetId, prefix, pagingQuery); + } else { + filesPage = datasetFileApplicationService.getDatasetFiles(datasetId, null, null, null, pagingQuery); + } return Response.ok(filesPage); } diff --git a/frontend/src/pages/DataManagement/Detail/useFilesOperation.ts b/frontend/src/pages/DataManagement/Detail/useFilesOperation.ts index 40d7726..9e2c4a0 100644 --- a/frontend/src/pages/DataManagement/Detail/useFilesOperation.ts +++ b/frontend/src/pages/DataManagement/Detail/useFilesOperation.ts @@ -35,6 +35,7 @@ export function useFilesOperation(dataset: Dataset) { const params: any = { page: current ? current : pagination.current, size: pageSize ? pageSize : pagination.pageSize, + isWithDirectory: true, }; if (prefix !== undefined) {