Bug #13947 signal

ui/ui-frontend/projects/pastis/src/app/core/services/file.service.ts

@@ -71,9 +71,9 @@ same conditions as regards security.
 The fact that you are presently reading this means that you have had
 knowledge of the CeCILL-C license and that you accept its terms.
 */
-import { Injectable, OnDestroy } from '@angular/core';
+import { Injectable } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
-import { BehaviorSubject, finalize, mergeMap, Observable, Subscription } from 'rxjs';
+import { BehaviorSubject, finalize, mergeMap, Observable } from 'rxjs';
 import { FileNode, TypeConstants } from '../../models/file-node';
 import { Notice } from '../../models/notice.model';
 import { ProfileDescription } from '../../models/profile-description.model';
@@ -88,9 +88,8 @@ import { NgxUiLoaderService } from 'ngx-ui-loader';
 @Injectable({
   providedIn: 'root',
 })
-export class FileService implements OnDestroy {
+export class FileService {
   currentTree = new BehaviorSubject<FileNode[]>([]);
-  tree$ = this.currentTree.asObservable();
 
   notice = new BehaviorSubject<ProfileDescription>(null);
   noticeEditable = new BehaviorSubject<Notice>(null);
@@ -100,8 +99,6 @@ export class FileService implements OnDestroy {
   currentTreeLoaded = false;
   parentNodeMap = new Map<FileNode, FileNode>();
 
-  private _profileServiceGetProfileSubscription: Subscription;
-
   public tabChildrenRulesChange = new BehaviorSubject<string[][]>([]);
 
   constructor(
@@ -134,7 +131,7 @@ export class FileService implements OnDestroy {
    */
   getProfileAndUpdateTree(element: ProfileDescription) {
     this.loaderService.start();
-    this._profileServiceGetProfileSubscription = this.profileService
+    this.profileService
       .getProfile(element)
       .pipe(
         mergeMap((profile) =>
@@ -213,10 +210,6 @@ export class FileService implements OnDestroy {
     }
   }
 
-  setNewChildrenRules(rules: string[][]) {
-    this.tabChildrenRulesChange.next(rules);
-  }
-
   /**
    * Delete all the attributes of the concerned FileNode
    * @param fileNode The concerned FileNode
@@ -296,12 +289,6 @@ export class FileService implements OnDestroy {
     }
   }
 
-  ngOnDestroy() {
-    if (this._profileServiceGetProfileSubscription != null) {
-      this._profileServiceGetProfileSubscription.unsubscribe();
-    }
-  }
-
   getTree(name: string): FileNode {
     return this.getFileNodeByName(this.currentTree.value[0], name);
   }

ui/ui-frontend/projects/pastis/src/app/main/main.component.ts

@@ -72,13 +72,13 @@ The fact that you are presently reading this means that you have had
 knowledge of the CeCILL-C license and that you accept its terms.
 */
 import { CdkTextareaAutosize } from '@angular/cdk/text-field';
-import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { Component, effect, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { toSignal } from '@angular/core/rxjs-interop';
 import { ActivatedRoute, Router } from '@angular/router';
-import { finalize, Subscription } from 'rxjs';
+import { finalize, map, Subscription, switchMap } from 'rxjs';
 import { FileService } from '../core/services/file.service';
 import { ToggleSidenavService } from '../core/services/toggle-sidenav.service';
 import { FileNode, FileNodeInsertAttributeParams, FileNodeInsertParams } from '../models/file-node';
-import { ProfileDescription } from '../models/profile-description.model';
 import { ProfileResponse } from '../models/profile-response';
 import { EditProfileComponent } from '../profile/edit-profile/edit-profile.component';
 import { ProfileService } from '../core/services/profile.service';
@@ -105,9 +105,9 @@ export class MainComponent implements OnInit, OnDestroy {
 
   uploadedProfileResponse: ProfileResponse;
 
-  uploadedProfileSelected: ProfileDescription;
-
-  private _routeParamsSubscription: Subscription;
+  private readonly params = toSignal(this.route.params);
+  private readonly queryParams = toSignal(this.route.queryParams);
+  private readonly retrievedProfiles = toSignal(this.profileService.retrievedProfiles);
 
   constructor(
     public fileService: FileService,
@@ -118,46 +118,56 @@ export class MainComponent implements OnInit, OnDestroy {
     private loaderService: NgxUiLoaderService,
     private router: Router,
   ) {
-    this.uploadedProfileResponse = this.router.getCurrentNavigation().extras.state as ProfileResponse;
-    this.uploadedProfileSelected = this.router.getCurrentNavigation().extras.state as ProfileDescription;
-
     this.sideNavService.isOpened.subscribe((status) => {
       this.opened = status;
     });
     this.pendingSub = this.sideNavService.isPending.subscribe((status) => {
       this.pending = status;
     });
-  }
 
-  ngOnInit() {
-    this.fileService.currentTreeLoaded = false;
-    this._routeParamsSubscription = this.route.params.subscribe((params) => {
-      const profileId = params.id;
+    effect(() => {
+      const params = this.params();
+      if (!params) {
+        return;
+      }
+
+      const profileId = params['id'];
+
       // If a profileId has been defined, it is retrieved from backend
       if (profileId !== undefined) {
-        if (this.uploadedProfileSelected === undefined) {
-          this.router.navigate(['/pastis/tenant/1'], { skipLocationChange: false });
+        const profiles = this.retrievedProfiles();
+        if (!profiles || profiles.length === 0) {
+          // Profiles not loaded yet, refresh the list
+          this.profileService.refreshListProfiles();
+          return;
+        }
+
+        // Find the profile in the list
+        const profileDescription = profiles.find((p) => p.id === profileId);
+        if (profileDescription) {
+          this.fileService.getProfileAndUpdateTree(profileDescription);
         } else {
-          this.fileService.getProfileAndUpdateTree(this.uploadedProfileSelected);
+          this.router.navigate(['/'], { skipLocationChange: false });
         }
       } else {
-        // Otherwise we must have an user uploaded profile
-        this.uploadedProfileResponse.id = null;
-
-        this.loaderService.start();
-        this.profileService
-          .getMetaModel(this.uploadedProfileResponse.sedaVersion)
-          .pipe(
-            tap((metaModel) => {
-              this.sedaService.setMetaModel(metaModel);
-              this.fileService.linkFileNodeToSedaData(null, [this.uploadedProfileResponse.profile]);
-              this.fileService.updateTreeWithProfile(this.uploadedProfileResponse);
-            }),
-            finalize(() => this.loaderService.stop()),
-          )
-          .subscribe();
+        // Check for query params to create a new profile
+        const queryParams = this.queryParams();
+        if (!queryParams) {
+          return;
+        }
+
+        if (queryParams['type'] && queryParams['version']) {
+          this.createNewProfile(queryParams['type'], queryParams['version']);
+        } else {
+          // No valid params, redirect to list
+          this.router.navigate(['/'], { skipLocationChange: false });
+        }
       }
     });
+  }
+
+  ngOnInit() {
+    this.fileService.currentTreeLoaded = false;
     this.opened = true;
   }
 
@@ -190,9 +200,28 @@ export class MainComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy(): void {
-    if (this._routeParamsSubscription != null) {
-      this._routeParamsSubscription.unsubscribe();
-    }
     if (this.pendingSub) this.pendingSub.unsubscribe();
   }
+
+  private createNewProfile(profileType: string, profileVersion: string) {
+    this.loaderService.start();
+    this.profileService
+      .createProfile('/pastis/profile', profileType as any, profileVersion as any)
+      .pipe(
+        tap((profileResponse) => {
+          this.uploadedProfileResponse = profileResponse;
+          this.uploadedProfileResponse.id = null;
+        }),
+        switchMap((profileResponse) =>
+          this.profileService.getMetaModel(profileResponse.sedaVersion).pipe(map((metaModel) => ({ profileResponse, metaModel }))),
+        ),
+        tap(({ profileResponse, metaModel }) => {
+          this.sedaService.setMetaModel(metaModel);
+          this.fileService.linkFileNodeToSedaData(null, [profileResponse.profile]);
+          this.fileService.updateTreeWithProfile(profileResponse);
+        }),
+        finalize(() => this.loaderService.stop()),
+      )
+      .subscribe();
+  }
 }

ui/ui-frontend/projects/pastis/src/app/profile/list-profile/list-profile.component.html

@@ -37,7 +37,7 @@ <h5>{{ 'APPLICATION.PASTIS_APP.TITLE' | translate }}</h5>
             type="file"
           />
         </button>
-        <pastis-popup-option *ngIf="!isStandalone" [sedaUrl]="sedaUrl" [newProfileUrl]="newProfileUrl"></pastis-popup-option>
+        <pastis-popup-option *ngIf="!isStandalone" [sedaUrl]="sedaUrl"></pastis-popup-option>
       </vitamui-banner>
     </div>
 

ui/ui-frontend/projects/pastis/src/app/profile/list-profile/list-profile.component.ts

@@ -84,7 +84,6 @@ import { ProfileService } from '../../core/services/profile.service';
 import { ToggleSidenavService } from '../../core/services/toggle-sidenav.service';
 import { BreadcrumbDataTop } from '../../models/breadcrumb';
 import { ProfileDescription } from '../../models/profile-description.model';
-import { ProfileResponse } from '../../models/profile-response';
 import { DataGeneriquePopupService } from '../../shared/data-generique-popup.service';
 import { PastisDialogData } from '../../shared/pastis-dialog/classes/pastis-dialog-data';
 import { CreateProfileComponent, CreateProfileFormResult } from '../create-profile/create-profile.component';
@@ -134,9 +133,6 @@ export class ListProfileComponent extends SidenavPage<ProfileDescription> implem
 
   sedaUrl: string =
     this.pastisConfig.pastisPathPrefix + (this.isStandalone ? '' : this.startupService.getTenantIdentifier()) + this.pastisConfig.sedaUrl;
-
-  newProfileUrl: string = this.pastisConfig.pastisNewProfile;
-
   subscription1$: Subscription;
   _uploadProfileSub: Subscription;
   subscriptions: Subscription[] = [];
@@ -251,8 +247,7 @@ export class ListProfileComponent extends SidenavPage<ProfileDescription> implem
 
   editProfile(element: ProfileDescription) {
     this.profileService.controlSchema.next(element?.controlSchema);
-    this.router.navigate([this.pastisConfig.pastisEditPage, element.id], {
-      state: element,
+    this.router.navigate(['edit', element.id], {
       relativeTo: this.route,
       skipLocationChange: false,
     });
@@ -265,8 +260,11 @@ export class ListProfileComponent extends SidenavPage<ProfileDescription> implem
       const formData = new FormData();
       formData.append('file', fileToUpload, fileToUpload.name);
       this._uploadProfileSub = this.profileService.uploadProfile(formData).subscribe((response: any) => {
-        if (response) {
-          this.router.navigate([this.pastisConfig.pastisNewProfile], { state: response, relativeTo: this.route });
+        if (response && response.id) {
+          // Navigate to edit page with the profile ID
+          this.router.navigate(['edit', response.id], {
+            relativeTo: this.route,
+          });
         }
       });
       this.subscriptions.push(this._uploadProfileSub);
@@ -289,16 +287,16 @@ export class ListProfileComponent extends SidenavPage<ProfileDescription> implem
     const dialogRef = this.dialog.open(CreateProfileComponent, createProfileDialogConfig);
     const subscription = dialogRef
       .afterClosed()
-      .pipe(
-        filter<CreateProfileFormResult>((result) => Boolean(result)),
-        switchMap((result) =>
-          this.profileService.createProfile(this.pastisConfig.createProfileByTypeUrl, result.profileType, result.profileVersion),
-        ),
-        filter<ProfileResponse>((profileResponse) => Boolean(profileResponse)),
-      )
-      .subscribe((profileResponse) =>
-        this.router.navigate([this.pastisConfig.pastisNewProfile], { state: profileResponse, relativeTo: this.route }),
-      );
+      .pipe(filter<CreateProfileFormResult>((result) => Boolean(result)))
+      .subscribe((result) => {
+        this.router.navigate(['new'], {
+          queryParams: {
+            type: result.profileType,
+            version: result.profileVersion,
+          },
+          relativeTo: this.route,
+        });
+      });
     this.subscriptions.push(subscription);
   }
 

ui/ui-frontend/projects/pastis/src/app/shared/pastis-popup-option/pastis-popup-option.component.ts

@@ -102,8 +102,6 @@ export class PastisPopupOptionComponent implements OnInit, OnDestroy {
   @Input()
   sedaUrl: string;
   @Input()
-  newProfileUrl: string;
-  @Input()
   uploader: FileUploader = new FileUploader({ url: '' });
 
   expanded = false;
@@ -145,8 +143,11 @@ export class PastisPopupOptionComponent implements OnInit, OnDestroy {
       const formData = new FormData();
       formData.append('file', fileToUpload, fileToUpload.name);
       this.profileService.uploadProfile(formData).subscribe((response: any) => {
-        if (response) {
-          this.router.navigate([this.newProfileUrl], { state: response, relativeTo: this.route });
+        if (response && response.id) {
+          // Navigate to edit page with the profile ID
+          this.router.navigate(['edit', response.id], {
+            relativeTo: this.route,
+          });
         }
       });
     }