mirrors/object-browser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix nested directory object display (#3415)

Browse Source
This commit is contained in:
Prakash Senthil Vel
2024-08-02 22:36:10 +05:30
committed by GitHub
parent fd51c9dc4c
commit b274add4da
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
api/ws_objects.go
View File

@@ -139,15 +139,23 @@ func (wsc *wsMinioClient) objectManager(session *models.Principal) {
continue
}
objItem := ObjectResponse{
Name: lsObj.Key,
Size: lsObj.Size,
LastModified: lsObj.LastModified.Format(time.RFC3339),
VersionID: lsObj.VersionID,
IsLatest: lsObj.IsLatest,
DeleteMarker: lsObj.IsDeleteMarker,
// if the key is same as requested prefix it would be nested directory object, so skip
// and show only objects under the prefix
// E.g:
// bucket/prefix1/prefix2/ -- this should be skipped from list item.
// bucket/prefix1/prefix2/an-object
// bucket/prefix1/prefix2/another-object
if messageRequest.Prefix != lsObj.Key {
objItem := ObjectResponse{
Name: lsObj.Key,
Size: lsObj.Size,
LastModified: lsObj.LastModified.Format(time.RFC3339),
VersionID: lsObj.VersionID,
IsLatest: lsObj.IsLatest,
DeleteMarker: lsObj.IsDeleteMarker,
}
buffer = append(buffer, objItem)
}
buffer = append(buffer, objItem)
if len(buffer) >= itemsPerBatch {
sendWSResponse(WSResponse{

10
web-app/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjectsTable.tsx
View File

@@ -84,20 +84,14 @@ const ListObjectsTable = () => {
IAM_SCOPES.S3_ALL_LIST_BUCKET,
]);
const filteredRecords = records.filter((b: BucketObjectItem) => {
const plSelect = records.filter((b: BucketObjectItem) => {
if (searchObjects === "") {
return true;
} else {
const objectName = b.name.toLowerCase();
if (objectName.indexOf(searchObjects.toLowerCase()) >= 0) {
return true;
} else {
return false;
}
return objectName.indexOf(searchObjects.toLowerCase()) >= 0;
}
});
const plSelect = filteredRecords;
const sortASC = plSelect.sort(sortListObjects(currentSortField));
let payload: BucketObjectItem[] = [];