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

feat: SDA-2056: update welcome screen url to [POD].symphony.com (#1009)

Browse Source 
* add support for electron 8.x

* update node-abi to latest

* 8.x: fix unit tests

* upgrade to electron 9.x

Signed-off-by: Vishwas Shashidhar <vishwas.shashidhar@symphony.com>

* rebase 9.x against master

Signed-off-by: Vishwas Shashidhar <vishwas.shashidhar@symphony.com>

* 9.x: fix windows installer files

Signed-off-by: Vishwas Shashidhar <vishwas.shashidhar@symphony.com>

* rebase 9.x against master and fix issues

Signed-off-by: Vishwas Shashidhar <vishwas.shashidhar@symphony.com>

* 9.x - update aip file

* 9.x -> downgrade to electron 9.0.0-beta.22

Signed-off-by: Vishwas Shashidhar <vishwas.shashidhar@symphony.com>

* bump up electron version to 9.0.0

Signed-off-by: Vishwas Shashidhar <vishwas.shashidhar@symphony.com>

* upgrade node-abi to support electron 9

* update package-lock.json

* 9.x -> enable signing on aip

Signed-off-by: Vishwas Shashidhar <vishwas.shashidhar@symphony.com>

* 9.x -> update package-lock.json

Signed-off-by: Vishwas Shashidhar <vishwas.shashidhar@symphony.com>

* 9.x -> fix screen share indicator mac script issue

Signed-off-by: Vishwas Shashidhar <vishwas.shashidhar@symphony.com>

* SDA-2080 - Target jss class name instead of dev defined

* SDA-2080: fix title bar issue with 9.x

* SDA-2080 - Make text notification black for 1.5 and update style template

* 9.x: add electron-osx-sign to fix 9.x build issues

Signed-off-by: Vishwas Shashidhar <vishwas.shashidhar@symphony.com>

* SDA-2091 - Only pass required data via IPC

* SDA-2092 - prevent notifications from opening in fullscreen state in MacOS

* SDA-2056: set [POD] as the placeholder for default pod url

Signed-off-by: Vishwas Shashidhar <vishwas.shashidhar@symphony.com>

* SDA-2056: fix unit tests

Signed-off-by: Vishwas Shashidhar <vishwas.shashidhar@symphony.com>

* SDA-2056: remove post install script.

Signed-off-by: Vishwas Shashidhar <vishwas.shashidhar@symphony.com>

Co-authored-by: Kiran Niranjan <kiran.niranjan@symphony.com>
This commit is contained in:
Vishwas Shashidhar 2020-06-02 13:00:30 +05:30 committed by GitHub
parent b4a4b13246
commit 6940d78068
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spec/__snapshots__/welcome.spec.ts.snap
View File

@ -31,7 +31,7 @@ exports[`welcome should render correctly 1`] = `
className="Welcome-main-container-podurl-box" className="Welcome-main-container-podurl-box"
onChange={[Function]} onChange={[Function]}
type="url" type="url"
value="https://my.symphony.com" value="https://[POD].symphony.com"
/> />
</div> </div>
<div <div
@ -52,8 +52,8 @@ exports[`welcome should render correctly 1`] = `
className="Welcome-message-label" className="Welcome-message-label"
/> />
<button <button
className="Welcome-continue-button" className="Welcome-continue-button-disabled"
disabled={false} disabled={true}
onClick={[Function]} onClick={[Function]}
> >
Continue Continue

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

@ -85,7 +85,7 @@ export class WindowHandler {
public screenShareIndicatorFrameUtil: string; public screenShareIndicatorFrameUtil: string;
public shouldShowWelcomeScreen: boolean = false; public shouldShowWelcomeScreen: boolean = false;
private readonly defaultPodUrl: string = 'https://my.symphony.com'; private readonly defaultPodUrl: string = 'https://[POD].symphony.com';
private readonly contextIsolation: boolean; private readonly contextIsolation: boolean;
private readonly backgroundThrottling: boolean; private readonly backgroundThrottling: boolean;
private readonly windowOpts: ICustomBrowserWindowConstructorOpts; private readonly windowOpts: ICustomBrowserWindowConstructorOpts;
@ -472,7 +472,7 @@ export class WindowHandler {
this.mainWindow.webContents.send('welcome', { this.mainWindow.webContents.send('welcome', {
url: userConfigUrl || this.startUrl, url: userConfigUrl || this.startUrl,
message: '', message: '',
urlValid: true, urlValid: false,
sso: false, sso: false,
}); });
} }

6
src/renderer/components/welcome.tsx
View File

@ -20,9 +20,9 @@ export default class Welcome extends React.Component<{}, IState> {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
url: 'https://my.symphony.com', url: 'https://[POD].symphony.com',
message: '', message: '',
urlValid: true, urlValid: false,
sso: false, sso: false,
}; };
this.updateState = this.updateState.bind(this); this.updateState = this.updateState.bind(this);
@ -102,7 +102,7 @@ export default class Welcome extends React.Component<{}, IState> {
public updatePodUrl(_event): void { public updatePodUrl(_event): void {
const url = _event.target.value; const url = _event.target.value;
const match = url.match(/(https?:\/\/.)?(www\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_+.~#?&/=]*)/g) != null; const match = url.match(/(https?:\/\/.)?(www\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_+.~#?&/=]*)/g) != null;
if (!match) { if (url === 'https://[POD].symphony.com' || !match) {
this.updateState(_event, { this.updateState(_event, {
url, url,
message: i18n.t('Please enter a valid url', WELCOME_NAMESPACE)(), message: i18n.t('Please enter a valid url', WELCOME_NAMESPACE)(),