Merge branch 'develop' into feat/frontend

ideafast · Sep 23, 2024 · d94dc9c · d94dc9c
2 parents a2db0c4 + 00c962c
commit d94dc9c
Show file tree

Hide file tree

Showing 5 changed files with 14,297 additions and 14,655 deletions.
diff --git a/package.json b/package.json
@@ -30,17 +30,17 @@
     "devDependencies": {
         "@babel/core": "^7.25.2",
         "@babel/preset-react": "^7.24.7",
-        "@nx/esbuild": "19.7.4",
-        "@nx/eslint": "19.7.4",
-        "@nx/eslint-plugin": "19.7.4",
-        "@nx/express": "19.7.4",
-        "@nx/jest": "19.7.4",
-        "@nx/js": "19.7.4",
-        "@nx/node": "19.7.4",
-        "@nx/react": "19.7.4",
-        "@nx/web": "19.7.4",
-        "@nx/webpack": "19.7.4",
-        "@nx/workspace": "19.7.4",
+        "@nx/esbuild": "19.8.0",
+        "@nx/eslint": "19.8.0",
+        "@nx/eslint-plugin": "19.8.0",
+        "@nx/express": "19.8.0",
+        "@nx/jest": "19.8.0",
+        "@nx/js": "19.8.0",
+        "@nx/node": "19.8.0",
+        "@nx/react": "19.8.0",
+        "@nx/web": "19.8.0",
+        "@nx/webpack": "19.8.0",
+        "@nx/workspace": "19.8.0",
         "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
         "@svgr/webpack": "8.1.0",
         "@swc/cli": "0.4.0",
@@ -81,8 +81,8 @@
         "husky": "^9.1.6",
         "jest": "29.7.0",
         "jest-environment-jsdom": "29.7.0",
-        "mongodb-memory-server": "10.0.0",
-        "nx": "19.7.4",
+        "mongodb-memory-server": "10.0.1",
+        "nx": "19.8.0",
         "prettier": "^3.3.3",
         "react-refresh": "^0.14.2",
         "supertest": "7.0.0",
@@ -111,13 +111,13 @@
         "@nivo/pie": "0.87.0",
         "@nivo/treemap": "0.87.0",
         "@swc/helpers": "0.5.13",
-        "@tanstack/react-query": "4.33.0",
-        "@trpc/client": "10.37.1",
-        "@trpc/react-query": "10.37.1",
+        "@tanstack/react-query": "4.36.1",
+        "@trpc/client": "10.45.2",
+        "@trpc/react-query": "10.45.2",
         "@trpc/server": "10.45.2",
         "JSONStream": "1.3.5",
-        "antd": "5.20.6",
-        "antd-img-crop": "4.22.0",
+        "antd": "5.21.0",
+        "antd-img-crop": "4.23.0",
         "apollo-upload-client": "18.0.1",
         "axios": "1.7.7",
         "bcrypt": "5.1.1",
@@ -126,11 +126,10 @@
         "connect-timeout": "1.9.0",
         "core-js": "^3.38.1",
         "cors": "2.8.5",
-        "crypto-browserify": "3.12.0",
         "csv-parse": "5.5.6",
         "dayjs": "1.11.13",
         "deepmerge": "4.3.1",
-        "esbuild": "^0.23.1",
+        "esbuild": "^0.24.0",
         "export-from-json": "1.7.4",
         "express": "^4.21.0",
         "express-rate-limit": "7.4.0",

diff --git a/packages/itmat-commons/src/utils/objStore.ts b/packages/itmat-commons/src/utils/objStore.ts
@@ -44,7 +44,7 @@ export class ObjectStore {
         return await minioClient.listBuckets();
     }
 
-    public async uploadFile(fileStream: Readable, bucketId: string, uri: string): Promise<string> {
+    public async uploadFile(fileStream: Readable, bucketId: string, uri: string, size?: number): Promise<string> {
         if (!this.client) {
             throw new Error('Connection failed.');
         }
@@ -66,7 +66,7 @@ export class ObjectStore {
         if (fileExists) {
             throw new Error(`File "${uri}" of bucket "${bucketId}" already exists.`);
         }
-        const result = await this.client.putObject(lowerCaseBucketId, uri, fileStream);
+        const result = await this.client.putObject(lowerCaseBucketId, uri, fileStream, size);
         return result.etag;
     }
 

diff --git a/packages/itmat-cores/src/coreFunc/fileCore.ts b/packages/itmat-cores/src/coreFunc/fileCore.ts
@@ -188,7 +188,7 @@ export class FileCore {
             );
         }
 
-        await this.objStore.uploadFile(stream, defaultFileBucketId, fileUri);
+        await this.objStore.uploadFile(stream, defaultFileBucketId, fileUri, fileSize);
 
         const fileEntry: IFile = {
             id: uuid(),

diff --git a/packages/itmat-interface/jest.config.ts b/packages/itmat-interface/jest.config.ts
@@ -2,7 +2,6 @@
 export default {
     displayName: 'itmat-interface',
     preset: '../../jest.preset.cjs',
-    verbose: true,
     transform: {
         '^.+\\.[tj]s$': ['ts-jest', {
             tsconfig: '<rootDir>/tsconfig.spec.json',