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 'main' into SDA-3024

Browse Source
This commit is contained in:
mattias-symphony
2021-03-25 09:12:19 +01:00
committed by GitHub
parent d4476d6ef0 d63dba8b10
commit c2afb5c5b3
3 changed files with 58 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
.vscode/launch.json vendored
View File

@@ -10,19 +10,14 @@
"windows": {
"runtimeExecutable": "${workspaceFolder}/node_modules/electron/dist/Electron.exe"
},
"args": [
".",
"--url=https://corporate.symphony.com"
],
"args": [".", "--url=https://corporate.symphony.com"],
"env": {
"ELECTRON_DEBUGGING": "true",
"ELECTRON_DEV": "true"
},
"outputCapture": "std",
"sourceMaps": true,
"outFiles": [
"${workspaceFolder}/lib/**/*.js"
]
"outFiles": ["${workspaceFolder}/lib/**/*.js"]
},
{
"name": "Corp (Build & Run)",
@@ -34,22 +29,17 @@
"runtimeExecutable": "${workspaceFolder}/node_modules/electron/dist/Electron.exe"
},
"preLaunchTask": "build",
"args": [
".",
"--url=https://corporate.symphony.com"
],
"args": [".", "--url=https://corporate.symphony.com"],
"env": {
"ELECTRON_DEBUGGING": "true",
"ELECTRON_DEV": "true"
},
"outputCapture": "std",
"sourceMaps": true,
"outFiles": [
"${workspaceFolder}/lib/**/*.js"
]
"outFiles": ["${workspaceFolder}/lib/**/*.js"]
},
{
"name": "Mana",
"name": "Local Mana",
"type": "node",
"request": "launch",
"cwd": "${workspaceFolder}",
@@ -57,22 +47,17 @@
"windows": {
"runtimeExecutable": "${workspaceFolder}/node_modules/electron/dist/Electron.exe"
},
"args": [
".",
"--url=https://local-dev.symphony.com:9090"
],
"args": [".", "--url=https://local-dev.symphony.com:9090"],
"env": {
"ELECTRON_DEBUGGING": "true",
"ELECTRON_DEV": "true"
},
"outputCapture": "std",
"sourceMaps": true,
"outFiles": [
"${workspaceFolder}/lib/**/*.js"
]
"outFiles": ["${workspaceFolder}/lib/**/*.js"]
},
{
"name": "Mana (Build & Run)",
"name": "Local Mana (Build & Run)",
"type": "node",
"request": "launch",
"cwd": "${workspaceFolder}",
@@ -81,19 +66,51 @@
"runtimeExecutable": "${workspaceFolder}/node_modules/electron/dist/Electron.exe"
},
"preLaunchTask": "build",
"args": [
".",
"--url=https://local-dev.symphony.com:9090"
],
"args": [".", "--url=https://local-dev.symphony.com:9090"],
"env": {
"ELECTRON_DEBUGGING": "true",
"ELECTRON_DEV": "true"
},
"outputCapture": "std",
"sourceMaps": true,
"outFiles": [
"${workspaceFolder}/lib/**/*.js"
]
"outFiles": ["${workspaceFolder}/lib/**/*.js"]
},
{
"name": "st2",
"type": "node",
"request": "launch",
"cwd": "${workspaceFolder}",
"runtimeExecutable": "${workspaceFolder}/node_modules/electron/dist/Electron.app/Contents/MacOS/Electron",
"windows": {
"runtimeExecutable": "${workspaceFolder}/node_modules/electron/dist/Electron.exe"
},
"args": [".", "--url=https://st2.symphony.com"],
"env": {
"ELECTRON_DEBUGGING": "true",
"ELECTRON_DEV": "true"
},
"outputCapture": "std",
"sourceMaps": true,
"outFiles": ["${workspaceFolder}/lib/**/*.js"]
},
{
"name": "st2 (Build & Run)",
"type": "node",
"request": "launch",
"cwd": "${workspaceFolder}",
"runtimeExecutable": "${workspaceFolder}/node_modules/electron/dist/Electron.app/Contents/MacOS/Electron",
"windows": {
"runtimeExecutable": "${workspaceFolder}/node_modules/electron/dist/Electron.exe"
},
"preLaunchTask": "build",
"args": [".", "--url=https://st2.symphony.com"],
"env": {
"ELECTRON_DEBUGGING": "true",
"ELECTRON_DEV": "true"
},
"outputCapture": "std",
"sourceMaps": true,
"outFiles": ["${workspaceFolder}/lib/**/*.js"]
},
{
"name": "Demo",
@@ -104,19 +121,14 @@
"windows": {
"runtimeExecutable": "${workspaceFolder}/node_modules/electron/dist/Electron.exe"
},
"args": [
".",
"--url=file://${workspaceFolder}/src/demo/index.html"
],
"args": [".", "--url=file://${workspaceFolder}/src/demo/index.html"],
"env": {
"ELECTRON_DEBUGGING": "true",
"ELECTRON_DEV": "true"
},
"outputCapture": "std",
"sourceMaps": true,
"outFiles": [
"${workspaceFolder}/lib/**/*.js"
]
"outFiles": ["${workspaceFolder}/lib/**/*.js"]
},
{
"name": "Demo (Build & Run)",
@@ -128,19 +140,14 @@
"runtimeExecutable": "${workspaceFolder}/node_modules/electron/dist/Electron.exe"
},
"preLaunchTask": "build",
"args": [
".",
"--url=file://${workspaceFolder}/src/demo/index.html"
],
"args": [".", "--url=file://${workspaceFolder}/src/demo/index.html"],
"env": {
"ELECTRON_DEBUGGING": "true",
"ELECTRON_DEV": "true"
},
"outputCapture": "std",
"sourceMaps": true,
"outFiles": [
"${workspaceFolder}/lib/**/*.js"
]
"outFiles": ["${workspaceFolder}/lib/**/*.js"]
},
{
"name": "Dev",
@@ -151,18 +158,14 @@
"windows": {
"runtimeExecutable": "${workspaceFolder}/node_modules/electron/dist/Electron.exe"
},
"args": [
"."
],
"args": ["."],
"env": {
"ELECTRON_DEBUGGING": "true",
"ELECTRON_DEV": "true"
},
"outputCapture": "std",
"sourceMaps": true,
"outFiles": [
"${workspaceFolder}/lib/**/*.js"
]
"outFiles": ["${workspaceFolder}/lib/**/*.js"]
},
{
"name": "Dev (Build & Run)",
@@ -173,19 +176,14 @@
"windows": {
"runtimeExecutable": "${workspaceFolder}/node_modules/electron/dist/Electron.exe"
},
"args": [
"."
],
"args": ["."],
"env": {
"ELECTRON_DEBUGGING": "true",
"ELECTRON_DEV": "true"
},
"outputCapture": "std",
"sourceMaps": true,
"outFiles": [
"${workspaceFolder}/lib/**/*.js"
]
},
"outFiles": ["${workspaceFolder}/lib/**/*.js"]
}
]
}

2
package.json
View File

@@ -164,7 +164,7 @@
"electron-dl": "3.0.0",
"electron-fetch": "1.4.0",
"electron-log": "4.0.7",
"electron-spellchecker": "git+https://github.com/symphonyoss/electron-spellchecker.git#v2.3.1",
"electron-spellchecker": "git+https://github.com/symphonyoss/electron-spellchecker.git#v2.3.2",
"ffi-napi": "3.0.0",
"filesize": "6.1.0",
"lazy-brush": "^1.0.1",

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

@@ -706,7 +706,7 @@ export class WindowHandler {
url: userConfigUrl || this.startUrl,
message: '',
urlValid: !!userConfigUrl,
sso: false,
sso: this.userConfig.url.indexOf('/login/sso/initsso') > -1,
});
}
});