beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into shareable-url

Browse source
This commit is contained in:
Abhinav 2022-01-24 15:06:53 +05:30
parent 17fd62be4d 3869d7c0e5
commit a8f327e49a
5 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/components/pages/gallery/UploadProgress.tsx
View file

@ -239,6 +239,16 @@ export default function UploadProgress(props: Props) {
sectionTitle={constants.SKIPPED_FILES} sectionTitle={constants.SKIPPED_FILES}
sectionInfo={constants.SKIPPED_INFO} sectionInfo={constants.SKIPPED_INFO}
/> />
<ResultSection
fileUploadResultMap={fileUploadResultMap}
fileUploadResult={
FileUploadResults.LARGER_THAN_AVAILABLE_STORAGE
}
sectionTitle={
constants.LARGER_THAN_AVAILABLE_STORAGE_UPLOADS
}
sectionInfo={constants.LARGER_THAN_AVAILABLE_STORAGE_INFO}
/>
<ResultSection <ResultSection
fileUploadResultMap={fileUploadResultMap} fileUploadResultMap={fileUploadResultMap}
fileUploadResult={FileUploadResults.UNSUPPORTED} fileUploadResult={FileUploadResults.UNSUPPORTED}

1
src/constants/upload/index.ts
View file

@ -35,5 +35,6 @@ export enum FileUploadResults {
UNSUPPORTED = -3, UNSUPPORTED = -3,
BLOCKED = -4, BLOCKED = -4,
TOO_LARGE = -5, TOO_LARGE = -5,
LARGER_THAN_AVAILABLE_STORAGE = -6,
UPLOADED = 100, UPLOADED = 100,
} }

7
src/services/upload/uploader.ts
View file

@ -133,9 +133,12 @@ export default async function uploader(
case CustomError.FILE_TOO_LARGE: case CustomError.FILE_TOO_LARGE:
UIService.setFileProgress( UIService.setFileProgress(
rawFile.name, rawFile.name,
FileUploadResults.TOO_LARGE FileUploadResults.LARGER_THAN_AVAILABLE_STORAGE
); );
return { fileUploadResult: FileUploadResults.TOO_LARGE }; return {
fileUploadResult:
FileUploadResults.LARGER_THAN_AVAILABLE_STORAGE,
};
default: default:
UIService.setFileProgress( UIService.setFileProgress(
rawFile.name, rawFile.name,

5
src/utils/strings/englishConstants.tsx
View file

@ -547,8 +547,11 @@ const englishConstants = {
BLOCKED_UPLOADS: 'blocked uploads', BLOCKED_UPLOADS: 'blocked uploads',
INPROGRESS_UPLOADS: 'uploads in progress', INPROGRESS_UPLOADS: 'uploads in progress',
TOO_LARGE_UPLOADS: 'large files', TOO_LARGE_UPLOADS: 'large files',
TOO_LARGE_INFO: LARGER_THAN_AVAILABLE_STORAGE_UPLOADS: 'insufficient storage',
LARGER_THAN_AVAILABLE_STORAGE_INFO:
'these files were not uploaded as they exceed the maximum size limit for your storage plan', 'these files were not uploaded as they exceed the maximum size limit for your storage plan',
TOO_LARGE_INFO:
'these files were not uploaded as they exceed our maximum file size limit',
UPLOAD_TO_COLLECTION: 'upload to album', UPLOAD_TO_COLLECTION: 'upload to album',
ARCHIVE: 'archive', ARCHIVE: 'archive',
ALL: 'all', ALL: 'all',

6
yarn.lock
View file

@ -4592,9 +4592,9 @@ ms@2.1.2, ms@^2.1.1:
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
nanoid@^3.1.23: nanoid@^3.1.23:
version "3.1.25" version "3.2.0"
resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q== integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
native-url@0.3.4: native-url@0.3.4:
version "0.3.4" version "0.3.4"