chore(dependency): update dsp-js to v2.0.0 and dsp-api to v13.2.0 (#276)

* chore(dependency): update dsp-js to v2.0.0 and dsp-ap to v13.2.0 * fix(viewer): update user cache * refactor(viewer): delete unused import * refactor (user service): make AsyncSubject and Observable Co-authored-by: Tobias Schweizer <t.schweizer@unibas.ch>
dasch-swiss · Feb 9, 2021 · d03aef7 · d03aef7
1 parent dd35b07
commit d03aef7
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 41 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "@angular/platform-browser-dynamic": "~9.1.2",
     "@angular/router": "~9.1.2",
     "@ckeditor/ckeditor5-angular": "^1.2.3",
-    "@dasch-swiss/dsp-js": "^1.3.0",
+    "@dasch-swiss/dsp-js": "^2.0.0",
     "ckeditor5-custom-build": "github:dasch-swiss/ckeditor_custom_build",
     "jdnconvertiblecalendar": "^0.0.5",
     "jdnconvertiblecalendardateadapter": "^0.0.13",

diff --git a/projects/dsp-ui/package.json b/projects/dsp-ui/package.json
@@ -21,7 +21,7 @@
     "@angular/core": "^9.0.0",
     "@angular/material": "^9.0.0",
     "@angular/cdk": "^9.0.0",
-    "@dasch-swiss/dsp-js": "^1.3.0",
+    "@dasch-swiss/dsp-js": "^2.0.0",
     "jdnconvertiblecalendar": "^0.0.5",
     "jdnconvertiblecalendardateadapter": "^0.0.13",
     "ngx-color-picker": "^10.0.1",

diff --git a/projects/dsp-ui/src/lib/viewer/operations/display-edit/display-edit.component.spec.ts b/projects/dsp-ui/src/lib/viewer/operations/display-edit/display-edit.component.spec.ts
@@ -36,11 +36,10 @@ import {
     UpdateIntValue,
     UpdateResource,
     UpdateValue,
-    UserResponse,
     ValuesEndpointV2,
     WriteValueResponse
 } from '@dasch-swiss/dsp-js';
-import { AsyncSubject, of, throwError } from 'rxjs';
+import { of, throwError } from 'rxjs';
 import { AjaxError } from 'rxjs/ajax';
 import { DspApiConnectionToken } from '../../../core/core.module';
 import { UserService } from '../../services/user.service';
@@ -418,11 +417,7 @@ describe('DisplayEditComponent', () => {
         () => {
             const user = MockUsers.mockUser();
 
-            const subj: AsyncSubject<UserResponse> = new AsyncSubject();
-            subj.next(user.body);
-            subj.complete();
-
-            return subj;
+            return of(user.body);
         }
     );
 

diff --git a/projects/dsp-ui/src/lib/viewer/services/user.service.spec.ts b/projects/dsp-ui/src/lib/viewer/services/user.service.spec.ts
@@ -1,8 +1,8 @@
 import { async, TestBed } from '@angular/core/testing';
-import { MockUsers, UserResponse } from '@dasch-swiss/dsp-js';
-import { AsyncSubject } from 'rxjs';
+import { MockUsers } from '@dasch-swiss/dsp-js';
 import { DspApiConnectionToken } from '../../core/core.module';
 import { UserService } from './user.service';
+import { of } from 'rxjs';
 
 describe('UserService', () => {
     let service: UserService;
@@ -31,11 +31,7 @@ describe('UserService', () => {
             () => {
                 const user = MockUsers.mockUser();
 
-                const subj: AsyncSubject<UserResponse> = new AsyncSubject();
-                subj.next(user.body);
-                subj.complete();
-
-                return subj;
+                return of(user.body);
             }
         );
 

diff --git a/projects/dsp-ui/src/lib/viewer/services/user.service.ts b/projects/dsp-ui/src/lib/viewer/services/user.service.ts
@@ -1,6 +1,6 @@
 import { Inject, Injectable } from '@angular/core';
 import { KnoraApiConnection, UserCache, UserResponse } from '@dasch-swiss/dsp-js';
-import { AsyncSubject } from 'rxjs';
+import { Observable } from 'rxjs';
 import { DspApiConnectionToken } from '../../core/core.module';
 
 @Injectable({
@@ -21,7 +21,7 @@ export class UserService {
      *
      * @param userIri the Iri identifying the user.
      */
-    getUser(userIri: string): AsyncSubject<UserResponse> {
+    getUser(userIri: string): Observable<UserResponse> {
         return this._userCache.getUser(userIri);
     }
 

diff --git a/...ui/src/lib/viewer/views/property-view/property-toolbar/property-toolbar.component.spec.ts b/...ui/src/lib/viewer/views/property-view/property-toolbar/property-toolbar.component.spec.ts
@@ -13,14 +13,12 @@ import {
     MockResource,
     MockUsers,
     ProjectsEndpointAdmin,
-    ReadResource,
-    UserResponse
+    ReadResource
 } from '@dasch-swiss/dsp-js';
 import { DspApiConnectionToken } from 'projects/dsp-ui/src/lib/core';
-import { AsyncSubject } from 'rxjs';
-import { of } from 'rxjs/internal/observable/of';
 import { UserService } from '../../../services/user.service';
 import { PropertyToolbarComponent } from './property-toolbar.component';
+import { of } from 'rxjs';
 
 /**
  * Test host component to simulate parent component
@@ -121,11 +119,7 @@ describe('PropertyToolbarComponent', () => {
             () => {
                 const user = MockUsers.mockUser();
 
-                const subj: AsyncSubject<UserResponse> = new AsyncSubject();
-                subj.next(user.body);
-                subj.complete();
-
-                return subj;
+                return of(user.body);
             }
         );
 

diff --git a/src/app/viewer-playground/viewer-playground.component.spec.ts b/src/app/viewer-playground/viewer-playground.component.spec.ts
@@ -7,14 +7,12 @@ import {
     MockUsers,
     ProjectsEndpointAdmin,
     ReadResource,
-    ResourcesEndpointV2,
-    UserResponse,
+    ResourcesEndpointV2
 } from '@dasch-swiss/dsp-js';
 import { DspApiConnectionToken, DspViewerModule, UserService } from '@dasch-swiss/dsp-ui';
-import { of } from 'rxjs/internal/observable/of';
-import { map } from 'rxjs/internal/operators/map';
 import { ViewerPlaygroundComponent } from './viewer-playground.component';
-import { AsyncSubject } from 'rxjs';
+import { of } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 describe('ViewerPlaygroundComponent', () => {
     let component: ViewerPlaygroundComponent;
@@ -89,11 +87,7 @@ describe('ViewerPlaygroundComponent', () => {
             () => {
                 const user = MockUsers.mockUser();
 
-                const subj: AsyncSubject<UserResponse> = new AsyncSubject();
-                subj.next(user.body);
-                subj.complete();
-
-                return subj;
+                return of(user.body);
             }
         );
 

diff --git a/vars.mk b/vars.mk
@@ -1 +1 @@
-API_VERSION := v13.1.1
+API_VERSION := v13.2.0