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

Merge pull request #3044 from dpalou/MOBILE-3922 

Mobile 3922
main
Noel De Martin 2022-01-13 14:01:41 +01:00 committed by GitHub
parent 0b694235ae f53b783fc9
commit 7cc309275c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 77 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/classes/delegate-sorted.ts
View File

@ -118,14 +118,14 @@ export class CoreSortedDelegate<
const handler = this.enabledHandlers[name];
const data = <DisplayType> handler.getDisplayData();
data.priority = handler.priority || 0;
data.priority = data.priority ?? handler.priority ?? 0;
data.name = handler.name;
displayData.push(data);
}
// Sort them by priority.
displayData.sort((a, b) => b.priority! - a.priority!);
displayData.sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0));
this.loaded = true;
this.sortedHandlersRxJs.next(displayData);

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

@ -27,7 +27,7 @@ export class CoreDashboardHomeHandlerService implements CoreMainMenuHomeHandler
static readonly PAGE_NAME = 'dashboard';
name = 'CoreCoursesDashboard';
priority = 1100;
priority = 1200;
/**
* Check if the handler is enabled on a site level.
@ -92,7 +92,6 @@ export class CoreDashboardHomeHandlerService implements CoreMainMenuHomeHandler
page: CoreDashboardHomeHandlerService.PAGE_NAME,
class: 'core-courses-dashboard-handler',
icon: 'fas-tachometer-alt',
selectPriority: 1000,
};
}

6
src/core/features/courses/services/handlers/my-courses-mainmenu.ts
View File

@ -13,6 +13,7 @@
// limitations under the License.
import { Injectable } from '@angular/core';
import { CoreSiteInfoUserHomepage } from '@classes/site';
import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '@features/mainmenu/services/mainmenu-delegate';
import { CoreSiteHomeHomeHandler } from '@features/sitehome/services/handlers/sitehome-home';
import { CoreSites } from '@services/sites';
@ -59,11 +60,16 @@ export class CoreCoursesMyCoursesMainMenuHandlerService implements CoreMainMenuH
* @inheritdoc
*/
getDisplayData(): CoreMainMenuHandlerData {
const site = CoreSites.getCurrentSite();
const displayMyCourses = site?.getInfo() && site?.getInfo()?.userhomepage === CoreSiteInfoUserHomepage.HOMEPAGE_MYCOURSES;
return {
title: 'core.courses.mycourses',
page: CoreCoursesMyCoursesMainMenuHandlerService.PAGE_NAME,
class: 'core-courses-my-courses-handler',
icon: 'fas-graduation-cap',
priority: displayMyCourses ? this.priority + 200 : this.priority,
};
}

1
src/core/features/mainmenu/mainmenu-lazy.module.ts
View File

