Editor: Add a search filters summary component #1037
There are no files selected for viewing
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <div *ngIf="(fieldValues$ | async)?.length > 0"> | ||
| <div | ||
| *ngIf="fieldType === 'dateRange'; else valuesBadge" | ||
| class="flex flex-row items-center gap-2" | ||
| > | ||
| <span class="text-gray-800" translate | ||
| >search.filters.summaryLabel.{{ fieldName }}</span | ||
| > | ||
| <gn-ui-badge | ||
| *ngFor="let fieldValue of dateRange$ | async" | ||
| [style.--gn-ui-badge-text-color]="'black'" | ||
| [style.--gn-ui-badge-background-color]="'#F2F2F2'" | ||
| [style.--gn-ui-badge-font-weight]="'700'" | ||
| [removable]="true" | ||
| (badgeRemoveClicked)="removeFilterValue(fieldValue)" | ||
| >{{ fieldValue['start'] | date: 'dd.MM.yyyy' }} - | ||
| {{ fieldValue['end'] | date: 'dd.MM.yyyy' }}</gn-ui-badge | ||
| > | ||
| </div> | ||
| <ng-template #valuesBadge> | ||
| <div class="flex flex-row items-center gap-2"> | ||
| <span class="text-gray-800" translate | ||
| >search.filters.summaryLabel.{{ fieldName }}</span | ||
| > | ||
| <gn-ui-badge | ||
| *ngFor="let fieldValue of values$ | async" | ||
| [style.--gn-ui-badge-text-color]="'black'" | ||
| [style.--gn-ui-badge-background-color]="'#F2F2F2'" | ||
| [style.--gn-ui-badge-font-weight]="'700'" | ||
| [removable]="true" | ||
| (badgeRemoveClicked)="removeFilterValue(fieldValue)" | ||
| >{{ fieldValue }}</gn-ui-badge | ||
| > | ||
| </div> | ||
| </ng-template> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| import { ComponentFixture, TestBed } from '@angular/core/testing' | ||
|
|
||
| import { SearchFiltersSummaryItemComponent } from './search-filters-summary-item.component' | ||
|
|
||
| describe('SearchFiltersSummaryComponent', () => { | ||
| let component: SearchFiltersSummaryItemComponent | ||
| let fixture: ComponentFixture<SearchFiltersSummaryItemComponent> | ||
|
|
||
| beforeEach(() => { | ||
| TestBed.configureTestingModule({ | ||
| imports: [SearchFiltersSummaryItemComponent], | ||
| }) | ||
| fixture = TestBed.createComponent(SearchFiltersSummaryItemComponent) | ||
| component = fixture.componentInstance | ||
| fixture.detectChanges() | ||
| }) | ||
|
|
||
| it('should create', () => { | ||
| expect(component).toBeTruthy() | ||
| }) | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core' | ||
| import { CommonModule } from '@angular/common' | ||
| import { | ||
| FieldsService, | ||
| FieldType, | ||
| FieldValue, | ||
| FieldValues, | ||
| SearchFacade, | ||
| SearchService, | ||
| } from '@geonetwork-ui/feature/search' | ||
| import { | ||
| catchError, | ||
| filter, | ||
| firstValueFrom, | ||
| map, | ||
| Observable, | ||
| startWith, | ||
| switchMap, | ||
| tap, | ||
| } from 'rxjs' | ||
| import { BadgeComponent } from '@geonetwork-ui/ui/inputs' | ||
| import { TranslateModule } from '@ngx-translate/core' | ||
| import { DateRange } from '@geonetwork-ui/api/repository' | ||
|
|
||
| @Component({ | ||
| selector: 'md-editor-search-filters-summary-item', | ||
| standalone: true, | ||
| imports: [CommonModule, TranslateModule, BadgeComponent], | ||
| templateUrl: './search-filters-summary-item.component.html', | ||
| styleUrls: ['./search-filters-summary-item.component.css'], | ||
| }) | ||
| export class SearchFiltersSummaryItemComponent implements OnInit { | ||
| @Input() fieldName: string | ||
| fieldType: FieldType | ||
|
|
||
| fieldValues$ = this.searchFacade.searchFilters$.pipe( | ||
| switchMap((filters) => | ||
| this.fieldsService.readFieldValuesFromFilters(filters) | ||
| ), | ||
| tap((fieldValues) => console.log(fieldValues)), | ||
| map((fieldValues) => | ||
| Array.isArray(fieldValues[this.fieldName]) //TODO: handle date ranges as arrays everywhere? | ||
| ? fieldValues[this.fieldName] | ||
| : [fieldValues[this.fieldName]] | ||
| ), | ||
| tap((fieldValues) => console.log(fieldValues)) | ||
| // startWith([]), | ||
| // catchError(() => of([])) | ||
| ) as Observable<FieldValue[] | DateRange[]> | ||
|
|
||
| dateRange$ = this.fieldValues$.pipe( | ||
| filter(() => this.fieldType === 'dateRange'), | ||
| map((fieldValues) => fieldValues as DateRange[]) | ||
| ) | ||
|
|
||
| values$ = this.fieldValues$.pipe( | ||
| filter(() => this.fieldType === 'values'), | ||
| map((fieldValues) => fieldValues as FieldValue[]) | ||
| ) | ||
|
|
||
| constructor( | ||
| private searchFacade: SearchFacade, | ||
| private searchService: SearchService, | ||
| private fieldsService: FieldsService | ||
| ) {} | ||
|
|
||
| ngOnInit() { | ||
| this.fieldType = this.fieldsService.getFieldType(this.fieldName) | ||
| } | ||
|
|
||
| async removeFilterValue(fieldValue: FieldValue | DateRange) { | ||
| const currentFieldValues: (FieldValue | DateRange)[] = await firstValueFrom( | ||
| this.fieldValues$ | ||
| ) | ||
| const updatedFieldValues = currentFieldValues.filter( | ||
| (value: string | DateRange) => value !== fieldValue | ||
| ) | ||
| this.fieldsService | ||
| .buildFiltersFromFieldValues({ | ||
| [this.fieldName]: updatedFieldValues as FieldValue[], | ||
| }) | ||
| .subscribe((filters) => this.searchService.updateFilters(filters)) | ||
| } | ||
| } | ||
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| <div | ||
| class="flex flex-row py-3 px-4 gap-4 overflow-hidden grow border-[1px] border-gray-200" | ||
| *ngIf="searchFilterActive$ | async" | ||
| > | ||
| <div class="flex flex-row flex-wrap gap-2"> | ||
| <md-editor-search-filters-summary-item | ||
| *ngFor="let field of searchFields; let i = index" | ||
| [fieldName]="field" | ||
| ></md-editor-search-filters-summary-item> | ||
| </div> | ||
| <button | ||
| class="bg-white text-black font-bold ml-auto" | ||
| (click)="clearFilters()" | ||
| > | ||
| {{ 'search.filters.clear' | translate }} | ||
| </button> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| import { ComponentFixture, TestBed } from '@angular/core/testing' | ||
| import { SearchFiltersSummaryComponent } from './search-filters-summary.component' | ||
|
|
||
| describe('SearchFiltersSummaryComponent', () => { | ||
| let component: SearchFiltersSummaryComponent | ||
| let fixture: ComponentFixture<SearchFiltersSummaryComponent> | ||
|
|
||
| beforeEach(async () => { | ||
| await TestBed.configureTestingModule({ | ||
| imports: [SearchFiltersSummaryComponent], | ||
| }).compileComponents() | ||
|
|
||
| fixture = TestBed.createComponent(SearchFiltersSummaryComponent) | ||
| component = fixture.componentInstance | ||
| fixture.detectChanges() | ||
| }) | ||
|
|
||
| it('should create', () => { | ||
| expect(component).toBeTruthy() | ||
| }) | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| import { Component, Input } from '@angular/core' | ||
| import { CommonModule } from '@angular/common' | ||
| import { SearchFacade, SearchService } from '@geonetwork-ui/feature/search' | ||
| import { map } from 'rxjs' | ||
| import { SearchFiltersSummaryItemComponent } from '../search-filters-summary-item/search-filters-summary-item.component' | ||
| import { TranslateModule } from '@ngx-translate/core' | ||
|
|
||
| @Component({ | ||
| selector: 'md-editor-search-filters-summary', | ||
|
There was a problem hiding this comment. this can maybe go in the feature-search lib ? |
||
| imports: [CommonModule, SearchFiltersSummaryItemComponent, TranslateModule], | ||
| templateUrl: './search-filters-summary.component.html', | ||
| styleUrls: ['./search-filters-summary.component.css'], | ||
| standalone: true, | ||
| }) | ||
| export class SearchFiltersSummaryComponent { | ||
| @Input() searchFields: string[] = [] | ||
|
|
||
| searchFilterActive$ = this.searchFacade.searchFilters$.pipe( | ||
| map((filters) => this.hasNonEmptyValues(filters)) | ||
| ) | ||
|
Comment on lines
+16
to
+20
There was a problem hiding this comment. I'm wondering if instead of taking a list of filters as input we can simply listen for the search filters and show everyone of them. This means that if another filter (which does not appear in the advanced filters above) is active then it will also show up. What do you think? |
||
|
|
||
| constructor( | ||
| private searchFacade: SearchFacade, | ||
| private searchService: SearchService | ||
| ) {} | ||
|
|
||
| hasNonEmptyValues(filters: any): boolean { | ||
| return Object.values(filters).some( | ||
| (value) => | ||
| value !== undefined && | ||
| (typeof value !== 'object' || | ||
| (typeof value === 'object' && Object.keys(value).length > 0)) | ||
| ) | ||
| } | ||
|
|
||
| clearFilters() { | ||
| this.searchService.setFilters({}) | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,20 @@ | ||
| <div | ||
| class="rounded bg-white shadow-md shadow-gray-300 border-[1px] border-gray-200 mx-[32px] my-[16px] text-sm" | ||
| > | ||
| <div | ||
| class="flex flex-row py-3 px-4 gap-4 overflow-hidden grow border-[1px] border-gray-200" | ||
| > | ||
| <mat-icon class="material-symbols-outlined">filter_list</mat-icon> | ||
| <gn-ui-filter-dropdown | ||
| *ngFor="let filter of searchConfig; let i = index" | ||
| [fieldName]="filter.fieldName" | ||
| [title]="filter.title | translate" | ||
| [style.--gn-ui-button-height]="'32px'" | ||
| [style.--gn-ui-multiselect-counter-text-color]="'var(--color-primary)'" | ||
| [style.--gn-ui-multiselect-counter-background-color]="'white'" | ||
| ></gn-ui-filter-dropdown> | ||
| </div> | ||
| <md-editor-search-filters-summary | ||
| [searchFields]="searchFields" | ||
| ></md-editor-search-filters-summary> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
how about directly modifying the current filters instead of going from filters to values and then values to filters? simply deleting the corresponding key in the filters should be enough