Skip to content

Commit 88d685b

Browse files
authored
RCINT-4413, RCINT-4414 (#316)
* export location_change from router * export location change as actionTypes * in progress * add initial contact index logic * change toNumberEntity structure * bump common version
1 parent eca0acd commit 88d685b

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
"redux-thunk": "^2.1.0",
7979
"ringcentral": "3.0.0",
8080
"ringcentral-client": "^1.0.0-rc1",
81-
"ringcentral-integration": "^0.6.17",
81+
"ringcentral-integration": "0.6.34",
8282
"sass-loader": "^4.1.1",
8383
"source-map-loader": "^0.1.5",
8484
"style-loader": "^0.13.1",

src/components/CallItem/index.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,20 @@ export default class CallItem extends Component {
103103
getInitialContactIndex(nextProps = this.props) {
104104
const contactMatches = this.getContactMatches(nextProps);
105105
const activityMatches = nextProps.call.activityMatches;
106+
// console.log('getInitialContactIndex:', nextProps.call.toNumberEntity);
106107
for (const activity of activityMatches) {
107108
const index = contactMatches.findIndex(contact => (
108109
// TODO find a better name or mechanism...
109110
this.props.isLoggedContact(nextProps.call, activity, contact)
110111
));
111112
if (index > -1) return index;
112113
}
114+
if (nextProps.call.toNumberEntity) {
115+
const index = contactMatches.findIndex(contact => (
116+
contact.id === nextProps.call.toNumberEntity
117+
));
118+
return index;
119+
}
113120
return -1;
114121
}
115122
getSelectedContact = (selected = this.state.selected) => {

yarn.lock

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5921,6 +5921,10 @@ querystringify@~1.0.0:
59215921
version "1.0.0"
59225922
resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb"
59235923

5924+
ramda@^0.24.1:
5925+
version "0.24.1"
5926+
resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.24.1.tgz#c3b7755197f35b8dc3502228262c4c91ddb6b857"
5927+
59245928
randomatic@^1.1.3:
59255929
version "1.1.6"
59265930
resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"
@@ -6432,14 +6436,15 @@ ringcentral-client@^1.0.0-rc1:
64326436
form-data "^2.1.2"
64336437
isomorphic-fetch "^2.2.1"
64346438

6435-
ringcentral-integration@^0.6.17:
6436-
version "0.6.17"
6437-
resolved "https://registry.yarnpkg.com/ringcentral-integration/-/ringcentral-integration-0.6.17.tgz#d85d6b6efea7680111d3108df8694c00ed1c4152"
6439+
6440+
version "0.6.34"
6441+
resolved "https://registry.yarnpkg.com/ringcentral-integration/-/ringcentral-integration-0.6.34.tgz#c9cabed5a6ce2f4e21e5853c78800f8aa8d25f0c"
64386442
dependencies:
64396443
file-loader "^0.10.1"
64406444
json-mask "^0.3.8"
64416445
loganberry "^0.9.1"
64426446
phoneformat.js "^1.0.3"
6447+
ramda "^0.24.1"
64436448
redux "^3.5.2"
64446449
reselect "^2.5.4"
64456450
ringcentral-web-phone "^0.4.1"

0 commit comments

Comments
 (0)