Send user back to first page when they make searches. (#1550) (#1560)

(cherry picked from commit ce6cf27)
ansible · Feb 13, 2019 · ff2f69f · ff2f69f
1 parent 2405290
commit ff2f69f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/galaxyui/src/app/search/search.component.html b/galaxyui/src/app/search/search.component.html
@@ -6,9 +6,9 @@
             <div class="search-bar">
                 <div class="search-field">
                     <div class="input-group">
-                        <input type="text" [(ngModel)]="queryParams.keywords" (keyup.enter)="searchContent()" class="form-control" placeholder="Search for...">
+                        <input type="text" [(ngModel)]="queryParams.keywords" (keyup.enter)="searchEntered()" class="form-control" placeholder="Search for...">
                         <span class="input-group-btn">
-                            <button class="btn btn-default" type="button" (click)="searchContent()"><span class="fa fa-search"></span></button>
+                            <button class="btn btn-default" type="button" (click)="searchEntered()"><span class="fa fa-search"></span></button>
                         </span>
                     </div>
                 </div>

diff --git a/galaxyui/src/app/search/search.component.ts b/galaxyui/src/app/search/search.component.ts
@@ -269,7 +269,7 @@ export class SearchComponent implements OnInit, AfterViewInit {
         }
         sortParams += $event.field.id;
         this.queryParams['order_by'] = sortParams;
-        this.searchContent();
+        this.searchEntered();
     }
 
     filterChanged($event: FilterEvent): void {
@@ -325,7 +325,7 @@ export class SearchComponent implements OnInit, AfterViewInit {
             this.appliedFilters = [];
             this.contentItems = [];
         }
-        this.searchContent();
+        this.searchEntered();
     }
 
     getToolbarConfig(): ToolbarConfig {
@@ -372,10 +372,17 @@ export class SearchComponent implements OnInit, AfterViewInit {
 
         if (update) {
             this.setAppliedFilters(this.queryParams);
-            this.searchContent();
+            this.searchEntered();
         }
     }
 
+    searchEntered() {
+        this.queryParams['page'] = 1;
+        this.pageNumber = 1;
+        this.paginationConfig.pageNumber = 1;
+        this.searchContent();
+    }
+
     searchContent() {
         this.pageLoading = true;
         this.setUrlParams(this.queryParams);