@sumaris-net/ngx-components 2.4.23-rc3 → 2.4.23-rc5

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

@@ -19695,9 +19695,9 @@ class CustomReuseStrategy extends IonicRouteStrategy {
      * @param curr
      */
     shouldReuseRoute(future, curr) {
-        const result = super.shouldReuseRoute(future, curr);
+        const reuse = super.shouldReuseRoute(future, curr);
         // Is sam route config
-        if (!result && future.routeConfig && future.routeConfig === curr.routeConfig) {
+        if (future.routeConfig && future.routeConfig === curr.routeConfig) {
             // Read the parameter name, where id is stored
             const pathIdParam = future.routeConfig.data && future.routeConfig.data.pathIdParam || 'id';
             // Read the current route id
@@ -19708,11 +19708,22 @@ 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)) {
+                if (!reuse) {
+                    // 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;
+                }
+                else {
+                    console.log(`Router reuse={reuse} from /${curr.params[pathIdParam]} to /${future.params[pathIdParam]}`);
+                }
+            }
         }
-        return result;
+        return reuse;
     }
 }
 CustomReuseStrategy.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: CustomReuseStrategy, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
@@ -28315,17 +28326,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();
         }
@@ -28615,7 +28623,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;
     }
@@ -28641,27 +28649,55 @@ class AppEntityEditor extends AppTabEditor {
             this.markForCheck();
         }
     }
+    /**
+     * Update the route, without reloading the component
+     * @param data
+     * @param queryParams
+     * @protected
+     */
     async 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;
-            // Disabling router animation
-            this.routerOutlet.animated = false;
-            try {
-                return await this.router.navigate(commands, {
-                    replaceUrl: true,
+        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
                 });
             }
-            finally {
-                // Re enabling router animation
-                this.routerOutlet.animated = true;
-            }
         }
         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');
         }
     }
 }