add encoded filename as part of upload url

Author: prakashsvmx

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

@@ -547,12 +547,11 @@ const ListObjects = () => {
             }
 
             if (encodedPath !== "") {
-              uploadUrl = `${uploadUrl}?prefix=${encodedPath}&fileName=${encodeURLString(
+              uploadUrl = `${uploadUrl}?prefix=${encodedPath}${encodeURLString(
                 fileName,
               )}`;
             } else {
-              // if passed as prefix it would be treated as folder in backend
-              uploadUrl = `${uploadUrl}?fileName=${encodeURLString(fileName)}`;
+              uploadUrl = `${uploadUrl}?prefix=${encodeURLString(fileName)}`;
             }
 
             const identity = encodeURLString(

restapi/user_objects.go

@@ -24,7 +24,6 @@ import (
 	"io"
 	"net/http"
 	"net/url"
-	"path"
 	"path/filepath"
 	"regexp"
 	"strconv"
@@ -1030,8 +1029,8 @@ func uploadFiles(ctx context.Context, client MinioClient, params objectApi.PostB
 		if contentType == "" {
 			contentType = mimedb.TypeByExtension(filepath.Ext(p.FileName()))
 		}
-
-		_, err = client.putObject(ctx, params.BucketName, path.Join(prefix, path.Clean(p.FileName())), p, size, minio.PutObjectOptions{
+		objectName := prefix // prefix will have complete object path e.g: /test-prefix/test-object.txt
+		_, err = client.putObject(ctx, params.BucketName, objectName, p, size, minio.PutObjectOptions{
 			ContentType:      contentType,
 			DisableMultipart: true, // Do not upload as multipart stream for console uploader.
 		})