From 8bf3483cebfbedec8322d2c5f7308adde4968abc Mon Sep 17 00:00:00 2001 From: Timo Date: Wed, 5 May 2021 15:40:50 +0300 Subject: [PATCH] fixed silly MB stuff --- .../upload-download/services/file-upload.service.ts | 3 ++- apps/red-ui/src/app/utils/functions.ts | 8 ++++++++ docker/red-ui/docker-entrypoint.sh | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts b/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts index 9f75932aa..f92b45879 100644 --- a/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts +++ b/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts @@ -7,6 +7,7 @@ import { interval, Subscription } from 'rxjs'; import { AppConfigKey, AppConfigService } from '../../app-config/app-config.service'; import { TranslateService } from '@ngx-translate/core'; import { UploadDownloadDialogService } from './upload-download-dialog.service'; +import { toNumber } from '../../../utils/functions'; export interface ActiveUpload { subscription: Subscription; @@ -47,7 +48,7 @@ export class FileUploadService { async uploadFiles(files: FileUploadModel[]): Promise { const maxSizeMB = this._appConfigService.getConfig(AppConfigKey.MAX_FILE_SIZE_MB, 100); - const maxSizeBytes = maxSizeMB * 1024 * 1024; + const maxSizeBytes = toNumber(maxSizeMB) * 1024 * 1024; const projectFiles = this._appStateService.activeProject.files; let option: 'overwrite' | 'skip' | undefined; for (let idx = 0; idx < files.length; ++idx) { diff --git a/apps/red-ui/src/app/utils/functions.ts b/apps/red-ui/src/app/utils/functions.ts index 5b08f8722..1efba9e23 100644 --- a/apps/red-ui/src/app/utils/functions.ts +++ b/apps/red-ui/src/app/utils/functions.ts @@ -88,3 +88,11 @@ export function lastIndexOfEnd(string, search) { const io = string.lastIndexOf(search); return io === -1 ? -1 : io + search.length; } + +export function toNumber(string) { + try { + return parseInt(`${string}`.replace(/\D/g, ''), 10); + } catch (e) { + return 0; + } +} diff --git a/docker/red-ui/docker-entrypoint.sh b/docker/red-ui/docker-entrypoint.sh index 7a4e76278..24897ad05 100755 --- a/docker/red-ui/docker-entrypoint.sh +++ b/docker/red-ui/docker-entrypoint.sh @@ -33,7 +33,7 @@ echo '{ "LICENSE_EMAIL":"'"$LICENSE_EMAIL"'", "APP_NAME":"'"$APP_NAME"'", "AUTO_READ_TIME":'"$AUTO_READ_TIME"', - "MAX_FILE_SIZE_MB":'"$MAX_FILE_SIZE_MB"', + "MAX_FILE_SIZE_MB":"'"$MAX_FILE_SIZE_MB"'", "API_URL":"'"$API_URL"'" }' > /usr/share/nginx/html/ui/assets/config/config.json