From b0816d2ff5558506a24caf145e93b0cc4198b25f Mon Sep 17 00:00:00 2001 From: Vasil Nikolov Date: Wed, 5 Dec 2018 13:40:35 +0200 Subject: [PATCH] merge fix and dashboard filters --- .../generic_data/contact_info/modal_content/add_modal.js | 4 ---- src/components/edit_user/generic_data/index.js | 3 --- src/utils/services/admin_account.js | 9 +++++++++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/components/edit_user/generic_data/contact_info/modal_content/add_modal.js b/src/components/edit_user/generic_data/contact_info/modal_content/add_modal.js index a4baf04..d7cc9fb 100644 --- a/src/components/edit_user/generic_data/contact_info/modal_content/add_modal.js +++ b/src/components/edit_user/generic_data/contact_info/modal_content/add_modal.js @@ -91,10 +91,6 @@ class ContactInfoAddModal extends PureComponent { const { addModalTextFields, isUpdated, phoneCodeValue, selectPhoneLabel, addCustomLabel, addCustomLabelValue, maskPhoneCode, maskPhoneNumber, phoneCountryValue } = this.state - console.log('====================================') - console.log(this.state) - console.log('====================================') - let phoneCoutryNames = internationPhoneCodes.map((coutryName) => { return coutryName.label }) diff --git a/src/components/edit_user/generic_data/index.js b/src/components/edit_user/generic_data/index.js index abef155..87f23cf 100644 --- a/src/components/edit_user/generic_data/index.js +++ b/src/components/edit_user/generic_data/index.js @@ -206,9 +206,6 @@ class genericUserData extends Component { } deleteAvatar = () => { - console.log('====================================') - console.log('DELETE AVATAR') - console.log('====================================') this.handleDeleteAvatar() } diff --git a/src/utils/services/admin_account.js b/src/utils/services/admin_account.js index 915df68..0579790 100644 --- a/src/utils/services/admin_account.js +++ b/src/utils/services/admin_account.js @@ -18,6 +18,15 @@ export function getAllAccountsGrpcRequest (startRow, endRow, filter) { filterModel.setFiltervalue(filter.firstname.filter.charAt(0).toUpperCase() + filter.firstname.filter.slice(1)) filterModel.setValuetype('text') + getAllAccountsRequest.addFiltermodel(filterModel) + } else if (filter.lastname) { + let filterModel = new FilterModel() + + filterModel.setColid('lastname') + filterModel.setFiltertype(FilterModel.FilterType.EQUALS) + filterModel.setFiltervalue(filter.lastname.filter.charAt(0).toUpperCase() + filter.lastname.filter.slice(1)) + filterModel.setValuetype('text') + getAllAccountsRequest.addFiltermodel(filterModel) } -- GitLab