From 537eeebaf98475cfcf962cdce91dd03ca2ecf1ea Mon Sep 17 00:00:00 2001
From: Denys Vuika <denys.vuika@gmail.com>
Date: Tue, 24 Jul 2018 09:30:41 +0100
Subject: [PATCH] [ACA-1610] search progress indicator (#530)

---
 .../search-results/search-results.component.html | 16 ++++++++++++----
 .../search-results/search-results.component.ts   |  3 +++
 src/assets/i18n/en.json                          |  3 ++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/app/components/search/search-results/search-results.component.html b/src/app/components/search/search-results/search-results.component.html
index 68976ed8e..ca29db79e 100644
--- a/src/app/components/search/search-results/search-results.component.html
+++ b/src/app/components/search/search-results/search-results.component.html
@@ -87,8 +87,12 @@
                 <adf-search-filter
                     #searchFilter
                     [ngClass]="{ 'adf-search-filter--hidden': !searchedWord }"></adf-search-filter>
-
                 <div class="adf-search-results__content">
+                    <mat-progress-bar
+                        *ngIf="isLoading"
+                        color="primary"
+                        mode="indeterminate">
+                    </mat-progress-bar>
                     <div class="adf-search-results__content-header content" *ngIf="data?.list.entries.length">
                         <div class="content__side--left">
                             <div class="adf-search-results--info-text">{{ 'APP.BROWSE.SEARCH.FOUND_RESULTS' | translate: { number: totalResults } }}</div>
@@ -131,9 +135,13 @@
 
                         <empty-folder-content>
                             <ng-template>
-                                <div class="empty-search__block">
-                                    <p class="empty-search__text">Your search returned 0 results</p>
-                                </div>
+                                <ng-container *ngIf="data">
+                                    <div class="empty-search__block">
+                                        <p class="empty-search__text">
+                                            {{ 'APP.BROWSE.SEARCH.NO_RESULTS' | translate }}
+                                        </p>
+                                    </div>
+                                </ng-container>
                             </ng-template>
                         </empty-folder-content>
                     </adf-document-list>
diff --git a/src/app/components/search/search-results/search-results.component.ts b/src/app/components/search/search-results/search-results.component.ts
index af47617e9..46dbf9b25 100644
--- a/src/app/components/search/search-results/search-results.component.ts
+++ b/src/app/components/search/search-results/search-results.component.ts
@@ -50,6 +50,7 @@ export class SearchResultsComponent extends PageComponent implements OnInit {
     data: NodePaging;
     totalResults = 0;
     sorting = ['name', 'asc'];
+    isLoading = false;
 
     constructor(
         private queryBuilder: SearchQueryBuilderService,
@@ -74,10 +75,12 @@ export class SearchResultsComponent extends PageComponent implements OnInit {
         this.subscriptions.push(
             this.queryBuilder.updated.subscribe(() => {
                 this.sorting = this.getSorting();
+                this.isLoading = true;
             }),
 
             this.queryBuilder.executed.subscribe(data => {
                 this.onSearchResultLoaded(data);
+                this.isLoading = false;
             })
         );
 
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 2d6155afd..7eb471321 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -107,7 +107,8 @@
                     "MODIFIED": "Modified",
                     "LOCATION": "Location",
                     "SIZE": "Size"
-                }
+                },
+                "NO_RESULTS": "Your search returned 0 results"
             }
         },
         "ACTIONS": {