From d649189c9a0c5fcea07505ae443c11abd21a2451 Mon Sep 17 00:00:00 2001
From: jbalasis <cs2180008@di.uoa.gr>
Date: Tue, 25 Jun 2024 16:10:28 +0300
Subject: [PATCH] Now navigates to tool landing page  with id

---
 package-lock.json                                             | 1 +
 src/dataSpaceUI/app/dataSpaceUI-routing.module.ts             | 2 +-
 .../app/pages/landingpages/payload/payload.component.ts       | 2 +-
 .../search/resource-search/resource-search.component.html     | 2 +-
 src/dataSpaceUI/app/services/resource-payload.service.ts      | 4 ++--
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b8631c7..2c97516 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,6 +5,7 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "scilake-catalogue-ui",
       "version": "0.0.0",
       "dependencies": {
         "@angular/animations": "^16.2.12",
diff --git a/src/dataSpaceUI/app/dataSpaceUI-routing.module.ts b/src/dataSpaceUI/app/dataSpaceUI-routing.module.ts
index 8868c3e..3bb4494 100644
--- a/src/dataSpaceUI/app/dataSpaceUI-routing.module.ts
+++ b/src/dataSpaceUI/app/dataSpaceUI-routing.module.ts
@@ -65,7 +65,7 @@ const dataSpaceRoutes: Routes = [
     component: BrowseJobsComponent
   },
   {
-    path: 'landingPage/:resourceType/:identifierValue',
+    path: 'landingPage/:resourceType/:id',
     component: PayloadComponent
   },
   {
diff --git a/src/dataSpaceUI/app/pages/landingpages/payload/payload.component.ts b/src/dataSpaceUI/app/pages/landingpages/payload/payload.component.ts
index 4960b76..a311e9f 100644
--- a/src/dataSpaceUI/app/pages/landingpages/payload/payload.component.ts
+++ b/src/dataSpaceUI/app/pages/landingpages/payload/payload.component.ts
@@ -45,7 +45,7 @@ export class PayloadComponent implements OnInit{
   ngOnInit() {
     this.route.params.subscribe(params => {
       this.resourceType = params['resourceType'];
-      this.resourcePayloadService.getItem(params['resourceType'], params['identifierValue']).subscribe(
+      this.resourcePayloadService.getItem(params['resourceType'], params['id']).subscribe(
         next => {this.payload = next;},
         error => {console.log(error);},
         () => {
diff --git a/src/dataSpaceUI/app/pages/search/resource-search/resource-search.component.html b/src/dataSpaceUI/app/pages/search/resource-search/resource-search.component.html
index 1bb4966..d899fb6 100644
--- a/src/dataSpaceUI/app/pages/search/resource-search/resource-search.component.html
+++ b/src/dataSpaceUI/app/pages/search/resource-search/resource-search.component.html
@@ -67,7 +67,7 @@
 
             <ng-container *ngFor="let result of payload.results; let i = index">
 
-              <a [routerLink]="['/landingPage', resourceType, result.identifier.value]" class="serviceDetails">
+              <a [routerLink]="['/landingPage', resourceType, result.id]" class="serviceDetails">
                 <div class="uk-card uk-card-default uk-card-hover uk-margin-bottom">
 
                   <!--LAPTOP & PAD LANDSCAPE-->
diff --git a/src/dataSpaceUI/app/services/resource-payload.service.ts b/src/dataSpaceUI/app/services/resource-payload.service.ts
index 183f7f3..5d1ff19 100644
--- a/src/dataSpaceUI/app/services/resource-payload.service.ts
+++ b/src/dataSpaceUI/app/services/resource-payload.service.ts
@@ -44,8 +44,8 @@ export class ResourcePayloadService {
     return this.http.get<Paging<any>>(this.base + `/items?resourceType=${resourceType}`, {params: params});
   }
 
-  getItem(resourceType: string, identifierValue: string) {
-    return this.http.get(this.base + `/items/search?resourceType=${resourceType}&field=identifier&value=${identifierValue}`);
+  getItem(resourceType: string, id: string) {
+    return this.http.get(this.base + `/items/${id}?resourceType=${resourceType}`);
   }
 
   getItemById(resourceType: string, id: string) {