diff --git a/explore/src/app/home/home.component.ts b/explore/src/app/home/home.component.ts
index 5881989e..c05576ed 100644
--- a/explore/src/app/home/home.component.ts
+++ b/explore/src/app/home/home.component.ts
@@ -157,7 +157,7 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
{value: "lcsh:Technology", label: "Technology"},
];
stringUtils = new StringUtils();
- disableSelect: boolean = true;
+ // disableSelect: boolean = true;
constructor(
private _router: Router,
@@ -340,48 +340,48 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
this.selectedEntityAdvancedUrl = $event.advancedUrl;
}
- goTo(simple: boolean) {
- let url = (simple) ? this.selectedEntitySimpleUrl : this.selectedEntityAdvancedUrl;
+ goTo() {
+ console.log('goto()');
let parameterNames = [];
let parameterValues = [];
- if (this.selectedEntity == "result") {
- if (this.resultTypes) {
- let values = [];
- for (let value of this.resultTypes.values) {
- if (value.selected) {
- values.push(value.id);
- }
- }
- if (values.length > 0 && values.length != 4) {
- parameterNames.push("type");
- parameterValues.push(values.join(","));
- }
- if (this.resultsQuickFilter && this.resultsQuickFilter.selected) {
- parameterNames.push(this.resultsQuickFilter.filterId);
- parameterValues.push('"' + encodeURIComponent(this.resultsQuickFilter.value) + '"');
- }
- }
- } else if (this.selectedEntity == "all") {
- if (this.resultsQuickFilter && this.resultsQuickFilter.selected) {
- parameterNames.push(this.resultsQuickFilter.filterId);
- parameterValues.push('"' + encodeURIComponent(this.resultsQuickFilter.value) + '"');
- }
+ // if (this.selectedEntity == "result") {
+ // if (this.resultTypes) {
+ // let values = [];
+ // for (let value of this.resultTypes.values) {
+ // if (value.selected) {
+ // values.push(value.id);
+ // }
+ // }
+ // if (values.length > 0 && values.length != 4) {
+ // parameterNames.push("type");
+ // parameterValues.push(values.join(","));
+ // }
+ // if (this.resultsQuickFilter && this.resultsQuickFilter.selected) {
+ // parameterNames.push(this.resultsQuickFilter.filterId);
+ // parameterValues.push('"' + encodeURIComponent(this.resultsQuickFilter.value) + '"');
+ // }
+ // }
+ // } else if (this.selectedEntity == "all") {
+ if (this.resultsQuickFilter && this.resultsQuickFilter.selected) {
+ parameterNames.push(this.resultsQuickFilter.filterId);
+ parameterValues.push('"' + encodeURIComponent(this.resultsQuickFilter.value) + '"');
}
+ // }
if (this.keyword.length > 0) {
parameterNames.push("fv0");
parameterValues.push(this.keyword);
parameterNames.push("f0");
parameterValues.push("q");
}
- this._router.navigate([url], {queryParams: this.routerHelper.createQueryParams(parameterNames, parameterValues)});
+ this._router.navigate([this.properties.searchLinkToAll], {queryParams: this.routerHelper.createQueryParams(parameterNames, parameterValues)});
}
getSubjectParameter(param) {
return {'f0': 'resultsubject', 'fv0': '"' + (param) + '"', size: 50};
}
- disableSelectChange(event: boolean) {
- this.disableSelect = event;
- this.cdr.detectChanges();
- }
+ // disableSelectChange(event: boolean) {
+ // this.disableSelect = event;
+ // this.cdr.detectChanges();
+ // }
}
diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary
index 51d50cf3..dd6f18db 160000
--- a/explore/src/app/openaireLibrary
+++ b/explore/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 51d50cf331e4497f5c7c273dff86524affa92b14
+Subproject commit dd6f18db52c8e4dbee3c9c05624c15a076ae74bb
diff --git a/explore/src/environments/environment.beta.ts b/explore/src/environments/environment.beta.ts
index 34493e20..90db5608 100644
--- a/explore/src/environments/environment.beta.ts
+++ b/explore/src/environments/environment.beta.ts
@@ -83,6 +83,7 @@ export let properties: EnvProperties = {
searchLinkToOrp: "/search/other?orpId=",
searchLinkToOrganization: "/search/organization?organizationId=",
+ searchLinkToAll: "/search/find/",
searchLinkToPublications: "/search/find/publications",
searchLinkToDataProviders: "/search/find/dataproviders",
searchLinkToProjects: "/search/find/projects",
diff --git a/explore/src/environments/environment.prod.ts b/explore/src/environments/environment.prod.ts
index fee6b2a2..46e0355c 100644
--- a/explore/src/environments/environment.prod.ts
+++ b/explore/src/environments/environment.prod.ts
@@ -88,6 +88,7 @@ export let properties: EnvProperties = {
searchLinkToOrp: "/search/other?orpId=",
searchLinkToOrganization: "/search/organization?organizationId=",
+ searchLinkToAll: "/search/find/",
searchLinkToPublications: "/search/find/publications",
searchLinkToDataProviders: "/search/find/dataproviders",
searchLinkToProjects: "/search/find/projects",
diff --git a/explore/src/environments/environment.test.ts b/explore/src/environments/environment.test.ts
index 0af87fef..39cd12d1 100644
--- a/explore/src/environments/environment.test.ts
+++ b/explore/src/environments/environment.test.ts
@@ -86,6 +86,7 @@ export let properties: EnvProperties = {
searchLinkToOrp: "/search/other?orpId=",
searchLinkToOrganization: "/search/organization?organizationId=",
+ searchLinkToAll: "/search/find/",
searchLinkToPublications: "/search/find/publications",
searchLinkToDataProviders: "/search/find/dataproviders",
searchLinkToProjects: "/search/find/projects",
diff --git a/explore/src/environments/environment.ts b/explore/src/environments/environment.ts
index 42c7fb67..bfee0b7d 100644
--- a/explore/src/environments/environment.ts
+++ b/explore/src/environments/environment.ts
@@ -89,6 +89,7 @@ export let properties: EnvProperties = {
searchLinkToOrp: "/search/other?orpId=",
searchLinkToOrganization: "/search/organization?organizationId=",
+ searchLinkToAll: "/search/find/",
searchLinkToPublications: "/search/find/publications",
searchLinkToDataProviders: "/search/find/dataproviders",
searchLinkToProjects: "/search/find/projects",