Merge branch 'dev' into cd-updates

Author: anmarhindi

Dockerfile

@@ -1,4 +1,4 @@
-FROM kernai/refinery-parent-images:v1.19.0-next
+FROM kernai/refinery-parent-images:v1.20.0-next
 
 WORKDIR /app
 COPY package*.json /app/

dev.Dockerfile

@@ -1,4 +1,4 @@
-FROM kernai/refinery-parent-images:v1.19.0-next
+FROM kernai/refinery-parent-images:v1.20.0-next
 
 WORKDIR /app
 

package.json

@@ -22,7 +22,6 @@
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "autoprefixer": "^10.4.19",
-    "aws-sdk": "^2.1653.0",
     "chart.js": "^4.4.3",
     "clsx": "^1.2.1",
     "d3": "^7.8.5",
@@ -42,7 +41,10 @@
     "react-router-dom": "^6.10.0",
     "rxjs": "^7.8.1",
     "tailwindcss": "^3.4.4",
-    "typescript": "^5.1.3"
+    "typescript": "^5.1.3",
+    "@aws-sdk/client-s3": "^3.685.0",
+    "i18next": "^23.11.5",
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
     "autoprefixer": "^10.4.15",

src/services/base/s3-service.ts

@@ -1,7 +1,7 @@
 import { UploadState, UploadStates } from "@/src/types/shared/upload";
-import { S3 } from 'aws-sdk';
 import { ConfigManager } from "./config";
 import { Observable } from "rxjs";
+import { GetObjectCommand, PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
 
 
 export function uploadFile(credentialsAndUploadIdParsed: any, file: File, filename: string): Observable<UploadState> {
@@ -11,42 +11,33 @@ export function uploadFile(credentialsAndUploadIdParsed: any, file: File, filena
     const s3Endpoint = ConfigManager.getConfigValue("KERN_S3_ENDPOINT");
     const s3Region = ConfigManager.getConfigValue('s3_region');
 
-    const s3Client = new S3({
+    const s3Client = new S3Client({
         endpoint: s3Endpoint,
-        accessKeyId: credentials["AccessKeyId"],
-        secretAccessKey: credentials["SecretAccessKey"],
-        sessionToken: credentials["SessionToken"],
         region: s3Region,
-        s3BucketEndpoint: false,
-        s3ForcePathStyle: true,
-        signatureVersion: 'v4',
-        sslEnabled: false,
+        credentials: {
+            accessKeyId: credentials["AccessKeyId"],
+            secretAccessKey: credentials["SecretAccessKey"],
+            sessionToken: credentials["SessionToken"],
+        },
     });
 
     const key = uploadTaskId + "/" + filename;
 
     return new Observable((subscriber) => {
-        var managedUpload = s3Client.upload({
+        s3Client.send(new PutObjectCommand({
             Bucket: bucket,
             Key: key,
             Body: file,
-        }, {}, function (err, data) {
-            if (err) {
-                subscriber.error({
-                    state: UploadStates.ERROR,
-                    progress: 100
-                })
-            }
+        })).then(data => {
             subscriber.next({
                 state: UploadStates.DONE,
                 progress: 100
-            })
-        });
-        return managedUpload.on('httpUploadProgress', function (progress) {
-            subscriber.next({
-                state: UploadStates.IN_PROGRESS,
-                progress: Math.round(progress.loaded / progress.total * 100)
-            })
+            });
+        }).catch(err => {
+            subscriber.error({
+                state: UploadStates.ERROR,
+                progress: 100
+            });
         });
     })
 }
@@ -57,34 +48,36 @@ export function downloadFile(credentialBlock: any, isStringData: boolean = true)
     const object = credentialBlock["objectName"];
     const bucket = credentialBlock["bucket"];
     const s3Endpoint = ConfigManager.getConfigValue("KERN_S3_ENDPOINT");
-    const s3Region = ConfigManager.getConfigValue('S3_REGION');
+    const s3Region = ConfigManager.getConfigValue('s3_region');
 
-    const s3Client = new S3({
+    const s3Client = new S3Client({
         endpoint: s3Endpoint,
-        accessKeyId: credentials["AccessKeyId"],
-        secretAccessKey: credentials["SecretAccessKey"],
-        sessionToken: credentials["SessionToken"],
         region: s3Region,
-        s3BucketEndpoint: false,
-        s3ForcePathStyle: true,
-        signatureVersion: 'v4',
+        credentials: {
+            accessKeyId: credentials["AccessKeyId"],
+            secretAccessKey: credentials["SecretAccessKey"],
+            sessionToken: credentials["SessionToken"],
+        },
     });
 
     var getParams = {
         Bucket: bucket,
         Key: object
     }
     return new Observable((subscriber) => {
-        s3Client.getObject(getParams, function (err, data) {
-            if (err) {
-                subscriber.error(null)
-            }
-            if (isStringData) {
-                let objectData = data.Body.toString('utf-8'); // Use the encoding necessary
-                subscriber.next(objectData)
+        s3Client.send(new GetObjectCommand(getParams)).then(data => {
+            const bodyContents = data.Body;
+            if (isStringData && bodyContents instanceof ReadableStream) {
+                const reader = bodyContents.getReader();
+                reader.read().then(({ done, value }) => {
+                    const objectData = new TextDecoder('utf-8').decode(value);
+                    subscriber.next(objectData);
+                });
             } else {
-                subscriber.next(data.Body)
+                subscriber.next(bodyContents);
             }
+        }).catch(err => {
+            subscriber.error(null);
         });
     });