mirror of
https://github.com/finos/SymphonyElectron.git
synced 2024-11-24 18:00:28 -06:00
feat: SDA-2056: update welcome screen url to [POD].symphony.com (#1009)
* 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:
parent
b4a4b13246
commit
6940d78068
@ -31,7 +31,7 @@ exports[`welcome should render correctly 1`] = `
|
||||
className="Welcome-main-container-podurl-box"
|
||||
onChange={[Function]}
|
||||
type="url"
|
||||
value="https://my.symphony.com"
|
||||
value="https://[POD].symphony.com"
|
||||
/>
|
||||
</div>
|
||||
<div
|
||||
@ -52,8 +52,8 @@ exports[`welcome should render correctly 1`] = `
|
||||
className="Welcome-message-label"
|
||||
/>
|
||||
<button
|
||||
className="Welcome-continue-button"
|
||||
disabled={false}
|
||||
className="Welcome-continue-button-disabled"
|
||||
disabled={true}
|
||||
onClick={[Function]}
|
||||
>
|
||||
Continue
|
||||
|
@ -85,7 +85,7 @@ export class WindowHandler {
|
||||
public screenShareIndicatorFrameUtil: string;
|
||||
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 backgroundThrottling: boolean;
|
||||
private readonly windowOpts: ICustomBrowserWindowConstructorOpts;
|
||||
@ -472,7 +472,7 @@ export class WindowHandler {
|
||||
this.mainWindow.webContents.send('welcome', {
|
||||
url: userConfigUrl || this.startUrl,
|
||||
message: '',
|
||||
urlValid: true,
|
||||
urlValid: false,
|
||||
sso: false,
|
||||
});
|
||||
}
|
||||
|
@ -20,9 +20,9 @@ export default class Welcome extends React.Component<{}, IState> {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
this.state = {
|
||||
url: 'https://my.symphony.com',
|
||||
url: 'https://[POD].symphony.com',
|
||||
message: '',
|
||||
urlValid: true,
|
||||
urlValid: false,
|
||||
sso: false,
|
||||
};
|
||||
this.updateState = this.updateState.bind(this);
|
||||
@ -102,7 +102,7 @@ export default class Welcome extends React.Component<{}, IState> {
|
||||
public updatePodUrl(_event): void {
|
||||
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;
|
||||
if (!match) {
|
||||
if (url === 'https://[POD].symphony.com' || !match) {
|
||||
this.updateState(_event, {
|
||||
url,
|
||||
message: i18n.t('Please enter a valid url', WELCOME_NAMESPACE)(),
|
||||
|
Loading…
Reference in New Issue
Block a user