This is an automated email from the ASF dual-hosted git repository. tobiasistvan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push: new 7f91e82 [AMBARI-24438] [Log Search UI] App Loader Page - add initial progress state (#2061) 7f91e82 is described below commit 7f91e82369a4c599c05f4953bce9514fcd4b4846 Author: Istvan Tobias <tobias.ist...@gmail.com> AuthorDate: Wed Aug 15 10:18:23 2018 +0200 [AMBARI-24438] [Log Search UI] App Loader Page - add initial progress state (#2061) --- .../data-loading-indicator/data-loading-indicator.component.html | 2 +- .../data-loading-indicator/data-loading-indicator.component.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/data-loading-indicator/data-loading-indicator.component.html b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/data-loading-indicator/data-loading-indicator.component.html index 32a3182..780ca6a 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/data-loading-indicator/data-loading-indicator.component.html +++ b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/data-loading-indicator/data-loading-indicator.component.html @@ -17,7 +17,7 @@ <ng-container> <div class="data-avaibility-progress"> <div class="progress-bar"> - <div class="progress-bar-indicator" [style.width]="((dataLoadingProgress$ | async) * 100) + '%'"></div> + <div class="progress-bar-indicator" [style.width]="((dataLoadingProgress$ | async) ? (dataLoadingProgress$ | async) * 100 : '5') + '%'"></div> </div> </div> <div class="data-avaibility"> diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/data-loading-indicator/data-loading-indicator.component.ts b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/data-loading-indicator/data-loading-indicator.component.ts index b568488..84410ae 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/data-loading-indicator/data-loading-indicator.component.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/data-loading-indicator/data-loading-indicator.component.ts @@ -48,7 +48,7 @@ export class DataLoadingIndicatorComponent implements OnDestroy { [key]: dataStates[key] }), {}); }); - private currentWatchedDataStatesAsArray$: Observable<DataAvaibilityObject[]> = this.currentWatchedDataStates$.map((dataStates) => { + currentWatchedDataStatesAsArray$: Observable<DataAvaibilityObject[]> = this.currentWatchedDataStates$.map((dataStates) => { return Object.keys(dataStates).reduce((statesArray, key): DataAvaibilityObject[] => { return [ ...statesArray, @@ -59,7 +59,7 @@ export class DataLoadingIndicatorComponent implements OnDestroy { ]; }, []); }); - private dataLoadingProgress$: Observable<number> = this.currentWatchedDataStates$.map((dataStates): number => { + dataLoadingProgress$: Observable<number> = this.currentWatchedDataStates$.map((dataStates): number => { const keys: string[] = Object.keys(dataStates); const total: number = keys.length; const totalAvailable: number = keys.filter( @@ -67,7 +67,7 @@ export class DataLoadingIndicatorComponent implements OnDestroy { ).length; return totalAvailable / total; }); - private hasDataStateError$: Observable<boolean> = this.currentWatchedDataStates$.map((dataStates): boolean => { + hasDataStateError$: Observable<boolean> = this.currentWatchedDataStates$.map((dataStates): boolean => { return Object.keys(dataStates).reduce((hasError: boolean, key) => { return hasError || dataStates[key] === DataAvailabilityValues.ERROR; }, false);