From 565c46876f46d85136727af2ded3eb2782c84c0e Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Thu, 2 Nov 2023 11:13:58 +0100 Subject: [PATCH] MOBILE-4459 core: Rename login-sites component to login-sites-modal --- src/core/features/login/components/components.module.ts | 6 +++--- .../{sites/sites.html => sites-modal/sites-modal.html} | 0 .../{sites/sites.ts => sites-modal/sites-modal.ts} | 8 ++++---- .../features/mainmenu/components/user-menu/user-menu.ts | 4 ++-- upgrade.txt | 4 ++++ 5 files changed, 13 insertions(+), 9 deletions(-) rename src/core/features/login/components/{sites/sites.html => sites-modal/sites-modal.html} (100%) rename src/core/features/login/components/{sites/sites.ts => sites-modal/sites-modal.ts} (94%) diff --git a/src/core/features/login/components/components.module.ts b/src/core/features/login/components/components.module.ts index 2ad4127b772..0d7cf51e74a 100644 --- a/src/core/features/login/components/components.module.ts +++ b/src/core/features/login/components/components.module.ts @@ -16,7 +16,7 @@ import { NgModule } from '@angular/core'; import { CoreSharedModule } from '@/core/shared.module'; import { CoreLoginSiteOnboardingComponent } from './site-onboarding/site-onboarding'; import { CoreLoginSiteHelpComponent } from './site-help/site-help'; -import { CoreLoginSitesComponent } from './sites/sites'; +import { CoreLoginSitesModalComponent } from './sites-modal/sites-modal'; import { CoreLoginMethodsComponent } from './login-methods/login-methods'; import { CoreLoginExceededAttemptsComponent } from '@features/login/components/exceeded-attempts/exceeded-attempts'; @@ -25,7 +25,7 @@ import { CoreLoginExceededAttemptsComponent } from '@features/login/components/e CoreLoginExceededAttemptsComponent, CoreLoginSiteOnboardingComponent, CoreLoginSiteHelpComponent, - CoreLoginSitesComponent, + CoreLoginSitesModalComponent, CoreLoginMethodsComponent, ], imports: [ @@ -35,7 +35,7 @@ import { CoreLoginExceededAttemptsComponent } from '@features/login/components/e CoreLoginExceededAttemptsComponent, CoreLoginSiteOnboardingComponent, CoreLoginSiteHelpComponent, - CoreLoginSitesComponent, + CoreLoginSitesModalComponent, CoreLoginMethodsComponent, ], }) diff --git a/src/core/features/login/components/sites/sites.html b/src/core/features/login/components/sites-modal/sites-modal.html similarity index 100% rename from src/core/features/login/components/sites/sites.html rename to src/core/features/login/components/sites-modal/sites-modal.html diff --git a/src/core/features/login/components/sites/sites.ts b/src/core/features/login/components/sites-modal/sites-modal.ts similarity index 94% rename from src/core/features/login/components/sites/sites.ts rename to src/core/features/login/components/sites-modal/sites-modal.ts index fb873b29d0c..ca3ed546d09 100644 --- a/src/core/features/login/components/sites/sites.ts +++ b/src/core/features/login/components/sites-modal/sites-modal.ts @@ -23,14 +23,14 @@ import { CoreAnimations } from '@components/animations'; import { ModalController } from '@singletons'; /** - * Component that displays a "splash screen" while the app is being initialized. + * Modal that displays a list of sites to be able to enter or delete a site. */ @Component({ - selector: 'core-login-sites', - templateUrl: 'sites.html', + selector: 'core-login-sites-modal', + templateUrl: 'sites-modal.html', animations: [CoreAnimations.SLIDE_IN_OUT, CoreAnimations.SHOW_HIDE], }) -export class CoreLoginSitesComponent implements OnInit { +export class CoreLoginSitesModalComponent implements OnInit { accountsList: CoreAccountsList = { sameSite: [], diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.ts b/src/core/features/mainmenu/components/user-menu/user-menu.ts index 4f09878a578..2961d0ba835 100644 --- a/src/core/features/mainmenu/components/user-menu/user-menu.ts +++ b/src/core/features/mainmenu/components/user-menu/user-menu.ts @@ -16,7 +16,7 @@ import { CoreConstants } from '@/core/constants'; import { Component, OnDestroy, OnInit } from '@angular/core'; import { CoreSite, CoreSiteInfo } from '@classes/site'; import { CoreFilter } from '@features/filter/services/filter'; -import { CoreLoginSitesComponent } from '@features/login/components/sites/sites'; +import { CoreLoginSitesModalComponent } from '@features/login/components/sites-modal/sites-modal'; import { CoreLoginHelper } from '@features/login/services/login-helper'; import { CoreUserAuthenticatedSupportConfig } from '@features/user/classes/support/authenticated-support-config'; import { CoreUserSupport } from '@features/user/services/support'; @@ -239,7 +239,7 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy { event.stopPropagation(); const closeAll = await CoreDomUtils.openSideModal({ - component: CoreLoginSitesComponent, + component: CoreLoginSitesModalComponent, cssClass: 'core-modal-lateral core-modal-lateral-sm', }); diff --git a/upgrade.txt b/upgrade.txt index 908f4e8dad7..222598a3888 100644 --- a/upgrade.txt +++ b/upgrade.txt @@ -7,6 +7,10 @@ For more information about upgrading, read the official documentation: https://m - Starting with this release, this file will only document breaking changes for APIs exposed to site plugins. Internal changes will no longer be documented. - CoreCache has been deprecated, use plain object as in-memory stores instead. +=== 4.4.0 === + + - Renamed CoreLoginSitesComponent to CoreLoginSitesModalComponent to make it clear that it's a modal and to avoid confusing it with the new CoreSiteListComponent. + === 4.3.0 === - CoreSiteBasicInfo fullName attribute has changed to fullname and avatar to userpictureurl to match user fields.