Skip to content

Commit

Permalink
fix(ontology): bug fix in list property (DSP-1368) (#390)
Browse files Browse the repository at this point in the history 
* fix(ontology): bug fix in list property

* test(ontology): new test for list property

* refactor(ontology): delete console.log

* test(ontology): reactivate all tests
  • Loading branch information
André Kilchenmann committed Feb 23, 2021
1 parent 8d822fd commit 2fb448e
Show file tree
Hide file tree
Showing 2 changed files with 132 additions and 11 deletions.
137 changes: 128 additions & 9 deletions src/app/project/ontology/property-info/property-info.component.spec.ts
View file
Expand Up @@ -7,7 +7,7 @@ import { MatSnackBarModule } from '@angular/material/snack-bar';
import { MatTooltipModule } from '@angular/material/tooltip';
import { By } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { Constants, IHasProperty, MockOntology, ReadOntology, ResourcePropertyDefinitionWithAllLanguages } from '@dasch-swiss/dsp-js';
import { Constants, IHasProperty, ListNodeInfo, MockOntology, ReadOntology, ResourcePropertyDefinitionWithAllLanguages } from '@dasch-swiss/dsp-js';
import { of } from 'rxjs';
import { CacheService } from 'src/app/main/cache/cache.service';
import { PropertyInfoComponent } from './property-info.component';
Expand Down Expand Up @@ -98,13 +98,62 @@ class LinkHostComponent {

}

/**
* Test host component to simulate parent component
* Property is of type list dropdown
*/
@Component({
template: '<app-property-info #propertyInfo [propCard]="propertyCardinality" [propDef]="propertyDefinition"></app-property-info>'
})
class ListHostComponent {

@ViewChild('propertyInfo') propertyInfoComponent: PropertyInfoComponent;

propertyCardinality: IHasProperty = {
"propertyIndex": "http://0.0.0.0:3333/ontology/0001/anything/v2#hasListItem",
"cardinality": 2,
"guiOrder": 0,
"isInherited": true
};
propertyDefinition: ResourcePropertyDefinitionWithAllLanguages = {
"id": "http://0.0.0.0:3333/ontology/0001/anything/v2#hasListItem",
"subPropertyOf": ["http://api.knora.org/ontology/knora-api/v2#hasValue"],
"label": "Listenelement",
"guiElement": "http://api.knora.org/ontology/salsah-gui/v2#List",
"subjectType": "http://0.0.0.0:3333/ontology/0001/anything/v2#Thing",
"objectType": "http://api.knora.org/ontology/knora-api/v2#ListValue",
"isLinkProperty": false,
"isLinkValueProperty": false,
"isEditable": true,
"guiAttributes": ["hlist=<http://rdfh.ch/lists/0001/treeList>"],
"comments": [],
"labels": [{
"language": "de",
"value": "Listenelement"
}, {
"language": "en",
"value": "List element"
}, {
"language": "fr",
"value": "Elément de liste"
}, {
"language": "it",
"value": "Elemento di lista"
}]
};

}

describe('PropertyInfoComponent', () => {
let simpleTextHostComponent: SimpleTextHostComponent;
let simpleTextHostFixture: ComponentFixture<SimpleTextHostComponent>;

let linkHostComponent: LinkHostComponent;
let linkHostFixture: ComponentFixture<LinkHostComponent>;

let listHostComponent: ListHostComponent;
let listHostFixture: ComponentFixture<ListHostComponent>;

beforeEach(async(() => {
const dspConnSpy = {
v2: {
Expand All @@ -117,6 +166,7 @@ describe('PropertyInfoComponent', () => {
TestBed.configureTestingModule({
declarations: [
LinkHostComponent,
ListHostComponent,
SimpleTextHostComponent,
PropertyInfoComponent
],
Expand All @@ -138,6 +188,14 @@ describe('PropertyInfoComponent', () => {
.compileComponents();
}));

beforeEach(() => {
simpleTextHostFixture = TestBed.createComponent(SimpleTextHostComponent);
simpleTextHostComponent = simpleTextHostFixture.componentInstance;
simpleTextHostFixture.detectChanges();

expect(simpleTextHostComponent).toBeTruthy();
});

beforeEach(() => {
// mock cache service for currentOntology
const cacheSpy = TestBed.inject(CacheService);
Expand All @@ -149,21 +207,71 @@ describe('PropertyInfoComponent', () => {
}
);

simpleTextHostFixture = TestBed.createComponent(SimpleTextHostComponent);
simpleTextHostComponent = simpleTextHostFixture.componentInstance;
simpleTextHostFixture.detectChanges();

expect(simpleTextHostComponent).toBeTruthy();
});

beforeEach(() => {
linkHostFixture = TestBed.createComponent(LinkHostComponent);
linkHostComponent = linkHostFixture.componentInstance;
linkHostFixture.detectChanges();

expect(linkHostComponent).toBeTruthy();
});

beforeEach(() => {
// mock cache service for currentOntology
const cacheSpy = TestBed.inject(CacheService);

(cacheSpy as jasmine.SpyObj<CacheService>).get.and.callFake(
(key = 'currentOntologyLists') => {
let response: ListNodeInfo[] = [{
"comments": [],
"id": "http://rdfh.ch/lists/0001/otherTreeList",
"isRootNode": true,
"labels": [{
"language": "en",
"value": "Tree list root"
}],
"projectIri": "http://rdfh.ch/projects/0001"
}, {
"comments": [{
"language": "en",
"value": "a list that is not in used in ontology or data"
}],
"id": "http://rdfh.ch/lists/0001/notUsedList",
"isRootNode": true,
"labels": [{
"language": "de",
"value": "unbenutzte Liste"
}, {
"language": "en",
"value": "a list that is not used"
}],
"name": "notUsedList",
"projectIri": "http://rdfh.ch/projects/0001"
}, {
"comments": [{
"language": "en",
"value": "Anything Tree List"
}],
"id": "http://rdfh.ch/lists/0001/treeList",
"isRootNode": true,
"labels": [{
"language": "de",
"value": "Listenwurzel"
}, {
"language": "en",
"value": "Tree list root"
}],
"name": "treelistroot",
"projectIri": "http://rdfh.ch/projects/0001"
}];
return of(response);
}
);
listHostFixture = TestBed.createComponent(ListHostComponent);
listHostComponent = listHostFixture.componentInstance;
listHostFixture.detectChanges();

expect(listHostComponent).toBeTruthy();
});

it('should create an instance', () => {
expect(simpleTextHostComponent.propertyInfoComponent).toBeTruthy();
});
Expand Down Expand Up @@ -237,4 +345,15 @@ describe('PropertyInfoComponent', () => {
// and cardinality 2 means also "not required value"
expect(requiredIcon.nativeElement.innerText).toEqual('check_box_outline_blank');
});

it('expect list property with connection to list "Listenwurzel"', () => {
expect(listHostComponent.propertyInfoComponent).toBeTruthy();
expect(listHostComponent.propertyInfoComponent.propDef).toBeDefined();

const hostCompDe = listHostFixture.debugElement;

const attribute: DebugElement = hostCompDe.query(By.css('.attribute'));
// expect list called "Listenwurzel"
expect(attribute.nativeElement.innerText).toContain('Listenwurzel');
});
});
6 changes: 4 additions & 2 deletions src/app/project/ontology/property-info/property-info.component.ts
View file
Expand Up @@ -5,6 +5,7 @@ import {
ApiResponseData,
Constants,
IHasProperty,
ListNodeInfo,
ListsResponse,
ReadOntology,
ResourcePropertyDefinitionWithAllLanguages
Expand Down Expand Up @@ -119,11 +120,12 @@ export class PropertyInfoComponent implements OnInit, AfterContentInit {
// this property is a list property
// get current ontology lists to get linked list information
this._cache.get('currentOntologyLists').subscribe(
(response: ApiResponseData<ListsResponse>) => {
(response: ListNodeInfo[]) => {
const re: RegExp = /\<([^)]+)\>/;
const listIri = this.propDef.guiAttributes[0].match(re)[1];
const listUrl = `/project/${this.projectcode}/lists/${encodeURIComponent(listIri)}`;
this.propAttribute = `<a href="${listUrl}">${response[0].labels[0].value}</a>`;
const list = response.find(i => i.id === listIri);
this.propAttribute = `<a href="${listUrl}">${list.labels[0].value}</a>`;
}
);
}
Expand Down

0 comments on commit 2fb448e

Please sign in to comment.