Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions packages/ringcentral-integration/modules/CallLog/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ const presenceRegExp = /\/presence\?detailedTelephonyState=true/;
'Auth',
'Client',
'ExtensionPhoneNumber',
'ExtensionInfo',
'Subscription',
'RolesAndPermissions',
{ dep: 'TabManager', optional: true },
Expand All @@ -77,6 +78,7 @@ export default class CallLog extends Pollable {
* @param {Client} params.client - client module instance
* @param {Storage} params.storage - storage module instance
* @param {ExtensionPhoneNumber} params.extensionPhoneNumber - extensionPhoneNumber module instance
* @param {ExtensionInfo} params.extensionPhoneNumber - extensionPhoneNumber module instance
* @param {Subscription} params.subscription - subscription module instance
* @param {RolesAndPermissions} params.rolesAndPermissions - rolesAndPermissions module instance
* @param {Number} params.ttl - local cache timestamp
Expand All @@ -91,6 +93,7 @@ export default class CallLog extends Pollable {
client,
storage,
extensionPhoneNumber,
extensionInfo,
subscription,
rolesAndPermissions,
tabManager,
Expand All @@ -112,6 +115,7 @@ export default class CallLog extends Pollable {
this._storage = storage;
}
this._extensionPhoneNumber = extensionPhoneNumber;
this._extensionInfo = extensionInfo;
this._subscription = subscription;
this._rolesAndPermissions = rolesAndPermissions;
this._tabManager = tabManager;
Expand Down Expand Up @@ -163,7 +167,7 @@ export default class CallLog extends Pollable {
call.result !== callResults.faxReceipt
)))).map((call) => {
// [RCINT-7364] Call presence is incorrect when make ringout call from a DL number.
// When user use DL number set ringout and the outBound from number must not a oneself company number
// When user use DL number set ringout and the outBound from number must not a oneself company/extension number
// Call log sync will response tow legs.
// But user use company plus extension number, call log sync will response only one leg.
// And the results about `to` and `from` in platform APIs call log sync response is opposite.
Expand All @@ -173,14 +177,20 @@ export default class CallLog extends Pollable {
call.from.phoneNumber &&
this.mainCompanyNumbers.indexOf(call.from.phoneNumber) > -1
);
const isOutBoundFromSelfExtNumber = (
call.from &&
call.from.extensionNumber &&
call.from.extensionNumber === this._extensionInfo.data.extensionNumber
);
if (
isOutbound(call) &&
(
call.action === callActions.ringOutWeb ||
call.action === callActions.ringOutPC ||
call.action === callActions.ringOutMobile
) &&
!isOutBoundCompanyNumber
!isOutBoundCompanyNumber &&
!isOutBoundFromSelfExtNumber
) {
return {
...call,
Expand Down Expand Up @@ -219,6 +229,7 @@ export default class CallLog extends Pollable {
(!this._storage || this._storage.ready) &&
(!this._subscription || this._subscription.ready) &&
(!this._extensionPhoneNumber || this._extensionPhoneNumber.ready) &&
(!this._extensionInfo || this._extensionInfo.ready) &&
(!this._tabManager || this._tabManager.ready) &&
this._rolesAndPermissions.ready &&
this.status === moduleStatuses.pending
Expand Down Expand Up @@ -249,6 +260,7 @@ export default class CallLog extends Pollable {
!this._auth.loggedIn ||
(!!this._storage && !this._storage.ready) ||
(this._extensionPhoneNumber && !this._extensionPhoneNumber.ready) ||
(this._extensionInfo && !this._extensionInfo.ready) ||
(this._subscription && !this._subscription.ready) ||
(this._tabManager && !this._tabManager.ready) ||
!this._rolesAndPermissions.ready
Expand Down
4 changes: 2 additions & 2 deletions packages/ringcentral-widgets/components/MeetingPanel/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -652,10 +652,10 @@ class MeetingPanel extends Component {
const isToggle = !this[`${type}Blur`];
if (isToggle) {
if (this[type]._values.open) {
this[type].refs.inner.close();
this[type].inner.close();
} else {
this[type].focus();
this[type].refs.inner.toggle();
this[type].inner.toggle();
}
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
flex-shrink: 1;
width: 100%;
height: 16px;
line-height: 16px;
line-height: 15px;
font-size: 13px;
color: $ash;
border: none;
Expand Down Expand Up @@ -169,8 +169,6 @@
.timeText {
font-size: 13px;
position: relative;
margin-top: -18.7px;
height: 17px;
color: $primary-color;
display: flex;
background-color: transparent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export default {
schedule: 'Schedule',
schedule: 'Schedule Meeting',
prompt: 'Please authorize RingCentral to access your account information.'
};