@sumaris-net/ngx-components 2.4.131 → 2.4.132

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

@@ -23154,7 +23154,7 @@ class MenuService extends StartableObservableService {
         this.router = router;
         this.environment = environment;
         this.accountChanges = new BehaviorSubject(undefined);
-        this._detachedItems = [];
+        this._detachedSubItems = [];
         this._itemCounter = 0;
         this._logPrefix = '[menu-service] ';
         this._$opened = new Subject();
@@ -23164,10 +23164,10 @@ class MenuService extends StartableObservableService {
         this._debug = !environment.production;
         this._staticItems = (staticItems || []).map(i => {
             const item = MenuItems.prepareItem(i);
-            item.id = this._itemCounter++;
+            item.id = this.computeNewId();
             return item;
         });
-        this._detachedItems = []; // TODO restore from settings ?
+        this._detachedSubItems = []; // TODO restore from settings ?
     }
     get opened() {
         return this._$opened.asObservable();
@@ -23251,16 +23251,22 @@ class MenuService extends StartableObservableService {
                     console.debug(`${this._logPrefix}Received config or account event. Refreshing items...`, account);
                 // Load all items
                 const items = yield this._loadMenuItems(config, account);
+                const pathParam = MenuItems.parsePathWithQuery(this.router.routerState.snapshot.url);
+                this.detachSubMenuItem(pathParam);
                 this.dataSubject.next(items);
                 // Emit account changes event
                 this.accountChanges.next(account);
             })));
-            this.registerSubscription(this._$listenRoute.pipe(filter(listen => listen === true), mergeMap$1(_ => this.router.events), filter(event => event instanceof NavigationEnd), map((event) => MenuItems.parsePathWithQuery(event.url))).subscribe(pathParam => {
+            this.registerSubscription(merge(this.accountChanges.pipe(map(() => MenuItems.parsePathWithQuery(this.router.routerState.snapshot.url))), this._$listenRoute.pipe(filter(listen => listen === true), mergeMap$1(_ => this.router.events), filter(event => event instanceof NavigationEnd), map((event) => MenuItems.parsePathWithQuery(event.url)))).pipe(throttleTime(250), filter(() => isNotEmptyArray(this.data)))
+                .subscribe(pathParam => {
                 this.detachSubMenuItem(pathParam);
             }));
             return items;
         });
     }
