Skip to content

Commit 082aca1

Browse files
authored
fix: the interface for querying data set files is compatible with ret… (#171)
fix: the interface for querying data set files is compatible with returns in file system format and list returns.
1 parent b3558d3 commit 082aca1

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

backend/services/data-management-service/src/main/java/com/datamate/datamanagement/interfaces/rest/DatasetFileController.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,17 @@ public DatasetFileController(DatasetFileApplicationService datasetFileApplicatio
4444
@GetMapping
4545
public Response<PagedResponse<DatasetFile>> getDatasetFiles(
4646
@PathVariable("datasetId") String datasetId,
47+
@RequestParam(value = "isWithDirectory", required = false) boolean isWithDirectory,
4748
@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
4849
@RequestParam(value = "size", required = false, defaultValue = "20") Integer size,
4950
@RequestParam(value = "prefix", required = false, defaultValue = "") String prefix) {
5051
PagingQuery pagingQuery = new PagingQuery(page, size);
51-
PagedResponse<DatasetFile> filesPage = datasetFileApplicationService.getDatasetFilesWithDirectory(
52-
datasetId, prefix, pagingQuery);
52+
PagedResponse<DatasetFile> filesPage;
53+
if (isWithDirectory) {
54+
filesPage = datasetFileApplicationService.getDatasetFilesWithDirectory(datasetId, prefix, pagingQuery);
55+
} else {
56+
filesPage = datasetFileApplicationService.getDatasetFiles(datasetId, null, null, null, pagingQuery);
57+
}
5358
return Response.ok(filesPage);
5459
}
5560

frontend/src/pages/DataManagement/Detail/useFilesOperation.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ export function useFilesOperation(dataset: Dataset) {
3535
const params: any = {
3636
page: current ? current : pagination.current,
3737
size: pageSize ? pageSize : pagination.pageSize,
38+
isWithDirectory: true,
3839
};
3940

4041
if (prefix !== undefined) {

0 commit comments

Comments
 (0)