Merge pull request #520 from rahulramakrishnan3/release-3.0.0

Release 3.0.0
ELEVATE-Project · Jul 11, 2024 · 532ce2b · 532ce2b
2 parents 9d87d52 + 5c27cee
commit 532ce2b
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 14 deletions.
diff --git 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
@@ -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
@@ -95,7 +95,7 @@ export class HomeSearchPage implements OnInit {
 
     modal.onDidDismiss().then(async (dataReturned) => {
       this.filteredDatas = []
-      if (dataReturned !== null) {
+      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()
@@ -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/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
@@ -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;
@@ -185,7 +185,7 @@ 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;

diff --git 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 @@
       </ion-col>
       <ion-col *ngIf="!results.length" padding size-xs="12" size-sm="12" size-md="6" size-lg="12"
       align-self-stretch>
-        <app-no-data-found [messageHeader]="'NO_SESSIONS_AVAILABLE'" [messageDescription]="'NO_SESSION_MESSAGE_DESCRIPTION'"> </app-no-data-found>
+        <app-no-data-found [messageHeader]="'SEARCH_RESULT_NOT_FOUND'" [messageDescription]="'NO_SESSION_MESSAGE_DESCRIPTION'"> </app-no-data-found>
       </ion-col>
     </ion-row>
   </ion-grid>

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
@@ -85,7 +85,7 @@ 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;
         this.onChange(values);

diff --git 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",