@sumaris-net/ngx-components 2.4.131 → 2.4.132

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

@@ -22791,7 +22791,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();
@@ -22801,10 +22801,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();
@@ -22883,15 +22883,21 @@ class MenuService extends StartableObservableService {
                 console.debug(`${this._logPrefix}Received config or account event. Refreshing items...`, account);
             // Load all items
             const items = await 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 = {
             skipIfExists: true,
@@ -22902,7 +22908,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);
@@ -22914,17 +22920,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?.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)
@@ -22935,11 +22956,14 @@ 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) => {
+            const subItems = rootItem.$children?.value;
+            if (isEmptyArray(subItems))
+                return res;
             rootItem.$children.next([]);
-            return res.concat(rootItem.$children?.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
@@ -22988,7 +23012,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];
@@ -22998,15 +23022,20 @@ class MenuService extends StartableObservableService {
             return item;
         });
         // Re-attach sub menu items
-        if (detachedItems.length) {
-            await this.addSubMenuItems(detachedItems, { skipIfExists: false, availableParents: detachedItems.concat(items) });
+        if (detachedSubItems.length) {
+            if (account) {
+                await 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...`);
         return items;
     }
     _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) {
@@ -23020,7 +23049,7 @@ class MenuService extends StartableObservableService {
     _findParent(childItem, availableParents) {
         if (!childItem?.path)
             return undefined;
-        availableParents = availableParents || this._detachedItems.concat(this.data);
+        availableParents = availableParents || this._detachedSubItems.concat(this.data);
         return availableParents.reduce((res, item) => {
             if (!item?.path)
                 return res;
@@ -23395,7 +23424,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);
@@ -23424,10 +23452,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 = await this.menuService.addSubMenuItem(menuItem, { skipIfExists: false });
-        this._menuItem = menuItem;
+        else {
+            menuItem.id = this.menuService.computeNewId();
+            this._menuItem = menuItem;
+        }
+        this._menuItem = await this.menuService.addSubMenuItem(menuItem, { skipIfExists: false });
     }
 }
 SubMenuTabDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: SubMenuTabDirective, deps: [{ token: MenuService }, { token: i7$3.MatTabGroup }, { token: i7$3.MatTab }, { token: i1$5.Router }], target: i0.ɵɵFactoryTarget.Directive });
@@ -36336,21 +36365,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();
@@ -36466,34 +36489,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 {