From 9a5bc95bafb0ebc82e3ea24af4e8c3505d62faf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABlle=20FOURNIER?= <gaelle.fournier.work@gmail.com> Date: Wed, 26 Aug 2020 09:22:55 +0200 Subject: [PATCH] Multiple Front Fixes --- .../event-type-label/event-type-label.component.spec.ts | 2 +- .../app/context/context-create/context-create.validators.ts | 2 +- .../context-permission-tab/context-permission-tab.component.ts | 3 +-- .../securisation-check-tab/securisation-check-tab.component.ts | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ui/ui-frontend-common/src/app/modules/logbook/event-type-label/event-type-label.component.spec.ts b/ui/ui-frontend-common/src/app/modules/logbook/event-type-label/event-type-label.component.spec.ts index 89ba2b97..2f4df4c2 100644 --- a/ui/ui-frontend-common/src/app/modules/logbook/event-type-label/event-type-label.component.spec.ts +++ b/ui/ui-frontend-common/src/app/modules/logbook/event-type-label/event-type-label.component.spec.ts @@ -38,7 +38,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { EventTypeLabelComponent } from './event-type-label.component'; -// TODO test jenkins +// TODO test jenkins // Error: Timeout - Async callback was not invoked within 5000ms (set by jasmine.DEFAULT_TIMEOUT_INTERVAL) xdescribe('EventTypeLabelComponent', () => { let component: EventTypeLabelComponent; diff --git a/ui/ui-frontend/projects/referential/src/app/context/context-create/context-create.validators.ts b/ui/ui-frontend/projects/referential/src/app/context/context-create/context-create.validators.ts index acbefb3f..1b677271 100644 --- a/ui/ui-frontend/projects/referential/src/app/context/context-create/context-create.validators.ts +++ b/ui/ui-frontend/projects/referential/src/app/context/context-create/context-create.validators.ts @@ -37,9 +37,9 @@ import {Injectable} from '@angular/core'; import {AbstractControl, AsyncValidatorFn} from '@angular/forms'; +import {ContextPermission} from 'projects/vitamui-library/src/public-api'; import {of, timer} from 'rxjs'; import {map, switchMap, take} from 'rxjs/operators'; -import {ContextPermission} from 'vitamui-library'; import {ContextService} from '../context.service'; @Injectable() diff --git a/ui/ui-frontend/projects/referential/src/app/context/context-preview/context-permission-tab/context-permission-tab.component.ts b/ui/ui-frontend/projects/referential/src/app/context/context-preview/context-permission-tab/context-permission-tab.component.ts index 7a564730..a08fd88d 100644 --- a/ui/ui-frontend/projects/referential/src/app/context/context-preview/context-permission-tab/context-permission-tab.component.ts +++ b/ui/ui-frontend/projects/referential/src/app/context/context-preview/context-permission-tab/context-permission-tab.component.ts @@ -36,12 +36,11 @@ */ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { Context } from 'projects/vitamui-library/src/public-api'; +import { Context, ContextPermission } from 'projects/vitamui-library/src/public-api'; import { Observable, of } from 'rxjs'; import { catchError, filter, map, switchMap } from 'rxjs/operators'; import { diff } from 'ui-frontend-common'; import { extend, isEmpty } from 'underscore'; -import { ContextPermission } from 'vitamui-library'; import { ContextCreateValidators } from '../../context-create/context-create.validators'; import { ContextService } from '../../context.service'; diff --git a/ui/ui-frontend/projects/referential/src/app/securisation/securisation-preview/securisation-check-tab/securisation-check-tab.component.ts b/ui/ui-frontend/projects/referential/src/app/securisation/securisation-preview/securisation-check-tab/securisation-check-tab.component.ts index 2d679f59..637adc3a 100644 --- a/ui/ui-frontend/projects/referential/src/app/securisation/securisation-preview/securisation-check-tab/securisation-check-tab.component.ts +++ b/ui/ui-frontend/projects/referential/src/app/securisation/securisation-preview/securisation-check-tab/securisation-check-tab.component.ts @@ -36,8 +36,8 @@ */ import {Component, Input, OnChanges, OnInit, SimpleChanges} from '@angular/core'; import {ActivatedRoute} from '@angular/router'; +import {AccessContract} from 'projects/vitamui-library/src/public-api'; import {ApiEvent, Event, LogbookApiService} from 'ui-frontend-common'; -import {AccessContract} from 'vitamui-library'; import {AccessContractService} from '../../../access-contract/access-contract.service'; import {SecurisationService} from '../../securisation.service'; -- GitLab