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

MOBILE-3783 login: Remove unused multisite selectors

main
Pau Ferrer Ocaña 2021-08-06 11:25:43 +02:00
parent 9a63793cf2
commit 19d366595e
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/features/login/pages/site/site.ts
View File

@ -20,7 +20,7 @@ import { CoreConfig } from '@services/config';
import { CoreSites, CoreSiteCheckResponse, CoreLoginSiteInfo, CoreSitesDemoSiteData } from '@services/sites'; import { CoreSites, CoreSiteCheckResponse, CoreLoginSiteInfo, CoreSitesDemoSiteData } from '@services/sites';
import { CoreUtils } from '@services/utils/utils'; import { CoreUtils } from '@services/utils/utils';
import { CoreDomUtils } from '@services/utils/dom'; import { CoreDomUtils } from '@services/utils/dom';
import { CoreLoginHelper, CoreLoginHelperProvider } from '@features/login/services/login-helper'; import { CoreLoginHelper, CoreLoginHelperProvider, CoreLoginSiteSelectorListMethod } from '@features/login/services/login-helper';
import { CoreSite } from '@classes/site'; import { CoreSite } from '@classes/site';
import { CoreError } from '@classes/errors/error'; import { CoreError } from '@classes/errors/error';
import { CoreConstants } from '@/core/constants'; import { CoreConstants } from '@/core/constants';
@ -49,7 +49,7 @@ export class CoreLoginSitePage implements OnInit {
siteForm: FormGroup; siteForm: FormGroup;
fixedSites?: CoreLoginSiteInfoExtended[]; fixedSites?: CoreLoginSiteInfoExtended[];
filteredSites?: CoreLoginSiteInfoExtended[]; filteredSites?: CoreLoginSiteInfoExtended[];
siteSelector = 'sitefinder'; siteSelector: CoreLoginSiteSelectorListMethod = 'sitefinder';
showKeyboard = false; showKeyboard = false;
filter = ''; filter = '';
sites: CoreLoginSiteInfoExtended[] = []; sites: CoreLoginSiteInfoExtended[] = [];
@ -124,24 +124,14 @@ export class CoreLoginSitePage implements OnInit {
* @return URL of the first site. * @return URL of the first site.
*/ */
protected initSiteSelector(): string { protected initSiteSelector(): string {
// Deprecate listnourl on 3.9.3, remove this block on the following release.
if (this.siteSelector == 'listnourl') {
this.siteSelector = 'list';
this.siteFinderSettings.displayurl = false;
}
this.fixedSites = this.extendCoreLoginSiteInfo(<CoreLoginSiteInfoExtended[]> CoreLoginHelper.getFixedSites()); this.fixedSites = this.extendCoreLoginSiteInfo(<CoreLoginSiteInfoExtended[]> CoreLoginHelper.getFixedSites());
this.siteSelector = 'list'; // In case it's not defined
// Do not show images if none are set. // Do not show images if none are set.
if (!this.fixedSites.some((site) => !!site.imageurl)) { if (!this.fixedSites.some((site) => !!site.imageurl)) {
this.siteFinderSettings.displayimage = false; this.siteFinderSettings.displayimage = false;
} }
// Autoselect if not defined.
if (this.siteSelector != 'list' && this.siteSelector != 'buttons') {
this.siteSelector = this.fixedSites.length > 3 ? 'list' : 'buttons';
}
this.filteredSites = this.fixedSites; this.filteredSites = this.fixedSites;
return this.fixedSites[0].url; return this.fixedSites[0].url;

6
src/core/features/login/services/login-helper.ts
View File

@ -1443,3 +1443,9 @@ type StoredLoginLaunchData = {
pageOptions: CoreNavigationOptions; pageOptions: CoreNavigationOptions;
ssoUrlParams: CoreUrlParams; ssoUrlParams: CoreUrlParams;
}; };
export type CoreLoginSiteSelectorListMethod =
'url'|
'sitefinder'|
'list'|
'';

3
src/types/config.d.ts vendored
View File

@ -16,6 +16,7 @@ import { CoreColorScheme, CoreZoomLevel } from '@features/settings/services/sett
import { CoreMainMenuLocalizedCustomItem } from '@features/mainmenu/services/mainmenu'; import { CoreMainMenuLocalizedCustomItem } from '@features/mainmenu/services/mainmenu';
import { CoreSitesDemoSiteData } from '@services/sites'; import { CoreSitesDemoSiteData } from '@services/sites';
import { OpenFileAction } from '@services/utils/utils'; import { OpenFileAction } from '@services/utils/utils';
import { CoreLoginSiteSelectorListMethod } from '@features/login/services/login-helper';
/* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable @typescript-eslint/naming-convention */
@ -37,7 +38,7 @@ export interface EnvironmentConfig {
customurlscheme: string; customurlscheme: string;
siteurl: string; siteurl: string;
sitename: string; sitename: string;
multisitesdisplay: string; multisitesdisplay: CoreLoginSiteSelectorListMethod;
sitefindersettings: Record<string, unknown>; sitefindersettings: Record<string, unknown>;
onlyallowlistedsites: boolean; onlyallowlistedsites: boolean;
skipssoconfirmation: boolean; skipssoconfirmation: boolean;