@sumaris-net/ngx-components 2.4.23-rc2 → 2.4.23-rc4

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

@@ -60,7 +60,7 @@ import { timer, merge, fromEvent, BehaviorSubject, Subscription, Subject, isObse
 import { filter, map, takeUntil, first, switchMap, tap, debounceTime, startWith, distinctUntilChanged, mergeMap, catchError, throttleTime, skip, bufferWhen, mapTo, take } from 'rxjs/operators';
 import { trigger, transition, style, animate, state } from '@angular/animations';
 import * as i1 from '@ionic/angular';
-import { IonicModule, Platform, ToastController, IonicSafeString, createAnimation, IonicRouteStrategy, ModalController, AlertController, IonContent, IonItem, IonModal, IonInfiniteScroll } from '@ionic/angular';
+import { IonicModule, Platform, ToastController, IonicSafeString, createAnimation, IonicRouteStrategy, ModalController, AlertController, IonContent, IonRouterOutlet, IonItem, IonModal, IonInfiniteScroll } from '@ionic/angular';
 import { Capacitor } from '@capacitor/core';
 import { Keyboard } from '@capacitor/keyboard';
 import * as i1$2 from '@ngx-translate/core';
@@ -19708,9 +19708,15 @@ class CustomReuseStrategy extends IonicRouteStrategy {
             const futureId = future.params[pathIdParam] === 'new'
                 ? (future.queryParams[pathIdParam] || future.queryParams['id'] || 'new') // e.g. path like '/new/?id=<ID>'
                 : future.params[pathIdParam]; // e.g. path like '/<ID>'
-            // Reuse if same ID, but never when 'new' expected
-            return futureId !== 'new' && currId !== 'new'
-                && futureId === currId;
+            // Reuse if same ID, using a futureId, if exists
+            if (isNotNil(futureId)) {
+                // Allow reuse when changing from /new to /new?id=:id
+                if (currId === 'new' && isNil(curr.queryParams[pathIdParam]) && future.params[pathIdParam] === 'new' && isNotNil(future.queryParams[pathIdParam])) {
+                    return true;
+                }
+                // Allow reuse same id, expect when expected '/new'
+                return futureId !== 'new' && futureId === currId;
+            }
         }
         return result;
     }
@@ -28076,6 +28082,7 @@ class AppEntityEditor extends AppTabEditor {
         };
         this.settings = injector.get(LocalSettingsService);
         this.errorTranslator = injector.get(FormErrorTranslator);
+        this.routerOutlet = injector.get(IonRouterOutlet);
         this.cd = injector.get(ChangeDetectorRef);
         this.dateFormat = injector.get(DateFormatService);
         this.toastController = injector.get(ToastController);
@@ -28314,17 +28321,14 @@ class AppEntityEditor extends AppTabEditor {
         const queryParams = { ...this.queryParams };
         // Open the next tab
         this.updateTabIndex(opts && opts.openTabIndex);
-        // Update queryParams
-        queryParams.tab = this.selectedTabIndex;
-        queryParams[this._pathIdAttribute] = isNotNil(data?.id) ? data.id : 'new';
         // Update route location
-        await this.updateRoute(data, queryParams);
+        await this.updateRoute(data, { ...queryParams, tab: this.selectedTabIndex });
     }
     /**
      * Update the route location, and open the next tab
      */
     updateTabIndex(tabIndex) {
-        if (isNotNil(tabIndex) && tabIndex !== this.selectedTabIndex) {
+        if (isNotNil(tabIndex) && tabIndex >= 0 && tabIndex !== this.selectedTabIndex) {
             this.selectedTabIndex = tabIndex;
             this.markForCheck();
         }
@@ -28614,7 +28618,7 @@ class AppEntityEditor extends AppTabEditor {
         let parentUrl = this.defaultBackHref;
         // Remove query params
         if (withQueryParams !== true && parentUrl && parentUrl.indexOf('?') !== -1) {
-            parentUrl = parentUrl.substr(0, parentUrl.indexOf('?'));
+            parentUrl = parentUrl.substring(0, parentUrl.indexOf('?'));
         }
         return parentUrl;
     }
@@ -28640,19 +28644,55 @@ class AppEntityEditor extends AppTabEditor {
             this.markForCheck();
         }
     }
-    updateRoute(data, queryParams) {
-        const path = this.computePageUrl(isNotNil(data.id) ? data.id : 'new');
-        const commands = (path && typeof path === 'string') ? path.split('/') : path;
-        if (isNotEmptyArray(commands)) {
-            this.queryParams = queryParams || this.queryParams;
-            return this.router.navigate(commands, {
-                replaceUrl: true,
-                queryParams: this.queryParams
-            });
+    /**
+     * Update the route, without reloading the component
+     * @param data
+     * @param queryParams
+     * @protected
+     */
+    async updateRoute(data, queryParams) {
+        const currId = this.route.snapshot.paramMap.get(this.pathIdAttribute);
+        const futureId = isNotNil(data.id) ? data.id.toString() : 'new';
+        this.queryParams = {
+            ...this.queryParams,
+            ...queryParams
+        };
+        if (currId === futureId) {
+            // Update queryParam only (not the path)
+            if (!equals(this.route.snapshot.queryParams, this.queryParams)) {
+                if (this.debug)
+                    console.debug('[entity-editor] Updating route using queryParams: ', queryParams);
+                return await this.router.navigate(['.'], {
+                    relativeTo: this.route,
+                    queryParams: this.queryParams
+                });
+            }
         }
         else {
-            console.warn('Skip page route update. Invalid page path: ', path);
-            return Promise.resolve(false);
+            // Current route was '/new' => change to '/new?id=:id' (to allow CustomReuseStrategy to detect that route can be reused)
+            if (currId === 'new') {
+                const res = await this.router.navigate(['.'], {
+                    relativeTo: this.route,
+                    replaceUrl: true,
+                    queryParams: {
+                        ...this.queryParams,
+                        [this.pathIdAttribute]: futureId
+                    }
+                });
+                if (!res)
+                    return false;
+            }
+            const path = this.computePageUrl(isNotNil(data.id) ? data.id : 'new');
+            const commands = (path && typeof path === 'string') ? path.split('/').slice(1) : path;
+            if (isNotEmptyArray(commands)) {
+                if (this.debug)
+                    console.debug('[entity-editor] Updating route to: ' + path);
+                return await this.router.navigate(commands, {
+                    replaceUrl: true,
+                    queryParams: this.queryParams
+                });
+            }
+            return Promise.reject('Missing page URL');
         }
     }
 }