fix(dsp-app): ontology loading, ontology clases refresh, reloads proj…

apps/dsp-app/src/app/project/ontology-classes/ontology-classes.component.ts

@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 import { ClassDefinition, Constants } from '@dasch-swiss/dsp-js';
 import { SortingService } from '@dasch-swiss/vre/shared/app-helper-services';
 
@@ -8,27 +8,27 @@ import { SortingService } from '@dasch-swiss/vre/shared/app-helper-services';
   templateUrl: './ontology-classes.component.html',
   styleUrls: ['./ontology-classes.component.scss'],
 })
-export class OntologyClassesComponent implements OnInit {
+export class OntologyClassesComponent {
   @Input() resClasses: ClassDefinition[];
 
   @Input() projectMember: boolean;
 
-  classesToDisplay: ClassDefinition[] = [];
-
-  constructor(private _sortingService: SortingService) {}
-
-  ngOnInit(): void {
-    // display only the classes which are not a subClass of Standoff and sort them by label
+  // display only the classes which are not a subClass of Standoff and sort them by label
+  get classesToDisplay(): ClassDefinition[] {
+    const classesToDisplay = [];
     this.resClasses.forEach(resClass => {
       if (resClass.subClassOf.length) {
         const splittedSubClass = resClass.subClassOf[0].split('#');
         if (!splittedSubClass[0].includes(Constants.StandoffOntology) && !splittedSubClass[1].includes('Standoff')) {
-          this.classesToDisplay.push(resClass);
+          classesToDisplay.push(resClass);
         }
       }
     });
-    this.classesToDisplay = this._sortingService.keySortByAlphabetical(this.classesToDisplay, 'label');
+
+    return this._sortingService.keySortByAlphabetical(classesToDisplay, 'label');
   }
 
+  constructor(private _sortingService: SortingService) {}
+
   trackByFn = (index: number, item: ClassDefinition) => `${index}-${item.id}`;
 }

apps/dsp-app/src/app/project/project-base.ts

@@ -93,17 +93,15 @@ export class ProjectBase implements OnInit, OnDestroy {
           if (!this.project || this.project.id !== this.projectIri || !projectMembers) {
             // get current project data, project members and project groups
             // and set the project state here
+            this._actions$
+              .pipe(ofActionSuccessful(LoadProjectsAction))
+              .pipe(take(1))
+              .subscribe(() => this.setProjectData());
             this._store.dispatch([new LoadProjectsAction(), new LoadProjectMembershipAction(this.projectUuid)]);
           } else if (!this.isOntologiesAvailable()) {
             this._store.dispatch(new LoadProjectOntologiesAction(this.projectUuid));
           }
         },
-        complete: () => {
-          this._actions$
-            .pipe(ofActionSuccessful(LoadProjectsAction))
-            .pipe(take(1))
-            .subscribe(() => this.setProjectData());
-        },
       });
   }
 
@@ -126,18 +124,12 @@ export class ProjectBase implements OnInit, OnDestroy {
 
   private isOntologiesAvailable(): boolean {
     const currentProjectOntologies = this._store.selectSnapshot(OntologiesSelectors.currentProjectOntologies);
-    let result = true;
-
-    this.project.ontologies.forEach(ontoIri => {
-      if (
-        !currentProjectOntologies ||
-        currentProjectOntologies.length === 0 ||
-        !currentProjectOntologies.find(o => o.id === ontoIri)
-      ) {
-        result = false;
-      }
-    });
-
-    return result;
+    return (
+      currentProjectOntologies &&
+      currentProjectOntologies.length > 0 &&
+      currentProjectOntologies.some(o =>
+        this.project.ontologies.some(ontoName => o.id.split('/').find(x => x === ontoName.split('/').pop()))
+      )
+    );
   }
 }

libs/vre/shared/app-session/src/lib/auth.service.ts

@@ -6,9 +6,10 @@ import {
   ClearListsAction,
   ClearOntologiesAction,
   ClearProjectsAction,
+  LoadProjectsAction,
   LogUserOutAction,
 } from '@dasch-swiss/vre/shared/app-state';
-import { Store } from '@ngxs/store';
+import { Actions, Store, ofActionSuccessful } from '@ngxs/store';
 import jwt_decode, { JwtPayload } from 'jwt-decode';
 import { Observable, of, throwError } from 'rxjs';
 import { catchError, map, switchMap, take, takeLast, tap } from 'rxjs/operators';
@@ -27,6 +28,7 @@ export class AuthService {
 
   constructor(
     private store: Store,
+    private _actions: Actions,
     private router: Router // private intervalWrapper: IntervalWrapperService
   ) {
     // check if the (possibly) existing session is still valid and if not, destroy it
@@ -176,14 +178,20 @@ export class AuthService {
 
   doLogoutUser() {
     this.removeTokens();
+    this._actions
+      .pipe(ofActionSuccessful(ClearProjectsAction))
+      .pipe(take(1))
+      .subscribe(() => {
+        this.store.dispatch(new LoadProjectsAction());
+        this.router.navigate([RouteConstants.home], { replaceUrl: true });
+      });
     this.store.dispatch([
       new LogUserOutAction(),
       new ClearProjectsAction(),
       new ClearListsAction(),
       new ClearOntologiesAction(),
     ]);
     clearTimeout(this.tokenRefreshIntervalId);
-    this.router.navigate([RouteConstants.home], { replaceUrl: true });
   }
 
   isLoggedIn() {