Merge pull request #442 from rahulramakrishnan3/release-2.6.1

1296 , 1300 bug fixes
ELEVATE-Project · Mar 20, 2024 · 46eb2e2 · 46eb2e2
2 parents fbbff28 + bc354ba
commit 46eb2e2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/app/core/services/profile/profile.service.ts b/src/app/core/services/profile/profile.service.ts
@@ -100,6 +100,8 @@ export class ProfileService {
       let data: any = await this.httpService.post(config);
       let authService = this.injector.get(AuthService);
       let userData = authService.setUserInLocal(data);
+      let user = await this.getProfileDetailsFromAPI();
+      this.userService.userEvent.next(user);
       this.loaderService.stopLoader();
       this.toast.showToast(data.message, "success");
       return userData;

diff --git a/src/app/modules/admin/components/manage-session/manage-session.component.ts b/src/app/modules/admin/components/manage-session/manage-session.component.ts
@@ -120,7 +120,7 @@ export class ManageSessionComponent implements OnInit {
         break;
 
       case "EDIT":
-        this.router.navigate([`${CommonRoutes.CREATE_SESSION}`], { queryParams: { id: this.receivedEventData.element.id }});
+        (this.receivedEventData?.element?.status=='Live') ? this.router.navigate([CommonRoutes.CREATE_SESSION], { queryParams: { id: this.receivedEventData.element.id , type: 'segment'} }) : this.router.navigate([CommonRoutes.CREATE_SESSION], { queryParams: { id: this.receivedEventData.element.id } });
         break;
       case 'DELETE':
         await this.adminWorkapceService.deleteSession(this.receivedEventData.element.id)

diff --git a/src/app/pages/session-detail/session-detail.page.ts b/src/app/pages/session-detail/session-detail.page.ts
@@ -265,11 +265,7 @@ export class SessionDetailPage implements OnInit {
 
   editSession() {
     this.activeUrl = this.router.url;
-    if(this.activeUrl.includes('/admin/managers-session-details')){
-      this.router.navigate([`${CommonRoutes.ADMIN}/${CommonRoutes.MANAGERS_SESSION}`], { queryParams: { id: this.id }});
-    }else{
-      (this.sessionDatas?.status?.value=='LIVE') ? this.router.navigate([CommonRoutes.CREATE_SESSION], { queryParams: { id: this.id , type: 'segment'} }) : this.router.navigate([CommonRoutes.CREATE_SESSION], { queryParams: { id: this.id } });
-    }
+    (this.sessionDatas?.status?.value=='LIVE') ? this.router.navigate([CommonRoutes.CREATE_SESSION], { queryParams: { id: this.id , type: 'segment'} }) : this.router.navigate([CommonRoutes.CREATE_SESSION], { queryParams: { id: this.id } });
   }
 
   deleteSession() {