add encoded filename as part of delete url for tooling

Author: prakashsvmx

portal-ui/src/api/consoleApi.ts

@@ -2092,7 +2092,7 @@ export class Api<
     deleteObject: (
       bucketName: string,
       query: {
-        path: string;
+        prefix: string;
         version_id?: string;
         recursive?: boolean;
         all_versions?: boolean;

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

@@ -25,6 +25,8 @@ import { hasPermission } from "../../../../../../common/SecureComponent";
 import { IAM_SCOPES } from "../../../../../../common/SecureComponent/permissions";
 import { useSelector } from "react-redux";
 import { BucketVersioningResponse } from "api/consoleApi";
+import { api } from "../../../../../../api";
+import { encodeURLString } from "../../../../../../common/utils";
 
 interface IDeleteObjectProps {
   closeDeleteModalAndRefresh: (refresh: boolean) => void;
@@ -86,13 +88,37 @@ const DeleteObject = ({
     }
 
     if (toSend) {
-      invokeDeleteApi(
-        "POST",
-        `/api/v1/buckets/${selectedBucket}/delete-objects?all_versions=${deleteVersions}${
-          bypassGovernance ? "&bypass=true" : ""
-        }`,
-        toSend,
-      );
+      if (selectedObjects.length === 1) {
+        const firstObject = selectedObjects[0];
+        api.buckets
+          .deleteObject(selectedBucket, {
+            prefix: encodeURLString(firstObject),
+            all_versions: deleteVersions,
+            bypass: bypassGovernance,
+            recursive: firstObject.endsWith("/"), //if it is just a prefix
+          })
+          .then(onDelSuccess)
+          .catch((err) => {
+            dispatch(
+              setErrorSnackMessage({
+                errorMessage: `Could not delete object. ${err.statusText}. ${
+                  retentionConfig
+                    ? "Please check retention mode and if object is WORM protected."
+                    : ""
+                }`,
+                detailedError: "",
+              }),
+            );
+          });
+      } else {
+        invokeDeleteApi(
+          "POST",
+          `/api/v1/buckets/${selectedBucket}/delete-objects?all_versions=${deleteVersions}${
+            bypassGovernance ? "&bypass=true" : ""
+          }`,
+          toSend,
+        );
+      }
     }
   };
 

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

@@ -59,7 +59,7 @@ const DeleteNonCurrentVersions = ({
     if (deleteLoading) {
       api.buckets
         .deleteObject(selectedBucket, {
-          path: selectedObject,
+          prefix: selectedObject,
           non_current_versions: true,
           bypass: bypassGovernance,
         })

restapi/embedded_spec.go

@@ -64,13 +64,16 @@ func registerObjectsHandlers(api *operations.ConsoleAPI) {
 	})
 	// delete object
 	api.ObjectDeleteObjectHandler = objectApi.DeleteObjectHandlerFunc(func(params objectApi.DeleteObjectParams, session *models.Principal) middleware.Responder {
+		fmt.Println("ObjectDeleteObjectHandler", params.Prefix)
 		if err := getDeleteObjectResponse(session, params); err != nil {
 			return objectApi.NewDeleteObjectDefault(err.Code).WithPayload(err.APIError)
 		}
 		return objectApi.NewDeleteObjectOK()
 	})
 	// delete multiple objects
 	api.ObjectDeleteMultipleObjectsHandler = objectApi.DeleteMultipleObjectsHandlerFunc(func(params objectApi.DeleteMultipleObjectsParams, session *models.Principal) middleware.Responder {
+		fmt.Println("ObjectDeleteMultipleObjectsHandler", params)
+
 		if err := getDeleteMultiplePathsResponse(session, params); err != nil {
 			return objectApi.NewDeleteMultipleObjectsDefault(err.Code).WithPayload(err.APIError)
 		}
@@ -765,8 +768,8 @@ func getDeleteObjectResponse(session *models.Principal, params objectApi.DeleteO
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	var prefix string
-	if params.Path != "" {
-		encodedPrefix := SanitizeEncodedPrefix(params.Path)
+	if params.Prefix != "" {
+		encodedPrefix := SanitizeEncodedPrefix(params.Prefix)
 		decodedPrefix, err := base64.StdEncoding.DecodeString(encodedPrefix)
 		if err != nil {
 			return ErrorWithContext(ctx, err)

restapi/operations/object/delete_object_parameters.go

@@ -339,7 +339,7 @@ paths:
           in: path
           required: true
           type: string
-        - name: path
+        - name: prefix
           in: query
           required: true
           type: string