From f62a36324767f829fec784b3e5f1567157638641 Mon Sep 17 00:00:00 2001
From: "Zherdetska Alona, IT21.1" <alona.zherdetska@post.ch>
Date: Fri, 4 Oct 2024 23:03:51 +0200
Subject: [PATCH] fix: revert changes of two previous commits

---
 packages/internet-header/src/models/header.model.ts |  2 +-
 .../internet-header/src/services/route.service.ts   | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/internet-header/src/models/header.model.ts b/packages/internet-header/src/models/header.model.ts
index f6484cab06..a31dde1a44 100644
--- a/packages/internet-header/src/models/header.model.ts
+++ b/packages/internet-header/src/models/header.model.ts
@@ -98,7 +98,7 @@ export interface NavMainEntity {
   isActive?: boolean;
   isActiveOverride?: boolean;
   noFlyout?: boolean;
-  flyout?: FlyoutEntity[];
+  flyout: FlyoutEntity[];
 }
 
 export interface FlyoutEntity {
diff --git a/packages/internet-header/src/services/route.service.ts b/packages/internet-header/src/services/route.service.ts
index f1e528b389..287c649f28 100644
--- a/packages/internet-header/src/services/route.service.ts
+++ b/packages/internet-header/src/services/route.service.ts
@@ -76,12 +76,13 @@ const resetOverrideConfig = (config: NavMainEntity[]): NavMainEntity[] => {
   return config.map(nav => ({
     ...nav,
     isActiveOverride: false,
-    // Initialize flyout as an empty array if it's undefined
-    flyout:
-      nav.flyout?.map(flyout => ({
-        ...flyout,
-        linkList: flyout.linkList.map(link => ({ ...link, isActiveOverride: false })),
-      })) || [], // Fallback to an empty array if nav.flyout is undefined
+    // Check if flyout exists before attempting to map
+    flyout: nav.flyout
+      ? nav.flyout.map(flyout => ({
+          ...flyout,
+          linkList: flyout.linkList.map(link => ({ ...link, isActiveOverride: false })),
+        }))
+      : [],
   }));
 };