From 21f15bb1a35334168dc1068be563708f176ec6b7 Mon Sep 17 00:00:00 2001 From: Vishwas Shashidhar Date: Wed, 3 Jun 2020 10:51:32 +0530 Subject: [PATCH 1/2] fix: SDA-2056: fix welcome screen button (#1011) * SDA-2056: fix welcome screen button - set url valid to true when setting welcome screen url from user config Signed-off-by: Vishwas Shashidhar * SDA-2056: trim url --- src/app/window-handler.ts | 2 +- src/renderer/components/welcome.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/window-handler.ts b/src/app/window-handler.ts index ba27fa62..e0484550 100644 --- a/src/app/window-handler.ts +++ b/src/app/window-handler.ts @@ -479,7 +479,7 @@ export class WindowHandler { this.mainWindow.webContents.send('welcome', { url: userConfigUrl || this.startUrl, message: '', - urlValid: false, + urlValid: !!userConfigUrl, sso: false, }); } diff --git a/src/renderer/components/welcome.tsx b/src/renderer/components/welcome.tsx index f166f196..c7a3d9bd 100644 --- a/src/renderer/components/welcome.tsx +++ b/src/renderer/components/welcome.tsx @@ -100,7 +100,7 @@ export default class Welcome extends React.Component<{}, IState> { * @param _event */ public updatePodUrl(_event): void { - const url = _event.target.value; + const url = _event.target.value.trim(); const match = url.match(/(https?:\/\/.)?(www\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_+.~#?&/=]*)/g) != null; if (url === 'https://[POD].symphony.com' || !match) { this.updateState(_event, { From f3500afd89f7ceb5be00dcb4dd4020d86b00f2c7 Mon Sep 17 00:00:00 2001 From: Johan Kwarnmark Date: Wed, 3 Jun 2020 08:18:44 +0200 Subject: [PATCH 2/2] Update to electron 9.0.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4bac142b..71f566e6 100644 --- a/package.json +++ b/package.json @@ -120,7 +120,7 @@ "browserify": "16.5.1", "cross-env": "5.2.0", "del": "3.0.0", - "electron": "9.0.0", + "electron": "9.0.2", "electron-builder": "22.7.0", "electron-builder-squirrel-windows": "20.38.3", "electron-icon-maker": "0.0.4",