MaDgIK
/
explore-services
13
0
Fork 0
Code Issues Pull Requests Projects Releases 22 Wiki Activity

[Explore|Trunk] 

- Remove qf=true  from home page and menu items --> use resultbestaccessright="Open%2520Access" instead
- initialize rel next/prev with empty values



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@61020 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2021-05-19 07:42:56 +00:00
parent 438f854908
commit a0dff09666
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
explore/src/app/app.component.ts
View File

@ -14,6 +14,7 @@ import {Subscriber} from "rxjs";
import {Meta} from "@angular/platform-browser"; import {Meta} from "@angular/platform-browser";
import {properties} from "../environments/environment"; import {properties} from "../environments/environment";
import {SmoothScroll} from "./openaireLibrary/utils/smooth-scroll"; import {SmoothScroll} from "./openaireLibrary/utils/smooth-scroll";
import {SEOService} from "./openaireLibrary/sharedComponents/SEO/SEO.service";
@Component({ @Component({
//changeDetection: ChangeDetectionStrategy.Default, //changeDetection: ChangeDetectionStrategy.Default,
@ -59,7 +60,7 @@ export class AppComponent {
constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService, constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService,
private router: Router, private userManagementService: UserManagementService, private smoothScroll: SmoothScroll, private router: Router, private userManagementService: UserManagementService, private smoothScroll: SmoothScroll,
private configurationService: ConfigurationService, private _meta: Meta) { private configurationService: ConfigurationService, private _meta: Meta, private seoService: SEOService,) {
this.userMenuItems.push(new MenuItem("", "My profile", "", "", false, [], [], {})); this.userMenuItems.push(new MenuItem("", "My profile", "", "", false, [], [], {}));
this.userMenuItems.push(new MenuItem("", "My ORCID links", "", "/my-orcid-links", false, [], [""], {})); this.userMenuItems.push(new MenuItem("", "My ORCID links", "", "/my-orcid-links", false, [], [""], {}));
this.userMenuItems.push(new MenuItem("", "My links", "", "/myclaims", false, [], ["/myclaims"], {})); this.userMenuItems.push(new MenuItem("", "My links", "", "/myclaims", false, [], ["/myclaims"], {}));
@ -80,6 +81,8 @@ export class AppComponent {
if (this.properties.environment == "production" || this.properties.environment == "development") { if (this.properties.environment == "production" || this.properties.environment == "development") {
this.subscriptions.push(this.route.queryParams.subscribe(data => { this.subscriptions.push(this.route.queryParams.subscribe(data => {
this._meta.updateTag({content: 'all', name: 'robots'}); this._meta.updateTag({content: 'all', name: 'robots'});
this.seoService.removeLinkForPrevURL();
this.seoService.removeLinkForNextURL();
})); }));
} }
this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => { this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
@ -114,7 +117,7 @@ export class AppComponent {
{ {
rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], ["/search/find"], {qf: true}), rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], ["/search/find"], {qf: true}),
items: [ items: [
new MenuItem("", "Research Outcomes", "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {qf: true}), new MenuItem("", "Research Outcomes", "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {resultbestaccessright: '"' + encodeURIComponent("Open Access") + '"'}),
new MenuItem("", "Projects", "", "/search/find/projects/", false, ["project"], ["/search/find/projects"], {}), new MenuItem("", "Projects", "", "/search/find/projects/", false, ["project"], ["/search/find/projects"], {}),
new MenuItem("", "Content Providers", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {}), new MenuItem("", "Content Providers", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {}),
new MenuItem("", "Organizations", "", "/search/find/organizations/", false, ["organization"], ["/search/find/organizations"], {}) new MenuItem("", "Organizations", "", "/search/find/organizations/", false, ["organization"], ["/search/find/organizations"], {})

12
explore/src/app/home/home.component.ts
View File

@ -268,15 +268,15 @@ export class HomeComponent {
parameterNames.push("type"); parameterNames.push("type");
parameterValues.push(values.join(",")); parameterValues.push(values.join(","));
} }
if (this.resultsQuickFilter) { if (this.resultsQuickFilter && this.resultsQuickFilter.selected) {
parameterNames.push("qf"); parameterNames.push(this.resultsQuickFilter.filterId);
parameterValues.push("" + this.resultsQuickFilter.selected); parameterValues.push('"'+ encodeURIComponent(this.resultsQuickFilter.value)+'"');
} }
} }
} else if (this.selectedEntity == "all") { } else if (this.selectedEntity == "all") {
if (this.resultsQuickFilter) { if (this.resultsQuickFilter && this.resultsQuickFilter.selected) {
parameterNames.push("qf"); parameterNames.push(this.resultsQuickFilter.filterId);
parameterValues.push("true"); parameterValues.push('"'+ encodeURIComponent(this.resultsQuickFilter.value)+'"');
} }
} }
if (this.keyword.length > 0) { if (this.keyword.length > 0) {