Version 0.52.0

.env

@@ -41,5 +41,6 @@ GOOGLE_ARTIFACT_UPLOADER_KEY_FILE=anymal-grand-tour-3b7a5d0c8ef4.json
 # can be left empty if you don't want to use docker hub
 DOCKER_HUB_USERNAME=
 DOCKER_HUB_PASSWORD=
+VITE_DOCKER_HUB_NAMESPACE=
 
 ARTIFACTS_UPLOADER_IMAGE=rslethz/grandtour-datasets:artifact-uploader-latest

backend/package.json

@@ -1,6 +1,6 @@
 {
     "name": "kleinkram-backend",
-    "version": "0.51.0",
+    "version": "0.52.0",
     "description": "",
     "author": "",
     "private": true,
@@ -20,7 +20,7 @@
     "dependencies": {
         "@aws-sdk/client-sts": "3.726.1",
         "@google-cloud/local-auth": "^3.0.1",
-        "@nestjs/common": "^10.4.7",
+        "@nestjs/common": "^10.4.20",
         "@nestjs/config": "^4.0.2",
         "@nestjs/core": "^10.4.5",
         "@nestjs/jwt": "^11.0.0",
@@ -41,7 +41,7 @@
         "@opentelemetry/instrumentation-winston": "^0.51.0",
         "@opentelemetry/sdk-node": "^0.206.0",
         "@opentelemetry/sdk-trace-base": "^2.0.0",
-        "@swc/core": "^1.13.3",
+        "@swc/core": "^1.13.5",
         "@swc/jest": "^0.2.39",
         "@willsoto/nestjs-prometheus": "^6.0.1",
         "aws4": "^1.13.2",
@@ -89,7 +89,7 @@
         "@types/passport-google-oauth20": "^2.0.16",
         "@typescript-eslint/eslint-plugin": "^8.32.1",
         "@typescript-eslint/parser": "^8.25.0",
-        "eslint": "^9.36.0",
+        "eslint": "^9.37.0",
         "eslint-config-prettier": "^10.1.8",
         "eslint-plugin-prettier": "^5.5.4",
         "jest": "^29.7.0",

backend/src/serialization.ts

@@ -62,12 +62,8 @@ export const missionEntityToDtoWithCreator = (
 export const missionEntityToFlatDto = (mission: Mission): FlatMissionDto => {
     return {
         ...missionEntityToDtoWithCreator(mission),
-        filesCount: mission.files?.length || 0,
-        size:
-            mission.files?.reduce(
-                (accumulator, file) => accumulator + (file.size ?? 0),
-                0,
-            ) || 0,
+        filesCount: mission.fileCount ?? 0,
+        size: mission.size ?? 0,
     };
 };
 

backend/src/services/action.service.ts

@@ -100,9 +100,14 @@ export class ActionService {
         data: CreateTemplateDto,
         auth: AuthHeader,
     ): Promise<ActionTemplateDto> {
-        if (!data.dockerImage.startsWith('rslethz/')) {
+        const dockerhub_namespace = process.env['VITE_DOCKER_HUB_NAMESPACE'];
+        // assert that we only run images from a specified namespace
+        if (
+            dockerhub_namespace !== undefined &&
+            !data.dockerImage.startsWith(dockerhub_namespace)
+        ) {
             throw new ConflictException(
-                'Only images from the rslethz namespace are allowed',
+                `Only images from the ${dockerhub_namespace} namespace are allowed`,
             );
         }
         const exists = await this.actionTemplateRepository.exists({
@@ -140,11 +145,11 @@ export class ActionService {
         data: UpdateTemplateDto,
         auth: AuthHeader,
     ): Promise<ActionTemplateDto> {
-        if (!data.dockerImage.startsWith('rslethz/')) {
-            throw new ConflictException(
-                'Only images from the rslethz namespace are allowed',
-            );
-        }
+        //if (!data.dockerImage.startsWith('rslethz/')) {
+        //    throw new ConflictException(
+        //        'Only images from the rslethz namespace are allowed',
+        //    );
+        //}
         const template = await this.actionTemplateRepository.findOneOrFail({
             where: { uuid: data.uuid },
         });

backend/src/services/mission.service.ts

@@ -32,7 +32,12 @@ import {
 } from '../serialization';
 import { TagService } from './tag.service';
 import { UserService } from './user.service';
-import { addMissionFilters, addProjectFilters, addSort } from './utilities';
+import {
+    addFileStats,
+    addMissionFilters,
+    addProjectFilters,
+    addSort,
+} from './utilities';
 
 import { SortOrder } from '@common/api/types/pagination';
 
@@ -162,36 +167,104 @@ export class MissionService {
         take: number,
         userUuid: string,
     ): Promise<MissionsDto> {
-        let query = this.missionRepository
+        let idQuery = this.missionRepository
             .createQueryBuilder('mission')
-            .leftJoinAndSelect('mission.project', 'project')
-            .leftJoinAndSelect('mission.creator', 'creator')
-            .leftJoinAndSelect('mission.tags', 'tag')
-            .leftJoinAndSelect('tag.tagType', 'tagType');
+            .select('mission.uuid')
+            .leftJoin('mission.project', 'project')
+            .leftJoin('mission.creator', 'creator')
+            .leftJoin('mission.tags', 'tag')
+            .leftJoin('tag.tagType', 'tagType');
 
-        query = addAccessConstraintsToMissionQuery(query, userUuid);
+        idQuery = addAccessConstraintsToMissionQuery(idQuery, userUuid);
 
-        query = addProjectFilters(
-            query,
+        idQuery = addProjectFilters(
+            idQuery,
             this.projectRepository,
             projectUuids,
             projectPatterns,
         );
 
-        query = addMissionFilters(
-            query,
+        idQuery = addMissionFilters(
+            idQuery,
             this.missionRepository,
             missionUuids,
             missionPatterns,
             missionMetadata,
         );
 
         if (sortBy !== undefined) {
-            query = addSort(query, FIND_MANY_SORT_KEYS, sortBy, sortOrder);
+            idQuery = addSort(idQuery, FIND_MANY_SORT_KEYS, sortBy, sortOrder);
         }
 
-        query.take(take).skip(skip);
-        const [missions, count] = await query.getManyAndCount();
+        // Get distinct mission UUIDs
+        idQuery.groupBy('mission.uuid');
+
+        // Get count before pagination
+        const count = await idQuery.getCount();
+        idQuery.take(take).skip(skip);
+
+        const missionIds = await idQuery.getRawMany();
+
+        if (missionIds.length === 0) {
+            return {
+                data: [],
+                count,
+                skip,
+                take,
+            };
+        }
+
+        let dataQuery = this.missionRepository
+            .createQueryBuilder('mission')
+            .leftJoinAndSelect('mission.project', 'project')
+            .leftJoinAndSelect('mission.creator', 'creator')
+            .leftJoinAndSelect('mission.tags', 'tag')
+            .leftJoinAndSelect('tag.tagType', 'tagType')
+            .where('mission.uuid IN (:...missionIds)', {
+                missionIds: missionIds.map((m) => m.mission_uuid),
+            });
+
+        if (sortBy !== undefined) {
+            dataQuery = addSort(
+                dataQuery,
+                FIND_MANY_SORT_KEYS,
+                sortBy,
+                sortOrder,
+            );
+        }
+
+        dataQuery = addFileStats(dataQuery);
+
+        const result = await dataQuery.getRawAndEntities();
+        const missions = result.entities;
+        const rawResults = result.raw;
+
+        // Create a map for quick lookup of file stats by mission UUID
+        const statsMap = new Map<
+            string,
+            { fileCount: number; fileSize: number }
+        >();
+        for (const raw of rawResults) {
+            const missionUuid = raw.mission_uuid;
+            if (!statsMap.has(missionUuid)) {
+                statsMap.set(missionUuid, {
+                    fileCount: Number.parseInt(raw.fileCount) || 0,
+                    fileSize: Number.parseInt(raw.fileSize) || 0,
+                });
+            }
+        }
+
+        // Assign file stats to missions
+        for (const mission of missions) {
+            const stats = statsMap.get(mission.uuid);
+            if (stats) {
+                mission.fileCount = stats.fileCount;
+                mission.size = stats.fileSize;
+            } else {
+                mission.fileCount = 0;
+                mission.size = 0;
+            }
+        }
 
         return {
             data: missions.map((element) => missionEntityToFlatDto(element)),

backend/src/services/utilities.ts

@@ -204,6 +204,26 @@ export const addMissionCount = (
     return query;
 };
 
+export const addFileStats = (
+    query: SelectQueryBuilder<Mission>,
+): SelectQueryBuilder<Mission> => {
+    query
+        .addSelect((subQuery) => {
+            return subQuery
+                .select('COUNT(file.uuid)', 'count')
+                .from('file_entity', 'file')
+                .where('file."missionUuid" = mission.uuid');
+        }, 'fileCount')
+        .addSelect((subQuery) => {
+            return subQuery
+                .select('COALESCE(SUM(file.size), 0)', 'sum')
+                .from('file_entity', 'file')
+                .where('file."missionUuid" = mission.uuid');
+        }, 'fileSize');
+
+    return query;
+};
+
 export const addProjectCreatorFilter = (
     query: SelectQueryBuilder<any>,
     creatorUuid: string | undefined,