@noatgnu/cupcake-vanilla 1.3.1 → 1.3.3

package/fesm2022/noatgnu-cupcake-vanilla.mjs

@@ -1,9 +1,9 @@
 import * as i0 from '@angular/core';
 import { Injectable, signal, computed, EventEmitter, inject, Output, Input, Component, effect, ViewChild } from '@angular/core';
 import * as i3 from '@noatgnu/cupcake-core';
-import { BaseApiService, WebSocketService, NotificationService as NotificationService$1, LabGroupService, ToastService, TaskStatus, TaskType, ResourceVisibility } from '@noatgnu/cupcake-core';
-import { switchMap, map, tap, takeUntil, filter as filter$1 } from 'rxjs/operators';
-import { from, Observable, throwError, NEVER, debounceTime, distinctUntilChanged, filter, switchMap as switchMap$1, map as map$1, catchError, of, tap as tap$1, Subject, BehaviorSubject, firstValueFrom, takeUntil as takeUntil$1 } from 'rxjs';
+import { BaseApiService, WebSocketService, NotificationService as NotificationService$1, LabGroupService, ToastService, AsyncTaskMonitorService, TaskStatus, TaskType, ResourceVisibility } from '@noatgnu/cupcake-core';
+import { switchMap, map, tap, takeUntil } from 'rxjs/operators';
+import { from, Observable, throwError, NEVER, debounceTime, distinctUntilChanged, filter, switchMap as switchMap$1, map as map$1, catchError, of, tap as tap$1, Subject, firstValueFrom, takeUntil as takeUntil$1 } from 'rxjs';
 import jsSHA from 'jssha';
 import * as i3$1 from '@angular/common';
 import { CommonModule } from '@angular/common';
@@ -1218,8 +1218,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.7", ngImpor
 class Websocket extends WebSocketService {
     constructor(authService) {
         super(authService);
-        this.endpoint = 'notifications';
-        this.config.endpoint = 'notifications';
+        this.endpoint = 'ccc/notifications';
+        this.config.endpoint = 'ccc/notifications';
         this.config.url = this.getWebSocketUrl();
     }
     getMetadataTableUpdates() {
@@ -1238,29 +1238,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.7", ngImpor
                 }]
         }], ctorParameters: () => [{ type: i3.AuthService }] });
 
-class AdminWebSocketService extends WebSocketService {
-    constructor(authService) {
-        super(authService);
-        this.endpoint = 'ccv/admin';
-        this.config.endpoint = 'ccv/admin';
-        this.config.url = this.getWebSocketUrl();
-    }
-    getAdminNotifications() {
-        return this.filterMessages('admin.notification');
-    }
-    getSystemNotifications() {
-        return this.filterMessages('system.notification');
-    }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.7", ngImport: i0, type: AdminWebSocketService, deps: [{ token: i3.AuthService }], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.7", ngImport: i0, type: AdminWebSocketService, providedIn: 'root' });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.7", ngImport: i0, type: AdminWebSocketService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }], ctorParameters: () => [{ type: i3.AuthService }] });
-
 var NotificationType;
 (function (NotificationType) {
     NotificationType["SYSTEM"] = "system";
@@ -1273,15 +1250,11 @@ var NotificationType;
 })(NotificationType || (NotificationType = {}));
 class NotificationService extends NotificationService$1 {
     websocketService;
-    adminWebSocketService;
     isConnected = signal(false, ...(ngDevMode ? [{ debugName: "isConnected" }] : []));
-    isAdminConnected = signal(false, ...(ngDevMode ? [{ debugName: "isAdminConnected" }] : []));
     isWebSocketConnected = computed(() => this.isConnected(), ...(ngDevMode ? [{ debugName: "isWebSocketConnected" }] : []));
-    isAdminWebSocketConnected = computed(() => this.isAdminConnected(), ...(ngDevMode ? [{ debugName: "isAdminWebSocketConnected" }] : []));
-    constructor(websocketService, adminWebSocketService, toastService) {
+    constructor(websocketService, toastService) {
         super(toastService);
         this.websocketService = websocketService;
-        this.adminWebSocketService = adminWebSocketService;
         this.initializeWebSocket();
     }
     initializeWebSocket() {
@@ -1291,18 +1264,9 @@ class NotificationService extends NotificationService$1 {
                 console.log('CCV WebSocket connected - notifications active');
             }
         });
-        this.adminWebSocketService.isConnected$.subscribe(connected => {
-            this.isAdminConnected.set(connected);
-            if (connected) {
-                console.log('CCV Admin WebSocket connected - admin notifications active');
-            }
-        });
         this.websocketService.messages$.subscribe(message => {
             this.handleWebSocketMessage(message);
         });
-        this.adminWebSocketService.messages$.subscribe(message => {
-            this.handleAdminWebSocketMessage(message);
-        });
         this.setupNotificationHandlers();
     }
     setupNotificationHandlers() {
@@ -1322,25 +1286,6 @@ class NotificationService extends NotificationService$1 {
                 this.toastService.info(message.message || message['title']);
             }
         });
