From 653473bf8ac0e2ed984f443766d89089bcfed345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Alberto=20Hern=C3=A1ndez?=
 <44206706+josehernandezfintecheandomx@users.noreply.github.com>
Date: Wed, 23 Aug 2023 20:55:59 -0600
Subject: [PATCH] Display Fineract version and build (#1847)

Co-authored-by: Jose Alberto Hernandez <alberto@blue-daemon.local>
---
 src/app/core/http/api-prefix.interceptor.ts   |  4 ++++
 ...sit-product-accounting-step.component.html | 12 +++++------
 ...sit-product-accounting-step.component.html | 12 +++++------
 ...ing-product-accounting-step.component.html | 20 +++++++++----------
 ...are-product-accounting-step.component.html |  8 ++++----
 src/app/settings/settings.service.ts          |  7 +++++++
 src/app/shared/footer/footer.component.html   |  5 +++--
 src/app/shared/footer/footer.component.ts     | 16 +++++++++++++--
 src/app/system/version.service.ts             | 19 ++++++++++++++++++
 src/assets/env.template.js                    |  4 ++++
 src/environments/environment.prod.ts          |  4 +++-
 src/environments/environment.ts               |  4 +++-
 12 files changed, 83 insertions(+), 32 deletions(-)
 create mode 100644 src/app/system/version.service.ts

diff --git a/src/app/core/http/api-prefix.interceptor.ts b/src/app/core/http/api-prefix.interceptor.ts
index c21b851c8..499dd8412 100644
--- a/src/app/core/http/api-prefix.interceptor.ts
+++ b/src/app/core/http/api-prefix.interceptor.ts
@@ -28,6 +28,10 @@ export class ApiPrefixInterceptor implements HttpInterceptor {
     if (versionRegex.test(request.url)) {
       baseUrl = this.settingsService.baseServerUrl;
     }
+    if (request.url.includes('/actuator/')) {
+      baseUrl = this.settingsService.serverHost;
+    }
+
     /**
      * Ignore URLs that are complete for i18n
      */
diff --git a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-accounting-step/fixed-deposit-product-accounting-step.component.html b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-accounting-step/fixed-deposit-product-accounting-step.component.html
index 2088038d8..9d30b6534 100644
--- a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-accounting-step/fixed-deposit-product-accounting-step.component.html
+++ b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-accounting-step/fixed-deposit-product-accounting-step.component.html
@@ -18,7 +18,7 @@
         <mat-label>Saving reference</mat-label>
         <mat-select formControlName="savingsReferenceAccountId" required>
           <mat-option *ngFor="let assetAccount of assetAccountData" [value]="assetAccount.id">
-            {{ assetAccount.name }}
+            ({{ assetAccount.glCode }}) {{ assetAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -34,7 +34,7 @@
         <mat-label>Saving control</mat-label>
         <mat-select formControlName="savingsControlAccountId" required>
           <mat-option *ngFor="let liabilityAccount of liabilityAccountData" [value]="liabilityAccount.id">
-            {{ liabilityAccount.name }}
+            ({{ liabilityAccount.glCode }}) {{ liabilityAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -46,7 +46,7 @@
         <mat-label>Savings transfers in suspense</mat-label>
         <mat-select formControlName="transfersInSuspenseAccountId" required>
           <mat-option *ngFor="let liabilityAccount of liabilityAccountData" [value]="liabilityAccount.id">
-            {{ liabilityAccount.name }}
+            ({{ liabilityAccount.glCode }}) {{ liabilityAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -62,7 +62,7 @@
         <mat-label>Interest on savings</mat-label>
         <mat-select formControlName="interestOnSavingsAccountId" required>
           <mat-option *ngFor="let expenseAccount of expenseAccountData" [value]="expenseAccount.id">
-            {{ expenseAccount.name }}
+            ({{ expenseAccount.glCode }}) {{ expenseAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -78,7 +78,7 @@
         <mat-label>Income from fees</mat-label>
         <mat-select formControlName="incomeFromFeeAccountId" required>
           <mat-option *ngFor="let incomeAccount of incomeAccountData" [value]="incomeAccount.id">
-            {{ incomeAccount.name }}
+            ({{ incomeAccount.glCode }}) {{ incomeAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -90,7 +90,7 @@
         <mat-label>Income from penalties</mat-label>
         <mat-select formControlName="incomeFromPenaltyAccountId" required>
           <mat-option *ngFor="let incomeAccount of incomeAccountData" [value]="incomeAccount.id">
-            {{ incomeAccount.name }}
+            ({{ incomeAccount.glCode }}) {{ incomeAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
diff --git a/src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-accounting-step/recurring-deposit-product-accounting-step.component.html b/src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-accounting-step/recurring-deposit-product-accounting-step.component.html
index 44505d55a..21a970b36 100644
--- a/src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-accounting-step/recurring-deposit-product-accounting-step.component.html
+++ b/src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-accounting-step/recurring-deposit-product-accounting-step.component.html
@@ -20,7 +20,7 @@
         <mat-label>Saving reference</mat-label>
         <mat-select formControlName="savingsReferenceAccountId" required>
           <mat-option *ngFor="let assetAccount of assetAccountData" [value]="assetAccount.id">
-            {{ assetAccount.name }}
+            ({{ assetAccount.glCode }}) {{ assetAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -36,7 +36,7 @@
         <mat-label>Saving control</mat-label>
         <mat-select formControlName="savingsControlAccountId" required>
           <mat-option *ngFor="let liabilityAccount of liabilityAccountData" [value]="liabilityAccount.id">
-            {{ liabilityAccount.name }}
+            ({{ liabilityAccount.glCode }}) {{ liabilityAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -48,7 +48,7 @@
         <mat-label>Savings transfers in suspense</mat-label>
         <mat-select formControlName="transfersInSuspenseAccountId" required>
           <mat-option *ngFor="let liabilityAccount of liabilityAccountData" [value]="liabilityAccount.id">
-            {{ liabilityAccount.name }}
+            ({{ liabilityAccount.glCode }}) {{ liabilityAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -64,7 +64,7 @@
         <mat-label>Interest on savings</mat-label>
         <mat-select formControlName="interestOnSavingsAccountId" required>
           <mat-option *ngFor="let expenseAccount of expenseAccountData" [value]="expenseAccount.id">
-            {{ expenseAccount.name }}
+            ({{ expenseAccount.glCode }}) {{ expenseAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -80,7 +80,7 @@
         <mat-label>Income from fees</mat-label>
         <mat-select formControlName="incomeFromFeeAccountId" required>
           <mat-option *ngFor="let incomeAccount of incomeAccountData" [value]="incomeAccount.id">
-            {{ incomeAccount.name }}
+            ({{ incomeAccount.glCode }}) {{ incomeAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -92,7 +92,7 @@
         <mat-label>Income from penalties</mat-label>
         <mat-select formControlName="incomeFromPenaltyAccountId" required>
           <mat-option *ngFor="let incomeAccount of incomeAccountData" [value]="incomeAccount.id">
-            {{ incomeAccount.name }}
+            ({{ incomeAccount.glCode }}) {{ incomeAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
diff --git a/src/app/products/saving-products/saving-product-stepper/saving-product-accounting-step/saving-product-accounting-step.component.html b/src/app/products/saving-products/saving-product-stepper/saving-product-accounting-step/saving-product-accounting-step.component.html
index d2a90391c..85de34a08 100644
--- a/src/app/products/saving-products/saving-product-stepper/saving-product-accounting-step/saving-product-accounting-step.component.html
+++ b/src/app/products/saving-products/saving-product-stepper/saving-product-accounting-step/saving-product-accounting-step.component.html
@@ -18,7 +18,7 @@
         <mat-label>Saving reference</mat-label>
         <mat-select formControlName="savingsReferenceAccountId" required>
           <mat-option *ngFor="let assetAccount of assetAccountData" [value]="assetAccount.id">
-            {{ assetAccount.name }}
+            ({{ assetAccount.glCode }}) {{ assetAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -30,7 +30,7 @@
         <mat-label>Overdraft portfolio</mat-label>
         <mat-select formControlName="overdraftPortfolioControlId" required>
           <mat-option *ngFor="let assetAccount of assetAccountData" [value]="assetAccount.id">
-            {{ assetAccount.name }}
+            ({{ assetAccount.glCode }}) {{ assetAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -46,7 +46,7 @@
         <mat-label>Saving control</mat-label>
         <mat-select formControlName="savingsControlAccountId" required>
           <mat-option *ngFor="let liabilityAccount of liabilityAccountData" [value]="liabilityAccount.id">
-            {{ liabilityAccount.name }}
+            ({{ liabilityAccount.glCode }}) {{ liabilityAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -58,7 +58,7 @@
         <mat-label>Savings transfers in suspense</mat-label>
         <mat-select formControlName="transfersInSuspenseAccountId" required>
           <mat-option *ngFor="let liabilityAccount of liabilityAccountData" [value]="liabilityAccount.id">
-            {{ liabilityAccount.name }}
+            ({{ liabilityAccount.glCode }}) {{ liabilityAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -70,7 +70,7 @@
         <mat-label>Escheat liability</mat-label>
         <mat-select formControlName="escheatLiabilityId" required>
           <mat-option *ngFor="let liabilityAccount of liabilityAccountData" [value]="liabilityAccount.id">
-            {{ liabilityAccount.name }}
+            ({{ liabilityAccount.glCode }}) {{ liabilityAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -86,7 +86,7 @@
         <mat-label>Interest on savings</mat-label>
         <mat-select formControlName="interestOnSavingsAccountId" required>
           <mat-option *ngFor="let expenseAccount of expenseAccountData" [value]="expenseAccount.id">
-            {{ expenseAccount.name }}
+            ({{ expenseAccount.glCode }}) {{ expenseAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -98,7 +98,7 @@
         <mat-label>Write-off</mat-label>
         <mat-select formControlName="writeOffAccountId" required>
           <mat-option *ngFor="let expenseAccount of expenseAccountData" [value]="expenseAccount.id">
-            {{ expenseAccount.name }}
+            ({{ expenseAccount.glCode }}) {{ expenseAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -114,7 +114,7 @@
         <mat-label>Income from fees</mat-label>
         <mat-select formControlName="incomeFromFeeAccountId" required>
           <mat-option *ngFor="let incomeAccount of incomeAccountData" [value]="incomeAccount.id">
-            {{ incomeAccount.name }}
+            ({{ incomeAccount.glCode }}) {{ incomeAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -126,7 +126,7 @@
         <mat-label>Income from penalties</mat-label>
         <mat-select formControlName="incomeFromPenaltyAccountId" required>
           <mat-option *ngFor="let incomeAccount of incomeAccountData" [value]="incomeAccount.id">
-            {{ incomeAccount.name }}
+            ({{ incomeAccount.glCode }}) {{ incomeAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -138,7 +138,7 @@
         <mat-label>Overdraft Interest Income</mat-label>
         <mat-select formControlName="incomeFromInterestId" required>
           <mat-option *ngFor="let incomeAccount of incomeAccountData" [value]="incomeAccount.id">
-            {{ incomeAccount.name }}
+            ({{ incomeAccount.glCode }}) {{ incomeAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
diff --git a/src/app/products/share-products/share-product-stepper/share-product-accounting-step/share-product-accounting-step.component.html b/src/app/products/share-products/share-product-stepper/share-product-accounting-step/share-product-accounting-step.component.html
index acaabd704..43a30855a 100644
--- a/src/app/products/share-products/share-product-stepper/share-product-accounting-step/share-product-accounting-step.component.html
+++ b/src/app/products/share-products/share-product-stepper/share-product-accounting-step/share-product-accounting-step.component.html
@@ -18,7 +18,7 @@
         <mat-label>Share reference</mat-label>
         <mat-select formControlName="shareReferenceId" required>
           <mat-option *ngFor="let assetAccount of assetAccountData" [value]="assetAccount.id">
-            {{ assetAccount.name }}
+            ({{ assetAccount.glCode }}) {{ assetAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -34,7 +34,7 @@
         <mat-label>Share suspense control</mat-label>
         <mat-select formControlName="shareSuspenseId" required>
           <mat-option *ngFor="let liabilityAccount of liabilityAccountData" [value]="liabilityAccount.id">
-            {{ liabilityAccount.name }}
+            ({{ liabilityAccount.glCode }}) {{ liabilityAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -50,7 +50,7 @@
         <mat-label>Equity</mat-label>
         <mat-select formControlName="shareEquityId" required>
           <mat-option *ngFor="let equityAccount of equityAccountData" [value]="equityAccount.id">
-            {{ equityAccount.name }}
+            ({{ equityAccount.glCode }}) {{ equityAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -66,7 +66,7 @@
         <mat-label>Income from fees</mat-label>
         <mat-select formControlName="incomeFromFeeAccountId" required>
           <mat-option *ngFor="let incomeAccount of incomeAccountData" [value]="incomeAccount.id">
-            {{ incomeAccount.name }}
+            ({{ incomeAccount.glCode }}) {{ incomeAccount.name }}
           </mat-option>
         </mat-select>
         <mat-error>
diff --git a/src/app/settings/settings.service.ts b/src/app/settings/settings.service.ts
index 34d49b76c..e4c6dad5b 100644
--- a/src/app/settings/settings.service.ts
+++ b/src/app/settings/settings.service.ts
@@ -162,6 +162,13 @@ export class SettingsService {
     return this.server + environment.apiProvider + environment.apiVersion;
   }
 
+  /**
+   * Returns server url with api path and version
+   */
+  get serverHost() {
+    return this.server;
+  }
+
   /**
    * Returns current Business date server
    */
diff --git a/src/app/shared/footer/footer.component.html b/src/app/shared/footer/footer.component.html
index 025affead..cdfa99577 100644
--- a/src/app/shared/footer/footer.component.html
+++ b/src/app/shared/footer/footer.component.html
@@ -1,10 +1,11 @@
 <div fxLayout="column" id="footer" class="m-b-20">
   <mat-divider fxFlexAlign="center" class="divider"></mat-divider>
-  <p fxFlexAlign="center" class="footer-content">{{ 'labels.texts.Version' | translate }} <b>{{ version }}</b> - <b>{{
+  <p fxFlexAlign="center" class="footer-content">Mifos <b>{{ versions.mifos }}</b> - <b>{{
       hash }}</b></p>
+  <p *ngIf="versions.fineract" fxFlexAlign="center" class="footer-content">Fineract <b>{{ versions.fineract.version }}</b></p>
   <p fxFlexAlign="center" class="footer-content" *ngIf="isBusinessDateDefined">Current Business Date: <b>{{ businessDate
       | date: 'EEEE, MMMM dd, y' }}</b></p>
-  <p fxFlexAlign="center" class="footer-content"><b>{{ server }}</b></p>
+  <p fxFlexAlign="center" class="footer-content" *ngIf="displayBackEndInfo"><b>{{ server }}</b></p>
   <mat-divider fxFlexAlign="center" class="divider"></mat-divider>
   <p fxFlexAlign="center" class="footer-content">{{ 'APP_NAME' | translate }} {{ 'labels.texts.by' | translate }} Mifos
   </p>
diff --git a/src/app/shared/footer/footer.component.ts b/src/app/shared/footer/footer.component.ts
index 906c2e000..c8691bb9e 100644
--- a/src/app/shared/footer/footer.component.ts
+++ b/src/app/shared/footer/footer.component.ts
@@ -6,6 +6,7 @@ import { AuthenticationService } from 'app/core/authentication/authentication.se
 import { Dates } from 'app/core/utils/dates';
 import { SettingsService } from 'app/settings/settings.service';
 import { SystemService } from 'app/system/system.service';
+import { VersionService } from 'app/system/version.service';
 
 /** Environment Configuration */
 import { environment } from 'environments/environment';
@@ -22,7 +23,9 @@ import { Subscription } from 'rxjs';
 export class FooterComponent implements OnInit, OnDestroy {
 
   /** Mifos X version. */
-  version: string = environment.version;
+  versions: any = {
+    mifos: environment.version
+  };
   /** Mifos X hash */
   hash: string = environment.hash;
   server = '';
@@ -35,11 +38,14 @@ export class FooterComponent implements OnInit, OnDestroy {
   alert$: Subscription;
   timer: any;
 
+  displayBackEndInfo: boolean = environment.displayBackEndInfo;
+
   constructor(private systemService: SystemService,
     private settingsService: SettingsService,
     private authenticationService: AuthenticationService,
     private alertService: AlertService,
-    private dateUtils: Dates) { }
+    private dateUtils: Dates,
+    private versionService: VersionService) { }
 
   ngOnInit() {
     this.alert$ = this.alertService.alertEvent.subscribe((alertEvent: Alert) => {
@@ -60,6 +66,12 @@ export class FooterComponent implements OnInit, OnDestroy {
     });
     this.getConfigurations();
     this.server = this.settingsService.server;
+    this.versionService.getBackendInfo().subscribe((data: any) => {
+      const regExp = /0.0.0/gi;
+      this.versions.fineract = {
+        version: data.git.build.replace(regExp, data.git.closest.tag.name)
+      }
+    });
   }
 
   ngOnDestroy() {
diff --git a/src/app/system/version.service.ts b/src/app/system/version.service.ts
new file mode 100644
index 000000000..ea0c93df2
--- /dev/null
+++ b/src/app/system/version.service.ts
@@ -0,0 +1,19 @@
+/** Angular Imports */
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+
+/** rxjs Imports */
+import { Observable } from 'rxjs';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class VersionService {
+
+  constructor(private http: HttpClient) { }
+
+  getBackendInfo(): Observable<any> {
+    return this.http.get('/fineract-provider/actuator/info');
+  }
+
+}
diff --git a/src/assets/env.template.js b/src/assets/env.template.js
index 2949dfb95..1752b21da 100644
--- a/src/assets/env.template.js
+++ b/src/assets/env.template.js
@@ -19,4 +19,8 @@
 
   // Char delimiter to Export CSV options: ',' ';' '|' ' '
   window['env']['defaultCharDelimiter'] = '$MIFOS_DEFAULT_CHAR_DELIMITER';
+
+  // Display or not the BackEnd Info
+  window['env']['displayBackEndInfo'] = '$MIFOS_DISPLAY_BACKEND_INFO';
+
 })(this);
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 7ff66f180..823962a2d 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -25,7 +25,9 @@ export const environment = {
   supportedLanguages: window['env']['supportedLanguages'] || 'en-US,es-MX,fr-FR',
   preloadClients: window['env']['preloadClients'] || true,
 
-  defaultCharDelimiter: window['env']['defaultCharDelimiter'] || ','
+  defaultCharDelimiter: window['env']['defaultCharDelimiter'] || ',',
+
+  displayBackEndInfo: window['env']['displayBackEndInfo'] || true
 };
 
 // Server URL
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 34a4a5ae7..a75cf9465 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -30,7 +30,9 @@ export const environment = {
   supportedLanguages: window['env']['supportedLanguages'] || 'en-US,es-MX,fr-FR',
   preloadClients: window['env']['preloadClients'] || true,
 
-  defaultCharDelimiter: window['env']['defaultCharDelimiter'] || ','
+  defaultCharDelimiter: window['env']['defaultCharDelimiter'] || ',',
+
+  displayBackEndInfo: window['env']['displayBackEndInfo'] || true
 };
 
 // Server URL