[NAE-2119] Fix MenuItem

Author: machacjozef

projects/netgrif-components-core/src/lib/navigation/model/uri-resource.ts

@@ -1,14 +1,15 @@
 
 export interface UriNodeResource {
-    id: string;
-    uriPath: string;
+    id?: string;
+    uriPath?: string;
+    path: string;
     name: string;
     parentId: string;
-    parent: UriNodeResource;
+    parent?: UriNodeResource;
     childrenId: Set<string>;
-    children: Set<UriNodeResource>;
+    children?: Set<UriNodeResource>;
     level: number;
-    contentTypes: Set<UriContentType>
+    contentTypes?: Set<UriContentType>
 }
 
 export enum UriContentType {

projects/netgrif-components-core/src/lib/navigation/navigation-double-drawer/abstract-navigation-double-drawer.ts

@@ -526,7 +526,7 @@ export abstract class AbstractNavigationDoubleDrawerComponent implements OnInit,
 
     protected getTranslation(value: I18nFieldValue): string {
         const locale = this._translateService.currentLang.split('-')[0];
-        return locale in value.translations ? value.translations[locale] : value.defaultValue;
+        return value.translations?.[locale] ?? value.defaultValue;
     }
 
     protected resolveAccessRoles(filter: Case, roleType: string): Array<RoleAccess> | undefined {

projects/netgrif-components-core/src/lib/navigation/service/uri-resource.service.ts

@@ -20,21 +20,53 @@ export class UriResourceService extends AbstractResourceService {
 
     public getRoot(): Observable<UriNodeResource> {
         return this._resourceProvider.get$('uri/root', this.SERVER_URL).pipe(
-            map(r => this.changeType(r, 'uriNode')));
+            map(r => this.changeType(r, 'uriNode')),
+            map((r: UriNodeResource) => {
+                if (r.path) {
+                    r.uriPath = r.path;
+                    r.id = r.path;
+                }
+                return r;
+            }));
     }
 
     public getByLevel(level: number): Observable<Array<UriNodeResource>> {
         return this._resourceProvider.get$('uri/level/' + level, this.SERVER_URL).pipe(
-            map(r => this.changeType(r, 'uriNodes')));
+            map(r => this.changeType(r, 'uriNodes')),
+            map((ar: Array<UriNodeResource>) => {
+                return ar.map(r => {
+                    if (r.path) {
+                        r.uriPath = r.path;
+                        r.id = r.path;
+                    }
+                    return r;
+                })
+            }));
     }
 
     public getNodesByParent(parentId: string): Observable<Array<UriNodeResource>> {
         return this._resourceProvider.get$('uri/parent/' + parentId, this.SERVER_URL).pipe(
-            map(r => this.changeType(r, 'uriNodes')));
+            map(r => this.changeType(r, 'uriNodes')),
+            map((ar: Array<UriNodeResource>) => {
+                return ar.map(r => {
+                    if (r.path) {
+                        r.uriPath = r.path;
+                        r.id = r.path;
+                    }
+                    return r;
+                })
+            }));
     }
 
     public getNodeByUri(uriPath: string): Observable<UriNodeResource> {
         return this._resourceProvider.get$('uri/' + btoa(uriPath), this.SERVER_URL).pipe(
-            map(r => this.changeType(r, 'uriNode')));
+            map(r => this.changeType(r, 'uriNode')),
+            map((r: UriNodeResource) => {
+                if (r.path) {
+                    r.uriPath = r.path;
+                    r.id = r.path;
+                }
+                return r;
+            }));
     }
 }