From 9e1dcf9f21879c365f641701d43744b86e5aff9f Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Mon, 7 Dec 2020 09:17:53 +0000 Subject: [PATCH] [Explore |Trunk] - App: set robots tag to "all" on params change - to unset the noindex value for newly added records - delete unused sitemap file - update properties with new login in beta - update language tag in html pages - update sitemap.xml git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@60039 d315682c-612b-4755-9ff5-7f18f6832af3 --- explore/src/app/app.component.ts | 13 ++- explore/src/environments/environment.beta.ts | 4 +- explore/src/index.beta.html | 2 +- explore/src/index.html | 2 +- explore/src/index.prod.html | 3 +- explore/src/robots.prod.txt | 7 -- explore/src/sitemap.xml | 78 -------------- explore/src/sitemaps/sitemap.xml | 102 +++++++++++-------- 8 files changed, 76 insertions(+), 135 deletions(-) delete mode 100644 explore/src/sitemap.xml diff --git a/explore/src/app/app.component.ts b/explore/src/app/app.component.ts index f617c0ac..7a725a4b 100644 --- a/explore/src/app/app.component.ts +++ b/explore/src/app/app.component.ts @@ -11,6 +11,8 @@ import {UserManagementService} from "./openaireLibrary/services/user-management. import {ConfigurationService} from "./openaireLibrary/utils/configuration/configuration.service"; import {Header} from "./openaireLibrary/sharedComponents/navigationBar.component"; import {Subscriber} from "rxjs"; +import {Meta} from "@angular/platform-browser"; +import {properties} from "../environments/environment"; @Component({ //changeDetection: ChangeDetectionStrategy.Default, @@ -61,7 +63,7 @@ export class AppComponent { constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService, private router: Router, private userManagementService: UserManagementService, - private configurationService: ConfigurationService) { + private configurationService: ConfigurationService, private _meta: Meta) { this.subscriptions.push(router.events.forEach((event) => { if (event instanceof NavigationStart) { // console.log(event.url); @@ -71,6 +73,10 @@ export class AppComponent { } ngOnInit() { + + + + if (typeof document !== 'undefined') { try { this.isClient = true; @@ -85,6 +91,11 @@ export class AppComponent { this.properties = this.propertiesService.envSpecific; this.configurationService.initCommunityInformation(this.properties, this.properties.adminToolsCommunity); this.feedbackmail = this.properties.feedbackmail; + if(this.properties.environment == "production") { + this.subscriptions.push(this.route.queryParams.subscribe(data => { + this._meta.updateTag({content: 'all', name: 'robots'}); + })); + } this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => { this.user = user; this.buildMenu(); diff --git a/explore/src/environments/environment.beta.ts b/explore/src/environments/environment.beta.ts index 9a20e890..794997ae 100644 --- a/explore/src/environments/environment.beta.ts +++ b/explore/src/environments/environment.beta.ts @@ -46,11 +46,11 @@ export let properties: EnvProperties = { piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", piwikSiteId: "6", - loginUrl: "https://beta.services.openaire.eu/uoa-user-management/openid_connect_login", + loginUrl: "https://beta.services.openaire.eu/explore-login/openid_connect_login", userInfoUrl: "https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=", - logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", + logoutUrl: "https://beta.services.openaire.eu/explore-login/openid_login", cookieDomain: ".openaire.eu", diff --git a/explore/src/index.beta.html b/explore/src/index.beta.html index d6e7a5f1..06ea7a43 100644 --- a/explore/src/index.beta.html +++ b/explore/src/index.beta.html @@ -1,5 +1,5 @@ - + diff --git a/explore/src/index.html b/explore/src/index.html index d6e7a5f1..06ea7a43 100644 --- a/explore/src/index.html +++ b/explore/src/index.html @@ -1,5 +1,5 @@ - + diff --git a/explore/src/index.prod.html b/explore/src/index.prod.html index 444cea0e..9f1e0b80 100644 --- a/explore/src/index.prod.html +++ b/explore/src/index.prod.html @@ -1,5 +1,5 @@ - + @@ -19,6 +19,7 @@ + diff --git a/explore/src/robots.prod.txt b/explore/src/robots.prod.txt index 540dfe5f..ca9f278e 100644 --- a/explore/src/robots.prod.txt +++ b/explore/src/robots.prod.txt @@ -1,12 +1,5 @@ User-Agent: * Disallow: /upload -Disallow: /participate/direct-claim -Disallow: /participate/direct-claim?* -Disallow: /participate/claim -Disallow: /myclaims -Disallow: /myclaims?* -Disallow: /claims -Disallow: /claims?* Crawl-delay: 30 Sitemap: https://explore.openaire.eu/sitemap.xml diff --git a/explore/src/sitemap.xml b/explore/src/sitemap.xml deleted file mode 100644 index 7f079239..00000000 --- a/explore/src/sitemap.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - weekly - 1 - - - - daily - 1 - - - - daily - 0.9 - - - - daily - 0.9 - - - - daily - 0.9 - - - - daily - 0.9 - - - - daily - 0.8 - - - - daily - 0.8 - - - - daily - 0.8 - - - - daily - 0.8 - - - - weekly - 0.7 - - - - weekly - 0.7 - - - - weekly - 0.7 - - - - weekly - 0.8 - - - - weekly - 0.8 - - diff --git a/explore/src/sitemaps/sitemap.xml b/explore/src/sitemaps/sitemap.xml index 6cc29ed8..c86ca2bc 100644 --- a/explore/src/sitemaps/sitemap.xml +++ b/explore/src/sitemaps/sitemap.xml @@ -1,59 +1,73 @@ - + + - - weekly - 1 - - - - daily - 1 - - - - daily - 0.9 - - - - daily - 0.9 - - - - daily - 0.8 - - - - daily - 0.8 + https://explore.openaire.eu - - weekly - 0.7 + https://explore.openaire.eu/search/find/?size=20 + - - weekly - 0.7 + https://explore.openaire.eu/search/find/research-outcomes?qf=true&size=20 + - - weekly - 0.7 + https://explore.openaire.eu/search/find/projects?size=20 + - - weekly - 0.8 + https://explore.openaire.eu/search/find/dataproviders + - - weekly - 0.8 + https://explore.openaire.eu/search/find/organizations + + + https://explore.openaire.eu/participate/deposit/learn-how + + + + https://explore.openaire.eu/participate/claim + + + + https://www.openaire.eu/linking + + + + https://explore.openaire.eu/search/content-providers + + + + https://explore.openaire.eu/search/journals + + + + https://explore.openaire.eu/search/entity-registries + + + + https://explore.openaire.eu/search/find/dataproviders + + + + https://explore.openaire.eu/search/find/research-outcomes?f0=q&fv0=&size=10&sortBy=&resultbestaccessright=%22Open%20Access%22&type=publications&qf=true&size=20 + + + + https://explore.openaire.eu/search/find/research-outcomes?f0=q&fv0=&size=10&sortBy=&resultbestaccessright=%22Open%20Access%22&type=publications&qf=true&size=20 + + + + https://explore.openaire.eu/search/find/research-outcomes?f0=q&fv0=&size=10&sortBy=&resultbestaccessright=%22Open%20Access%22&type=publications,datasets,%22software%22&qf=true&size=20 + + + + https://explore.openaire.eu/search/find/research-outcomes?f0=q&fv0=&size=10&sortBy=&resultbestaccessright=%22Open%20Access%22&type=publications,datasets,%22other%22&qf=true&size=20 + + +