Handle encoding filename when displaying it in the IDE

4ian · Jan 18, 2024 · a19d477 · a19d477
1 parent a1a4029
commit a19d477
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/newIDE/app/src/UI/CorsAwareImage.js b/newIDE/app/src/UI/CorsAwareImage.js
@@ -22,8 +22,27 @@ const addSearchParameterToUrl = (
     return url;
   }
 
-  const separator = url.indexOf('?') === -1 ? '?' : '&';
-  return url + separator + urlEncodedParameterName + '=' + urlEncodedValue;
+  const searchParams = url.indexOf('?') === -1 ? '' : url.split('?')[1];
+  const urlWithoutSearchParams = searchParams ? url.split('?')[0] : url;
+  const fileName = urlWithoutSearchParams.split('/').pop();
+  const urlWithoutSearchParamsAndFileName = urlWithoutSearchParams.replace(
+    '/' + fileName,
+    ''
+  );
+
+  const encodedFileName = encodeURIComponent(fileName);
+  const newSearchParam = urlEncodedParameterName + '=' + urlEncodedValue;
+  const searchParamsWithNewParam = searchParams
+    ? searchParams + '&' + newSearchParam
+    : newSearchParam;
+
+  return (
+    urlWithoutSearchParamsAndFileName +
+    '/' +
+    encodedFileName +
+    '?' +
+    searchParamsWithNewParam
+  );
 };
 
 /**