Merge pull request #512 from rahulramakrishnan3/release-3.0.0

Release 3.0.0
ELEVATE-Project · Jul 3, 2024 · 36620ac · 36620ac
2 parents 89cb2a3 + b64bc2a
commit 36620ac
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/src/app/modules/private/private.page.html b/src/app/modules/private/private.page.html
@@ -1,6 +1,6 @@
 <ion-split-pane contentId="main-content">
   <ion-menu contentId="main-content" menuId="side-menu" type="overlay" swipeGesture="false" class="width-20">
-    <ion-header  [translucent]="true" class="ion-no-border" [ngClass]="{'disable-div': user?.profile_mandatory_fields.length}">
+    <ion-header  [translucent]="true" class="ion-no-border" [ngClass]="{'disable-div': user?.profile_mandatory_fields.length || !user?.about}">
       <div *ngIf="user" >
         <div class="sub-menu-toolbar">
           <div slot="start" class="img-mainDiv">
@@ -23,7 +23,7 @@
         </div>
       </div>
     </ion-header>
-    <ion-content *ngIf="user" fullscreen [ngClass]="{'disable-div': user?.profile_mandatory_fields.length}">
+    <ion-content *ngIf="user" fullscreen [ngClass]="{'disable-div': user?.profile_mandatory_fields.length || !user?.about}">
       <div class="menu-css">
         <ion-list lines="none" class="sub-menu-list">
           <ion-menu-toggle auto-hide="false" [class]="adminPage?.class" *ngIf="adminAccess">

diff --git a/src/app/pages/edit-profile/edit-profile.page.ts b/src/app/pages/edit-profile/edit-profile.page.ts
@@ -78,7 +78,7 @@ export class EditProfilePage implements OnInit, isDeactivatable {
       this.profileService.prefillData(this.userDetails, this.entityNames, this.formData);
       this.showForm = true;
     }
-    if(this.userDetails?.profile_mandatory_fields?.length || !this.userDetails.about){
+    if(this.userDetails?.profile_mandatory_fields?.length || !this.userDetails?.about){
     this.headerConfig.backButton = false;
     let msg = {
         header: 'SETUP_PROFILE',

diff --git a/src/app/pages/home-search/home-search.page.ts b/src/app/pages/home-search/home-search.page.ts
@@ -115,7 +115,7 @@ export class HomeSearchPage implements OnInit {
     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.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
@@ -112,7 +112,7 @@ export class MentorSearchDirectoryPage implements OnInit {
   }
 
   transformData(responseData) {
-    const entityTypes = responseData.entity_types;
+    const entityTypes = responseData?.entity_types;
 
     const filterData = Object.keys(entityTypes).map(type => {
       const entityType = entityTypes[type][0];

diff --git a/src/app/pages/tabs/mentor-directory/mentor-directory.page.ts b/src/app/pages/tabs/mentor-directory/mentor-directory.page.ts
@@ -55,7 +55,6 @@ export class MentorDirectoryPage implements OnInit {
 
   async ionViewWillEnter() {
     this.page = 1;
-    this.mentors = [];
     this.getMentors();
     this.gotToTop();
   }

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'"> </app-no-data-found>
+        <app-no-data-found [messageHeader]="'NO_SESSIONS_AVAILABLE'" [messageDescription]="'NO_SESSION_MESSAGE_DESCRIPTION'"> </app-no-data-found>
       </ion-col>
     </ion-row>
   </ion-grid>

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -7,7 +7,7 @@
     "PROFILE":"Profile",
     "DASHBOARD":"Dashboard",
     "ENROLL":"Enroll",
-    "HOME_SEARCH_PLACEHOLDER":"Search for sessions, mentor profile",
+    "HOME_SEARCH_PLACEHOLDER":"Search for sessions",
     "EDIT":"Edit",
     "LANGUAGE":"Language",
     "SETTINGS":"Settings",
@@ -275,5 +275,6 @@
     "SEARCH_RESULT": "Search results found",
     "MENTOR_SEARCH_RESULT": "Mentors search result for",
     "SETUP_PROFILE": "Setup profile",
-    "SETUP_PROFILE_MESSAGE": "Finish setting up your profile to get started"
+    "SETUP_PROFILE_MESSAGE": "Finish setting up your profile to get started",
+    "NO_SESSION_MESSAGE_DESCRIPTION": "Looks like we couldn’t  find what you were looking for, try searching for something else."
 }