Use of environment variables to set wait time for reading notifications and catch-up apis

src/app/shared/notifications-tray/notifications-tray.component.ts

@@ -6,6 +6,7 @@ import { forkJoin } from 'rxjs';
 
 /** Custom Services */
 import { NotificationsService } from 'app/notifications/notifications.service';
+import { environment } from 'environments/environment';
 
 /**
  * Notifications Tray Component
@@ -17,7 +18,8 @@ import { NotificationsService } from 'app/notifications/notifications.service';
   encapsulation: ViewEncapsulation.None
 })
 export class NotificationsTrayComponent implements OnInit, OnDestroy {
-
+  /** Wait time between API status calls 60 seg */
+  waitTime = environment.waitTimeForNotifications || 60;
   /** Read Notifications */
   readNotifications: any[] = [];
   /** Displayed Read Notifications */
@@ -57,7 +59,7 @@ export class NotificationsTrayComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
-    setTimeout(() => { this.fetchUnreadNotifications(); }, 60000);
+    this.fetchUnreadNotifications();
   }
 
   ngOnDestroy() {
@@ -81,7 +83,7 @@ export class NotificationsTrayComponent implements OnInit, OnDestroy {
       this.setNotifications();
     });
     // this.mockNotifications(); // Uncomment for Testing.
-    this.timer = setTimeout(() => { this.fetchUnreadNotifications(); }, 60000);
+    this.timer = setTimeout(() => { this.fetchUnreadNotifications(); }, this.waitTime * 1000);
   }
 
   /**

src/app/shared/tenant-selector/tenant-selector.component.ts

@@ -16,11 +16,10 @@ export class TenantSelectorComponent implements OnInit {
    * Sets the Tenant Identifier of the application in the selector on initial setup.
    * @param {SettingsService} settingsService Settings Service.
    */
-  constructor(private settingsService: SettingsService) {
-    this.tenantSelector.setValue(this.settingsService.tenantIdentifier);
-  }
+  constructor(private settingsService: SettingsService) { }
 
   ngOnInit(): void {
+    this.tenantSelector.setValue(this.settingsService.tenantIdentifier);
   }
 
   /**

src/app/system/manage-jobs/cob-workflow/cob-workflow.component.ts

@@ -1,5 +1,6 @@
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { SystemService } from 'app/system/system.service';
+import { environment } from 'environments/environment';
 
 @Component({
   selector: 'mifosx-cob-workflow',
@@ -8,7 +9,7 @@ import { SystemService } from 'app/system/system.service';
 })
 export class CobWorkflowComponent implements OnInit, OnDestroy {
   /** Wait time between API status calls 30 seg */
-  waitTime = 30000;
+  waitTime = environment.waitTimeForCOBCatchUp || 30;
   /** Process running flag */
   @Input() isCatchUpRunning = true;
   /** Timer to refetch COB Catch-Up status every 5 seconds */
@@ -17,7 +18,6 @@ export class CobWorkflowComponent implements OnInit, OnDestroy {
   constructor(private systemService: SystemService) { }
 
   ngOnInit(): void {
-    setTimeout(() => { this.getCOBCatchUpStatus(); }, this.waitTime);
     this.getCOBCatchUpStatus();
   }
 
@@ -28,11 +28,8 @@ export class CobWorkflowComponent implements OnInit, OnDestroy {
   getCOBCatchUpStatus(): void {
     this.systemService.getCOBCatchUpStatus().subscribe((response: any) => {
       this.isCatchUpRunning = response.isCatchUpRunning;
-      if (!this.isCatchUpRunning) {
-        this.waitTime = 30000;
-      }
     });
-    this.timer = setTimeout(() => { this.getCOBCatchUpStatus(); }, this.waitTime);
+    this.timer = setTimeout(() => { this.getCOBCatchUpStatus(); }, this.waitTime * 1000);
   }
 
   runCatchUp(): void {