From d42d5bba97b4ff36e95513a5f5f611f84ac554ae Mon Sep 17 00:00:00 2001
From: Fadil <Fadil.zemmari@xelians.fr>
Date: Wed, 9 Dec 2020 16:39:11 +0100
Subject: [PATCH] [FIX TRTL-569] Fix get application & analytics http request
headers
---
.../src/app/modules/api/user-api.service.ts | 6 ++++--
.../src/app/modules/application.service.ts | 5 +++--
.../application-list/application-list.component.scss | 1 -
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ui/ui-frontend-common/src/app/modules/api/user-api.service.ts b/ui/ui-frontend-common/src/app/modules/api/user-api.service.ts
index 6cead0bd9..859fe36d5 100644
--- a/ui/ui-frontend-common/src/app/modules/api/user-api.service.ts
+++ b/ui/ui-frontend-common/src/app/modules/api/user-api.service.ts
@@ -38,6 +38,7 @@ import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
import { Inject, Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
+import { AuthService } from '../auth.service';
import { BASE_URL } from '../injection-tokens';
import { Analytics } from '../models/user/analytics.interface';
import { User } from '../models/user/user.interface';
@@ -49,12 +50,13 @@ export class UserApiService {
private readonly apiUrl: string;
- constructor(private http: HttpClient, @Inject(BASE_URL) baseUrl: string) {
+ constructor(private http: HttpClient, @Inject(BASE_URL) baseUrl: string, private authService: AuthService) {
this.apiUrl = baseUrl + '/users';
}
public analytics(data: { applicationId?: string, lastTenantIdentifier?: number }): Observable<User> {
- return this.http.post<User>(this.apiUrl + '/analytics', data);
+ const headers = new HttpHeaders({ 'X-Tenant-Id': this.authService.getAnyTenantIdentifier() });
+ return this.http.post<User>(this.apiUrl + '/analytics', data, { headers });
}
}
diff --git a/ui/ui-frontend-common/src/app/modules/application.service.ts b/ui/ui-frontend-common/src/app/modules/application.service.ts
index 33ecb8083..abcd873ee 100644
--- a/ui/ui-frontend-common/src/app/modules/application.service.ts
+++ b/ui/ui-frontend-common/src/app/modules/application.service.ts
@@ -34,7 +34,7 @@
* The fact that you are presently reading this means that you have had
* knowledge of the CeCILL-C license and that you accept its terms.
*/
-import { HttpParams } from '@angular/common/http';
+import { HttpHeaders, HttpParams } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Router } from '@angular/router';
import { BehaviorSubject } from 'rxjs';
@@ -100,7 +100,8 @@ export class ApplicationService {
*/
list(): Observable<ApplicationInfo> {
const params = new HttpParams().set('filterApp', 'true');
- return this.applicationApi.getAllByParams(params).pipe(
+ const headers = new HttpHeaders({ 'X-Tenant-Id': this.authService.getAnyTenantIdentifier() });
+ return this.applicationApi.getAllByParams(params, headers).pipe(
catchError(() => of({ APPLICATION_CONFIGURATION: [], CATEGORY_CONFIGURATION: {}})),
map((applicationInfo: ApplicationInfo) => {
this._applications = applicationInfo.APPLICATION_CONFIGURATION;
diff --git a/ui/ui-frontend/projects/portal/src/app/components/application-list/application-list.component.scss b/ui/ui-frontend/projects/portal/src/app/components/application-list/application-list.component.scss
index 2cba452bd..c5ee356de 100644
--- a/ui/ui-frontend/projects/portal/src/app/components/application-list/application-list.component.scss
+++ b/ui/ui-frontend/projects/portal/src/app/components/application-list/application-list.component.scss
@@ -65,7 +65,6 @@ mat-card-subtitle {
overflow: hidden;
min-height: 200px;
max-height: 200px;
- width: 100%;
max-width: 280px;
margin: 0 auto 17px auto;
}
--
GitLab