Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent unlogged rendering #451

Merged
merged 6 commits into from
Apr 5, 2019
Merged

Prevent unlogged rendering #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9efd5a1
Add ‘isHidden’ prop to Authorization component
parostatkiem-zz Apr 1, 2019
e99d0d0
Render TopNav only if needed
parostatkiem-zz Apr 1, 2019
46398e4
Small refactoring
parostatkiem-zz Apr 3, 2019
37359e2
Some more tiny improvements
parostatkiem-zz Apr 3, 2019
5159fa4
Merge branch 'master' of https://github.com/kyma-project/luigi into P…
parostatkiem-zz Apr 5, 2019
11cf0e2
Fix merge problems
parostatkiem-zz Apr 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions core/src/Authorization.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

{#if !isHidden}
<ul class="fd-menu__list">
{#if isLoggedIn}
<li on:click=onLogoutClick()>
Expand All @@ -9,6 +11,7 @@
</li>
{/if}
</ul>
{/if}

<script type="text/javascript">
import { LuigiConfig } from './services/config.js';
Expand Down Expand Up @@ -62,6 +65,11 @@
};

export default {
data() {
return{
isHidden:false
}
},
oncreate() {
if (!LuigiConfig.isAuthorizationEnabled()) {
return;
Expand Down
337 changes: 174 additions & 163 deletions core/src/navigation/TopNav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,180 +1,185 @@
<svelte:window on:click="closeAllDropdowns()" on:blur="closeAllDropdowns()"/>

<div class="fd-shellbar {hideNavComponent ? 'hideNavComponent' : ''}">
<div class="fd-shellbar__group fd-shellbar__group--start">
{#if responsiveNavSetting==="simple" || responsiveNavSetting==="simpleMobileOnly"}
<span class="sap-icon--menu2 lui-burger" on:click="burgerClicked()"></span>
{/if}
<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)"
>
{#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>
{/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"
<svelte:window on:click="closeAllDropdowns()" on:blur="closeAllDropdowns()" />
{#if showTopNav}
<div class="fd-shellbar {hideNavComponent ? 'hideNavComponent' : ''}">
<div class="fd-shellbar__group fd-shellbar__group--start">
{#if responsiveNavSetting==="simple" || responsiveNavSetting==="simpleMobileOnly"}
<span class="sap-icon--menu2 lui-burger" on:click="burgerClicked()"></span>
{/if}
<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"
role="button"
on:click="handleClick(node)"
>
<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"
{#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}"
>
<!-- <span class="fd-counter fd-counter--notification" aria-label="Unread count">25</span> -->
</button>
</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}"
>
{/if}{/if} {node.label} {#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
</a>
</li>
{/if}
</ul>
</nav>
{/if}
{:else} {node.label} {/if} {#if node.externalLink &&
node.externalLink.url}
<span
class="sap-icon--action sap-icon--s"
></span>
{/if}
</button>
</div>
{#if isProductSwitcherAvailable}
{/if}
{/each}
{#if isProductSwitcherAvailable}
<ProductSwitcher
bind:dropDownStates
on:toggleDropdownState="toggleDropdownState(event.name)"
isMobile="{true}"
isMobile={false}
/>
{/if}
{/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}"
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
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}"
>
{/if} {/if} {node.label} {#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
</a>

</li>

{/if}
</ul>
</nav>
</div>
{#if isProductSwitcherAvailable}
<ProductSwitcher
bind:dropDownStates
on:toggleDropdownState="toggleDropdownState(event.name)"
isMobile={true}
/>
{/if}
</div>
</div>

</div>
</div>
</div>
{/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}
{/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>
</div>
</div>
</div>
</div>
</div>
{/if}

</div>
{/if}

</div>
</div>
</div>
{:else}
<Authorization isHidden={true}/>
{/if}



<script type="text/javascript">
import ContextSwitcher from './ContextSwitcher.html';
Expand Down Expand Up @@ -222,6 +227,9 @@
oncreate() {
this.set({
authorizationEnabled: LuigiConfig.isAuthorizationEnabled(),
autologinEnabled: !Boolean(LuigiConfig.getConfigValue(
'auth.disableAutoLogin'
)),
isProductSwitcherAvailable: LuigiConfig.getConfigValue(
'navigation.productSwitcher'
),
Expand All @@ -245,7 +253,10 @@
isLoggedIn: false
};
},
computed: {},
computed: {
showTopNav:({authorizationEnabled,autologinEnabled,isLoggedIn})=>
(authorizationEnabled && (!autologinEnabled || isLoggedIn)) || !authorizationEnabled
},
helpers: {
hasOpenUIicon(node) {
return NavigationHelpers.isOpenUIiconName(node.icon);
Expand Down