big refactor

matsen-tool/src/app/_components/linked-label/linked-label.component.html

@@ -0,0 +1,14 @@
+<span *ngIf="partner">
+    <img src="/assets/images/icons/{{partner.partnerType}}.svg" class="icon-mini" alt="" /><a href="/{{partner.partnerType}}/{{this.appHelperService.extractId(partner.id)}}">{{partner.name}}</a>
+</span>
+<span *ngIf="product">
+    <img src="/assets/images/icons/product.svg" class="icon-mini" alt="" /><a href="/product/{{this.appHelperService.extractId(product.id)}}">{{product.name}}</a>
+</span>
+<span *ngIf="contact">
+    <!-- change here for contact -->
+    <img src="/assets/images/icons/contact.svg" class="icon-mini" alt="" /><a href="/contact/{{this.appHelperService.extractId(contact.id)}}">{{contact.firstName}} {{contact.lastName}}</a>
+</span>
+<span *ngIf="user">
+    <!-- change here for contact -->
+    <img src="/assets/images/icons/profile.svg" class="icon-mini" alt="" /><a href="/user/{{this.appHelperService.extractId(user.id)}}">{{user.firstName}} {{user.lastName}}</a>
+</span>

matsen-tool/src/app/_components/linked-label/linked-label.component.spec.ts

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { LinkedLabelComponent } from './linked-label.component';
+
+describe('LinkedLabelComponent', () => {
+  let component: LinkedLabelComponent;
+  let fixture: ComponentFixture<LinkedLabelComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [LinkedLabelComponent]
+    })
+    .compileComponents();
+    
+    fixture = TestBed.createComponent(LinkedLabelComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

matsen-tool/src/app/_components/linked-label/linked-label.component.ts

@@ -0,0 +1,24 @@
+import {Component, Input} from '@angular/core';
+import {ContactJsonld, PartnerJsonld, ProductJsonld, UserJsonld} from "@app/core/api/v1";
+import {AppHelperService} from "@app/_helpers/app-helper.service";
+
+@Component({
+  selector: 'app-linked-label',
+  templateUrl: './linked-label.component.html',
+  styleUrl: './linked-label.component.scss'
+})
+export class LinkedLabelComponent {
+    @Input() public partner!: PartnerJsonld;
+    @Input() public product!: ProductJsonld;
+    @Input() public contact!: ContactJsonld;
+    @Input() public user!: UserJsonld;
+
+
+    constructor(
+        protected appHelperService: AppHelperService
+    ) {
+
+    }
+
+
+}

matsen-tool/src/app/_forms/apiForms.ts

@@ -3,8 +3,7 @@ import { FormGroup, FormControl, Validators } from '@angular/forms';
 export const commentForm = new FormGroup({
   message: new FormControl(null, [Validators.required]),
   owner: new FormControl(null, []),
-  ownerName: new FormControl(null, []),
-  post: new FormControl(null, []),
+  postIri: new FormControl(null, []),
   createdAt: new FormControl(null, [])
 });
 
@@ -12,23 +11,23 @@ export const commentJsonhalForm = new FormGroup({
   _links: new FormControl(null, []),
   message: new FormControl(null, [Validators.required]),
   owner: new FormControl(null, []),
-  ownerName: new FormControl(null, []),
-  post: new FormControl(null, []),
+  postIri: new FormControl(null, []),
   createdAt: new FormControl(null, [])
 });
 
 export const commentJsonldForm = new FormGroup({
   message: new FormControl(null, [Validators.required]),
   owner: new FormControl(null, []),
-  ownerName: new FormControl(null, []),
-  post: new FormControl(null, []),
+  postIri: new FormControl(null, []),
   createdAt: new FormControl(null, [])
 });
 
 export const contactForm = new FormGroup({
   firstName: new FormControl(null, [Validators.required]),
   lastName: new FormControl(null, [Validators.required]),
-  partner: new FormControl(null, [Validators.required]),
+  fullName: new FormControl(null, []),
+  partner: new FormControl(null, []),
+  partnerIri: new FormControl(null, [Validators.required]),
   birthday: new FormControl(null, []),
   image: new FormControl(null, []),
   imageUrl: new FormControl(null, []),
@@ -37,7 +36,6 @@ export const contactForm = new FormGroup({
   email: new FormControl(null, [Validators.email]),
   posts: new FormControl(null, []),
   createdBy: new FormControl(null, []),
-  createdByName: new FormControl(null, []),
   createdAt: new FormControl(null, [])
 });
 
@@ -45,7 +43,9 @@ export const contactJsonhalForm = new FormGroup({
   _links: new FormControl(null, []),
   firstName: new FormControl(null, [Validators.required]),
   lastName: new FormControl(null, [Validators.required]),
-  partner: new FormControl(null, [Validators.required]),
+  fullName: new FormControl(null, []),
+  partner: new FormControl(null, []),
+  partnerIri: new FormControl(null, [Validators.required]),
   birthday: new FormControl(null, []),
   image: new FormControl(null, []),
   imageUrl: new FormControl(null, []),
@@ -54,14 +54,15 @@ export const contactJsonhalForm = new FormGroup({
   email: new FormControl(null, [Validators.email]),
   posts: new FormControl(null, []),
   createdBy: new FormControl(null, []),
-  createdByName: new FormControl(null, []),
   createdAt: new FormControl(null, [])
 });
 
 export const contactJsonldForm = new FormGroup({
   firstName: new FormControl(null, [Validators.required]),
   lastName: new FormControl(null, [Validators.required]),
-  partner: new FormControl(null, [Validators.required]),
+  fullName: new FormControl(null, []),
+  partner: new FormControl(null, []),
+  partnerIri: new FormControl(null, [Validators.required]),
   birthday: new FormControl(null, []),
   image: new FormControl(null, []),
   imageUrl: new FormControl(null, []),
@@ -70,32 +71,28 @@ export const contactJsonldForm = new FormGroup({
   email: new FormControl(null, [Validators.email]),
   posts: new FormControl(null, []),
   createdBy: new FormControl(null, []),
-  createdByName: new FormControl(null, []),
   createdAt: new FormControl(null, [])
 });
 
 export const contactPartnerProductForm = new FormGroup({
-  contact: new FormControl(null, [Validators.required]),
-  partnerProduct: new FormControl(null, [Validators.required]),
-  product: new FormControl(null, [Validators.required]),
-  productName: new FormControl(null, []),
+  contactIri: new FormControl(null, [Validators.required]),
+  partnerProductIri: new FormControl(null, [Validators.required]),
+  product: new FormControl(null, []),
   createdAt: new FormControl(null, [])
 });
 
 export const contactPartnerProductJsonhalForm = new FormGroup({
   _links: new FormControl(null, []),
-  contact: new FormControl(null, [Validators.required]),
-  partnerProduct: new FormControl(null, [Validators.required]),
-  product: new FormControl(null, [Validators.required]),
-  productName: new FormControl(null, []),
+  contactIri: new FormControl(null, [Validators.required]),
+  partnerProductIri: new FormControl(null, [Validators.required]),
+  product: new FormControl(null, []),
   createdAt: new FormControl(null, [])
 });
 
 export const contactPartnerProductJsonldForm = new FormGroup({
-  contact: new FormControl(null, [Validators.required]),
-  partnerProduct: new FormControl(null, [Validators.required]),
-  product: new FormControl(null, [Validators.required]),
-  productName: new FormControl(null, []),
+  contactIri: new FormControl(null, [Validators.required]),
+  partnerProductIri: new FormControl(null, [Validators.required]),
+  product: new FormControl(null, []),
   createdAt: new FormControl(null, [])
 });
 
@@ -103,13 +100,12 @@ export const documentForm = new FormGroup({
   name: new FormControl(null, [Validators.required]),
   description: new FormControl(null, []),
   partner: new FormControl(null, []),
-  partnerName: new FormControl(null, []),
+  partnerIri: new FormControl(null, []),
   product: new FormControl(null, []),
-  productName: new FormControl(null, []),
+  productIri: new FormControl(null, []),
   documentObject: new FormControl(null, [Validators.required]),
   documentUrl: new FormControl(null, []),
   createdBy: new FormControl(null, []),
-  createdByName: new FormControl(null, []),
   createdAt: new FormControl(null, [])
 });
 
@@ -118,13 +114,12 @@ export const documentJsonhalForm = new FormGroup({
   name: new FormControl(null, [Validators.required]),
   description: new FormControl(null, []),
   partner: new FormControl(null, []),
-  partnerName: new FormControl(null, []),
+  partnerIri: new FormControl(null, []),
   product: new FormControl(null, []),
-  productName: new FormControl(null, []),
+  productIri: new FormControl(null, []),
   documentObject: new FormControl(null, [Validators.required]),
   documentUrl: new FormControl(null, []),
   createdBy: new FormControl(null, []),
-  createdByName: new FormControl(null, []),
   createdAt: new FormControl(null, [])
 });
 
@@ -132,13 +127,12 @@ export const documentJsonldForm = new FormGroup({
   name: new FormControl(null, [Validators.required]),
   description: new FormControl(null, []),
   partner: new FormControl(null, []),
-  partnerName: new FormControl(null, []),
+  partnerIri: new FormControl(null, []),
   product: new FormControl(null, []),
-  productName: new FormControl(null, []),
+  productIri: new FormControl(null, []),
   documentObject: new FormControl(null, [Validators.required]),
   documentUrl: new FormControl(null, []),
   createdBy: new FormControl(null, []),
-  createdByName: new FormControl(null, []),
   createdAt: new FormControl(null, [])
 });
 
@@ -180,12 +174,8 @@ export const partnerForm = new FormGroup({
   website: new FormControl(null, []),
   logo: new FormControl(null, []),
   logoUrl: new FormControl(null, []),
-  createdBy: new FormControl(null, []),
-  createdByName: new FormControl(null, []),
-  createdAt: new FormControl(null, []),
-  posts: new FormControl(null, []),
-  contacts: new FormControl(null, []),
-  partnerProducts: new FormControl(null, [])
+  createdByIri: new FormControl(null, []),
+  createdAt: new FormControl(null, [])
 });
 
 export const partnerJsonhalForm = new FormGroup({
@@ -201,12 +191,8 @@ export const partnerJsonhalForm = new FormGroup({
   website: new FormControl(null, []),
   logo: new FormControl(null, []),
   logoUrl: new FormControl(null, []),
-  createdBy: new FormControl(null, []),
-  createdByName: new FormControl(null, []),
-  createdAt: new FormControl(null, []),
-  posts: new FormControl(null, []),
-  contacts: new FormControl(null, []),
-  partnerProducts: new FormControl(null, [])
+  createdByIri: new FormControl(null, []),
+  createdAt: new FormControl(null, [])
 });
 
 export const partnerJsonldForm = new FormGroup({
@@ -221,64 +207,57 @@ export const partnerJsonldForm = new FormGroup({
   website: new FormControl(null, []),
   logo: new FormControl(null, []),
   logoUrl: new FormControl(null, []),
-  createdBy: new FormControl(null, []),
-  createdByName: new FormControl(null, []),
-  createdAt: new FormControl(null, []),
-  posts: new FormControl(null, []),
-  contacts: new FormControl(null, []),
-  partnerProducts: new FormControl(null, [])
+  createdByIri: new FormControl(null, []),
+  createdAt: new FormControl(null, [])
 });
 
 export const partnerFollowForm = new FormGroup({
-  user: new FormControl(null, []),
-  userName: new FormControl(null, []),
-  partner: new FormControl(null, [Validators.required]),
-  partnerName: new FormControl(null, []),
+  userIri: new FormControl(null, []),
+  partner: new FormControl(null, []),
+  partnerIri: new FormControl(null, [Validators.required]),
   createdAt: new FormControl(null, []),
   owner: new FormControl(null, [])
 });
 
 export const partnerFollowJsonhalForm = new FormGroup({
   _links: new FormControl(null, []),
-  user: new FormControl(null, []),
-  userName: new FormControl(null, []),
-  partner: new FormControl(null, [Validators.required]),
-  partnerName: new FormControl(null, []),
+  userIri: new FormControl(null, []),
+  partner: new FormControl(null, []),
+  partnerIri: new FormControl(null, [Validators.required]),
   createdAt: new FormControl(null, []),
   owner: new FormControl(null, [])
 });
 
 export const partnerFollowJsonldForm = new FormGroup({
-  user: new FormControl(null, []),
-  userName: new FormControl(null, []),
-  partner: new FormControl(null, [Validators.required]),
-  partnerName: new FormControl(null, []),
+  userIri: new FormControl(null, []),
+  partner: new FormControl(null, []),
+  partnerIri: new FormControl(null, [Validators.required]),
   createdAt: new FormControl(null, []),
   owner: new FormControl(null, [])
 });
 
 export const partnerProductForm = new FormGroup({
-  partner: new FormControl(null, [Validators.required]),
-  partnerName: new FormControl(null, []),
-  product: new FormControl(null, [Validators.required]),
-  productName: new FormControl(null, []),
+  partner: new FormControl(null, []),
+  partnerIri: new FormControl(null, [Validators.required]),
+  product: new FormControl(null, []),
+  productIri: new FormControl(null, [Validators.required]),
   createdAt: new FormControl(null, [])
 });
 
 export const partnerProductJsonhalForm = new FormGroup({
   _links: new FormControl(null, []),
-  partner: new FormControl(null, [Validators.required]),
-  partnerName: new FormControl(null, []),
-  product: new FormControl(null, [Validators.required]),
-  productName: new FormControl(null, []),
+  partner: new FormControl(null, []),
+  partnerIri: new FormControl(null, [Validators.required]),
+  product: new FormControl(null, []),
+  productIri: new FormControl(null, [Validators.required]),
   createdAt: new FormControl(null, [])
 });
 
 export const partnerProductJsonldForm = new FormGroup({
-  partner: new FormControl(null, [Validators.required]),
-  partnerName: new FormControl(null, []),
-  product: new FormControl(null, [Validators.required]),
-  productName: new FormControl(null, []),
+  partner: new FormControl(null, []),
+  partnerIri: new FormControl(null, [Validators.required]),
+  product: new FormControl(null, []),
+  productIri: new FormControl(null, [Validators.required]),
   createdAt: new FormControl(null, [])
 });
 
@@ -286,26 +265,24 @@ export const postForm = new FormGroup({
   headline: new FormControl(null, [Validators.required]),
   message: new FormControl(null, [Validators.required]),
   owner: new FormControl(null, []),
-  ownerName: new FormControl(null, []),
   partner: new FormControl(null, []),
-  partnerName: new FormControl(null, []),
-  partnerType: new FormControl(null, []),
+  partnerIri: new FormControl(null, []),
   product: new FormControl(null, []),
-  productName: new FormControl(null, []),
+  productIri: new FormControl(null, []),
   contact: new FormControl(null, []),
-  contactName: new FormControl(null, []),
+  contactIri: new FormControl(null, []),
   sale: new FormControl(null, []),
-  comments: new FormControl(null, []),
+  saleIri: new FormControl(null, []),
   createdAt: new FormControl(null, [])
 });
 
 export const postPostingCreateForm = new FormGroup({
   headline: new FormControl(null, [Validators.required]),
   message: new FormControl(null, [Validators.required]),
-  partner: new FormControl(null, []),
-  product: new FormControl(null, []),
-  contact: new FormControl(null, []),
-  sale: new FormControl(null, [])
+  partnerIri: new FormControl(null, []),
+  productIri: new FormControl(null, []),
+  contactIri: new FormControl(null, []),
+  saleIri: new FormControl(null, [])
 });
 
 export const postPostingPatchForm = new FormGroup({
@@ -318,16 +295,14 @@ export const postJsonhalForm = new FormGroup({
   headline: new FormControl(null, [Validators.required]),
   message: new FormControl(null, [Validators.required]),
   owner: new FormControl(null, []),
-  ownerName: new FormControl(null, []),
   partner: new FormControl(null, []),
-  partnerName: new FormControl(null, []),
-  partnerType: new FormControl(null, []),
+  partnerIri: new FormControl(null, []),
   product: new FormControl(null, []),
-  productName: new FormControl(null, []),
+  productIri: new FormControl(null, []),
   contact: new FormControl(null, []),
-  contactName: new FormControl(null, []),
+  contactIri: new FormControl(null, []),
   sale: new FormControl(null, []),
-  comments: new FormControl(null, []),
+  saleIri: new FormControl(null, []),
   createdAt: new FormControl(null, [])
 });
 
@@ -335,36 +310,34 @@ export const postJsonhalPostingCreateForm = new FormGroup({
   _links: new FormControl(null, []),
   headline: new FormControl(null, [Validators.required]),
   message: new FormControl(null, [Validators.required]),
-  partner: new FormControl(null, []),
-  product: new FormControl(null, []),
-  contact: new FormControl(null, []),
-  sale: new FormControl(null, [])
+  partnerIri: new FormControl(null, []),
+  productIri: new FormControl(null, []),
+  contactIri: new FormControl(null, []),
+  saleIri: new FormControl(null, [])
 });
 
 export const postJsonldForm = new FormGroup({
   headline: new FormControl(null, [Validators.required]),
   message: new FormControl(null, [Validators.required]),
   owner: new FormControl(null, []),
-  ownerName: new FormControl(null, []),
   partner: new FormControl(null, []),
-  partnerName: new FormControl(null, []),
-  partnerType: new FormControl(null, []),
+  partnerIri: new FormControl(null, []),
   product: new FormControl(null, []),
-  productName: new FormControl(null, []),
+  productIri: new FormControl(null, []),
   contact: new FormControl(null, []),
-  contactName: new FormControl(null, []),
+  contactIri: new FormControl(null, []),
   sale: new FormControl(null, []),
-  comments: new FormControl(null, []),
+  saleIri: new FormControl(null, []),
   createdAt: new FormControl(null, [])
 });
 
 export const postJsonldPostingCreateForm = new FormGroup({
   headline: new FormControl(null, [Validators.required]),
   message: new FormControl(null, [Validators.required]),
-  partner: new FormControl(null, []),
-  product: new FormControl(null, []),
-  contact: new FormControl(null, []),
-  sale: new FormControl(null, [])
+  partnerIri: new FormControl(null, []),
+  productIri: new FormControl(null, []),
+  contactIri: new FormControl(null, []),
+  saleIri: new FormControl(null, [])
 });
 
 export const productForm = new FormGroup({
@@ -373,7 +346,6 @@ export const productForm = new FormGroup({
   image: new FormControl(null, []),
   imageUrl: new FormControl(null, []),
   createdBy: new FormControl(null, []),
-  createdByName: new FormControl(null, []),
   createdAt: new FormControl(null, [])
 });
 
@@ -384,7 +356,6 @@ export const productJsonhalForm = new FormGroup({
   image: new FormControl(null, []),
   imageUrl: new FormControl(null, []),
   createdBy: new FormControl(null, []),
-  createdByName: new FormControl(null, []),
   createdAt: new FormControl(null, [])
 });
 
@@ -394,63 +365,52 @@ export const productJsonldForm = new FormGroup({
   image: new FormControl(null, []),
   imageUrl: new FormControl(null, []),
   createdBy: new FormControl(null, []),
-  createdByName: new FormControl(null, []),
   createdAt: new FormControl(null, [])
 });
 
 export const saleForm = new FormGroup({
   owner: new FormControl(null, []),
-  ownerName: new FormControl(null, []),
-  partner: new FormControl(null, [Validators.required]),
-  partnerType: new FormControl(null, []),
-  partnerName: new FormControl(null, []),
-  product: new FormControl(null, [Validators.required]),
-  productName: new FormControl(null, []),
+  partner: new FormControl(null, []),
+  partnerIri: new FormControl(null, [Validators.required]),
+  product: new FormControl(null, []),
+  productIri: new FormControl(null, [Validators.required]),
   turnover: new FormControl(null, [Validators.required]),
   profit: new FormControl(null, [Validators.required]),
   quantity: new FormControl(null, [Validators.required]),
   comment: new FormControl(null, []),
-  createdAt: new FormControl(null, []),
-  posts: new FormControl(null, [])
+  createdAt: new FormControl(null, [])
 });
 
 export const saleJsonhalForm = new FormGroup({
   _links: new FormControl(null, []),
   owner: new FormControl(null, []),
-  ownerName: new FormControl(null, []),
-  partner: new FormControl(null, [Validators.required]),
-  partnerType: new FormControl(null, []),
-  partnerName: new FormControl(null, []),
-  product: new FormControl(null, [Validators.required]),
-  productName: new FormControl(null, []),
+  partner: new FormControl(null, []),
+  partnerIri: new FormControl(null, [Validators.required]),
+  product: new FormControl(null, []),
+  productIri: new FormControl(null, [Validators.required]),
   turnover: new FormControl(null, [Validators.required]),
   profit: new FormControl(null, [Validators.required]),
   quantity: new FormControl(null, [Validators.required]),
   comment: new FormControl(null, []),
-  createdAt: new FormControl(null, []),
-  posts: new FormControl(null, [])
+  createdAt: new FormControl(null, [])
 });
 
 export const saleJsonldForm = new FormGroup({
   owner: new FormControl(null, []),
-  ownerName: new FormControl(null, []),
-  partner: new FormControl(null, [Validators.required]),
-  partnerType: new FormControl(null, []),
-  partnerName: new FormControl(null, []),
-  product: new FormControl(null, [Validators.required]),
-  productName: new FormControl(null, []),
+  partner: new FormControl(null, []),
+  partnerIri: new FormControl(null, [Validators.required]),
+  product: new FormControl(null, []),
+  productIri: new FormControl(null, [Validators.required]),
   turnover: new FormControl(null, [Validators.required]),
   profit: new FormControl(null, [Validators.required]),
   quantity: new FormControl(null, [Validators.required]),
   comment: new FormControl(null, []),
-  createdAt: new FormControl(null, []),
-  posts: new FormControl(null, [])
+  createdAt: new FormControl(null, [])
 });
 
 export const saleSummaryForm = new FormGroup({
   userId: new FormControl(null, []),
   owner: new FormControl(null, []),
-  ownerName: new FormControl(null, []),
   turnover: new FormControl(null, []),
   profit: new FormControl(null, [])
 });
@@ -459,7 +419,6 @@ export const saleSummaryJsonhalForm = new FormGroup({
   _links: new FormControl(null, []),
   userId: new FormControl(null, []),
   owner: new FormControl(null, []),
-  ownerName: new FormControl(null, []),
   turnover: new FormControl(null, []),
   profit: new FormControl(null, [])
 });
@@ -467,7 +426,6 @@ export const saleSummaryJsonhalForm = new FormGroup({
 export const saleSummaryJsonldForm = new FormGroup({
   userId: new FormControl(null, []),
   owner: new FormControl(null, []),
-  ownerName: new FormControl(null, []),
   turnover: new FormControl(null, []),
   profit: new FormControl(null, [])
 });
@@ -476,20 +434,17 @@ export const taskForm = new FormGroup({
   headline: new FormControl(null, [Validators.required]),
   description: new FormControl(null, [Validators.required]),
   createdBy: new FormControl(null, []),
-  createdByName: new FormControl(null, []),
-  assignedTo: new FormControl(null, [Validators.required]),
-  assignedToName: new FormControl(null, []),
+  assignedTo: new FormControl(null, []),
+  assignedToIri: new FormControl(null, [Validators.required]),
   dueAt: new FormControl(null, [Validators.required]),
   partner: new FormControl(null, []),
-  partnerName: new FormControl(null, []),
-  partnerType: new FormControl(null, []),
-  product: new FormControl(null, [Validators.required]),
-  productName: new FormControl(null, []),
+  partnerIri: new FormControl(null, []),
+  product: new FormControl(null, []),
+  productIri: new FormControl(null, [Validators.required]),
   contact: new FormControl(null, []),
-  contactName: new FormControl(null, []),
+  contactIri: new FormControl(null, []),
   prio: new FormControl(null, [Validators.required]),
   completed: new FormControl(null, [Validators.required]),
-  taskNotes: new FormControl(null, []),
   createdAt: new FormControl(null, [])
 });
 
@@ -498,20 +453,17 @@ export const taskJsonhalForm = new FormGroup({
   headline: new FormControl(null, [Validators.required]),
   description: new FormControl(null, [Validators.required]),
   createdBy: new FormControl(null, []),
-  createdByName: new FormControl(null, []),
-  assignedTo: new FormControl(null, [Validators.required]),
-  assignedToName: new FormControl(null, []),
+  assignedTo: new FormControl(null, []),
+  assignedToIri: new FormControl(null, [Validators.required]),
   dueAt: new FormControl(null, [Validators.required]),
   partner: new FormControl(null, []),
-  partnerName: new FormControl(null, []),
-  partnerType: new FormControl(null, []),
-  product: new FormControl(null, [Validators.required]),
-  productName: new FormControl(null, []),
+  partnerIri: new FormControl(null, []),
+  product: new FormControl(null, []),
+  productIri: new FormControl(null, [Validators.required]),
   contact: new FormControl(null, []),
-  contactName: new FormControl(null, []),
+  contactIri: new FormControl(null, []),
   prio: new FormControl(null, [Validators.required]),
   completed: new FormControl(null, [Validators.required]),
-  taskNotes: new FormControl(null, []),
   createdAt: new FormControl(null, [])
 });
 
@@ -519,28 +471,24 @@ export const taskJsonldForm = new FormGroup({
   headline: new FormControl(null, [Validators.required]),
   description: new FormControl(null, [Validators.required]),
   createdBy: new FormControl(null, []),
-  createdByName: new FormControl(null, []),
-  assignedTo: new FormControl(null, [Validators.required]),
-  assignedToName: new FormControl(null, []),
+  assignedTo: new FormControl(null, []),
+  assignedToIri: new FormControl(null, [Validators.required]),
   dueAt: new FormControl(null, [Validators.required]),
   partner: new FormControl(null, []),
-  partnerName: new FormControl(null, []),
-  partnerType: new FormControl(null, []),
-  product: new FormControl(null, [Validators.required]),
-  productName: new FormControl(null, []),
+  partnerIri: new FormControl(null, []),
+  product: new FormControl(null, []),
+  productIri: new FormControl(null, [Validators.required]),
   contact: new FormControl(null, []),
-  contactName: new FormControl(null, []),
+  contactIri: new FormControl(null, []),
   prio: new FormControl(null, [Validators.required]),
   completed: new FormControl(null, [Validators.required]),
-  taskNotes: new FormControl(null, []),
   createdAt: new FormControl(null, [])
 });
 
 export const taskNoteForm = new FormGroup({
   message: new FormControl(null, [Validators.required]),
   owner: new FormControl(null, []),
-  ownerName: new FormControl(null, []),
-  task: new FormControl(null, []),
+  taskIri: new FormControl(null, [Validators.required]),
   createdAt: new FormControl(null, [])
 });
 
@@ -548,16 +496,14 @@ export const taskNoteJsonhalForm = new FormGroup({
   _links: new FormControl(null, []),
   message: new FormControl(null, [Validators.required]),
   owner: new FormControl(null, []),
-  ownerName: new FormControl(null, []),
-  task: new FormControl(null, []),
+  taskIri: new FormControl(null, [Validators.required]),
   createdAt: new FormControl(null, [])
 });
 
 export const taskNoteJsonldForm = new FormGroup({
   message: new FormControl(null, [Validators.required]),
   owner: new FormControl(null, []),
-  ownerName: new FormControl(null, []),
-  task: new FormControl(null, []),
+  taskIri: new FormControl(null, [Validators.required]),
   createdAt: new FormControl(null, [])
 });
 
@@ -567,6 +513,7 @@ export const userForm = new FormGroup({
   lastName: new FormControl(null, [Validators.required]),
   image: new FormControl(null, []),
   imageUrl: new FormControl(null, []),
+  fullName: new FormControl(null, []),
   password: new FormControl(null, []),
   active: new FormControl(null, []),
   createdAt: new FormControl(null, [])
@@ -579,6 +526,7 @@ export const userJsonhalForm = new FormGroup({
   lastName: new FormControl(null, [Validators.required]),
   image: new FormControl(null, []),
   imageUrl: new FormControl(null, []),
+  fullName: new FormControl(null, []),
   password: new FormControl(null, []),
   active: new FormControl(null, []),
   createdAt: new FormControl(null, [])
@@ -590,6 +538,7 @@ export const userJsonldForm = new FormGroup({
   lastName: new FormControl(null, [Validators.required]),
   image: new FormControl(null, []),
   imageUrl: new FormControl(null, []),
+  fullName: new FormControl(null, []),
   password: new FormControl(null, []),
   active: new FormControl(null, []),
   createdAt: new FormControl(null, [])
@@ -597,9 +546,8 @@ export const userJsonldForm = new FormGroup({
 
 export const userProductForm = new FormGroup({
   user: new FormControl(null, []),
-  userName: new FormControl(null, []),
-  product: new FormControl(null, [Validators.required]),
-  productName: new FormControl(null, []),
+  product: new FormControl(null, []),
+  productIri: new FormControl(null, [Validators.required]),
   createdAt: new FormControl(null, []),
   owner: new FormControl(null, [])
 });
@@ -607,18 +555,16 @@ export const userProductForm = new FormGroup({
 export const userProductJsonhalForm = new FormGroup({
   _links: new FormControl(null, []),
   user: new FormControl(null, []),
-  userName: new FormControl(null, []),
-  product: new FormControl(null, [Validators.required]),
-  productName: new FormControl(null, []),
+  product: new FormControl(null, []),
+  productIri: new FormControl(null, [Validators.required]),
   createdAt: new FormControl(null, []),
   owner: new FormControl(null, [])
 });
 
 export const userProductJsonldForm = new FormGroup({
   user: new FormControl(null, []),
-  userName: new FormControl(null, []),
-  product: new FormControl(null, [Validators.required]),
-  productName: new FormControl(null, []),
+  product: new FormControl(null, []),
+  productIri: new FormControl(null, [Validators.required]),
   createdAt: new FormControl(null, []),
   owner: new FormControl(null, [])
 });

matsen-tool/src/app/_views/contacts/contact-list/contact-list.component.ts

@@ -53,7 +53,7 @@ export class ContactListComponent implements OnInit, AfterViewInit {
 
     openModalNewContact() {
         let contact: ContactJsonld = {} as ContactJsonld;
-        contact.partner = this.partner.id ?? null;
+        contact.partnerIri = this.partner.id ?? null;
         this.appHelperService.openModal(NewContactComponent, { 'contact': contact }, this.getData);
     }
 

matsen-tool/src/app/_views/contacts/contacts-detail/contacts-detail.component.html

@@ -19,7 +19,7 @@
                     <div class="col-6">
                         <ul *ngFor="let contactPartnerProduct of contactPartnerProducts">
 <!--                            TODO: contactPartnerProduct.productName ist falsch, hier muss die ID rein -->
-                            <li><a href="/product/{{this.appHelperService.extractId(contactPartnerProduct.productName)}}">{{contactPartnerProduct.productName}}</a></li>
+                            <li><a href="/products/{{this.appHelperService.extractId(contactPartnerProduct.product?.id)}}">{{contactPartnerProduct.product?.name}}</a></li>
                         </ul>
                     </div>
                 </div>

matsen-tool/src/app/_views/contacts/contacts-detail/contacts-detail.component.ts

@@ -1,6 +1,6 @@
 import {AfterViewInit, Component, OnInit, ViewChild} from '@angular/core';
 import {
-    ContactJsonld, ContactPartnerProduct, ContactPartnerProductService,
+    ContactJsonld, ContactPartnerProduct, ContactPartnerProductJsonld, ContactPartnerProductService,
     ContactService,
     PartnerJsonld,
     PartnerService,
@@ -32,7 +32,7 @@ export class ContactsDetailComponent implements OnInit, AfterViewInit {
     protected contact!: ContactJsonld;
     protected contactSub: Subscription;
     protected partner!: PartnerJsonld;
-    protected contactPartnerProducts: Array<ContactPartnerProduct>;
+    protected contactPartnerProducts: Array<ContactPartnerProductJsonld>;
 
     protected partnerSub: Subscription;
     protected contactProductSub: Subscription;
@@ -81,7 +81,7 @@ export class ContactsDetailComponent implements OnInit, AfterViewInit {
 
     getPartnerData = () => {
         this.partnerSub = this.partnerService.partnersIdGet(
-            this.appHelperService.extractId(this.contact.partner)
+            this.appHelperService.extractId(this.contact.partnerIri)
         ).subscribe(
             data => {
                 this.partner = data;

matsen-tool/src/app/_views/partners/partner-list/partner-list.component.ts

@@ -120,7 +120,9 @@ export class PartnerListComponent implements OnInit, AfterViewInit {
                 let partnerFollows = data["hydra:member"];
                 this.partners = [];
                 partnerFollows.forEach(item => {
-                    this.partners.push(item.partner);
+                    if (item.partner) {
+                        this.partners.push(item.partner);
+                    }
                 });
                 this.dataSource = new MatTableDataSource<PartnerJsonld>(this.partners);
                 this.pagingComponent.dataLength = Number(data["hydra:totalItems"]);
@@ -143,7 +145,9 @@ export class PartnerListComponent implements OnInit, AfterViewInit {
                 let partnerProducts = data["hydra:member"];
                 this.partners = [];
                 partnerProducts.forEach(item => {
-                    this.partners.push(item.partner);
+                    if (item.partner) {
+                        this.partners.push(item.partner);
+                    }
                 });
                 this.dataSource = new MatTableDataSource<PartnerJsonld>(this.partners);
                 this.pagingComponent.dataLength = Number(data["hydra:totalItems"]);

matsen-tool/src/app/_views/partners/partners-detail/partners-detail.component.ts

@@ -105,9 +105,7 @@ export class PartnersDetailComponent implements OnInit, AfterViewInit {
         if (this.partnerFollow === null) {
             this.partnerFollowSub = this.partnerFollowService.partnerFollowsPost(
                 {
-                    partner: this.partner,
-                    contact: null,
-                    partnerProduct: null
+                    partnerIri: this.partner.id
                 } as PartnerFollowJsonld
             ).subscribe(
                 data => {

matsen-tool/src/app/_views/posts/post-list/post-list.component.html

@@ -12,10 +12,16 @@
                     <div class="row">
                         <div class="col-4">
                             <span class="due-date">{{ post.createdAt | date:'dd.MM.YYYY':'GMT+0000' }}</span>
-                            <h3 class="m-0"><img src="/assets/images/icons/{{post.partnerType}}.svg" class="icon-mini" alt="" /><a href="/{{post.partnerType}}/{{this.appHelperService.extractId(post.partner)}}">{{post.partnerName}}</a></h3>
-                            <h3 class="m-0" *ngIf="post.contact"><a href="/contact/{{this.appHelperService.extractId(post.contact)}}">{{post.contactName}}</a></h3>
-                            <h3 class="m-0"><img src="/assets/images/icons/product.svg" class="icon-mini" alt="" /><a href="/product/{{this.appHelperService.extractId(post.product)}}">{{post.productName}}</a></h3>
-                            <p>{{ post.ownerName }}</p>
+                            <h3 class="m-0" *ngIf="post.partner">
+                                <app-linked-label [partner]="post.partner"></app-linked-label>
+                            </h3>
+                            <h3 class="m-0" *ngIf="post.contact">
+                                <app-linked-label [contact]="post.contact"></app-linked-label>
+                            </h3>
+                            <h3 class="m-0" *ngIf="post.product">
+                                <app-linked-label [product]="post.product"></app-linked-label>
+                            </h3>
+                            <p>{{ post.owner?.firstName }} {{ post.owner?.lastName }}</p>
                         </div>
                         <div class="spt-border col-8">
                             <h2 class="m-0">{{ post.headline }}</h2>
@@ -23,34 +29,34 @@
                             <span *ngIf="post.owner === currentUser?.id" class="position-absolute bi bi-pencil p-2"
                                   data-type="user-tool"
                                   data-action="edit" (click)="openModalEditPost(post)"></span>
-                            <div class="spt-comments-box d-flex justify-content-end mt-1 position-absolute">
-                                <span *ngIf="post.comments?.length !== 0" role="button" class="badge bg-secondary p-2 me-2"
-                                      (click)="showComments(post)">
-                                    <ng-container
-                                        *ngIf="post.id && commentsVisibility.get(post.id)">{{ 'basic.hide-comments' | translate }}</ng-container>
-                                    <ng-container
-                                        *ngIf="post.id && !commentsVisibility.get(post.id)">{{ 'basic.show-comments' | translate }}</ng-container>
-                                </span>
-                                <span role="button" class="badge bg-secondary p-2"
-                                      (click)="openModalNewComment(post)">{{ 'basic.comment-it' | translate }}</span>
-                            </div>
+<!--                            <div class="spt-comments-box d-flex justify-content-end mt-1 position-absolute">-->
+<!--                                <span *ngIf="post.comments?.length !== 0" role="button" class="badge bg-secondary p-2 me-2"-->
+<!--                                      (click)="showComments(post)">-->
+<!--                                    <ng-container-->
+<!--                                        *ngIf="post.id && commentsVisibility.get(post.id)">{{ 'basic.hide-comments' | translate }}</ng-container>-->
+<!--                                    <ng-container-->
+<!--                                        *ngIf="post.id && !commentsVisibility.get(post.id)">{{ 'basic.show-comments' | translate }}</ng-container>-->
+<!--                                </span>-->
+<!--                                <span role="button" class="badge bg-secondary p-2"-->
+<!--                                      (click)="openModalNewComment(post)">{{ 'basic.comment-it' | translate }}</span>-->
+<!--                            </div>-->
                         </div>
                     </div>
                 </div>
                 <div *ngIf="post.id && commentsVisibility.get(post.id)" class="pb-1">
-                    <div class="card spt-comments" *ngFor="let comment of post.comments">
-                        <div class="card-body">
-                            <div class="d-flex justify-content-between align-items-center">
-                                <p>{{ comment.createdAt | date:'dd.MM.YYYY' }}</p>
-                                <p>{{ comment.ownerName }}</p>
-                            </div>
-                            <div>
-                                <p [innerHTML]="appHelperService.getSafeLongtext(comment.message)"></p>
-                            </div>
-                            <span *ngIf="comment.owner === currentUser?.id" class="position-absolute bi bi-pencil p-2"
-                                  data-type="user-tool" data-action="edit" (click)="openModalEditComment(comment)"></span>
-                        </div>
-                    </div>
+<!--                    <div class="card spt-comments" *ngFor="let comment of post.comments">-->
+<!--                        <div class="card-body">-->
+<!--                            <div class="d-flex justify-content-between align-items-center">-->
+<!--                                <p>{{ comment.createdAt | date:'dd.MM.YYYY' }}</p>-->
+<!--                                <p>{{ comment.ownerName }}</p>-->
+<!--                            </div>-->
+<!--                            <div>-->
+<!--                                <p [innerHTML]="appHelperService.getSafeLongtext(comment.message)"></p>-->
+<!--                            </div>-->
+<!--                            <span *ngIf="comment.owner === currentUser?.id" class="position-absolute bi bi-pencil p-2"-->
+<!--                                  data-type="user-tool" data-action="edit" (click)="openModalEditComment(comment)"></span>-->
+<!--                        </div>-->
+<!--                    </div>-->
                 </div>
             </div>
         </app-paging>

matsen-tool/src/app/_views/posts/post-list/post-list.component.ts

@@ -99,7 +99,7 @@ export class PostListComponent implements OnInit, AfterViewInit {
 
     openModalNewPost() {
         let post: PostJsonld = {} as PostJsonld;
-        post.partner = this.partner.id ?? null;
+        post.partnerIri = this.partner.id;
         this.appHelperService.openModal(NewPostComponent, { 'posting': post }, this.getData);
     }
 
@@ -109,7 +109,7 @@ export class PostListComponent implements OnInit, AfterViewInit {
 
     openModalNewComment(post: PostJsonld) {
         let comment: CommentJsonld = {} as CommentJsonld;
-        comment.post = post.id ?? null;
+        comment.postIri = post.id;
         this.appHelperService.openModal(NewCommentComponent, { 'comment': comment }, this.getData);
     }
 

matsen-tool/src/app/_views/products/product-list/product-list.component.ts

@@ -89,7 +89,10 @@ export class ProductListComponent implements OnInit, AfterViewInit {
                 let userProducts = data["hydra:member"];
                 this.products = [];
                 userProducts.forEach(item => {
-                    this.products.push(item.product);
+                    if (item.product) {
+                        this.products.push(item.product);
+                    }
+
                 })
                 this.pagingComponent.dataLength = Number(data["hydra:totalItems"]);
                 this.dataSource = new MatTableDataSource<ProductJsonld>(this.products);
@@ -107,7 +110,9 @@ export class ProductListComponent implements OnInit, AfterViewInit {
                 let partnerProducts = data["hydra:member"];
                 this.products = [];
                 partnerProducts.forEach(item => {
-                    this.products.push(item.product);
+                    if (item.product) {
+                        this.products.push(item.product);
+                    }
                 })
                 this.pagingComponent.dataLength = Number(data["hydra:totalItems"]);
                 this.dataSource = new MatTableDataSource<ProductJsonld>(this.products);
@@ -125,7 +130,9 @@ export class ProductListComponent implements OnInit, AfterViewInit {
                 let contactProduct = data["hydra:member"];
                 this.products = [];
                 contactProduct.forEach(item => {
-                    this.products.push(item.product);
+                    if (item.product) {
+                        this.products.push(item.product);
+                    }
                 })
                 console.log(this.products);
                 this.pagingComponent.dataLength = Number(data["hydra:totalItems"]);

matsen-tool/src/app/_views/sales/sale-summary/sale-summary.component.html

@@ -1,5 +1,5 @@
 <div class="sales-summary-container mb-4" *ngFor="let saleSummary of saleSummaries">
-    <p><strong>{{ saleSummary.ownerName }}</strong></p>
+    <p><strong>{{ saleSummary.owner?.fullName }}</strong></p>
     <div class="sales-summary-bar">
         <div>
                 <span class="sales-summary-turnover"

matsen-tool/src/app/_views/sales/sales-detail/sales-detail.component.html

@@ -2,12 +2,12 @@
     <div class="card">
         <div *ngIf="sale" class="card-body row pb-5">
             <div class="spt-col col-8">
-                <h1>{{'overview.sale-user' | translate }}: {{ sale.ownerName }}</h1>
+                <h1>{{'overview.sale-user' | translate }}: {{ sale.owner?.fullName }}</h1>
                 <dl>
-                    <dt *ngIf="sale.partnerName">{{'overview.partner' | translate}}:</dt>
-                    <dd *ngIf="sale.partnerName">{{ sale.partnerName }}</dd>
-                    <dt *ngIf="sale.productName">{{'overview.product' | translate}}:</dt>
-                    <dd *ngIf="sale.productName">{{ sale.productName }}</dd>
+                    <dt *ngIf="sale.partner?.name">{{'overview.partner' | translate}}:</dt>
+                    <dd *ngIf="sale.partner?.name">{{ sale.partner?.name }}</dd>
+                    <dt *ngIf="sale.product?.name">{{'overview.product' | translate}}:</dt>
+                    <dd *ngIf="sale.product?.name">{{ sale.product?.name }}</dd>
                     <dt *ngIf="sale.turnover">{{'overview.turnover' | translate}}:</dt>
                     <dd *ngIf="sale.turnover">{{ sale.turnover }}</dd>
                     <dt *ngIf="sale.profit">{{'overview.profit' | translate}}:</dt>
@@ -38,7 +38,7 @@
                         <div class="card-body">
                             <div class="d-flex justify-content-between align-items-center">
                                 <p>{{ post.createdAt | date:'dd.MM.YYYY' }}</p>
-                                <p>{{ post.ownerName }}</p>
+                                <p>{{ post.owner?.fullName }}</p>
                             </div>
                             <div>
                                 <h3>{{ post.headline }}</h3>
@@ -49,28 +49,28 @@
                         </div>
                     </div>
                     <div *ngIf="post.id && commentsVisibility.get(post.id)">
-                        <div class="card ms-5" *ngFor="let comment of post.comments">
-                            <div class="card-body">
-                                <div class="d-flex justify-content-between align-items-center">
-                                    <p>{{ comment.createdAt | date:'dd.MM.YYYY' }}</p>
-                                    <p>{{ comment.ownerName }}</p>
-                                </div>
-                                <div>
-                                    <p class="m-0" [innerHTML]="appHelperService.getSafeLongtext(comment.message)"></p>
-                                </div>
-                                <span *ngIf="comment.owner === user?.id" class="position-absolute bi bi-pencil p-2" data-type="user-tool"
-                                      data-action="edit" (click)="openModalEditComment(comment)"></span>
-                            </div>
-                        </div>
+<!--                        <div class="card ms-5" *ngFor="let comment of post.comments">-->
+<!--                            <div class="card-body">-->
+<!--                                <div class="d-flex justify-content-between align-items-center">-->
+<!--                                    <p>{{ comment.createdAt | date:'dd.MM.YYYY' }}</p>-->
+<!--                                    <p>{{ comment.ownerName }}</p>-->
+<!--                                </div>-->
+<!--                                <div>-->
+<!--                                    <p class="m-0" [innerHTML]="appHelperService.getSafeLongtext(comment.message)"></p>-->
+<!--                                </div>-->
+<!--                                <span *ngIf="comment.owner === user?.id" class="position-absolute bi bi-pencil p-2" data-type="user-tool"-->
+<!--                                      data-action="edit" (click)="openModalEditComment(comment)"></span>-->
+<!--                            </div>-->
+<!--                        </div>-->
                     </div>
 
                     <div class="d-flex justify-content-end mt-1">
-                        <span *ngIf="post.comments?.length !== 0" role="button" class="badge bg-secondary p-2 me-2"
-                              (click)="showComments(post)">
-                            <ng-container *ngIf="post.id && commentsVisibility.get(post.id)">{{ 'basic.hide-comments' | translate }}</ng-container>
-                            <ng-container *ngIf="post.id && !commentsVisibility.get(post.id)">{{ 'basic.show-comments' | translate }}</ng-container>
-                        </span>
-                        <span role="button" class="badge bg-secondary p-2" (click)="openModalNewComment(post)">{{'basic.comment-it' | translate}}</span>
+<!--                        <span *ngIf="post.comments?.length !== 0" role="button" class="badge bg-secondary p-2 me-2"-->
+<!--                              (click)="showComments(post)">-->
+<!--                            <ng-container *ngIf="post.id && commentsVisibility.get(post.id)">{{ 'basic.hide-comments' | translate }}</ng-container>-->
+<!--                            <ng-container *ngIf="post.id && !commentsVisibility.get(post.id)">{{ 'basic.show-comments' | translate }}</ng-container>-->
+<!--                        </span>-->
+<!--                        <span role="button" class="badge bg-secondary p-2" (click)="openModalNewComment(post)">{{'basic.comment-it' | translate}}</span>-->
                     </div>
                 </div>
             </app-paging>

matsen-tool/src/app/_views/sales/sales-detail/sales-detail.component.ts

@@ -102,9 +102,9 @@ export class SalesDetailComponent implements OnInit, AfterViewInit {
 
     openModalNewPosting() {
         let posting: PostJsonld = {} as PostJsonld;
-        posting.sale = this.sale.id ?? null;
-        posting.partner = this.sale.partner ?? null;
-        posting.product = this.sale.product ?? null;
+        posting.saleIri = this.sale.id ?? null;
+        posting.partnerIri = this.sale.partner?.id ?? null;
+        posting.productIri = this.sale.product?.id ?? null;
         this.appHelperService.openModal(NewPostComponent, { 'posting': posting }, this.getPostsData);
     }
 
@@ -114,7 +114,7 @@ export class SalesDetailComponent implements OnInit, AfterViewInit {
 
     openModalNewComment(post: PostJsonld) {
         let comment: CommentJsonld = {} as CommentJsonld;
-        comment.post = post.id ?? null;
+        comment.postIri = post.id ?? null;
         this.appHelperService.openModal(NewCommentComponent, { 'comment': comment }, this.getPostsData);
     }
 

matsen-tool/src/app/_views/tasks/task-list/task-list.component.html

@@ -15,9 +15,15 @@
                             <div style="display: flex;justify-content: flex-start;align-items: center;">
                                 <span class="importance" [attr.data-importance]="task.prio"></span>
                                 <span class="due-date">{{ task.dueAt | date:'dd.MM.YYYY':'GMT+0000' }}</span>
-                                <h3 class="m-0 ps-3" *ngIf="task.partner"><img src="/assets/images/icons/{{task.partnerType}}.svg" class="icon-mini" alt="" /><a href="/{{task.partnerType}}/{{this.appHelperService.extractId(task.partner)}}">{{task.partnerName}}</a></h3>
-                                <h3 class="m-0 ps-3" *ngIf="task.product"><img src="/assets/images/icons/product.svg" class="icon-mini" alt="" /><a href="/product/{{this.appHelperService.extractId(task.product)}}">{{task.productName}}</a></h3>
-                                <p class="m-0 ps-3"><img src="/assets/images/icons/profile.svg" class="icon-mini" alt="" />{{ task.assignedToName }}</p>
+                                <h3 class="m-0 ps-3" *ngIf="task.partner">
+                                    <app-linked-label [partner]="task.partner"></app-linked-label>
+                                </h3>
+                                <h3 class="m-0 ps-3" *ngIf="task.product">
+                                    <app-linked-label [product]="task.product"></app-linked-label>
+                                </h3>
+                                <p class="m-0 ps-3" *ngIf="task.assignedTo">
+                                    <app-linked-label [user]="task.assignedTo"></app-linked-label>
+                                </p>
                             </div>
                         </div>
                     </div>
@@ -30,15 +36,15 @@
                             <span *ngIf="task.createdBy === currentUser?.id" class="position-absolute bi bi-pencil p-2"
                                   data-type="user-tool" data-action="edit" (click)="openModalEditTask(task)"></span>
                             <div class="spt-comments-box d-flex justify-content-end mt-1 position-absolute">
-                                <span *ngIf="task.taskNotes?.length !== 0" role="button" class="spt-btn-low badge bg-secondary p-2 me-2"
-                                      (click)="showTaskNotes(task)">
-                                    <ng-container
-                                            *ngIf="task.id && taskNotesVisibility.get(task.id)">{{ 'basic.hide-comments' | translate }}</ng-container>
-                                    <ng-container
-                                            *ngIf="task.id && !taskNotesVisibility.get(task.id)">{{ 'basic.show-comments' | translate }}</ng-container>
-                                </span>
-                                <span role="button" class="badge bg-secondary p-2"
-                                      (click)="openModalNewTaskNote(task)">{{ 'basic.comment-it' | translate }}</span>
+<!--                                <span *ngIf="task.taskNotes?.length !== 0" role="button" class="spt-btn-low badge bg-secondary p-2 me-2"-->
+<!--                                      (click)="showTaskNotes(task)">-->
+<!--                                    <ng-container-->
+<!--                                            *ngIf="task.id && taskNotesVisibility.get(task.id)">{{ 'basic.hide-comments' | translate }}</ng-container>-->
+<!--                                    <ng-container-->
+<!--                                            *ngIf="task.id && !taskNotesVisibility.get(task.id)">{{ 'basic.show-comments' | translate }}</ng-container>-->
+<!--                                </span>-->
+<!--                                <span role="button" class="badge bg-secondary p-2"-->
+<!--                                      (click)="openModalNewTaskNote(task)">{{ 'basic.comment-it' | translate }}</span>-->
                             </div>
                         </div>
                     </div>
@@ -47,9 +53,15 @@
                     <div class="row">
                         <div class="col-6">
                             <span class="due-date">{{ task.dueAt | date:'dd.MM.YYYY':'GMT+0000' }}</span>
-                            <h3 class="m-0" *ngIf="task.partner"><img src="/assets/images/icons/{{task.partnerType}}.svg" class="icon-mini" alt="" /><a href="/{{task.partnerType}}/{{this.appHelperService.extractId(task.partner)}}">{{task.partnerName}}</a></h3>
-                            <h3 class="m-0" *ngIf="task.product"><img src="/assets/images/icons/product.svg" class="icon-mini" alt="" /><a href="/product/{{this.appHelperService.extractId(task.product)}}">{{task.productName}}</a></h3>
-                            <p><img src="/assets/images/icons/profile.svg" class="icon-mini" alt="" />{{ task.assignedToName }}</p>
+                            <h3 class="m-0" *ngIf="task.partner">
+                                <app-linked-label [partner]="task.partner"></app-linked-label>
+                            </h3>
+                            <h3 class="m-0" *ngIf="task.product">
+                                <app-linked-label [product]="task.product"></app-linked-label>
+                            </h3>
+                            <p *ngIf="task.assignedTo">
+                                <app-linked-label [user]="task.assignedTo"></app-linked-label>
+                            </p>
                         </div>
                         <div class="spt-border col-8">
                             <span class="importance" [attr.data-importance]="task.prio"></span>
@@ -58,33 +70,33 @@
                             <span *ngIf="task.createdBy === currentUser?.id" class="position-absolute bi bi-pencil p-2"
                                   data-type="user-tool" data-action="edit" (click)="openModalEditTask(task)"></span>
                             <div class="spt-comments-box d-flex justify-content-end mt-1 position-absolute">
-                                <span *ngIf="task.taskNotes?.length !== 0" role="button" class="spt-btn-low badge bg-secondary p-2 me-2"
-                                      (click)="showTaskNotes(task)">
-                                    <ng-container
-                                        *ngIf="task.id && taskNotesVisibility.get(task.id)">{{ 'basic.hide-comments' | translate }}</ng-container>
-                                    <ng-container
-                                        *ngIf="task.id && !taskNotesVisibility.get(task.id)">{{ 'basic.show-comments' | translate }}</ng-container>
-                                </span>
-                                <span role="button" class="badge bg-secondary p-2"
-                                      (click)="openModalNewTaskNote(task)">{{ 'basic.comment-it' | translate }}</span>
+<!--                                <span *ngIf="task.taskNotes?.length !== 0" role="button" class="spt-btn-low badge bg-secondary p-2 me-2"-->
+<!--                                      (click)="showTaskNotes(task)">-->
+<!--                                    <ng-container-->
+<!--                                        *ngIf="task.id && taskNotesVisibility.get(task.id)">{{ 'basic.hide-comments' | translate }}</ng-container>-->
+<!--                                    <ng-container-->
+<!--                                        *ngIf="task.id && !taskNotesVisibility.get(task.id)">{{ 'basic.show-comments' | translate }}</ng-container>-->
+<!--                                </span>-->
+<!--                                <span role="button" class="badge bg-secondary p-2"-->
+<!--                                      (click)="openModalNewTaskNote(task)">{{ 'basic.comment-it' | translate }}</span>-->
                             </div>
                         </div>
                     </div>
                 </div>
                 <div *ngIf="task.id && taskNotesVisibility.get(task.id)" class="pb-1">
-                    <div class="card spt-comments" *ngFor="let taskNote of task.taskNotes">
-                        <div class="card-body">
-                            <div class="d-flex justify-content-between align-items-center">
-                                <p>{{ taskNote.createdAt | date:'dd.MM.YYYY' }}</p>
-                                <p>{{ taskNote.ownerName }}</p>
-                            </div>
-                            <div>
-                                <p [innerHTML]="appHelperService.getSafeLongtext(taskNote.message)"></p>
-                            </div>
-                            <span *ngIf="taskNote.owner === currentUser?.id" class="position-absolute bi bi-pencil p-2"
-                                  data-type="user-tool" data-action="edit" (click)="openModalEditTaskNote(taskNote)"></span>
-                        </div>
-                    </div>
+<!--                    <div class="card spt-comments" *ngFor="let taskNote of task.taskNotes">-->
+<!--                        <div class="card-body">-->
+<!--                            <div class="d-flex justify-content-between align-items-center">-->
+<!--                                <p>{{ taskNote.createdAt | date:'dd.MM.YYYY' }}</p>-->
+<!--                                <p>{{ taskNote.owner?.firstName }} {{ taskNote.owner?.lastName }}</p>-->
+<!--                            </div>-->
+<!--                            <div>-->
+<!--                                <p [innerHTML]="appHelperService.getSafeLongtext(taskNote.message)"></p>-->
+<!--                            </div>-->
+<!--                            <span *ngIf="taskNote.owner === currentUser?.id" class="position-absolute bi bi-pencil p-2"-->
+<!--                                  data-type="user-tool" data-action="edit" (click)="openModalEditTaskNote(taskNote)"></span>-->
+<!--                        </div>-->
+<!--                    </div>-->
                 </div>
             </div>
         </div>

matsen-tool/src/app/_views/tasks/task-list/task-list.component.ts

@@ -81,7 +81,7 @@ export class TaskListComponent implements OnInit, AfterViewInit {
 
     openModalNewTask() {
         let task: TaskJsonld = {} as TaskJsonld;
-        task.partner = this.partner.id ?? null;
+        task.partnerIri = this.partner.id;
         task.completed = false;
         this.appHelperService.openModal(NewTaskComponent, { 'task': task }, this.getData);
     }
@@ -92,7 +92,7 @@ export class TaskListComponent implements OnInit, AfterViewInit {
 
     openModalNewTaskNote(task: TaskJsonld) {
         let taskNote: TaskNoteJsonld = {} as TaskNoteJsonld;
-        taskNote.task = task.id ?? null;
+        taskNote.taskIri = task.id ?? null;
         this.appHelperService.openModal(NewTaskNoteComponent, { 'taskNote': taskNote }, this.getData);
     }
 

matsen-tool/src/app/app.module.ts

@@ -62,6 +62,7 @@ import { UsersComponent } from './_views/user/users.component';
 import { UserDetailComponent } from './_views/user/user-detail/user-detail.component';
 import { UserListComponent } from './_views/user/user-list/user-list.component';
 import { AssignProductComponent } from './_views/products/assign-product/assign-product.component';
+import { LinkedLabelComponent } from './_components/linked-label/linked-label.component';
 
 
 export function apiConfigFactory(): Configuration {
@@ -147,6 +148,7 @@ export function HttpLoaderFactory(http: HttpClient) {
         UserDetailComponent,
         UserListComponent,
         AssignProductComponent,
+        LinkedLabelComponent,
     ],
     providers: [
         {provide: HTTP_INTERCEPTORS, useClass: JwtInterceptor, multi: true},

matsen-tool/src/app/core/api/v1/model/comment.ts

@@ -9,6 +9,7 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
+import { User } from './user';
 
 
 /**
@@ -16,9 +17,11 @@
  */
 export interface Comment { 
     message: string | null;
-    readonly owner?: string | null;
-    readonly ownerName?: string | null;
-    post?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly owner?: User;
+    postIri?: string | null;
     readonly createdAt?: string | null;
 }
 

matsen-tool/src/app/core/api/v1/model/commentJsonhal.ts

@@ -10,6 +10,7 @@
  * Do not edit the class manually.
  */
 import { CommentJsonhalLinks } from './commentJsonhalLinks';
+import { UserJsonhal } from './userJsonhal';
 
 
 /**
@@ -18,9 +19,11 @@ import { CommentJsonhalLinks } from './commentJsonhalLinks';
 export interface CommentJsonhal { 
     _links?: CommentJsonhalLinks;
     message: string | null;
-    readonly owner?: string | null;
-    readonly ownerName?: string | null;
-    post?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly owner?: UserJsonhal;
+    postIri?: string | null;
     readonly createdAt?: string | null;
 }
 

matsen-tool/src/app/core/api/v1/model/commentJsonld.ts

@@ -9,6 +9,7 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
+import { UserJsonld } from './userJsonld';
 import { CommentJsonldContext } from './commentJsonldContext';
 
 
@@ -20,9 +21,11 @@ export interface CommentJsonld {
     readonly id?: string;
     readonly type?: string;
     message: string | null;
-    readonly owner?: string | null;
-    readonly ownerName?: string | null;
-    post?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly owner?: UserJsonld;
+    postIri?: string | null;
     readonly createdAt?: string | null;
 }
 

matsen-tool/src/app/core/api/v1/model/contact.ts

@@ -9,6 +9,8 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
+import { User } from './user';
+import { Partner } from './partner';
 
 
 /**
@@ -17,7 +19,12 @@
 export interface Contact { 
     firstName: string | null;
     lastName: string | null;
-    partner: string | null;
+    fullName?: string | null;
+    /**
+     * ?PartnerApi
+     */
+    readonly partner?: Partner;
+    partnerIri: string | null;
     birthday?: string | null;
     image?: string | null;
     readonly imageUrl?: string | null;
@@ -25,8 +32,10 @@ export interface Contact {
     phone?: string | null;
     email?: string | null;
     posts?: Array<string>;
-    readonly createdBy?: string | null;
-    readonly createdByName?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly createdBy?: User;
     readonly createdAt?: string | null;
 }
 

matsen-tool/src/app/core/api/v1/model/contactJsonhal.ts

@@ -10,6 +10,8 @@
  * Do not edit the class manually.
  */
 import { CommentJsonhalLinks } from './commentJsonhalLinks';
+import { PartnerJsonhal } from './partnerJsonhal';
+import { UserJsonhal } from './userJsonhal';
 
 
 /**
@@ -19,7 +21,12 @@ export interface ContactJsonhal {
     _links?: CommentJsonhalLinks;
     firstName: string | null;
     lastName: string | null;
-    partner: string | null;
+    fullName?: string | null;
+    /**
+     * ?PartnerApi
+     */
+    readonly partner?: PartnerJsonhal;
+    partnerIri: string | null;
     birthday?: string | null;
     image?: string | null;
     readonly imageUrl?: string | null;
@@ -27,8 +34,10 @@ export interface ContactJsonhal {
     phone?: string | null;
     email?: string | null;
     posts?: Array<string>;
-    readonly createdBy?: string | null;
-    readonly createdByName?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly createdBy?: UserJsonhal;
     readonly createdAt?: string | null;
 }
 

matsen-tool/src/app/core/api/v1/model/contactJsonld.ts

@@ -9,7 +9,9 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
+import { UserJsonld } from './userJsonld';
 import { CommentJsonldContext } from './commentJsonldContext';
+import { PartnerJsonld } from './partnerJsonld';
 
 
 /**
@@ -21,7 +23,12 @@ export interface ContactJsonld {
     readonly type?: string;
     firstName: string | null;
     lastName: string | null;
-    partner: string | null;
+    fullName?: string | null;
+    /**
+     * ?PartnerApi
+     */
+    readonly partner?: PartnerJsonld;
+    partnerIri: string | null;
     birthday?: string | null;
     image?: string | null;
     readonly imageUrl?: string | null;
@@ -29,8 +36,10 @@ export interface ContactJsonld {
     phone?: string | null;
     email?: string | null;
     posts?: Array<string>;
-    readonly createdBy?: string | null;
-    readonly createdByName?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly createdBy?: UserJsonld;
     readonly createdAt?: string | null;
 }
 

matsen-tool/src/app/core/api/v1/model/contactPartnerProduct.ts

@@ -16,13 +16,12 @@ import { Product } from './product';
  * 
  */
 export interface ContactPartnerProduct { 
-    contact: string | null;
-    partnerProduct: string | null;
+    contactIri: string | null;
+    partnerProductIri: string | null;
     /**
      * ?ProductApi
      */
-    product: Product;
-    readonly productName?: string | null;
+    readonly product?: Product;
     readonly createdAt?: string | null;
 }
 

matsen-tool/src/app/core/api/v1/model/contactPartnerProductJsonhal.ts

@@ -18,13 +18,12 @@ import { ProductJsonhal } from './productJsonhal';
  */
 export interface ContactPartnerProductJsonhal { 
     _links?: CommentJsonhalLinks;
-    contact: string | null;
-    partnerProduct: string | null;
+    contactIri: string | null;
+    partnerProductIri: string | null;
     /**
      * ?ProductApi
      */
-    product: ProductJsonhal;
-    readonly productName?: string | null;
+    readonly product?: ProductJsonhal;
     readonly createdAt?: string | null;
 }
 

matsen-tool/src/app/core/api/v1/model/contactPartnerProductJsonld.ts

@@ -20,13 +20,12 @@ export interface ContactPartnerProductJsonld {
     context?: CommentJsonldContext;
     readonly id?: string;
     readonly type?: string;
-    contact: string | null;
-    partnerProduct: string | null;
+    contactIri: string | null;
+    partnerProductIri: string | null;
     /**
      * ?ProductApi
      */
-    product: ProductJsonld;
-    readonly productName?: string | null;
+    readonly product?: ProductJsonld;
     readonly createdAt?: string | null;
 }
 

matsen-tool/src/app/core/api/v1/model/document.ts

@@ -9,6 +9,9 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
+import { User } from './user';
+import { Product } from './product';
+import { Partner } from './partner';
 
 
 /**
@@ -17,14 +20,22 @@
 export interface Document { 
     name: string | null;
     description?: string | null;
-    partner?: string | null;
-    readonly partnerName?: string | null;
-    product?: string | null;
-    readonly productName?: string | null;
+    /**
+     * ?PartnerApi
+     */
+    readonly partner?: Partner;
+    partnerIri?: string | null;
+    /**
+     * ?ProductApi
+     */
+    readonly product?: Product;
+    productIri?: string | null;
     documentObject: string | null;
     readonly documentUrl?: string | null;
-    readonly createdBy?: string | null;
-    readonly createdByName?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly createdBy?: User;
     readonly createdAt?: string | null;
 }
 

matsen-tool/src/app/core/api/v1/model/documentJsonhal.ts

@@ -10,6 +10,9 @@
  * Do not edit the class manually.
  */
 import { CommentJsonhalLinks } from './commentJsonhalLinks';
+import { ProductJsonhal } from './productJsonhal';
+import { PartnerJsonhal } from './partnerJsonhal';
+import { UserJsonhal } from './userJsonhal';
 
 
 /**
@@ -19,14 +22,22 @@ export interface DocumentJsonhal {
     _links?: CommentJsonhalLinks;
     name: string | null;
     description?: string | null;
-    partner?: string | null;
-    readonly partnerName?: string | null;
-    product?: string | null;
-    readonly productName?: string | null;
+    /**
+     * ?PartnerApi
+     */
+    readonly partner?: PartnerJsonhal;
+    partnerIri?: string | null;
+    /**
+     * ?ProductApi
+     */
+    readonly product?: ProductJsonhal;
+    productIri?: string | null;
     documentObject: string | null;
     readonly documentUrl?: string | null;
-    readonly createdBy?: string | null;
-    readonly createdByName?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly createdBy?: UserJsonhal;
     readonly createdAt?: string | null;
 }
 

matsen-tool/src/app/core/api/v1/model/documentJsonld.ts

@@ -9,7 +9,10 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
+import { UserJsonld } from './userJsonld';
 import { CommentJsonldContext } from './commentJsonldContext';
+import { ProductJsonld } from './productJsonld';
+import { PartnerJsonld } from './partnerJsonld';
 
 
 /**
@@ -21,14 +24,22 @@ export interface DocumentJsonld {
     readonly type?: string;
     name: string | null;
     description?: string | null;
-    partner?: string | null;
-    readonly partnerName?: string | null;
-    product?: string | null;
-    readonly productName?: string | null;
+    /**
+     * ?PartnerApi
+     */
+    readonly partner?: PartnerJsonld;
+    partnerIri?: string | null;
+    /**
+     * ?ProductApi
+     */
+    readonly product?: ProductJsonld;
+    productIri?: string | null;
     documentObject: string | null;
     readonly documentUrl?: string | null;
-    readonly createdBy?: string | null;
-    readonly createdByName?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly createdBy?: UserJsonld;
     readonly createdAt?: string | null;
 }
 

matsen-tool/src/app/core/api/v1/model/partner.ts

@@ -26,15 +26,8 @@ export interface Partner {
     website?: string | null;
     logo?: string | null;
     readonly logoUrl?: string | null;
-    readonly createdBy?: string | null;
-    readonly createdByName?: string | null;
+    readonly createdByIri?: string | null;
     readonly createdAt?: string | null;
-    /**
-     * array<int, PostingApi>
-     */
-    posts?: Array<string>;
-    contacts?: Array<string>;
-    partnerProducts?: Array<string>;
 }
 export namespace Partner {
     export type PartnerTypeEnum = 'customer' | 'supplier' | 'service';

matsen-tool/src/app/core/api/v1/model/partnerFollow.ts

@@ -16,13 +16,12 @@ import { Partner } from './partner';
  * 
  */
 export interface PartnerFollow { 
-    readonly user?: string | null;
-    readonly userName?: string | null;
+    userIri?: string | null;
     /**
      * ?PartnerApi
      */
-    partner: Partner;
-    readonly partnerName?: string | null;
+    readonly partner?: Partner;
+    partnerIri: string | null;
     readonly createdAt?: string | null;
     readonly owner?: string | null;
 }

matsen-tool/src/app/core/api/v1/model/partnerFollowJsonhal.ts

@@ -18,13 +18,12 @@ import { PartnerJsonhal } from './partnerJsonhal';
  */
 export interface PartnerFollowJsonhal { 
     _links?: CommentJsonhalLinks;
-    readonly user?: string | null;
-    readonly userName?: string | null;
+    userIri?: string | null;
     /**
      * ?PartnerApi
      */
-    partner: PartnerJsonhal;
-    readonly partnerName?: string | null;
+    readonly partner?: PartnerJsonhal;
+    partnerIri: string | null;
     readonly createdAt?: string | null;
     readonly owner?: string | null;
 }

matsen-tool/src/app/core/api/v1/model/partnerFollowJsonld.ts

@@ -20,13 +20,12 @@ export interface PartnerFollowJsonld {
     context?: CommentJsonldContext;
     readonly id?: string;
     readonly type?: string;
-    readonly user?: string | null;
-    readonly userName?: string | null;
+    userIri?: string | null;
     /**
      * ?PartnerApi
      */
-    partner: PartnerJsonld;
-    readonly partnerName?: string | null;
+    readonly partner?: PartnerJsonld;
+    partnerIri: string | null;
     readonly createdAt?: string | null;
     readonly owner?: string | null;
 }

matsen-tool/src/app/core/api/v1/model/partnerJsonhal.ts

@@ -28,15 +28,8 @@ export interface PartnerJsonhal {
     website?: string | null;
     logo?: string | null;
     readonly logoUrl?: string | null;
-    readonly createdBy?: string | null;
-    readonly createdByName?: string | null;
+    readonly createdByIri?: string | null;
     readonly createdAt?: string | null;
-    /**
-     * array<int, PostingApi>
-     */
-    posts?: Array<string>;
-    contacts?: Array<string>;
-    readonly partnerProducts?: any | null;
 }
 export namespace PartnerJsonhal {
     export type PartnerTypeEnum = 'customer' | 'supplier' | 'service';

matsen-tool/src/app/core/api/v1/model/partnerJsonld.ts

@@ -30,15 +30,8 @@ export interface PartnerJsonld {
     website?: string | null;
     logo?: string | null;
     readonly logoUrl?: string | null;
-    readonly createdBy?: string | null;
-    readonly createdByName?: string | null;
+    readonly createdByIri?: string | null;
     readonly createdAt?: string | null;
-    /**
-     * array<int, PostingApi>
-     */
-    posts?: Array<string>;
-    contacts?: Array<string>;
-    partnerProducts?: Array<string>;
 }
 export namespace PartnerJsonld {
     export type PartnerTypeEnum = 'customer' | 'supplier' | 'service';

matsen-tool/src/app/core/api/v1/model/partnerProduct.ts

@@ -20,13 +20,13 @@ export interface PartnerProduct {
     /**
      * ?PartnerApi
      */
-    partner: Partner;
-    readonly partnerName?: string | null;
+    readonly partner?: Partner;
+    partnerIri: string | null;
     /**
      * ?ProductApi
      */
-    product: Product;
-    readonly productName?: string | null;
+    product?: Product;
+    productIri: string | null;
     readonly createdAt?: string | null;
 }
 

matsen-tool/src/app/core/api/v1/model/partnerProductJsonhal.ts

@@ -22,13 +22,13 @@ export interface PartnerProductJsonhal {
     /**
      * ?PartnerApi
      */
-    partner: PartnerJsonhal;
-    readonly partnerName?: string | null;
+    readonly partner?: PartnerJsonhal;
+    partnerIri: string | null;
     /**
      * ?ProductApi
      */
-    product: ProductJsonhal;
-    readonly productName?: string | null;
+    product?: ProductJsonhal;
+    productIri: string | null;
     readonly createdAt?: string | null;
 }
 

matsen-tool/src/app/core/api/v1/model/partnerProductJsonld.ts

@@ -24,13 +24,13 @@ export interface PartnerProductJsonld {
     /**
      * ?PartnerApi
      */
-    partner: PartnerJsonld;
-    readonly partnerName?: string | null;
+    readonly partner?: PartnerJsonld;
+    partnerIri: string | null;
     /**
      * ?ProductApi
      */
-    product: ProductJsonld;
-    readonly productName?: string | null;
+    product?: ProductJsonld;
+    productIri: string | null;
     readonly createdAt?: string | null;
 }
 

matsen-tool/src/app/core/api/v1/model/post.ts

@@ -9,7 +9,10 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-import { Comment } from './comment';
+import { User } from './user';
+import { Product } from './product';
+import { Partner } from './partner';
+import { Contact } from './contact';
 
 
 /**
@@ -18,30 +21,30 @@ import { Comment } from './comment';
 export interface Post { 
     headline: string | null;
     message: string | null;
-    readonly owner?: string | null;
-    readonly ownerName?: string | null;
-    partner?: string | null;
-    readonly partnerName?: string | null;
-    readonly partnerType?: Post.PartnerTypeEnum | null;
-    product?: string | null;
-    readonly productName?: string | null;
-    contact?: string | null;
-    readonly contactName?: string | null;
-    sale?: string | null;
     /**
-     * array<int, CommentApi>
+     * ?UserApi
      */
-    comments?: Array<Comment>;
+    readonly owner?: User;
+    /**
+     * ?PartnerApi
+     */
+    readonly partner?: Partner;
+    partnerIri?: string | null;
+    /**
+     * ?ProductApi
+     */
+    readonly product?: Product;
+    productIri?: string | null;
+    /**
+     * ?ContactApi
+     */
+    readonly contact?: Contact;
+    contactIri?: string | null;
+    /**
+     * ?SaleApi
+     */
+    readonly sale?: Contact;
+    saleIri?: string | null;
     readonly createdAt?: string | null;
 }
-export namespace Post {
-    export type PartnerTypeEnum = 'customer' | 'supplier' | 'service' | 'null';
-    export const PartnerTypeEnum = {
-        Customer: 'customer' as PartnerTypeEnum,
-        Supplier: 'supplier' as PartnerTypeEnum,
-        Service: 'service' as PartnerTypeEnum,
-        Null: 'null' as PartnerTypeEnum
-    };
-}
-
 

matsen-tool/src/app/core/api/v1/model/postJsonhal.ts

@@ -10,7 +10,10 @@
  * Do not edit the class manually.
  */
 import { CommentJsonhalLinks } from './commentJsonhalLinks';
-import { CommentJsonhal } from './commentJsonhal';
+import { ProductJsonhal } from './productJsonhal';
+import { ContactJsonhal } from './contactJsonhal';
+import { PartnerJsonhal } from './partnerJsonhal';
+import { UserJsonhal } from './userJsonhal';
 
 
 /**
@@ -20,30 +23,30 @@ export interface PostJsonhal {
     _links?: CommentJsonhalLinks;
     headline: string | null;
     message: string | null;
-    readonly owner?: string | null;
-    readonly ownerName?: string | null;
-    partner?: string | null;
-    readonly partnerName?: string | null;
-    readonly partnerType?: PostJsonhal.PartnerTypeEnum | null;
-    product?: string | null;
-    readonly productName?: string | null;
-    contact?: string | null;
-    readonly contactName?: string | null;
-    sale?: string | null;
     /**
-     * array<int, CommentApi>
+     * ?UserApi
      */
-    comments?: Array<CommentJsonhal>;
+    readonly owner?: UserJsonhal;
+    /**
+     * ?PartnerApi
+     */
+    readonly partner?: PartnerJsonhal;
+    partnerIri?: string | null;
+    /**
+     * ?ProductApi
+     */
+    readonly product?: ProductJsonhal;
+    productIri?: string | null;
+    /**
+     * ?ContactApi
+     */
+    readonly contact?: ContactJsonhal;
+    contactIri?: string | null;
+    /**
+     * ?SaleApi
+     */
+    readonly sale?: ContactJsonhal;
+    saleIri?: string | null;
     readonly createdAt?: string | null;
 }
-export namespace PostJsonhal {
-    export type PartnerTypeEnum = 'customer' | 'supplier' | 'service' | 'null';
-    export const PartnerTypeEnum = {
-        Customer: 'customer' as PartnerTypeEnum,
-        Supplier: 'supplier' as PartnerTypeEnum,
-        Service: 'service' as PartnerTypeEnum,
-        Null: 'null' as PartnerTypeEnum
-    };
-}
-
 

matsen-tool/src/app/core/api/v1/model/postJsonhalPostingCreate.ts

@@ -19,9 +19,9 @@ export interface PostJsonhalPostingCreate {
     _links?: CommentJsonhalLinks;
     headline: string | null;
     message: string | null;
-    partner?: string | null;
-    product?: string | null;
-    contact?: string | null;
-    sale?: string | null;
+    partnerIri?: string | null;
+    productIri?: string | null;
+    contactIri?: string | null;
+    saleIri?: string | null;
 }
 

matsen-tool/src/app/core/api/v1/model/postJsonld.ts

@@ -9,8 +9,11 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-import { CommentJsonld } from './commentJsonld';
+import { ContactJsonld } from './contactJsonld';
+import { UserJsonld } from './userJsonld';
 import { CommentJsonldContext } from './commentJsonldContext';
+import { ProductJsonld } from './productJsonld';
+import { PartnerJsonld } from './partnerJsonld';
 
 
 /**
@@ -22,30 +25,30 @@ export interface PostJsonld {
     readonly type?: string;
     headline: string | null;
     message: string | null;
-    readonly owner?: string | null;
-    readonly ownerName?: string | null;
-    partner?: string | null;
-    readonly partnerName?: string | null;
-    readonly partnerType?: PostJsonld.PartnerTypeEnum | null;
-    product?: string | null;
-    readonly productName?: string | null;
-    contact?: string | null;
-    readonly contactName?: string | null;
-    sale?: string | null;
     /**
-     * array<int, CommentApi>
+     * ?UserApi
      */
-    comments?: Array<CommentJsonld>;
+    readonly owner?: UserJsonld;
+    /**
+     * ?PartnerApi
+     */
+    readonly partner?: PartnerJsonld;
+    partnerIri?: string | null;
+    /**
+     * ?ProductApi
+     */
+    readonly product?: ProductJsonld;
+    productIri?: string | null;
+    /**
+     * ?ContactApi
+     */
+    readonly contact?: ContactJsonld;
+    contactIri?: string | null;
+    /**
+     * ?SaleApi
+     */
+    readonly sale?: ContactJsonld;
+    saleIri?: string | null;
     readonly createdAt?: string | null;
 }
-export namespace PostJsonld {
-    export type PartnerTypeEnum = 'customer' | 'supplier' | 'service' | 'null';
-    export const PartnerTypeEnum = {
-        Customer: 'customer' as PartnerTypeEnum,
-        Supplier: 'supplier' as PartnerTypeEnum,
-        Service: 'service' as PartnerTypeEnum,
-        Null: 'null' as PartnerTypeEnum
-    };
-}
-
 

matsen-tool/src/app/core/api/v1/model/postJsonldPostingCreate.ts

@@ -17,9 +17,9 @@
 export interface PostJsonldPostingCreate { 
     headline: string | null;
     message: string | null;
-    partner?: string | null;
-    product?: string | null;
-    contact?: string | null;
-    sale?: string | null;
+    partnerIri?: string | null;
+    productIri?: string | null;
+    contactIri?: string | null;
+    saleIri?: string | null;
 }
 

matsen-tool/src/app/core/api/v1/model/postPostingCreate.ts

@@ -17,9 +17,9 @@
 export interface PostPostingCreate { 
     headline: string | null;
     message: string | null;
-    partner?: string | null;
-    product?: string | null;
-    contact?: string | null;
-    sale?: string | null;
+    partnerIri?: string | null;
+    productIri?: string | null;
+    contactIri?: string | null;
+    saleIri?: string | null;
 }
 

matsen-tool/src/app/core/api/v1/model/product.ts

@@ -9,6 +9,7 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
+import { User } from './user';
 
 
 /**
@@ -19,8 +20,10 @@ export interface Product {
     description?: string | null;
     image?: string | null;
     readonly imageUrl?: string | null;
-    readonly createdBy?: string | null;
-    readonly createdByName?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly createdBy?: User;
     createdAt?: string | null;
 }
 

matsen-tool/src/app/core/api/v1/model/productJsonhal.ts

@@ -10,6 +10,7 @@
  * Do not edit the class manually.
  */
 import { CommentJsonhalLinks } from './commentJsonhalLinks';
+import { UserJsonhal } from './userJsonhal';
 
 
 /**
@@ -21,8 +22,10 @@ export interface ProductJsonhal {
     description?: string | null;
     image?: string | null;
     readonly imageUrl?: string | null;
-    readonly createdBy?: string | null;
-    readonly createdByName?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly createdBy?: UserJsonhal;
     createdAt?: string | null;
 }
 

matsen-tool/src/app/core/api/v1/model/productJsonld.ts

@@ -9,6 +9,7 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
+import { UserJsonld } from './userJsonld';
 import { CommentJsonldContext } from './commentJsonldContext';
 
 
@@ -23,8 +24,10 @@ export interface ProductJsonld {
     description?: string | null;
     image?: string | null;
     readonly imageUrl?: string | null;
-    readonly createdBy?: string | null;
-    readonly createdByName?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly createdBy?: UserJsonld;
     createdAt?: string | null;
 }
 

matsen-tool/src/app/core/api/v1/model/sale.ts

@@ -9,36 +9,33 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
+import { User } from './user';
+import { Product } from './product';
+import { Partner } from './partner';
 
 
 /**
  * 
  */
 export interface Sale { 
-    readonly owner?: string | null;
-    readonly ownerName?: string | null;
-    partner: string | null;
-    readonly partnerType?: Sale.PartnerTypeEnum;
-    readonly partnerName?: string | null;
-    product: string | null;
-    readonly productName?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly owner?: User;
+    /**
+     * ?PartnerApi
+     */
+    readonly partner?: Partner;
+    partnerIri: string | null;
+    /**
+     * ?ProductApi
+     */
+    readonly product?: Product;
+    productIri: string | null;
     turnover: number | null;
     profit: number | null;
     quantity: number | null;
     comment?: string | null;
     readonly createdAt?: string | null;
-    /**
-     * array<int, PostingApi>
-     */
-    posts?: Array<string>;
 }
-export namespace Sale {
-    export type PartnerTypeEnum = 'customer' | 'supplier' | 'service';
-    export const PartnerTypeEnum = {
-        Customer: 'customer' as PartnerTypeEnum,
-        Supplier: 'supplier' as PartnerTypeEnum,
-        Service: 'service' as PartnerTypeEnum
-    };
-}
-
 

matsen-tool/src/app/core/api/v1/model/saleJsonhal.ts

@@ -10,6 +10,9 @@
  * Do not edit the class manually.
  */
 import { CommentJsonhalLinks } from './commentJsonhalLinks';
+import { ProductJsonhal } from './productJsonhal';
+import { PartnerJsonhal } from './partnerJsonhal';
+import { UserJsonhal } from './userJsonhal';
 
 
 /**
@@ -17,30 +20,24 @@ import { CommentJsonhalLinks } from './commentJsonhalLinks';
  */
 export interface SaleJsonhal { 
     _links?: CommentJsonhalLinks;
-    readonly owner?: string | null;
-    readonly ownerName?: string | null;
-    partner: string | null;
-    readonly partnerType?: SaleJsonhal.PartnerTypeEnum;
-    readonly partnerName?: string | null;
-    product: string | null;
-    readonly productName?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly owner?: UserJsonhal;
+    /**
+     * ?PartnerApi
+     */
+    readonly partner?: PartnerJsonhal;
+    partnerIri: string | null;
+    /**
+     * ?ProductApi
+     */
+    readonly product?: ProductJsonhal;
+    productIri: string | null;
     turnover: number | null;
     profit: number | null;
     quantity: number | null;
     comment?: string | null;
     readonly createdAt?: string | null;
-    /**
-     * array<int, PostingApi>
-     */
-    posts?: Array<string>;
 }
-export namespace SaleJsonhal {
-    export type PartnerTypeEnum = 'customer' | 'supplier' | 'service';
-    export const PartnerTypeEnum = {
-        Customer: 'customer' as PartnerTypeEnum,
-        Supplier: 'supplier' as PartnerTypeEnum,
-        Service: 'service' as PartnerTypeEnum
-    };
-}
-
 

matsen-tool/src/app/core/api/v1/model/saleJsonld.ts

@@ -9,7 +9,10 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
+import { UserJsonld } from './userJsonld';
 import { CommentJsonldContext } from './commentJsonldContext';
+import { ProductJsonld } from './productJsonld';
+import { PartnerJsonld } from './partnerJsonld';
 
 
 /**
@@ -19,30 +22,24 @@ export interface SaleJsonld {
     context?: CommentJsonldContext;
     readonly id?: string;
     readonly type?: string;
-    readonly owner?: string | null;
-    readonly ownerName?: string | null;
-    partner: string | null;
-    readonly partnerType?: SaleJsonld.PartnerTypeEnum;
-    readonly partnerName?: string | null;
-    product: string | null;
-    readonly productName?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly owner?: UserJsonld;
+    /**
+     * ?PartnerApi
+     */
+    readonly partner?: PartnerJsonld;
+    partnerIri: string | null;
+    /**
+     * ?ProductApi
+     */
+    readonly product?: ProductJsonld;
+    productIri: string | null;
     turnover: number | null;
     profit: number | null;
     quantity: number | null;
     comment?: string | null;
     readonly createdAt?: string | null;
-    /**
-     * array<int, PostingApi>
-     */
-    posts?: Array<string>;
 }
-export namespace SaleJsonld {
-    export type PartnerTypeEnum = 'customer' | 'supplier' | 'service';
-    export const PartnerTypeEnum = {
-        Customer: 'customer' as PartnerTypeEnum,
-        Supplier: 'supplier' as PartnerTypeEnum,
-        Service: 'service' as PartnerTypeEnum
-    };
-}
-
 

matsen-tool/src/app/core/api/v1/model/saleSummary.ts

@@ -9,6 +9,7 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
+import { User } from './user';
 
 
 /**
@@ -16,8 +17,10 @@
  */
 export interface SaleSummary { 
     userId?: number;
-    owner?: string | null;
-    ownerName?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly owner?: User;
     turnover?: number | null;
     profit?: number | null;
 }

matsen-tool/src/app/core/api/v1/model/saleSummaryJsonhal.ts

@@ -10,6 +10,7 @@
  * Do not edit the class manually.
  */
 import { CommentJsonhalLinks } from './commentJsonhalLinks';
+import { UserJsonhal } from './userJsonhal';
 
 
 /**
@@ -18,8 +19,10 @@ import { CommentJsonhalLinks } from './commentJsonhalLinks';
 export interface SaleSummaryJsonhal { 
     _links?: CommentJsonhalLinks;
     userId?: number;
-    owner?: string | null;
-    ownerName?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly owner?: UserJsonhal;
     turnover?: number | null;
     profit?: number | null;
 }

matsen-tool/src/app/core/api/v1/model/saleSummaryJsonld.ts

@@ -9,6 +9,7 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
+import { UserJsonld } from './userJsonld';
 import { CommentJsonldContext } from './commentJsonldContext';
 
 
@@ -20,8 +21,10 @@ export interface SaleSummaryJsonld {
     readonly type?: string;
     context?: CommentJsonldContext;
     userId?: number;
-    owner?: string | null;
-    ownerName?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly owner?: UserJsonld;
     turnover?: number | null;
     profit?: number | null;
 }

matsen-tool/src/app/core/api/v1/model/task.ts

@@ -9,7 +9,10 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-import { TaskNote } from './taskNote';
+import { User } from './user';
+import { Product } from './product';
+import { Partner } from './partner';
+import { Contact } from './contact';
 
 
 /**
@@ -18,34 +21,36 @@ import { TaskNote } from './taskNote';
 export interface Task { 
     headline: string | null;
     description: string | null;
-    readonly createdBy?: string | null;
-    readonly createdByName?: string | null;
-    assignedTo: string | null;
-    readonly assignedToName?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly createdBy?: User;
+    /**
+     * ?UserApi
+     */
+    readonly assignedTo?: User;
+    assignedToIri: string | null;
     dueAt: string | null;
-    partner?: string | null;
-    readonly partnerName?: string | null;
-    readonly partnerType?: Task.PartnerTypeEnum | null;
-    product: string | null;
-    readonly productName?: string | null;
-    contact?: string | null;
-    readonly contactName?: string | null;
-    prio: Task.PrioEnum;
-    completed: boolean | null;
     /**
-     * array<int, TaskNoteApi>
+     * ?PartnerApi
      */
-    taskNotes?: Array<TaskNote>;
+    readonly partner?: Partner;
+    partnerIri?: string | null;
+    /**
+     * ?ProductApi
+     */
+    readonly product?: Product;
+    productIri: string | null;
+    /**
+     * ?ContactApi
+     */
+    readonly contact?: Contact;
+    contactIri?: string | null;
+    prio: Task.PrioEnum;
+    completed: boolean | null;
     readonly createdAt?: string | null;
 }
 export namespace Task {
-    export type PartnerTypeEnum = 'customer' | 'supplier' | 'service' | 'null';
-    export const PartnerTypeEnum = {
-        Customer: 'customer' as PartnerTypeEnum,
-        Supplier: 'supplier' as PartnerTypeEnum,
-        Service: 'service' as PartnerTypeEnum,
-        Null: 'null' as PartnerTypeEnum
-    };
     export type PrioEnum = 'low' | 'medium' | 'high';
     export const PrioEnum = {
         Low: 'low' as PrioEnum,

matsen-tool/src/app/core/api/v1/model/taskJsonhal.ts

@@ -10,7 +10,10 @@
  * Do not edit the class manually.
  */
 import { CommentJsonhalLinks } from './commentJsonhalLinks';
-import { TaskNoteJsonhal } from './taskNoteJsonhal';
+import { ProductJsonhal } from './productJsonhal';
+import { ContactJsonhal } from './contactJsonhal';
+import { PartnerJsonhal } from './partnerJsonhal';
+import { UserJsonhal } from './userJsonhal';
 
 
 /**
@@ -20,34 +23,36 @@ export interface TaskJsonhal {
     _links?: CommentJsonhalLinks;
     headline: string | null;
     description: string | null;
-    readonly createdBy?: string | null;
-    readonly createdByName?: string | null;
-    assignedTo: string | null;
-    readonly assignedToName?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly createdBy?: UserJsonhal;
+    /**
+     * ?UserApi
+     */
+    readonly assignedTo?: UserJsonhal;
+    assignedToIri: string | null;
     dueAt: string | null;
-    partner?: string | null;
-    readonly partnerName?: string | null;
-    readonly partnerType?: TaskJsonhal.PartnerTypeEnum | null;
-    product: string | null;
-    readonly productName?: string | null;
-    contact?: string | null;
-    readonly contactName?: string | null;
-    prio: TaskJsonhal.PrioEnum;
-    completed: boolean | null;
     /**
-     * array<int, TaskNoteApi>
+     * ?PartnerApi
      */
-    taskNotes?: Array<TaskNoteJsonhal>;
+    readonly partner?: PartnerJsonhal;
+    partnerIri?: string | null;
+    /**
+     * ?ProductApi
+     */
+    readonly product?: ProductJsonhal;
+    productIri: string | null;
+    /**
+     * ?ContactApi
+     */
+    readonly contact?: ContactJsonhal;
+    contactIri?: string | null;
+    prio: TaskJsonhal.PrioEnum;
+    completed: boolean | null;
     readonly createdAt?: string | null;
 }
 export namespace TaskJsonhal {
-    export type PartnerTypeEnum = 'customer' | 'supplier' | 'service' | 'null';
-    export const PartnerTypeEnum = {
-        Customer: 'customer' as PartnerTypeEnum,
-        Supplier: 'supplier' as PartnerTypeEnum,
-        Service: 'service' as PartnerTypeEnum,
-        Null: 'null' as PartnerTypeEnum
-    };
     export type PrioEnum = 'low' | 'medium' | 'high';
     export const PrioEnum = {
         Low: 'low' as PrioEnum,

matsen-tool/src/app/core/api/v1/model/taskJsonld.ts

@@ -9,8 +9,11 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
+import { ContactJsonld } from './contactJsonld';
+import { UserJsonld } from './userJsonld';
 import { CommentJsonldContext } from './commentJsonldContext';
-import { TaskNoteJsonld } from './taskNoteJsonld';
+import { ProductJsonld } from './productJsonld';
+import { PartnerJsonld } from './partnerJsonld';
 
 
 /**
@@ -22,34 +25,36 @@ export interface TaskJsonld {
     readonly type?: string;
     headline: string | null;
     description: string | null;
-    readonly createdBy?: string | null;
-    readonly createdByName?: string | null;
-    assignedTo: string | null;
-    readonly assignedToName?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly createdBy?: UserJsonld;
+    /**
+     * ?UserApi
+     */
+    readonly assignedTo?: UserJsonld;
+    assignedToIri: string | null;
     dueAt: string | null;
-    partner?: string | null;
-    readonly partnerName?: string | null;
-    readonly partnerType?: TaskJsonld.PartnerTypeEnum | null;
-    product: string | null;
-    readonly productName?: string | null;
-    contact?: string | null;
-    readonly contactName?: string | null;
-    prio: TaskJsonld.PrioEnum;
-    completed: boolean | null;
     /**
-     * array<int, TaskNoteApi>
+     * ?PartnerApi
      */
-    taskNotes?: Array<TaskNoteJsonld>;
+    readonly partner?: PartnerJsonld;
+    partnerIri?: string | null;
+    /**
+     * ?ProductApi
+     */
+    readonly product?: ProductJsonld;
+    productIri: string | null;
+    /**
+     * ?ContactApi
+     */
+    readonly contact?: ContactJsonld;
+    contactIri?: string | null;
+    prio: TaskJsonld.PrioEnum;
+    completed: boolean | null;
     readonly createdAt?: string | null;
 }
 export namespace TaskJsonld {
-    export type PartnerTypeEnum = 'customer' | 'supplier' | 'service' | 'null';
-    export const PartnerTypeEnum = {
-        Customer: 'customer' as PartnerTypeEnum,
-        Supplier: 'supplier' as PartnerTypeEnum,
-        Service: 'service' as PartnerTypeEnum,
-        Null: 'null' as PartnerTypeEnum
-    };
     export type PrioEnum = 'low' | 'medium' | 'high';
     export const PrioEnum = {
         Low: 'low' as PrioEnum,

matsen-tool/src/app/core/api/v1/model/taskNote.ts

@@ -9,6 +9,7 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
+import { User } from './user';
 
 
 /**
@@ -16,9 +17,11 @@
  */
 export interface TaskNote { 
     message: string | null;
-    readonly owner?: string | null;
-    readonly ownerName?: string | null;
-    task?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly owner?: User;
+    taskIri: string | null;
     readonly createdAt?: string | null;
 }
 

matsen-tool/src/app/core/api/v1/model/taskNoteJsonhal.ts

@@ -10,6 +10,7 @@
  * Do not edit the class manually.
  */
 import { CommentJsonhalLinks } from './commentJsonhalLinks';
+import { UserJsonhal } from './userJsonhal';
 
 
 /**
@@ -18,9 +19,11 @@ import { CommentJsonhalLinks } from './commentJsonhalLinks';
 export interface TaskNoteJsonhal { 
     _links?: CommentJsonhalLinks;
     message: string | null;
-    readonly owner?: string | null;
-    readonly ownerName?: string | null;
-    task?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly owner?: UserJsonhal;
+    taskIri: string | null;
     readonly createdAt?: string | null;
 }
 

matsen-tool/src/app/core/api/v1/model/taskNoteJsonld.ts

@@ -9,6 +9,7 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
+import { UserJsonld } from './userJsonld';
 import { CommentJsonldContext } from './commentJsonldContext';
 
 
@@ -20,9 +21,11 @@ export interface TaskNoteJsonld {
     readonly id?: string;
     readonly type?: string;
     message: string | null;
-    readonly owner?: string | null;
-    readonly ownerName?: string | null;
-    task?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly owner?: UserJsonld;
+    taskIri: string | null;
     readonly createdAt?: string | null;
 }
 

matsen-tool/src/app/core/api/v1/model/user.ts

@@ -20,6 +20,7 @@ export interface User {
     lastName: string | null;
     image?: string | null;
     readonly imageUrl?: string | null;
+    readonly fullName?: string | null;
     /**
      * The plaintext password when being set or changed.
      */

matsen-tool/src/app/core/api/v1/model/userJsonhal.ts

@@ -22,6 +22,7 @@ export interface UserJsonhal {
     lastName: string | null;
     image?: string | null;
     readonly imageUrl?: string | null;
+    readonly fullName?: string | null;
     /**
      * The plaintext password when being set or changed.
      */

matsen-tool/src/app/core/api/v1/model/userJsonld.ts

@@ -24,6 +24,7 @@ export interface UserJsonld {
     lastName: string | null;
     image?: string | null;
     readonly imageUrl?: string | null;
+    readonly fullName?: string | null;
     /**
      * The plaintext password when being set or changed.
      */

matsen-tool/src/app/core/api/v1/model/userProduct.ts

@@ -9,6 +9,7 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
+import { User } from './user';
 import { Product } from './product';
 
 
@@ -16,13 +17,15 @@ import { Product } from './product';
  * 
  */
 export interface UserProduct { 
-    readonly user?: string | null;
-    readonly userName?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly user?: User;
     /**
      * ?ProductApi
      */
-    product: Product;
-    readonly productName?: string | null;
+    readonly product?: Product;
+    productIri: string | null;
     readonly createdAt?: string | null;
     readonly owner?: string | null;
 }

matsen-tool/src/app/core/api/v1/model/userProductJsonhal.ts

@@ -11,6 +11,7 @@
  */
 import { CommentJsonhalLinks } from './commentJsonhalLinks';
 import { ProductJsonhal } from './productJsonhal';
+import { UserJsonhal } from './userJsonhal';
 
 
 /**
@@ -18,13 +19,15 @@ import { ProductJsonhal } from './productJsonhal';
  */
 export interface UserProductJsonhal { 
     _links?: CommentJsonhalLinks;
-    readonly user?: string | null;
-    readonly userName?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly user?: UserJsonhal;
     /**
      * ?ProductApi
      */
-    product: ProductJsonhal;
-    readonly productName?: string | null;
+    readonly product?: ProductJsonhal;
+    productIri: string | null;
     readonly createdAt?: string | null;
     readonly owner?: string | null;
 }

matsen-tool/src/app/core/api/v1/model/userProductJsonld.ts

@@ -9,6 +9,7 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
+import { UserJsonld } from './userJsonld';
 import { CommentJsonldContext } from './commentJsonldContext';
 import { ProductJsonld } from './productJsonld';
 
@@ -20,13 +21,15 @@ export interface UserProductJsonld {
     context?: CommentJsonldContext;
     readonly id?: string;
     readonly type?: string;
-    readonly user?: string | null;
-    readonly userName?: string | null;
+    /**
+     * ?UserApi
+     */
+    readonly user?: UserJsonld;
     /**
      * ?ProductApi
      */
-    product: ProductJsonld;
-    readonly productName?: string | null;
+    readonly product?: ProductJsonld;
+    productIri: string | null;
     readonly createdAt?: string | null;
     readonly owner?: string | null;
 }