Clean up AutocompleteItem interface (#296)

* build: upgrade @knora/core * enhancement (user form): remove interface AutocompleteItem and update paths * build: upgrade @knora/core and @knora/action * test: fix timeout issue * build: update version @knora modules * fix: update list type to ListNodeInfo
dhlab-basel · Oct 26, 2018 · 63e3895 · 63e3895
1 parent 2d87aeb
commit 63e3895
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/src/app/app.interfaces.ts b/src/app/app.interfaces.ts
diff --git a/src/app/view/dashboard/system/system-projects/system-projects.component.spec.ts b/src/app/view/dashboard/system/system-projects/system-projects.component.spec.ts
@@ -8,7 +8,6 @@ describe('SystemProjectsComponent', () => {
     let component: SystemProjectsComponent;
     let fixture: ComponentFixture<SystemProjectsComponent>;
 
-
     let originalTimeout;
 
     beforeEach(function () {

diff --git a/src/app/view/modules/form/edit-resource-class/edit-resource-class.component.spec.ts b/src/app/view/modules/form/edit-resource-class/edit-resource-class.component.spec.ts
@@ -9,6 +9,17 @@ describe('EditResourceClassComponent', () => {
     let component: EditResourceClassComponent;
     let fixture: ComponentFixture<EditResourceClassComponent>;
 
+    let originalTimeout;
+
+    beforeEach(function () {
+        originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
+        jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
+    });
+
+    afterEach(function () {
+        jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
+    });
+
     beforeEach(async(() => {
         TestBed.configureTestingModule({
             imports: [

diff --git a/src/app/view/modules/form/user-form/user-form.component.ts b/src/app/view/modules/form/user-form/user-form.component.ts
@@ -16,8 +16,7 @@ import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'
 import { Observable } from 'rxjs';
 import { startWith, map } from 'rxjs/operators';
 
-import { ApiServiceError, KnoraConstants, Project, User, UsersService, Utils } from '@knora/core';
-import { AutocompleteItem } from '../../../../app.interfaces';
+import { ApiServiceError, AutocompleteItem, KnoraConstants, Project, User, UsersService, Utils } from '@knora/core';
 
 @Component({
     selector: 'salsah-user-form',

diff --git a/src/app/view/modules/form/user-form/user-role/user-role.component.ts b/src/app/view/modules/form/user-form/user-role/user-role.component.ts
@@ -12,9 +12,8 @@
  * */
 
 import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core';
-import { AutocompleteItem } from '../../../../../app.interfaces';
 import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
-import { ApiServiceError, Group, GroupsService, KnoraConstants, Project, ProjectsService, User } from '@knora/core';
+import { ApiServiceError, AutocompleteItem, Group, GroupsService, KnoraConstants, Project, ProjectsService, User } from '@knora/core';
 
 @Component({
     selector: 'salsah-user-role',