Commit 9a5bc95b authored by Gaëlle FOURNIER's avatar Gaëlle FOURNIER
Browse files

Multiple Front Fixes

parent 6e2e0bc2
...@@ -38,7 +38,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; ...@@ -38,7 +38,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { EventTypeLabelComponent } from './event-type-label.component'; 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) // Error: Timeout - Async callback was not invoked within 5000ms (set by jasmine.DEFAULT_TIMEOUT_INTERVAL)
xdescribe('EventTypeLabelComponent', () => { xdescribe('EventTypeLabelComponent', () => {
let component: EventTypeLabelComponent; let component: EventTypeLabelComponent;
......
...@@ -37,9 +37,9 @@ ...@@ -37,9 +37,9 @@
import {Injectable} from '@angular/core'; import {Injectable} from '@angular/core';
import {AbstractControl, AsyncValidatorFn} from '@angular/forms'; import {AbstractControl, AsyncValidatorFn} from '@angular/forms';
import {ContextPermission} from 'projects/vitamui-library/src/public-api';
import {of, timer} from 'rxjs'; import {of, timer} from 'rxjs';
import {map, switchMap, take} from 'rxjs/operators'; import {map, switchMap, take} from 'rxjs/operators';
import {ContextPermission} from 'vitamui-library';
import {ContextService} from '../context.service'; import {ContextService} from '../context.service';
@Injectable() @Injectable()
......
...@@ -36,12 +36,11 @@ ...@@ -36,12 +36,11 @@
*/ */
import { Component, EventEmitter, Input, Output } from '@angular/core'; import { Component, EventEmitter, Input, Output } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms'; 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 { Observable, of } from 'rxjs';
import { catchError, filter, map, switchMap } from 'rxjs/operators'; import { catchError, filter, map, switchMap } from 'rxjs/operators';
import { diff } from 'ui-frontend-common'; import { diff } from 'ui-frontend-common';
import { extend, isEmpty } from 'underscore'; import { extend, isEmpty } from 'underscore';
import { ContextPermission } from 'vitamui-library';
import { ContextCreateValidators } from '../../context-create/context-create.validators'; import { ContextCreateValidators } from '../../context-create/context-create.validators';
import { ContextService } from '../../context.service'; import { ContextService } from '../../context.service';
......
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
*/ */
import {Component, Input, OnChanges, OnInit, SimpleChanges} from '@angular/core'; import {Component, Input, OnChanges, OnInit, SimpleChanges} from '@angular/core';
import {ActivatedRoute} from '@angular/router'; import {ActivatedRoute} from '@angular/router';
import {AccessContract} from 'projects/vitamui-library/src/public-api';
import {ApiEvent, Event, LogbookApiService} from 'ui-frontend-common'; import {ApiEvent, Event, LogbookApiService} from 'ui-frontend-common';
import {AccessContract} from 'vitamui-library';
import {AccessContractService} from '../../../access-contract/access-contract.service'; import {AccessContractService} from '../../../access-contract/access-contract.service';
import {SecurisationService} from '../../securisation.service'; import {SecurisationService} from '../../securisation.service';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment