@netgrif/components-core 6.4.0-beta.6 → 6.4.0-beta.7

package/fesm2020/netgrif-components-core.mjs

@@ -27613,8 +27613,9 @@ class AbstractNavigationDoubleDrawerComponent {
             return;
         }
         this._currentNode = node;
-        if (!node)
+        if (!node) {
             return;
+        }
         if (node.parentId && !node.parent) {
             if (node.parentId === this._uriService.root.id) {
                 node.parent = this._uriService.root;
@@ -27630,7 +27631,14 @@ class AbstractNavigationDoubleDrawerComponent {
                 });
             }
         }
-        this.resolveMenuItems(node);
+        if (this.nodeLoading$.isActive) {
+            this.nodeLoading$.subscribe(() => {
+                this.resolveMenuItems(node);
+            });
+        }
+        else {
+            this.resolveMenuItems(node);
+        }
     }
     resolveMenuItems(node) {
         if (this._uriService.isRoot(node)) {
@@ -27741,16 +27749,30 @@ class AbstractNavigationDoubleDrawerComponent {
         this._uriService.activeNode = this._currentNode.parent;
     }
     onItemClick(item) {
-        if (this.hasItemChildren(item) && !this.leftLoading$.isActive && !this.rightLoading$.isActive) {
-            const path = item.resource.immediateData.find(f => f.stringId === GroupNavigationConstants.ITEM_FIELD_ID_NODE_PATH)?.value;
-            this._uriService.getNodeByPath(path).subscribe(node => {
-                this._uriService.activeNode = node;
-            }, error => {
-                this._log.error(error);
-            });
+        if (item.resource === undefined) {
+            // custom view represented only in nae.json
+            if (item.processUri === this.currentNode.uriPath) {
+                this._uriService.activeNode = this._currentNode;
+            }
+            else {
+                this._uriService.activeNode = this._currentNode.parent;
+            }
         }
         else {
-            this._uriService.activeNode = this._currentNode;
+            const path = item.resource.immediateData.find(f => f.stringId === GroupNavigationConstants.ITEM_FIELD_ID_NODE_PATH)?.value;
+            if (this.hasItemChildren(item) && !this.leftLoading$.isActive && !this.rightLoading$.isActive) {
+                this._uriService.getNodeByPath(path).subscribe(node => {
+                    this._uriService.activeNode = node;
+                }, error => {
+                    this._log.error(error);
+                });
+            }
+            else if (!path.includes(this.currentNode.uriPath)) {
+                this._uriService.activeNode = this._currentNode.parent;
+            }
+            else {
+                this._uriService.activeNode = this._currentNode;
+            }
         }
     }
     hasItemChildren(item) {