Skip to content

Feature/073102 locale #970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 1, 2018
Merged

Feature/073102 locale #970

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6a5d608
pm says no anonymous search
amylas Jul 31, 2018
5652916
message as before
amylas Jul 31, 2018
8733da8
mutiple search
amylas Jul 31, 2018
6e52f96
Merge branch 'master' into feature/073102_locale
amylas Aug 1, 2018
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
11 changes: 8 additions & 3 deletions packages/ringcentral-integration/modules/CallHistory/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,13 +401,18 @@ export default class CallHistory extends RcModule {
const calls = this.calls;
const searchInput = this.searchInput;
let data = [];
let display = '';
const effectSearchStr = searchInput.toLowerCase().trim();

data = calls.filter((call) => {
const { phoneNumber, matches } = getPhoneNumberMatches(call);
const nameMatches = matches.filter(entities => entities && entities.id);
if (nameMatches.length === 1 && nameMatches[0].name && nameMatches[0].name.toLowerCase().indexOf(effectSearchStr) > -1) {
const matchesMatched = matches.some((entities) => {
if (!entities || !entities.id) return false;
if (entities.name && entities.name.toLowerCase().indexOf(effectSearchStr) > -1) return true;
if (entities.phone && entities.phone.indexOf(effectSearchStr) > -1) return true;
return false;
});

if (matchesMatched) {
return true;
}
if (phoneNumber && phoneNumber.indexOf(effectSearchStr) > -1) {
Expand Down