From 4cb2071fd4aceb01f102c63cc3706a7b82a4ccee Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Wed, 3 Apr 2024 18:44:24 +0300
Subject: [PATCH] [master]: Fix search properties after changing the national
 dashboiard route.

---
 src/app/national/national.component.ts | 1 -
 src/app/search/links-resolver.ts       | 6 ++++++
 src/app/shared/irish.ts                | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/app/national/national.component.ts b/src/app/national/national.component.ts
index 4282269..d140888 100644
--- a/src/app/national/national.component.ts
+++ b/src/app/national/national.component.ts
@@ -86,7 +86,6 @@ export class NationalComponent extends StakeholderBaseComponent implements OnIni
         this.setProperties(this.stakeholder.alias, this.stakeholder.type, this.configurationService);
         this._customFilterService.setCustomFilter([new SearchCustomFilter("National", "country", "IE", "Irish National Monitor")]);
         LinksResolver.resetProperties();
-        LinksResolver.setSearchAndResultLanding("national/");
         this.loading = false;
       } else {
         this.loading = false;
diff --git a/src/app/search/links-resolver.ts b/src/app/search/links-resolver.ts
index ac405c6..67298a8 100644
--- a/src/app/search/links-resolver.ts
+++ b/src/app/search/links-resolver.ts
@@ -57,6 +57,12 @@ export class LinksResolver {
     searchLinkToAdvancedOrganizations: properties.searchLinkToAdvancedOrganizations,
     errorLink: properties.errorLink
   };
+
+  public static setDefaultProperties(alias: string) {
+    Object.keys(this.default).forEach(field => {
+      this.default[field] = "/" + alias + (<string>this.default[field]);
+    });
+  }
   
   public static setProperties(alias: string) {
     Object.keys(this.default).forEach(field => {
diff --git a/src/app/shared/irish.ts b/src/app/shared/irish.ts
index 2ece335..02e40cb 100644
--- a/src/app/shared/irish.ts
+++ b/src/app/shared/irish.ts
@@ -3,6 +3,7 @@ import {StakeholderConfiguration} from "../openaireLibrary/monitor-admin/utils/i
 import {LayoutService} from "../openaireLibrary/dashboard/sharedComponents/sidebar/layout.service";
 import {Role} from "../openaireLibrary/login/utils/helper.class";
 import {Stakeholder} from "../openaireLibrary/monitor/entities/stakeholder";
+import {LinksResolver} from "../search/links-resolver";
 
 export class Irish {
   public static irishAdminToolsPortalType = "country";
@@ -12,6 +13,8 @@ export class Irish {
   public portal: Portal = Portal.getMockCommunityInfo("noami", "Noami",['service'],['/search/advanced/services', '/search/find/services']);
 
   constructor() {
+    LinksResolver.setDefaultProperties('national/');
+
     StakeholderConfiguration.ENTITIES.stakeholder = 'Monitor';
     StakeholderConfiguration.ENTITIES.stakeholders  = 'Monitors';
     StakeholderConfiguration.ENTITIES.funder  = 'RFO';