Merged changes from main branch

UKHomeOffice · Jan 29, 2025 · 1900695 · 1900695
1 parent 882ac5d
commit 1900695
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/source/common/config/rush/browser-approved-packages.json b/source/common/config/rush/browser-approved-packages.json
@@ -154,6 +154,10 @@
       "name": "@aws-sdk/util-stream-node",
       "allowedCategories": [ "production" ]
     },
+    {
+      "name": "@aws-sdk/xhr-http-handler",
+      "allowedCategories": [ "production" ]
+    },
     {
       "name": "@aws/dea-app",
       "allowedCategories": [ "production" ]
@@ -302,6 +306,14 @@
       "name": "@rushstack/ts-command-line",
       "allowedCategories": [ "production" ]
     },
+    {
+      "name": "@smithy/fetch-http-handler",
+      "allowedCategories": [ "production" ]
+    },
+    {
+      "name": "@smithy/node-http-handler",
+      "allowedCategories": [ "production" ]
+    },
     {
       "name": "@smithy/types",
       "allowedCategories": [ "production" ]
@@ -490,6 +502,10 @@
       "name": "generate-password",
       "allowedCategories": [ "production" ]
     },
+    {
+      "name": "http2",
+      "allowedCategories": [ "production" ]
+    },
     {
       "name": "i18next",
       "allowedCategories": [ "production" ]
@@ -558,6 +574,10 @@
       "name": "minimist",
       "allowedCategories": [ "production" ]
     },
+    {
+      "name": "net",
+      "allowedCategories": [ "production" ]
+    },
     {
       "name": "next",
       "allowedCategories": [ "production", "prototypes" ]

diff --git a/source/dea-app/src/storage/datasets.ts b/source/dea-app/src/storage/datasets.ts
@@ -111,7 +111,7 @@ export const createCaseFileUpload = async (
         ServerSideEncryption: 'aws:kms',
         ContentType: caseFile.contentType,
         StorageClass: 'INTELLIGENT_TIERING',
-        ChecksumAlgorithm: ChecksumAlgorithm.SHA256,
+        // ChecksumAlgorithm: ChecksumAlgorithm.SHA256,
       })
     );
   } catch (error) {

diff --git a/source/dea-ui/ui/src/components/upload-files/MBTPUploader.ts b/source/dea-ui/ui/src/components/upload-files/MBTPUploader.ts
@@ -164,7 +164,13 @@ export class MyUploader {
       const endByte = Math.min(startByte + this.chunkSize, file.size);
 
       const partBlob = file.slice(startByte, endByte);
-      xhr.send(partBlob);
+      try {
+        console.log(' XHR Data :', xhr);
+
+        xhr.send(partBlob);
+      } catch (error) {
+        this.onErrorFn(error);
+      }
     });
   }