Skip to content

Commit

Permalink
[ACS-6641] fix advanced search filters not displaying, fix libraries …
Browse files Browse the repository at this point in the history 
…search option unchecking (#3633)
  • Loading branch information
@g-jaskowski
g-jaskowski authored Feb 13, 2024
1 parent 1400545 commit 8e567cd
Show file tree
Hide file tree
Showing 4 changed files with 125 additions and 123 deletions.
2 changes: 1 addition & 1 deletion projects/aca-content/src/lib/components/search/search-input/search-input.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
];
Expand Down
2 changes: 1 addition & 1 deletion ...rc/lib/components/search/search-libraries-results/search-libraries-results.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="adf-search-results">
<div class="adf-search-results__content">
<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="adf-search-results--info-text" *ngIf="totalResults !== 1">
{{ 'APP.BROWSE.SEARCH_LIBRARIES.FOUND_RESULTS' | translate: { number: totalResults } }}
Expand Down
8 changes: 5 additions & 3 deletions ...rc/lib/components/search/search-libraries-results/search-libraries-results.component.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,16 @@ aca-search-results {
&__content {
@include flex-column;

border-left: 1px solid #eee;
border-left: 1px solid var(--theme-border-color);
}

&__content-header {
display: flex;
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 {
Expand All @@ -28,14 +29,15 @@ aca-search-results {
color: rgba(0, 0, 0, 0.54);
}

.aca-content {
.aca-content-lib {
@include flex-row;

flex: unset;
height: unset;
padding-top: 8px;
padding-bottom: 8px;
flex-wrap: wrap;
background-color: var(--theme-card-background-color);

&__side--left {
@include flex-column;
Expand Down
236 changes: 118 additions & 118 deletions projects/aca-content/src/lib/components/search/search-results/search-results.component.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
}

0 comments on commit 8e567cd

Please sign in to comment.