+    computeNewId() {
+        return this._itemCounter++;
+    }
     _addSubMenuItem(newItem, opts) {
         opts = Object.assign({ skipIfExists: true }, opts);
         // Make sure path (and pathParams) are filled in the same way
@@ -23268,7 +23274,7 @@ class MenuService extends StartableObservableService {
         // Find if item already exists
         const existingItem = this._findExistingItem(newItem);
         if (existingItem) {
-            if (opts.skipIfExists) {
+            if (opts.skipIfExists && !!existingItem.parentPath) {
                 // DEBUG
                 if (this._debug)
                     console.debug(`${this._logPrefix}Skipping sub item (already exist)`, newItem);
@@ -23280,17 +23286,32 @@ class MenuService extends StartableObservableService {
             newItem.id = existingItem.id;
             newItem.$children = existingItem.$children;
             newItem.pinned = existingItem.pinned;
+            newItem.title = newItem.title || existingItem.title; // Keep existing title
+        }
+        else {
+            // Generate item's id (if need)
+            if (isNil(newItem.id))
+                newItem.id = this.computeNewId();
         }
-        // Generate item's id (if need)
-        if (isNil(newItem.id))
-            newItem.id = this._itemCounter++;
         const parent = this._findParent(newItem, opts === null || opts === void 0 ? void 0 : opts.availableParents);
         if (parent) {
             this._addMenuToParent(parent, newItem);
+            // Removed from detached items
+            const detachedIndex = existingItem ? this._detachedSubItems.indexOf(existingItem) : -1;
+            if (detachedIndex !== -1) {
+                this._detachedSubItems.splice(detachedIndex, 1);
+            }
         }
         else {
-            console.debug(`${this._logPrefix}Add detached sub item (no parent found)`);
-            this._detachedItems.push(newItem);
+            const detachedIndex = existingItem ? this._detachedSubItems.indexOf(existingItem) : -1;
+            if (detachedIndex !== -1) {
+                // Update existing detached item
+                this._detachedSubItems[detachedIndex] = newItem;
+            }
+            else {
+                // Add to detached item
+                this._detachedSubItems.push(newItem);
+            }
         }
         // Start listening route
         if (!this._$listenRoute.value)
@@ -23302,12 +23323,15 @@ class MenuService extends StartableObservableService {
             if (this._debug)
                 console.debug(`${this._logPrefix}Loading menu items...`);
             // Save previous children of root items
-            const detachedItems = (this.data || [])
+            const detachedSubItems = (this.data || [])
                 .reduce((res, rootItem) => {
                 var _a;
+                const subItems = (_a = rootItem.$children) === null || _a === void 0 ? void 0 : _a.value;
+                if (isEmptyArray(subItems))
+                    return res;
                 rootItem.$children.next([]);
-                return res.concat(((_a = rootItem.$children) === null || _a === void 0 ? void 0 : _a.value) || []);
-            }, []);
+                return res.concat(subItems);
+            }, this._detachedSubItems || []);
             // Reset base root items (clean items added by config)
             let items = this._staticItems.slice();
             // Concat config's items
@@ -23357,7 +23381,7 @@ class MenuService extends StartableObservableService {
                 .map(item => {
                 // Generate item's id (if need)
                 if (isNil(item.id))
-                    item.id = this._itemCounter++;
+                    item.id = this.computeNewId();
                 // Replace title using properties
                 if (isNotNilOrBlank(item.titleProperty) && config) {
                     const title = config.properties[item.titleProperty];
@@ -23367,8 +23391,13 @@ class MenuService extends StartableObservableService {
                 return item;
             });
             // Re-attach sub menu items
-            if (detachedItems.length) {
-                yield this.addSubMenuItems(detachedItems, { skipIfExists: false, availableParents: detachedItems.concat(items) });
+            if (detachedSubItems.length) {
+                if (account) {
+                    yield this.addSubMenuItems(detachedSubItems, { skipIfExists: false, availableParents: detachedSubItems.concat(items) });
+                }
+                else {
+                    this._detachedSubItems = detachedSubItems;
+                }
             }
             if (this._debug)
                 console.debug(`${this._logPrefix}Found ${items.length} visible items...`);
@@ -23376,7 +23405,7 @@ class MenuService extends StartableObservableService {
         });
     }
     _findExistingItem(item, items) {
-        items = items || this._detachedItems.concat(this.data);
+        items = items || this._detachedSubItems.concat(this.data);
         if (!items.length)
             return undefined; // Not found
         for (const i of items) {
@@ -23390,7 +23419,7 @@ class MenuService extends StartableObservableService {
     _findParent(childItem, availableParents) {
         if (!(childItem === null || childItem === void 0 ? void 0 : childItem.path))
             return undefined;
-        availableParents = availableParents || this._detachedItems.concat(this.data);
+        availableParents = availableParents || this._detachedSubItems.concat(this.data);
         return availableParents.reduce((res, item) => {
             var _a, _b;
             if (!(item === null || item === void 0 ? void 0 : item.path))
@@ -23790,7 +23819,6 @@ class SubMenuTabDirective {
     }
     ngOnChanges(changes) {
         if (changes.disabled || changes.label || changes.subMenuTitle || changes.parentPath || changes.path) {
-            console.log('TODO received tab=' + (this.subMenuTitle || this.label), this.path);
             if (this.disabled) {
                 if (this._menuItem)
                     this.menuService.removeSubMenuItem(this._menuItem);
@@ -23820,10 +23848,11 @@ class SubMenuTabDirective {
                     return; // Skip if no changes
                 menuItem.id = this._menuItem.id;
             }
-            //if (!menuItem.parentPath) return; // Skip if no parent
-            //if (isNil(menuItem.title)) return; // Skip if no title
-            menuItem = yield this.menuService.addSubMenuItem(menuItem, { skipIfExists: false });
-            this._menuItem = menuItem;
+            else {
+                menuItem.id = this.menuService.computeNewId();
+                this._menuItem = menuItem;
+            }
+            this._menuItem = yield this.menuService.addSubMenuItem(menuItem, { skipIfExists: false });
         });
     }
 }
@@ -37190,21 +37219,15 @@ class MenuTestingPage extends AppTabEditor {
         this.thirdTabTitle = '';
         this.parentPath = null;
         this.showOtherLinks = true;
-        this.$title = new BehaviorSubject('');
-        this.$secondTabTitle = new BehaviorSubject('Second');
+        this.$title = new Subject();
+        this.$secondTabTitle = new Subject();
     }
     set title(value) {
         this.$title.next(value);
     }
-    get title() {
-        return this.$title.value;
-    }
     set secondTabTitle(value) {
         this.$secondTabTitle.next(value);
     }
-    get secondTabTitle() {
-        return this.$secondTabTitle.value;
-    }
     ngOnInit() {
         console.debug(`${this.logPrefix} Init page...`);
         super.ngOnInit();
@@ -37328,34 +37351,28 @@ const routes$4 = [
                 pathMatch: 'full',
                 component: MenuTestingPage,
                 data: {
-                    test: 'empty'
-                }
+                    test: 'empty',
+                },
             },
             {
                 path: 'others',
-                // component: OtherMenuTestingPage,
+                canActivate: [AuthGuardService],
+                data: {
+                    profile: 'USER',
+                },
                 children: [
                     {
                         path: ':otherId',
+                        pathMatch: 'full',
                         component: OtherMenuTestingPage,
+                        canActivate: [AuthGuardService],
+                        data: {
+                            profile: 'ADMIN',
+                        },
                     },
-                ]
-                // canActivate: [
-                //   <CanActivateFn>(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => {
-                //     console.log('TODO canActivate', route.data?.tabs);
-                //
-                //     if (route.component?.['tabsChanges']) {
-                //       (route.component as any).tabsChanges
-                //         .subscribe(tabs => {
-                //           console.log('TODO tabs', tabs);
-                //         });
-                //     }
-                //
-                //     return true;
-                //   }
-                // ]
+                ],
             },
-        ]
+        ],
     },
 ];
 class MenuTestingModule {