Theaninova/openstapps
1
0
Fork 0
mirror of https://gitlab.com/openstapps/openstapps.git synced 2026-01-21 00:52:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: remove default data from search page

Browse Source 
Closes #151
This commit is contained in:
Jovan Krunić
2021-11-03 12:41:04 +00:00
parent d3188f5090
commit d6cb7e1d3b
13 changed files with 101 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/app/modules/data/list/search-page.component.ts
View File

@@ -40,6 +40,16 @@ import {PositionService} from '../../map/position.service';
providers: [ContextMenuService],
})
export class SearchPageComponent implements OnInit, OnDestroy {
/**
* Signalizes that the data is being loaded
*/
loading = false;
/**
* Show default data (e.g. when there is user interaction)
*/
@Input() showDefaultData = false;
/**
* Api query filter
*/
@@ -166,35 +176,37 @@ export class SearchPageComponent implements OnInit, OnDestroy {
};
}
return this.dataProvider.search(searchOptions).then(
async result => {
this.singleTypeResponse =
result.facets.find(facet => facet.field === 'type')?.buckets
.length === 1;
if (append) {
let items = await this.items;
// append results
items = [...items, ...result.data];
this.items = (async () => items)();
} else {
// override items with results
this.items = (async () => {
this.updateContextFilter(result.facets);
this.loading = !append;
return result.data;
})();
}
},
async error => {
const alert: HTMLIonAlertElement = await this.alertController.create({
buttons: ['Dismiss'],
header: 'Error',
subHeader: error.message,
});
try {
const result = await this.dataProvider.search(searchOptions);
this.singleTypeResponse =
result.facets.find(facet => facet.field === 'type')?.buckets.length ===
1;
if (append) {
let items = await this.items;
// append results
items = [...items, ...result.data];
this.items = (async () => items)();
} else {
// override items with results
this.items = (async () => {
this.updateContextFilter(result.facets);
await alert.present();
},
);
return result.data;
})();
}
} catch (error) {
const alert: HTMLIonAlertElement = await this.alertController.create({
buttons: ['Dismiss'],
header: 'Error',
subHeader: error.message,
});
await alert.present();
} finally {
this.loading = false;
}
}
/**
@@ -268,8 +280,14 @@ export class SearchPageComponent implements OnInit, OnDestroy {
this.filterQuery = query[1];
this.sortQuery = query[2];
this.from = 0;
await this.fetchAndUpdateItems();
this.queryChanged.next();
if (
typeof this.filterQuery !== 'undefined' ||
this.queryText?.length > 0 ||
this.showDefaultData
) {
await this.fetchAndUpdateItems();
this.queryChanged.next();
}
}),
this.settingsProvider.settingsActionChanged$.subscribe(
({type, payload}) => {