From b8d1aed90c3537728314ded5302f5dc2c1d4b431 Mon Sep 17 00:00:00 2001 From: embbnux Date: Wed, 24 May 2017 15:35:12 +0800 Subject: [PATCH 1/4] enhancement of calling setting --- dev-server/Phone.js | 1 - src/components/CallingSettingsAlert/i18n/en-US.js | 4 ++-- src/components/CallingSettingsAlert/index.js | 4 +++- src/components/WebphoneAlert/i18n/en-US.js | 3 +-- src/components/WebphoneAlert/index.js | 3 +-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dev-server/Phone.js b/dev-server/Phone.js index a52798b36c..4a2b486828 100644 --- a/dev-server/Phone.js +++ b/dev-server/Phone.js @@ -248,7 +248,6 @@ export default class Phone extends RcModule { webphone: this.webphone, extensionPhoneNumber: this.extensionPhoneNumber, numberValidate: this.numberValidate, - extensionPhoneNumber: this.extensionPhoneNumber, getState: () => this.state.call, })); this.addModule('subscription', new Subscription({ diff --git a/src/components/CallingSettingsAlert/i18n/en-US.js b/src/components/CallingSettingsAlert/i18n/en-US.js index 0bffc7959c..f58e4d364c 100644 --- a/src/components/CallingSettingsAlert/i18n/en-US.js +++ b/src/components/CallingSettingsAlert/i18n/en-US.js @@ -19,8 +19,8 @@ export default { 'Your phone number information has been changed recently. Please go to {link} to check your Calling options.', link: 'Settings > Calling', [callingSettingsMessages.webphonePermissionRemoved]: - `Your permissions have been changed and you cannot make calls with Browser. - For details please contact your account administrator.`, + `Your permissions have been changed and you cannot make calls with Browser. + For details please contact your account administrator.`, [callingSettingsMessages.emergencyCallingNotAvailable]: `Dialing emergency or special service numbers is not supported. In an emergency, use your traditional wireline or wireless phone to call an emergency number.`, diff --git a/src/components/CallingSettingsAlert/index.js b/src/components/CallingSettingsAlert/index.js index 01e6c53016..b27d733201 100644 --- a/src/components/CallingSettingsAlert/index.js +++ b/src/components/CallingSettingsAlert/index.js @@ -11,10 +11,12 @@ function CallingSettingsAlert({ message: { message }, currentLocale, brand, call case callingSettingsMessages.saveSuccessWithSoftphone: case callingSettingsMessages.firstLogin: case callingSettingsMessages.firstLoginOther: + case callingSettingsMessages.webphonePermissionRemoved: + case callingSettingsMessages.emergencyCallingNotAvailable: return ( ); diff --git a/src/components/WebphoneAlert/i18n/en-US.js b/src/components/WebphoneAlert/i18n/en-US.js index b353846ba2..a628754a48 100644 --- a/src/components/WebphoneAlert/i18n/en-US.js +++ b/src/components/WebphoneAlert/i18n/en-US.js @@ -1,11 +1,10 @@ import webphoneErrors from 'ringcentral-integration/modules/Webphone/webphoneErrors'; export default { - [webphoneErrors.connectFailed]: 'Send Success.', + [webphoneErrors.connectFailed]: 'Connect with web phone server faild.', [webphoneErrors.browserNotSupported]: 'Calling with browser is only supported on Chrome.', [webphoneErrors.webphoneCountOverLimit]: 'A maximum of 5 web phones could be registered.', [webphoneErrors.notOutboundCallWithoutDL]: `Your extension is not allowed to make outbound calls with browser currently, please contact your account representative for an upgrade.`, - [webphoneErrors.getSipProvisionError]: 'You have no permission to send message.', }; diff --git a/src/components/WebphoneAlert/index.js b/src/components/WebphoneAlert/index.js index 4f516befb5..bd0a84f303 100644 --- a/src/components/WebphoneAlert/index.js +++ b/src/components/WebphoneAlert/index.js @@ -20,6 +20,5 @@ WebphoneAlert.handleMessage = ({ message }) => ( (message === webphoneErrors.connectFailed) || (message === webphoneErrors.browserNotSupported) || (message === webphoneErrors.webphoneCountOverLimit) || - (message === webphoneErrors.notOutboundCallWithoutDL) || - (message === webphoneErrors.getSipProvisionError) + (message === webphoneErrors.notOutboundCallWithoutDL) ); From 88425e3c90cae1e950800b73e1221b4d38fab533 Mon Sep 17 00:00:00 2001 From: embbnux Date: Wed, 24 May 2017 15:37:41 +0800 Subject: [PATCH 2/4] fix typo --- src/components/WebphoneAlert/i18n/en-US.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/WebphoneAlert/i18n/en-US.js b/src/components/WebphoneAlert/i18n/en-US.js index a628754a48..d11bbaf997 100644 --- a/src/components/WebphoneAlert/i18n/en-US.js +++ b/src/components/WebphoneAlert/i18n/en-US.js @@ -1,7 +1,7 @@ import webphoneErrors from 'ringcentral-integration/modules/Webphone/webphoneErrors'; export default { - [webphoneErrors.connectFailed]: 'Connect with web phone server faild.', + [webphoneErrors.connectFailed]: 'Connect with web phone server failed.', [webphoneErrors.browserNotSupported]: 'Calling with browser is only supported on Chrome.', [webphoneErrors.webphoneCountOverLimit]: 'A maximum of 5 web phones could be registered.', [webphoneErrors.notOutboundCallWithoutDL]: `Your extension is not allowed to From 55bd89ae128ed988b74b1027a3730620cb8a3efc Mon Sep 17 00:00:00 2001 From: embbnux Date: Thu, 25 May 2017 15:28:22 +0800 Subject: [PATCH 3/4] remove connect failed --- src/components/WebphoneAlert/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/WebphoneAlert/index.js b/src/components/WebphoneAlert/index.js index bd0a84f303..73952e124f 100644 --- a/src/components/WebphoneAlert/index.js +++ b/src/components/WebphoneAlert/index.js @@ -17,7 +17,6 @@ WebphoneAlert.propTypes = { }; WebphoneAlert.handleMessage = ({ message }) => ( - (message === webphoneErrors.connectFailed) || (message === webphoneErrors.browserNotSupported) || (message === webphoneErrors.webphoneCountOverLimit) || (message === webphoneErrors.notOutboundCallWithoutDL) From 66d3e6d8f810a9a2ea4788764e552b8af78d84cf Mon Sep 17 00:00:00 2001 From: embbnux Date: Thu, 25 May 2017 15:40:03 +0800 Subject: [PATCH 4/4] update commons --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 5b976af561..5a9d60031c 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "redux-thunk": "^2.1.0", "ringcentral": "3.0.0", "ringcentral-client": "^1.0.0-rc1", - "ringcentral-integration": "^0.6.9", + "ringcentral-integration": "^0.6.10", "sass-loader": "^4.1.1", "source-map-loader": "^0.1.5", "style-loader": "^0.13.1", diff --git a/yarn.lock b/yarn.lock index 929f77a960..f540a9c8ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6432,9 +6432,9 @@ ringcentral-client@^1.0.0-rc1: form-data "^2.1.2" isomorphic-fetch "^2.2.1" -ringcentral-integration@^0.6.9: - version "0.6.9" - resolved "https://registry.yarnpkg.com/ringcentral-integration/-/ringcentral-integration-0.6.9.tgz#577e5e6fa8101aa995a89776c8df17bcc9b479d2" +ringcentral-integration@^0.6.10: + version "0.6.10" + resolved "https://registry.yarnpkg.com/ringcentral-integration/-/ringcentral-integration-0.6.10.tgz#9c6d2eb008ba30c8a87743a559456790d0454a5a" dependencies: file-loader "^0.10.1" json-mask "^0.3.8"