Merging explore-redesign branch into develop for Explore July release #7

Merged
konstantina.galouni merged 112 commits from explore-redesign into develop 2023-07-05 11:11:53 +02:00
1 changed files with 7 additions and 9 deletions
Showing only changes of commit a9e8a5c25a - Show all commits

View File

@ -222,15 +222,13 @@ export class SearchAllComponent {
if(this.activeEntity == null && (!params["entity"] || params["entity"].length == 0)){
if (active) {
this.activeEntity = active;
// if((typeof document !== 'undefined')){
// if (active == "result") {
// active = "research-outcomes";
// }
// console.log(location.search);
// let query = location.search.replace(/((active=).*&)|((active=).*)/, '');
// console.log(query);
// this.location.go(location.pathname + '/' + active, query == '?' ? '' : query);
// }
if((typeof document !== 'undefined')){
if (active == "result") {
active = "research-outcomes";
}
let query = location.search.replace(/(active=)([^&]*)&?/, '');
this.location.go(location.pathname + '/' + active, query == '?' ? '' : query);
}
} else {
this.activeEntity = this.getDefaultEntityToShow();
}