From 033c3f37eb009dce5f8e63cbdc949de64e37b697 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Wed, 10 Jul 2024 14:19:33 +0530 Subject: [PATCH 1/6] error resolved --- .../components/search-and-select/search-and-select.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/components/search-and-select/search-and-select.component.ts b/src/app/shared/components/search-and-select/search-and-select.component.ts index 04be3355..4b62f0ba 100644 --- a/src/app/shared/components/search-and-select/search-and-select.component.ts +++ b/src/app/shared/components/search-and-select/search-and-select.component.ts @@ -87,7 +87,7 @@ export class SearchAndSelectComponent implements OnInit, ControlValueAccessor { popover.onDidDismiss().then((data) => { if (data.data) { this.selectedData = data.data; - const values = this.control.meta.multiSelect ? data.data.map(obj => obj.id) : data.data[0].id; + const values = this.control.meta.multiSelect ? data.data.map(obj => obj.id) : data?.data[0]?.id; this.onChange(values); this.icon = this.selectedData.length ? this.closeIconLight : this.addIconDark } From 7e4cc6f6dc8288a3987a4690e29b5157c2df2dbf Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Thu, 11 Jul 2024 13:31:34 +0530 Subject: [PATCH 2/6] bug fix 1392 --- .../components/generic-search/generic-search.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/components/generic-search/generic-search.component.html b/src/app/shared/components/generic-search/generic-search.component.html index 5b1e3270..28aed9f3 100644 --- a/src/app/shared/components/generic-search/generic-search.component.html +++ b/src/app/shared/components/generic-search/generic-search.component.html @@ -26,7 +26,7 @@ - + From abc6acea29e5e44e92f71d7bc67bc7ab877e3ec1 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Thu, 11 Jul 2024 18:05:52 +0530 Subject: [PATCH 3/6] bug fix 1476, 1490 --- src/app/core/constants/urlConstants.ts | 3 ++- src/app/core/services/profile/profile.service.ts | 15 +++++++++++++++ src/app/pages/home-search/home-search.page.ts | 8 ++++---- src/app/pages/language/language.page.ts | 2 +- .../mentor-search-directory.page.ts | 6 +++--- src/app/pages/tabs/home/home.page.ts | 4 ++-- src/assets/i18n/en.json | 2 +- 7 files changed, 28 insertions(+), 12 deletions(-) diff --git a/src/app/core/constants/urlConstants.ts b/src/app/core/constants/urlConstants.ts index 16ed3a72..a045e860 100644 --- a/src/app/core/constants/urlConstants.ts +++ b/src/app/core/constants/urlConstants.ts @@ -62,6 +62,7 @@ export const urlConstants = { ENROLLED_MENTEES_LIST:"/mentoring/v1/sessions/enrolledMentees/", GET_PLATFORM_CONFIG: "/mentoring/v1/platform/config", CHANGE_PASSWORD: "/user/v1/account/changePassword", - LOGIN_ACTIVITY: "/user/v1/account/sessions" + LOGIN_ACTIVITY: "/user/v1/account/sessions" , + UPDATE_LANGUAGE: "/user/v1/user/setLanguagePreference" } }; diff --git a/src/app/core/services/profile/profile.service.ts b/src/app/core/services/profile/profile.service.ts index 17757c45..664863d1 100644 --- a/src/app/core/services/profile/profile.service.ts +++ b/src/app/core/services/profile/profile.service.ts @@ -233,4 +233,19 @@ export class ProfileService { } } + async updateLanguage(formData, showToast=true){ + const config = { + url: urlConstants.API_URLS.UPDATE_LANGUAGE, + payload: formData, + }; + try { + let data: any = await this.httpService.patch(config); + (showToast)?this.toast.showToast(data.message, "success"):null; + return data; + } + catch (error) { + this.loaderService.stopLoader(); + } + } + } diff --git a/src/app/pages/home-search/home-search.page.ts b/src/app/pages/home-search/home-search.page.ts index e9df26fe..ffdcc730 100644 --- a/src/app/pages/home-search/home-search.page.ts +++ b/src/app/pages/home-search/home-search.page.ts @@ -96,12 +96,12 @@ export class HomeSearchPage implements OnInit { modal.onDidDismiss().then(async (dataReturned) => { this.filteredDatas = [] if (dataReturned !== null) { - if (dataReturned.data.data.selectedFilters) { - for (let key in dataReturned.data.data.selectedFilters) { - this.filteredDatas[key] = dataReturned.data.data.selectedFilters[key].slice(0, dataReturned.data.data.selectedFilters[key].length).map(obj => obj.value).join(',').toString() + if (dataReturned?.data?.data?.selectedFilters) { + for (let key in dataReturned?.data?.data?.selectedFilters) { + this.filteredDatas[key] = dataReturned?.data?.data?.selectedFilters[key].slice(0, dataReturned?.data?.data?.selectedFilters[key].length).map(obj => obj.value).join(',').toString() } } - this.extractLabels(dataReturned.data.data.selectedFilters); + this.extractLabels(dataReturned?.data?.data?.selectedFilters); this.getUrlQueryData(); } this.page = 1; diff --git a/src/app/pages/language/language.page.ts b/src/app/pages/language/language.page.ts index 6b549a47..1193dfe8 100644 --- a/src/app/pages/language/language.page.ts +++ b/src/app/pages/language/language.page.ts @@ -40,7 +40,7 @@ export class LanguagePage implements OnInit { onSubmit(){ let showProfileUpdateToast = false; - this.profile.profileUpdate({preferred_language:this.selectedLanguage}, showProfileUpdateToast).then((result)=>{ + this.profile.updateLanguage({preferred_language:this.selectedLanguage}, showProfileUpdateToast).then((result)=>{ if(result){ this.setLanguage(this.selectedLanguage); } diff --git a/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts b/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts index 576a1668..3881f3d3 100644 --- a/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts +++ b/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts @@ -185,10 +185,10 @@ export class MentorSearchDirectoryPage implements OnInit { } async getMentors(){ - var obj = {page: this.page, pageSize: this.pageSize, searchText: this.searchText, selectedChip: this.selectedChipName, urlQueryData: this.urlQueryData}; + var obj = {page: this.page, pageSize: this.pageSize, searchText: this.searchText.trim(), selectedChip: this.selectedChipName, urlQueryData: this.urlQueryData}; let data = await this.profileService.getMentors(true,obj); - this.data = data.result.data; - this.totalCount = data.result.count; + this.data = data?.result?.data; + this.totalCount = data?.result?.count; } } diff --git a/src/app/pages/tabs/home/home.page.ts b/src/app/pages/tabs/home/home.page.ts index 45b45ea9..d88482c5 100644 --- a/src/app/pages/tabs/home/home.page.ts +++ b/src/app/pages/tabs/home/home.page.ts @@ -166,8 +166,8 @@ export class HomePage implements OnInit { async getSessions() { var obj = {page: this.page, limit: this.limit} let data = await this.sessionService.getSessions(obj); - this.sessions = data.result; - this.sessionsCount = data.result.count; + this.sessions = data?.result; + this.sessionsCount = data?.result?.count; } async openModal() { const modal = await this.modalController.create({ diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index d023177a..c52b10d0 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -235,7 +235,7 @@ "PLEASE_UPLOAD_IMAGE_FILE":"Please, upload image file.", "SESSION_LIST":"Session list", "DOWNLOAD":"Download", - "SEARCH_RESULT_NOT_FOUND":"Search result not found", + "SEARCH_RESULT_NOT_FOUND":"Search results not found", "THIS_SPACE_LOOKS_EMPTY":"This space looks empty", "SSESSIONS_MENTOR_SEARCH_PLACEHOLDER":"Search for sessions,mentors", "PORTAL_ONLY_TOAST_MESSAGE": "Portal is recommended for administrative tasks", From 6560fc483f1d5eb6f413ae8bddbd747329eeb268 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Thu, 11 Jul 2024 18:58:59 +0530 Subject: [PATCH 4/6] comments resolved --- src/app/pages/home-search/home-search.page.ts | 6 +++--- .../mentor-search-directory.page.ts | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/pages/home-search/home-search.page.ts b/src/app/pages/home-search/home-search.page.ts index ffdcc730..f874610e 100644 --- a/src/app/pages/home-search/home-search.page.ts +++ b/src/app/pages/home-search/home-search.page.ts @@ -101,7 +101,7 @@ export class HomeSearchPage implements OnInit { this.filteredDatas[key] = dataReturned?.data?.data?.selectedFilters[key].slice(0, dataReturned?.data?.data?.selectedFilters[key].length).map(obj => obj.value).join(',').toString() } } - this.extractLabels(dataReturned?.data?.data?.selectedFilters); + this.extractLabels(dataReturned.data.data.selectedFilters); this.getUrlQueryData(); } this.page = 1; @@ -114,8 +114,8 @@ export class HomeSearchPage implements OnInit { async fetchSessionList() { var obj={page: this.page, limit: this.limit, type: this.type, searchText : this.searchText, selectedChip : this.criteriaChip?.name, filterData : this.urlQueryData} var response = await this.sessionService.getSessionsList(obj); - this.results = response?.result?.data; - this.totalCount = response?.result?.count; + this.results = response.result.data; + this.totalCount = response.result.count; this.noDataMessage = obj.searchText ? "SEARCH_RESULT_NOT_FOUND" : "THIS_SPACE_LOOKS_EMPTY" } diff --git a/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts b/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts index 3881f3d3..61f4c480 100644 --- a/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts +++ b/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts @@ -94,14 +94,14 @@ export class MentorSearchDirectoryPage implements OnInit { modal.onDidDismiss().then(async (dataReturned) => { this.filteredDatas = [] - if (dataReturned !== null) { - if (dataReturned?.data?.data?.selectedFilters) { - for (let key in dataReturned?.data?.data?.selectedFilters) { - this.filteredDatas[key] = dataReturned?.data?.data?.selectedFilters[key].slice(0, dataReturned?.data?.data?.selectedFilters[key].length).map(obj => obj.value).join(',').toString() + if (dataReturned.data && dataReturned.data.data) { + if (dataReturned.data.data.selectedFilters) { + for (let key in dataReturned.data.data.selectedFilters) { + this.filteredDatas[key] = dataReturned.data.data.selectedFilters[key].slice(0, dataReturned.data.data.selectedFilters[key].length).map(obj => obj.value).join(',').toString() } this.selectedChips = true; } - this.extractLabels(dataReturned?.data?.data?.selectedFilters); + this.extractLabels(dataReturned.data.data.selectedFilters); this.getUrlQueryData(); } this.page = 1; @@ -187,8 +187,8 @@ export class MentorSearchDirectoryPage implements OnInit { async getMentors(){ var obj = {page: this.page, pageSize: this.pageSize, searchText: this.searchText.trim(), selectedChip: this.selectedChipName, urlQueryData: this.urlQueryData}; let data = await this.profileService.getMentors(true,obj); - this.data = data?.result?.data; - this.totalCount = data?.result?.count; + this.data = data.result.data; + this.totalCount = data.result.count; } } From c9d79f231147dc4ebf12b4000f94e42c16a1508d Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Thu, 11 Jul 2024 19:36:11 +0530 Subject: [PATCH 5/6] resolved comments --- src/app/pages/home-search/home-search.page.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/pages/home-search/home-search.page.ts b/src/app/pages/home-search/home-search.page.ts index f874610e..39d6632d 100644 --- a/src/app/pages/home-search/home-search.page.ts +++ b/src/app/pages/home-search/home-search.page.ts @@ -95,10 +95,10 @@ export class HomeSearchPage implements OnInit { modal.onDidDismiss().then(async (dataReturned) => { this.filteredDatas = [] - if (dataReturned !== null) { - if (dataReturned?.data?.data?.selectedFilters) { - for (let key in dataReturned?.data?.data?.selectedFilters) { - this.filteredDatas[key] = dataReturned?.data?.data?.selectedFilters[key].slice(0, dataReturned?.data?.data?.selectedFilters[key].length).map(obj => obj.value).join(',').toString() + if (dataReturned.data && dataReturned.data.data) { + if (dataReturned.data.data.selectedFilters) { + for (let key in dataReturned.data.data.selectedFilters) { + this.filteredDatas[key] = dataReturned.data.data.selectedFilters[key].slice(0, dataReturned.data.data.selectedFilters[key].length).map(obj => obj.value).join(',').toString() } } this.extractLabels(dataReturned.data.data.selectedFilters); From 5c27cee5b4695afd85f5efc70ae840368fddc6bb Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Thu, 11 Jul 2024 19:40:38 +0530 Subject: [PATCH 6/6] comments resolved --- src/app/pages/tabs/home/home.page.ts | 4 ++-- .../search-and-select/search-and-select.component.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/pages/tabs/home/home.page.ts b/src/app/pages/tabs/home/home.page.ts index d88482c5..45b45ea9 100644 --- a/src/app/pages/tabs/home/home.page.ts +++ b/src/app/pages/tabs/home/home.page.ts @@ -166,8 +166,8 @@ export class HomePage implements OnInit { async getSessions() { var obj = {page: this.page, limit: this.limit} let data = await this.sessionService.getSessions(obj); - this.sessions = data?.result; - this.sessionsCount = data?.result?.count; + this.sessions = data.result; + this.sessionsCount = data.result.count; } async openModal() { const modal = await this.modalController.create({ diff --git a/src/app/shared/components/search-and-select/search-and-select.component.ts b/src/app/shared/components/search-and-select/search-and-select.component.ts index 4b62f0ba..23a2af25 100644 --- a/src/app/shared/components/search-and-select/search-and-select.component.ts +++ b/src/app/shared/components/search-and-select/search-and-select.component.ts @@ -85,9 +85,9 @@ export class SearchAndSelectComponent implements OnInit, ControlValueAccessor { }); popover.onDidDismiss().then((data) => { - if (data.data) { + if (data && data.data) { this.selectedData = data.data; - const values = this.control.meta.multiSelect ? data.data.map(obj => obj.id) : data?.data[0]?.id; + const values = this.control.meta.multiSelect ? data.data.map(obj => obj.id) : data.data[0].id; this.onChange(values); this.icon = this.selectedData.length ? this.closeIconLight : this.addIconDark }