EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-3817 myoverview: Save setting when using custom filter

main
Dani Palou 2022-07-05 15:10:36 +02:00
parent fbe46ee895
commit c9a0b372a9
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/addons/block/myoverview/components/myoverview/myoverview.ts
View File

@ -252,7 +252,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
this.loadSort();
this.loadLayouts(config?.layouts?.value.split(','));
this.loadFilters(config);
await this.loadFilters(config);
this.isDirty = false;
}
@ -280,9 +280,9 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
*
* @param config Block configuration.
*/
protected loadFilters(
protected async loadFilters(
config?: Record<string, { name: string; value: string; type: string }>,
): void {
): Promise<void> {
if (!this.hasCourses) {
return;
}
@ -320,7 +320,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
this.saveFilters('all');
}
this.filterCourses();
await this.filterCourses();
}
/**
@ -369,6 +369,8 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
protected async refreshCourseList(data: CoreCoursesMyCoursesUpdatedEventData): Promise<void> {
if (data.action == CoreCoursesProvider.ACTION_ENROL) {
// Always update if user enrolled in a course.
this.loaded = false;
return this.refreshContent();
}
@ -376,6 +378,8 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
if (data.action == CoreCoursesProvider.ACTION_STATE_CHANGED) {
if (!course) {
// Not found, use WS update.
this.loaded = false;
return this.refreshContent();
}
@ -394,6 +398,8 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
if (data.action == CoreCoursesProvider.ACTION_VIEW && data.courseId != CoreSites.getCurrentSiteHomeId()) {
if (!course) {
// Not found, use WS update.
this.loaded = false;
return this.refreshContent();
}
@ -463,7 +469,9 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
const customFilterValue = this.filters.customFilters[timeFilter.substring(7)]?.value;
if (customFilterName !== undefined && customFilterValue !== undefined) {
const alreadyLoading = this.loaded === false;
this.loaded = false;
try {
const courses = await CoreCourses.getEnrolledCoursesByCustomField(customFilterName, customFilterValue);
@ -471,12 +479,20 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
const courseIds = courses.map((course) => course.id);
this.filteredCourses = this.filteredCourses.filter((course) => courseIds.includes(course.id));
this.saveFilters(timeFilter);
} catch (error) {
if (alreadyLoading) {
throw error; // Pass the error to the caller so it's treated there.
}
CoreDomUtils.showErrorModalDefault(error, this.fetchContentDefaultError);
} finally {
if (!alreadyLoading) {
// Only set loaded to true if there was no other data being loaded.
this.loaded = true;
}
}
}
} else {
// Filter is not active, take the first active or all. Custom is never saved.
if (!this.filters.show[timeFilter]) {