inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-08-07 17:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACA-1610] search progress indicator (#530)

Browse Source
This commit is contained in:
Denys Vuika
2018-07-24 09:30:41 +01:00
committed by GitHub
parent 9676bf6f79
commit 537eeebaf9
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/components/search/search-results/search-results.component.html
View File

@@ -87,8 +87,12 @@
<adf-search-filter <adf-search-filter
#searchFilter #searchFilter
[ngClass]="{ 'adf-search-filter--hidden': !searchedWord }"></adf-search-filter> [ngClass]="{ 'adf-search-filter--hidden': !searchedWord }"></adf-search-filter>
<div class="adf-search-results__content"> <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="adf-search-results__content-header content" *ngIf="data?.list.entries.length">
<div class="content__side--left"> <div class="content__side--left">
<div class="adf-search-results--info-text">{{ 'APP.BROWSE.SEARCH.FOUND_RESULTS' | translate: { number: totalResults } }}</div> <div class="adf-search-results--info-text">{{ 'APP.BROWSE.SEARCH.FOUND_RESULTS' | translate: { number: totalResults } }}</div>
@@ -131,9 +135,13 @@
<empty-folder-content> <empty-folder-content>
<ng-template> <ng-template>
<div class="empty-search__block"> <ng-container *ngIf="data">
<p class="empty-search__text">Your search returned 0 results</p> <div class="empty-search__block">
</div> <p class="empty-search__text">
{{ 'APP.BROWSE.SEARCH.NO_RESULTS' | translate }}
</p>
</div>
</ng-container>
</ng-template> </ng-template>
</empty-folder-content> </empty-folder-content>
</adf-document-list> </adf-document-list>

3
src/app/components/search/search-results/search-results.component.ts
View File

@@ -50,6 +50,7 @@ export class SearchResultsComponent extends PageComponent implements OnInit {
data: NodePaging; data: NodePaging;
totalResults = 0; totalResults = 0;
sorting = ['name', 'asc']; sorting = ['name', 'asc'];
isLoading = false;
constructor( constructor(
private queryBuilder: SearchQueryBuilderService, private queryBuilder: SearchQueryBuilderService,
@@ -74,10 +75,12 @@ export class SearchResultsComponent extends PageComponent implements OnInit {
this.subscriptions.push( this.subscriptions.push(
this.queryBuilder.updated.subscribe(() => { this.queryBuilder.updated.subscribe(() => {
this.sorting = this.getSorting(); this.sorting = this.getSorting();
this.isLoading = true;
}), }),
this.queryBuilder.executed.subscribe(data => { this.queryBuilder.executed.subscribe(data => {
this.onSearchResultLoaded(data); this.onSearchResultLoaded(data);
this.isLoading = false;
}) })
); );

3
src/assets/i18n/en.json
View File

@@ -107,7 +107,8 @@
"MODIFIED": "Modified", "MODIFIED": "Modified",
"LOCATION": "Location", "LOCATION": "Location",
"SIZE": "Size" "SIZE": "Size"
} },
"NO_RESULTS": "Your search returned 0 results"
} }
}, },
"ACTIONS": { "ACTIONS": {