@noatgnu/cupcake-core 1.3.2 → 1.3.4

package/fesm2022/noatgnu-cupcake-core.mjs

@@ -4,7 +4,7 @@ import * as i1 from '@angular/common/http';
 import { HttpClient, HttpParams, provideHttpClient, withInterceptors, HttpClientModule } from '@angular/common/http';
 import { BehaviorSubject, catchError, throwError, switchMap, filter, take, map, tap, Subject, timer, EMPTY, interval, debounceTime, distinctUntilChanged } from 'rxjs';
 import { Router, ActivatedRoute, RouterModule } from '@angular/router';
-import { map as map$1, takeUntil, tap as tap$1, switchMap as switchMap$1, filter as filter$1 } from 'rxjs/operators';
+import { map as map$1, takeUntil, tap as tap$1, switchMap as switchMap$1 } from 'rxjs/operators';
 import * as i1$1 from '@angular/forms';
 import { FormBuilder, Validators, ReactiveFormsModule, FormsModule, NonNullableFormBuilder } from '@angular/forms';
 import * as i2 from '@angular/common';
@@ -1166,7 +1166,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.7", ngImpor
 
 const WEBSOCKET_ENDPOINT = new InjectionToken('WEBSOCKET_ENDPOINT', {
     providedIn: 'root',
-    factory: () => 'notifications'
+    factory: () => 'ccc/notifications'
 });
 class WebSocketService {
     authService;
@@ -1184,7 +1184,7 @@ class WebSocketService {
     connectionState$ = computed(() => this.connectionState(), ...(ngDevMode ? [{ debugName: "connectionState$" }] : []));
     lastError$ = computed(() => this.lastError(), ...(ngDevMode ? [{ debugName: "lastError$" }] : []));
     config_token = inject(CUPCAKE_CORE_CONFIG);
-    endpoint = inject(WEBSOCKET_ENDPOINT, { optional: true }) || 'notifications';
+    endpoint = inject(WEBSOCKET_ENDPOINT, { optional: true }) || 'ccc/notifications';
     constructor(authService) {
         this.authService = authService;
         this.config = {
@@ -1207,14 +1207,14 @@ class WebSocketService {
             const url = new URL(apiUrl);
             const protocol = url.protocol === 'https:' ? 'wss:' : 'ws:';
             const host = url.host;
-            const endpoint = this.config?.endpoint || 'notifications';
+            const endpoint = this.config?.endpoint || 'ccc/notifications';
             return `${protocol}//${host}/ws/${endpoint}/`;
         }
         catch (error) {
             console.error('Invalid API URL in cupcake config:', apiUrl);
             const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
             const host = window.location.host;
-            const endpoint = this.config?.endpoint || 'notifications';
+            const endpoint = this.config?.endpoint || 'ccc/notifications';
             return `${protocol}//${host}/ws/${endpoint}/`;
         }
     }
@@ -1472,6 +1472,9 @@ class AsyncTaskMonitorService extends BaseApiService {
     tasksSubject = new BehaviorSubject([]);
     isSubscribed = false;
     websocket = inject(WebSocketService);
+    constructor() {
+        super();
+    }
     tasks$ = this.tasksSubject.asObservable();
     activeTasks$ = this.tasks$.pipe(map$1(tasks => {
         const taskArray = Array.isArray(tasks) ? tasks : [];
@@ -1490,21 +1493,16 @@ class AsyncTaskMonitorService extends BaseApiService {
         }
         console.log('AsyncTaskMonitorService: Starting real-time updates');
         this.isSubscribed = true;
-        if (!this.websocket.connectionState$() || this.websocket.connectionState$() === 'disconnected') {
-            console.log('AsyncTaskMonitorService: WebSocket not connected, connecting now...');
-            this.websocket.connect();
-        }
-        else {
-            console.log('AsyncTaskMonitorService: WebSocket already connected');
-        }
-        this.websocket.isConnected$.pipe(takeUntil(this.destroy$), filter$1(connected => connected)).subscribe(() => {
-            console.log('AsyncTaskMonitorService: 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('AsyncTaskMonitorService: Received async_task.update message:', message);
             this.handleTaskUpdate(message);
         });
+        this.websocket.isConnected$.pipe(takeUntil(this.destroy$)).subscribe(isConnected => {
+            if (isConnected) {
+                console.log('AsyncTaskMonitorService: WebSocket connected, subscribing to async_task_updates channel');
+                this.websocket.subscribe('async_task_updates');
+            }
+        });
         this.loadAllTasks();
     }
     stopRealtimeUpdates() {
@@ -1535,7 +1533,14 @@ class AsyncTaskMonitorService extends BaseApiService {
         console.log('AsyncTaskMonitorService: Current tasks in subject:', currentTasks.length);
         const existingTaskIndex = currentTasks.findIndex(t => t.id === taskId);
         console.log('AsyncTaskMonitorService: Existing task index:', existingTaskIndex);
-        if (existingTaskIndex >= 0) {
+        const isTaskCompleted = message.status === TaskStatus.SUCCESS ||
+            message.status === TaskStatus.FAILURE ||
+            message.status === TaskStatus.CANCELLED;
+        if (isTaskCompleted) {
+            console.log('AsyncTaskMonitorService: Task completed, fetching full task details from API');
+            this.loadSingleTask(taskId);
+        }
+        else if (existingTaskIndex >= 0) {
             const existingTask = currentTasks[existingTaskIndex];
             const updatedTask = {
                 ...existingTask,
@@ -1555,7 +1560,30 @@ class AsyncTaskMonitorService extends BaseApiService {
             this.loadAllTasks();
         }
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.7", ngImport: i0, type: AsyncTaskMonitorService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+    loadSingleTask(taskId) {
+        this.get(`${this.apiUrl}/async-tasks/${taskId}/`).subscribe({
+            next: (task) => {
+                console.log('AsyncTaskMonitorService: Loaded single task from API:', task);
+                const currentTasks = this.tasksSubject.value;
+                const existingTaskIndex = currentTasks.findIndex(t => t.id === taskId);
+                if (existingTaskIndex >= 0) {
+                    const updatedTasks = [...currentTasks];
+                    updatedTasks[existingTaskIndex] = task;
+                    console.log('AsyncTaskMonitorService: Updated task in list with full details');
+                    this.tasksSubject.next(updatedTasks);
+                }
+                else {
+                    console.log('AsyncTaskMonitorService: Adding new task to list');
+                    this.tasksSubject.next([task, ...currentTasks]);
+                }
+            },
+            error: (error) => {
+                console.error('AsyncTaskMonitorService: Error loading single task:', error);
+                this.loadAllTasks();
+            }
+        });
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.7", ngImport: i0, type: AsyncTaskMonitorService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.7", ngImport: i0, type: AsyncTaskMonitorService, providedIn: 'root' });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.7", ngImport: i0, type: AsyncTaskMonitorService, decorators: [{
@@ -1563,7 +1591,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.7", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: () => [] });
 
 class ToastService {
     toastsSignal = signal([], ...(ngDevMode ? [{ debugName: "toastsSignal" }] : []));
@@ -1939,8 +1967,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.7", ngImpor
 
 const WEBSOCKET_ENDPOINTS = new InjectionToken('WEBSOCKET_ENDPOINTS');
 class WebSocketEndpoints {
-    static CORE_NOTIFICATIONS = 'notifications';
-    static CORE_ADMIN = 'admin';
+    static CORE_NOTIFICATIONS = 'ccc/notifications';
+    static CORE_ADMIN = 'ccc/admin';
 }
 class WebSocketConfigService {
     endpoints = new Map();
@@ -1992,6 +2020,29 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.7", ngImpor
                 }]
         }], ctorParameters: () => [] });
 
+class AdminWebSocketService extends WebSocketService {
+    constructor(authService) {
+        super(authService);
+        this.endpoint = 'ccc/admin';
+        this.config.endpoint = 'ccc/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: 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: AuthService }] });
+
 class LabGroupService extends BaseApiService {
     // LAB GROUPS
     getLabGroups(params) {
@@ -3601,5 +3652,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.7", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { AnnotationType, ApiService, AsyncTaskMonitorService, AuthService, BaseApiService, CUPCAKE_CORE_CONFIG, CupcakeCoreModule, InvitationStatus, InvitationStatusLabels, LabGroupService, LabGroupsComponent, LoginComponent, NotificationService, PoweredByFooterComponent, RegisterComponent, ResourceRole, ResourceRoleLabels, ResourceService, ResourceType, ResourceTypeLabels, ResourceVisibility, ResourceVisibilityLabels, SiteConfigComponent, SiteConfigService, TASK_STATUS_COLORS, TASK_STATUS_LABELS, TASK_TYPE_LABELS, TaskStatus, TaskType, ThemeService, ToastContainerComponent, ToastService, UserManagementComponent, UserManagementService, UserProfileComponent, WEBSOCKET_ENDPOINT, WEBSOCKET_ENDPOINTS, WebSocketConfigService, WebSocketEndpoints, WebSocketService, adminGuard, authGuard, authInterceptor, resetRefreshState };
+export { AdminWebSocketService, AnnotationType, ApiService, AsyncTaskMonitorService, AuthService, BaseApiService, CUPCAKE_CORE_CONFIG, CupcakeCoreModule, InvitationStatus, InvitationStatusLabels, LabGroupService, LabGroupsComponent, LoginComponent, NotificationService, PoweredByFooterComponent, RegisterComponent, ResourceRole, ResourceRoleLabels, ResourceService, ResourceType, ResourceTypeLabels, ResourceVisibility, ResourceVisibilityLabels, SiteConfigComponent, SiteConfigService, TASK_STATUS_COLORS, TASK_STATUS_LABELS, TASK_TYPE_LABELS, TaskStatus, TaskType, ThemeService, ToastContainerComponent, ToastService, UserManagementComponent, UserManagementService, UserProfileComponent, WEBSOCKET_ENDPOINT, WEBSOCKET_ENDPOINTS, WebSocketConfigService, WebSocketEndpoints, WebSocketService, adminGuard, authGuard, authInterceptor, resetRefreshState };
 //# sourceMappingURL=noatgnu-cupcake-core.mjs.map