From d504b4b021f12e0ed2e2797fe40aac316ea1408a Mon Sep 17 00:00:00 2001
From: lpapadopoulos <lpapadopoulos@ubitech.eu>
Date: Tue, 11 Jun 2024 16:25:42 +0300
Subject: [PATCH] ommit my-user functionality

---
 .../edit-individuals/edit-individuals.component.ts       | 9 +++++----
 src/app/shared/components/redirect/redirect.component.ts | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/app/shared/components/partyManagement/edit-individuals/edit-individuals.component.ts b/src/app/shared/components/partyManagement/edit-individuals/edit-individuals.component.ts
index 82411e6..9d6412f 100644
--- a/src/app/shared/components/partyManagement/edit-individuals/edit-individuals.component.ts
+++ b/src/app/shared/components/partyManagement/edit-individuals/edit-individuals.component.ts
@@ -96,15 +96,16 @@ export class EditIndividualsComponent implements OnInit {
       if (this.authService.portalUser && this.authService.portalUser.id === this.individualID) {
         this.individualID = "myuser"
       }
+      this.retrieveIndividual()
       for(var val of this.authService.portalUserJWT.realm_access.roles){
             if (val ==='TESTBED_PROVIDER') {
               this.testbedProvider=true
               this.retrieveGeographicSite()
               console.log(this.geographicSite)
-              
+
               }
           }
-      this.retrieveIndividual()
+
     } else {
       for(var val of this.authService.portalUserJWT.realm_access.roles){
         if (val ==='TESTBED_PROVIDER') {
@@ -229,7 +230,7 @@ export class EditIndividualsComponent implements OnInit {
   }
 
   retrieveGeographicSite(){
-    this.geographicSiteService.retrieveGeographicSite("myuser").subscribe(
+    this.geographicSiteService.retrieveGeographicSite(this.individual.id).subscribe(
       data => {
         this.geographicSite = data
         if (this.geographicSite.place[0].geographicAddress.city!==null){
@@ -330,7 +331,7 @@ export class EditIndividualsComponent implements OnInit {
       )
     }
     else {
-      this.geographicSiteService.patchGeographicSite("myuser",updateObj).subscribe(
+      this.geographicSiteService.patchGeographicSite(id,updateObj).subscribe(
         data => { updatedGeographicSite = data },
         error => console.error(error),
         () => {
diff --git a/src/app/shared/components/redirect/redirect.component.ts b/src/app/shared/components/redirect/redirect.component.ts
index 15fa389..bad895e 100644
--- a/src/app/shared/components/redirect/redirect.component.ts
+++ b/src/app/shared/components/redirect/redirect.component.ts
@@ -21,7 +21,7 @@ export class RedirectComponent implements OnInit {
     const activePortal = localStorage.getItem('active_portal')
 
     if (activePortal === 'services') {
-      this.router.navigate(['services/individual_update', 'myuser'])
+      this.router.navigate(['services', 'services_marketplace'])
 
     }
     else if (activePortal === 'resources') {
@@ -29,12 +29,12 @@ export class RedirectComponent implements OnInit {
     }
     else if (activePortal === 'testing') {
 
-      this.router.navigate(['testing/individual_update', 'myuser'])
+      this.router.navigate(['testing', 'service_test_specs'])
     }
 
     else if (activePortal === 'products') {
 
-          this.router.navigate(['products/individual_update', 'myuser'])
+          this.router.navigate(['products', 'marketplace'])
     }
 
     else {
-- 
GitLab