Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2047 from omnivore-app/fix/uploader-no-open-url-progress

Browse Source 
Handle cases where no progres is sent during upload
This commit is contained in:
Jackson Harper
2023-04-14 14:32:20 +08:00
committed by GitHub
parent 1ae0b9e6dd 63b9053d84
commit ce4e078754
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/web/components/templates/UploadModal.tsx
View File

@ -154,7 +154,6 @@ export function UploadModal(props: UploadModalProps): JSX.Element {
}
const progress = (p.loaded / p.total) * 100
file.progress = progress
file.openUrl = `/article/sr/${request.createdPageId}`
setUploadFiles([...allFiles])
},
@ -162,6 +161,8 @@ export function UploadModal(props: UploadModalProps): JSX.Element {
file.progress = 100
file.status = 'success'
file.openUrl = `/article/sr/${request.createdPageId}`
setUploadFiles([...allFiles])
} catch (error) {
file.status = 'error'
@ -278,7 +279,7 @@ export function UploadModal(props: UploadModalProps): JSX.Element {
</DragnDropStyle>
<VStack css={{ width: '100%', mt: '25px', gap: '5px' }}>
{uploadFiles.map((file) => {
console.log('fileL ', file.name, file.progress)
console.log('fileL ', file.name, file)
return (
<HStack
key={file.id}
@ -289,6 +290,7 @@ export function UploadModal(props: UploadModalProps): JSX.Element {
borderRadius: '5px',
padding: '15px',
gap: '10px',
color: '$thTextContrast',
}}
alignment="center"
distribution="start"
@ -312,7 +314,7 @@ export function UploadModal(props: UploadModalProps): JSX.Element {
alignment="center"
css={{ marginLeft: 'auto', fontSize: '14px' }}
>
{file.status == 'success' && (
{file.status == 'success' && file.openUrl && (
<a href={file.openUrl}>Read Now</a>
)}
{file.status == 'error' && (