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

Not show objects with the same path (#1784)

Browse Source 
Signed-off-by: Benjamin Perez <benjamin@bexsoft.net>
This commit is contained in:
Alex
2022-03-31 13:49:55 -07:00
committed by GitHub
parent 461bc94a0b
commit 1985c110b1
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx
View File

@@ -493,7 +493,12 @@ const ListObjects = ({
.then((res: RewindObjectList) => {
setLoadingRewind(false);
if (res.objects) {
setRewind(res.objects);
// We omit files from the same path
const filteredObjects = res.objects.filter((object) => {
return object.name !== decodeFileName(internalPaths)
})
setRewind(filteredObjects);
} else {
setRewind([]);
}
@@ -558,12 +563,15 @@ const ListObjects = ({
const files: BucketObject[] = [];
records.forEach((record) => {
// this is a folder
if (record.name.endsWith("/")) {
folders.push(record);
} else {
// this is a file
files.push(record);
// We omit files from the same path
if (record.name !== decodeFileName(internalPaths)) {
// this is a folder
if (record.name.endsWith("/")) {
folders.push(record);
} else {
// this is a file
files.push(record);
}
}
});
const recordsInElement = [...folders, ...files];
@@ -1051,7 +1059,6 @@ const ListObjects = ({
const currentPath = pageTitle.split("/").filter((i: string) => i !== "");
const plSelect = rewindEnabled ? rewind : filteredRecords;
const sortASC = plSelect.sort(sortListObjects(currentSortField));
let payload: BucketObject[] | RewindObject[] = [];