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

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

@@ -2748,6 +2748,12 @@ class DateUtils {
         value[MOMENT_NO_TIME_PROPERTY] = true;
         return value;
     }
+    static markTime(value) {
+        if (!value)
+            return undefined;
+        delete value[MOMENT_NO_TIME_PROPERTY];
+        return value;
+    }
     static isNoTime(value) {
         return value?.[MOMENT_NO_TIME_PROPERTY] === true;
     }
@@ -19047,28 +19053,29 @@ class ToolbarComponent {
             const replaceUrl = !this.routerOutlet.canGoBack();
             // Relative href
             if (this._backHref.startsWith('.')) {
-                await this.router.navigate([this._backHref], { relativeTo: this.route, replaceUrl });
+                return this.router.navigate([this._backHref], { relativeTo: this.route, replaceUrl });
             }
             else {
-                await this.router.navigateByUrl(this._backHref, { replaceUrl });
+                return this.router.navigateByUrl(this._backHref, { replaceUrl });
             }
         }
         else if (this.routerOutlet.canGoBack()) {
-            await this.routerOutlet.pop();
+            return this.routerOutlet.pop();
         }
         else if (this._defaultBackHref) {
             // Relative href
             if (this._defaultBackHref.startsWith('.')) {
-                await this.router.navigate([this._defaultBackHref], { relativeTo: this.route, replaceUrl: true });
+                return this.router.navigate([this._defaultBackHref], { relativeTo: this.route, replaceUrl: true });
             }
             else {
-                await this.router.navigateByUrl(this._defaultBackHref, {
+                return this.router.navigateByUrl(this._defaultBackHref, {
                     replaceUrl: true
                 });
             }
         }
         else {
             console.error('[toolbar] Cannot go back. Missing attribute \'defaultBackHref\' or \'backHref\'');
+            return false;
         }
     }
     tapClose(event) {
@@ -28304,34 +28311,14 @@ class AppEntityEditor extends AppTabEditor {
      * Update the route location, and open the next tab
      */
     async updateTabAndRoute(data, opts) {
-        this.queryParams = this.queryParams || {};
+        const queryParams = { ...this.queryParams };
         // Open the next tab
         this.updateTabIndex(opts && opts.openTabIndex);
-        // Save the opened tab into the queryParams
-        this.queryParams.tab = this.selectedTabIndex;
+        // Update queryParams
+        queryParams.tab = this.selectedTabIndex;
+        queryParams[this._pathIdAttribute] = isNotNil(data?.id) ? data.id : 'new';
         // Update route location
-        if (isNotNil(data?.id)) {
-            const queryParams = { ...this.queryParams };
-            queryParams[this._pathIdAttribute] = data.id;
-            if (this.debug)
-                console.debug('[entity-editor] Updating route using params: ', queryParams);
-            await this.router.navigate(['.'], {
-                relativeTo: this.route,
-                queryParams
-            });
-        }
-        // Move to ../new
-        else {
-            const queryParams = { ...this.queryParams };
-            queryParams[this._pathIdAttribute] = 'new';
-            if (this.debug)
-                console.debug('[entity-editor] Updating route to \'../new\' using params: ', queryParams);
-            await this.router.navigate(['..', 'new'], {
-                relativeTo: this.route,
-                queryParams
-            });
-        }
-        await this.updateRoute(data, this.queryParams);
+        await this.updateRoute(data, queryParams);
     }
     /**
      * Update the route location, and open the next tab
@@ -28653,17 +28640,19 @@ class AppEntityEditor extends AppTabEditor {
             this.markForCheck();
         }
     }
-    async updateRoute(data, queryParams) {
+    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)) {
-            return await this.router.navigate(commands, {
+            this.queryParams = queryParams || this.queryParams;
+            return this.router.navigate(commands, {
                 replaceUrl: true,
                 queryParams: this.queryParams
             });
         }
         else {
             console.warn('Skip page route update. Invalid page path: ', path);
+            return Promise.resolve(false);
         }
     }
 }