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.

Sign up for GitHub

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

Fix(ogcFilters): fix wfs datasource ogcFilters / clearTimeout for checkbox filters #849

Merged
merged 8 commits into from
May 3, 2021
Merged

Fix(ogcFilters): fix wfs datasource ogcFilters / clearTimeout for checkbox filters #849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cc24566
feat(ogcfilter): automatic assignation of selectorType
Apr 29, 2021
92ffd32
fix(ogcFilters): various fix
PhilippeLafreniere18 Apr 30, 2021
86fd9e7
lint
PhilippeLafreniere18 Apr 30, 2021
287343b
Merge remote-tracking branch 'origin/next' into ogcFiltersFix
PhilippeLafreniere18 Apr 30, 2021
e6f4914
refactor(ogc-filter-selection): clear timeout for checkboxes apply fi…
PhilippeLafreniere18 Apr 30, 2021
656280e
fix(ogc): linked layers filter sync.
Apr 30, 2021
c332bcf
lint
Apr 30, 2021
26bd8a3
wip
May 3, 2021
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
6 changes: 3 additions & 3 deletions packages/geo/src/lib/datasource/shared/datasources/wfs-datasource.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ export class WFSDataSource extends DataSource {
this.wfsService.getSourceFieldsFromWFS(this.options);
}

if (ogcFilters.pushButtons){
if (ogcFilters?.pushButtons){
ogcFilters.pushButtons.selectorType = 'pushButton';
}
if (ogcFilters.checkboxes){
if (ogcFilters?.checkboxes){
ogcFilters.checkboxes.selectorType = 'checkbox';
}
if (ogcFilters.radioButtons){
if (ogcFilters?.radioButtons){
ogcFilters.radioButtons.selectorType = 'radioButton';
}

Expand Down
6 changes: 5 additions & 1 deletion packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ export class OgcFilterSelectionComponent implements OnInit {
private ogcFilterWriter: OgcFilterWriter;
public color = 'primary';

public applyFiltersTimeout;

get ogcFiltersSelectors() {
const ogcSelector = [];
if (this.datasource?.options?.ogcFilters?.pushButtons) {
Expand Down Expand Up @@ -255,10 +257,11 @@ export class OgcFilterSelectionComponent implements OnInit {
}

onSelectionChange(currentOgcSelection?) {
clearTimeout(this.applyFiltersTimeout);
if (currentOgcSelection) {
currentOgcSelection.enabled = !currentOgcSelection.enabled;
}
setTimeout(() => {
this.applyFiltersTimeout = setTimeout(() => {
this.applyFilters();
}, 750);
}
Expand Down Expand Up @@ -299,6 +302,7 @@ export class OgcFilterSelectionComponent implements OnInit {
// TODO: Check how to prevent wfs to refresh when filter icon is pushed...
this.datasource.ol.refresh();
}
this.datasource.setOgcFilters(this.datasource.options.ogcFilters, true);
}

isMoreResults(bundle, type) {
Expand Down
3 changes: 2 additions & 1 deletion packages/geo/src/lib/filter/ogc-filterable-form/ogc-filterable-form.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ export class OgcFilterableFormComponent {
}

get currentFilter(): any {
return this.datasource.options.ogcFilters.interfaceOgcFilters[0];
return this.datasource.options.ogcFilters.interfaceOgcFilters ?
this.datasource.options.ogcFilters.interfaceOgcFilters[0] : undefined;
}

public color = 'primary';
Expand Down