Merge remote-tracking branch 'main' into graph-email

.github/dependabot.yml

@@ -25,3 +25,11 @@ updates:
     labels:
       - "dependencies"
       - "npm"
+    groups:
+      nestjs:
+        patterns:
+          - "@nestjs*"
+        update-types:
+          - "minor"
+          - "patch"
+          - "major"

.github/workflows/release-and-publish-sdk.yml

@@ -112,6 +112,9 @@ jobs:
         env:
           MONGODB_URI: "mongodb://localhost:27017/scicat"
           JWT_SECRET: thisIsTheJwtSecret
+          # It disables the content property on some of the endpoints as the sdk generator complains about it.
+          # We want to keep it when the app is running to improve the swagger documentation and usage.
+          SDK_PACKAGE_SWAGGER_HELPERS_DISABLED: true
         run: |
           npm install -g wait-on && npm install
           npm run start & wait-on http://localhost:3000/api/v3/health --timeout 200000

.github/workflows/upload-sdk-artifact.yml

@@ -33,6 +33,9 @@ jobs:
         env:
           MONGODB_URI: "mongodb://localhost:27017/scicat"
           JWT_SECRET: thisIsTheJwtSecret
+          # It disables the content property on some of the endpoints as the sdk generator complains about it.
+          # We want to keep it when the app is running to improve the swagger documentation and usage.
+          SDK_PACKAGE_SWAGGER_HELPERS_DISABLED: true
         run: |
           npm install -g wait-on && npm install
           npm run start & wait-on http://localhost:3000/api/v3/health --timeout 200000

nest-cli.json

@@ -2,6 +2,17 @@
   "collection": "@nestjs/schematics",
   "sourceRoot": "src",
   "compilerOptions": {
-    "plugins": ["@nestjs/swagger"]
+    "plugins": [{
+      "name": "@nestjs/swagger",
+      "options": {
+        "dtoFileNameSuffix": [
+          ".dto.ts",
+          "sample.schema.ts",
+          "proposal.schema.ts",
+          "measurement-period.schema.ts"
+        ],
+        "introspectComments": true
+      }
+    }]
   }
 }

package.json

@@ -108,7 +108,6 @@
     "chai-http": "^5.1.1",
     "concurrently": "^9.0.0",
     "eslint": "^9.0.0",
-    "eslint-config-loopback": "^13.1.0",
     "eslint-config-prettier": "^10.0.1",
     "eslint-plugin-prettier": "^5.0.0",
     "globals": "^15.12.0",

src/admin/admin.module.ts

@@ -1,11 +1,9 @@
 import { Module } from "@nestjs/common";
 import { AdminService } from "./admin.service";
 import { AdminController } from "./admin.controller";
-import { ConfigModule } from "@nestjs/config";
 
 @Module({
   controllers: [AdminController],
-  imports: [ConfigModule],
   providers: [AdminService],
   exports: [AdminService],
 })

src/app.module.ts

@@ -39,13 +39,15 @@ import { MetricsModule } from "./metrics/metrics.module";
 
 @Module({
   imports: [
-    AttachmentsModule,
-    AuthModule,
-    CaslModule,
-    CommonModule,
     ConfigModule.forRoot({
       load: [configuration],
+      isGlobal: true,
+      cache: true,
     }),
+    AuthModule,
+    CaslModule,
+    AttachmentsModule,
+    CommonModule,
     // NOTE: `ConditionalModule.registerWhen` directly uses `process.env` as it does not support
     // dependency injection for `ConfigService`. This approach ensures compatibility while
     // leveraging environment variables for conditional module loading.
@@ -124,7 +126,6 @@ import { MetricsModule } from "./metrics/metrics.module";
       inject: [ConfigService, HttpService],
     }),
     MongooseModule.forRootAsync({
-      imports: [ConfigModule],
       useFactory: async (configService: ConfigService) => ({
         uri: configService.get<string>("mongodbUri"),
       }),