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_complete-flow

Browse Source
This commit is contained in:
NguyenTranHoangSym 2023-04-05 17:26:14 +07:00 committed by Salah Benmoussati
parent 93755c717c
commit db872a5c17
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,9 +175,7 @@ export class WindowHandler {
private readonly opts: Electron.BrowserViewConstructorOptions | undefined;
private hideOnCapture: boolean = false;
private currentWindow?: string = undefined;
private isPodConfigured: boolean = false;
private shouldShowWelcomeScreen: boolean = true;
private didShowWelcomeScreen: boolean = false;
private defaultUrl: string = 'my.symphony.com';
constructor(opts?: Electron.BrowserViewConstructorOptions) {
@ -251,11 +249,10 @@ export class WindowHandler {
this.config.isCustomTitleBar === CloudConfigDataTypes.ENABLED;
// Get url to load from cmd line or from global config file
const urlFromCmd = getCommandLineArgs(process.argv, '--url=', false);
this.isPodConfigured = !config.isFirstTimeLaunch();
this.didShowWelcomeScreen = false;
this.shouldShowWelcomeScreen =
this.globalConfig.url.includes(this.defaultUrl) &&
(config.isFirstTimeLaunch() || !!this.config.enableBrowserLogin);
(this.globalConfig.url.includes(this.defaultUrl) &&
config.isFirstTimeLaunch()) ||
!!this.config.enableBrowserLogin;
this.windowOpts = {
...this.getWindowOpts(
@ -551,7 +548,7 @@ export class WindowHandler {
if (this.mainWebContents && !this.mainWebContents.isDestroyed()) {
// Load welcome screen
if (this.shouldShowWelcomeScreen && !this.didShowWelcomeScreen) {
if (this.shouldShowWelcomeScreen) {
const podUrl = this.userConfig.url
? this.userConfig.url
: !this.globalConfig.url.includes(this.defaultUrl)
@ -565,11 +562,10 @@ export class WindowHandler {
url: podUrl,
message: '',
urlValid: !!podUrl,
isPodConfigured: this.isPodConfigured && !!podUrl,
isPodConfigured: !!podUrl,
isBrowserLoginEnabled: this.config.enableBrowserLogin,
browserLoginAutoConnect: this.config.browserLoginAutoConnect,
});
this.didShowWelcomeScreen = true;
this.mainWebContents.focus();
}