mirror of
https://github.com/finos/SymphonyElectron.git
synced 2024-12-28 09:51:06 -06:00
Merge pull request #1810 from NguyenTranHoangSym/SDA-4113
SDA-4113: Add url from CMD
This commit is contained in:
commit
66322e2ec5
@ -550,20 +550,17 @@ export class WindowHandler {
|
|||||||
if (this.mainWebContents && !this.mainWebContents.isDestroyed()) {
|
if (this.mainWebContents && !this.mainWebContents.isDestroyed()) {
|
||||||
// Load welcome screen
|
// Load welcome screen
|
||||||
if (this.shouldShowWelcomeScreen && !this.didShowWelcomeScreen) {
|
if (this.shouldShowWelcomeScreen && !this.didShowWelcomeScreen) {
|
||||||
const userConfigUrl =
|
const defaultUrl = 'my.symphony.com';
|
||||||
this.userConfig.url &&
|
const podUrl = this.userConfig.url
|
||||||
this.userConfig.url.indexOf('/login/sso/initsso') > -1
|
? this.userConfig.url
|
||||||
? this.userConfig.url.slice(
|
: !this.globalConfig.url.includes(defaultUrl) &&
|
||||||
0,
|
this.globalConfig.url;
|
||||||
this.userConfig.url.indexOf('/login/sso/initsso'),
|
|
||||||
)
|
|
||||||
: this.userConfig.url;
|
|
||||||
this.mainWebContents.send('page-load-welcome', {
|
this.mainWebContents.send('page-load-welcome', {
|
||||||
locale: i18n.getLocale(),
|
locale: i18n.getLocale(),
|
||||||
resources: i18n.loadedResources,
|
resources: i18n.loadedResources,
|
||||||
});
|
});
|
||||||
this.mainWebContents.send('welcome', {
|
this.mainWebContents.send('welcome', {
|
||||||
url: userConfigUrl,
|
url: podUrl,
|
||||||
message: '',
|
message: '',
|
||||||
urlValid: !!userConfigUrl,
|
urlValid: !!userConfigUrl,
|
||||||
isPodConfigured: this.isPodConfigured && !!userConfigUrl,
|
isPodConfigured: this.isPodConfigured && !!userConfigUrl,
|
||||||
|
Loading…
Reference in New Issue
Block a user