Merge pull request #1810 from NguyenTranHoangSym/SDA-4113

SDA-4113: Add url from CMD
This commit is contained in:
NguyenTranHoangSym 2023-03-30 10:49:30 +07:00 committed by GitHub
commit 66322e2ec5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -550,20 +550,17 @@ export class WindowHandler {
if (this.mainWebContents && !this.mainWebContents.isDestroyed()) {
// Load welcome screen
if (this.shouldShowWelcomeScreen && !this.didShowWelcomeScreen) {
const userConfigUrl =
this.userConfig.url &&
this.userConfig.url.indexOf('/login/sso/initsso') > -1
? this.userConfig.url.slice(
0,
this.userConfig.url.indexOf('/login/sso/initsso'),
)
: this.userConfig.url;
const defaultUrl = 'my.symphony.com';
const podUrl = this.userConfig.url
? this.userConfig.url
: !this.globalConfig.url.includes(defaultUrl) &&
this.globalConfig.url;
this.mainWebContents.send('page-load-welcome', {
locale: i18n.getLocale(),
resources: i18n.loadedResources,
});
this.mainWebContents.send('welcome', {
url: userConfigUrl,
url: podUrl,
message: '',
urlValid: !!userConfigUrl,
isPodConfigured: this.isPodConfigured && !!userConfigUrl,