From c0af1dcd74358cffbe4d7ceb0f2bbd379b2fc467 Mon Sep 17 00:00:00 2001 From: UlianaMunich Date: Mon, 29 Mar 2021 09:38:30 +0200 Subject: [PATCH 01/15] refactor user settings dialog to use byline component for left side navigatin --- core/src/UserSettingsDialog.html | 96 +++++++++++--------------------- 1 file changed, 34 insertions(+), 62 deletions(-) diff --git a/core/src/UserSettingsDialog.html b/core/src/UserSettingsDialog.html index ac9cdc0982..36ab021c4a 100644 --- a/core/src/UserSettingsDialog.html +++ b/core/src/UserSettingsDialog.html @@ -162,18 +162,18 @@ errorHandling(selectedUserSettingGroupData); if (event) { document - .querySelectorAll(".lui-us-list .fd-nested-list__link") + .querySelectorAll(".lui-us-list .lui-us-navlist__item") .forEach(elem => { elem.classList.remove("is-selected"); }); - const link = closest(event.target, ".fd-nested-list__link", 20); + const link = closest(event.target, ".lui-us-navlist__item", 20); link.classList.add("is-selected"); if (window.innerWidth < CSS_BREAKPOINTS.desktopMinWidth) { closeNavOnCategoryClickMobile(); } } else { document - .querySelectorAll(".lui-us-list .fd-nested-list__link")[0] + .querySelectorAll(".lui-us-list ..lui-us-navlist__item")[0] .classList.add("is-selected"); if ( window.innerWidth !== 0 && @@ -391,17 +391,6 @@ display: none; } - .fd-nested-list__item { - display: flex; - -webkit-box-align: center; - align-items: center; - position: relative; - -webkit-box-flex: 1; - flex: 1 1 auto; - max-width: 100%; - border-bottom-color: var(--sapList_GroupHeaderBorderColor, #d9d9d9); - } - .lui-usersettings-list-item__info-container { white-space: nowrap; overflow: hidden; @@ -410,11 +399,6 @@ align-items: center; } - .fd-nested-list__link { - height: 5rem; - padding: 1rem; - } - .lui-usersettings-list-item__info-container .sap-icon { font-size: 2rem; color: var(--sapContent_NonInteractiveIconColor); @@ -428,43 +412,6 @@ margin-right: 0.75rem; } - .lui-usersettings-list-item__title-container { - display: flex; - flex-direction: column; - flex: auto; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } - - .lui-usersettings-list-item__title { - color: var(--sapList_TextColor); - font-size: var(--sapFontSize, 14px); - font-weight: normal; - padding-top: 0.125rem; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - flex: 1 1 auto; - } - - .fd-nested-list__link:active .lui-usersettings-list-item__title, - .fd-nested-list__link:active .lui-usersettings-list-item__subtitle, - .fd-nested-list__link:active .fd-nested-list__icon { - color: var(--sapList_Active_TextColor, #fff); - } - - .lui-usersettings-list-item__subtitle { - font-size: var(--sapFontSize, 14px); - font-weight: normal; - color: var(--sapContent_LabelColor); - padding-top: 0.5rem; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - flex: 1 1 auto; - } - .iframeUserSettingsCtn { position: relative; width: 100%; @@ -567,18 +514,43 @@

- diff --git a/core/src/UserSettingsEditor.html b/core/src/UserSettingsEditor.html index 9b4df87a7d..7e5af277e6 100644 --- a/core/src/UserSettingsEditor.html +++ b/core/src/UserSettingsEditor.html @@ -156,8 +156,8 @@ }
- {#if userSettingGroup && userSettingGroup[0] && userSettingGroup[1]} - {#if userSettingGroup[1].settings} + {#if userSettingGroup && userSettingGroup[0] && userSettingGroup[1]} {#if + userSettingGroup[1].settings}
{#each Object.entries(userSettingGroup[1].settings) as [key, schemaItem], From 04cfa208f18f90b27e05a7da42827b1b16b40cdf Mon Sep 17 00:00:00 2001 From: UlianaMunich Date: Mon, 29 Mar 2021 23:28:34 +0200 Subject: [PATCH 04/15] fix user settings related tests --- core/src/UserSettingsDialog.html | 1 + core/src/UserSettingsEditor.html | 148 +++++++++--------- .../tests/0-fiddle/fiddle-navigation.spec.js | 12 +- .../1-angular/user_settings_dialog.spec.js | 24 +-- 4 files changed, 91 insertions(+), 94 deletions(-) diff --git a/core/src/UserSettingsDialog.html b/core/src/UserSettingsDialog.html index c44925f1f7..2c6714054e 100644 --- a/core/src/UserSettingsDialog.html +++ b/core/src/UserSettingsDialog.html @@ -533,6 +533,7 @@

tabindex="0" role="listitem" class="fd-list__item lui-us-navlist__item" + data-testid="us-navigation-item" on:click="{() => openEditor(userSettingsGroupProperty, event)}" on:keyup="{handleKeyUp}" > diff --git a/core/src/UserSettingsEditor.html b/core/src/UserSettingsEditor.html index 7e5af277e6..65d1a29157 100644 --- a/core/src/UserSettingsEditor.html +++ b/core/src/UserSettingsEditor.html @@ -164,8 +164,8 @@ i}
+ >{$getTranslation(schemaItem.label)}: +
{#if schemaItem.type==='string'} {#if schemaItem.isEditable || @@ -181,92 +181,88 @@ /> {:else} + >{storedUserSettingData[userSettingGroup[0]][key]} + {/if} {/if} {#if schemaItem.type==='enum' && (schemaItem.style === undefined || schemaItem.style === 'list')} -
-
-
-