@sumaris-net/ngx-components 18.2.35-alpha1 → 18.2.35-alpha2

package/fesm2022/sumaris-net.ngx-components.mjs

@@ -36832,7 +36832,8 @@ class AppEditor extends AppFormContainer {
     toolbar = null;
     formButtonsBar = null;
     content;
-    constructor(route, router, navController, alertCtrl, translate) {
+    constructor(route, // Modal editor give 'null'
+    router, navController, alertCtrl, translate) {
         super();
         this.route = route;
         this.router = router;
@@ -36924,7 +36925,6 @@ class AppEditor extends AppFormContainer {
         this.markAsSaved(opts);
     }
     async reloadWithConfirmation(confirm) {
-        console.debug(this._logPrefix + ': reloadWithConfirmation', new Error());
         const needConfirm = this.dirty;
         // if not confirm yet: ask confirmation
         if (!confirm && needConfirm) {
@@ -37048,12 +37048,14 @@ class AppEditor extends AppFormContainer {
             throw new Error("Missing toastController in component's constructor");
         await Toasts.show(this.toastController, this.translate, opts);
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.11", ngImport: i0, type: AppEditor, deps: [{ token: i1$5.ActivatedRoute }, { token: i1$5.Router }, { token: i2$1.NavController }, { token: i2$1.AlertController }, { token: i1$1.TranslateService }], target: i0.ɵɵFactoryTarget.Directive });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.11", ngImport: i0, type: AppEditor, deps: [{ token: i1$5.ActivatedRoute, optional: true }, { token: i1$5.Router }, { token: i2$1.NavController }, { token: i2$1.AlertController }, { token: i1$1.TranslateService }], target: i0.ɵɵFactoryTarget.Directive });
     static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "18.2.11", type: AppEditor, viewQueries: [{ propertyName: "toolbar", first: true, predicate: ToolbarToken, descendants: true }, { propertyName: "formButtonsBar", first: true, predicate: FormButtonsBarToken, descendants: true, static: true }, { propertyName: "content", first: true, predicate: IonContent, descendants: true, static: true }], usesInheritance: true, ngImport: i0 });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.11", ngImport: i0, type: AppEditor, decorators: [{
             type: Directive
-        }], ctorParameters: () => [{ type: i1$5.ActivatedRoute }, { type: i1$5.Router }, { type: i2$1.NavController }, { type: i2$1.AlertController }, { type: i1$1.TranslateService }], propDecorators: { toolbar: [{
+        }], ctorParameters: () => [{ type: i1$5.ActivatedRoute, decorators: [{
+                    type: Optional
+                }] }, { type: i1$5.Router }, { type: i2$1.NavController }, { type: i2$1.AlertController }, { type: i1$1.TranslateService }], propDecorators: { toolbar: [{
                 type: ViewChild,
                 args: [ToolbarToken]
             }], formButtonsBar: [{
@@ -37080,11 +37082,6 @@ class AppTabEditorOptions {
 }
 // eslint-disable-next-line @angular-eslint/directive-class-suffix
 class AppTabEditor extends AppEditor {
-    route;
-    router;
-    navController;
-    alertCtrl;
-    translate;
     _selectedTabIndex = 0;
     // Editor options
     tabCount;
@@ -37102,11 +37099,6 @@ class AppTabEditor extends AppEditor {
     constructor(route, // Modal editor give 'null'
     router, navController, alertCtrl, translate, options) {
         super(route, router, navController, alertCtrl, translate);
-        this.route = route;
-        this.router = router;
-        this.navController = navController;
-        this.alertCtrl = alertCtrl;
-        this.translate = translate;
         options = {
             tabCount: 1,
             enableSwipe: true,
@@ -37176,10 +37168,11 @@ class AppTabEditor extends AppEditor {
             if (queryTabIndexParamName === 'tab' && isNotNil(this.queryParams['subtab'])) {
                 delete this.queryParams.subtab; // clean subtab
             }
+            // Update queryParam only (not the path)
             this.router.navigate(['.'], {
                 relativeTo: this.route,
+                replaceUrl: false, // Avoid to change the URL (e.g. to avoid restoring '/:id' by '/new' if changed silently)
                 queryParams: this.queryParams,
-                replaceUrl: true,
                 state: { animated: false },
             });
             return true;
@@ -39330,6 +39323,7 @@ class AppEntityEditor extends AppTabEditor {
                     console.debug('[entity-editor] Updating route using queryParams: ', queryParams);
                 return await this.router.navigate(['.'], {
                     relativeTo: this.route,
+                    replaceUrl: false,
                     queryParams: this.queryParams,
                     state: { animated: false },
                 });
@@ -39338,6 +39332,8 @@ class AppEntityEditor extends AppTabEditor {
         else {
             // Current route was '/new' => change to '/new?id=:id' (to allow CustomReuseStrategy to detect that route can be reused)
             if (currId === 'new') {
+                if (this.debug)
+                    console.debug('[entity-editor] Updating route /new into /:id, using queryParams: ', queryParams);
                 const res = await this.router.navigate(['.'], {
                     relativeTo: this.route,
                     replaceUrl: true,