-        this.adminWebSocketService.getAdminNotifications().subscribe(message => {
-            const notification = this.createNotificationFromWebSocket(message, NotificationType.SYSTEM);
-            this.addNotification(notification);
-            const level = message['level'] || 'info';
-            const title = message['title'] || 'Admin Notification';
-            const messageText = message.message || '';
-            if (level === 'error') {
-                this.toastService.error(`${title}: ${messageText}`, 10000);
-            }
-            else if (level === 'warning') {
-                this.toastService.warning(`${title}: ${messageText}`, 8000);
-            }
-            else if (level === 'success') {
-                this.toastService.success(`${title}: ${messageText}`, 6000);
-            }
-            else {
-                this.toastService.info(`${title}: ${messageText}`, 5000);
-            }
-        });
         this.websocketService.getMetadataTableUpdates().subscribe(message => {
             const notification = this.createNotificationFromWebSocket(message, NotificationType.METADATA_TABLE);
             this.addNotification(notification);
@@ -1522,31 +1467,19 @@ class NotificationService extends NotificationService$1 {
                 return 'info';
         }
     }
-    handleAdminWebSocketMessage(message) {
-        if (message.type === 'admin.notification') {
-            const notification = this.createNotificationFromWebSocket(message, NotificationType.SYSTEM);
-            this.addNotification(notification);
-        }
-    }
     connect() {
         this.websocketService.connect();
     }
-    connectAdmin() {
-        this.adminWebSocketService.connect();
-    }
     disconnect() {
         this.websocketService.disconnect();
     }
-    disconnectAdmin() {
-        this.adminWebSocketService.disconnect();
-    }
     subscribeToMetadataTable(tableId) {
         this.websocketService.subscribe('metadata_table_updates', { table_id: tableId });
     }
     createVanillaNotification(type, title, message, level = 'info', autoClose = true) {
         this.createLocalNotification(type, title, message, level, autoClose);
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.7", ngImport: i0, type: NotificationService, deps: [{ token: Websocket }, { token: AdminWebSocketService }, { token: i3.ToastService }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.7", ngImport: i0, type: NotificationService, deps: [{ token: Websocket }, { token: i3.ToastService }], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.7", ngImport: i0, type: NotificationService, providedIn: 'root' });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.7", ngImport: i0, type: NotificationService, decorators: [{
@@ -1554,7 +1487,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.7", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: () => [{ type: Websocket }, { type: AdminWebSocketService }, { type: i3.ToastService }] });
+        }], ctorParameters: () => [{ type: Websocket }, { type: i3.ToastService }] });
 
 class OntologySearchService extends BaseApiService {
     /**
@@ -3878,82 +3811,67 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.7", ngImpor
 
 class AsyncTaskUIService {
     destroy$ = new Subject();
-    tasksSubject = new BehaviorSubject([]);
-    isSubscribed = false;
     metadataTableRefreshSubject = new Subject();
     taskCompletedSubject = new Subject();
     exportTaskCompletedSubject = new Subject();
     sessionId = this.generateSessionId();
     initiatedTasks = new Set();
+    processedCompletedTasks = new Set();
     libraryAsyncTaskService = inject(AsyncTaskService);
     asyncExportService = inject(AsyncExportService);
     asyncImportService = inject(AsyncImportService);
     asyncValidationService = inject(AsyncValidationService);
     toastService = inject(ToastService);
-    websocket = inject(Websocket);
+    asyncTaskMonitor = inject(AsyncTaskMonitorService);
     modalService = inject(NgbModal);
     electronService = inject(ElectronService);
-    tasks$ = this.tasksSubject.asObservable();
-    activeTasks$ = this.tasks$.pipe(map(tasks => {
-        const taskArray = Array.isArray(tasks) ? tasks : [];
-        const active = taskArray.filter(task => task.status === TaskStatus.QUEUED || task.status === TaskStatus.STARTED);
-        console.log('AsyncTaskUIService: activeTasks$ emitting:', active.length, 'active tasks out of', taskArray.length, 'total');
-        return active;
-    }));
+    tasks$ = this.asyncTaskMonitor.tasks$;
+    activeTasks$ = this.asyncTaskMonitor.activeTasks$;
     metadataTableRefresh$ = this.metadataTableRefreshSubject.asObservable();
     taskCompleted$ = this.taskCompletedSubject.asObservable();
     exportTaskCompleted$ = this.exportTaskCompletedSubject.asObservable();
     constructor() {
+        this.asyncTaskMonitor.tasks$.pipe(takeUntil(this.destroy$)).subscribe(tasks => {
+            this.handleTasksUpdate(tasks);
+        });
     }
     ngOnDestroy() {
         this.destroy$.next();
         this.destroy$.complete();
     }
-    startRealtimeUpdates() {
-        if (this.isSubscribed) {
-            console.log('AsyncTaskUIService: Already subscribed to real-time updates');
-            return;
-        }
-        console.log('AsyncTaskUIService: Starting real-time updates');
-        this.isSubscribed = true;
-        if (!this.websocket.connectionState$() || this.websocket.connectionState$() === 'disconnected') {
-            console.log('AsyncTaskUIService: WebSocket not connected, connecting now...');
-            this.websocket.connect();
-        }
-        else {
-            console.log('AsyncTaskUIService: WebSocket already connected');
-        }
-        this.websocket.isConnected$.pipe(takeUntil(this.destroy$), filter$1(connected => connected)).subscribe(() => {
-            console.log('AsyncTaskUIService: WebSocket connected, subscribing to async_task_updates');
-            this.websocket.subscribe('async_task_updates');
-        });
-        this.websocket.filterMessages('async_task.update').pipe(takeUntil(this.destroy$)).subscribe((message) => {
-            console.log('AsyncTaskUIService: Received async_task.update message:', message);
-            this.handleTaskUpdate(message);
-        });
-        this.getTasks().subscribe({
-            next: tasks => {
-                const taskArray = Array.isArray(tasks) ? tasks : [];
-                this.tasksSubject.next(taskArray);
-            },
-            error: error => {
-                console.error('Error loading initial tasks:', error);
+    handleTasksUpdate(tasks) {
+        tasks.forEach(task => {
+            const wasRunning = task.status === TaskStatus.QUEUED || task.status === TaskStatus.STARTED;
+            if (task.status === TaskStatus.SUCCESS || task.status === TaskStatus.FAILURE || task.status === TaskStatus.CANCELLED) {
+                const isTaskFromThisTab = this.isTaskInitiatedByThisTab(task.id);
+                if (this.processedCompletedTasks.has(task.id)) {
+                    return;
+                }
+                this.taskCompletedSubject.next(task);
+                if (task.status === TaskStatus.SUCCESS && isTaskFromThisTab) {
+                    if (this.isImportTask(task.taskType) && task.metadataTable) {
+                        this.metadataTableRefreshSubject.next(task.metadataTable);
+                    }
+                    if (this.isExportTask(task.taskType)) {
+                        this.exportTaskCompletedSubject.next(task);
+                        this.handleExportTaskCompletion(task);
+                    }
+                    if (task.taskType === TaskType.VALIDATE_TABLE && task.metadataTable) {
+                        this.metadataTableRefreshSubject.next(task.metadataTable);
+                    }
+                    if ((task.taskType === TaskType.REORDER_TABLE_COLUMNS) && task.metadataTable) {
+                        this.metadataTableRefreshSubject.next(task.metadataTable);
+                    }
+                }
+                if (isTaskFromThisTab) {
+                    this.showTaskCompletionNotification(task);
+                }
+                this.processedCompletedTasks.add(task.id);
             }
         });
     }
-    stopRealtimeUpdates() {
-        console.log('AsyncTaskUIService: Stopping real-time updates');
-        this.isSubscribed = false;
-        this.destroy$.next();
-    }
-    getTasks() {
-        return this.libraryAsyncTaskService.getAsyncTasks().pipe(map(response => response.results || []));
-    }
-    getTask(taskId) {
-        return this.libraryAsyncTaskService.getAsyncTask(taskId);
-    }
     cancelTask(taskId) {
-        return this.libraryAsyncTaskService.cancelTask(taskId);
+        return this.asyncTaskMonitor.cancelTask(taskId);
     }
     generateSessionId() {
         return `session_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
@@ -3961,37 +3879,45 @@ class AsyncTaskUIService {
     isTaskInitiatedByThisTab(taskId) {
         return this.initiatedTasks.has(taskId);
     }
-    /**
-     * Mark a task as initiated by this tab for tracking purposes
-     */
     monitorTask(taskId) {
         this.initiatedTasks.add(taskId);
+        this.asyncTaskMonitor.loadSingleTask(taskId);
     }
     queueExcelExport(request) {
         return this.asyncExportService.excelTemplate(request).pipe(tap(response => {
             this.initiatedTasks.add(response.taskId);
+            this.asyncTaskMonitor.loadSingleTask(response.taskId);
         }));
     }
     queueSdrfExport(request) {
         return this.asyncExportService.sdrfFile(request).pipe(tap(response => {
             this.initiatedTasks.add(response.taskId);
+            this.asyncTaskMonitor.loadSingleTask(response.taskId);
         }));
     }
     queueSdrfImport(request) {
         return this.asyncImportService.sdrfFile(request).pipe(tap(response => {
             this.initiatedTasks.add(response.taskId);
+            this.asyncTaskMonitor.loadSingleTask(response.taskId);
         }));
     }
     queueExcelImport(request) {
-        return this.asyncImportService.excelFile(request);
+        return this.asyncImportService.excelFile(request).pipe(tap(response => {
+            this.initiatedTasks.add(response.taskId);
+            this.asyncTaskMonitor.loadSingleTask(response.taskId);
+        }));
     }
     queueBulkSdrfExport(request) {
         return this.asyncExportService.multipleSdrfFiles(request).pipe(tap(response => {
             this.initiatedTasks.add(response.taskId);
+            this.asyncTaskMonitor.loadSingleTask(response.taskId);
         }));
     }
     queueBulkExcelExport(request) {
-        return this.asyncExportService.multipleExcelTemplates(request);
+        return this.asyncExportService.multipleExcelTemplates(request).pipe(tap(response => {
+            this.initiatedTasks.add(response.taskId);
+            this.asyncTaskMonitor.loadSingleTask(response.taskId);
+        }));
     }
     downloadTaskResult(taskId) {
         this.libraryAsyncTaskService.getDownloadUrl(taskId).subscribe({
@@ -4026,91 +3952,9 @@ class AsyncTaskUIService {
     validateMetadataTable(validationRequest) {
         return this.asyncValidationService.metadataTable(validationRequest).pipe(tap(response => {
             this.initiatedTasks.add(response.taskId);
+            this.asyncTaskMonitor.loadSingleTask(response.taskId);
         }));
     }
-    handleTaskUpdate(message) {
-        console.log('AsyncTaskUIService: handleTaskUpdate called with message:', message);
-        const taskId = message.task_id;
-        const currentTasks = this.tasksSubject.value;
-        console.log('AsyncTaskUIService: Current tasks in subject:', currentTasks.length);
-        const existingTaskIndex = currentTasks.findIndex(t => t.id === taskId);
-        console.log('AsyncTaskUIService: Existing task index:', existingTaskIndex);
-        if (existingTaskIndex >= 0) {
-            const existingTask = currentTasks[existingTaskIndex];
-            const wasRunning = existingTask.status === TaskStatus.QUEUED || existingTask.status === TaskStatus.STARTED;
-            const updatedTask = {
-                ...existingTask,
-                status: message.status,
-                progressPercentage: message.progress_percentage || existingTask.progressPercentage,
-                progressDescription: message.progress_description || existingTask.progressDescription,
-                errorMessage: message.error_message || existingTask.errorMessage,
-                result: message.result || existingTask.result,
-            };
-            const updatedTasks = [...currentTasks];
-            updatedTasks[existingTaskIndex] = updatedTask;
-            console.log('AsyncTaskUIService: Emitting updated tasks:', updatedTasks.length, 'active tasks:', updatedTasks.filter(t => t.status === TaskStatus.QUEUED || t.status === TaskStatus.STARTED).length);
-            this.tasksSubject.next(updatedTasks);
-            if (message.status === TaskStatus.STARTED) {
-                this.showTaskProgressNotification(updatedTask, existingTask);
-            }
-            if (wasRunning && (message.status === TaskStatus.SUCCESS || message.status === TaskStatus.FAILURE || message.status === TaskStatus.CANCELLED)) {
-                this.showTaskCompletionNotification(updatedTask);
-                const isTaskFromThisTab = this.isTaskInitiatedByThisTab(updatedTask.id);
-                this.taskCompletedSubject.next(updatedTask);
-                if (message.status === TaskStatus.SUCCESS) {
-                    if (this.isImportTask(updatedTask.taskType) && updatedTask.metadataTable) {
-                        this.metadataTableRefreshSubject.next(updatedTask.metadataTable);
-                    }
-                    if (this.isExportTask(updatedTask.taskType)) {
-                        this.exportTaskCompletedSubject.next(updatedTask);
-                        this.handleExportTaskCompletion(updatedTask);
-                    }
-                    if (updatedTask.taskType === TaskType.VALIDATE_TABLE && updatedTask.metadataTable) {
-                        this.metadataTableRefreshSubject.next(updatedTask.metadataTable);
-                    }
-                    if ((updatedTask.taskType === TaskType.REORDER_TABLE_COLUMNS) && updatedTask.metadataTable) {
-                        this.metadataTableRefreshSubject.next(updatedTask.metadataTable);
-                    }
-                }
-                if (isTaskFromThisTab) {
-                    this.initiatedTasks.delete(updatedTask.id);
-                }
-            }
-        }
-        else {
-            console.log('AsyncTaskUIService: Task not found in current list, fetching all tasks');
-            this.getTasks().subscribe(tasks => {
-                const taskArray = Array.isArray(tasks) ? tasks : [];
-                console.log('AsyncTaskUIService: Fetched tasks from server:', taskArray.length);
-                this.tasksSubject.next(taskArray);
-                const refreshedTask = taskArray.find(t => t.id === taskId);
-                console.log('AsyncTaskUIService: Found refreshed task:', refreshedTask ? refreshedTask.id : 'not found');
-                if (refreshedTask && (message.status === TaskStatus.SUCCESS || message.status === TaskStatus.FAILURE || message.status === TaskStatus.CANCELLED)) {
-                    this.showTaskCompletionNotification(refreshedTask);
-                    const isTaskFromThisTab = this.isTaskInitiatedByThisTab(refreshedTask.id);
-                    this.taskCompletedSubject.next(refreshedTask);
-                    if (message.status === TaskStatus.SUCCESS) {
-                        if (this.isImportTask(refreshedTask.taskType) && refreshedTask.metadataTable) {
-                            this.metadataTableRefreshSubject.next(refreshedTask.metadataTable);
-                        }
-                        if (this.isExportTask(refreshedTask.taskType)) {
-                            this.exportTaskCompletedSubject.next(refreshedTask);
-                            this.handleExportTaskCompletion(refreshedTask);
-                        }
-                        if (refreshedTask.taskType === TaskType.VALIDATE_TABLE && refreshedTask.metadataTable) {
-                            this.metadataTableRefreshSubject.next(refreshedTask.metadataTable);
-                        }
-                        if ((refreshedTask.taskType === TaskType.REORDER_TABLE_COLUMNS) && refreshedTask.metadataTable) {
-                            this.metadataTableRefreshSubject.next(refreshedTask.metadataTable);
-                        }
-                    }
-                    if (isTaskFromThisTab) {
-                        this.initiatedTasks.delete(refreshedTask.id);
-                    }
-                }
-            });
-        }
-    }
     showTaskProgressNotification(updatedTask, previousTask) {
         const taskName = this.getTaskDisplayName(updatedTask.taskType);
         const tableName = updatedTask.metadataTableName ? ` for "${updatedTask.metadataTableName}"` : '';
@@ -4214,15 +4058,19 @@ class AsyncTaskUIService {
             taskType === TaskType.EXPORT_MULTIPLE_SDRF || taskType === TaskType.EXPORT_MULTIPLE_EXCEL;
     }
     handleExportTaskCompletion(task) {
+        console.log('AsyncTaskUIService: handleExportTaskCompletion called for task:', task.id, 'type:', task.taskType);
         const taskName = this.getTaskDisplayName(task.taskType);
         const tableName = task.metadataTableName ? ` for "${task.metadataTableName}"` : '';
         if (task.taskType === TaskType.EXPORT_SDRF || task.taskType === TaskType.EXPORT_EXCEL) {
+            console.log('AsyncTaskUIService: Single export task - starting download in 1500ms');
             setTimeout(() => {
+                console.log('AsyncTaskUIService: Calling downloadTaskResult for task:', task.id);
                 this.downloadTaskResult(task.id);
             }, 1500);
             this.toastService.success(`${taskName}${tableName} completed! Starting download...`, 4000);
         }
         else {
+            console.log('AsyncTaskUIService: Bulk export task - no auto-download');
             this.toastService.success(`${taskName}${tableName} completed! Check your downloads.`, 6000);
         }
     }
@@ -6308,7 +6156,6 @@ class MetadataTableTemplates {
                 this.toastService.success(`Template column reorder task queued successfully! Task ID: ${response.taskId}`);
                 // Mark task for monitoring and start real-time updates (same pattern as other async operations)
                 this.asyncTaskService.monitorTask(response.taskId);
-                this.asyncTaskService.startRealtimeUpdates();
                 this.isLoading.set(false);
             },
             error: (error) => {
@@ -8465,7 +8312,6 @@ class MetadataTableDetails {
                         this.toastService.success(`SDRF import task queued successfully! Task ID: ${result.taskId}`);
                         // Mark task for monitoring and start real-time updates (same pattern as export)
                         this.asyncTaskService.monitorTask(result.taskId);
-                        this.asyncTaskService.startRealtimeUpdates();
                     }
                     else {
                         // Fallback for immediate processing (backward compatibility)
@@ -8527,7 +8373,6 @@ class MetadataTableDetails {
                         this.toastService.success(`Excel import task queued successfully! Task ID: ${result.taskId}`);
                         // Mark task for monitoring and start real-time updates (same pattern as export)
                         this.asyncTaskService.monitorTask(result.taskId);
-                        this.asyncTaskService.startRealtimeUpdates();
                     }
                     else {
                         // Fallback for immediate processing (backward compatibility)
@@ -8582,8 +8427,7 @@ class MetadataTableDetails {
             labGroupIds = [];
         }
         // For 'none', labGroupIds stays undefined
-        // Use async export only
-        this.asyncExportService.excelTemplate({
+        this.asyncTaskService.queueExcelExport({
             metadataTableId: table.id,
             metadataColumnIds: columnIds,
             sampleNumber: table.sampleCount,
@@ -8593,8 +8437,6 @@ class MetadataTableDetails {
         }).subscribe({
             next: (response) => {
                 this.toastService.success(`Excel export queued successfully! Task ID: ${response.taskId}`);
-                // Start monitoring tasks if not already started
-                this.asyncTaskService.startRealtimeUpdates();
             },
             error: (error) => {
                 console.error('Error queuing Excel export:', error);
@@ -8605,8 +8447,7 @@ class MetadataTableDetails {
     }
     performSdrfExport(table) {
         const columnIds = table.columns.map(col => col.id);
-        // Use async export only
-        this.asyncExportService.sdrfFile({
+        this.asyncTaskService.queueSdrfExport({
             metadataTableId: table.id,
             metadataColumnIds: columnIds,
             sampleNumber: table.sampleCount,
@@ -8615,8 +8456,6 @@ class MetadataTableDetails {
         }).subscribe({
             next: (response) => {
                 this.toastService.success(`SDRF export queued successfully! Task ID: ${response.taskId}`);
-                // Start monitoring tasks if not already started
-                this.asyncTaskService.startRealtimeUpdates();
             },
             error: (error) => {
                 console.error('Error queuing SDRF export:', error);
@@ -8631,7 +8470,6 @@ class MetadataTableDetails {
                 this.isLoading.set(false);
                 this.toastService.success(`${format.toUpperCase()} export task queued successfully! Task ID: ${response.taskId}`);
                 // Start monitoring tasks if not already started
-                this.asyncTaskService.startRealtimeUpdates();
             },
             error: (error) => {
                 this.isLoading.set(false);
@@ -9327,7 +9165,6 @@ class MetadataTableDetails {
                 this.toastService.success(`Column reorder task queued successfully! Task ID: ${response.taskId}`);
                 // Mark task for monitoring and start real-time updates (same pattern as imports)
                 this.asyncTaskService.monitorTask(response.taskId);
-                this.asyncTaskService.startRealtimeUpdates();
                 this.isLoading.set(false);
             },
             error: (error) => {
@@ -9894,5 +9731,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.7", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { AdminWebSocketService, AsyncExportService, AsyncImportService, AsyncTaskService, AsyncTaskUIService, AsyncValidationService, COLUMN_TYPE_CONFIGS, ChunkedImportService, ChunkedUploadService, ColumnEditModal, ColumnTemplateEditModal, ColumnTemplates, ColumnType, CupcakeVanilla, ElectronService, ExcelExportModalComponent, FavoriteManagement, FavouriteMetadataOptionService, MSTermType, MetadataColumnAutofillModal, MetadataColumnHistoryModal, MetadataColumnService, MetadataColumnTemplateService, MetadataColumnTemplateShareService, MetadataManagementService, MetadataTableDetails, MetadataTableEditModal, MetadataTableService, MetadataTableTemplateEditModal, MetadataTableTemplateService, MetadataTableTemplates, MetadataValidationModal, MetadataValueEditModal, NotificationService, NotificationType, OFFICIAL_SDRF_COLUMNS, ONTOLOGY_TYPE_CONFIGS, OntologySearchService, OntologyType, OntologyTypeLabels, OntologyUtils, SDRFDefaultsService, SamplePoolCreateModal, SamplePoolDetailsModal, SamplePoolEditModal, SamplePoolService, SchemaSelectionModal, SchemaService, SdrfAgeInput, SdrfCleavageInput, SdrfColumnCategory, SdrfModificationInput, SdrfSpikedCompoundInput, SdrfSyntaxService, SearchReplaceModal, TableCreationModalComponent, TemplatePermissionLabels, TemplatePermissionLevel, TemplateSchemaSelectionModal, ValidationResultsModal, Websocket, getRequiredSdrfColumns, getSdrfColumnByName, getSdrfColumnsByCategory, isSdrfColumnRequired, isUnimodFullData };
+export { AsyncExportService, AsyncImportService, AsyncTaskService, AsyncTaskUIService, AsyncValidationService, COLUMN_TYPE_CONFIGS, ChunkedImportService, ChunkedUploadService, ColumnEditModal, ColumnTemplateEditModal, ColumnTemplates, ColumnType, CupcakeVanilla, ElectronService, ExcelExportModalComponent, FavoriteManagement, FavouriteMetadataOptionService, MSTermType, MetadataColumnAutofillModal, MetadataColumnHistoryModal, MetadataColumnService, MetadataColumnTemplateService, MetadataColumnTemplateShareService, MetadataManagementService, MetadataTableDetails, MetadataTableEditModal, MetadataTableService, MetadataTableTemplateEditModal, MetadataTableTemplateService, MetadataTableTemplates, MetadataValidationModal, MetadataValueEditModal, NotificationService, NotificationType, OFFICIAL_SDRF_COLUMNS, ONTOLOGY_TYPE_CONFIGS, OntologySearchService, OntologyType, OntologyTypeLabels, OntologyUtils, SDRFDefaultsService, SamplePoolCreateModal, SamplePoolDetailsModal, SamplePoolEditModal, SamplePoolService, SchemaSelectionModal, SchemaService, SdrfAgeInput, SdrfCleavageInput, SdrfColumnCategory, SdrfModificationInput, SdrfSpikedCompoundInput, SdrfSyntaxService, SearchReplaceModal, TableCreationModalComponent, TemplatePermissionLabels, TemplatePermissionLevel, TemplateSchemaSelectionModal, ValidationResultsModal, Websocket, getRequiredSdrfColumns, getSdrfColumnByName, getSdrfColumnsByCategory, isSdrfColumnRequired, isUnimodFullData };
 //# sourceMappingURL=noatgnu-cupcake-vanilla.mjs.map