Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ogcFilters): add multiple selection for autocomplete with chips #1274

Merged
merged 41 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
1b1a28b
checkboxes fonctionels (activent les filtres appropriés)
matt-litwiller May 11, 2023
87e4dcf
Update ogc-filter-selection.component.html
matt-litwiller May 11, 2023
e08c1ca
Merge branch 'next' into filtres-attributaires-autocomplete
matt-litwiller May 12, 2023
42126c6
Plusieurs filtres peuvent être appliqués en même temps
matt-litwiller May 19, 2023
b0e11b2
Merge branch 'master' into filtres-attributaires-autocomplete
matt-litwiller May 23, 2023
906ad0e
Checkboxes filtres attributaires autocomplete
matt-litwiller May 23, 2023
e365b0d
autocomplete style amélioré + chips
matt-litwiller May 24, 2023
2930864
Merge branch 'next' into filtres-attributaires-autocomplete
matt-litwiller May 29, 2023
d098f74
autocomplete multiselect completed + chips implemented
matt-litwiller May 30, 2023
943823e
Merge branch 'next' into filtres-attributaires-autocomplete
matt-litwiller Jun 1, 2023
9ff73c1
Update ogc-filter-chips.component.ts
matt-litwiller Jun 1, 2023
af88610
Add tooltip for removing chips
matt-litwiller Jun 5, 2023
b504007
Merge remote-tracking branch origin/next into filtres-attributaires-a…
LAMM26 Dec 19, 2023
7d3df3f
adjustments
LAMM26 Dec 19, 2023
464ce40
adjustments
LAMM26 Dec 19, 2023
ebf555c
final adjustments
LAMM26 Dec 20, 2023
3ccee90
Merge remote-tracking branch origin/next into
LAMM26 Jan 24, 2024
6d44c26
made thresholdSize optional
LAMM26 Jan 24, 2024
5a7e060
Merge remote-tracking branch origin/next into filtres-attributaires-a…
LAMM26 May 1, 2024
8bb589b
Merge remote-tracking branch origin/next into filtres-attributaires-a…
LAMM26 May 1, 2024
961cfa3
Merge remote-tracking branch origin/next into filtres-attributaires-a…
LAMM26 May 1, 2024
ee4a6d3
Merge remote-tracking branch origin/next into filtres-attributaires-a…
LAMM26 May 3, 2024
23c9c47
updates after comments
LAMM26 May 6, 2024
fd29fa8
commented ogc-filter-chips.component.spec.ts
LAMM26 May 6, 2024
c3a42f8
Merge remote-tracking branch origin/next into filtres-attributaires-a…
LAMM26 May 6, 2024
f7ed5bb
removed validators
LAMM26 May 6, 2024
e4088a3
removed ogc-filter-chips
LAMM26 May 10, 2024
138e107
transfer to mat-chips
LAMM26 May 10, 2024
ef97e79
bug fix
LAMM26 May 14, 2024
843e86d
Merge remote-tracking branch 'origin/next' into filtres-attributaires…
alecarn May 16, 2024
f873fe1
Merge remote-tracking branch origin/next into filtres-attributaires-a…
LAMM26 May 16, 2024
c82e67a
Merge remote-tracking branch 'origin/next' into filtres-attributaires…
alecarn May 17, 2024
0aaf853
Merge branch filtres-attributaires-autocomplete of https://github.com…
LAMM26 May 17, 2024
3256300
replaced maxOptionCountChips with showChips and typing
LAMM26 May 17, 2024
96c98f0
Merge remote-tracking branch origin/next into filtres-attributaires-a…
LAMM26 May 24, 2024
0b3ab62
Merge remote-tracking branch 'origin/next' into filtres-attributaires…
alecarn May 31, 2024
e8228b4
Merge remote-tracking branch origin/next into filtres-attributaires-a…
LAMM26 May 31, 2024
1934fcb
refactor(ogc-filter): reverted unfilterButton to unfiltered
LAMM26 May 31, 2024
a2f1566
fix(ogc-filter): fixed autocomplete flickering
LAMM26 May 31, 2024
3f4d89e
fix(geo): autocomplete selection flickering
alecarn Jun 3, 2024
23a0f0c
fix(ogc-filter): autocomplete on return
LAMM26 Jun 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/common/dom/src/dom.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import { DOMOptions, DOMValue } from './dom.interfaces';
export class DOMService {
constructor(private http: HttpClient) {}

async getDom(dom: DOMOptions): Promise<DOMValue[]> {
const url = dom.url;
async getDomValuesFromURL(domOptions: DOMOptions): Promise<DOMValue[]> {
const url = domOptions.url;
let result: DOMValue[];

await this.http
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -305,31 +305,61 @@ <h3>{{ bundle.title }}</h3>
</mat-button>
<mat-form-field
*ngIf="filteredOgcAutocomplete[bundle.id]"
floatLabel="always"
[style.width.%]="bundle.width ? bundle.width : undefined"
>
<mat-label>{{ bundle.title }}</mat-label>
<mat-chip-set
*ngIf="
filteredOgcAutocomplete[bundle.id] && (bundle.showChips ?? true)
"
>
<mat-chip
*ngFor="let autocompleteEnabled of autocompleteEnableds"
(removed)="toggleSelection(autocompleteEnabled)"
>
{{ autocompleteEnabled }}
<button
matChipRemove
[matTooltip]="'igo.geo.filter.removeFilter' | translate"
>
<mat-icon>cancel</mat-icon>
</button>
</mat-chip>
</mat-chip-set>
<input
matInput
type="text"
formControlName="autocomplete"
#autocomplete
class="autocomplete"
#input
[matAutocomplete]="auto"
[placeholder]="bundle.title"
(input)="onInputChange()"
/>
<mat-autocomplete
#auto="matAutocomplete"
#autocomplete
(optionSelected)="autocompleteOptionClick($event.option.value)"
[displayWith]="displayFn"
>
<mat-autocomplete #auto="matAutocomplete" [displayWith]="displayFn">
<mat-option
*ngFor="
let ogcAutocomplete of filteredOgcAutocomplete[bundle.id]
| async
"
[value]="ogcAutocomplete"
id="mat-option"
[matTooltip]="getToolTip(ogcAutocomplete)"
>
{{ ogcAutocomplete.value }}
<div
(click)="
toggleAutocompleteOption($event, ogcAutocomplete.value)
"
>
<mat-checkbox
id="mat-checkbox"
color="primary"
[checked]="checkedStatus(ogcAutocomplete.value)"
(click)="
toggleAutocompleteOption($event, ogcAutocomplete.value)
"
>
</mat-checkbox>
{{ ogcAutocomplete.value }}
</div>
</mat-option>
</mat-autocomplete>
</mat-form-field>
Expand Down
Loading
Loading