MOBILE-4329 user: Rename user profile handler types

crazyserver · crazyserver · commit cc2f238d6825 · 2024-02-27T12:55:12.000+01:00
diff --git a/src/addons/badges/services/handlers/user.ts b/src/addons/badges/services/handlers/user.ts
@@ -16,9 +16,9 @@ import { Injectable } from '@angular/core';
 import { CoreCourseUserAdminOrNavOptionIndexed } from '@features/courses/services/courses';
 import {
     CoreUserDelegateContext,
-    CoreUserDelegateService,
     CoreUserProfileHandler,
     CoreUserProfileHandlerData,
+    CoreUserProfileHandlerType,
 } from '@features/user/services/user-delegate';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
@@ -33,7 +33,7 @@ export class AddonBadgesUserHandlerService implements CoreUserProfileHandler {
 
     name = 'AddonBadges:fakename'; // This name doesn't match any disabled feature, they'll be checked in isEnabledForContext.
     priority = 300;
-    type = CoreUserDelegateService.TYPE_NEW_PAGE;
+    type = CoreUserProfileHandlerType.LIST_ITEM;
 
     /**
      * @inheritdoc
diff --git a/src/addons/blog/services/handlers/user.ts b/src/addons/blog/services/handlers/user.ts
@@ -16,7 +16,7 @@ import { Injectable } from '@angular/core';
 import {
     CoreUserProfileHandler,
     CoreUserProfileHandlerData,
-    CoreUserDelegateService,
+    CoreUserProfileHandlerType,
     CoreUserDelegateContext,
 } from '@features/user/services/user-delegate';
 import { CoreNavigator } from '@services/navigator';
@@ -32,7 +32,7 @@ export class AddonBlogUserHandlerService implements CoreUserProfileHandler {
 
     name = 'AddonBlog'; // This name doesn't match any disabled feature, they'll be checked in isEnabledForContext.
     priority = 200;
-    type = CoreUserDelegateService.TYPE_NEW_PAGE;
+    type = CoreUserProfileHandlerType.LIST_ITEM;
 
     /**
      * @inheritdoc
diff --git a/src/addons/competency/services/handlers/user.ts b/src/addons/competency/services/handlers/user.ts
@@ -18,7 +18,7 @@ import { COURSE_PAGE_NAME } from '@features/course/course.module';
 import { CoreUserProfile } from '@features/user/services/user';
 import {
     CoreUserProfileHandler,
-    CoreUserDelegateService,
+    CoreUserProfileHandlerType,
     CoreUserProfileHandlerData,
     CoreUserDelegateContext,
 } from '@features/user/services/user-delegate';
@@ -36,7 +36,7 @@ export class AddonCompetencyUserHandlerService implements CoreUserProfileHandler
 
     name = 'AddonCompetency'; // This name doesn't match any disabled feature, they'll be checked in isEnabledForContext.
     priority = 100;
-    type = CoreUserDelegateService.TYPE_NEW_PAGE;
+    type = CoreUserProfileHandlerType.LIST_ITEM;
     cacheEnabled = true;
 
     /**
diff --git a/src/addons/coursecompletion/services/handlers/user.ts b/src/addons/coursecompletion/services/handlers/user.ts
@@ -16,7 +16,7 @@ import { Injectable } from '@angular/core';
 import { CoreUserProfile } from '@features/user/services/user';
 import {
     CoreUserProfileHandler,
-    CoreUserDelegateService,
+    CoreUserProfileHandlerType,
     CoreUserProfileHandlerData,
     CoreUserDelegateContext,
 } from '@features/user/services/user-delegate';
@@ -31,7 +31,7 @@ import { AddonCourseCompletion } from '../coursecompletion';
 export class AddonCourseCompletionUserHandlerService implements CoreUserProfileHandler {
 
     name = 'AddonCourseCompletion:viewCompletion';
-    type = CoreUserDelegateService.TYPE_NEW_PAGE;
+    type = CoreUserProfileHandlerType.LIST_ITEM;
     priority = 350;
     cacheEnabled = true;
 
diff --git a/src/addons/messages/services/handlers/user-send-message.ts b/src/addons/messages/services/handlers/user-send-message.ts
@@ -15,7 +15,11 @@
 import { Injectable } from '@angular/core';
 import { Params } from '@angular/router';
 import { CoreUserProfile } from '@features/user/services/user';
-import { CoreUserDelegateService, CoreUserProfileHandler, CoreUserProfileHandlerData } from '@features/user/services/user-delegate';
+import {
+    CoreUserProfileHandlerType,
+    CoreUserProfileHandler,
+     CoreUserProfileHandlerData,
+} from '@features/user/services/user-delegate';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { makeSingleton } from '@singletons';
@@ -29,7 +33,7 @@ export class AddonMessagesSendMessageUserHandlerService implements CoreUserProfi
 
     name = 'AddonMessages:sendMessage';
     priority = 1000;
-    type = CoreUserDelegateService.TYPE_COMMUNICATION;
+    type = CoreUserProfileHandlerType.BUTTON;
 
     /**
      * @inheritdoc
diff --git a/src/addons/notes/services/handlers/user.ts b/src/addons/notes/services/handlers/user.ts
@@ -16,7 +16,7 @@ import { Injectable } from '@angular/core';
 import { CoreUserProfile } from '@features/user/services/user';
 import {
     CoreUserProfileHandler,
-    CoreUserDelegateService,
+    CoreUserProfileHandlerType,
     CoreUserProfileHandlerData,
     CoreUserDelegateContext,
 } from '@features/user/services/user-delegate';
@@ -33,7 +33,7 @@ export class AddonNotesUserHandlerService implements CoreUserProfileHandler {
 
     name = 'AddonNotes:notes';
     priority = 250;
-    type = CoreUserDelegateService.TYPE_NEW_PAGE;
+    type = CoreUserProfileHandlerType.LIST_ITEM;
     cacheEnabled = true;
 
     /**
diff --git a/src/addons/privatefiles/services/handlers/user.ts b/src/addons/privatefiles/services/handlers/user.ts
@@ -18,7 +18,7 @@ import { AddonPrivateFiles } from '@addons/privatefiles/services/privatefiles';
 import { makeSingleton } from '@singletons';
 import {
     CoreUserDelegateContext,
-    CoreUserDelegateService,
+    CoreUserProfileHandlerType,
     CoreUserProfileHandler,
     CoreUserProfileHandlerData,
 } from '@features/user/services/user-delegate';
@@ -36,7 +36,7 @@ export class AddonPrivateFilesUserHandlerService implements CoreUserProfileHandl
 
     name = 'AddonPrivateFiles';
     priority = 400;
-    type = CoreUserDelegateService.TYPE_NEW_PAGE;
+    type = CoreUserProfileHandlerType.LIST_ITEM;
     cacheEnabled = true;
 
     /**
diff --git a/src/core/features/dataprivacy/services/handlers/user.ts b/src/core/features/dataprivacy/services/handlers/user.ts
@@ -13,7 +13,11 @@
 // limitations under the License.
 
 import { Injectable } from '@angular/core';
-import { CoreUserDelegateService, CoreUserProfileHandler, CoreUserProfileHandlerData } from '@features/user/services/user-delegate';
+import {
+    CoreUserProfileHandlerType,
+    CoreUserProfileHandler,
+    CoreUserProfileHandlerData,
+} from '@features/user/services/user-delegate';
 import { CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
 import { CoreDataPrivacy } from '../dataprivacy';
@@ -27,7 +31,7 @@ export class CoreDataPrivacyUserHandlerService implements CoreUserProfileHandler
 
     protected pageName = CORE_DATAPRIVACY_PAGE_NAME;
 
-    type = CoreUserDelegateService.TYPE_NEW_PAGE;
+    type = CoreUserProfileHandlerType.LIST_ACCOUNT_ITEM;
     name = 'CoreDataPrivacyDelegate';
     priority = 100;
 
diff --git a/src/core/features/grades/services/handlers/user.ts b/src/core/features/grades/services/handlers/user.ts
@@ -19,7 +19,7 @@ import { CoreGrades } from '@features/grades/services/grades';
 import { CoreUserProfile } from '@features/user/services/user';
 import {
     CoreUserDelegateContext,
-    CoreUserDelegateService ,
+    CoreUserProfileHandlerType ,
     CoreUserProfileHandler,
     CoreUserProfileHandlerData,
 } from '@features/user/services/user-delegate';
@@ -38,7 +38,7 @@ export class CoreGradesUserHandlerService implements CoreUserProfileHandler {
 
     name = 'CoreGrades'; // This name doesn't match any disabled feature, they'll be checked in isEnabledForContext.
     priority = 500;
-    type = CoreUserDelegateService.TYPE_NEW_PAGE;
+    type = CoreUserProfileHandlerType.LIST_ITEM;
     cacheEnabled = true;
 
     /**
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.html b/src/core/features/mainmenu/components/user-menu/user-menu.html
@@ -40,23 +40,35 @@ <h1>
                 </ion-label>
             </ion-item>
 
-            <ion-item button class="core-usermenu-handler ion-text-wrap" *ngIf="siteInfo" lines="full" (click)="openUserProfile($event)"
+            <ion-item button class="core-usermenu-profile ion-text-wrap" *ngIf="siteInfo" lines="full" (click)="openUserProfile($event)"
                 [detail]="true" [attr.aria-label]="'core.user.profile' | translate">
                 <core-user-avatar [site]="siteInfo" [userId]="siteInfo.userid" [linkProfile]="false" slot="start" />
                 <ion-label>
                     <p class="item-heading">{{ siteInfo.fullname }}</p>
                 </ion-label>
             </ion-item>
 
-            <ion-item class="ion-text-center" *ngIf="(!handlers || !handlers.length) && !handlersLoaded">
+            @if (handlers.length + accountHandlers.length > 0) {
+            <ion-item button *ngFor="let handler of handlers" class="ion-text-wrap" (click)="handlerClicked($event, handler)"
+                [ngClass]="['core-user-menu-handler', handler.class || '']" [hidden]="handler.hidden"
+                [attr.aria-label]="handler.title | translate" [detail]="true">
+                <ion-icon *ngIf="handler.icon" [name]="handler.icon" slot="start" aria-hidden="true" />
                 <ion-label>
-                    <ion-spinner [attr.aria-label]="'core.loading' | translate" />
+                    <p class="item-heading">{{ handler.title | translate }}</p>
                 </ion-label>
+                <ion-badge slot="end" *ngIf="handler.showBadge" [hidden]="handler.loading || !handler.badge" aria-hidden="true">
+                    {{handler.badge}}
+                </ion-badge>
+                <span *ngIf="handler.showBadge && handler.badge && handler.badgeA11yText" class="sr-only">
+                    {{ handler.badgeA11yText | translate: {$a : handler.badge } }}
+                </span>
+                <ion-spinner slot="end" *ngIf="handler.showBadge && handler.loading" [attr.aria-label]="'core.loading' | translate" />
             </ion-item>
 
-            <ion-item button *ngFor="let handler of handlers" class="ion-text-wrap" (click)="handlerClicked($event, handler)"
-                [ngClass]="['core-user-menu-handler', handler.class || '']" [hidden]="handler.hidden"
-                [attr.aria-label]="handler.title | translate" [detail]="true">
+            <ion-item button *ngFor="let handler of accountHandlers; let first = first" class="ion-text-wrap"
+                (click)="handlerClicked($event, handler)"
+                [ngClass]="['core-user-account-menu-handler', handler.class || '', first ? 'core-user-menu-separator' : '']"
+                [hidden]="handler.hidden" [attr.aria-label]="handler.title | translate" [detail]="true">
                 <ion-icon *ngIf="handler.icon" [name]="handler.icon" slot="start" aria-hidden="true" />
                 <ion-label>
                     <p class="item-heading">{{ handler.title | translate }}</p>
@@ -69,9 +81,19 @@ <h1>
                 </span>
                 <ion-spinner slot="end" *ngIf="handler.showBadge && handler.loading" [attr.aria-label]="'core.loading' | translate" />
             </ion-item>
+            } @else {
+            <ion-item class="ion-text-center">
+                <ion-label>
+                    <ion-spinner [attr.aria-label]="'core.loading' | translate" />
+                </ion-label>
+            </ion-item>
+            }
+
+
+
 
             <ion-item button (click)="openPreferences($event)" [attr.aria-label]="'core.settings.preferences' | translate" [detail]="true"
-                class="core-user-menu-preferences">
+                class="core-user-menu-preferences core-user-menu-separator">
                 <ion-icon name="fas-wrench" slot="start" aria-hidden="true" />
                 <ion-label>
                     <p class="item-heading">{{ 'core.settings.preferences' | translate }}</p>
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.scss b/src/core/features/mainmenu/components/user-menu/user-menu.scss
@@ -1,7 +1,7 @@
 @use "theme/globals" as *;
 
 :host {
-    .core-user-menu-preferences {
+    .core-user-menu-separator {
         --inner-border-width: 0;
         --border-width: 1px 0 0 0;
     }
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.ts b/src/core/features/mainmenu/components/user-menu/user-menu.ts
@@ -25,12 +25,13 @@ import { CoreUser, CoreUserProfile } from '@features/user/services/user';
 import {
     CoreUserProfileHandlerData,
     CoreUserDelegate,
-    CoreUserDelegateService,
+    CoreUserProfileHandlerType,
     CoreUserDelegateContext,
 } from '@features/user/services/user-delegate';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
 import { CoreDomUtils } from '@services/utils/dom';
+import { CoreUtils } from '@services/utils/utils';
 import { ModalController, Translate } from '@singletons';
 import { Subscription } from 'rxjs';
 
@@ -52,6 +53,7 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
     siteUrl?: string;
     displaySiteUrl = false;
     handlers: CoreUserProfileHandlerData[] = [];
+    accountHandlers: CoreUserProfileHandlerData[] = [];
     handlersLoaded = false;
     user?: CoreUserProfile;
     displaySwitchAccount = true;
@@ -76,37 +78,48 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
 
         this.loadSiteLogo(currentSite);
 
-        // Load the handlers.
-        if (this.siteInfo) {
-            try {
-                this.user = await CoreUser.getProfile(this.siteInfo.userid);
-            } catch {
-                this.user = {
-                    id: this.siteInfo.userid,
-                    fullname: this.siteInfo.fullname,
-                };
-            }
-
-            this.subscription = CoreUserDelegate.getProfileHandlersFor(this.user, CoreUserDelegateContext.USER_MENU)
-                .subscribe((handlers) => {
-                    if (!handlers || !this.user) {
-                        return;
-                    }
-
-                    const newHandlers = handlers
-                        .filter((handler) => handler.type === CoreUserDelegateService.TYPE_NEW_PAGE)
-                        .map((handler) => handler.data);
-
-                    // Only update handlers if they have changed, to prevent a blink effect.
-                    if (newHandlers.length !== this.handlers.length ||
-                            JSON.stringify(newHandlers) !== JSON.stringify(this.handlers)) {
-                        this.handlers = newHandlers;
-                    }
-
-                    this.handlersLoaded = CoreUserDelegate.areHandlersLoaded(this.user.id, CoreUserDelegateContext.USER_MENU);
-                });
+        if (!this.siteInfo) {
+            return;
+        }
 
+        // Load the handlers.
+        try {
+            this.user = await CoreUser.getProfile(this.siteInfo.userid);
+        } catch {
+            this.user = {
+                id: this.siteInfo.userid,
+                fullname: this.siteInfo.fullname,
+            };
         }
+
+        this.subscription = CoreUserDelegate.getProfileHandlersFor(this.user, CoreUserDelegateContext.USER_MENU)
+            .subscribe((handlers) => {
+                if (!handlers.length || !this.user) {
+                    return;
+                }
+
+                let newHandlers = handlers
+                    .filter((handler) => handler.type === CoreUserProfileHandlerType.LIST_ITEM)
+                    .map((handler) => handler.data);
+
+                // Only update handlers if they have changed, to prevent a blink effect.
+                if (newHandlers.length !== this.handlers.length ||
+                        JSON.stringify(newHandlers) !== JSON.stringify(this.handlers)) {
+                    this.handlers = newHandlers;
+                }
+
+                newHandlers = handlers
+                    .filter((handler) => handler.type === CoreUserProfileHandlerType.LIST_ACCOUNT_ITEM)
+                    .map((handler) => handler.data);
+
+                // Only update handlers if they have changed, to prevent a blink effect.
+                if (newHandlers.length !== this.handlers.length ||
+                        JSON.stringify(newHandlers) !== JSON.stringify(this.handlers)) {
+                    this.accountHandlers = newHandlers;
+                }
+
+                this.handlersLoaded = CoreUserDelegate.areHandlersLoaded(this.user.id, CoreUserDelegateContext.USER_MENU);
+            });
     }
 
     /**
@@ -123,15 +136,9 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
             return;
         }
 
-        try {
-            const siteConfig = await currentSite.getPublicConfig();
-
-            this.siteLogo = currentSite.getLogoUrl(siteConfig);
-        } catch {
-            // Ignore errors.
-        } finally {
-            this.siteLogoLoaded = true;
-        }
+        const siteConfig = await CoreUtils.ignoreErrors(currentSite.getPublicConfig());
+        this.siteLogo = currentSite.getLogoUrl(siteConfig);
+        this.siteLogoLoaded = true;
     }
 
     /**
diff --git a/src/core/features/reportbuilder/services/handlers/reportbuilder.ts b/src/core/features/reportbuilder/services/handlers/reportbuilder.ts
@@ -13,7 +13,11 @@
 // limitations under the License.
 
 import { Injectable } from '@angular/core';
-import { CoreUserDelegateService, CoreUserProfileHandler, CoreUserProfileHandlerData } from '@features/user/services/user-delegate';
+import {
+    CoreUserProfileHandlerType,
+    CoreUserProfileHandler,
+    CoreUserProfileHandlerData,
+} from '@features/user/services/user-delegate';
 import { CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
 import { CoreReportBuilder } from '../reportbuilder';
@@ -26,7 +30,7 @@ export class CoreReportBuilderHandlerService implements CoreUserProfileHandler {
 
     static readonly PAGE_NAME = 'reportbuilder';
 
-    type = CoreUserDelegateService.TYPE_NEW_PAGE;
+    type = CoreUserProfileHandlerType.LIST_ITEM;
     cacheEnabled = true;
     name = 'CoreReportBuilderDelegate';
     priority = 350;
diff --git a/src/core/features/siteplugins/classes/handlers/user-handler.ts b/src/core/features/siteplugins/classes/handlers/user-handler.ts
diff --git a/src/core/features/siteplugins/services/siteplugins.ts b/src/core/features/siteplugins/services/siteplugins.ts
diff --git a/src/core/features/user/pages/profile/profile.html b/src/core/features/user/pages/profile/profile.html
diff --git a/src/core/features/user/pages/profile/profile.ts b/src/core/features/user/pages/profile/profile.ts
diff --git a/src/core/features/user/services/handlers/profile-mail.ts b/src/core/features/user/services/handlers/profile-mail.ts
diff --git a/src/core/features/user/services/user-delegate.ts b/src/core/features/user/services/user-delegate.ts