@ -35,7 +35,6 @@ function buildRoutes(injector: Injector): Routes {
{
path: '',
pathMatch: 'full',
redirectTo: CoreMainMenuHomeHandlerService.PAGE_NAME,
},
{
path: CoreMainMenuHomeHandlerService.PAGE_NAME,

2
src/core/features/mainmenu/pages/home/home.html
View File

@ -17,5 +17,5 @@
<core-loading [hideUntil]="loaded">
<core-empty-box *ngIf="tabs.length == 0" icon="fas-home" [message]="'core.courses.nocourses' | translate"></core-empty-box>
</core-loading>
<core-tabs-outlet *ngIf="tabs.length > 0" [selectedIndex]="selectedTab" [hideUntil]="loaded" [tabs]="tabs" (ionChange)="tabSelected()">
<core-tabs-outlet *ngIf="tabs.length > 0" [hideUntil]="loaded" [tabs]="tabs" (ionChange)="tabSelected()">
</core-tabs-outlet>

27
src/core/features/mainmenu/pages/home/home.ts
View File

@ -26,6 +26,7 @@ import { CoreCourseHelper } from '@features/course/services/course-helper';
import { CoreCourse } from '@features/course/services/course';
import { CoreContentLinksDelegate } from '@features/contentlinks/services/contentlinks-delegate';
import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
import { CoreMainMenuHomeHandlerService } from '@features/mainmenu/services/handlers/mainmenu';
/**
* Page that displays the Home.
@ -39,10 +40,9 @@ export class CoreMainMenuHomePage implements OnInit {
@ViewChild(CoreTabsOutletComponent) tabsComponent?: CoreTabsOutletComponent;
siteName!: string;
siteName = '';
tabs: CoreTabsOutletTab[] = [];
loaded = false;
selectedTab?: number;
protected subscription?: Subscription;
protected updateSiteObserver?: CoreEventObserver;
@ -97,7 +97,7 @@ export class CoreMainMenuHomePage implements OnInit {
}
return {
page: `/main/home/${handler.page}`,
page: `/main/${CoreMainMenuHomeHandlerService.PAGE_NAME}/${handler.page}`,
pageParams: handler.pageParams,
title: handler.title,
class: handler.class,
@ -109,21 +109,6 @@ export class CoreMainMenuHomePage implements OnInit {
// Sort them by priority so new handlers are in the right position.
newTabs.sort((a, b) => (handlersMap[b.title].priority || 0) - (handlersMap[a.title].priority || 0));
if (this.selectedTab === undefined && newTabs.length > 0) {
let maxPriority = 0;
this.selectedTab = Object.entries(newTabs).reduce((maxIndex, [index, tab]) => {
const selectPriority = handlersMap[tab.title].selectPriority ?? 0;
if (selectPriority > maxPriority) {
maxPriority = selectPriority;
maxIndex = Number(index);
}
return maxIndex;
}, 0);
}
this.tabs = newTabs;
// Try to prevent empty box displayed for an instant when it shouldn't.
@ -136,7 +121,7 @@ export class CoreMainMenuHomePage implements OnInit {
* Load the site name.
*/
protected loadSiteName(): void {
this.siteName = CoreSites.getCurrentSite()!.getSiteName();
this.siteName = CoreSites.getCurrentSite()?.getSiteName() || '';
}
/**
@ -171,8 +156,8 @@ export class CoreMainMenuHomePage implements OnInit {
const actions = await CoreContentLinksDelegate.getActionsFor(url, undefined);
const action = CoreContentLinksHelper.getFirstValidAction(actions);
if (action) {
action.action(action.sites![0]);
if (action?.sites?.[0]) {
action.action(action.sites[0]);
}
}

4
src/core/features/mainmenu/pages/menu/menu.ts
View File

@ -173,6 +173,10 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
this.loaded = CoreMainMenuDelegate.areHandlersLoaded();
if (this.loaded && this.tabs[0] && !CoreNavigator.getCurrentMainMenuTab()) {
// No tab selected, select the first one.
this.mainTabs?.select(this.tabs[0].page);
}
}
/**

7
src/core/features/mainmenu/services/home-delegate.ts
View File

@ -72,12 +72,7 @@ export interface CoreMainMenuHomeHandlerData {
/**
* Data returned by the delegate for each handler.
*/
export interface CoreMainMenuHomeHandlerToDisplay extends CoreDelegateToDisplay, CoreMainMenuHomeHandlerData {
/**
* Priority to select handler.
*/
selectPriority?: number;
}
export interface CoreMainMenuHomeHandlerToDisplay extends CoreDelegateToDisplay, CoreMainMenuHomeHandlerData {}
/**
* Service to interact with plugins to be shown in the main menu. Provides functions to register a plugin

5
src/core/features/mainmenu/services/mainmenu-delegate.ts
View File

@ -77,6 +77,11 @@ export interface CoreMainMenuHandlerData {
* Whether the handler should only appear in More menu.
*/
onlyInMore?: boolean;
/**
* Priority of the handler. If set, overrides the priority defined in CoreMainMenuHandler.
*/
priority?: number;
}
/**

4
src/core/features/sitehome/services/handlers/sitehome-home.ts
View File

@ -28,7 +28,7 @@ export class CoreSiteHomeHomeHandlerService implements CoreMainMenuHomeHandler {
static readonly PAGE_NAME = 'site';
name = 'CoreSiteHomeDashboard';
priority = 1200;
priority = 1100;
/**
* Check if the handler is enabled on a site level.
@ -64,7 +64,7 @@ export class CoreSiteHomeHomeHandlerService implements CoreMainMenuHomeHandler {
page: CoreSiteHomeHomeHandlerService.PAGE_NAME,
class: 'core-sitehome-dashboard-handler',
icon: 'fas-home',
selectPriority: displaySiteHome ? 1100 : 900,
priority: displaySiteHome ? this.priority + 200 : this.priority,
};
}

3
src/core/guards/redirect.ts
View File

@ -14,6 +14,7 @@
import { Injectable } from '@angular/core';
import { CanActivate, CanLoad, UrlTree } from '@angular/router';
import { CoreMainMenuHomeHandlerService } from '@features/mainmenu/services/handlers/mainmenu';
import { CoreApp } from '@services/app';
import { CoreRedirectPayload } from '@services/navigator';
import { CoreSites } from '@services/sites';
@ -59,7 +60,7 @@ export class CoreRedirectGuard implements CanLoad, CanActivate {
redirect.page,
redirect.options,
);
const route = Router.parseUrl('/main/home');
const route = Router.parseUrl(`/main/${CoreMainMenuHomeHandlerService.PAGE_NAME}`);
route.queryParams = {
redirectPath: redirect.page,

39
src/core/services/navigator.ts
View File

@ -20,7 +20,6 @@ import { NavigationOptions } from '@ionic/angular/providers/nav-controller';
import { CoreConstants } from '@/core/constants';
import { CoreDomUtils } from '@services/utils/dom';
import { CoreMainMenu } from '@features/mainmenu/services/mainmenu';
import { CoreMainMenuHomeHandlerService } from '@features/mainmenu/services/handlers/mainmenu';
import { CoreObject } from '@singletons/object';
import { CoreSites } from '@services/sites';
import { CoreUtils } from '@services/utils/utils';
@ -31,8 +30,8 @@ import { CoreScreen } from './screen';
import { CoreApp } from './app';
import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
import { CoreError } from '@classes/errors/error';
const DEFAULT_MAIN_MENU_TAB = CoreMainMenuHomeHandlerService.PAGE_NAME;
import { CoreMainMenuDelegate } from '@features/mainmenu/services/mainmenu-delegate';
import { CoreMainMenuHomeHandlerService } from '@features/mainmenu/services/handlers/mainmenu';
/**
* Redirect payload.
@ -184,9 +183,12 @@ export class CoreNavigatorService {
* @return Whether navigation suceeded.
*/
async navigateToSiteHome(options: Omit<CoreNavigationOptions, 'reset'> & { siteId?: string } = {}): Promise<boolean> {
return this.navigateToSitePath(DEFAULT_MAIN_MENU_TAB, {
const landingPagePath = this.getLandingTabPage();
return this.navigateToSitePath(landingPagePath, {
...options,
reset: true,
preferCurrentTab: false,
});
}
@ -535,8 +537,13 @@ export class CoreNavigatorService {
path = path.replace(/^(\.|\/main)?\//, '');
const pathRoot = /^[^/]+/.exec(path)?.[0] ?? '';
if (!pathRoot) {
// No path root, going to the site home.
return this.navigate('/main', options);
}
const currentMainMenuTab = this.getCurrentMainMenuTab();
const isMainMenuTab = pathRoot === currentMainMenuTab || (!currentMainMenuTab && path === DEFAULT_MAIN_MENU_TAB) ||
const isMainMenuTab = pathRoot === currentMainMenuTab || (!currentMainMenuTab && path === this.getLandingTabPage()) ||
await CoreUtils.ignoreErrors(CoreMainMenu.isMainMenuTab(pathRoot), false);
if (!options.preferCurrentTab && isMainMenuTab) {
@ -553,16 +560,32 @@ export class CoreNavigatorService {
return this.navigate(`/main/${path}`, options);
}
// Open the path within the default main tab.
return this.navigate(`/main/${DEFAULT_MAIN_MENU_TAB}`, {
// Open the path within the home tab.
return this.navigate(`/main/${CoreMainMenuHomeHandlerService.PAGE_NAME}`, {
...options,
params: {
redirectPath: `/main/${DEFAULT_MAIN_MENU_TAB}/${path}`,
redirectPath: `/main/${CoreMainMenuHomeHandlerService.PAGE_NAME}/${path}`,
redirectOptions: options.params || options.nextNavigation ? options : undefined,
} as CoreRedirectPayload,
});
}
/**
* Get the first page path using priority.
*
* @return Landing page path.
*/
protected getLandingTabPage(): string {
if (!CoreMainMenuDelegate.areHandlersLoaded()) {
// Handlers not loaded yet, landing page is the root page.
return '';
}
const handlers = CoreMainMenuDelegate.getHandlers();
return handlers[0]?.page || '';
}
/**
* Replace all objects in query params with an ID that can be used to retrieve the object later.
*

19
src/core/services/tests/navigator.test.ts
View File

@ -21,6 +21,7 @@ import { NavController, Router } from '@singletons';
import { ActivatedRoute, RouterState } from '@angular/router';
import { CoreSites } from '@services/sites';
import { CoreMainMenu } from '@features/mainmenu/services/mainmenu';
import { CoreMainMenuDelegate } from '@features/mainmenu/services/mainmenu-delegate';
describe('CoreNavigator', () => {
@ -118,7 +119,7 @@ describe('CoreNavigator', () => {
});
});
it('navigates to site paths ussing different path formats', async () => {
it('navigates to site paths using different path formats', async () => {
currentMainMenuHandlers.push('users');
const assertNavigation = async (currentPath, sitePath, expectedPath) => {
@ -136,11 +137,23 @@ describe('CoreNavigator', () => {
await assertNavigation('/main/home', '/users/user/42', '/main/users/user/42');
});
it('navigates to site home', async () => {
it('navigates to site home: no handlers loaded', async () => {
const success = await navigator.navigateToSiteHome();
expect(success).toBe(true);
expect(navControllerMock.navigateRoot).toHaveBeenCalledWith(['/main/home'], {});
expect(navControllerMock.navigateRoot).toHaveBeenCalledWith(['/main'], {});
});
it('navigates to site home: handlers loaded', async () => {
mockSingleton(CoreMainMenuDelegate, {
areHandlersLoaded: () => true,
getHandlers: () => [{ title: 'Test', page: 'initialpage', icon: '' }],
});
const success = await navigator.navigateToSiteHome();
expect(success).toBe(true);
expect(navControllerMock.navigateRoot).toHaveBeenCalledWith(['/main/initialpage'], {});
});
it.todo('navigates to a different site');