Fix: update version of search and core module (#291)

* fix (packages): add latest knora module (search / core); update README

* test (travis): fix timeout issue

* update README

* test (travis): fix timeout issue

* test (travis): fix timeout issue

* enhancement (knora modules): update package version

* test (travis): fix timeout issue

* test (travis): fix timeout issue

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/dhlab-basel/Salsah.svg?branch=develop)](https://travis-ci.org/dhlab-basel/Salsah)
+[![Build Status](https://travis-ci.org/dhlab-basel/Salsah.svg?branch=master)](https://travis-ci.org/dhlab-basel/Salsah)
 
 
 # Salsah
@@ -24,7 +24,7 @@ If you're a developer and you want to improve the app, please have a look at the
 
 ### Prerequisites
 
-We develop the Salsah app with Angular (v5), especially with Angular-cli, which requires the following tools:
+We develop the Salsah app with Angular (v6), especially with Angular-cli, which requires the following tools:
 
 
 #### Node
@@ -44,11 +44,6 @@ To start the app or to create new components and services, you need [angular-cli
 
 `$ yarn global add @angular/cli`
 
-We develop the Salsah app with Angular (v5), especially with Angular-cli, which requires [Node](https://nodejs.org/en/download/) (version >=4 <=9) and [NPM](https://www.npmjs.com) or [yarn](https://yarnpkg.com/en/docs/cli/install). We recommend to use Yarn instead of npm!
-
-**Install [angular-cli](https://github.com/angular/angular-cli) globally**
-
-`yarn global add @angular/cli`
 
 ### Getting started
 #### Install the app dependencies
@@ -66,7 +61,7 @@ Now you can start the app with
 
 `$ ng serve`
 
-which will start a server with the app in a developer mode on [http://localhost:4200/](http://localhost:4200/). 
+which will run a server and the app in a developer mode on [http://localhost:4200/](http://localhost:4200/). 
 
 By changing the code, the app will automatically compile and reload the page.
 
@@ -80,15 +75,22 @@ Run `ng generate component component-name` to generate a new component. You can
 
 The SALSAH structure contents two main directories: model and view.
 * The **model** directory contains angular services and everything else for API data requests.
+    **&rarr; At the moment, there are only a few services left. We moved all main services (Knora API request services) to the [@knora/core module](https://www.npmjs.com/package/@knora/core).**
+
+* The **view** directory contains all templates (angular components), pipes and directives. Pipes and directives are should be placed in `view/modules/other/`. **&rarr; Here we also moving all generic components, pipes and directives to one of the [Knora-ui modules](https://www.npmjs.com/~knora).**
 
-* The **view** directory contains all templates (angular components), pipes and directives. Pipes and directives are should be placed in `view/modules/other/`. 
+Get more information about the status of the Knora-ui modules in this repo: https://github.com/dhlab-basel/Knora-ui
 
-The command to create a new component, like the e.g. a component to handle image objects, should look as follow:
+---
+
+The command to create new component, e.g. a component to handle image objects, should look as follow:
 
  `ng g component view/object/image-object`
 
 "image-object" is the name for the new component.
 
+Please read the [Angular-cli documentation about the "generate" command](https://github.com/angular/angular-cli/wiki/generate).
+
 
 #### Build
 

docs/README.md

@@ -16,7 +16,7 @@ and to run the site locally, run
 
 `$ bundle exec jekyll serve`
 
-
+<!--
 ## Publish on Github pages
 The documentation is accessible on the [repository's Github page](https://dhlab-basel.github.io/Salsah).
 To update this page, you must be on the develop branch, having committed any changes you made there.
@@ -32,3 +32,4 @@ The script updates the following folders and files:
 * _config.yml
 
 The directory `_docs` contains sub-pages of the documentation. The files in `_posts` are for release notes. By updating the release notes in `_posts` it's important to update the version in _config.yml as well. In `assets` you can store images, scripts and styling files.
+-->

package.json

@@ -30,9 +30,9 @@
         "@firebase/app": "^0.1.10",
         "@firebase/app-types": "^0.1.2",
         "@knora/action": "^0.0.9",
-        "@knora/authentication": "^1.0.0-alpha.3",
-        "@knora/core": "^1.0.0-beta.2",
-        "@knora/search": "^1.0.0-beta",
+        "@knora/authentication": "^1.0.0-alpha.4",
+        "@knora/core": "^1.0.0-beta.3",
+        "@knora/search": "^1.0.0-beta.2",
         "@knora/viewer": "^0.0.1-alpha",
         "@ngx-translate/core": "^10.0.0",
         "@ngx-translate/http-loader": "^2.0.0",

src/app/view/dashboard/system/system-ontologies/system-ontologies.component.spec.ts

@@ -8,6 +8,17 @@ describe('SystemOntologiesComponent', () => {
     let component: SystemOntologiesComponent;
     let fixture: ComponentFixture<SystemOntologiesComponent>;
 
+    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: [

src/app/view/dashboard/system/system-users/system-users.component.spec.ts

@@ -1,13 +1,24 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { AppModule } from '../../../../app.module';
-import { AppRoutingModule } from '../../../../app-routing.module';
-import { SystemUsersComponent } from './system-users.component';
-import { UsersService } from '@knora/core';
+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import {AppModule} from '../../../../app.module';
+import {AppRoutingModule} from '../../../../app-routing.module';
+import {SystemUsersComponent} from './system-users.component';
+import {UsersService} from '@knora/core';
 
 describe('SystemUsersComponent', () => {
     let component: SystemUsersComponent;
     let fixture: ComponentFixture<SystemUsersComponent>;
 
+    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: [

src/app/view/dashboard/user/user-projects/user-projects.component.spec.ts

@@ -16,7 +16,16 @@ describe('UserProjectsComponent', () => {
         'token': '',
         'sysAdmin': false
     };
+    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: [

src/app/view/modules/form/contact-form/contact-form.component.spec.ts

@@ -1,14 +1,24 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ContactFormComponent } from './contact-form.component';
-import { ReactiveFormsModule, FormsModule } from '@angular/forms';
 import { AppRoutingModule } from '../../../../app-routing.module';
 import { AppModule } from '../../../../app.module';
 
 describe('ContactFormComponent', () => {
   let component: ContactFormComponent;
   let fixture: ComponentFixture<ContactFormComponent>;
 
+    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: [

src/app/view/modules/listing/ontologies-list/ontologies-list.component.spec.ts

@@ -7,6 +7,17 @@ describe('OntologiesListComponent', () => {
     let component: OntologiesListComponent;
     let fixture: ComponentFixture<OntologiesListComponent>;
 
+    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: [AppModule]

src/app/view/modules/listing/users-list/users-list-item/users-list-item.component.spec.ts

@@ -1,30 +1,41 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
 
-import { UsersListItemComponent } from './users-list-item.component';
-import { AppModule } from '../../../../../app.module';
-import { AppRoutingModule } from '../../../../../app-routing.module';
+import {UsersListItemComponent} from './users-list-item.component';
+import {AppModule} from '../../../../../app.module';
+import {AppRoutingModule} from '../../../../../app-routing.module';
 
 describe('UsersListItemComponent', () => {
-  let component: UsersListItemComponent;
-  let fixture: ComponentFixture<UsersListItemComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        AppModule,
-        AppRoutingModule
-      ]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(UsersListItemComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+    let component: UsersListItemComponent;
+    let fixture: ComponentFixture<UsersListItemComponent>;
+
+    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: [
+                AppModule,
+                AppRoutingModule
+            ]
+        })
+            .compileComponents();
+    }));
+
+    beforeEach(() => {
+        fixture = TestBed.createComponent(UsersListItemComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
 });

src/app/view/modules/object/resource-object/resource-object.component.spec.ts

@@ -1,12 +1,23 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ResourceObjectComponent } from './resource-object.component';
-import { ResourceService } from '@knora/core';
-import { AppModule } from '../../../../app.module';
+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import {ResourceObjectComponent} from './resource-object.component';
+import {ResourceService} from '@knora/core';
+import {AppModule} from '../../../../app.module';
 
 describe('ResourceObjectComponent', () => {
     let component: ResourceObjectComponent;
     let fixture: ComponentFixture<ResourceObjectComponent>;
 
+    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: [

src/app/view/modules/other/progress-stepper/progress-stepper.component.spec.ts

@@ -7,6 +7,17 @@ describe('ProgressStepperComponent', () => {
     let component: ProgressStepperComponent;
     let fixture: ComponentFixture<ProgressStepperComponent>;
 
+    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: [

yarn.lock

@@ -358,21 +358,21 @@
   dependencies:
     tslib "^1.9.0"
 
-"@knora/authentication@^1.0.0-alpha.3":
-  version "1.0.0-alpha.3"
-  resolved "https://registry.yarnpkg.com/@knora/authentication/-/authentication-1.0.0-alpha.3.tgz#97bf960b0f370ec1881d015c0db529c55f0c092f"
+"@knora/authentication@^1.0.0-alpha.4":
+  version "1.0.0-alpha.4"
+  resolved "https://registry.yarnpkg.com/@knora/authentication/-/authentication-1.0.0-alpha.4.tgz#5c79637d7df2de11876ef532014eb140ec116b7c"
   dependencies:
     tslib "^1.9.0"
 
-"@knora/core@^1.0.0-beta.2":
-  version "1.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/@knora/core/-/core-1.0.0-beta.2.tgz#52213d67380d963821acf8d100972ac8df01bb77"
+"@knora/core@^1.0.0-beta.3":
+  version "1.0.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@knora/core/-/core-1.0.0-beta.3.tgz#524ec33f6a34663ee9015886279a8a9fb85a3ae4"
   dependencies:
     tslib "^1.9.0"
 
-"@knora/search@^1.0.0-beta":
-  version "1.0.0-beta"
-  resolved "https://registry.yarnpkg.com/@knora/search/-/search-1.0.0-beta.tgz#0546cfd6b7683ef4237479b89edbc95daf68f9ba"
+"@knora/search@^1.0.0-beta.2":
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@knora/search/-/search-1.0.0-beta.2.tgz#77476713f862b781220c70eede63c07a46d37623"
   dependencies:
     tslib "^1.9.0"