Release/v3.11.4 (#94)

* Release/v3.11.4 (#751) * fix: ASC-27509 - file upload (#750) * fix: cannot upload the same file again * fix: show modal to discard files after upload failed * chore(release): 3.11.4 --------- Co-authored-by: Pitchaya T. <[email protected]> Co-authored-by: bmo-amity-bot <[email protected]> * chore: update lock file * chore(release): 3.11.4 --------- Co-authored-by: Pitchaya T. <[email protected]> Co-authored-by: bmo-amity-bot <[email protected]>
AmityCo · Dec 2, 2024 · d70ac6d · d70ac6d
1 parent 475a96f
commit d70ac6d
Show file tree

Hide file tree

Showing 7 changed files with 132 additions and 41 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### 3.11.4 (2024-12-02)
+
+### 3.11.4 (2024-12-02)
+
+
+### Bug Fixes
+
+* ASC-27509 - file upload ([#750](https://github.com/AmityCo/Amity-Social-Cloud-UIKit-Web/issues/750)) ([53a5b4e](https://github.com/AmityCo/Amity-Social-Cloud-UIKit-Web/commit/53a5b4e1057762e61f839730a3568d253ec0602a))
+
 ### 3.11.3 (2024-11-28)
 
 ### 3.11.3 (2024-11-28)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@amityco/ui-kit-open-source",
-  "version": "3.11.3",
+  "version": "3.11.4",
   "engines": {
     "node": ">=16",
     "pnpm": ">=8"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/core/components/Uploaders/Loader.tsx b/src/core/components/Uploaders/Loader.tsx
@@ -170,7 +170,10 @@ const FileLoader: React.FC<FileLoaderProps> = ({
         accept={mimeType}
         multiple={multiple}
         disabled={disabled}
-        onChange={onLoad}
+        onChange={(e) => {
+          e.target.value && onLoad(e);
+          e.target.value = '';
+        }}
         onClick={onClick}
       />
       {children}

diff --git a/src/social/components/post/Creator/components/FilesUploaded.tsx b/src/social/components/post/Creator/components/FilesUploaded.tsx
@@ -1,9 +1,10 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import styled from 'styled-components';
 
 import File from '~/core/components/Uploaders/File';
 import useFileUpload from '~/core/hooks/useFileUpload';
 import { useShallowCompareEffect } from 'react-use';
+import { useConfirmContext } from '~/core/providers/ConfirmProvider';
 
 const StylesFileRows = styled.div<{ uploadLoading?: boolean }>`
   display: grid;
@@ -64,7 +65,7 @@ interface FilesProps {
   onChange: (data: { uploaded: Array<Amity.File>; uploading: Array<File> }) => void;
   onLoadingChange: (loading: boolean) => void;
   uploadLoading: boolean;
-  onError: (error: string) => void;
+  onError?: (error: string) => void;
   rowDataQaAnchor?: string;
 }
 
@@ -85,7 +86,22 @@ const Files = ({
     onError,
   });
 
-  const { allFiles } = useFileUploadProps;
+  const { info } = useConfirmContext();
+
+  const { allFiles, rejected, reset } = useFileUploadProps;
+
+  useEffect(() => {
+    if (rejected && rejected.length > 0) {
+      info({
+        title: 'Error',
+        content: 'There was an issue uploading file. Please try again later.',
+        onOk: () => reset(),
+        okText: 'Discard',
+        onCancel: () => reset(),
+        OkButton: undefined,
+      });
+    }
+  }, [rejected]);
 
   if (allFiles.length === 0) return null;
 

diff --git a/src/social/components/post/Creator/components/ImagesUploaded.tsx b/src/social/components/post/Creator/components/ImagesUploaded.tsx
@@ -1,9 +1,10 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import styled, { css } from 'styled-components';
 
 import GalleryGrid from '~/core/components/GalleryGrid';
 import Image from '~/core/components/Uploaders/Image';
 import useFileUpload, { isAmityFile } from '~/core/hooks/useFileUpload';
+import { useConfirmContext } from '~/core/providers/ConfirmProvider';
 
 const StyledGalleryGrid = styled(GalleryGrid)<
   { uploadLoading?: boolean } & React.ComponentProps<typeof GalleryGrid<Amity.File | File>>
@@ -68,7 +69,7 @@ interface ImagesUploadedProps {
   onChange: (data: { uploaded: Array<Amity.File>; uploading: Array<File> }) => void;
   onLoadingChange: (loading: boolean) => void;
   uploadLoading: boolean;
-  onError: (error: string) => void;
+  onError?: (error: string) => void;
 }
 
 const ImagesUploaded = ({
@@ -87,7 +88,22 @@ const ImagesUploaded = ({
     onError,
   });
 
-  const { allFiles } = useFileUploadProps;
+  const { info } = useConfirmContext();
+
+  const { allFiles, rejected, reset } = useFileUploadProps;
+
+  useEffect(() => {
+    if (rejected && rejected.length > 0) {
+      info({
+        title: 'Error',
+        content: 'There was an issue uploading media. Please try again later.',
+        onOk: () => reset(),
+        okText: 'Discard',
+        onCancel: () => reset(),
+        OkButton: undefined,
+      });
+    }
+  }, [rejected]);
 
   if (allFiles.length === 0) return null;
 

diff --git a/src/social/components/post/Creator/index.tsx b/src/social/components/post/Creator/index.tsx
@@ -361,7 +361,6 @@ const PostCreatorBar = ({
                   setPostImages(uploaded);
                   setIncomingImages(uploading);
                 }}
-                onError={setError}
               />
               <VideosUploaded
                 files={incomingVideos}
@@ -372,7 +371,6 @@ const PostCreatorBar = ({
                   setPostVideos(uploaded);
                   setIncomingVideos(uploading);
                 }}
-                onError={setError}
               />
               <FilesUploaded
                 files={incomingFiles}
@@ -383,7 +381,6 @@ const PostCreatorBar = ({
                   setPostFiles(uploaded);
                   setIncomingFiles(uploading);
                 }}
-                onError={setError}
               />
             </UploadsContainer>
           }