if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

SDA-4143: by pass welcome screen (#1822)

Browse Source
This commit is contained in:
NguyenTranHoangSym 2023-04-03 15:14:53 +07:00 committed by GitHub
parent d1414b2218
commit fdd718b457
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/window-handler.ts
View File

@ -178,6 +178,7 @@ export class WindowHandler {
private isPodConfigured: boolean = false; private isPodConfigured: boolean = false;
private shouldShowWelcomeScreen: boolean = true; private shouldShowWelcomeScreen: boolean = true;
private didShowWelcomeScreen: boolean = false; private didShowWelcomeScreen: boolean = false;
private defaultUrl: string = 'my.symphony.com';
constructor(opts?: Electron.BrowserViewConstructorOptions) { constructor(opts?: Electron.BrowserViewConstructorOptions) {
this.opts = opts; this.opts = opts;
@ -253,7 +254,9 @@ export class WindowHandler {
this.isPodConfigured = !config.isFirstTimeLaunch(); this.isPodConfigured = !config.isFirstTimeLaunch();
this.didShowWelcomeScreen = false; this.didShowWelcomeScreen = false;
this.shouldShowWelcomeScreen = this.shouldShowWelcomeScreen =
config.isFirstTimeLaunch() || !!this.config.enableBrowserLogin; !(this.globalConfig.url !== this.defaultUrl) ||
config.isFirstTimeLaunch() ||
!!this.config.enableBrowserLogin;
this.windowOpts = { this.windowOpts = {
...this.getWindowOpts( ...this.getWindowOpts(
@ -550,10 +553,9 @@ 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 defaultUrl = 'my.symphony.com';
const podUrl = this.userConfig.url const podUrl = this.userConfig.url
? this.userConfig.url ? this.userConfig.url
: !this.globalConfig.url.includes(defaultUrl) : !this.globalConfig.url.includes(this.defaultUrl)
? this.globalConfig.url ? this.globalConfig.url
: undefined; : undefined;
this.mainWebContents.send('page-load-welcome', { this.mainWebContents.send('page-load-welcome', {