diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 2706ef60e9..fa3e0f2d8b 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,4 +1 @@ -===REMOVE=== -Important! Please follow the new guidelines for naming Pull Requests: https://docs.dasch.swiss/developers/dsp/contribution/#pull-request-guidelines -===REMOVE=== -resolves DSP- +resolves DEV- diff --git a/src/app/project/ontology/ontology.component.html b/src/app/project/ontology/ontology.component.html index a16b3d17b3..d1197c85db 100644 --- a/src/app/project/ontology/ontology.component.html +++ b/src/app/project/ontology/ontology.component.html @@ -193,7 +193,7 @@

- + {{propDef.label ? propDef.label : propDef.id}} - {{!propDef.labels.length ? propDef?.label : propDef.labels | - appStringifyStringLiteral:'all'}} + + {{!propDef.labels.length ? propDef?.label : propDef.labels | appStringifyStringLiteral:'all'}} +
-
+
+ + {{propDef.id | split: '#':1}} + +  ·  {{propInfo.multiple ? 'check_box' : 'check_box_outline_blank' }} @@ -40,7 +45,6 @@ This property is not used in a class -
diff --git a/src/app/project/ontology/property-info/property-info.component.scss b/src/app/project/ontology/property-info/property-info.component.scss index df62d6f968..5958d40253 100644 --- a/src/app/project/ontology/property-info/property-info.component.scss +++ b/src/app/project/ontology/property-info/property-info.component.scss @@ -9,6 +9,10 @@ color: $primary_700; } +.flex { + display: flex !important; +} + .mat-line.title { line-height: 1.8; .mat-icon { diff --git a/src/app/project/ontology/property-info/property-info.component.spec.ts b/src/app/project/ontology/property-info/property-info.component.spec.ts index b5dfa36854..c4e54014bc 100644 --- a/src/app/project/ontology/property-info/property-info.component.spec.ts +++ b/src/app/project/ontology/property-info/property-info.component.spec.ts @@ -27,6 +27,7 @@ import { CacheService } from 'src/app/main/cache/cache.service'; import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens'; import { DialogHeaderComponent } from 'src/app/main/dialog/dialog-header/dialog-header.component'; import { DialogComponent } from 'src/app/main/dialog/dialog.component'; +import { SplitPipe } from 'src/app/main/pipes/split.pipe'; import { PropertyFormComponent } from '../property-form/property-form.component'; import { PropertyInfoComponent } from './property-info.component'; @@ -194,6 +195,7 @@ describe('PropertyInfoComponent', () => { SimpleTextHostComponent, PropertyFormComponent, PropertyInfoComponent, + SplitPipe ], imports: [ BrowserAnimationsModule, diff --git a/src/app/project/ontology/resource-class-info/resource-class-info.component.html b/src/app/project/ontology/resource-class-info/resource-class-info.component.html index 042d6abfab..c082f47f2b 100644 --- a/src/app/project/ontology/resource-class-info/resource-class-info.component.html +++ b/src/app/project/ontology/resource-class-info/resource-class-info.component.html @@ -7,6 +7,10 @@ {{resourceClass.label | appTruncate: 24}} + + {{resourceClass.id | split: '#':1}} + +  ·  {{subClassOfLabel}} @@ -43,9 +47,9 @@
+ *ngFor="let prop of propsToDisplay; let i = index; let odd = odd">
- + {{i + 1}}) { declarations: [ HostComponent, ResourceClassInfoComponent, + SplitPipe, TruncatePipe ], imports: [ @@ -162,7 +164,7 @@ describe('ResourceClassInfoComponent', () => { }); - it('expect title to be "Blue thing" and subclass of "Thing"', () => { + it('expect title to be "Blue thing", id name "BlueThing" and subclass of "Thing"', () => { expect(hostComponent.resourceClassInfoComponent).toBeTruthy(); expect(hostComponent.resourceClassInfoComponent.resourceClass).toBeDefined(); @@ -174,7 +176,8 @@ describe('ResourceClassInfoComponent', () => { const subtitle: DebugElement = hostCompDe.query(By.css('mat-card-subtitle')); - expect(subtitle.nativeElement.innerText).toEqual('Thing'); + expect(subtitle.nativeElement.innerText).toContain('BlueThing'); + expect(subtitle.nativeElement.innerText).toContain('Thing'); }); it('expect delete res class button should be disabled', () => {