From 9efd5a1f543682492b15aba84244352e9e8f7b14 Mon Sep 17 00:00:00 2001
From: "Sudczak, Jan" <jan.sudczak@sap.com>
Date: Mon, 1 Apr 2019 09:51:13 +0200
Subject: [PATCH 1/5] =?UTF-8?q?Add=20=E2=80=98isHidden=E2=80=99=20prop=20t?=
 =?UTF-8?q?o=20Authorization=20component?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/src/Authorization.html     |   3 +
 core/src/navigation/TopNav.html | 315 ++++++++++++++++----------------
 2 files changed, 165 insertions(+), 153 deletions(-)

diff --git a/core/src/Authorization.html b/core/src/Authorization.html
index 02809c2a0f..3363f89fe2 100644
--- a/core/src/Authorization.html
+++ b/core/src/Authorization.html
@@ -1,3 +1,5 @@
+
+{#if !isHidden}
 <ul class="fd-menu__list">
     {#if isLoggedIn}
       <li on:click=onLogoutClick()>
@@ -9,6 +11,7 @@
       </li>
     {/if}
 </ul>
+{/if}
 
 <script type="text/javascript">
   import { LuigiConfig } from './services/config.js';
diff --git a/core/src/navigation/TopNav.html b/core/src/navigation/TopNav.html
index 96ef60b18d..ade2d3caf9 100644
--- a/core/src/navigation/TopNav.html
+++ b/core/src/navigation/TopNav.html
@@ -1,176 +1,182 @@
 <svelte:window on:click="closeAllDropdowns()" on:blur="closeAllDropdowns()" />
-
-<div class="fd-shellbar {hideNavComponent ? 'hideNavComponent' : ''}">
-  <div class="fd-shellbar__group fd-shellbar__group--start">
-    <LogoTitle />
-  </div>
-  <div class="fd-shellbar__group fd-shellbar__group--end">
-    <div class="fd-shellbar__actions">
-      {#if !authorizationEnabled || isLoggedIn}
-      <ContextSwitcher
-        bind:dropDownStates
-        on:toggleDropdownState="toggleDropdownState(event.name)"
-      />
-      {/if} 
-      {#if children && pathData.length > 0} 
-        {#each children as node} 
-          {#if !node.hideFromNav}
-          <div
-            class="fd-shellbar__action fd-shellbar__action--hide fd-shellbar__action--collapsible"
-          >
-            <button
-              title="{node.label}"
-              class="fd-button--shell {node === selectedNode ? 'is-selected' : ''} {node.externalLink && node.externalLink.url ? 'fd-global-nav__btn--external' : ''}"
-              aria-controls="0AcWE812"
-              aria-expanded="false"
-              aria-haspopup="true"
-              on:click="handleClick(node)"
+{isLoggedIn}
+{#if authorizationEnabled && isLoggedIn || !authorizationEnabled }
+  <div class="fd-shellbar {hideNavComponent ? 'hideNavComponent' : ''}">
+    <div class="fd-shellbar__group fd-shellbar__group--start">
+      <LogoTitle /> 
+    </div>
+    <div class="fd-shellbar__group fd-shellbar__group--end">
+      <div class="fd-shellbar__actions">
+        {#if !authorizationEnabled || isLoggedIn}
+        <ContextSwitcher
+          bind:dropDownStates
+          on:toggleDropdownState="toggleDropdownState(event.name)"
+        />
+        {/if} 
+        {#if children && pathData.length > 0} 
+          {#each children as node} 
+            {#if !node.hideFromNav}
+            <div
+              class="fd-shellbar__action fd-shellbar__action--hide fd-shellbar__action--collapsible"
             >
-              {#if node.icon} {#if hasOpenUIicon(node)}
-              <span
-                class="fd-top-nav__icon sap-icon--{node.icon} sap-icon--m"
-              ></span>
-              {:else}
-              <img
-                class="fd-top-nav__icon nav-icon"
-                src="{node.icon}"
+              <button
+                title="{node.label}"
+                class="fd-button--shell {node === selectedNode ? 'is-selected' : ''} {node.externalLink && node.externalLink.url ? 'fd-global-nav__btn--external' : ''}"
+                aria-controls="0AcWE812"
+                aria-expanded="false"
+                aria-haspopup="true"
+                on:click="handleClick(node)"
               >
-              {/if}
-              {:else} {node.label} {/if} {#if node.externalLink &&
-              node.externalLink.url}
-              <span
-                class="sap-icon--action sap-icon--s"
-              ></span>
-              {/if}
-            </button>
-          </div>
-          {/if} 
-        {/each}
-        {#if isProductSwitcherAvailable}
-          <ProductSwitcher
-            bind:dropDownStates
-            on:toggleDropdownState="toggleDropdownState(event.name)"
-            isMobile={false}
-          />
-        {/if}
-        <!-- Sample Markup for Notifications
-            <div class="fd-shellbar__action fd-shellbar__action--collapsible">
-              <button class=" fd-button--shell sap-icon--bell" aria-label="Notifications">
-                <span class="fd-counter fd-counter--notification" aria-label="Unread count">25</span>
+                {#if node.icon} {#if hasOpenUIicon(node)}
+                <span
+                  class="fd-top-nav__icon sap-icon--{node.icon} sap-icon--m"
+                ></span>
+                {:else}
+                <img
+                  class="fd-top-nav__icon nav-icon"
+                  src="{node.icon}"
+                >
+                {/if}
+                {:else} {node.label} {/if} {#if node.externalLink &&
+                node.externalLink.url}
+                <span
+                  class="sap-icon--action sap-icon--s"
+                ></span>
+                {/if}
               </button>
-            </div> 
-        -->
+            </div>
+            {/if} 
+          {/each}
+          {#if isProductSwitcherAvailable}
+            <ProductSwitcher
+              bind:dropDownStates
+              on:toggleDropdownState="toggleDropdownState(event.name)"
+              isMobile={false}
+            />
+          {/if}
+          <!-- Sample Markup for Notifications
+              <div class="fd-shellbar__action fd-shellbar__action--collapsible">
+                <button class=" fd-button--shell sap-icon--bell" aria-label="Notifications">
+                  <span class="fd-counter fd-counter--notification" aria-label="Unread count">25</span>
+                </button>
+              </div> 
+          -->
 
-        <!-- dropdown for top nav nodes on smaller screens -->
-        {#if visibleNodeCount > 0}
-        <div class="fd-shellbar__action fd-shellbar__action--collapse">
-          <div class="fd-shellbar-collapse">
-            <div class="fd-popover fd-popover--right">
-              <div class="fd-popover__control" on:click="event.stopPropagation()">
-                <div
-                  class="fd-shellbar-collapse--control"
-                  aria-controls="eYVEJ960"
-                  aria-expanded="false"
-                  aria-haspopup="true"
-                  role="button"
-                >
-                  <button
-                    class="fd-button--shell sap-icon--overflow"
-                    aria-controls="overflowPopover"
-                    aria-expanded="{dropDownStates.overflowPopover || false}"
+          <!-- dropdown for top nav nodes on smaller screens -->
+          {#if visibleNodeCount > 0}
+          <div class="fd-shellbar__action fd-shellbar__action--collapse">
+            <div class="fd-shellbar-collapse">
+              <div class="fd-popover fd-popover--right">
+                <div class="fd-popover__control" on:click="event.stopPropagation()">
+                  <div
+                    class="fd-shellbar-collapse--control"
+                    aria-controls="eYVEJ960"
+                    aria-expanded="false"
                     aria-haspopup="true"
-                    on:click="toggleDropdownState('overflowPopover')"
-                    data-cy="mobile-menu"
+                    role="button"
                   >
-                    <!-- <span class="fd-counter fd-counter--notification" aria-label="Unread count">25</span> -->
-                  </button>
+                    <button
+                      class="fd-button--shell sap-icon--overflow"
+                      aria-controls="overflowPopover"
+                      aria-expanded="{dropDownStates.overflowPopover || false}"
+                      aria-haspopup="true"
+                      on:click="toggleDropdownState('overflowPopover')"
+                      data-cy="mobile-menu"
+                    >
+                      <!-- <span class="fd-counter fd-counter--notification" aria-label="Unread count">25</span> -->
+                    </button>
+                  </div>
                 </div>
-              </div>
-              <div
-                class="fd-popover__body fd-popover__body--right"
-                aria-hidden="{!(dropDownStates.overflowPopover || false)}"
-                id="overflowPopover"
-              >
-                <nav class="fd-menu">
-                  <ul class="fd-menu__list">
-                    {#each children as node} {#if !node.hideFromNav}
-                    <li>
-                      <a
-                        class="fd-menu__item {node === selectedNode ? 'is-selected' : ''} {node.externalLink && node.externalLink.url ? 'fd-global-nav__btn--external' : ''}"
-                        on:click="handleClick(node)"
-                      >
-                        {#if node.icon} {#if hasOpenUIicon(node)}
-                        <span
-                          class="fd-top-nav__icon sap-icon--{node.icon} sap-icon--m"
-                        ></span>
-                        {:else}
-                        <img
-                          class="fd-top-nav__icon nav-icon"
-                          src="{node.icon}"
+                <div
+                  class="fd-popover__body fd-popover__body--right"
+                  aria-hidden="{!(dropDownStates.overflowPopover || false)}"
+                  id="overflowPopover"
+                >
+                  <nav class="fd-menu">
+                    <ul class="fd-menu__list">
+                      {#each children as node} {#if !node.hideFromNav}
+                      <li>
+                        <a
+                          class="fd-menu__item {node === selectedNode ? 'is-selected' : ''} {node.externalLink && node.externalLink.url ? 'fd-global-nav__btn--external' : ''}"
+                          on:click="handleClick(node)"
                         >
-                        {/if} {:else} {node.label} {/if} {#if node.externalLink &&
-                        node.externalLink.url}
-                        <span
-                          class="sap-icon--action sap-icon--s"
-                        ></span>
-                        {/if}
-                      </a>
-                    </li>
-                    {/if} 
-                    {/each}
-                    {#if isProductSwitcherAvailable}
-                      <li>       
-                        <a class="fd-menu__item" on:click="openMobileProductSwitcher(event)"  data-cy="mobile-product-switcher">            
-                           <span class="fd-top-nav__icon sap-icon--grid sap-icon--m">
-                           </span>                  
-                          My Products
+                          {#if node.icon} {#if hasOpenUIicon(node)}
+                          <span
+                            class="fd-top-nav__icon sap-icon--{node.icon} sap-icon--m"
+                          ></span>
+                          {:else}
+                          <img
+                            class="fd-top-nav__icon nav-icon"
+                            src="{node.icon}"
+                          >
+                          {/if} {:else} {node.label} {/if} {#if node.externalLink &&
+                          node.externalLink.url}
+                          <span
+                            class="sap-icon--action sap-icon--s"
+                          ></span>
+                          {/if}
                         </a>
-                        
                       </li>
-                      
-                    {/if}
-                  </ul>
-                </nav>
+                      {/if} 
+                      {/each}
+                      {#if isProductSwitcherAvailable}
+                        <li>       
+                          <a class="fd-menu__item" on:click="openMobileProductSwitcher(event)"  data-cy="mobile-product-switcher">            
+                            <span class="fd-top-nav__icon sap-icon--grid sap-icon--m">
+                            </span>                  
+                            My Products
+                          </a>
+                          
+                        </li>
+                        
+                      {/if}
+                    </ul>
+                  </nav>
+                </div>
+                {#if isProductSwitcherAvailable}
+                    <ProductSwitcher
+                    bind:dropDownStates
+                    on:toggleDropdownState="toggleDropdownState(event.name)"
+                    isMobile={true}
+                  />
+                {/if}
               </div>
-              {#if isProductSwitcherAvailable}
-                  <ProductSwitcher
-                  bind:dropDownStates
-                  on:toggleDropdownState="toggleDropdownState(event.name)"
-                  isMobile={true}
-                />
-              {/if}
             </div>
           </div>
-        </div>
+          {/if} 
         {/if} 
-      {/if} 
-      {#if authorizationEnabled}
-        <div class="fd-shellbar__action fd-shellbar__action--show-always">
-          <div class="fd-popover">
-            <div class="fd-popover__control" on:click="event.stopPropagation()">
-              <button
-                class="fd-button--shell sap-icon--customer"
-                aria-expanded="{dropDownStates.profilePopover || false}"
-                aria-haspopup="true"
-                on:click="toggleDropdownState('profilePopover')"
-              ></button>
-              <div
-                class="fd-popover__body fd-popover__body--right"
-                aria-hidden="{!(dropDownStates.profilePopover || false)}"
-                id="profilePopover"
-              >
-                <nav class="fd-menu">
-                  <Authorization/>
-                </nav>
+        {#if authorizationEnabled}
+          <div class="fd-shellbar__action fd-shellbar__action--show-always">
+            <div class="fd-popover">
+              <div class="fd-popover__control" on:click="event.stopPropagation()">
+                <button
+                  class="fd-button--shell sap-icon--customer"
+                  aria-expanded="{dropDownStates.profilePopover || false}"
+                  aria-haspopup="true"
+                  on:click="toggleDropdownState('profilePopover')"
+                ></button>
+                <div
+                  class="fd-popover__body fd-popover__body--right"
+                  aria-hidden="{!(dropDownStates.profilePopover || false)}"
+                  id="profilePopover"
+                >
+                  <nav class="fd-menu">
+                    <Authorization/>
+                  </nav>
+                </div>
               </div>
             </div>
           </div>
-        </div>
-      {/if} 
-    
+        {/if} 
+      
+      </div>
     </div>
   </div>
-</div>
+{:else}
+  <Authorization isHidden={true}/>
+{/if}
+
+
 
 <script type="text/javascript">
   import ContextSwitcher from './ContextSwitcher.html';
@@ -218,6 +224,9 @@
     oncreate() {
       this.set({
         authorizationEnabled: LuigiConfig.isAuthorizationEnabled(),
+        autologinEnabled: !(LuigiConfig.getConfigValue(
+          'auth.disableAutoLogin'
+        ) || false),
         isProductSwitcherAvailable: LuigiConfig.getConfigValue(
           'navigation.productSwitcher'
         ),

From e99d0d0576a704e665d6ea43bc1b4ca49ad261db Mon Sep 17 00:00:00 2001
From: "Sudczak, Jan" <jan.sudczak@sap.com>
Date: Mon, 1 Apr 2019 10:03:22 +0200
Subject: [PATCH 2/5] Render TopNav only if needed

---
 core/src/navigation/TopNav.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/src/navigation/TopNav.html b/core/src/navigation/TopNav.html
index ade2d3caf9..c95da253a0 100644
--- a/core/src/navigation/TopNav.html
+++ b/core/src/navigation/TopNav.html
@@ -1,6 +1,5 @@
 <svelte:window on:click="closeAllDropdowns()" on:blur="closeAllDropdowns()" />
-{isLoggedIn}
-{#if authorizationEnabled && isLoggedIn || !authorizationEnabled }
+{#if authorizationEnabled && (!autologinEnabled || isLoggedIn) || !authorizationEnabled }
   <div class="fd-shellbar {hideNavComponent ? 'hideNavComponent' : ''}">
     <div class="fd-shellbar__group fd-shellbar__group--start">
       <LogoTitle /> 

From 46398e43f26cecd25f6fcca82d7b3c988a9cbc25 Mon Sep 17 00:00:00 2001
From: "Sudczak, Jan" <jan.sudczak@sap.com>
Date: Wed, 3 Apr 2019 13:04:49 +0200
Subject: [PATCH 3/5] Small refactoring

---
 core/src/navigation/TopNav.html | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/src/navigation/TopNav.html b/core/src/navigation/TopNav.html
index c95da253a0..10d9614be8 100644
--- a/core/src/navigation/TopNav.html
+++ b/core/src/navigation/TopNav.html
@@ -1,5 +1,5 @@
 <svelte:window on:click="closeAllDropdowns()" on:blur="closeAllDropdowns()" />
-{#if authorizationEnabled && (!autologinEnabled || isLoggedIn) || !authorizationEnabled }
+{#if showTopNav}
   <div class="fd-shellbar {hideNavComponent ? 'hideNavComponent' : ''}">
     <div class="fd-shellbar__group fd-shellbar__group--start">
       <LogoTitle /> 
@@ -223,9 +223,9 @@
     oncreate() {
       this.set({
         authorizationEnabled: LuigiConfig.isAuthorizationEnabled(),
-        autologinEnabled: !(LuigiConfig.getConfigValue(
+        autologinEnabled: !Boolean(LuigiConfig.getConfigValue(
           'auth.disableAutoLogin'
-        ) || false),
+        )),
         isProductSwitcherAvailable: LuigiConfig.getConfigValue(
           'navigation.productSwitcher'
         ),
@@ -246,7 +246,10 @@
         isLoggedIn: false
       };
     },
-    computed: {},
+    computed: {
+      showTopNav:({authorizationEnabled,autologinEnabled,isLoggedIn})=>
+        authorizationEnabled && (!autologinEnabled || isLoggedIn) || !authorizationEnabled 
+    },
     helpers: {
       hasOpenUIicon(node) {
         return NavigationHelpers.isOpenUIiconName(node.icon);

From 37359e2e8755ece3fb907a8b5e9b4972a0c2fa6f Mon Sep 17 00:00:00 2001
From: "Sudczak, Jan" <jan.sudczak@sap.com>
Date: Wed, 3 Apr 2019 13:31:23 +0200
Subject: [PATCH 4/5] Some more tiny improvements

---
 core/src/Authorization.html     | 5 +++++
 core/src/navigation/TopNav.html | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/src/Authorization.html b/core/src/Authorization.html
index 3363f89fe2..cc69ebc34a 100644
--- a/core/src/Authorization.html
+++ b/core/src/Authorization.html
@@ -65,6 +65,11 @@
   };
 
   export default {
+    data() {
+      return{
+        isHidden:false
+      }
+    },
     oncreate() {
       if (!LuigiConfig.isAuthorizationEnabled()) {
         return;
diff --git a/core/src/navigation/TopNav.html b/core/src/navigation/TopNav.html
index 10d9614be8..89810dddd9 100644
--- a/core/src/navigation/TopNav.html
+++ b/core/src/navigation/TopNav.html
@@ -248,7 +248,7 @@
     },
     computed: {
       showTopNav:({authorizationEnabled,autologinEnabled,isLoggedIn})=>
-        authorizationEnabled && (!autologinEnabled || isLoggedIn) || !authorizationEnabled 
+        (authorizationEnabled && (!autologinEnabled || isLoggedIn)) || !authorizationEnabled 
     },
     helpers: {
       hasOpenUIicon(node) {

From 11cf0e20dc9d61a9076fb5a82497e4a2bd467f9b Mon Sep 17 00:00:00 2001
From: "Sudczak, Jan" <jan.sudczak@sap.com>
Date: Fri, 5 Apr 2019 09:10:57 +0200
Subject: [PATCH 5/5] Fix merge problems

---
 core/src/navigation/TopNav.html | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/core/src/navigation/TopNav.html b/core/src/navigation/TopNav.html
index 5d6ce5870b..9d4418b130 100644
--- a/core/src/navigation/TopNav.html
+++ b/core/src/navigation/TopNav.html
@@ -144,13 +144,7 @@
                 {/if}
               </div>
             </div>
-            {#if isProductSwitcherAvailable}
-            <ProductSwitcher
-              bind:dropDownStates
-              on:toggleDropdownState="toggleDropdownState(event.name)"
-              isMobile="{true}"
-            />
-            {/if}
+           
           </div>
           {/if} 
         {/if}