From 1c7dbf2464915e3167eec64c4fa58c79efe05d71 Mon Sep 17 00:00:00 2001 From: Tor Idland Date: Fri, 17 Jan 2025 11:21:42 +0100 Subject: [PATCH] =?UTF-8?q?:goal=5Fnet:=20putt=20opplasting=20i=20else=20s?= =?UTF-8?q?lik=20at=20det=20ikke=20opplasting=20ikke=20starter=20hvis=20st?= =?UTF-8?q?=C3=B8rrelsen=20er=20over=20grensen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/aap-felles-css/CHANGELOG.md | 2 + packages/aap-felles-css/package.json | 2 +- packages/aap-felles-prettier/CHANGELOG.md | 2 + packages/aap-felles-prettier/package.json | 2 +- packages/aap-felles-react/CHANGELOG.md | 6 ++ packages/aap-felles-react/package.json | 2 +- .../src/FileInput/FileInputInnsending.tsx | 65 ++++++++++--------- packages/aap-felles-utils-client/CHANGELOG.md | 2 + packages/aap-felles-utils-client/package.json | 2 +- packages/aap-felles-utils/CHANGELOG.md | 2 + packages/aap-felles-utils/package.json | 2 +- packages/eslint-config-aap/CHANGELOG.md | 2 + packages/eslint-config-aap/package.json | 2 +- 13 files changed, 55 insertions(+), 38 deletions(-) diff --git a/packages/aap-felles-css/CHANGELOG.md b/packages/aap-felles-css/CHANGELOG.md index ae058ad..d1237ae 100644 --- a/packages/aap-felles-css/CHANGELOG.md +++ b/packages/aap-felles-css/CHANGELOG.md @@ -1,5 +1,7 @@ # Change Log +## 4.2.4 + ## 4.2.3 ## 4.2.2 diff --git a/packages/aap-felles-css/package.json b/packages/aap-felles-css/package.json index 502d9ea..878857c 100644 --- a/packages/aap-felles-css/package.json +++ b/packages/aap-felles-css/package.json @@ -1,5 +1,5 @@ { - "version": "4.2.3", + "version": "4.2.4", "name": "@navikt/aap-felles-css", "author": "NAV", "homepage": "https://github.com/navikt/aap-felles-frontend#readme", diff --git a/packages/aap-felles-prettier/CHANGELOG.md b/packages/aap-felles-prettier/CHANGELOG.md index 43e6353..c3a16b0 100644 --- a/packages/aap-felles-prettier/CHANGELOG.md +++ b/packages/aap-felles-prettier/CHANGELOG.md @@ -1,5 +1,7 @@ # Change Log +## 4.2.4 + ## 4.2.3 ## 4.2.2 diff --git a/packages/aap-felles-prettier/package.json b/packages/aap-felles-prettier/package.json index da018f2..099eef9 100644 --- a/packages/aap-felles-prettier/package.json +++ b/packages/aap-felles-prettier/package.json @@ -1,7 +1,7 @@ { "name": "@navikt/aap-felles-prettier", "author": "NAV", - "version": "4.2.3", + "version": "4.2.4", "main": "index.json", "license": "MIT", "dependencies": { diff --git a/packages/aap-felles-react/CHANGELOG.md b/packages/aap-felles-react/CHANGELOG.md index 3168dfc..77692be 100644 --- a/packages/aap-felles-react/CHANGELOG.md +++ b/packages/aap-felles-react/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 4.2.4 + +### Patch Changes + +- fileinputinnsending-opplasting-i-else + ## 4.2.3 ### Patch Changes diff --git a/packages/aap-felles-react/package.json b/packages/aap-felles-react/package.json index bd9e5c1..d5af725 100644 --- a/packages/aap-felles-react/package.json +++ b/packages/aap-felles-react/package.json @@ -1,5 +1,5 @@ { - "version": "4.2.3", + "version": "4.2.4", "name": "@navikt/aap-felles-react", "author": "NAV", "homepage": "https://github.com/navikt/aap-felles-frontend#readme", diff --git a/packages/aap-felles-react/src/FileInput/FileInputInnsending.tsx b/packages/aap-felles-react/src/FileInput/FileInputInnsending.tsx index fd4abee..54418d0 100644 --- a/packages/aap-felles-react/src/FileInput/FileInputInnsending.tsx +++ b/packages/aap-felles-react/src/FileInput/FileInputInnsending.tsx @@ -89,44 +89,45 @@ export const FileInputInnsending = (props: FileInputProps) => { name: `${fileArray.length} filer`, } ]); - } - setIsUploading(true); - const uploadedFiles: Vedlegg[] = await Promise.all( - fileArray.map(async (file) => { - const internalErrorMessage = internalValidate(file); - let uploadResult: Vedlegg = { - vedleggId: uuidV4(), - errorMessage: '', - type: file.type, - size: file.size, - name: file.name, - }; + } else { + setIsUploading(true); + const uploadedFiles: Vedlegg[] = await Promise.all( + fileArray.map(async (file) => { + const internalErrorMessage = internalValidate(file); + let uploadResult: Vedlegg = { + vedleggId: uuidV4(), + errorMessage: '', + type: file.type, + size: file.size, + name: file.name, + }; - if (!internalErrorMessage) { - try { - const data = new FormData(); - data.append('vedlegg', file); - const res = await fetch(uploadUrl, { method: 'POST', body: data }); - const resData = await res.json(); + if (!internalErrorMessage) { + try { + const data = new FormData(); + data.append('vedlegg', file); + const res = await fetch(uploadUrl, { method: 'POST', body: data }); + const resData = await res.json(); - if (res.ok) { - uploadResult.vedleggId = resData.filId; - } else { - uploadResult.errorMessage = settFeilmelding(res.status, resData.substatus); + if (res.ok) { + uploadResult.vedleggId = resData.filId; + } else { + uploadResult.errorMessage = settFeilmelding(res.status, resData.substatus); + } + } catch (err: any) { + uploadResult.errorMessage = settFeilmelding(err?.status || 500); } - } catch (err: any) { - uploadResult.errorMessage = settFeilmelding(err?.status || 500); + } else if (internalErrorMessage) { + uploadResult.errorMessage = internalErrorMessage; } - } else if (internalErrorMessage) { - uploadResult.errorMessage = internalErrorMessage; - } - return uploadResult; - }) - ); + return uploadResult; + }) + ); - setIsUploading(false); - onUpload(uploadedFiles); + setIsUploading(false); + onUpload(uploadedFiles); + } } return ( diff --git a/packages/aap-felles-utils-client/CHANGELOG.md b/packages/aap-felles-utils-client/CHANGELOG.md index fc92d26..7f6dde2 100644 --- a/packages/aap-felles-utils-client/CHANGELOG.md +++ b/packages/aap-felles-utils-client/CHANGELOG.md @@ -1,5 +1,7 @@ # Change Log +## 4.2.4 + ## 4.2.3 ## 4.2.2 diff --git a/packages/aap-felles-utils-client/package.json b/packages/aap-felles-utils-client/package.json index 8c4c3eb..36d1943 100644 --- a/packages/aap-felles-utils-client/package.json +++ b/packages/aap-felles-utils-client/package.json @@ -1,5 +1,5 @@ { - "version": "4.2.3", + "version": "4.2.4", "name": "@navikt/aap-felles-utils-client", "author": "NAV", "homepage": "https://github.com/navikt/aap-felles-frontend#readme", diff --git a/packages/aap-felles-utils/CHANGELOG.md b/packages/aap-felles-utils/CHANGELOG.md index d410333..203ef10 100644 --- a/packages/aap-felles-utils/CHANGELOG.md +++ b/packages/aap-felles-utils/CHANGELOG.md @@ -1,5 +1,7 @@ # Change Log +## 4.2.4 + ## 4.2.3 ## 4.2.2 diff --git a/packages/aap-felles-utils/package.json b/packages/aap-felles-utils/package.json index 2aa16bc..f020114 100644 --- a/packages/aap-felles-utils/package.json +++ b/packages/aap-felles-utils/package.json @@ -1,5 +1,5 @@ { - "version": "4.2.3", + "version": "4.2.4", "name": "@navikt/aap-felles-utils", "author": "NAV", "homepage": "https://github.com/navikt/aap-felles-frontend#readme", diff --git a/packages/eslint-config-aap/CHANGELOG.md b/packages/eslint-config-aap/CHANGELOG.md index ef7a416..84c48ac 100644 --- a/packages/eslint-config-aap/CHANGELOG.md +++ b/packages/eslint-config-aap/CHANGELOG.md @@ -1,5 +1,7 @@ # Change Log +## 4.2.4 + ## 4.2.3 ## 4.2.2 diff --git a/packages/eslint-config-aap/package.json b/packages/eslint-config-aap/package.json index 8a48a3e..ff65a07 100644 --- a/packages/eslint-config-aap/package.json +++ b/packages/eslint-config-aap/package.json @@ -1,7 +1,7 @@ { "name": "@navikt/eslint-config-aap", "author": "NAV", - "version": "4.2.3", + "version": "4.2.4", "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\"",