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

SDA-4271: SIG-Back button causes SDA 23.4 to present a blank screen

Browse Source
This commit is contained in:
NguyenTranHoangSym 2023-11-23 15:17:05 +07:00
parent f3380b06aa
commit 9431c11e09
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,6 +131,7 @@ export const AUX_CLICK = 'Auxclick';
// Timeout on restarting SDA in case it's stuck
const LISTEN_TIMEOUT: number = 25 * 1000;
const HOSTNAME_REGEX = /^[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
export class WindowHandler {
/**
* Verifies if the url is valid and
@ -190,6 +191,7 @@ export class WindowHandler {
private shouldShowWelcomeScreen: boolean = true;
private defaultUrl: string = 'my.symphony.com';
private didShowWelcomeScreen: boolean = false;
private cmdUrl: string = '';
constructor(opts?: Electron.BrowserViewConstructorOptions) {
this.opts = opts;
@ -385,6 +387,7 @@ export class WindowHandler {
logger.info(
`window-handler: setting ${commandLineUrl} from the command line as the main window url.`,
);
this.cmdUrl = commandLineUrl;
this.url = commandLineUrl;
} else {
logger.info(
@ -395,6 +398,7 @@ export class WindowHandler {
logger.info(
`window-handler: setting ${commandLineUrl} from the command line as the main window url since pod whitelist is empty.`,
);
this.cmdUrl = commandLineUrl;
this.url = commandLineUrl;
}
}
@ -2184,9 +2188,21 @@ export class WindowHandler {
`window-utils: user hasn't logged in yet, loading login page again`,
);
const userAgent = this.getUserAgent(this.mainWebContents);
await this.mainWebContents.loadURL(this.url || this.globalConfig.url, {
const urlFromConfig = config.getUserConfigFields(['url']);
const isValidUrl =
HOSTNAME_REGEX.test(urlFromConfig.url || '') ||
urlFromConfig.url.includes('https://local-dev.symphony.com');
await this.mainWebContents.loadURL(
this.cmdUrl
? this.cmdUrl
: isValidUrl
? urlFromConfig.url
: this.globalConfig.url,
{
userAgent,
});
},
);
}
}

13
src/renderer/preload-main.ts
View File

@ -202,3 +202,16 @@ ipcRenderer.on('page-load-welcome', (_event, { locale, resources }) => {
const element = React.createElement(component);
ReactDOM.render(element, document.getElementById('Root'));
});
window.addEventListener('mouseup', (e) => {
if (e.button === 3 || e.button === 4) {
e.preventDefault();
e.stopPropagation();
}
});
window.addEventListener('mousedown', (e) => {
if (e.button === 3 || e.button === 4) {
e.preventDefault();
e.stopPropagation();
}
});