From a1797acdd1c94ab31200e88e19ec1e9cc84d6770 Mon Sep 17 00:00:00 2001 From: caffffe Date: Wed, 12 Jul 2017 14:32:47 +0800 Subject: [PATCH 1/5] RCINT-4578 The list of forwarded numbers is messy --- package.json | 2 - src/components/ForwardForm/index.js | 4 +- src/components/ForwardForm/styles.scss | 3 + src/components/IncomingCallPad/styles.scss | 1 + src/components/WebphoneAlert/i18n/en-US.js | 3 +- src/components/WebphoneAlert/index.js | 3 +- src/containers/ActiveCallPage/index.js | 13 +-- yarn.lock | 94 +--------------------- 8 files changed, 20 insertions(+), 103 deletions(-) diff --git a/package.json b/package.json index cc947c19c7..0eaab53ef3 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,6 @@ "react-router-redux": "^4.0.7", "ringcentral": "3.1.1", "ringcentral-client": "^1.0.0-rc1", - "ringcentral-integration": "^0.7.0-rc8", "whatwg-fetch": "^2.0.1" }, "devDependencies": { @@ -84,7 +83,6 @@ "redux-thunk": "^2.1.0", "ringcentral": "^3.1.1", "ringcentral-client": "^1.0.0-rc1", - "ringcentral-integration": "^0.7.0-rc5", "sass-loader": "^6.0.5", "source-map-loader": "^0.2.1", "style-loader": "^0.18.2", diff --git a/src/components/ForwardForm/index.js b/src/components/ForwardForm/index.js index d65ae6703a..ab66f4c2dc 100644 --- a/src/components/ForwardForm/index.js +++ b/src/components/ForwardForm/index.js @@ -28,9 +28,9 @@ function ForwardNumbers({ } onClick={() => onSelect(index)} > - {number.label} + {number.label} : - {formatPhone(number.phoneNumber)} + {formatPhone(number.phoneNumber)} )) } diff --git a/src/components/ForwardForm/styles.scss b/src/components/ForwardForm/styles.scss index 0b41d259d8..94d4d82e6a 100644 --- a/src/components/ForwardForm/styles.scss +++ b/src/components/ForwardForm/styles.scss @@ -116,5 +116,8 @@ .colon { padding-right: 5px; } + .phoneNumber{ + max-width: 97px; + } } } diff --git a/src/components/IncomingCallPad/styles.scss b/src/components/IncomingCallPad/styles.scss index a47b186b0a..214e4be02f 100644 --- a/src/components/IncomingCallPad/styles.scss +++ b/src/components/IncomingCallPad/styles.scss @@ -43,6 +43,7 @@ width: 79%; min-width: 201px; background: #fff; + z-index: 9; } :global .rc-tooltip-inner { padding: 0; diff --git a/src/components/WebphoneAlert/i18n/en-US.js b/src/components/WebphoneAlert/i18n/en-US.js index 193a59fff5..a72bc9cf0a 100644 --- a/src/components/WebphoneAlert/i18n/en-US.js +++ b/src/components/WebphoneAlert/i18n/en-US.js @@ -6,5 +6,6 @@ export default { [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.', - [webphoneErrors.toVoiceMailError]: 'Cannot send call to voicemail due to internal error' + [webphoneErrors.toVoiceMailError]: 'Cannot send call to voicemail due to internal error', + [webphoneErrors.forwardError]: 'Dialing emergency or special service numbers is not supported.', }; diff --git a/src/components/WebphoneAlert/index.js b/src/components/WebphoneAlert/index.js index a3b8c7b646..8363b2a7e7 100644 --- a/src/components/WebphoneAlert/index.js +++ b/src/components/WebphoneAlert/index.js @@ -21,6 +21,7 @@ WebphoneAlert.handleMessage = ({ message }) => ( (message === webphoneErrors.browserNotSupported) || (message === webphoneErrors.webphoneCountOverLimit) || (message === webphoneErrors.notOutboundCallWithoutDL) || - (message === webphoneErrors.toVoiceMailError) + (message === webphoneErrors.toVoiceMailError) || + (message === webphoneErrors.forwardError) ); diff --git a/src/containers/ActiveCallPage/index.js b/src/containers/ActiveCallPage/index.js index 1371b41328..6bb07ef2ae 100644 --- a/src/containers/ActiveCallPage/index.js +++ b/src/containers/ActiveCallPage/index.js @@ -98,9 +98,9 @@ class ActiveCallPage extends Component { render() { const session = this.props.session; const active = !!session.id; - if (!active) { - return null; - } + // if (!active) { + // return null; + // } if (this.props.minimized) { return ( =0.0.5: - version "0.0.6" - resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f" - orchestrator@^0.3.0: version "0.3.8" resolved "https://registry.yarnpkg.com/orchestrator/-/orchestrator-0.3.8.tgz#14e7e9e2764f7315fbac184e506c7aa6df94ad7e" @@ -5071,10 +5045,6 @@ performance-now@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" -phoneformat.js@^1.0.3: - version "1.0.5" - resolved "https://registry.yarnpkg.com/phoneformat.js/-/phoneformat.js-1.0.5.tgz#aeda52ea1a11358dd240f4896ee3446d6b9e0da0" - pify@^2.0.0, pify@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" @@ -5423,16 +5393,6 @@ progress@^1.1.8: version "1.1.8" resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be" -promiscuous@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/promiscuous/-/promiscuous-0.6.0.tgz#54014cd3d62cafe831e3354990c05ff5b78c8892" - -promise@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/promise/-/promise-5.0.0.tgz#ac40b7866bed7aaf796ab5b79b80325e047ec0ef" - dependencies: - asap "~1.0.0" - promise@^7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/promise/-/promise-7.1.1.tgz#489654c692616b8aa55b0724fa809bb7db49c5bf" @@ -5813,7 +5773,7 @@ redux-thunk@^2.1.0: version "2.2.0" resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.2.0.tgz#e615a16e16b47a19a515766133d1e3e99b7852e5" -redux@^3.5.2, redux@^3.6.0: +redux@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/redux/-/redux-3.6.0.tgz#887c2b3d0b9bd86eca2be70571c27654c19e188d" dependencies: @@ -5984,10 +5944,6 @@ requires-port@1.0.x, requires-port@1.x.x: version "1.0.0" resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" -reselect@2.5.4: - version "2.5.4" - resolved "https://registry.yarnpkg.com/reselect/-/reselect-2.5.4.tgz#b7d23fdf00b83fa7ad0279546f8dbbbd765c7047" - resolve-dir@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-0.1.1.tgz#b219259a5602fac5c5c496ad894a6e8cc430261e" @@ -6047,27 +6003,6 @@ ringcentral-client@^1.0.0-rc1: form-data "^2.1.2" isomorphic-fetch "^2.2.1" -ringcentral-integration@^0.7.0-rc5: - version "0.7.0-rc5" - resolved "https://registry.yarnpkg.com/ringcentral-integration/-/ringcentral-integration-0.7.0-rc5.tgz#bd47aaa3368b6b07269d29789d6f2f53486dd65d" - dependencies: - file-loader "^0.11.2" - json-mask "^0.3.8" - loganberry "^0.9.1" - phoneformat.js "^1.0.3" - redux "^3.5.2" - reselect "2.5.4" - ringcentral-web-phone "^0.4.1" - url-loader "^0.5.8" - uuid "^3.0.1" - yards "^0.1.4" - -ringcentral-web-phone@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/ringcentral-web-phone/-/ringcentral-web-phone-0.4.1.tgz#dfa9d7e67dc8ae02bea844718552cd5738138001" - dependencies: - sip.js "^0.7.7" - ringcentral@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/ringcentral/-/ringcentral-3.1.1.tgz#7f73f768f5ae8a62c1121b8356032cf4321ecc11" @@ -6255,14 +6190,6 @@ signal-exit@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" -sip.js@^0.7.7: - version "0.7.8" - resolved "https://registry.yarnpkg.com/sip.js/-/sip.js-0.7.8.tgz#48709ba13485bcc050869b77a93c21658095b430" - dependencies: - ws "^1.0.1" - optionalDependencies: - promiscuous "^0.6.0" - slash@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" @@ -6818,10 +6745,6 @@ uid-number@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" -ultron@1.0.x: - version "1.0.2" - resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa" - unc-path-regex@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" @@ -7142,13 +7065,6 @@ write@^0.2.1: dependencies: mkdirp "^0.5.1" -ws@^1.0.1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.4.tgz#57f40d036832e5f5055662a397c4de76ed66bf61" - dependencies: - options ">=0.0.5" - ultron "1.0.x" - xml-js@^1.0.2: version "1.3.2" resolved "https://registry.yarnpkg.com/xml-js/-/xml-js-1.3.2.tgz#6157f1987f0f0ab994237bb827aa0c3401aea843" @@ -7171,12 +7087,6 @@ yallist@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" -yards@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/yards/-/yards-0.1.4.tgz#f7da295448ab1740bf56b7512a841a0f969cb0d3" - dependencies: - promise "5.0.0" - yargs-parser@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4" From 18411a8aff31e073bda64843d3912afc8dd38886 Mon Sep 17 00:00:00 2001 From: caffffe Date: Wed, 12 Jul 2017 14:33:59 +0800 Subject: [PATCH 2/5] RCINT-4579 [Window Title] --- src/containers/ActiveCallPage/index.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/containers/ActiveCallPage/index.js b/src/containers/ActiveCallPage/index.js index 6bb07ef2ae..8ab4fbed53 100644 --- a/src/containers/ActiveCallPage/index.js +++ b/src/containers/ActiveCallPage/index.js @@ -250,10 +250,7 @@ function mapToProps(_, { minimized: webphone.minimized, areaCode: regionSettings.areaCode, countryCode: regionSettings.countryCode, - // forwardingNumbers: forwardingNumber.forwardingNumbers, - forwardingNumbers: [{ id: '1', label: 'RC US Cisco SPA-122 ATA', phoneNumber: '8613666035097' }, - { id: '2', label: 'RC US Polycom VVX-311 Gigabit Ethernet Phone', phoneNumber: '165 7224 4548' }, - { id: '3', label: '122222222223', phoneNumber: '13666035097' }], + forwardingNumbers: forwardingNumber.forwardingNumbers, }; } From ebacb4366aea7d04f3bfb3efaa89fa87b62a2bc0 Mon Sep 17 00:00:00 2001 From: caffffe Date: Wed, 12 Jul 2017 14:38:15 +0800 Subject: [PATCH 3/5] RCINT-4579 Error message should be shown on the top of the app --- package.json | 2 ++ src/containers/ActiveCallPage/index.js | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 0eaab53ef3..cc947c19c7 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "react-router-redux": "^4.0.7", "ringcentral": "3.1.1", "ringcentral-client": "^1.0.0-rc1", + "ringcentral-integration": "^0.7.0-rc8", "whatwg-fetch": "^2.0.1" }, "devDependencies": { @@ -83,6 +84,7 @@ "redux-thunk": "^2.1.0", "ringcentral": "^3.1.1", "ringcentral-client": "^1.0.0-rc1", + "ringcentral-integration": "^0.7.0-rc5", "sass-loader": "^6.0.5", "source-map-loader": "^0.2.1", "style-loader": "^0.18.2", diff --git a/src/containers/ActiveCallPage/index.js b/src/containers/ActiveCallPage/index.js index 8ab4fbed53..1371b41328 100644 --- a/src/containers/ActiveCallPage/index.js +++ b/src/containers/ActiveCallPage/index.js @@ -98,9 +98,9 @@ class ActiveCallPage extends Component { render() { const session = this.props.session; const active = !!session.id; - // if (!active) { - // return null; - // } + if (!active) { + return null; + } if (this.props.minimized) { return ( Date: Wed, 12 Jul 2017 16:23:18 +0800 Subject: [PATCH 4/5] update padding of numbers --- src/components/ForwardForm/index.js | 2 +- src/components/ForwardForm/styles.scss | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/components/ForwardForm/index.js b/src/components/ForwardForm/index.js index ab66f4c2dc..9b9e9417a2 100644 --- a/src/components/ForwardForm/index.js +++ b/src/components/ForwardForm/index.js @@ -30,7 +30,7 @@ function ForwardNumbers({ > {number.label} : - {formatPhone(number.phoneNumber)} + {formatPhone(number.phoneNumber)} )) } diff --git a/src/components/ForwardForm/styles.scss b/src/components/ForwardForm/styles.scss index 94d4d82e6a..d284ac7988 100644 --- a/src/components/ForwardForm/styles.scss +++ b/src/components/ForwardForm/styles.scss @@ -103,7 +103,7 @@ .number { box-sizing: border-box; height: 28px; - padding: 5px 20px; + padding: 5px 0 5px 20px; span { display: inline-block; overflow: hidden; @@ -116,8 +116,5 @@ .colon { padding-right: 5px; } - .phoneNumber{ - max-width: 97px; - } } } From 67755b373aca4e3c7e261cd3fba8e2fa442d5823 Mon Sep 17 00:00:00 2001 From: caffffe Date: Wed, 12 Jul 2017 17:22:38 +0800 Subject: [PATCH 5/5] remove webphone alert --- src/components/ForwardForm/index.js | 2 +- src/components/WebphoneAlert/i18n/en-US.js | 1 - src/components/WebphoneAlert/index.js | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/ForwardForm/index.js b/src/components/ForwardForm/index.js index 9b9e9417a2..918c5a3f16 100644 --- a/src/components/ForwardForm/index.js +++ b/src/components/ForwardForm/index.js @@ -30,7 +30,7 @@ function ForwardNumbers({ > {number.label} : - {formatPhone(number.phoneNumber)} + {formatPhone(number.phoneNumber)} )) } diff --git a/src/components/WebphoneAlert/i18n/en-US.js b/src/components/WebphoneAlert/i18n/en-US.js index a72bc9cf0a..82329acf11 100644 --- a/src/components/WebphoneAlert/i18n/en-US.js +++ b/src/components/WebphoneAlert/i18n/en-US.js @@ -7,5 +7,4 @@ export default { [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.', [webphoneErrors.toVoiceMailError]: 'Cannot send call to voicemail due to internal error', - [webphoneErrors.forwardError]: 'Dialing emergency or special service numbers is not supported.', }; diff --git a/src/components/WebphoneAlert/index.js b/src/components/WebphoneAlert/index.js index 8363b2a7e7..a3b8c7b646 100644 --- a/src/components/WebphoneAlert/index.js +++ b/src/components/WebphoneAlert/index.js @@ -21,7 +21,6 @@ WebphoneAlert.handleMessage = ({ message }) => ( (message === webphoneErrors.browserNotSupported) || (message === webphoneErrors.webphoneCountOverLimit) || (message === webphoneErrors.notOutboundCallWithoutDL) || - (message === webphoneErrors.toVoiceMailError) || - (message === webphoneErrors.forwardError) + (message === webphoneErrors.toVoiceMailError) );