Implements on the "Monitor" page the scroll position restoration

Tiledesk · Apr 29, 2024 · 1bd5cc8 · 1bd5cc8
1 parent 513c447
commit 1bd5cc8
Show file tree

Hide file tree

Showing 7 changed files with 191 additions and 94 deletions.
diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts
@@ -439,6 +439,13 @@ const routes: Routes = [
   },
   // { path: 'project/:projectid/request-for-panel/:requestid', component: WsRequestsMsgsComponent, canActivate: [AuthGuard] }, // now lazy
 
+  // Conversation details with scrollposition
+  {
+    path: 'project/:projectid/wsrequest/:requestid/:calledby/messages/:scrollposition',
+    loadChildren: () => import('app/ws_requests/ws-requests-msgs/ws-requests-msgs.module').then(m => m.WsRequestsMsgsModule),
+    canActivate: [AuthGuard]
+  },
+
   {
     path: 'project/:projectid/wsrequest/:requestid/:calledby/messages',
     loadChildren: () => import('app/ws_requests/ws-requests-msgs/ws-requests-msgs.module').then(m => m.WsRequestsMsgsModule),
@@ -467,12 +474,20 @@ const routes: Routes = [
   },
   // { path: 'project/:projectid/wsrequest/:requestid/:calledby/:hassearchedby/:isopenadvancedsearch/:deptid/messages', component: WsRequestsMsgsComponent, canActivate: [AuthGuard] }, // now lazy
 
-  // Conversations list - Served - Unserved
+  // Conversations list  (Served - Unserved)
   {
     path: 'project/:projectid/wsrequests',
     loadChildren: () => import('app/ws_requests/ws-requests-list/ws-requests-list.module').then(m => m.WsRequestsListModule),
     canActivate: [AuthGuard, ProjectProfileGuard]
   },
+
+  // Conversations list  (Served - Unserved) with scroll position
+  {
+    path: 'project/:projectid/wsrequests/:scrollposition',
+    loadChildren: () => import('app/ws_requests/ws-requests-list/ws-requests-list.module').then(m => m.WsRequestsListModule),
+    canActivate: [AuthGuard, ProjectProfileGuard]
+  },
+
   // { path: 'project/:projectid/wsrequests', component: WsRequestsListComponent, canActivate: [AuthGuard, ProjectProfileGuard] }, // now lazy
 
   // Conversations list demo page

diff --git a/src/app/project-edit-add/project-edit-add.component.html b/src/app/project-edit-add/project-edit-add.component.html
@@ -199,7 +199,7 @@ <h3 class="card_title__underlined">
                   <!-- ------------------------------------ -->
                   <!-- Display Support Widget in project -->
                   <!-- ------------------------------------ -->
-                  <!-- <div class="row" style="margin-top: 44px;margin-bottom: 24px ">
+                  <div class="row" style="margin-top: 44px;margin-bottom: 24px ">
                     <div class="col-md-6">
                       <h3 class="card_title__underlined">
                         <span class="card_title__underline">
@@ -208,7 +208,7 @@ <h3 class="card_title__underlined">
                       </h3>
                     </div>
 
-                    <!- - SWITCH BUTTON - ->
+                    <!-- SWITCH BUTTON -->
                     <div class="col-md-6">
                       <h3 class="card-title onoffswitch_container_first_line">
 
@@ -224,13 +224,13 @@ <h3 class="card-title onoffswitch_container_first_line">
                       </h3>
                     </div>
 
-                    <!- - SUBTITLE - ->
+                    <!-- SUBTITLE -->
                     <div class="col-md-12">
                       <div class="section-subtitle" style="width: calc((100% / 3) + 372px)"></div>
                       <p style="margin-top: -10px;">
                         Hide / Display the support widget in the project</p>
                     </div>
-                  </div> -->
+                  </div> 
 
 
                   <!-- --------------------------- -->

diff --git a/src/app/ws_requests/ws-requests-list/ws-requests-list.module.ts b/src/app/ws_requests/ws-requests-list/ws-requests-list.module.ts
@@ -16,6 +16,7 @@ import { MomentModule } from 'ngx-moment';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIconModule } from '@angular/material/icon';
 import { MapRequestComponent } from 'app/map-request/map-request.component';
+import { MatMenuModule } from '@angular/material/menu';
 
 
 const routes: Routes = [
@@ -42,7 +43,8 @@ const routes: Routes = [
     MatDatepickerModule,
     MomentModule,
     MatFormFieldModule,
-    MatIconModule
+    MatIconModule,
+    MatMenuModule
   ]
 })
 export class WsRequestsListModule { }