From ff9bed82f862046dd444ee5d32f46e4b742bc360 Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 14 Feb 2024 17:00:36 +0100 Subject: [PATCH] custom pagination --- matsen-tool/openapi.yaml | 36 +++++++++++++++++++ .../app/core/api/v1/.openapi-generator/FILES | 1 - matsen-tool/src/app/core/api/v1/model/post.ts | 4 +++ .../src/app/core/api/v1/model/postJsonhal.ts | 4 +++ .../src/app/core/api/v1/model/postJsonld.ts | 4 +++ .../partners-detail.component.ts | 1 + .../src/app/partners/partners.component.ts | 3 +- 7 files changed, 51 insertions(+), 2 deletions(-) diff --git a/matsen-tool/openapi.yaml b/matsen-tool/openapi.yaml index 8f78e07..6f8e0a5 100644 --- a/matsen-tool/openapi.yaml +++ b/matsen-tool/openapi.yaml @@ -1710,6 +1710,18 @@ components: - 'null' format: iri-reference example: 'https://example.com/' + partner: + anyOf: + - + $ref: '#/components/schemas/Partner' + - + type: 'null' + contact: + anyOf: + - + $ref: '#/components/schemas/Contact' + - + type: 'null' createdAt: readOnly: true type: @@ -1743,6 +1755,18 @@ components: - 'null' format: iri-reference example: 'https://example.com/' + partner: + anyOf: + - + $ref: '#/components/schemas/Partner.jsonhal' + - + type: 'null' + contact: + anyOf: + - + $ref: '#/components/schemas/Contact.jsonhal' + - + type: 'null' createdAt: readOnly: true type: @@ -1790,6 +1814,18 @@ components: - 'null' format: iri-reference example: 'https://example.com/' + partner: + anyOf: + - + $ref: '#/components/schemas/Partner.jsonld' + - + type: 'null' + contact: + anyOf: + - + $ref: '#/components/schemas/Contact.jsonld' + - + type: 'null' createdAt: readOnly: true type: diff --git a/matsen-tool/src/app/core/api/v1/.openapi-generator/FILES b/matsen-tool/src/app/core/api/v1/.openapi-generator/FILES index 1c2dc22..812c87e 100644 --- a/matsen-tool/src/app/core/api/v1/.openapi-generator/FILES +++ b/matsen-tool/src/app/core/api/v1/.openapi-generator/FILES @@ -1,5 +1,4 @@ .gitignore -.openapi-generator-ignore README.md api.module.ts api/api.ts diff --git a/matsen-tool/src/app/core/api/v1/model/post.ts b/matsen-tool/src/app/core/api/v1/model/post.ts index 29f3942..d16b708 100644 --- a/matsen-tool/src/app/core/api/v1/model/post.ts +++ b/matsen-tool/src/app/core/api/v1/model/post.ts @@ -9,6 +9,8 @@ * https://openapi-generator.tech * Do not edit the class manually. */ +import { Partner } from './partner'; +import { Contact } from './contact'; /** @@ -17,6 +19,8 @@ export interface Post { message: string | null; owner?: string | null; + partner?: Partner | null; + contact?: Contact | null; readonly createdAt?: string | null; } diff --git a/matsen-tool/src/app/core/api/v1/model/postJsonhal.ts b/matsen-tool/src/app/core/api/v1/model/postJsonhal.ts index cd1d6a4..91437d3 100644 --- a/matsen-tool/src/app/core/api/v1/model/postJsonhal.ts +++ b/matsen-tool/src/app/core/api/v1/model/postJsonhal.ts @@ -10,6 +10,8 @@ * Do not edit the class manually. */ import { ContactJsonhalLinks } from './contactJsonhalLinks'; +import { ContactJsonhal } from './contactJsonhal'; +import { PartnerJsonhal } from './partnerJsonhal'; /** @@ -19,6 +21,8 @@ export interface PostJsonhal { _links?: ContactJsonhalLinks; message: string | null; owner?: string | null; + partner?: PartnerJsonhal | null; + contact?: ContactJsonhal | null; readonly createdAt?: string | null; } diff --git a/matsen-tool/src/app/core/api/v1/model/postJsonld.ts b/matsen-tool/src/app/core/api/v1/model/postJsonld.ts index e0bc4ad..f86022a 100644 --- a/matsen-tool/src/app/core/api/v1/model/postJsonld.ts +++ b/matsen-tool/src/app/core/api/v1/model/postJsonld.ts @@ -9,6 +9,8 @@ * https://openapi-generator.tech * Do not edit the class manually. */ +import { ContactJsonld } from './contactJsonld'; +import { PartnerJsonld } from './partnerJsonld'; /** @@ -20,6 +22,8 @@ export interface PostJsonld { readonly type?: string; message: string | null; owner?: string | null; + partner?: PartnerJsonld | null; + contact?: ContactJsonld | null; readonly createdAt?: string | null; } diff --git a/matsen-tool/src/app/partners/partners-detail/partners-detail.component.ts b/matsen-tool/src/app/partners/partners-detail/partners-detail.component.ts index 5e20cf2..bcd231e 100644 --- a/matsen-tool/src/app/partners/partners-detail/partners-detail.component.ts +++ b/matsen-tool/src/app/partners/partners-detail/partners-detail.component.ts @@ -117,6 +117,7 @@ export class PartnersDetailComponent implements OnInit, AfterViewInit { this.partnerContactsSub = this.contactService.contactsGetCollection( this.contactsPageIndex + 1, + 6, ApiConverter.extractId(this.partner.id) ).subscribe( data => { diff --git a/matsen-tool/src/app/partners/partners.component.ts b/matsen-tool/src/app/partners/partners.component.ts index af90945..a6849af 100644 --- a/matsen-tool/src/app/partners/partners.component.ts +++ b/matsen-tool/src/app/partners/partners.component.ts @@ -98,9 +98,9 @@ export class PartnersComponent implements OnInit, AfterViewInit { } getData() { - // switch over this.dataType (customers, etc.) this.partnersSub = this.partnerService.partnersGetCollection( this.pageIndex + 1, + this.pageSize, this.dataType, undefined, this.nameOrderAsc, @@ -115,6 +115,7 @@ export class PartnersComponent implements OnInit, AfterViewInit { this.paginator.length = this.length; } ); + // switch over this.dataType (customers, etc.) } handlePageEvent(e: PageEvent) {