Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions lang/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@
"defaultMessage": "Last 1 month",
"description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
},
"/BZiQv": {
"defaultMessage": "Upload Failed"
},
"/GCoTA": {
"defaultMessage": "Clear"
},
Expand Down Expand Up @@ -2205,6 +2208,9 @@
"WFCO2w": {
"defaultMessage": "Set Collection"
},
"WHd6DD": {
"defaultMessage": "Too Frequent"
},
"WIOxG+": {
"defaultMessage": "Collapse",
"description": "src/components/CircleComment/DropdownActions/CollapseComment/Button.tsx"
Expand Down
6 changes: 6 additions & 0 deletions lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@
"defaultMessage": "Last 1 month",
"description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
},
"/BZiQv": {
"defaultMessage": "Upload Failed"
},
"/GCoTA": {
"defaultMessage": "Clear"
},
Expand Down Expand Up @@ -2205,6 +2208,9 @@
"WFCO2w": {
"defaultMessage": "Set Collection"
},
"WHd6DD": {
"defaultMessage": "Too Frequent"
},
"WIOxG+": {
"defaultMessage": "Collapse",
"description": "src/components/CircleComment/DropdownActions/CollapseComment/Button.tsx"
Expand Down
6 changes: 6 additions & 0 deletions lang/zh-Hans.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@
"defaultMessage": "最近 1 个月",
"description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
},
"/BZiQv": {
"defaultMessage": "Upload Failed"
},
"/GCoTA": {
"defaultMessage": "清空"
},
Expand Down Expand Up @@ -2205,6 +2208,9 @@
"WFCO2w": {
"defaultMessage": "关联作品"
},
"WHd6DD": {
"defaultMessage": "Too Frequent"
},
"WIOxG+": {
"defaultMessage": "取消折叠",
"description": "src/components/CircleComment/DropdownActions/CollapseComment/Button.tsx"
Expand Down
6 changes: 6 additions & 0 deletions lang/zh-Hant.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@
"defaultMessage": "最近 1 個月",
"description": "src/views/Me/Analytics/SelectPeriod/index.tsx"
},
"/BZiQv": {
"defaultMessage": "Upload Failed"
},
"/GCoTA": {
"defaultMessage": "清空"
},
Expand Down Expand Up @@ -2205,6 +2208,9 @@
"WFCO2w": {
"defaultMessage": "關聯作品"
},
"WHd6DD": {
"defaultMessage": "Too Frequent"
},
"WIOxG+": {
"defaultMessage": "闔上",
"description": "src/components/CircleComment/DropdownActions/CollapseComment/Button.tsx"
Expand Down
27 changes: 25 additions & 2 deletions src/components/FileUploader/MomentAssetsUploader/Item.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
import { ApolloError } from '@apollo/client'
import _omit from 'lodash/omit'
import { memo, useContext, useEffect, useState } from 'react'
import { FormattedMessage } from 'react-intl'

import IconCircleTimesFill from '@/public/static/icons/24px/circle-times-fill.svg'
import IconWarn from '@/public/static/icons/24px/warn.svg'
import { ERROR_CODES } from '~/common/enums'
import { ASSET_TYPE, ENTITY_TYPE } from '~/common/enums/file'
import { validateImage } from '~/common/utils'
import { useDirectImageUpload, useMutation, ViewerContext } from '~/components'
import { getErrorCodes } from '~/components/GQL'
import {
DIRECT_IMAGE_UPLOAD,
DIRECT_IMAGE_UPLOAD_DONE,
Expand All @@ -33,6 +36,20 @@ type UploadedAsset = {
path: string
}

const UploadErrorMessage = ({ error }: { error?: Error }) => {
const [code] = getErrorCodes(error as ApolloError)

if (code === ERROR_CODES.ACTION_LIMIT_EXCEEDED) {
return <FormattedMessage defaultMessage="Too Frequent" id="WHd6DD" />
}

if (error) {
return <FormattedMessage defaultMessage="Upload Failed" id="/BZiQv" />
}

return <FormattedMessage defaultMessage="Unknown Error" id="tQV8l8" />
}

export const Item = memo(function Item({
asset,
removeAsset,
Expand Down Expand Up @@ -115,7 +132,13 @@ export const Item = memo(function Item({
draft: false,
url: path,
},
}).catch(console.error)
}).catch((error) => {
console.error('[MomentAssetsUploader] direct upload done failed', {
error,
assetId,
path,
})
})

setUploadedAsset({ assetId, path })
} else {
Expand Down Expand Up @@ -151,7 +174,7 @@ export const Item = memo(function Item({
<div className={styles.error}>
<Icon icon={IconWarn} color="red" size={24} />
<span>
<FormattedMessage defaultMessage="Unknown Error" id="tQV8l8" />
<UploadErrorMessage error={error} />
</span>
</div>
)}
Expand Down
Loading