🥅 putt opplasting i else slik at det ikke opplasting ikke starter hvi…

…s størrelsen er over grensen
navikt · Jan 17, 2025 · 1c7dbf2 · 1c7dbf2
1 parent 5e4bc00
commit 1c7dbf2
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 38 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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\"",