fix(paging): set pg to 1 when facet added/removed

Closes #1129
NCI-GDC · Aug 4, 2015 · 60c233b · 60c233b
1 parent b29ef33
commit 60c233b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/app/scripts/components/facets/facets.services.ts b/app/scripts/components/facets/facets.services.ts
@@ -140,6 +140,7 @@ module ngApp.components.facets.services {
 
     addTerm(facet: string, term: string, op: string = 'in') {
       var filters = this.ensurePath(this.LocationService.filters());
+
       // TODO - not like this
       var found = false;
       var cs = filters["content"];

diff --git a/app/scripts/components/location/location.services.ts b/app/scripts/components/location/location.services.ts
@@ -40,6 +40,15 @@ module ngApp.components.location.services {
       } else {
         delete search.filters;
       }
+
+      //move the user back to pg1
+      var paging = this.pagination();
+      if (paging) {
+        _.each(paging, (page) => {
+          page.from = 0;
+        });
+        search['pagination'] = paging;
+      }
       return this.setSearch(search);
     }
 
@@ -60,13 +69,13 @@ module ngApp.components.location.services {
     }
 
     pagination(): any {
-      var f = this.search()["pagination"];
-      return f ? angular.fromJson(f) : {};
+      var f = _.get(this.search(), "pagination", "{}");
+      return angular.fromJson(f);
     }
 
     setPaging(pagination: {[key: string]: string}): ng.ILocationService {
       var search: ISearch = this.search();
-      
+
       if (pagination) {
         search.pagination = angular.toJson(pagination);
       } else if (_.isEmpty(search.pagination)) {