[ACS-6641] fix advanced search filters not displaying, fix libraries search option unchecking (#3633)

This commit is contained in:
Grzegorz Jaśkowski
2024-02-13 11:28:33 +01:00
committed by GitHub
parent 1400545c2d
commit 8e567cd483
4 changed files with 132 additions and 130 deletions

View File

@@ -92,7 +92,7 @@ export class SearchInputComponent implements OnInit, OnDestroy {
{ {
id: SearchOptionIds.Libraries, id: SearchOptionIds.Libraries,
key: 'SEARCH.INPUT.LIBRARIES', key: 'SEARCH.INPUT.LIBRARIES',
value: false, value: this.onLibrariesSearchResults,
shouldDisable: this.isContentChecked.bind(this) shouldDisable: this.isContentChecked.bind(this)
} }
]; ];

View File

@@ -10,7 +10,7 @@
<div class="adf-search-results"> <div class="adf-search-results">
<div class="adf-search-results__content"> <div class="adf-search-results__content">
<mat-progress-bar *ngIf="isLoading" color="primary" mode="indeterminate"></mat-progress-bar> <mat-progress-bar *ngIf="isLoading" color="primary" mode="indeterminate"></mat-progress-bar>
<div class="adf-search-results__content-header aca-content" *ngIf="data?.list.entries.length"> <div class="adf-search-results__content-header aca-content-lib" *ngIf="data?.list.entries.length">
<div class="aca-content__side--left"> <div class="aca-content__side--left">
<div class="adf-search-results--info-text" *ngIf="totalResults !== 1"> <div class="adf-search-results--info-text" *ngIf="totalResults !== 1">
{{ 'APP.BROWSE.SEARCH_LIBRARIES.FOUND_RESULTS' | translate: { number: totalResults } }} {{ 'APP.BROWSE.SEARCH_LIBRARIES.FOUND_RESULTS' | translate: { number: totalResults } }}

View File

@@ -11,7 +11,7 @@ aca-search-results {
&__content { &__content {
@include flex-column; @include flex-column;
border-left: 1px solid #eee; border-left: 1px solid var(--theme-border-color);
} }
&__content-header { &__content-header {
@@ -19,7 +19,8 @@ aca-search-results {
padding: 0 25px; padding: 0 25px;
flex-direction: row; flex-direction: row;
align-items: center; 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 { &--info-text {
@@ -28,7 +29,7 @@ aca-search-results {
color: rgba(0, 0, 0, 0.54); color: rgba(0, 0, 0, 0.54);
} }
.aca-content { .aca-content-lib {
@include flex-row; @include flex-row;
flex: unset; flex: unset;
@@ -36,6 +37,7 @@ aca-search-results {
padding-top: 8px; padding-top: 8px;
padding-bottom: 8px; padding-bottom: 8px;
flex-wrap: wrap; flex-wrap: wrap;
background-color: var(--theme-card-background-color);
&__side--left { &__side--left {
@include flex-column; @include flex-column;

View File

@@ -4,154 +4,154 @@ aca-search-results {
.aca-search-toolbar-spacer { .aca-search-toolbar-spacer {
width: 100%; width: 100%;
} }
}
.adf-search-results { .adf-search-results {
@include flex-row; @include flex-row;
&__facets { &__facets {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
margin-top: 5px; margin-top: 5px;
margin-bottom: 15px; margin-bottom: 15px;
} }
&__content { &__content {
@include flex-column; @include flex-column;
border-left: 1px solid var(--theme-border-color); border-left: 1px solid var(--theme-border-color);
} }
&__content-header { &__content-header {
display: flex; display: flex;
padding: 0 25px; padding: 0 25px;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
border-top: 1px solid var(--theme-border-color); border-top: 1px solid var(--theme-border-color);
border-bottom: 1px solid var(--theme-border-color); border-bottom: 1px solid var(--theme-border-color);
.aca-content__advanced-filters { .aca-content__advanced-filters {
.adf-search-filter-chip, .adf-search-filter-chip,
.adf-search-filter-chip-tabbed { .adf-search-filter-chip-tabbed {
background-color: var(--theme-dropdown-color); background-color: var(--theme-dropdown-color);
color: var(--theme-selected-text-color); color: var(--theme-selected-text-color);
&:hover, &:hover,
&:focus { &:focus {
background-color: var(--theme-dropdown-background-hover); 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);
}
} }
&[disabled] { .adf-search-filter-placeholder {
background-color: var(--theme-disabled-chip-background-color); color: var(--theme-selected-text-color);
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);
}
}
}
&--info-text {
flex: 1;
font-size: 16px;
color: rgba(0, 0, 0, 0.54);
}
&--embedded_viewer {
position: unset;
display: flex;
width: 100%;
}
&--right_panel_section {
display: flex;
justify-content: flex-start;
}
&--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;
}
&--visibility_button {
margin-right: 8px;
}
.adf-search-filter {
min-width: 260px;
max-width: 320px;
padding: 5px;
height: 100%;
overflow: scroll;
&--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;
}
} }
&__divider { &--info-text {
height: 100%; flex: 1;
font-size: 16px;
color: rgba(0, 0, 0, 0.54);
} }
&__advanced-filters { &--embedded_viewer {
position: unset;
display: flex;
width: 100%; width: 100%;
padding: 0 12px; }
&--header { &--right_panel_section {
display: flex; display: flex;
justify-content: space-between; justify-content: flex-start;
}
&--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;
}
&--visibility_button {
margin-right: 8px;
}
.adf-search-filter {
min-width: 260px;
max-width: 320px;
padding: 5px;
height: 100%;
overflow: scroll;
&--hidden {
display: none;
} }
} }
&__reset-action { .aca-content {
line-height: 33px; box-sizing: border-box;
font-weight: lighter; 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%;
}
&__advanced-filters {
width: 100%;
padding: 0 12px;
&--header {
display: flex;
justify-content: space-between;
}
}
&__reset-action {
line-height: 33px;
font-weight: lighter;
}
&__sort-picker {
min-width: 220px;
}
} }
&__sort-picker { .adf-datatable {
min-width: 220px; aca-search-action-menu button {
} width: 0;
} }
.adf-datatable { .aca-location-link a {
aca-search-action-menu button { font-size: 12px;
width: 0; max-width: 350px;
} text-align: left;
direction: rtl;
.aca-location-link a { }
font-size: 12px;
max-width: 350px;
text-align: left;
direction: rtl;
} }
} }
} }