Merge pull request #315 from AppQuality/develop

release-01-20-25

Author: cannarocks

src/pages/BugForm/FileUploader/FileDropzone.tsx

@@ -7,6 +7,7 @@ import { appendMediaList } from "src/pages/BugForm/bugFormSlice";
 import { createFilesElementList } from "src/pages/BugForm/createFilesElementList";
 import useCampaignData from "src/pages/BugForm/useCampaignData";
 import { useTranslation } from "react-i18next";
+import { normalizeFileName } from "../normalizeFilename";
 
 export const FileDropzone = () => {
   const { t } = useTranslation();
@@ -35,12 +36,8 @@ export const FileDropzone = () => {
 
   const uploadMedia = async (files: File[]) => {
     files.forEach((f) => {
-      // Normalizes accented characters in the file name (e.g. à becomes a)
-      const normalizedFileName = f.name
-        .normalize("NFD")
-        .replace(/\p{Diacritic}/gu, "");
       const formData = new FormData();
-      formData.append("media", f, normalizedFileName);
+      formData.append("media", f, normalizeFileName(f.name));
       if (!campaign.data) return;
       const data = createMedia({
         campaignId: campaign.data.id.toString(),

src/pages/BugForm/bugFormSlice.ts

@@ -3,6 +3,7 @@ import {
   PostUsersMeCampaignsByCampaignIdMediaApiResponse,
   tryberApi,
 } from "src/services/tryberApi";
+import { normalizeFileName } from "./normalizeFilename";
 
 // Define a type for the slice state
 interface BugFormState {
@@ -60,7 +61,10 @@ const bugFormSlice = createSlice({
       const { mediaList } = state;
       mediaList.forEach((media, i) => {
         files?.forEach((file) => {
-          if (media.fileName === file.name && requestId === media.uploadId) {
+          if (
+            normalizeFileName(media.fileName) === file.name &&
+            requestId === media.uploadId
+          ) {
             mediaList[i].status = "success";
             mediaList[i].uploadedFileUrl = file.path;
           }

src/pages/BugForm/normalizeFilename.ts

@@ -0,0 +1,4 @@
+// Normalizes accented characters in the file name (e.g. à becomes a)
+export const normalizeFileName = (fileName: string) => {
+  return fileName.normalize("NFD").replace(/\p{Diacritic}/gu, "");
+};