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

Fix object name in object manager (#1353)

Browse Source 
Signed-off-by: Lenin Alevski <alevsk.8772@gmail.com>
This commit is contained in:
Lenin Alevski
2021-12-30 18:56:06 -06:00
committed by GitHub
parent 5373e1dc19
commit b04ea490f8
2 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -355,8 +355,7 @@ const ListObjects = ({
api
.invoke(
"GET",
`/api/v1/buckets/${bucketName}/rewind/${rewindParsed}${
pathPrefix ? `?prefix=${encodeFileName(pathPrefix)}` : ``
`/api/v1/buckets/${bucketName}/rewind/${rewindParsed}${pathPrefix ? `?prefix=${encodeFileName(pathPrefix)}` : ``
}`
)
.then((res: RewindObjectList) => {
@@ -405,8 +404,7 @@ const ListObjects = ({
api
.invoke(
"GET",
`/api/v1/buckets/${bucketName}/objects${
pathPrefix ? `?prefix=${encodeFileName(pathPrefix)}` : ``
`/api/v1/buckets/${bucketName}/objects${pathPrefix ? `?prefix=${encodeFileName(pathPrefix)}` : ``
}`
)
.then((res: BucketObjectsList) => {
@@ -440,8 +438,7 @@ const ListObjects = ({
api
.invoke(
"GET",
`/api/v1/buckets/${bucketName}/rewind/${rewindParsed}${
pathPrefix ? `?prefix=${encodeFileName(pathPrefix)}` : ``
`/api/v1/buckets/${bucketName}/rewind/${rewindParsed}${pathPrefix ? `?prefix=${encodeFileName(pathPrefix)}` : ``
}`
)
.then((res: RewindObjectList) => {
@@ -466,8 +463,7 @@ const ListObjects = ({
api
.invoke(
"GET",
`/api/v1/buckets/${bucketName}/objects${
internalPaths ? `?prefix=${internalPaths}` : ``
`/api/v1/buckets/${bucketName}/objects${internalPaths ? `?prefix=${internalPaths}` : ``
}`
)
.then((res: BucketObjectsList) => {
@@ -651,9 +647,8 @@ const ListObjects = ({
};
const openPath = (idElement: string) => {
const newPath = `/buckets/${bucketName}/browse${
idElement ? `/${encodeFileName(idElement)}` : ``
}`;
const newPath = `/buckets/${bucketName}/browse${idElement ? `/${encodeFileName(idElement)}` : ``
}`;
history.push(newPath);
return;
};
@@ -696,8 +691,7 @@ const ListObjects = ({
.join("/");
encodedPath = encodeFileName(
`${path}${finalFolderPath}${
!finalFolderPath.endsWith("/") ? "/" : ""
`${path}${finalFolderPath}${!finalFolderPath.endsWith("/") ? "/" : ""
}`
);
}
@@ -724,12 +718,10 @@ const ListObjects = ({
xhr.open("POST", uploadUrl, true);
const areMultipleFiles = files.length > 1;
const errorMessage = `An error occurred while uploading the file${
areMultipleFiles ? "s" : ""
}.`;
const okMessage = `Object${
areMultipleFiles ? "s" : ``
} uploaded successfully.`;
const errorMessage = `An error occurred while uploading the file${areMultipleFiles ? "s" : ""
}.`;
const okMessage = `Object${areMultipleFiles ? "s" : ``
} uploaded successfully.`;
xhr.withCredentials = false;
xhr.onload = function (event) {
@@ -1315,9 +1307,8 @@ const ListObjects = ({
customPaperHeight={classes.browsePaper}
selectedItems={selectedObjects}
onSelect={selectListObjects}
customEmptyMessage={`This location is empty${
!rewindEnabled ? ", please try uploading a new file" : ""
}`}
customEmptyMessage={`This location is empty${!rewindEnabled ? ", please try uploading a new file" : ""
}`}
sortConfig={{
currentSort: currentSortField,
currentDirection: sortDirection,
@@ -1358,4 +1349,4 @@ const mapDispatchToProps = {
const connector = connect(mapStateToProps, mapDispatchToProps);
export default withRouter(connector(withStyles(styles)(ListObjects)));
export default withRouter(connector(withStyles(styles)(ListObjects)));

2
portal-ui/src/screens/Console/Common/ObjectManager/ObjectHandled.tsx
View File

@@ -115,7 +115,7 @@ const ObjectHandled = ({
objectToDisplay,
deleteFromList,
}: IObjectHandled) => {
const prefix = `/${objectToDisplay.prefix}`;
const prefix = `${objectToDisplay.prefix}`;
return (
<Fragment>
<div