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

MOBILE-4270 filter: Fix text loading forever if get filters failed

main
Dani Palou 2023-05-12 14:46:40 +02:00
parent ae83b7d87b
commit 71784abfad
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/features/filter/services/filter-helper.ts
View File

@ -216,7 +216,7 @@ export class CoreFilterHelperProvider {
options.filter = true; options.filter = true;
// We cannot check which filters are available, apply them all. // We cannot check which filters are available, apply them all.
return CoreFilterDelegate.getEnabledFilters(contextLevel, instanceId); return await CoreFilterDelegate.getEnabledFilters(contextLevel, instanceId);
} }
const courseId = options.courseId; const courseId = options.courseId;
@ -239,21 +239,21 @@ export class CoreFilterHelperProvider {
// Get all the modules filters with a single call to decrease the number of WS calls. // Get all the modules filters with a single call to decrease the number of WS calls.
const getFilters = () => this.getCourseModulesContexts(courseId, siteId); const getFilters = () => this.getCourseModulesContexts(courseId, siteId);
return this.getCacheableFilters(contextLevel, instanceId, getFilters, options, site); return await this.getCacheableFilters(contextLevel, instanceId, getFilters, options, site);
} else if (contextLevel == 'course') { } else if (contextLevel == 'course') {
// If enrolled, get all enrolled courses filters with a single call to decrease number of WS calls. // If enrolled, get all enrolled courses filters with a single call to decrease number of WS calls.
const getFilters = () => this.getCourseContexts(instanceId, siteId); const getFilters = () => this.getCourseContexts(instanceId, siteId);
return this.getCacheableFilters(contextLevel, instanceId, getFilters, options, site); return await this.getCacheableFilters(contextLevel, instanceId, getFilters, options, site);
} else if (contextLevel == 'block' && courseId && CoreCourse.canGetCourseBlocks(site)) { } else if (contextLevel == 'block' && courseId && CoreCourse.canGetCourseBlocks(site)) {
// Get all the course blocks filters with a single call to decrease number of WS calls. // Get all the course blocks filters with a single call to decrease number of WS calls.
const getFilters = () => this.getBlocksContexts(courseId, siteId); const getFilters = () => this.getBlocksContexts(courseId, siteId);
return this.getCacheableFilters(contextLevel, instanceId, getFilters, options, site); return await this.getCacheableFilters(contextLevel, instanceId, getFilters, options, site);
} }
return CoreFilter.getAvailableInContext(contextLevel, instanceId, siteId); return await CoreFilter.getAvailableInContext(contextLevel, instanceId, siteId);
} catch (error) { } catch (error) {
this.logger.error('Error getting filters, return an empty array', error, contextLevel, instanceId); this.logger.error('Error getting filters, return an empty array', error, contextLevel, instanceId);