Merge pull request #33 from mahos/publicprep

reset button bug fix

Author: Synicix

README.md

@@ -76,7 +76,11 @@ for test dev mode, in `docker-compose-deploy.yml` make sure `STAGING=true` for `
 `ssh testdev` go to `ibl-navigator`
 `docker-compose -f docker-compose-deploy.yml down` to stop what's already running
 `sudo rm -R letsencrypt-keys` to get rid of key folder that generated in the previous run.
+
 `git pull https://github.com/vathes/ibl-navigator.git dev` to get the latest from `vathes/ibl-navigator` repo.
+NOTE: to make sure branch is freshly deployed, `git checkout remote/branch` is recommended. 
+`origin` should be pointed to `https://github.com/vathes/ibl-navigator.git` in the testdev EC2 but do double check.
+
 login with your regular github credentials (the one registered under github vathes)
 make sure to move over to the `dev` branch by `git checkout dev`
 `docker login registry.vathes.com` to docker to get access.
@@ -94,7 +98,10 @@ for client deploy mode, in `docker-compose-deploy.yml` make sure to comment out
 
 `ssh djcompute` go to `nagivator-deployer/ibl-navigator`
 `docker-compose -f docker-compose-deploy.yml down` to stop what's already running
+
 `git pull https://github.com/vathes/ibl-navigator.git master` to get the latest from `vathes/ibl-navigator` repo.
+NOTE: to make sure branch is freshly deployed, `git checkout remote/branch` is recommended. Do check which remote is pointing to which repo before checking a branch out.
+
 login with your regular github credentials (the one registered under github vathes)
 make sure to move over to the `master` branch by `git checkout master`
 `docker login registry.vathes.com` to docker to get access.

ibl-frontend/frontend-content/src/app/session-list/session-list.component.ts

@@ -862,6 +862,7 @@ export class SessionListComponent implements OnInit, OnDestroy {
    * Triggers when user presses the reset filter button - no new fetch here, just clearing the input fields and stored state
    */
   async handleResetFilterButtonPress() {
+    this.isLoading = true;
     for (const control in this.session_filter_form.controls) {
       const toReset = {}
 
@@ -891,11 +892,23 @@ export class SessionListComponent implements OnInit, OnDestroy {
       }
     })
 
-    // 
+    // clear the filter in storage before applying filter
+    this.filterStoreService.clearSessionFilter();
+    
     this.restrictedSessions = await this.applyFilter();
     this.createMenu(this.restrictedSessions);
+
+    // intention here is to reset the sort/pagination to default state before updating table view 
+    this.paginator.pageIndex = 0;
+    this.paginator.pageSize = 25;
+    // the below is to remove the arrow UI that doesn't go away after this.sort.active = '' 
+    this.sort.sortables.forEach(sortItem => {
+      this.sort.sort(sortItem);
+    });
+    this.sort.active = '';
+
     await this.updateTableView(this.restrictedSessions);
-    // console.log('reset filter is done')
+    this.isLoading = false;
     return;
   }