From 8e567cd483b5de9b64554486b7e29dd09ea202fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Grzegorz=20Ja=C5=9Bkowski?= <138671284+g-jaskowski@users.noreply.github.com> Date: Tue, 13 Feb 2024 11:28:33 +0100 Subject: [PATCH] [ACS-6641] fix advanced search filters not displaying, fix libraries search option unchecking (#3633) --- .../search-input/search-input.component.ts | 2 +- .../search-libraries-results.component.html | 2 +- .../search-libraries-results.component.scss | 8 +- .../search-results.component.scss | 236 +++++++++--------- 4 files changed, 125 insertions(+), 123 deletions(-) diff --git a/projects/aca-content/src/lib/components/search/search-input/search-input.component.ts b/projects/aca-content/src/lib/components/search/search-input/search-input.component.ts index 0aa5d5b985..a5eff509ff 100644 --- a/projects/aca-content/src/lib/components/search/search-input/search-input.component.ts +++ b/projects/aca-content/src/lib/components/search/search-input/search-input.component.ts @@ -92,7 +92,7 @@ export class SearchInputComponent implements OnInit, OnDestroy { { id: SearchOptionIds.Libraries, key: 'SEARCH.INPUT.LIBRARIES', - value: false, + value: this.onLibrariesSearchResults, shouldDisable: this.isContentChecked.bind(this) } ]; diff --git a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.html b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.html index 368f5a86d0..13f7a57085 100644 --- a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.html +++ b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.html @@ -10,7 +10,7 @@
-
+
{{ 'APP.BROWSE.SEARCH_LIBRARIES.FOUND_RESULTS' | translate: { number: totalResults } }} diff --git a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.scss b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.scss index aac217e30d..fb8decd0fd 100644 --- a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.scss +++ b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.scss @@ -11,7 +11,7 @@ aca-search-results { &__content { @include flex-column; - border-left: 1px solid #eee; + border-left: 1px solid var(--theme-border-color); } &__content-header { @@ -19,7 +19,8 @@ aca-search-results { padding: 0 25px; flex-direction: row; align-items: center; - border-bottom: 1px solid #eee; + border-bottom: 1px solid var(--theme-border-color); + border-top: 1px solid var(--theme-border-color); } &--info-text { @@ -28,7 +29,7 @@ aca-search-results { color: rgba(0, 0, 0, 0.54); } - .aca-content { + .aca-content-lib { @include flex-row; flex: unset; @@ -36,6 +37,7 @@ aca-search-results { padding-top: 8px; padding-bottom: 8px; flex-wrap: wrap; + background-color: var(--theme-card-background-color); &__side--left { @include flex-column; diff --git a/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss b/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss index 3a20a9a9d8..9a0cbe4844 100644 --- a/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss +++ b/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss @@ -4,154 +4,154 @@ aca-search-results { .aca-search-toolbar-spacer { width: 100%; } -} - -.adf-search-results { - @include flex-row; - &__facets { - display: flex; - flex-direction: row; - margin-top: 5px; - margin-bottom: 15px; - } + .adf-search-results { + @include flex-row; - &__content { - @include flex-column; + &__facets { + display: flex; + flex-direction: row; + margin-top: 5px; + margin-bottom: 15px; + } - border-left: 1px solid var(--theme-border-color); - } + &__content { + @include flex-column; - &__content-header { - display: flex; - padding: 0 25px; - flex-direction: row; - align-items: center; - border-top: 1px solid var(--theme-border-color); - border-bottom: 1px solid var(--theme-border-color); - - .aca-content__advanced-filters { - .adf-search-filter-chip, - .adf-search-filter-chip-tabbed { - background-color: var(--theme-dropdown-color); - color: var(--theme-selected-text-color); - - &:hover, - &:focus { - background-color: var(--theme-dropdown-background-hover); - } + border-left: 1px solid var(--theme-border-color); + } - &[disabled] { - background-color: var(--theme-disabled-chip-background-color); - color: var(--theme-search-chip-icon-color); + &__content-header { + display: flex; + padding: 0 25px; + flex-direction: row; + align-items: center; + border-top: 1px solid var(--theme-border-color); + border-bottom: 1px solid var(--theme-border-color); + + .aca-content__advanced-filters { + .adf-search-filter-chip, + .adf-search-filter-chip-tabbed { + background-color: var(--theme-dropdown-color); + color: var(--theme-selected-text-color); + + &:hover, + &:focus { + background-color: var(--theme-dropdown-background-hover); + } + + &[disabled] { + background-color: var(--theme-disabled-chip-background-color); + color: var(--theme-search-chip-icon-color); + } + + mat-icon { + color: var(--theme-search-chip-icon-color); + } } - mat-icon { - color: var(--theme-search-chip-icon-color); + .adf-search-filter-placeholder { + color: var(--theme-selected-text-color); } } - - .adf-search-filter-placeholder { - color: var(--theme-selected-text-color); - } } - } - &--info-text { - flex: 1; - font-size: 16px; - color: rgba(0, 0, 0, 0.54); - } + &--info-text { + flex: 1; + font-size: 16px; + color: rgba(0, 0, 0, 0.54); + } - &--embedded_viewer { - position: unset; - display: flex; - width: 100%; - } + &--embedded_viewer { + position: unset; + display: flex; + width: 100%; + } - &--right_panel_section { - display: flex; - justify-content: flex-start; - } + &--right_panel_section { + display: flex; + justify-content: flex-start; + } - &--right_panel_section-extended { - display: flex; - justify-content: flex-start; - flex-basis: 55%; - } + &--right_panel_section-extended { + display: flex; + justify-content: flex-start; + flex-basis: 55%; + } - &--preview-toolbar { - display: flex; - align-items: flex-end; - justify-content: space-between; - margin: 5px; - padding-right: 24px; - } + &--preview-toolbar { + display: flex; + align-items: flex-end; + justify-content: space-between; + margin: 5px; + padding-right: 24px; + } - &--visibility_button { - margin-right: 8px; - } + &--visibility_button { + margin-right: 8px; + } - .adf-search-filter { - min-width: 260px; - max-width: 320px; - padding: 5px; - height: 100%; - overflow: scroll; + .adf-search-filter { + min-width: 260px; + max-width: 320px; + padding: 5px; + height: 100%; + overflow: scroll; - &--hidden { - display: none; + &--hidden { + display: none; + } } - } - .aca-content { - box-sizing: border-box; - display: flex; - place-content: flex-start space-between; - align-items: flex-start; - padding: 16px 12px; - background-color: var(--theme-card-background-color); - - &__filter-set { - p { - padding: 0 16px; + .aca-content { + box-sizing: border-box; + display: flex; + place-content: flex-start space-between; + align-items: flex-start; + padding: 16px 12px; + background-color: var(--theme-card-background-color); + + &__filter-set { + p { + padding: 0 16px; + } } - } - &__divider { - height: 100%; - } + &__divider { + height: 100%; + } - &__advanced-filters { - width: 100%; - padding: 0 12px; + &__advanced-filters { + width: 100%; + padding: 0 12px; - &--header { - display: flex; - justify-content: space-between; + &--header { + display: flex; + justify-content: space-between; + } } - } - &__reset-action { - line-height: 33px; - font-weight: lighter; - } + &__reset-action { + line-height: 33px; + font-weight: lighter; + } - &__sort-picker { - min-width: 220px; + &__sort-picker { + min-width: 220px; + } } - } - .adf-datatable { - aca-search-action-menu button { - width: 0; - } + .adf-datatable { + aca-search-action-menu button { + width: 0; + } - .aca-location-link a { - font-size: 12px; - max-width: 350px; - text-align: left; - direction: rtl; + .aca-location-link a { + font-size: 12px; + max-width: 350px; + text-align: left; + direction: rtl; + } } } }