Merge branch 'master' into fs_support

Author: dvaldivia

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

@@ -53,7 +53,9 @@ const DeleteObject = ({
     if (selectedObject.endsWith("/")) {
       recursive = true;
     }
-    setDeleteLoading(true);
+    // Escape object name
+    selectedObject = encodeURIComponent(selectedObject);
+
     api
       .invoke(
         "DELETE",

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

@@ -468,7 +468,8 @@ const ListObjects = ({
     let files = e.target.files;
     let uploadUrl = `/api/v1/buckets/${bucketName}/objects/upload`;
     if (path !== "") {
-      uploadUrl = `${uploadUrl}?prefix=${path}`;
+      const encodedPath = encodeURIComponent(path);
+      uploadUrl = `${uploadUrl}?prefix=${encodedPath}`;
     }
     let xhr = new XMLHttpRequest();
     const areMultipleFiles = files.length > 1 ? true : false;

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

@@ -219,10 +219,11 @@ const ObjectDetails = ({
 
   useEffect(() => {
     if (loadObjectData) {
+      const encodedPath = encodeURIComponent(pathInBucket);
       api
         .invoke(
           "GET",
-          `/api/v1/buckets/${bucketName}/objects?prefix=${pathInBucket}${
+          `/api/v1/buckets/${bucketName}/objects?prefix=${encodedPath}${
             distributedSetup ? "&with_versions=true" : ""
           }`
         )

portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/utils.ts

@@ -25,8 +25,8 @@ export const download = (
 ) => {
   const anchor = document.createElement("a");
   document.body.appendChild(anchor);
-
-  let path = `/api/v1/buckets/${bucketName}/objects/download?prefix=${objectPath}`;
+  const encodedPath = encodeURIComponent(objectPath);
+  let path = `/api/v1/buckets/${bucketName}/objects/download?prefix=${encodedPath}`;
   if (!isNullOrUndefined(versionID) && versionID !== "null") {
     path = path.concat(`&version_id=${versionID}`);
   }

portal-ui/src/screens/Console/Policies/PolicyDetails.tsx

@@ -30,7 +30,7 @@ import TableWrapper from "../Common/TableWrapper/TableWrapper";
 import api from "../../../common/api";
 import PageHeader from "../Common/PageHeader/PageHeader";
 import { Link } from "react-router-dom";
-import { setErrorSnackMessage } from "../../../actions";
+import { setErrorSnackMessage, setSnackBarMessage } from "../../../actions";
 import CodeMirrorWrapper from "../Common/FormComponents/CodeMirrorWrapper/CodeMirrorWrapper";
 import history from "../../../history";
 import InputAdornment from "@material-ui/core/InputAdornment";
@@ -44,8 +44,8 @@ import TextField from "@material-ui/core/TextField";
 interface IPolicyDetailsProps {
   classes: any;
   match: any;
-  closeModalAndRefresh: (refresh: boolean) => void;
   setErrorSnackMessage: typeof setErrorSnackMessage;
+  setSnackBarMessage: typeof setSnackBarMessage;
 }
 
 const styles = (theme: Theme) =>
@@ -160,8 +160,8 @@ const styles = (theme: Theme) =>
 const PolicyDetails = ({
   classes,
   match,
-  closeModalAndRefresh,
   setErrorSnackMessage,
+  setSnackBarMessage,
 }: IPolicyDetailsProps) => {
   const [selectedTab, setSelectedTab] = useState<number>(0);
   const [policy, setPolicy] = useState<Policy | null>(null);
@@ -191,7 +191,7 @@ const PolicyDetails = ({
       })
       .then((res) => {
         setAddLoading(false);
-        closeModalAndRefresh(true);
+        setSnackBarMessage("Policy successfully updated")
       })
       .catch((err) => {
         setAddLoading(false);
@@ -441,6 +441,7 @@ const PolicyDetails = ({
 
 const connector = connect(null, {
   setErrorSnackMessage,
+  setSnackBarMessage
 });
 
 export default withStyles(styles)(connector(PolicyDetails));