1
0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00

Remove additional separators when separated items are not shown for having no content

Co-authored-by: Janne Savolainen <janne.savolainen@live.fi>

Signed-off-by: Iku-turso <mikko.aspiala@gmail.com>
This commit is contained in:
Iku-turso 2022-10-20 14:12:54 +03:00 committed by Janne Savolainen
parent aa785c9738
commit 067ecd0eee
No known key found for this signature in database
GPG Key ID: 8C6CFB2FFFE8F68A
17 changed files with 7 additions and 494 deletions

View File

@ -154,13 +154,6 @@ exports[`add custom helm repository in preferences when navigating to preference
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -803,13 +796,6 @@ exports[`add custom helm repository in preferences when navigating to preference
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -1463,13 +1449,6 @@ exports[`add custom helm repository in preferences when navigating to preference
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -2234,13 +2213,6 @@ exports[`add custom helm repository in preferences when navigating to preference
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -2902,13 +2874,6 @@ exports[`add custom helm repository in preferences when navigating to preference
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -3673,13 +3638,6 @@ exports[`add custom helm repository in preferences when navigating to preference
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -4626,13 +4584,6 @@ exports[`add custom helm repository in preferences when navigating to preference
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -5397,13 +5348,6 @@ exports[`add custom helm repository in preferences when navigating to preference
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -6350,13 +6294,6 @@ exports[`add custom helm repository in preferences when navigating to preference
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -7122,13 +7059,6 @@ exports[`add custom helm repository in preferences when navigating to preference
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -7790,13 +7720,6 @@ exports[`add custom helm repository in preferences when navigating to preference
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -8447,13 +8370,6 @@ exports[`add custom helm repository in preferences when navigating to preference
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>

View File

@ -154,13 +154,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -803,13 +796,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -1463,13 +1449,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -1969,7 +1948,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
/>
</div>
<div
class="Select__menu-portal css-yj2v5g"
class="Select__menu-portal css-1no2yl0-MenuPortal"
>
<div
class="theme-lens selection-of-active-public-helm-repository-options Select__menu css-26l3qy-menu"
@ -2176,13 +2155,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -2836,13 +2808,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -3496,13 +3461,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -4145,13 +4103,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -4839,13 +4790,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -5379,7 +5323,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
/>
</div>
<div
class="Select__menu-portal css-yj2v5g"
class="Select__menu-portal css-1no2yl0-MenuPortal"
>
<div
class="theme-lens selection-of-active-public-helm-repository-options Select__menu css-26l3qy-menu"
@ -5596,13 +5540,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -6290,13 +6227,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>

View File

@ -154,13 +154,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -803,13 +796,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -1452,13 +1438,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -1993,13 +1972,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -2642,13 +2614,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -3183,13 +3148,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -3832,13 +3790,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -4526,13 +4477,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -5067,13 +5011,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -5608,13 +5545,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>

View File

@ -154,13 +154,6 @@ exports[`remove helm repository from list of active repositories in preferences
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -803,13 +796,6 @@ exports[`remove helm repository from list of active repositories in preferences
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -1463,13 +1449,6 @@ exports[`remove helm repository from list of active repositories in preferences
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -2123,13 +2102,6 @@ exports[`remove helm repository from list of active repositories in preferences
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>

View File

@ -165,13 +165,6 @@ exports[`preferences - closing-preferences given accessing preferences directly
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -873,13 +866,6 @@ exports[`preferences - closing-preferences given accessing preferences directly
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -1445,13 +1431,6 @@ exports[`preferences - closing-preferences given already in a page and then navi
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -2153,13 +2132,6 @@ exports[`preferences - closing-preferences given already in a page and then navi
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>

View File

@ -178,13 +178,6 @@ exports[`preferences: extension adding preference tabs given in preferences, whe
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>

View File

@ -153,20 +153,6 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -884,13 +870,6 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -1620,13 +1599,6 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>

View File

@ -153,13 +153,6 @@ exports[`preferences - navigation to application preferences given in some child
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -501,13 +494,6 @@ exports[`preferences - navigation to application preferences given in some child
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -1198,13 +1184,6 @@ exports[`preferences - navigation to application preferences given in some child
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>

View File

@ -153,13 +153,6 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -849,13 +842,6 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>

View File

@ -166,13 +166,6 @@ exports[`preferences - navigation to extension specific preferences given in pre
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -875,13 +868,6 @@ exports[`preferences - navigation to extension specific preferences given in pre
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -1208,13 +1194,6 @@ exports[`preferences - navigation to extension specific preferences given in pre
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -1541,13 +1520,6 @@ exports[`preferences - navigation to extension specific preferences given in pre
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -2202,13 +2174,6 @@ exports[`preferences - navigation to extension specific preferences given in pre
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -3966,13 +3931,6 @@ exports[`preferences - navigation to extension specific preferences given in pre
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>

View File

@ -153,13 +153,6 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -849,13 +842,6 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>

View File

@ -153,13 +153,6 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -849,13 +842,6 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>

View File

@ -165,13 +165,6 @@ exports[`preferences - navigation to telemetry preferences given URL for Sentry
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -484,13 +477,6 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -1192,13 +1178,6 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -1900,13 +1879,6 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -2209,13 +2181,6 @@ exports[`preferences - navigation to telemetry preferences given no URL for Sent
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>

View File

@ -153,13 +153,6 @@ exports[`preferences - navigation to terminal preferences given in preferences,
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>
@ -849,13 +842,6 @@ exports[`preferences - navigation to terminal preferences given in preferences,
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>

View File

@ -371,13 +371,6 @@ exports[`preferences - navigation using application menu when navigating to pref
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>

View File

@ -374,13 +374,6 @@ exports[`show-about-using-tray when navigating using tray renders 1`] = `
</div>
</div>
</div>
<div
style="padding: 0px 10px;"
>
<div
class="HorizontalLine size-sm"
/>
</div>
</div>
</div>
</nav>

View File

@ -38,11 +38,6 @@ export const PreferencesNavigation = withInjectables<Dependencies>(
);
const toNavigationHierarchy = (composite: Composite<PreferenceTypes | PreferenceTabsRoot>) => {
// Note: This makes tab groups and tabs without content not render anything in navigation.
if (!hasContent(composite)) {
return emptyRender;
}
const value = composite.value;
switch (value.kind) {
@ -65,13 +60,14 @@ const toNavigationHierarchy = (composite: Composite<PreferenceTypes | Preference
<Icon
material={value.iconName}
smallest
className="mr-3"
/>
className="mr-3" />
)}
{value.label}
</div>
<Map items={composite.children}>{toNavigationHierarchy}</Map>
<Map items={composite.children.filter(hasContent)}>
{toNavigationHierarchy}
</Map>
</div>
);
}
@ -84,7 +80,7 @@ const toNavigationHierarchy = (composite: Composite<PreferenceTypes | Preference
return (
<Map
// Note: stricter typing for composite children could maybe remove this curiosity.
items={composite.children as Composite<PreferenceTypes>[]}
items={composite.children.filter(hasContent) as Composite<PreferenceTypes>[]}
getSeparator={value.childSeparator}
>
{toNavigationHierarchy}