[DSC-1652] refactor translateService calls, change default values for timeouts

Author: Andrea Barbasso

src/app/shared/loading/loading.component.ts

@@ -23,7 +23,7 @@ export class LoadingComponent implements OnDestroy, OnInit {
   @Input() message: string;
   @Input() showMessage = true;
 
-  @Input() enableFallbackMessages = environment.loader.enableFallbackMessagesByDefault;
+  @Input() showFallbackMessages = environment.loader.showFallbackMessagesByDefault;
   @Input() warningMessage: string;
   @Input() warningMessageDelay = environment.loader.warningMessageDelay;
   @Input() errorMessage: string;
@@ -37,8 +37,6 @@ export class LoadingComponent implements OnDestroy, OnInit {
   readonly MessageType = MessageType;
   messageToShow: MessageType = this.showMessage ? MessageType.LOADING : undefined;
 
-  private subscriptions: Subscription[] = [];
-
   warningTimeout: any;
   errorTimeout: any;
 
@@ -49,22 +47,12 @@ export class LoadingComponent implements OnDestroy, OnInit {
   }
 
   ngOnInit() {
-    if (this.showMessage && this.message === undefined) {
-      this.subscriptions.push(this.translate.get('loading.default').subscribe((message: string) => {
-        this.message = message;
-      }));
+    if (this.showMessage) {
+      this.message = this.message || this.translate.instant('loading.default');
     }
-    if (this.enableFallbackMessages) {
-      if (!this.warningMessage) {
-        this.subscriptions.push(this.translate.get('loading.warning').subscribe((warningMessage: string) => {
-          this.warningMessage = warningMessage;
-        }));
-      }
-      if (!this.errorMessage) {
-        this.subscriptions.push(this.translate.get('loading.error').subscribe((errorMessage: string) => {
-          this.errorMessage = errorMessage;
-        }));
-      }
+    if (this.showFallbackMessages) {
+      this.warningMessage = this.warningMessage || this.translate.instant('loading.warning');
+      this.errorMessage = this.errorMessage || this.translate.instant('loading.error');
       if (this.warningMessageDelay > 0) {
         this.warningTimeout = setTimeout(() => {
           this.messageToShow = MessageType.WARNING;
@@ -81,11 +69,6 @@ export class LoadingComponent implements OnDestroy, OnInit {
   }
 
   ngOnDestroy() {
-    if (this.subscriptions.length > 0) {
-      this.subscriptions.forEach((sub) => {
-        sub.unsubscribe();
-      });
-    }
     if (hasValue(this.warningTimeout)) {
       clearTimeout(this.warningTimeout);
     }

src/app/shared/loading/themed-loading.component.ts

@@ -16,8 +16,22 @@ export class ThemedLoadingComponent extends ThemedComponent<LoadingComponent> {
   @Input() message: string;
   @Input() showMessage: boolean;
   @Input() spinner: boolean;
+  @Input() showFallbackMessages: boolean;
+  @Input() warningMessage: string;
+  @Input() warningMessageDelay: number;
+  @Input() errorMessage: string;
+  @Input() errorMessageDelay: number;
 
-  protected inAndOutputNames: (keyof LoadingComponent & keyof this)[] = ['message', 'showMessage', 'spinner'];
+  protected inAndOutputNames: (keyof LoadingComponent & keyof this)[] = [
+    'message',
+    'showMessage',
+    'spinner',
+    'showFallbackMessages',
+    'warningMessage',
+    'warningMessageDelay',
+    'errorMessage',
+    'errorMessageDelay'
+  ];
 
   constructor(
     protected resolver: ComponentFactoryResolver,

src/app/shared/search/search-results/search-results.component.html

@@ -22,7 +22,7 @@ <h2 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.
             (selectObject)="selectObject.emit($event)">
     </ds-viewable-collection>
 </div>
-<ds-themed-loading *ngIf="isLoading()" message="{{'loading.search-results' | translate}}"></ds-themed-loading>
+<ds-themed-loading *ngIf="isLoading()" message="{{'loading.search-results' | translate}}" [showFallbackMessages]="true"></ds-themed-loading>
 <ds-error *ngIf="showError()"
           message="{{errorMessageLabel() | translate}}"></ds-error>
 <div *ngIf="searchResults?.payload?.page.length == 0 || searchResults?.statusCode == 400">

src/config/default-app-config.ts

@@ -763,8 +763,8 @@ export class DefaultAppConfig implements AppConfig {
   };
 
   loader: LoaderConfig = {
-    enableFallbackMessagesByDefault: false,
-    warningMessageDelay: 10000, // 10 seconds
-    errorMessageDelay: 30000, // 30 seconds
+    showFallbackMessagesByDefault: false,
+    warningMessageDelay: 5000, // 5 seconds
+    errorMessageDelay: 15000, // 15 seconds
   };
 }

src/config/loader-config.interfaces.ts

@@ -1,7 +1,7 @@
 import { Config } from './config.interface';
 
 export interface LoaderConfig extends Config {
-  enableFallbackMessagesByDefault: boolean;
+  showFallbackMessagesByDefault: boolean;
   warningMessageDelay: number;
   errorMessageDelay: number;
 }

src/environments/environment.test.ts

@@ -579,7 +579,7 @@ export const environment: BuildConfig = {
   },
 
   loader: {
-    enableFallbackMessagesByDefault: true,
+    showFallbackMessagesByDefault: true,
     warningMessageDelay: 1000,
     errorMessageDelay: 2000,
   },