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

Merge pull request #3192 from dpalou/MOBILE-4002 

MOBILE-4002 dashboard: Check new setting to disable dashboard
main
Pau Ferrer Ocaña 2022-03-21 11:54:30 +01:00 committed by GitHub
parent 3f68944a66 43d7ccc345
commit cb2d2d1813
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/core/features/courses/services/handlers/dashboard-home.ts
View File

@ -15,6 +15,8 @@
import { Injectable } from '@angular/core';
import { CoreBlockDelegate } from '@features/block/services/block-delegate';
import { CoreMainMenuHomeHandler, CoreMainMenuHomeHandlerToDisplay } from '@features/mainmenu/services/home-delegate';
import { CoreSites } from '@services/sites';
import { CoreUtils } from '@services/utils/utils';
import { makeSingleton } from '@singletons';
import { CoreCoursesDashboard } from '../dashboard';
@ -45,40 +47,25 @@ export class CoreDashboardHomeHandlerService implements CoreMainMenuHomeHandler
* @return Whether or not the handler is enabled on a site level.
*/
async isEnabledForSite(siteId?: string): Promise<boolean> {
const promises: Promise<void>[] = [];
let blocksEnabled = false;
let dashboardAvailable = false;
let dashboardEnabled = false;
const site = await CoreSites.getSite(siteId);
// Check if blocks and 3.6 dashboard is enabled.
promises.push(CoreBlockDelegate.areBlocksDisabled(siteId).then((disabled) => {
blocksEnabled = !disabled;
const [blocksDisabled, dashboardDisabled, dashboardAvailable, dashboardConfig] = await Promise.all([
CoreBlockDelegate.areBlocksDisabled(site.getId()),
CoreCoursesDashboard.isDisabled(site.getId()),
CoreCoursesDashboard.isAvailable(site.getId()),
CoreUtils.ignoreErrors(site.getConfig('enabledashboard'), '1'),
]);
const dashboardEnabled = !dashboardDisabled && dashboardConfig !== '0';
return;
}));
promises.push(CoreCoursesDashboard.isDisabled(siteId).then((disabled) => {
dashboardEnabled = !disabled;
return;
}));
promises.push(CoreCoursesDashboard.isAvailable(siteId).then((available) => {
dashboardAvailable = available;
return;
}));
await Promise.all(promises);
if (dashboardAvailable && dashboardEnabled && blocksEnabled) {
if (dashboardAvailable && dashboardEnabled && !blocksDisabled) {
const blocks = await CoreCoursesDashboard.getDashboardBlocks(undefined, siteId);
return CoreBlockDelegate.hasSupportedBlock(blocks.mainBlocks) || CoreBlockDelegate.hasSupportedBlock(blocks.sideBlocks);
}
// Dashboard is enabled but not available, we will fake blocks.
return dashboardEnabled && blocksEnabled;
return dashboardEnabled && !blocksDisabled;
}
/**