+
-
Classes
-
diff --git a/apps/dsp-app/src/app/project/ontology/ontology.component.ts b/apps/dsp-app/src/app/project/ontology/ontology.component.ts
index 04f7ebb0e9..dc3d122bc6 100644
--- a/apps/dsp-app/src/app/project/ontology/ontology.component.ts
+++ b/apps/dsp-app/src/app/project/ontology/ontology.component.ts
@@ -1,7 +1,10 @@
import {
+ ChangeDetectionStrategy,
+ ChangeDetectorRef,
Component,
HostListener,
Inject,
+ OnDestroy,
OnInit,
ViewChild,
ViewContainerRef,
@@ -15,102 +18,42 @@ import { MatDialog, MatDialogConfig } from '@angular/material/dialog';
import { Title } from '@angular/platform-browser';
import { ActivatedRoute, Params, Router } from '@angular/router';
import {
- ApiResponseData,
ApiResponseError,
- CanDoResponse,
ClassDefinition,
Constants,
DeleteResourceClass,
DeleteResourceProperty,
KnoraApiConnection,
- ListsResponse,
- OntologiesMetadata,
- ProjectResponse,
PropertyDefinition,
ReadOntology,
- ReadProject,
+ ReadUser,
UpdateOntology,
- UserResponse,
} from '@dasch-swiss/dsp-js';
-import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
-import {DspApiConnectionToken, RouteConstants} from '@dasch-swiss/vre/shared/app-config';
-import { DialogComponent } from '@dsp-app/src/app/main/dialog/dialog.component';
+import { DspApiConnectionToken, RouteConstants, getAllEntityDefinitionsAsArray } from '@dasch-swiss/vre/shared/app-config';
+import { DialogComponent, DialogEvent } from '@dsp-app/src/app/main/dialog/dialog.component';
import { AppErrorHandler } from '@dasch-swiss/vre/shared/app-error-handler';
-import {
- Session,
- SessionService,
-} from '@dasch-swiss/vre/shared/app-session';
-import { SortingService } from '@dsp-app/src/app/main/services/sorting.service';
-import { ProjectService } from '@dsp-app/src/app/workspace/resource/services/project.service';
+import { DefaultClass, DefaultResourceClasses, SortingService } from '@dasch-swiss/vre/shared/app-helper-services';
+import { ProjectService } from '@dasch-swiss/vre/shared/app-helper-services';
import {
DefaultProperties,
PropertyCategory,
PropertyInfoObject,
-} from './default-data/default-properties';
-import {
- DefaultClass,
- DefaultResourceClasses,
-} from './default-data/default-resource-classes';
-import { OntologyService } from './ontology.service';
-
-/**
- * contains the information about the assignment of a property to a class
- **/
-export interface PropertyAssignment {
- resClass: ClassDefinition;
- property: PropertyInfoObject;
-}
-
-export interface OntologyProperties {
- ontology: string;
- properties: PropertyDefinition[];
-}
+} from '@dasch-swiss/vre/shared/app-helper-services';
+import { OntologyService } from '@dasch-swiss/vre/shared/app-helper-services';
+import { Actions, Select, Store, ofActionSuccessful } from '@ngxs/store';
+import { ClearCurrentOntologyAction, ClearProjectOntologiesAction, CurrentOntologyCanBeDeletedAction, CurrentProjectSelectors, LoadListsInProjectAction, LoadOntologyAction, LoadProjectOntologiesAction, OntologiesSelectors, OntologyProperties, ProjectsSelectors, SetCurrentOntologyAction, SetCurrentProjectOntologyPropertiesAction, UserSelectors } from '@dasch-swiss/vre/shared/app-state';
+import { Observable, Subject, combineLatest } from 'rxjs';
+import { map, take, takeUntil } from 'rxjs/operators';
+import { ProjectBase } from '../project-base';
@Component({
+ changeDetection: ChangeDetectionStrategy.OnPush,
selector: 'app-ontology',
templateUrl: './ontology.component.html',
styleUrls: ['./ontology.component.scss'],
})
-export class OntologyComponent implements OnInit {
- @ViewChild('ontologyEditor', { read: ViewContainerRef })
- ontologyEditor: ViewContainerRef;
-
- // general loading status for progess indicator
- loading: boolean;
-
- // loading status during open-ontology-process
- loadOntology: boolean;
-
- // permissions of logged-in user
- session: Session;
- // system admin, project admin, and project member are by default false
- sysAdmin = false;
- projectAdmin = false;
- projectMember = false;
-
- // project uuid; used as identifier in application state service
- projectUuid: string;
-
- // project data
- project: ReadProject;
-
- // all project ontologies
- ontologies: ReadOntology[] = [];
-
- // existing project ontology names
- existingOntologyNames: string[] = [];
-
- // id of current ontology
- ontologyIri: string = undefined;
-
- // current ontology
- ontology: ReadOntology;
-
- // the lastModificationDate is the most important key
- // when updating something inside the ontology
- lastModificationDate: string;
-
- ontologyCanBeDeleted: boolean;
+export class OntologyComponent extends ProjectBase implements OnInit, OnDestroy {
+ private ngUnsubscribe: Subject
= new Subject();
// all resource classes in the current ontology
ontoClasses: ClassDefinition[];
@@ -148,34 +91,76 @@ export class OntologyComponent implements OnInit {
// route to classes view
classesLink = `../${RouteConstants.classes}`;
propertiesLink = `../${RouteConstants.properties}`;
+
+ @ViewChild('ontologyEditor', { read: ViewContainerRef })
+ ontologyEditor: ViewContainerRef;
+
+ updatePropertyAssignment$: Subject = new Subject();
+
+ // id of current ontology
+ get ontologyIri(): string {
+ const iriBase = this._ontologyService.getIriBaseUrl();
+ const ontologyName = this._route.snapshot.paramMap.get(RouteConstants.ontoParameter);
+ return `${iriBase}/${RouteConstants.ontology}/${this.project.shortcode}/${ontologyName}/v2`;
+ }
+
+ // the lastModificationDate is the most important key
+ // when updating something inside the ontology
+ get lastModificationDate$(): Observable {
+ return this.currentOntology$.pipe(
+ takeUntil(this.ngUnsubscribe),
+ map(x => x?.lastModificationDate)
+ )
+ }
+
+ get isLoading$(): Observable {
+ return combineLatest([this.isOntologiesLoading$, this.isProjectsLoading$])
+ .pipe(
+ takeUntil(this.ngUnsubscribe),
+ map(([isOntologiesLoading, isProjectsLoading]) => {
+ return isOntologiesLoading === true || isProjectsLoading === true;
+ })
+ )
+ }
+
+ @Select(UserSelectors.user) user$: Observable;
+ @Select(UserSelectors.userProjectAdminGroups) userProjectAdminGroups$: Observable;
+ @Select(UserSelectors.isSysAdmin) isSysAdmin$: Observable;
+ @Select(ProjectsSelectors.isProjectsLoading) isProjectsLoading$: Observable;
+ @Select(OntologiesSelectors.isLoading) isOntologiesLoading$: Observable;
+ @Select(OntologiesSelectors.currentProjectOntologies) currentProjectOntologies$: Observable;
+ @Select(OntologiesSelectors.currentOntology) currentOntology$: Observable;
+ @Select(OntologiesSelectors.currentOntologyCanBeDeleted) currentOntologyCanBeDeleted$: Observable;
constructor(
@Inject(DspApiConnectionToken)
private _dspApiConnection: KnoraApiConnection,
- private _applicationStateService: ApplicationStateService,
private _dialog: MatDialog,
private _errorHandler: AppErrorHandler,
private _fb: UntypedFormBuilder,
private _ontologyService: OntologyService,
- private _route: ActivatedRoute,
- private _router: Router,
- private _sessionService: SessionService,
private _sortingService: SortingService,
- private _titleService: Title,
- private _projectService: ProjectService
- ) {}
+ protected _actions$: Actions,
+ protected _router: Router,
+ protected _route: ActivatedRoute,
+ protected _store: Store,
+ protected _titleService: Title,
+ protected _projectService: ProjectService,
+ protected _cd: ChangeDetectorRef,
+ ) {
+ super(_store, _route, _projectService, _titleService, _router, _cd, _actions$);
+ }
@HostListener('window:resize', ['$event']) onWindowResize() {
this.disableContent = window.innerWidth <= 768;
// reset the page title
if (!this.disableContent) {
- this._setPageTitle();
+ this.setTitle();
}
}
ngOnInit() {
- this.loading = true;
-
+ super.ngOnInit();
// get the uuid of the current project
this._route.parent.paramMap.subscribe((params: Params) => {
this.projectUuid = params.get('uuid');
@@ -185,65 +170,50 @@ export class OntologyComponent implements OnInit {
// get the selected view from route: display classes or properties view
this.view = this._route.snapshot.params.view
? this._route.snapshot.params.view
- : 'classes';
+ : RouteConstants.classes;
}
+
+ const currentProject = this._store.selectSnapshot(CurrentProjectSelectors.project);
+ if (this.projectUuid
+ && (currentProject && currentProject.id === this.projectIri)) {
+ const projectOntologies = this._store.selectSnapshot(OntologiesSelectors.projectOntologies);
+ if (currentProject.ontologies.length > 0
+ && (!projectOntologies[this.projectIri] || projectOntologies[this.projectIri].readOntologies.length === 0)) {
+ this._store.dispatch(new LoadProjectOntologiesAction(currentProject.id));
+ this._actions$.pipe(ofActionSuccessful(LoadListsInProjectAction))
+ .subscribe(() => {
+ this.initOntology();
+ });
+ } else {
+ this.initOntology();
+ }
+ }
- const uuid = this._route.parent.snapshot.params.uuid;
- this._route.params.subscribe((params) => {
- this.loading = true;
- this._dspApiConnection.admin.projectsEndpoint
- .getProjectByIri(this._projectService.uuidToIri(uuid))
- .subscribe((res: ApiResponseData) => {
- this.project = res.body.project;
- const shortcode = res.body.project.shortcode;
- const iriBase = this._ontologyService.getIriBaseUrl();
- const ontologyName = params['onto'];
- this.ontologyIri = `${iriBase}/ontology/${shortcode}/${ontologyName}/v2`;
-
- this.initView();
- });
+ //TODO temporary solution to replace eventemitter with subject because emitter loses subscriber after child component
+ //subscription responsible for emitting event is triggered
+ this.updatePropertyAssignment$.pipe(takeUntil(this.ngUnsubscribe)).subscribe(() => {
+ this.onUpdatePropertyAssignment();
});
- }
-
- initView(): void {
- this.disableContent = window.innerWidth <= 768;
- // get information about the logged-in user
- this.session = this._sessionService.getSession();
+ this._cd.markForCheck();
+ }
- // is the logged-in user system admin?
- this.sysAdmin = this.session ? this.session.user.sysAdmin : false;
+ ngOnDestroy() {
+ this.ngUnsubscribe.next();
+ this.ngUnsubscribe.complete();
+ this._store.dispatch(new ClearCurrentOntologyAction());
+ }
- // default value for projectAdmin
- this.projectAdmin = this.sysAdmin;
+ initView(ontology: ReadOntology): void {
+ this.disableContent = window.innerWidth <= 768;
// set the page title
- this._setPageTitle();
-
- if (this.session) {
- // is logged-in user projectAdmin?
- this.projectAdmin = this.sysAdmin
- ? this.sysAdmin
- : this.session.user.projectAdmin.some(
- (e) => e === this.project.id
- );
-
- // or at least a project member?
- this._dspApiConnection.admin.usersEndpoint
- .getUserByUsername(this.session.user.name)
- .subscribe((userResponse: ApiResponseData) => {
- this.projectMember = userResponse.body.user.projects.some(
- (p) => p.shortcode === this.project.shortcode
- );
-
- // get the ontologies for this project
- this.initOntologiesList();
- });
- }
+ this.setTitle();
+ //this.initOntologiesList();
this.ontologyForm = this._fb.group({
ontology: new UntypedFormControl({
- value: this.ontologyIri,
+ value: ontology.id,
disabled: false,
}),
});
@@ -258,84 +228,46 @@ export class OntologyComponent implements OnInit {
* and set the state of currentProjectOntologies
*/
initOntologiesList(): void {
- this.loading = true;
-
- // reset existing ontology names and ontologies
- this.existingOntologyNames = [];
- this.ontologies = [];
-
- this._dspApiConnection.v2.onto
- .getOntologiesByProjectIri(this.project.id)
- .subscribe(
- (response: OntologiesMetadata) => {
- if (!response.ontologies.length) {
- this.setCache();
- } else {
- response.ontologies.forEach((ontoMeta) => {
- // set list of already existing ontology names
- // it will be used in ontology form
- // because ontology name has to be unique
- const name = this._ontologyService.getOntologyName(
- ontoMeta.id
- );
- this.existingOntologyNames.push(name);
-
- // get each ontology
- this._dspApiConnection.v2.onto
- .getOntology(ontoMeta.id, true)
- .subscribe(
- (readOnto: ReadOntology) => {
- this.ontologies.push(readOnto);
-
- if (ontoMeta.id === this.ontologyIri) {
- // one ontology is selected:
- // get all information to display this ontology
- // with all classes, properties and connected lists
- this.loadOntology = true;
- this.resetOntologyView(readOnto);
- }
- if (
- response.ontologies.length ===
- this.ontologies.length
- ) {
- this.ontologies =
- this._sortingService.keySortByAlphabetical(
- this.ontologies,
- 'label'
- );
-
- this._applicationStateService.set(
- 'currentProjectOntologies',
- this.ontologies
- );
- this.setCache();
- }
- },
- (error: ApiResponseError) => {
- this._errorHandler.showMessage(error);
- }
- );
- });
- }
- },
- (error: ApiResponseError) => {
- this.ontologies = [];
- this._errorHandler.showMessage(error);
- this.loading = false;
+ this._store.dispatch(new LoadProjectOntologiesAction(this.projectUuid));
+ combineLatest([this._actions$.pipe(ofActionSuccessful(LoadListsInProjectAction)), this.currentProjectOntologies$])
+ .pipe(
+ take(1),
+ map(([loadListsInProjectAction, currentProjectOntologies]) =>
+ currentProjectOntologies.find((x) => x.id === this.ontologyIri)
+ ))
+ .subscribe((readOnto) => {
+ if (readOnto) {
+ // one ontology is selected:
+ // get all information to display this ontology
+ // with all classes, properties and connected lists
+ this.resetOntologyView(readOnto);
}
- );
+ });
}
- initOntology(iri: string) {
- this._dspApiConnection.v2.onto.getOntology(iri, true).subscribe(
- (response: ReadOntology) => {
- this.resetOntologyView(response);
- this._dspApiConnection.v2.ontologyCache.reloadCachedItem(response.id);
- },
- (error: ApiResponseError) => {
- this._errorHandler.showMessage(error);
- }
- );
+ initOntology() {
+ let currentOntology = this._store.selectSnapshot(OntologiesSelectors.currentOntology);
+ if (!currentOntology) {
+ const projectOntologies = this._store.selectSnapshot(OntologiesSelectors.projectOntologies);
+ const projectIri = this._projectService.uuidToIri(this.projectUuid);
+ currentOntology = projectOntologies[projectIri]?.readOntologies.find(o => o.id === this.ontologyIri);
+ if (currentOntology) {
+ this.resetOntologyView(currentOntology);
+ } else {
+ const isLoading = this._store.selectSnapshot(OntologiesSelectors.isLoading);
+ if (isLoading === false) {
+ this._store.dispatch(new LoadOntologyAction(this.ontologyIri, this.projectUuid, true));
+ this._actions$.pipe(ofActionSuccessful(LoadOntologyAction))
+ .pipe(take(1))
+ .subscribe(() => {
+ this.initOntology();
+ this._cd.markForCheck();
+ });
+ }
+ }
+ } else {
+ this.resetOntologyView(currentOntology);
+ }
}
initOntoClasses(allOntoClasses: ClassDefinition[]) {
@@ -356,13 +288,10 @@ export class OntologyComponent implements OnInit {
});
// sort classes by label
// --> TODO: add sort functionallity to the gui
- this.ontoClasses = this._sortingService.keySortByAlphabetical(
- this.ontoClasses,
- 'label'
- );
+ this.ontoClasses = this._sortingService.keySortByAlphabetical(this.ontoClasses, 'label');
}
- initOntoProperties(allOntoProperties: PropertyDefinition[]) {
+ initOntoProperties(ontology: ReadOntology, allOntoProperties: PropertyDefinition[]) {
// reset the ontology properties
const listOfProperties = [];
@@ -378,7 +307,7 @@ export class OntologyComponent implements OnInit {
// sort properties by label
this.ontoProperties = {
- ontology: this.ontology.id,
+ ontology: ontology.id,
properties: this._sortingService.keySortByAlphabetical(
listOfProperties,
'label'
@@ -386,6 +315,16 @@ export class OntologyComponent implements OnInit {
};
}
+ trackByPropertyCategoryFn = (index: number, item: PropertyCategory) => `${index}-${item.group}`;
+
+ trackByClassDefinitionFn = (index: number, item: ClassDefinition) => `${index}-${item.id}`;
+
+ trackByPropertyDefinitionFn = (index: number, item: PropertyDefinition) => `${index}-${item.id}`;
+
+ trackByDefaultClassFn = (index: number, item: DefaultClass) => `${index}-${item.iri}`;
+
+ trackByElementFn = (index: number) => `${index}`;
+
/**
* update view after selecting an ontology from dropdown
* @param id
@@ -398,6 +337,12 @@ export class OntologyComponent implements OnInit {
this.resetOntology(id);
}
+ onLastModificationDateChange(lastModificationDate): void {
+ const ontology = this._store.selectSnapshot(OntologiesSelectors.currentOntology);
+ //TODO reload or just update lastModificationDate in the state?
+ this._store.dispatch(new LoadOntologyAction(ontology.id, this.projectUuid, true));
+ }
+
/**
* opens ontology route by iri
* @param id ontology id/iri
@@ -423,47 +368,25 @@ export class OntologyComponent implements OnInit {
* @param id
*/
resetOntology(id: string) {
- this.ontology = undefined;
+ this._store.dispatch([new SetCurrentOntologyAction(null), new CurrentOntologyCanBeDeletedAction()]);
this.ontoClasses = [];
this.openOntologyRoute(id, this.view);
this.initOntologiesList();
}
resetOntologyView(ontology: ReadOntology) {
- this.ontology = ontology;
- this.lastModificationDate = this.ontology.lastModificationDate;
- this._applicationStateService.set('currentOntology', ontology);
-
- this._applicationStateService.get('currentProjectOntologies').subscribe(
- (ontologies: ReadOntology[]) => {
- // update current list of project ontologies
- ontologies[
- ontologies.findIndex((onto) => onto.id === ontology.id)
- ] = ontology;
- this._applicationStateService.set('currentProjectOntologies', ontologies);
- },
- () => {} // don't log error to rollbar if 'currentProjectOntologies' does not exist in the application state
- );
-
+ this.initView(ontology);
+ this._dspApiConnection.v2.ontologyCache.reloadCachedItem(ontology.id);
// grab the onto class information to display
- this.initOntoClasses(ontology.getAllClassDefinitions());
-
+ this.initOntoClasses(getAllEntityDefinitionsAsArray(ontology.classes));
// grab the onto properties information to display
- this.initOntoProperties(ontology.getAllPropertyDefinitions());
-
- // check if the ontology can be deleted
- this._dspApiConnection.v2.onto
- .canDeleteOntology(this.ontology.id)
- .subscribe(
- (response: CanDoResponse) => {
- this.ontologyCanBeDeleted = response.canDo;
- },
- (error: ApiResponseError) => {
- this._errorHandler.showMessage(error);
- }
- );
+ this.initOntoProperties(ontology, getAllEntityDefinitionsAsArray(ontology.properties));
- this.loadOntology = false;
+ this._store.dispatch([
+ new SetCurrentOntologyAction(ontology),
+ new SetCurrentProjectOntologyPropertiesAction(this.projectIri),
+ new CurrentOntologyCanBeDeletedAction()
+ ]);
}
/**
@@ -483,9 +406,11 @@ export class OntologyComponent implements OnInit {
mode: 'createOntology' | 'editOntology',
iri?: string
): void {
- const title = iri ? this.ontology.label : 'Data model';
+ const ontology = this._store.selectSnapshot(OntologiesSelectors.currentOntology);
+ const title = iri ? ontology.label : 'Data model';
- const uuid = this._projectService.iriToUuid(this.project.id);
+ const uuid = this._projectService.iriToUuid(this.projectUuid);
+ const existingOntologyNames = this._store.selectSnapshot(OntologiesSelectors.currentProjectExistingOntologyNames);
const dialogConfig: MatDialogConfig = {
width: '640px',
@@ -498,23 +423,14 @@ export class OntologyComponent implements OnInit {
title: title,
id: iri,
project: uuid,
- existing: this.existingOntologyNames,
+ existing: existingOntologyNames,
},
};
const dialogRef = this._dialog.open(DialogComponent, dialogConfig);
dialogRef.afterClosed().subscribe((ontologyId: string) => {
- // in case of new ontology, go to correct route and update the view
- if (ontologyId) {
- this.ontologyIri = ontologyId;
- // reset and open selected ontology
- this.ontologyForm.controls['ontology'].setValue(
- this.ontologyIri
- );
- } else {
- this.initOntologiesList();
- }
+ this.initOntologiesList();
});
}
@@ -543,11 +459,10 @@ export class OntologyComponent implements OnInit {
const dialogRef = this._dialog.open(DialogComponent, dialogConfig);
- dialogRef.afterClosed().subscribe(() => {
- // update the view
- this.initOntologiesList();
- // refresh whole page; todo: would be better to use an event emitter to the parent to update the list of resource classes
- window.location.reload();
+ dialogRef.afterClosed().subscribe((event) => {
+ if (event !== DialogEvent.DialogCanceled) {
+ this.initOntologiesList();
+ }
});
}
@@ -584,9 +499,13 @@ export class OntologyComponent implements OnInit {
// get the ontologies for this project
this.initOntologiesList();
// update the view of resource class or list of properties
- this.initOntology(this.ontologyIri);
+ this.initOntology();
});
}
+
+ onUpdatePropertyAssignment() {
+ this.initOntologiesList();
+ }
/**
* delete either ontology, resource class or property
@@ -611,87 +530,73 @@ export class OntologyComponent implements OnInit {
dialogRef.afterClosed().subscribe((answer) => {
if (answer === true) {
+ const ontology = this._store.selectSnapshot(OntologiesSelectors.currentOntology);
// delete and refresh the view
switch (mode) {
case 'Ontology':
- this.loading = true;
- this.loadOntology = true;
- const ontology = new UpdateOntology();
- ontology.id = this.ontology.id;
- ontology.lastModificationDate =
- this.ontology.lastModificationDate;
+ const updateOntology = new UpdateOntology();
+ updateOntology.id = ontology.id;
+ updateOntology.lastModificationDate = ontology.lastModificationDate;
this._dspApiConnection.v2.onto
- .deleteOntology(ontology)
+ .deleteOntology(updateOntology)
+ .pipe(take(1))
.subscribe(
() => {
+ this._store.dispatch(new ClearProjectOntologiesAction(this.projectUuid));
// reset current ontology
- this.ontology = undefined;
+ // this._store.dispatch([
+ // new SetCurrentOntologyAction(null),
+ // new RemoveProjectOntologyAction(updateOntology.id, this.projectUuid)
+ // ]);
// get the ontologies for this project
this.initOntologiesList();
// go to project ontology page
const goto = `/project/${this.projectUuid}`;
- this._router
- .navigateByUrl(goto, {
- skipLocationChange: false,
- })
- .then(() => {
- // refresh whole page; todo: would be better to use an event emitter to the parent to update the list of resource classes
- window.location.reload();
- });
+ this._router.navigateByUrl(goto, { skipLocationChange: false });
},
(error: ApiResponseError) => {
this._errorHandler.showMessage(error);
- this.loading = false;
- this.loadOntology = false;
}
);
break;
case 'ResourceClass':
// delete resource class and refresh the view
- this.loadOntology = true;
- const resClass: DeleteResourceClass =
- new DeleteResourceClass();
+ const resClass: DeleteResourceClass = new DeleteResourceClass();
resClass.id = info.iri;
- resClass.lastModificationDate =
- this.ontology.lastModificationDate;
+ resClass.lastModificationDate = ontology.lastModificationDate;
this._dspApiConnection.v2.onto
.deleteResourceClass(resClass)
+ .pipe(take(1))
.subscribe(
() => {
- this.loading = false;
- // refresh whole page; todo: would be better to use an event emitter to the parent to update the list of resource classes
- window.location.reload();
+ this.ontoClasses = [];
+ this.initOntologiesList();
},
(error: ApiResponseError) => {
this._errorHandler.showMessage(error);
- this.loading = false;
- this.loadOntology = false;
}
);
break;
case 'Property':
// delete resource property and refresh the view
- this.loadOntology = true;
const resProp: DeleteResourceProperty =
new DeleteResourceProperty();
resProp.id = info.iri;
- resProp.lastModificationDate =
- this.ontology.lastModificationDate;
+ resProp.lastModificationDate = ontology.lastModificationDate;
this._dspApiConnection.v2.onto
.deleteResourceProperty(resProp)
+ .pipe(take(1))
.subscribe(
() => {
- this.loading = false;
+ this._store.dispatch(new ClearCurrentOntologyAction());
// get the ontologies for this project
this.initOntologiesList();
// update the view of resource class or list of properties
- this.initOntology(this.ontologyIri);
+ this.initOntology();
},
(error: ApiResponseError) => {
this._errorHandler.showMessage(error);
- this.loading = false;
- this.loadOntology = false;
}
);
break;
@@ -700,34 +605,12 @@ export class OntologyComponent implements OnInit {
});
}
- setCache() {
- // get all lists from the project
- // it will be used to set gui attribute in a list property
- this._dspApiConnection.admin.listsEndpoint
- .getListsInProject(this.project.id)
- .subscribe(
- (response: ApiResponseData) => {
- this._applicationStateService.set(
- 'currentOntologyLists',
- response.body.lists
- );
- this.loadOntology = false;
- this.loading = false;
- },
- (error: ApiResponseError) => {
- this._errorHandler.showMessage(error);
- this.loading = false;
- this.loadOntology = false;
- }
- );
- }
-
- private _setPageTitle() {
- this._titleService.setTitle(
- 'Project ' +
- this.project.shortname +
- ' | Data model' +
- (this.ontologyIri ? '' : 's')
- );
+ private setTitle() {
+ combineLatest([ProjectBase.navigationEndFilter(this._router.events), this.project$, this.currentOntology$])
+ .pipe(takeUntil(this.ngUnsubscribe))
+ .subscribe(([event, project, currentOntology]) => {
+ this._titleService.setTitle(`Project ${project.shortname} | Data model ${currentOntology.id ? '' : 's'}`);
+ });
}
+
}
diff --git a/apps/dsp-app/src/app/project/ontology/property-form/property-form.component.html b/apps/dsp-app/src/app/project/ontology/property-form/property-form.component.html
index 5646f9eaf5..398beec495 100644
--- a/apps/dsp-app/src/app/project/ontology/property-form/property-form.component.html
+++ b/apps/dsp-app/src/app/project/ontology/property-form/property-form.component.html
@@ -207,7 +207,7 @@