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

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

@@ -2764,6 +2764,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 === null || value === void 0 ? void 0 : value[MOMENT_NO_TIME_PROPERTY]) === true;
     }
@@ -19328,28 +19334,29 @@ class ToolbarComponent {
                 const replaceUrl = !this.routerOutlet.canGoBack();
                 // Relative href
                 if (this._backHref.startsWith('.')) {
-                    yield this.router.navigate([this._backHref], { relativeTo: this.route, replaceUrl });
+                    return this.router.navigate([this._backHref], { relativeTo: this.route, replaceUrl });
                 }
                 else {
-                    yield this.router.navigateByUrl(this._backHref, { replaceUrl });
+                    return this.router.navigateByUrl(this._backHref, { replaceUrl });
                 }
             }
             else if (this.routerOutlet.canGoBack()) {
-                yield this.routerOutlet.pop();
+                return this.routerOutlet.pop();
             }
             else if (this._defaultBackHref) {
                 // Relative href
                 if (this._defaultBackHref.startsWith('.')) {
-                    yield this.router.navigate([this._defaultBackHref], { relativeTo: this.route, replaceUrl: true });
+                    return this.router.navigate([this._defaultBackHref], { relativeTo: this.route, replaceUrl: true });
                 }
                 else {
-                    yield 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;
             }
         });
     }
@@ -28860,34 +28867,14 @@ class AppEntityEditor extends AppTabEditor {
      */
     updateTabAndRoute(data, opts) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.queryParams = this.queryParams || {};
+            const queryParams = Object.assign({}, 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 === null || data === void 0 ? void 0 : data.id) ? data.id : 'new';
             // Update route location
-            if (isNotNil(data === null || data === void 0 ? void 0 : data.id)) {
-                const queryParams = Object.assign({}, this.queryParams);
-                queryParams[this._pathIdAttribute] = data.id;
-                if (this.debug)
-                    console.debug('[entity-editor] Updating route using params: ', queryParams);
-                yield this.router.navigate(['.'], {
-                    relativeTo: this.route,
-                    queryParams
-                });
-            }
-            // Move to ../new
-            else {
-                const queryParams = Object.assign({}, this.queryParams);
-                queryParams[this._pathIdAttribute] = 'new';
-                if (this.debug)
-                    console.debug('[entity-editor] Updating route to \'../new\' using params: ', queryParams);
-                yield this.router.navigate(['..', 'new'], {
-                    relativeTo: this.route,
-                    queryParams
-                });
-            }
-            yield this.updateRoute(data, this.queryParams);
+            yield this.updateRoute(data, queryParams);
         });
     }
     /**
@@ -29244,19 +29231,19 @@ class AppEntityEditor extends AppTabEditor {
         }
     }
     updateRoute(data, queryParams) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const path = this.computePageUrl(isNotNil(data.id) ? data.id : 'new');
-            const commands = (path && typeof path === 'string') ? path.split('/') : path;
-            if (isNotEmptyArray(commands)) {
-                return yield this.router.navigate(commands, {
-                    replaceUrl: true,
-                    queryParams: this.queryParams
-                });
-            }
-            else {
-                console.warn('Skip page route update. Invalid page path: ', path);
-            }
-        });
+        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
+            });
+        }
+        else {
+            console.warn('Skip page route update. Invalid page path: ', path);
+            return Promise.resolve(false);
+        }
     }
 }
 AppEntityEditor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: AppEntityEditor, deps: "invalid", target: i0.ɵɵFactoryTarget.Directive });