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

Merge branch 'master' into SDA-1859

Browse Source
This commit is contained in:
Kiran Niranjan 2020-03-12 18:16:21 +05:30 committed by GitHub
commit b2b94b6010
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/chrome-flags.ts
View File

@ -8,7 +8,7 @@ logger.info(`chrome-flags: Setting mandatory chrome flags`, { flag: { 'ssl-versi
app.commandLine.appendSwitch('ssl-version-fallback-min', 'tls1.2'); app.commandLine.appendSwitch('ssl-version-fallback-min', 'tls1.2');
// Special args that need to be excluded as part of the chrome command line switch // Special args that need to be excluded as part of the chrome command line switch
const specialArgs = [ '--url', '--multiInstance', '--userDataPath=', 'symphony://', '--inspect-brk', '--inspect', '--logPath', '--no-sandbox' ]; const specialArgs = [ '--url', '--multiInstance', '--userDataPath=', 'symphony://', '--inspect-brk', '--inspect', '--logPath' ];
/** /**
* Sets chrome flags * Sets chrome flags

6
src/app/config-handler.ts
View File

@ -267,9 +267,9 @@ class Config {
const { acpFeatureLevelEntitlements, podLevelEntitlements, pmpEntitlements } = this.cloudConfig as ICloudConfig; const { acpFeatureLevelEntitlements, podLevelEntitlements, pmpEntitlements } = this.cloudConfig as ICloudConfig;
// Filter out some values // Filter out some values
const filteredACP = filterOutSelectedValues(acpFeatureLevelEntitlements, [ true, 'NOT_SET' ]); const filteredACP = filterOutSelectedValues(acpFeatureLevelEntitlements, [ true, 'NOT_SET', '' ]);
const filteredPod = filterOutSelectedValues(podLevelEntitlements, [ true, 'NOT_SET' ]); const filteredPod = filterOutSelectedValues(podLevelEntitlements, [ true, 'NOT_SET', '' ]);
const filteredPMP = filterOutSelectedValues(pmpEntitlements, [ true, 'NOT_SET' ]); const filteredPMP = filterOutSelectedValues(pmpEntitlements, [ true, 'NOT_SET', '' ]);
// priority is PMP > ACP > SDA // priority is PMP > ACP > SDA
this.filteredCloudConfig = { ...filteredACP, ...filteredPod, ...filteredPMP }; this.filteredCloudConfig = { ...filteredACP, ...filteredPod, ...filteredPMP };