home page: simplify search bar - remove 2 steps, update submodules
This commit is contained in:
parent
0b92ad3725
commit
ebf26d66cf
|
@ -15,23 +15,24 @@
|
||||||
Discover open linked research<span class="uk-text-primary">.</span>
|
Discover open linked research<span class="uk-text-primary">.</span>
|
||||||
</h1>
|
</h1>
|
||||||
<numbers #numbersComponent [defaultInit]="false" (results)="numbers = $event"></numbers>
|
<numbers #numbersComponent [defaultInit]="false" (results)="numbers = $event"></numbers>
|
||||||
<div [class.uk-invisible]="disableSelect" class="uk-margin-medium-top uk-width-3-4@xl">
|
<!-- [class.uk-invisible]="disableSelect" -->
|
||||||
|
<div class="uk-margin-medium-top" style="max-width: 600px;" uk-scrollspy-class>
|
||||||
<div class="uk-flex uk-flex-right uk-text-small">
|
<div class="uk-flex uk-flex-right uk-text-small">
|
||||||
<a [routerLink]="properties.searchLinkToAdvancedResults" class="uk-margin-small-bottom">
|
<a [routerLink]="properties.searchLinkToAdvancedResults" class="uk-margin-small-bottom">
|
||||||
Advanced search
|
Advanced search
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<advanced-search-input #advanced (searchEmitter)="goTo(true)">
|
<advanced-search-input #advanced (searchEmitter)="goTo()">
|
||||||
<entities-selection [simpleView]="true" currentEntity="all" [selectedEntity]="selectedEntity"
|
<!-- <entities-selection [simpleView]="true" currentEntity="all" [selectedEntity]="selectedEntity"
|
||||||
(selectionChange)="entityChanged($event);advanced.focusNext(input, $event)" (disableSelectEmitter)="disableSelectChange($event)"
|
(selectionChange)="entityChanged($event);advanced.focusNext(input, $event)" (disableSelectEmitter)="disableSelectChange($event)"
|
||||||
[onChangeNavigate]="false" class="uk-width-2-5"></entities-selection>
|
[onChangeNavigate]="false" class="uk-width-2-5"></entities-selection> -->
|
||||||
<div class="uk-width-expand" input #input placeholder="Scholary works" [searchable]="true" [hint]="'Search in OpenAIRE'" [(value)]="keyword"></div>
|
<div class="uk-width-expand" input #input placeholder="Search in Explore" [searchable]="true" [hint]="'What are you looking for?'" [(value)]="keyword"></div>
|
||||||
</advanced-search-input>
|
</advanced-search-input>
|
||||||
<div *ngIf="selectedEntity === 'result' && input.focused" (click)="$event.stopPropagation();advanced.focusNext(input, $event)" class="uk-dropdown uk-display-block uk-margin-small-top uk-width-auto">
|
<!-- <div *ngIf="selectedEntity === 'result' && input.focused" (click)="$event.stopPropagation();advanced.focusNext(input, $event)" class="uk-dropdown uk-display-block uk-margin-small-top uk-width-auto">
|
||||||
<div class="uk-padding-small">
|
<div class="uk-padding-small">
|
||||||
<quick-selections [resultTypes]="resultTypes" [quickFilter]="resultsQuickFilter"></quick-selections>
|
<quick-selections [resultTypes]="resultTypes" [quickFilter]="resultsQuickFilter"></quick-selections>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div> -->
|
||||||
</div>
|
</div>
|
||||||
<div class="uk-padding-small uk-margin-small-top">
|
<div class="uk-padding-small uk-margin-small-top">
|
||||||
<div class="uk-text-meta">
|
<div class="uk-text-meta">
|
||||||
|
|
|
@ -157,7 +157,7 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
|
||||||
{value: "lcsh:Technology", label: "Technology"},
|
{value: "lcsh:Technology", label: "Technology"},
|
||||||
];
|
];
|
||||||
stringUtils = new StringUtils();
|
stringUtils = new StringUtils();
|
||||||
disableSelect: boolean = true;
|
// disableSelect: boolean = true;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private _router: Router,
|
private _router: Router,
|
||||||
|
@ -340,48 +340,48 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
|
||||||
this.selectedEntityAdvancedUrl = $event.advancedUrl;
|
this.selectedEntityAdvancedUrl = $event.advancedUrl;
|
||||||
}
|
}
|
||||||
|
|
||||||
goTo(simple: boolean) {
|
goTo() {
|
||||||
let url = (simple) ? this.selectedEntitySimpleUrl : this.selectedEntityAdvancedUrl;
|
console.log('goto()');
|
||||||
let parameterNames = [];
|
let parameterNames = [];
|
||||||
let parameterValues = [];
|
let parameterValues = [];
|
||||||
if (this.selectedEntity == "result") {
|
// if (this.selectedEntity == "result") {
|
||||||
if (this.resultTypes) {
|
// if (this.resultTypes) {
|
||||||
let values = [];
|
// let values = [];
|
||||||
for (let value of this.resultTypes.values) {
|
// for (let value of this.resultTypes.values) {
|
||||||
if (value.selected) {
|
// if (value.selected) {
|
||||||
values.push(value.id);
|
// values.push(value.id);
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
if (values.length > 0 && values.length != 4) {
|
// if (values.length > 0 && values.length != 4) {
|
||||||
parameterNames.push("type");
|
// parameterNames.push("type");
|
||||||
parameterValues.push(values.join(","));
|
// parameterValues.push(values.join(","));
|
||||||
}
|
// }
|
||||||
if (this.resultsQuickFilter && this.resultsQuickFilter.selected) {
|
// if (this.resultsQuickFilter && this.resultsQuickFilter.selected) {
|
||||||
parameterNames.push(this.resultsQuickFilter.filterId);
|
// parameterNames.push(this.resultsQuickFilter.filterId);
|
||||||
parameterValues.push('"' + encodeURIComponent(this.resultsQuickFilter.value) + '"');
|
// parameterValues.push('"' + encodeURIComponent(this.resultsQuickFilter.value) + '"');
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
} else if (this.selectedEntity == "all") {
|
// } else if (this.selectedEntity == "all") {
|
||||||
if (this.resultsQuickFilter && this.resultsQuickFilter.selected) {
|
if (this.resultsQuickFilter && this.resultsQuickFilter.selected) {
|
||||||
parameterNames.push(this.resultsQuickFilter.filterId);
|
parameterNames.push(this.resultsQuickFilter.filterId);
|
||||||
parameterValues.push('"' + encodeURIComponent(this.resultsQuickFilter.value) + '"');
|
parameterValues.push('"' + encodeURIComponent(this.resultsQuickFilter.value) + '"');
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
// }
|
||||||
if (this.keyword.length > 0) {
|
if (this.keyword.length > 0) {
|
||||||
parameterNames.push("fv0");
|
parameterNames.push("fv0");
|
||||||
parameterValues.push(this.keyword);
|
parameterValues.push(this.keyword);
|
||||||
parameterNames.push("f0");
|
parameterNames.push("f0");
|
||||||
parameterValues.push("q");
|
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) {
|
getSubjectParameter(param) {
|
||||||
return {'f0': 'resultsubject', 'fv0': '"' + (param) + '"', size: 50};
|
return {'f0': 'resultsubject', 'fv0': '"' + (param) + '"', size: 50};
|
||||||
}
|
}
|
||||||
|
|
||||||
disableSelectChange(event: boolean) {
|
// disableSelectChange(event: boolean) {
|
||||||
this.disableSelect = event;
|
// this.disableSelect = event;
|
||||||
this.cdr.detectChanges();
|
// this.cdr.detectChanges();
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 51d50cf331e4497f5c7c273dff86524affa92b14
|
Subproject commit dd6f18db52c8e4dbee3c9c05624c15a076ae74bb
|
|
@ -83,6 +83,7 @@ export let properties: EnvProperties = {
|
||||||
searchLinkToOrp: "/search/other?orpId=",
|
searchLinkToOrp: "/search/other?orpId=",
|
||||||
searchLinkToOrganization: "/search/organization?organizationId=",
|
searchLinkToOrganization: "/search/organization?organizationId=",
|
||||||
|
|
||||||
|
searchLinkToAll: "/search/find/",
|
||||||
searchLinkToPublications: "/search/find/publications",
|
searchLinkToPublications: "/search/find/publications",
|
||||||
searchLinkToDataProviders: "/search/find/dataproviders",
|
searchLinkToDataProviders: "/search/find/dataproviders",
|
||||||
searchLinkToProjects: "/search/find/projects",
|
searchLinkToProjects: "/search/find/projects",
|
||||||
|
|
|
@ -88,6 +88,7 @@ export let properties: EnvProperties = {
|
||||||
searchLinkToOrp: "/search/other?orpId=",
|
searchLinkToOrp: "/search/other?orpId=",
|
||||||
searchLinkToOrganization: "/search/organization?organizationId=",
|
searchLinkToOrganization: "/search/organization?organizationId=",
|
||||||
|
|
||||||
|
searchLinkToAll: "/search/find/",
|
||||||
searchLinkToPublications: "/search/find/publications",
|
searchLinkToPublications: "/search/find/publications",
|
||||||
searchLinkToDataProviders: "/search/find/dataproviders",
|
searchLinkToDataProviders: "/search/find/dataproviders",
|
||||||
searchLinkToProjects: "/search/find/projects",
|
searchLinkToProjects: "/search/find/projects",
|
||||||
|
|
|
@ -86,6 +86,7 @@ export let properties: EnvProperties = {
|
||||||
searchLinkToOrp: "/search/other?orpId=",
|
searchLinkToOrp: "/search/other?orpId=",
|
||||||
searchLinkToOrganization: "/search/organization?organizationId=",
|
searchLinkToOrganization: "/search/organization?organizationId=",
|
||||||
|
|
||||||
|
searchLinkToAll: "/search/find/",
|
||||||
searchLinkToPublications: "/search/find/publications",
|
searchLinkToPublications: "/search/find/publications",
|
||||||
searchLinkToDataProviders: "/search/find/dataproviders",
|
searchLinkToDataProviders: "/search/find/dataproviders",
|
||||||
searchLinkToProjects: "/search/find/projects",
|
searchLinkToProjects: "/search/find/projects",
|
||||||
|
|
|
@ -89,6 +89,7 @@ export let properties: EnvProperties = {
|
||||||
searchLinkToOrp: "/search/other?orpId=",
|
searchLinkToOrp: "/search/other?orpId=",
|
||||||
searchLinkToOrganization: "/search/organization?organizationId=",
|
searchLinkToOrganization: "/search/organization?organizationId=",
|
||||||
|
|
||||||
|
searchLinkToAll: "/search/find/",
|
||||||
searchLinkToPublications: "/search/find/publications",
|
searchLinkToPublications: "/search/find/publications",
|
||||||
searchLinkToDataProviders: "/search/find/dataproviders",
|
searchLinkToDataProviders: "/search/find/dataproviders",
|
||||||
searchLinkToProjects: "/search/find/projects",
|
searchLinkToProjects: "/search/find/projects",
|
||||||
|
|
Loading…
Reference in New Issue