From 9acaa70fe11a7296bfeed946860f464df774fdb7 Mon Sep 17 00:00:00 2001
From: BLANCHET Ludovic <ludovic.blanchet.ext@culture.gouv.fr>
Date: Fri, 24 Jan 2020 17:40:35 +0100
Subject: [PATCH] Fix some features
Signed-off-by: Makhtar DIAGNE <makhtar.diagne@teamdlab.com>
---
.../server/customer/domain/Customer.java | 7 -----
.../customer/domain/GraphicIdentity.java | 5 ----
.../service/CustomerInternalService.java | 9 +------
.../group_vars/all/vitamui_services.yml.rej | 17 ++++++++++++
.../ui-identity-admin/application.yml.j2 | 1 +
.../templates/ui-identity/application.yml.j2 | 1 +
.../templates/ui-portal/application.yml.j2 | 1 +
.../ui/commons/config/UIPropertiesImpl.java | 1 +
.../ui/commons/property/UIProperties.java | 2 +-
.../commons/rest/ApplicationController.java | 16 +++++++++++
.../commons/service/ApplicationService.java | 27 ++++++++++---------
.../modules/api/application-api.service.ts | 4 +++
.../modules/api/customer-api.service.spec.ts | 20 --------------
.../app/modules/api/customer-api.service.ts | 23 ----------------
.../models/customer/customer.interface.ts | 2 +-
.../src/app/modules/startup.service.ts | 8 +++---
.../src/app/modules/utils/colors.util.ts | 1 +
.../src/sass/material/_menu.scss | 2 +-
.../customer-create.component.html | 6 ++---
.../graphic-identity-update.component.html | 4 ++-
.../config/ui-identity-application-dev.yml | 4 +--
.../main/config/ui-portal-application-dev.yml | 4 +--
.../rest/ApplicationControllerTest.java | 1 -
23 files changed, 71 insertions(+), 95 deletions(-)
create mode 100644 deployment/environment/group_vars/all/vitamui_services.yml.rej
delete mode 100644 ui/ui-frontend-common/src/app/modules/api/customer-api.service.spec.ts
delete mode 100644 ui/ui-frontend-common/src/app/modules/api/customer-api.service.ts
diff --git a/api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/customer/domain/Customer.java b/api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/customer/domain/Customer.java
index d57e7a79..1add4d97 100644
--- a/api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/customer/domain/Customer.java
+++ b/api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/customer/domain/Customer.java
@@ -113,11 +113,4 @@ public class Customer extends IdDocument {
@NotNull
private GraphicIdentity graphicIdentity;
-
- @Override public String toString() {
- return "Customer{" + "identifier='" + identifier + '\'' + ", code='" + code + '\'' + ", name='" + name + '\'' + ", companyName='" + companyName + '\''
- + ", enabled=" + enabled + ", language='" + language + '\'' + ", passwordRevocationDelay=" + passwordRevocationDelay + ", otp=" + otp
- + ", emailDomains=" + emailDomains + ", defaultEmailDomain='" + defaultEmailDomain + '\'' + ", address=" + address + ", readonly=" + readonly
- + ", subrogeable=" + subrogeable + ", graphicIdentity=" + graphicIdentity + '}';
- }
}
diff --git a/api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/customer/domain/GraphicIdentity.java b/api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/customer/domain/GraphicIdentity.java
index 1553938f..aaa9f7a9 100644
--- a/api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/customer/domain/GraphicIdentity.java
+++ b/api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/customer/domain/GraphicIdentity.java
@@ -51,9 +51,4 @@ public class GraphicIdentity {
// Theme based Graphical identity
Map<String, String> themeColors;
-
- @Override public String toString() {
- return "GraphicIdentity{" + "hasCustomGraphicIdentity=" + hasCustomGraphicIdentity + ", logoDataBase64='" + logoDataBase64 + '\'' + ", themeColors="
- + themeColors + '}';
- }
}
diff --git a/api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/customer/service/CustomerInternalService.java b/api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/customer/service/CustomerInternalService.java
index 526e22a9..22065757 100644
--- a/api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/customer/service/CustomerInternalService.java
+++ b/api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/customer/service/CustomerInternalService.java
@@ -175,10 +175,8 @@ public class CustomerInternalService extends VitamUICrudService<CustomerDto, Cus
Assert.isNull(dto.getId(), "The DTO identifier must be null for creation.");
beforeCreate(dto);
dto.setId(generateSuperId());
- LOGGER.debug("DTO: " + dto);
final Customer entity = convertFromDtoToEntity(dto);
- LOGGER.debug("entity: " + entity);
if (customerData.getLogo().isPresent()) {
try {
entity.getGraphicIdentity().setHasCustomGraphicIdentity(true);
@@ -327,23 +325,18 @@ public class CustomerInternalService extends VitamUICrudService<CustomerDto, Cus
processGraphicIdentityPatch(newCustomGraphicIdentityValue, customer, logo);
break;
case "themeColors":
- LOGGER.debug("Update Theme Colors");
- // Check value as map ?
Object themeColorsValue = entry.getValue();
- LOGGER.debug("Theme: " + themeColorsValue);
if (themeColorsValue instanceof Map) {
Map<String, String> themeColors = (Map)themeColorsValue;
- LOGGER.debug("Colors: " + themeColorsValue);
customer.getGraphicIdentity().setThemeColors(themeColors);
} else {
- LOGGER.error("Cannot instantiate themeColors value as a Map<String, String>");
+ LOGGER.error("Cannot instantiate themeColors value as a Map<String, String>. Ignore it");
}
break;
default :
throw new IllegalArgumentException("Unable to patch customer " + customer.getId() + ": key " + entry.getKey() + " is not allowed");
}
}
- LOGGER.debug("Customer: ", customer);
iamLogbookService.updateCustomerEvent(customer, logbooks);
}
diff --git a/deployment/environment/group_vars/all/vitamui_services.yml.rej b/deployment/environment/group_vars/all/vitamui_services.yml.rej
new file mode 100644
index 00000000..1747c1cb
--- /dev/null
+++ b/deployment/environment/group_vars/all/vitamui_services.yml.rej
@@ -0,0 +1,17 @@
+diff a/deployment/environment/group_vars/all/vitamui_services.yml b/deployment/environment/group_vars/all/vitamui_services.yml (rejected hunks)
+@@ -157,6 +157,7 @@ vitamui_services:
+ dirs:
+ config: /vitamui/conf/ui-identity
+ log: /vitamui/log/ui-identity
++ assets: /vitamui/assets/ui-identity
+
+ server_name: "{{ vitamui_env_name }}-identity.teamvitamui.com"
+ java_opts: -Xms128m -Xmx512m -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses=true
+@@ -211,6 +212,7 @@ vitamui_services:
+ dirs:
+ config: /vitamui/conf/ui-portal
+ log: /vitamui/log/ui-portal
++ assets: /vitamui/assets/ui-portal
+ server_name: "{{ vitamui_env_name }}-portal.teamvitamui.com"
+ java_opts: -Xms128m -Xmx512m -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses=true
+ access_log_enabled: false
diff --git a/deployment/roles/vitamui/templates/ui-identity-admin/application.yml.j2 b/deployment/roles/vitamui/templates/ui-identity-admin/application.yml.j2
index 311659c2..486cd215 100644
--- a/deployment/roles/vitamui/templates/ui-identity-admin/application.yml.j2
+++ b/deployment/roles/vitamui/templates/ui-identity-admin/application.yml.j2
@@ -62,6 +62,7 @@ ui-identity:
key-password: {{ password_truststore }} # TODO OMA : revoir
hostname-verification: false
{% endif %}
+ assets: "{{ vitamui_services.ui_identity_admin.dirs.assets }}"
base-url:
{% if vitamui.portal.base_url is defined %}
portal: "{{ vitamui.portal.base_url }}"
diff --git a/deployment/roles/vitamui/templates/ui-identity/application.yml.j2 b/deployment/roles/vitamui/templates/ui-identity/application.yml.j2
index edb5d4bb..7ad58cc9 100644
--- a/deployment/roles/vitamui/templates/ui-identity/application.yml.j2
+++ b/deployment/roles/vitamui/templates/ui-identity/application.yml.j2
@@ -59,6 +59,7 @@ ui-identity:
key-password: {{ password_truststore }}
hostname-verification: false
{%endif %}
+ assets: "{{ vitamui_services.ui_identity.dirs.assets }}"
base-url:
{% if vitamui.portal.base_url is defined %}
portal: "{{ vitamui.portal.base_url }}"
diff --git a/deployment/roles/vitamui/templates/ui-portal/application.yml.j2 b/deployment/roles/vitamui/templates/ui-portal/application.yml.j2
index 5ddb60e4..d82635df 100644
--- a/deployment/roles/vitamui/templates/ui-portal/application.yml.j2
+++ b/deployment/roles/vitamui/templates/ui-portal/application.yml.j2
@@ -54,6 +54,7 @@ ui-portal:
key-path: {{ vitamui_folder_conf }}/truststore_{{ vitamui_certificate_client_type }}.jks
key-password: {{ password_truststore }} # TODO OMA : revoir
hostname-verification: false
+ assets: "{{ vitamui_services.ui_portal.dirs.assets }}"
{% endif %}
{% if vitamui.portal.base_url is undefined %}
base-url:
diff --git a/ui/ui-commons/src/main/java/fr/gouv/vitamui/ui/commons/config/UIPropertiesImpl.java b/ui/ui-commons/src/main/java/fr/gouv/vitamui/ui/commons/config/UIPropertiesImpl.java
index c88618c6..7313abaf 100644
--- a/ui/ui-commons/src/main/java/fr/gouv/vitamui/ui/commons/config/UIPropertiesImpl.java
+++ b/ui/ui-commons/src/main/java/fr/gouv/vitamui/ui/commons/config/UIPropertiesImpl.java
@@ -65,4 +65,5 @@ public class UIPropertiesImpl implements UIProperties {
private Map<String, String> themeColors;
+ private String assets;
}
diff --git a/ui/ui-commons/src/main/java/fr/gouv/vitamui/ui/commons/property/UIProperties.java b/ui/ui-commons/src/main/java/fr/gouv/vitamui/ui/commons/property/UIProperties.java
index 04dc4634..5b6d657d 100644
--- a/ui/ui-commons/src/main/java/fr/gouv/vitamui/ui/commons/property/UIProperties.java
+++ b/ui/ui-commons/src/main/java/fr/gouv/vitamui/ui/commons/property/UIProperties.java
@@ -50,6 +50,6 @@ public interface UIProperties {
public Map<String, String> getThemeColors();
- public String getLogoURI();
+ public String getAssets();
}
diff --git a/ui/ui-commons/src/main/java/fr/gouv/vitamui/ui/commons/rest/ApplicationController.java b/ui/ui-commons/src/main/java/fr/gouv/vitamui/ui/commons/rest/ApplicationController.java
index 73e6c6bb..32b19a2a 100644
--- a/ui/ui-commons/src/main/java/fr/gouv/vitamui/ui/commons/rest/ApplicationController.java
+++ b/ui/ui-commons/src/main/java/fr/gouv/vitamui/ui/commons/rest/ApplicationController.java
@@ -94,4 +94,20 @@ public class ApplicationController extends AbstractUiRestController {
LOGGER.info("Get configuration");
return service.getConf();
}
+
+ /**
+ * Return asset file as base64 data
+ * @param fileName the file to get from assets
+ * @return the file as base64 string
+ */
+ @ApiOperation(value = "Get Asset File")
+ @GetMapping
+ @RequestMapping(method = RequestMethod.GET, value = "/asset")
+ @ResponseStatus(HttpStatus.OK)
+ public Map<String, Object> getAsset(@RequestParam() final String fileName) {
+ LOGGER.info("Get Asset {}", fileName);
+ Map<String, Object> file = new HashMap<>();
+ file.put(fileName, service.getBase64Asset(fileName));
+ return file;
+ }
}
diff --git a/ui/ui-commons/src/main/java/fr/gouv/vitamui/ui/commons/service/ApplicationService.java b/ui/ui-commons/src/main/java/fr/gouv/vitamui/ui/commons/service/ApplicationService.java
index 2a08f359..ac5488b2 100644
--- a/ui/ui-commons/src/main/java/fr/gouv/vitamui/ui/commons/service/ApplicationService.java
+++ b/ui/ui-commons/src/main/java/fr/gouv/vitamui/ui/commons/service/ApplicationService.java
@@ -124,19 +124,6 @@ public class ApplicationService extends AbstractCrudService<ApplicationDto> {
configurationData.put(CommonConstants.LOGOUT_REDIRECT_UI_URL, casLogoutUrl.getValueWithRedirection(uiRedirectUrl));
configurationData.put(CommonConstants.THEME_COLORS, properties.getThemeColors());
- final Path logoPath = Paths.get(properties.getLogoURI());
- String base64Logo = null;
- try {
- base64Logo = DatatypeConverter.printBase64Binary(Files.readAllBytes(logoPath));
- }
- catch (IOException e) {
- LOGGER.warn("Error while resolve application logo");
- e.printStackTrace();
- }
- if (base64Logo != null) {
- configurationData.put(CommonConstants.LOGO, base64Logo);
- }
-
return configurationData;
}
@@ -148,4 +135,18 @@ public class ApplicationService extends AbstractCrudService<ApplicationDto> {
public ApplicationExternalRestClient getClient() {
return client;
}
+
+ public String getBase64Asset(String fileName) {
+ final Path assetFile = Paths.get(properties.getAssets(), fileName);
+ String base64Logo = null;
+ try {
+ base64Logo = DatatypeConverter.printBase64Binary(Files.readAllBytes(assetFile));
+ }
+ catch (IOException e) {
+ LOGGER.warn("Error while resolve file");
+ e.printStackTrace();
+ return null;
+ }
+ return base64Logo;
+ }
}
diff --git a/ui/ui-frontend-common/src/app/modules/api/application-api.service.ts b/ui/ui-frontend-common/src/app/modules/api/application-api.service.ts
index cb6af820..2a3e96ce 100644
--- a/ui/ui-frontend-common/src/app/modules/api/application-api.service.ts
+++ b/ui/ui-frontend-common/src/app/modules/api/application-api.service.ts
@@ -60,4 +60,8 @@ export class ApplicationApiService {
return this.http.get<AppConfiguration>(this.apiUrl + '/conf');
}
+ getAsset(fileName: string): Observable<AppConfiguration> {
+ return this.http.get<AppConfiguration>(`${this.apiUrl}/asset?fileName=${fileName}`);
+ }
+
}
diff --git a/ui/ui-frontend-common/src/app/modules/api/customer-api.service.spec.ts b/ui/ui-frontend-common/src/app/modules/api/customer-api.service.spec.ts
deleted file mode 100644
index 8a5cde2c..00000000
--- a/ui/ui-frontend-common/src/app/modules/api/customer-api.service.spec.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { TestBed } from '@angular/core/testing';
-
-import { BASE_URL } from '../injection-tokens';
-import { ApplicationApiService } from './application-api.service';
-import {CustomerApiService} from "../../../../../ui-frontend/projects/identity/src/app/core/api/customer-api.service";
-
-describe('CustomerApiService', () => {
- beforeEach(() => TestBed.configureTestingModule({
- imports: [HttpClientTestingModule],
- providers: [
- { provide: BASE_URL, useValue: '/fake-api' },
- ]
- }));
-
- it('should be created', () => {
- const service: CustomerApiService = TestBed.get(CustomerApiService);
- expect(service).toBeTruthy();
- });
-});
diff --git a/ui/ui-frontend-common/src/app/modules/api/customer-api.service.ts b/ui/ui-frontend-common/src/app/modules/api/customer-api.service.ts
deleted file mode 100644
index 9d3eb1e1..00000000
--- a/ui/ui-frontend-common/src/app/modules/api/customer-api.service.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
-import { Inject, Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
-
-import { BASE_URL } from '../injection-tokens';
-import {AppConfiguration, Application, Customer} from '../models';
-
-@Injectable({
- providedIn: 'root'
-})
-export class CustomerApiService {
-
- private readonly apiUrl: string;
-
- constructor(private http: HttpClient, @Inject(BASE_URL) baseUrl: string) {
- this.apiUrl = 'identity-api/customers'; // HTD: Get Identity Base URI at start !
- }
-
- getSystemCustomer(): Observable<Customer> {
- return this.http.get<Customer>(`${this.apiUrl}/system_customer`);
- }
-
-}
diff --git a/ui/ui-frontend-common/src/app/modules/models/customer/customer.interface.ts b/ui/ui-frontend-common/src/app/modules/models/customer/customer.interface.ts
index 5775ae83..ba46ecf2 100644
--- a/ui/ui-frontend-common/src/app/modules/models/customer/customer.interface.ts
+++ b/ui/ui-frontend-common/src/app/modules/models/customer/customer.interface.ts
@@ -55,5 +55,5 @@ export interface Customer extends Id {
owners: Owner[];
readonly: boolean;
hasCustomGraphicIdentity: boolean;
- themeColors: any;
+ themeColors: Map<string, string>;
}
diff --git a/ui/ui-frontend-common/src/app/modules/startup.service.ts b/ui/ui-frontend-common/src/app/modules/startup.service.ts
index d4b85655..cc9c22a0 100644
--- a/ui/ui-frontend-common/src/app/modules/startup.service.ts
+++ b/ui/ui-frontend-common/src/app/modules/startup.service.ts
@@ -72,7 +72,6 @@ export class StartupService {
private logger: Logger,
private authService: AuthService,
private applicationService: ApplicationService,
- private customerApiService: CustomerApiService,
private securityApi: SecurityApiService,
private applicationApi: ApplicationApiService,
@Inject(WINDOW_LOCATION) private location: any
@@ -89,6 +88,10 @@ export class StartupService {
this.authService.logoutRedirectUiUrl = this.configurationData.LOGOUT_REDIRECT_UI_URL;
})
.then(() => this.refreshUser().toPromise())
+ .then(() => this.applicationApi.getAsset('navbar-logo.svg').toPromise())
+ .then((data: any) => {
+ this.configurationData.LOGO = data['navbar-logo.svg'];
+ })
.then(() => {
const applicationColorMap = this.configurationData.THEME_COLORS;
@@ -103,9 +106,6 @@ export class StartupService {
'--vitamui-secondary-dark-5': getColorFromMaps('vitamui-secondary-dark', '#52aa9a', applicationColorMap, customerColorMap)
};
- const logo64 = this.configurationData.LOGO;
- console.log('Logo: ', logo64);
-
for (const themeColorsKey in themeColors) {
if (themeColors.hasOwnProperty(themeColorsKey)) {
this.themeWrapper.style.setProperty(themeColorsKey, themeColors[themeColorsKey]);
diff --git a/ui/ui-frontend-common/src/app/modules/utils/colors.util.ts b/ui/ui-frontend-common/src/app/modules/utils/colors.util.ts
index 1f6474cb..92222438 100644
--- a/ui/ui-frontend-common/src/app/modules/utils/colors.util.ts
+++ b/ui/ui-frontend-common/src/app/modules/utils/colors.util.ts
@@ -17,6 +17,7 @@ class HSL {
* @param defaultColor the color default value if no overriding in priority and fallback maps
* @param fallbackMap the fallback map. The function will search in it if no color is found in priority map. Should be application config
* @param priorityMap the priority map. If the color is found in it, the fallbackMap is not used. Should be customer config
+ * @return The hex RBG color find or computed from all sources
*/
export function getColorFromMaps(name: string, defaultColor: string, fallbackMap: any, priorityMap: any): string {
diff --git a/ui/ui-frontend-common/src/sass/material/_menu.scss b/ui/ui-frontend-common/src/sass/material/_menu.scss
index 11df22be..fb5dfb63 100644
--- a/ui/ui-frontend-common/src/sass/material/_menu.scss
+++ b/ui/ui-frontend-common/src/sass/material/_menu.scss
@@ -9,7 +9,7 @@
}
.mat-menu-item {
- color: c;
+ color: var(--vitamui-primary);
background: white;
font-size: 16px;
font-weight: 500;
diff --git a/ui/ui-frontend/projects/identity/src/app/customer/customer-create/customer-create.component.html b/ui/ui-frontend/projects/identity/src/app/customer/customer-create/customer-create.component.html
index 24eb1921..ff6e9a9c 100644
--- a/ui/ui-frontend/projects/identity/src/app/customer/customer-create/customer-create.component.html
+++ b/ui/ui-frontend/projects/identity/src/app/customer/customer-create/customer-create.component.html
@@ -182,15 +182,13 @@
</p>
</div>
</div>
+
+ <app-customer-colors-input formControlName="themeColors"></app-customer-colors-input>
</div>
<div class="error-message" *ngIf="hasError">
{{ message }}
</div>
- <!-- TODO: Color picker -->
- <!-- FIXME: Placeholder => placeholder="domaine.xyz" i18n-placeholder="Email domain input placeholder@@customerCreateEmailDomainInputPlaceholder" -->
- <app-customer-colors-input formControlName="themeColors"></app-customer-colors-input>
-
<div class="actions">
<button type="button" class="btn primary" cdkStepperNext [disabled]="!thirdStepValid()" i18n="Create owner button@@customerCreateCreateOwnerButton">
Créer le propriétaire
diff --git a/ui/ui-frontend/projects/identity/src/app/customer/customer-preview/graphic-identity-tab/graphic-identity-update/graphic-identity-update.component.html b/ui/ui-frontend/projects/identity/src/app/customer/customer-preview/graphic-identity-tab/graphic-identity-update/graphic-identity-update.component.html
index 3978260f..7fe8324d 100644
--- a/ui/ui-frontend/projects/identity/src/app/customer/customer-preview/graphic-identity-tab/graphic-identity-update/graphic-identity-update.component.html
+++ b/ui/ui-frontend/projects/identity/src/app/customer/customer-preview/graphic-identity-tab/graphic-identity-update/graphic-identity-update.component.html
@@ -34,7 +34,9 @@
{{ message }}
</div>
- <app-customer-colors-input formControlName="themeColors"></app-customer-colors-input>
+ <div style="padding-bottom: 30px">
+ <app-customer-colors-input formControlName="themeColors"></app-customer-colors-input>
+ </div>
<div class="actions">
<button type="button" class="btn primary" [disabled]="!isGraphicIdentityFormValid()" i18n="Update customer graphic identity@@updateCustomerGraphicIdentityButton" (click)="updateGraphicIdentity()">Valider</button>
diff --git a/ui/ui-identity/src/main/config/ui-identity-application-dev.yml b/ui/ui-identity/src/main/config/ui-identity-application-dev.yml
index 56bd8c48..bbb2e529 100644
--- a/ui/ui-identity/src/main/config/ui-identity-application-dev.yml
+++ b/ui/ui-identity/src/main/config/ui-identity-application-dev.yml
@@ -15,9 +15,7 @@ ui-identity:
vitamui-primary-light: "#992fb1"
vitamui-primary-light-20: "#ba52d1"
vitamui-secondary: "#7FA1D4"
-
- logoURI: "/home/lubla/vitamui/test_logo.png"
-
+ assets: /vitamui/assets/ui-identity
iam-external-client:
server-host: localhost
server-port: 8083
diff --git a/ui/ui-portal/src/main/config/ui-portal-application-dev.yml b/ui/ui-portal/src/main/config/ui-portal-application-dev.yml
index 2566f06f..80d4ac1d 100644
--- a/ui/ui-portal/src/main/config/ui-portal-application-dev.yml
+++ b/ui/ui-portal/src/main/config/ui-portal-application-dev.yml
@@ -30,9 +30,7 @@ ui-portal:
vitamui-primary-light: "#992fb1"
vitamui-primary-light-20: "#ba52d1"
vitamui-secondary: "#7FA1D4"
-
- logoURI: "/home/lubla/vitamui/test_logo.png"
-
+ assets: /vitamui/assets/ui-portal
iam-external-client:
server-host: localhost
server-port: 8083
diff --git a/ui/ui-portal/src/test/java/fr/gouv/vitamui/portal/rest/ApplicationControllerTest.java b/ui/ui-portal/src/test/java/fr/gouv/vitamui/portal/rest/ApplicationControllerTest.java
index 01517d37..74d0b2d1 100644
--- a/ui/ui-portal/src/test/java/fr/gouv/vitamui/portal/rest/ApplicationControllerTest.java
+++ b/ui/ui-portal/src/test/java/fr/gouv/vitamui/portal/rest/ApplicationControllerTest.java
@@ -49,7 +49,6 @@ public class ApplicationControllerTest extends UIControllerTest<ApplicationDto>
@Test
public void testfindApplicationsByNames() throws Exception {
- LOGGER.debug("testfindApplicationsByName");
final ResultActions result = performGet(StringUtils.EMPTY, ImmutableMap.of("term", "ab", "lang", "ENGLISH"));
}
--
GitLab