From 1f01bfaafc1959b4cfa83c54670ae19146366b3d Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 15 Dec 2023 13:34:07 +0100 Subject: [PATCH] working --- matsen-tool/fix.sh | 11 +++++++++++ matsen-tool/src/app/app.component.html | 9 +++++---- matsen-tool/src/app/app.component.ts | 6 +++++- .../api/v1/model/apiPostsGetCollection200Response.ts | 8 ++++---- .../apiPostsGetCollection200ResponseHydraSearch.ts | 6 +++--- .../apiPostsGetCollection200ResponseHydraView.ts | 8 ++++---- .../api/v1/model/apiUsersGetCollection200Response.ts | 8 ++++---- matsen-tool/src/environment.ts | 2 +- 8 files changed, 37 insertions(+), 21 deletions(-) create mode 100644 matsen-tool/fix.sh diff --git a/matsen-tool/fix.sh b/matsen-tool/fix.sh new file mode 100644 index 0000000..a3b7842 --- /dev/null +++ b/matsen-tool/fix.sh @@ -0,0 +1,11 @@ +find ./src/app/core/api/v1/model -type f -exec sed -i '' -e '' -e "s/hydramember/'hydra:member'/g" {} + +find ./src/app/core/api/v1/model -type f -exec sed -i '' -e '' -e "s/hydratotalItems/'hydra:totalItems'/g" {} + +find ./src/app/core/api/v1/model -type f -exec sed -i '' -e "s/hydraview/'hydra:view'/g" {} + +find ./src/app/core/api/v1/model -type f -exec sed -i '' -e "s/hydrasearch/'hydra:search'/g" {} + +find ./src/app/core/api/v1/model -type f -exec sed -i '' -e "s/hydratemplate/'hydra:template'/g" {} + +find ./src/app/core/api/v1/model -type f -exec sed -i '' -e "s/hydravariableRepresentation/'hydra:variableRepresentation'/g" {} + +find ./src/app/core/api/v1/model -type f -exec sed -i '' -e "s/hydramapping/'hydra:mapping'/g" {} + +find ./src/app/core/api/v1/model -type f -exec sed -i '' -e "s/hydrafirst/'hydra:first'/g" {} + +find ./src/app/core/api/v1/model -type f -exec sed -i '' -e "s/hydralast/'hydra:last'/g" {} + +find ./src/app/core/api/v1/model -type f -exec sed -i '' -e "s/hydranext/'hydra:next'/g" {} + +find ./src/app/core/api/v1/model -type f -exec sed -i '' -e "s/hydraprevious/'hydra:previous'/g" {} + \ No newline at end of file diff --git a/matsen-tool/src/app/app.component.html b/matsen-tool/src/app/app.component.html index cd5ac6f..853e557 100644 --- a/matsen-tool/src/app/app.component.html +++ b/matsen-tool/src/app/app.component.html @@ -2,10 +2,11 @@ diff --git a/matsen-tool/src/app/app.component.ts b/matsen-tool/src/app/app.component.ts index 8258cf0..d0ecd35 100644 --- a/matsen-tool/src/app/app.component.ts +++ b/matsen-tool/src/app/app.component.ts @@ -8,6 +8,7 @@ import {Observable, Subscription} from "rxjs"; styleUrl: './app.component.scss' }) export class AppComponent implements OnInit{ + title = 'matsen-tool'; protected postSub: Subscription; protected posts: Array; @@ -18,11 +19,14 @@ export class AppComponent implements OnInit{ } ngOnInit(): void { + this.postSub = this.postService.postsGetCollection().subscribe( data => { - this.posts = data.hydramember; console.log(data); + //myVariable['my:prop:name' as keyof MyModel] + this.posts = data["hydra:member"]; + console.log(this.posts); } ); diff --git a/matsen-tool/src/app/core/api/v1/model/apiPostsGetCollection200Response.ts b/matsen-tool/src/app/core/api/v1/model/apiPostsGetCollection200Response.ts index 38b38de..47f9272 100644 --- a/matsen-tool/src/app/core/api/v1/model/apiPostsGetCollection200Response.ts +++ b/matsen-tool/src/app/core/api/v1/model/apiPostsGetCollection200Response.ts @@ -15,9 +15,9 @@ import { ApiPostsGetCollection200ResponseHydraView } from './apiPostsGetCollecti export interface ApiPostsGetCollection200Response { - hydramember: Array; - hydratotalItems?: number; - hydraview?: ApiPostsGetCollection200ResponseHydraView; - hydrasearch?: ApiPostsGetCollection200ResponseHydraSearch; + 'hydra:member': Array; + 'hydra:totalItems'?: number; + 'hydra:view'?: ApiPostsGetCollection200ResponseHydraView; + 'hydra:search'?: ApiPostsGetCollection200ResponseHydraSearch; } diff --git a/matsen-tool/src/app/core/api/v1/model/apiPostsGetCollection200ResponseHydraSearch.ts b/matsen-tool/src/app/core/api/v1/model/apiPostsGetCollection200ResponseHydraSearch.ts index 34c0c5c..0bc3364 100644 --- a/matsen-tool/src/app/core/api/v1/model/apiPostsGetCollection200ResponseHydraSearch.ts +++ b/matsen-tool/src/app/core/api/v1/model/apiPostsGetCollection200ResponseHydraSearch.ts @@ -14,8 +14,8 @@ import { ApiPostsGetCollection200ResponseHydraSearchHydraMappingInner } from './ export interface ApiPostsGetCollection200ResponseHydraSearch { type?: string; - hydratemplate?: string; - hydravariableRepresentation?: string; - hydramapping?: Array; + 'hydra:template'?: string; + 'hydra:variableRepresentation'?: string; + 'hydra:mapping'?: Array; } diff --git a/matsen-tool/src/app/core/api/v1/model/apiPostsGetCollection200ResponseHydraView.ts b/matsen-tool/src/app/core/api/v1/model/apiPostsGetCollection200ResponseHydraView.ts index ca44e03..2828047 100644 --- a/matsen-tool/src/app/core/api/v1/model/apiPostsGetCollection200ResponseHydraView.ts +++ b/matsen-tool/src/app/core/api/v1/model/apiPostsGetCollection200ResponseHydraView.ts @@ -14,9 +14,9 @@ export interface ApiPostsGetCollection200ResponseHydraView { id?: string; type?: string; - hydrafirst?: string; - hydralast?: string; - hydraprevious?: string; - hydranext?: string; + 'hydra:first'?: string; + 'hydra:last'?: string; + 'hydra:previous'?: string; + 'hydra:next'?: string; } diff --git a/matsen-tool/src/app/core/api/v1/model/apiUsersGetCollection200Response.ts b/matsen-tool/src/app/core/api/v1/model/apiUsersGetCollection200Response.ts index 856978d..1fcb7ed 100644 --- a/matsen-tool/src/app/core/api/v1/model/apiUsersGetCollection200Response.ts +++ b/matsen-tool/src/app/core/api/v1/model/apiUsersGetCollection200Response.ts @@ -15,9 +15,9 @@ import { ApiPostsGetCollection200ResponseHydraView } from './apiPostsGetCollecti export interface ApiUsersGetCollection200Response { - hydramember: Array; - hydratotalItems?: number; - hydraview?: ApiPostsGetCollection200ResponseHydraView; - hydrasearch?: ApiPostsGetCollection200ResponseHydraSearch; + 'hydra:member': Array; + 'hydra:totalItems'?: number; + 'hydra:view'?: ApiPostsGetCollection200ResponseHydraView; + 'hydra:search'?: ApiPostsGetCollection200ResponseHydraSearch; } diff --git a/matsen-tool/src/environment.ts b/matsen-tool/src/environment.ts index 16446e8..d9530a5 100644 --- a/matsen-tool/src/environment.ts +++ b/matsen-tool/src/environment.ts @@ -1,5 +1,5 @@ export const environment = { production: false, // basePath: 'https://matsen-tool-be.ddev.site:8443', - basePath: 'https://127.0.0.1:49858', + basePath: 'https://matsen-tool-be.ddev.site:8443', };