[Connect|Trunk]
- update properties / use prod.prod propertis for production instance - remove checks for production ready instances - simplify sitemap - remove subscribe for properties - Add community title for custom filter - update piwik ids - use the same for beta and production git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@59991 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
parent
7f99bb3640
commit
9d68ae13c8
|
@ -44,7 +44,7 @@
|
|||
"fileReplacements": [
|
||||
{
|
||||
"replace": "src/environments/environment.ts",
|
||||
"with": "src/environments/environment.prod.ts"
|
||||
"with": "src/environments/environment.prod.prod.ts"
|
||||
},
|
||||
{
|
||||
"replace": "src/index.html",
|
||||
|
@ -163,7 +163,7 @@
|
|||
"fileReplacements": [
|
||||
{
|
||||
"replace": "src/environments/environment.ts",
|
||||
"with": "src/environments/environment.prod.ts"
|
||||
"with": "src/environments/environment.prod.prod.ts"
|
||||
},
|
||||
{
|
||||
"replace": "src/index.html",
|
||||
|
|
|
@ -84,18 +84,17 @@ app.use(function (req, res, next) {
|
|||
console.log(req.get("host"));
|
||||
let host = req.get("host").split(":")[0];
|
||||
let connectLinks= ["/","/about/learn-how","/about/learn-in-depth", "/about/faq","/search/find/communities"];
|
||||
let communityLinks= ["/","/search/find/research-outcomes","/search/advanced/research-outcomes","/participate/deposit/learn-how","/organizations", "/content"];
|
||||
let communityLinks= ["/","/search/find/research-outcomes?size=20","/search/advanced/research-outcomes?size=20","/participate/deposit/learn-how","/organizations", "/content"];
|
||||
let sitemap = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
|
||||
"<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd\">";
|
||||
let urlPre = "<url>\n" +
|
||||
" <loc><![CDATA[";
|
||||
let urlSuf = "]]></loc>\n" +
|
||||
" <loc>";
|
||||
let urlSuf = "</loc>\n" +
|
||||
" </url>";
|
||||
for(let link of (host.indexOf("connect.openaire.eu") == -1 ?communityLinks:connectLinks)){
|
||||
sitemap += urlPre + "https://" + host + link + urlSuf;
|
||||
}
|
||||
sitemap += "\n</urlset>";
|
||||
console.log(req.secure);
|
||||
res.setHeader('content-type', 'application/xml');
|
||||
res.send( sitemap);
|
||||
});
|
||||
|
|
|
@ -10,6 +10,7 @@ import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
|
|||
import {PiwikHelper} from "../utils/piwikHelper";
|
||||
import {StringUtils} from '../openaireLibrary/utils/string-utils.class';
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'affiliations',
|
||||
|
@ -41,42 +42,41 @@ export class AffiliationsComponent {
|
|||
private affiliationService: AffiliationService) {}
|
||||
|
||||
public ngOnInit() {
|
||||
this.subscriptions.push(this.route.data
|
||||
.subscribe((data: { envSpecific: EnvProperties }) => {
|
||||
this.subscriptions.push(this.route.queryParams.subscribe(
|
||||
communityId => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
|
||||
if(!this.communityId) {
|
||||
this.communityId = communityId['communityId'];
|
||||
}
|
||||
|
||||
this.properties = data.envSpecific;
|
||||
if(this.longView) {
|
||||
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
|
||||
this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, PiwikHelper.getSiteId(this.communityId, this.properties.environment)).subscribe());
|
||||
}
|
||||
this.url = this.properties.domain + this._router.url;
|
||||
this.seoService.createLinkForCanonicalURL(this.url);
|
||||
this.updateUrl(this.url);
|
||||
this.updateTitle(this.pageTitle);
|
||||
this.updateDescription("OpenAIRE - Connect, Community Gateway, research community, organizations");
|
||||
this.subscriptions.push(this.route.queryParams.subscribe(
|
||||
communityId => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(properties.domain);
|
||||
if(!this.communityId) {
|
||||
this.communityId = communityId['communityId'];
|
||||
}
|
||||
|
||||
this.properties = properties;
|
||||
if(this.longView) {
|
||||
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
|
||||
this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, PiwikHelper.getSiteId(this.communityId, this.properties.environment)).subscribe());
|
||||
}
|
||||
this.url = this.properties.domain + this._router.url;
|
||||
this.seoService.createLinkForCanonicalURL(this.url);
|
||||
this.updateUrl(this.url);
|
||||
this.updateTitle(this.pageTitle);
|
||||
this.updateDescription("OpenAIRE - Connect, Community Gateway, research community, organizations");
|
||||
}
|
||||
if(this.getAffiliationsFromAPI) {
|
||||
this.showLoading = true;
|
||||
this.affiliationService.initAffiliations(this.communityId);
|
||||
this.subscriptions.push(this.affiliationService.affiliations.subscribe(
|
||||
affiliations => {
|
||||
this.affiliations = affiliations;
|
||||
this.showLoading = false;
|
||||
},
|
||||
error => {
|
||||
console.error("Affiliations Component: Error getting affiliations for community with id: " + this.communityId, error);
|
||||
this.showLoading = false;
|
||||
}
|
||||
if(this.getAffiliationsFromAPI) {
|
||||
this.showLoading = true;
|
||||
this.affiliationService.initAffiliations(this.communityId);
|
||||
this.subscriptions.push(this.affiliationService.affiliations.subscribe(
|
||||
affiliations => {
|
||||
this.affiliations = affiliations;
|
||||
this.showLoading = false;
|
||||
},
|
||||
error => {
|
||||
console.error("Affiliations Component: Error getting affiliations for community with id: " + this.communityId, error);
|
||||
this.showLoading = false;
|
||||
}
|
||||
));
|
||||
}
|
||||
}));
|
||||
));
|
||||
}
|
||||
}));
|
||||
|
||||
}
|
||||
|
||||
ngOnDestroy() {
|
||||
|
|
|
@ -14,6 +14,7 @@ import {ConfigurationService} from "./openaireLibrary/utils/configuration/config
|
|||
import {properties} from '../environments/environment';
|
||||
import {Header} from "./openaireLibrary/sharedComponents/navigationBar.component";
|
||||
import {Subscriber} from "rxjs";
|
||||
import {CommunityService} from "./openaireLibrary/connect/community/community.service";
|
||||
|
||||
@Component({
|
||||
//changeDetection: ChangeDetectionStrategy.Default,
|
||||
|
@ -98,7 +99,7 @@ export class AppComponent {
|
|||
constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService,
|
||||
private _communitiesService: CommunitiesService, private _subscribeService: SubscribeService,
|
||||
private router: Router, private userManagementService: UserManagementService,
|
||||
private configurationService: ConfigurationService) {
|
||||
private configurationService: ConfigurationService, private _communityService: CommunityService) {
|
||||
this.subscriptions.push(router.events.forEach((event) => {
|
||||
if (event instanceof NavigationStart) {
|
||||
HelperFunctions.scroll();
|
||||
|
@ -115,6 +116,7 @@ export class AppComponent {
|
|||
this.userManagementService.clearSubscriptions();
|
||||
this.configurationService.clearSubscriptions();
|
||||
this._subscribeService.clearSubscriptions();
|
||||
this._communityService.clearSubscriptions();
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
|
|
|
@ -3,6 +3,7 @@ import {ActivatedRoute} from '@angular/router';
|
|||
import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
|
||||
import {PiwikHelper} from "../../utils/piwikHelper";
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-directLinking',
|
||||
|
@ -23,16 +24,15 @@ export class OpenaireDirectLinkingComponent {
|
|||
}
|
||||
}
|
||||
public ngOnInit() {
|
||||
this.sub = this.route.data
|
||||
.subscribe((data: { envSpecific: any }) => {
|
||||
this.sub =
|
||||
this.route.queryParams.subscribe(
|
||||
communityId => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(properties.domain);
|
||||
if (!this.communityId) {
|
||||
this.communityId = communityId['communityId'];
|
||||
}
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId,data.envSpecific.environment);
|
||||
})
|
||||
});
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId,properties.environment);
|
||||
});
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,6 +3,7 @@ import {ActivatedRoute} from '@angular/router';
|
|||
import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
|
||||
import {PiwikHelper} from "../../utils/piwikHelper";
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-linking-generic',
|
||||
|
@ -19,17 +20,13 @@ export class OpenaireLinkingComponent {
|
|||
}
|
||||
}
|
||||
constructor (private route: ActivatedRoute) {
|
||||
this.sub = this.route.data
|
||||
.subscribe((data: { envSpecific: any }) => {
|
||||
this.route.queryParams.subscribe(
|
||||
communityId => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
|
||||
if(!this.communityId) {
|
||||
this.communityId = communityId['communityId'];
|
||||
}
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId,data.envSpecific.environment);
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
this.route.queryParams.subscribe(
|
||||
communityId => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(properties.domain);
|
||||
if(!this.communityId) {
|
||||
this.communityId = communityId['communityId'];
|
||||
}
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId,properties.environment);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
import {Component} from '@angular/core';
|
||||
import {ActivatedRoute} from '@angular/router';
|
||||
import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties';
|
||||
import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
|
||||
import {PiwikHelper} from "../../utils/piwikHelper";
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
|
||||
@Component({
|
||||
|
@ -27,19 +27,17 @@ import {Subscriber} from "rxjs";
|
|||
}
|
||||
}
|
||||
public ngOnInit() {
|
||||
this.sub = this.route.data
|
||||
.subscribe((data: { envSpecific: EnvProperties }) => {
|
||||
this.claimsInfoURL = data.envSpecific.claimsInformationLink;
|
||||
this.userInfoURL = data.envSpecific.userInfoUrl;
|
||||
this.route.queryParams.subscribe(
|
||||
communityId => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
|
||||
if(!this.communityId) {
|
||||
this.communityId = communityId['communityId'];
|
||||
}
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId,data.envSpecific.environment);
|
||||
});
|
||||
});
|
||||
this.claimsInfoURL = properties.claimsInformationLink;
|
||||
this.userInfoURL = properties.userInfoUrl;
|
||||
this.sub = this.route.queryParams.subscribe(
|
||||
communityId => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(properties.domain);
|
||||
if(!this.communityId) {
|
||||
this.communityId = communityId['communityId'];
|
||||
}
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId,properties.environment);
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -75,12 +75,12 @@
|
|||
<div>
|
||||
<div class="uk-position-small uk-position-bottom-right">
|
||||
<a *ngIf="directLink" [href]="getCommunityPageUrl()" target="_blank" class="portal-link uk-text-uppercase uk-text-bold">
|
||||
Visit {{(properties.environment == 'production'&& getProductionPrefix(community.communityId).length > 0
|
||||
?' BETA':'')}}
|
||||
Visit <!--{{(properties.environment == 'production'&& getProductionPrefix(community.communityId).length > 0
|
||||
?' BETA':'')}}-->
|
||||
</a>
|
||||
<a *ngIf="!directLink" (click)="confirmModalOpen()" class="portal-link uk-text-uppercase uk-text-bold">
|
||||
Visit {{(properties.environment == 'production' && getProductionPrefix(community.communityId).length > 0
|
||||
?' BETA':'')}}
|
||||
Visit <!--{{(properties.environment == 'production' && getProductionPrefix(community.communityId).length > 0
|
||||
?' BETA':'')}}-->
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -3,9 +3,10 @@ import {ActivatedRoute, Router} from '@angular/router';
|
|||
import {Location} from '@angular/common';
|
||||
|
||||
import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties';
|
||||
import {CommunityInfo, prodReadyCommunities} from '../../openaireLibrary/connect/community/communityInfo';
|
||||
import {CommunityInfo} from '../../openaireLibrary/connect/community/communityInfo';
|
||||
import {LocalStorageService} from "../../openaireLibrary/services/localStorage.service";
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'browse-community',
|
||||
|
@ -34,13 +35,11 @@ export class BrowseCommunityComponent {
|
|||
|
||||
|
||||
public ngOnInit() {
|
||||
this.subscriptions.push(this.route.data
|
||||
.subscribe((data: { envSpecific: EnvProperties }) => {
|
||||
this.properties = data.envSpecific;
|
||||
this.subscriptions.push(this.localStorageService.get().subscribe(value => {
|
||||
this.directLink = value;
|
||||
}));
|
||||
}));
|
||||
this.properties = properties;
|
||||
this.subscriptions.push(this.localStorageService.get().subscribe(value => {
|
||||
this.directLink = value;
|
||||
}));
|
||||
|
||||
}
|
||||
|
||||
subscriptions = [];
|
||||
|
@ -58,7 +57,7 @@ export class BrowseCommunityComponent {
|
|||
}
|
||||
|
||||
getProductionPrefix(id:string): string {
|
||||
return (this.properties.environment == "production" && prodReadyCommunities.indexOf(id)!=-1) ? "" : "beta.";
|
||||
return (this.properties.environment == "production") ? "" : "beta.";
|
||||
}
|
||||
|
||||
public confirmModalOpen() {
|
||||
|
|
|
@ -12,6 +12,7 @@ import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
|
|||
import {FormBuilder, FormGroup, Validators} from "@angular/forms";
|
||||
import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'contact',
|
||||
|
@ -54,24 +55,24 @@ export class ContactComponent implements OnInit {
|
|||
|
||||
ngOnInit() {
|
||||
this._title.setTitle('OpenAIRE-Connect | Contact Us');
|
||||
this.subscriptions.push(this.route.data.subscribe((data: { envSpecific: EnvProperties }) => {
|
||||
this.properties = data.envSpecific;
|
||||
this.email = {body: '', subject: '', recipients: []};
|
||||
|
||||
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
|
||||
this.subscriptions.push( this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe());
|
||||
}
|
||||
this.url = this.properties.domain + this._router.url;
|
||||
this.seoService.createLinkForCanonicalURL(this.url);
|
||||
this.updateUrl(this.url);
|
||||
this.updateTitle(this.pageTitle);
|
||||
this.updateDescription("Contact us to learn more about OpenAIRE Connect Research Gateways");
|
||||
this.reset();
|
||||
//this.getDivContents();
|
||||
this.getPageContents();
|
||||
HelperFunctions.scroll();
|
||||
this.showLoading = false;
|
||||
}));
|
||||
this.properties = properties;
|
||||
this.email = {body: '', subject: '', recipients: []};
|
||||
|
||||
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
|
||||
this.subscriptions.push( this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe());
|
||||
}
|
||||
this.url = this.properties.domain + this._router.url;
|
||||
this.seoService.createLinkForCanonicalURL(this.url);
|
||||
this.updateUrl(this.url);
|
||||
this.updateTitle(this.pageTitle);
|
||||
this.updateDescription("Contact us to learn more about OpenAIRE Connect Research Gateways");
|
||||
this.reset();
|
||||
//this.getDivContents();
|
||||
this.getPageContents();
|
||||
HelperFunctions.scroll();
|
||||
this.showLoading = false;
|
||||
|
||||
}
|
||||
|
||||
private getPageContents() {
|
||||
|
|
|
@ -8,6 +8,7 @@ import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
|
|||
import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
|
||||
import {ConnectHelper} from "../openaireLibrary/connect/connectHelper";
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from 'environments/environment';
|
||||
|
||||
@Component({
|
||||
selector: 'html-page',
|
||||
|
@ -36,27 +37,26 @@ export class HtmlPageComponent {
|
|||
private helper: HelperService) {}
|
||||
|
||||
public ngOnInit() {
|
||||
this.subscriptions.push(this.route.data
|
||||
.subscribe((data: { envSpecific: EnvProperties }) => {
|
||||
this.properties = data.envSpecific;
|
||||
|
||||
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
|
||||
this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe());
|
||||
}
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(this.properties.domain);
|
||||
if (this.properties.environment == "development") {
|
||||
this.subscriptions.push(this.route.queryParams.subscribe(params => {
|
||||
this.communityId = (params['communityId']) ? params['communityId'] : ConnectHelper.getCommunityFromDomain(this.properties.domain);
|
||||
}));
|
||||
}
|
||||
//TODO set the proper URL
|
||||
this.url = this.properties.domain + this._router.url;
|
||||
this.seoService.createLinkForCanonicalURL(this.url);
|
||||
this.updateUrl(this.url);
|
||||
this.updateTitle(this.pageTitle);
|
||||
this.updateDescription(this.description);
|
||||
this.getPageContents();
|
||||
}));
|
||||
this.properties = properties;
|
||||
|
||||
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
|
||||
this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe());
|
||||
}
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(this.properties.domain);
|
||||
if (this.properties.environment == "development") {
|
||||
this.subscriptions.push(this.route.queryParams.subscribe(params => {
|
||||
this.communityId = (params['communityId']) ? params['communityId'] : ConnectHelper.getCommunityFromDomain(this.properties.domain);
|
||||
}));
|
||||
}
|
||||
//TODO set the proper URL
|
||||
this.url = this.properties.domain + this._router.url;
|
||||
this.seoService.createLinkForCanonicalURL(this.url);
|
||||
this.updateUrl(this.url);
|
||||
this.updateTitle(this.pageTitle);
|
||||
this.updateDescription(this.description);
|
||||
this.getPageContents();
|
||||
|
||||
}
|
||||
|
||||
ngOnDestroy() {
|
||||
|
|
|
@ -3,6 +3,7 @@ import {ActivatedRoute} from '@angular/router';
|
|||
import {PiwikHelper} from '../../utils/piwikHelper';
|
||||
import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-dataprovider',
|
||||
|
@ -14,16 +15,14 @@ export class OpenaireDataProviderComponent {
|
|||
communityId = null;
|
||||
private sub;
|
||||
constructor(private route: ActivatedRoute) {
|
||||
this.sub = this.route.data
|
||||
.subscribe((data: { envSpecific: any }) => {
|
||||
this.route.queryParams.subscribe(params => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
|
||||
this.sub = this.route.queryParams.subscribe(params => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(properties.domain);
|
||||
if (!this.communityId) {
|
||||
this.communityId = params['communityId'];
|
||||
}
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId, data.envSpecific.environment);
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId, properties.environment);
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
|
|
|
@ -3,6 +3,7 @@ import {ActivatedRoute} from '@angular/router';
|
|||
import {PiwikHelper} from '../../utils/piwikHelper';
|
||||
import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-dataset',
|
||||
|
@ -15,16 +16,14 @@ export class OpenaireDatasetComponent {
|
|||
communityId = null;
|
||||
private sub;
|
||||
constructor(private route: ActivatedRoute) {
|
||||
this.sub = this.route.data
|
||||
.subscribe((data: { envSpecific: any }) => {
|
||||
this.route.queryParams.subscribe(params => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
|
||||
this.sub = this.route.queryParams.subscribe(params => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(properties.domain);
|
||||
if (!this.communityId) {
|
||||
this.communityId = params['communityId'];
|
||||
}
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId, data.envSpecific.environment);
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId, properties.environment);
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
|
|
|
@ -3,6 +3,7 @@ import {ActivatedRoute} from '@angular/router';
|
|||
import {PiwikHelper} from '../../utils/piwikHelper';
|
||||
import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../../environments/environment";
|
||||
@Component({
|
||||
selector: 'openaire-htmlProjectReport',
|
||||
template: `<htmlProjectReport [piwikSiteId]=piwikSiteId [communityId]="communityId"></htmlProjectReport>`,
|
||||
|
@ -13,16 +14,14 @@ export class OpenaireHtmlProjectReportComponent{
|
|||
private sub;
|
||||
|
||||
constructor(private route: ActivatedRoute) {
|
||||
this.sub = this.route.data
|
||||
.subscribe((data: { envSpecific: any }) => {
|
||||
this.route.queryParams.subscribe(params => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
|
||||
this.sub = this.route.queryParams.subscribe(params => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(properties.domain);
|
||||
if (!this.communityId) {
|
||||
this.communityId = params['communityId'];
|
||||
}
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId, data.envSpecific.environment);
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId, properties.environment);
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
|
|
|
@ -3,6 +3,7 @@ import {ActivatedRoute} from '@angular/router';
|
|||
import {PiwikHelper} from '../../utils/piwikHelper';
|
||||
import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-organization',
|
||||
|
@ -15,16 +16,14 @@ export class OpenaireOrganizationComponent {
|
|||
private sub;
|
||||
|
||||
constructor(private route: ActivatedRoute) {
|
||||
this.sub = this.route.data
|
||||
.subscribe((data: { envSpecific: any }) => {
|
||||
this.route.queryParams.subscribe(params => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
|
||||
this.sub = this.route.queryParams.subscribe(params => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(properties.domain);
|
||||
if (!this.communityId) {
|
||||
this.communityId = params['communityId'];
|
||||
}
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId, data.envSpecific.environment);
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId, properties.environment);
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -3,6 +3,7 @@ import {ActivatedRoute} from '@angular/router';
|
|||
import {PiwikHelper} from '../../utils/piwikHelper';
|
||||
import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-orp',
|
||||
|
@ -17,16 +18,14 @@ export class OpenaireOrpComponent {
|
|||
private sub;
|
||||
|
||||
constructor(private route: ActivatedRoute) {
|
||||
this.sub = this.route.data
|
||||
.subscribe((data: { envSpecific: any }) => {
|
||||
this.route.queryParams.subscribe(params => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
|
||||
this.sub = this.route.queryParams.subscribe(params => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(properties.domain);
|
||||
if (!this.communityId) {
|
||||
this.communityId = params['communityId'];
|
||||
}
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId, data.envSpecific.environment);
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId, properties.environment);
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -3,6 +3,7 @@ import {ActivatedRoute} from '@angular/router';
|
|||
import {PiwikHelper} from '../../utils/piwikHelper';
|
||||
import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-project',
|
||||
|
@ -15,16 +16,14 @@ export class OpenaireProjectComponent {
|
|||
private sub;
|
||||
|
||||
constructor(private route: ActivatedRoute) {
|
||||
this.sub = this.route.data
|
||||
.subscribe((data: { envSpecific: any }) => {
|
||||
this.route.queryParams.subscribe(params => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
|
||||
this.sub = this.route.queryParams.subscribe(params => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(properties.domain);
|
||||
if (!this.communityId) {
|
||||
this.communityId = params['communityId'];
|
||||
}
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId, data.envSpecific.environment);
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId, properties.environment);
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
|
|
|
@ -3,6 +3,7 @@ import {ActivatedRoute} from '@angular/router';
|
|||
import {PiwikHelper} from '../../utils/piwikHelper';
|
||||
import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-publication',
|
||||
|
@ -16,16 +17,13 @@ export class OpenairePublicationComponent {
|
|||
private sub;
|
||||
|
||||
constructor(private route: ActivatedRoute) {
|
||||
this.sub = this.route.data
|
||||
.subscribe((data: { envSpecific: any }) => {
|
||||
this.route.queryParams.subscribe(params => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
|
||||
this.sub = this.route.queryParams.subscribe(params => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(properties.domain);
|
||||
if (!this.communityId) {
|
||||
this.communityId = params['communityId'];
|
||||
}
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId, data.envSpecific.environment);
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId, properties.environment);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -3,6 +3,7 @@ import {ActivatedRoute} from "@angular/router";
|
|||
import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
|
||||
import {PiwikHelper} from "../../utils/piwikHelper";
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-publication',
|
||||
|
@ -14,16 +15,14 @@ export class OpenaireResultComponent{
|
|||
private sub;
|
||||
|
||||
constructor(private route: ActivatedRoute) {
|
||||
this.sub = this.route.data
|
||||
.subscribe((data: { envSpecific: any }) => {
|
||||
this.route.queryParams.subscribe(params => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
|
||||
this.sub = this.route.queryParams.subscribe(params => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(properties.domain);
|
||||
if (!this.communityId) {
|
||||
this.communityId = params['communityId'];
|
||||
}
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId, data.envSpecific.environment);
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId, properties.environment);
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -3,6 +3,7 @@ import {ActivatedRoute} from '@angular/router';
|
|||
import {PiwikHelper} from '../../utils/piwikHelper';
|
||||
import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-software',
|
||||
|
@ -16,16 +17,15 @@ export class OpenaireSoftwareComponent {
|
|||
private sub;
|
||||
|
||||
constructor(private route: ActivatedRoute) {
|
||||
this.sub = this.route.data
|
||||
.subscribe((data: { envSpecific: any }) => {
|
||||
this.sub =
|
||||
this.route.queryParams.subscribe(params => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(properties.domain);
|
||||
if (!this.communityId) {
|
||||
this.communityId = params['communityId'];
|
||||
}
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId, data.envSpecific.environment);
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId, properties.environment);
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -7,6 +7,7 @@ import {SEOService} from "../../openaireLibrary/sharedComponents/SEO/SEO.service
|
|||
import {PiwikService} from "../../openaireLibrary/utils/piwik/piwik.service";
|
||||
import {HelperService} from "../../openaireLibrary/utils/helper/helper.service";
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'learn-in-depth',
|
||||
|
@ -201,7 +202,7 @@ export class FaqsComponent {
|
|||
public pageTitle: string = "OpenAIRE - Connect | FAQs";
|
||||
public pageDescription: string = "Frequently asked questions about OpenAIRE Connect research gateway";
|
||||
public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'about', route: '/about'}, {name: 'FAQs'}];
|
||||
private subscriptions;
|
||||
private subscriptions = [];
|
||||
public pageContents = null;
|
||||
public divContents = null;
|
||||
public url: string = null;
|
||||
|
@ -218,9 +219,8 @@ export class FaqsComponent {
|
|||
}
|
||||
|
||||
public ngOnInit() {
|
||||
this.subscriptions.push(this.route.data
|
||||
.subscribe((data: { envSpecific: EnvProperties }) => {
|
||||
this.properties = data.envSpecific;
|
||||
|
||||
this.properties = properties;
|
||||
|
||||
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
|
||||
this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe());
|
||||
|
@ -233,7 +233,7 @@ export class FaqsComponent {
|
|||
|
||||
//this.getDivContents();
|
||||
this.getPageContents();
|
||||
}));
|
||||
|
||||
}
|
||||
|
||||
private getPageContents() {
|
||||
|
|
|
@ -7,6 +7,7 @@ import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
|
|||
import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
|
||||
import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'learn-how',
|
||||
|
@ -254,9 +255,8 @@ export class LearnHowComponent implements OnInit {
|
|||
}
|
||||
|
||||
public ngOnInit() {
|
||||
this.subscriptions.push(this.route.data
|
||||
.subscribe((data: { envSpecific: EnvProperties }) => {
|
||||
this.properties = data.envSpecific;
|
||||
|
||||
this.properties = properties
|
||||
|
||||
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
|
||||
this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe());
|
||||
|
@ -269,7 +269,7 @@ export class LearnHowComponent implements OnInit {
|
|||
|
||||
//this.getDivContents();
|
||||
this.getPageContents();
|
||||
}));
|
||||
|
||||
}
|
||||
|
||||
private getPageContents() {
|
||||
|
|
|
@ -7,6 +7,7 @@ import {SEOService} from "../../openaireLibrary/sharedComponents/SEO/SEO.service
|
|||
import {PiwikService} from "../../openaireLibrary/utils/piwik/piwik.service";
|
||||
import {HelperService} from "../../openaireLibrary/utils/helper/helper.service";
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'learn-in-depth',
|
||||
|
@ -200,9 +201,8 @@ export class LearnInDepthComponent implements OnInit {
|
|||
}
|
||||
|
||||
public ngOnInit() {
|
||||
this.subscriptions.push(this.route.data
|
||||
.subscribe((data: { envSpecific: EnvProperties }) => {
|
||||
this.properties = data.envSpecific;
|
||||
|
||||
this.properties = properties;
|
||||
|
||||
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
|
||||
this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe());
|
||||
|
@ -215,7 +215,6 @@ export class LearnInDepthComponent implements OnInit {
|
|||
|
||||
//this.getDivContents();
|
||||
this.getPageContents();
|
||||
}));
|
||||
}
|
||||
|
||||
private getPageContents() {
|
||||
|
|
|
@ -4,6 +4,7 @@ import {ActivatedRoute} from "@angular/router";
|
|||
import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
|
||||
import {PiwikHelper} from "../../utils/piwikHelper";
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
|
||||
@Component({
|
||||
|
@ -28,28 +29,27 @@ export class OpenaireAdvancedSearchDataProvidersComponent {
|
|||
}
|
||||
}
|
||||
ngOnInit() {
|
||||
this.sub = this.route.data
|
||||
.subscribe((data: { envSpecific: any }) => {
|
||||
|
||||
var communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
|
||||
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(communityId, data.envSpecific.environment);
|
||||
var communityId = ConnectHelper.getCommunityFromDomain(properties.domain);
|
||||
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(communityId, properties.environment);
|
||||
|
||||
if(communityId){
|
||||
this.connectCommunityId = communityId;
|
||||
this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
|
||||
this.customFilter.isHiddenFilter = false;
|
||||
} else{
|
||||
this.route.queryParams.subscribe(params => {
|
||||
this.sub = this.route.queryParams.subscribe(params => {
|
||||
|
||||
if(params['communityId'] && params['communityId']!=""){
|
||||
this.connectCommunityId = params['communityId'];
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.connectCommunityId, data.envSpecific.environment);
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.connectCommunityId, properties.environment);
|
||||
this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
|
||||
this.customFilter.isHiddenFilter = false;
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,6 +4,7 @@ import {ActivatedRoute} from "@angular/router";
|
|||
import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
|
||||
import {PiwikHelper} from "../../utils/piwikHelper";
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
|
||||
@Component({
|
||||
|
@ -28,12 +29,11 @@ export class OpenaireAdvancedSearchOrganizationsComponent {
|
|||
}
|
||||
}
|
||||
ngOnInit() {
|
||||
this.sub =this.route.data
|
||||
.subscribe((data: { envSpecific: any }) => {
|
||||
|
||||
|
||||
var communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
|
||||
var communityId = ConnectHelper.getCommunityFromDomain(properties.domain);
|
||||
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(communityId, data.envSpecific.environment);
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(communityId, properties.environment);
|
||||
|
||||
if(communityId){
|
||||
this.connectCommunityId = communityId;
|
||||
|
@ -41,18 +41,18 @@ export class OpenaireAdvancedSearchOrganizationsComponent {
|
|||
this.customFilter.isHiddenFilter = false;
|
||||
|
||||
} else{
|
||||
this.route.queryParams.subscribe(params => {
|
||||
this.sub = this.route.queryParams.subscribe(params => {
|
||||
|
||||
if(params['communityId'] && params['communityId']!=""){
|
||||
this.connectCommunityId = params['communityId'];
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.connectCommunityId, data.envSpecific.environment);
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.connectCommunityId, properties.environment);
|
||||
this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
|
||||
this.customFilter.isHiddenFilter = false;
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -4,6 +4,7 @@ import {ActivatedRoute} from "@angular/router";
|
|||
import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
|
||||
import {PiwikHelper} from "../../utils/piwikHelper";
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../../environments/environment";
|
||||
@Component({
|
||||
selector: 'openaire-advanced-search-projects',
|
||||
template: `
|
||||
|
@ -26,12 +27,11 @@ export class OpenaireAdvancedSearchProjectsComponent {
|
|||
}
|
||||
}
|
||||
ngOnInit() {
|
||||
this.sub = this.route.data
|
||||
.subscribe((data: { envSpecific: any }) => {
|
||||
|
||||
|
||||
var communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
|
||||
var communityId = ConnectHelper.getCommunityFromDomain(properties.domain);
|
||||
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(communityId, data.envSpecific.environment);
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(communityId, properties.environment);
|
||||
|
||||
if(communityId){
|
||||
this.connectCommunityId = communityId;
|
||||
|
@ -42,12 +42,12 @@ export class OpenaireAdvancedSearchProjectsComponent {
|
|||
|
||||
if(params['communityId'] && params['communityId']!=""){
|
||||
this.connectCommunityId = params['communityId'];
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.connectCommunityId, data.envSpecific.environment);
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.connectCommunityId, properties.environment);
|
||||
this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
|
||||
this.customFilter.isHiddenFilter = false;
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,19 +4,27 @@ import {ActivatedRoute} from "@angular/router";
|
|||
import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
|
||||
import {PiwikHelper} from "../../utils/piwikHelper";
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../../environments/environment";
|
||||
import {CommunitiesService} from "../../openaireLibrary/connect/communities/communities.service";
|
||||
import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properties";
|
||||
import {CommunityService} from "../../openaireLibrary/connect/community/community.service";
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-search-results',
|
||||
template: `
|
||||
<search-research-results resultType="result" [simpleView]="false" [customFilter]=customFilter [piwikSiteId]="piwikSiteId" [hasPrefix]="false" [showBreadcrumb]="true"></search-research-results>
|
||||
<search-research-results resultType="result" [simpleView]="false" [customFilter]=customFilter [piwikSiteId]="piwikSiteId" [hasPrefix]="false" [showBreadcrumb]="true"
|
||||
[openaireLink]="'https://' + (properties.environment == 'production'?'':'beta.') + 'explore.openaire.eu/search/advanced/research-outcomes'"
|
||||
></search-research-results>
|
||||
`
|
||||
})
|
||||
export class OpenaireSearchResearchResultsComponent {
|
||||
connectCommunityId:string;
|
||||
piwikSiteId = null;
|
||||
customFilter: SearchCustomFilter = null;
|
||||
constructor ( private route: ActivatedRoute) {
|
||||
}
|
||||
properties:EnvProperties;
|
||||
constructor(private route: ActivatedRoute, private _communityService: CommunityService) {
|
||||
}
|
||||
|
||||
sub;
|
||||
ngOnDestroy() {
|
||||
if (this.sub instanceof Subscriber) {
|
||||
|
@ -24,26 +32,29 @@ export class OpenaireSearchResearchResultsComponent {
|
|||
}
|
||||
}
|
||||
ngOnInit() {
|
||||
this.sub = this.route.data
|
||||
.subscribe((data: { envSpecific: any }) => {
|
||||
this.properties = properties;
|
||||
var communityId = ConnectHelper.getCommunityFromDomain(properties.domain);
|
||||
if (communityId) {
|
||||
this.connectCommunityId = communityId;
|
||||
this.setCommunity();
|
||||
} else {
|
||||
this.route.queryParams.subscribe(params => {
|
||||
if (params['communityId'] && params['communityId'] != "") {
|
||||
this.connectCommunityId = params['communityId'];
|
||||
this.setCommunity();
|
||||
|
||||
var communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
|
||||
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(communityId, data.envSpecific.environment);
|
||||
|
||||
if(communityId){
|
||||
this.connectCommunityId = communityId;
|
||||
this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
|
||||
} else{
|
||||
this.route.queryParams.subscribe(params => {
|
||||
|
||||
if(params['communityId'] && params['communityId']!=""){
|
||||
this.connectCommunityId = params['communityId'];
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.connectCommunityId, data.envSpecific.environment);
|
||||
this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
setCommunity(){
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.connectCommunityId,properties.environment);
|
||||
this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
|
||||
this.sub = this._communityService.getCommunityByState(this.properties, this.properties.communityAPI + this.connectCommunityId).subscribe(community =>{
|
||||
if(community != null){
|
||||
this.customFilter.valueName = community.shortTitle;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
@ -11,6 +11,9 @@ import {SearchCommunityDataprovidersService} from '../../openaireLibrary/connect
|
|||
import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
|
||||
import {PiwikHelper} from '../../utils/piwikHelper';
|
||||
import {properties} from "../../../environments/environment";
|
||||
import {CommunitiesService} from "../../openaireLibrary/connect/communities/communities.service";
|
||||
import {CommunityService} from "../../openaireLibrary/connect/community/community.service";
|
||||
import {Subscriber} from "rxjs";
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-search-dataproviders',
|
||||
|
@ -21,7 +24,7 @@ import {properties} from "../../../environments/environment";
|
|||
[results] = "results" [searchUtils] = "searchUtils"
|
||||
[columnNames]="columnNames"
|
||||
[showResultCount]=false
|
||||
openaireLink="https://beta.explore.openaire.eu/search/find/dataproviders"
|
||||
[openaireLink]="'https://' + (properties.environment == 'production'?'':'beta.') + 'explore.openaire.eu/search/find/dataproviders'"
|
||||
[disableForms]="disableForms"
|
||||
[enableSearchView]="enableSearchView"
|
||||
searchFormClass="datasourcesTableSearchForm"
|
||||
|
@ -39,8 +42,6 @@ export class OpenaireSearchDataprovidersComponent {
|
|||
public results =[];
|
||||
public filters =[];
|
||||
public searchUtils:SearchUtilsClass = new SearchUtilsClass();
|
||||
public sub: any; public subResults: any;
|
||||
public _location:Location;
|
||||
public searchFields:SearchFields = new SearchFields();
|
||||
public refineFields: string[] = [];// = this.searchFields.JOURNAL_FIELDS;
|
||||
properties:EnvProperties;
|
||||
|
@ -49,12 +50,12 @@ export class OpenaireSearchDataprovidersComponent {
|
|||
public enableSearchView: boolean = true;
|
||||
|
||||
private communityId: string = '';
|
||||
|
||||
subscriptions = [];
|
||||
@ViewChild (SearchPageTableViewComponent) searchPage : SearchPageTableViewComponent ;
|
||||
piwikSiteId = null;
|
||||
customFilter: SearchCustomFilter = null;
|
||||
initialLoad = true;
|
||||
constructor (private route: ActivatedRoute, private _searchDataprovidersService: SearchCommunityDataprovidersService) {
|
||||
constructor (private route: ActivatedRoute, private _searchDataprovidersService: SearchCommunityDataprovidersService, private _communitiesService: CommunitiesService, private _communityService: CommunityService) {
|
||||
this.errorCodes = new ErrorCodes();
|
||||
this.errorMessages = new ErrorMessagesComponent();
|
||||
this.searchUtils.status = this.errorCodes.LOADING;
|
||||
|
@ -63,12 +64,17 @@ export class OpenaireSearchDataprovidersComponent {
|
|||
|
||||
public ngOnInit() {
|
||||
this.properties = properties;
|
||||
this.sub = this.route.queryParams.subscribe(params => {
|
||||
this.subscriptions.push(this.route.queryParams.subscribe(params => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(this.properties.domain);
|
||||
if(!this.communityId) {
|
||||
this.communityId = params['communityId'];
|
||||
}
|
||||
this.customFilter = new SearchCustomFilter("Community", "communityId", this.communityId, "");
|
||||
this.subscriptions.push(this._communityService.getCommunityByState(this.properties, this.properties.communityAPI + this.communityId).subscribe(community =>{
|
||||
if(community != null){
|
||||
this.customFilter.valueName = community.shortTitle;
|
||||
}
|
||||
}));
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId,this.properties.environment);
|
||||
this.searchUtils.keyword = (params['fv0']?params['fv0']:(params['keyword']?params['keyword']:''));
|
||||
//this.filters = this.createFilters();
|
||||
|
@ -82,17 +88,16 @@ export class OpenaireSearchDataprovidersComponent {
|
|||
this.searchPage.goTo(1);
|
||||
console.log("Init transfrm " + this.searchUtils.keyword)
|
||||
}
|
||||
});
|
||||
}));
|
||||
|
||||
}
|
||||
|
||||
public ngOnDestroy() {
|
||||
if(this.sub){
|
||||
this.sub.unsubscribe();
|
||||
}
|
||||
if(this.subResults){
|
||||
this.subResults.unsubscribe();
|
||||
}
|
||||
this.subscriptions.forEach(subscription => {
|
||||
if (subscription instanceof Subscriber) {
|
||||
subscription.unsubscribe();
|
||||
}
|
||||
});
|
||||
}
|
||||
private _getResults(params){
|
||||
this.searchUtils.status = this.errorCodes.LOADING;
|
||||
|
@ -103,7 +108,7 @@ export class OpenaireSearchDataprovidersComponent {
|
|||
|
||||
let size: number = 0;
|
||||
|
||||
this.subResults = this._searchDataprovidersService.searchDataproviders(this.properties, this.communityId).subscribe(
|
||||
this.subscriptions.push(this._searchDataprovidersService.searchDataproviders(this.properties, this.communityId).subscribe(
|
||||
data => {
|
||||
this.searchUtils.totalResults = data.length;
|
||||
this.results = data;
|
||||
|
@ -135,7 +140,7 @@ export class OpenaireSearchDataprovidersComponent {
|
|||
|
||||
this.enableSearchView = true;
|
||||
}
|
||||
);
|
||||
));
|
||||
}
|
||||
|
||||
private handleError(message: string, error) {
|
||||
|
|
|
@ -4,6 +4,7 @@ import {ActivatedRoute} from '@angular/router';
|
|||
import {PiwikHelper} from '../../utils/piwikHelper';
|
||||
import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-search-organizations',
|
||||
|
@ -26,22 +27,18 @@ export class OpenaireSearchOrganizationsComponent {
|
|||
}
|
||||
}
|
||||
ngOnInit() {
|
||||
this.sub = this.route.data
|
||||
.subscribe((data: { envSpecific: any }) => {
|
||||
|
||||
|
||||
var communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
|
||||
var communityId = ConnectHelper.getCommunityFromDomain(properties.domain);
|
||||
if(communityId){
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(communityId,data.envSpecific.environment);
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(communityId,properties.environment);
|
||||
}else{
|
||||
this.route.queryParams.subscribe(params => {
|
||||
this.sub = this.route.queryParams.subscribe(params => {
|
||||
if(params['communityId'] && params['communityId']!=""){
|
||||
communityId = params['communityId'];
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(communityId,data.envSpecific.environment);
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(communityId,properties.environment);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -13,6 +13,9 @@ import {SearchCommunityProjectsService} from '../../openaireLibrary/connect/proj
|
|||
import {PiwikHelper} from '../../utils/piwikHelper';
|
||||
import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
|
||||
import {properties} from "../../../environments/environment";
|
||||
import {CommunitiesService} from "../../openaireLibrary/connect/communities/communities.service";
|
||||
import {CommunityService} from "../../openaireLibrary/connect/community/community.service";
|
||||
import {Subscriber} from "rxjs";
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-search-projects',
|
||||
|
@ -23,7 +26,7 @@ import {properties} from "../../../environments/environment";
|
|||
[results] = "results" [searchUtils] = "searchUtils"
|
||||
[columnNames]="columnNames"
|
||||
[showResultCount]=false
|
||||
openaireLink="https://beta.explore.openaire.eu/search/find/projects"
|
||||
[openaireLink]="'https://' + (properties.environment == 'production'?'':'beta.') + 'explore.openaire.eu/search/find/projects'"
|
||||
[disableForms]="disableForms"
|
||||
[enableSearchView]="enableSearchView"
|
||||
searchFormClass="projectsTableSearchForm"
|
||||
|
@ -41,7 +44,7 @@ export class OpenaireSearchProjectsComponent {
|
|||
public results =[];
|
||||
public filters =[];
|
||||
public searchUtils:SearchUtilsClass = new SearchUtilsClass();
|
||||
public sub: any; public subResults: any;
|
||||
subscriptions = [];
|
||||
public _location:Location;
|
||||
public searchFields:SearchFields = new SearchFields();
|
||||
public refineFields: string[] = [];// = this.searchFields.JOURNAL_FIELDS;
|
||||
|
@ -56,7 +59,7 @@ export class OpenaireSearchProjectsComponent {
|
|||
piwikSiteId = null;
|
||||
customFilter: SearchCustomFilter = null;
|
||||
initialLoad = true;
|
||||
constructor (private route: ActivatedRoute, private _searchProjectsService: SearchCommunityProjectsService) {
|
||||
constructor (private route: ActivatedRoute, private _searchProjectsService: SearchCommunityProjectsService, private _communitiesService: CommunitiesService, private _communityService: CommunityService) {
|
||||
this.errorCodes = new ErrorCodes();
|
||||
this.errorMessages = new ErrorMessagesComponent();
|
||||
this.searchUtils.status = this.errorCodes.LOADING;
|
||||
|
@ -66,12 +69,17 @@ export class OpenaireSearchProjectsComponent {
|
|||
|
||||
this.properties = properties;
|
||||
|
||||
this.sub = this.route.queryParams.subscribe(params => {
|
||||
this.subscriptions.push(this.route.queryParams.subscribe(params => {
|
||||
this.communityId = ConnectHelper.getCommunityFromDomain(this.properties.domain);
|
||||
if(!this.communityId) {
|
||||
this.communityId = params['communityId'];
|
||||
}
|
||||
this.customFilter = new SearchCustomFilter("Community", "communityId", this.communityId, "");
|
||||
this.subscriptions.push(this._communityService.getCommunityByState(this.properties, this.properties.communityAPI + this.communityId).subscribe(community =>{
|
||||
if(community != null){
|
||||
this.customFilter.valueName = community.shortTitle;
|
||||
}
|
||||
}));
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId,this.properties.environment);
|
||||
this.searchUtils.keyword = (params['fv0']?params['fv0']:(params['keyword']?params['keyword']:''));
|
||||
if(this.initialLoad) {
|
||||
|
@ -80,16 +88,15 @@ export class OpenaireSearchProjectsComponent {
|
|||
}else{
|
||||
this.searchPage.goTo(1);
|
||||
}
|
||||
});
|
||||
}));
|
||||
}
|
||||
|
||||
public ngOnDestroy() {
|
||||
if(this.sub){
|
||||
this.sub.unsubscribe();
|
||||
}
|
||||
if(this.subResults){
|
||||
this.subResults.unsubscribe();
|
||||
}
|
||||
this.subscriptions.forEach(subscription => {
|
||||
if (subscription instanceof Subscriber) {
|
||||
subscription.unsubscribe();
|
||||
}
|
||||
});
|
||||
}
|
||||
private _getResults(params){
|
||||
this.searchUtils.status = this.errorCodes.LOADING;
|
||||
|
@ -100,7 +107,7 @@ export class OpenaireSearchProjectsComponent {
|
|||
|
||||
let size: number = 0;
|
||||
|
||||
this.subResults = this._searchProjectsService.searchProjects(this.properties, this.communityId).subscribe(
|
||||
this.subscriptions.push(this._searchProjectsService.searchProjects(this.properties, this.communityId).subscribe(
|
||||
data => {
|
||||
// data=data.slice(0,150)
|
||||
this.filters = this.createFilters(data, params);
|
||||
|
@ -140,7 +147,7 @@ export class OpenaireSearchProjectsComponent {
|
|||
|
||||
this.enableSearchView = true;
|
||||
}
|
||||
);
|
||||
));
|
||||
}
|
||||
private setFilters(){
|
||||
//TODO set filters from
|
||||
|
|
|
@ -5,11 +5,14 @@ import {ActivatedRoute} from "@angular/router";
|
|||
import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
|
||||
import {PiwikHelper} from "../../utils/piwikHelper";
|
||||
import {Subscriber} from "rxjs";
|
||||
import {CommunitiesService} from "../../openaireLibrary/connect/communities/communities.service";
|
||||
import {properties} from "../../../environments/environment";
|
||||
import {CommunityService} from "../../openaireLibrary/connect/community/community.service";
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-search-results',
|
||||
template: `
|
||||
<search-research-results resultType="result" openaireLink="https://beta.explore.openaire.eu/search/find/research-outcomes"
|
||||
<search-research-results resultType="result" [openaireLink]="'https://' + (properties.environment == 'production'?'':'beta.') + 'explore.openaire.eu/search/find/research-outcomes'"
|
||||
[customFilter]=customFilter [piwikSiteId]="piwikSiteId" [hasPrefix]="false"
|
||||
[includeOnlyResultsAndFilter]="false" [showBreadcrumb]="true" [showSwitchSearchLink]="true"></search-research-results>
|
||||
`
|
||||
|
@ -22,7 +25,7 @@ export class OpenaireSearchResearchResultsComponent {
|
|||
customFilter: SearchCustomFilter = null;
|
||||
properties:EnvProperties;
|
||||
|
||||
constructor(private route: ActivatedRoute) {
|
||||
constructor(private route: ActivatedRoute, private _communityService: CommunityService) {
|
||||
}
|
||||
|
||||
sub;
|
||||
|
@ -32,28 +35,28 @@ export class OpenaireSearchResearchResultsComponent {
|
|||
}
|
||||
}
|
||||
ngOnInit() {
|
||||
this.sub = this.route.data
|
||||
.subscribe((data: { envSpecific: any }) => {
|
||||
|
||||
var communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
|
||||
if (communityId) {
|
||||
this.connectCommunityId = communityId;
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.connectCommunityId,data.envSpecific.environment);
|
||||
this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
|
||||
|
||||
} else {
|
||||
this.route.queryParams.subscribe(params => {
|
||||
if (params['communityId'] && params['communityId'] != "") {
|
||||
this.connectCommunityId = params['communityId'];
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.connectCommunityId,data.envSpecific.environment);
|
||||
this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
|
||||
|
||||
}
|
||||
});
|
||||
this.properties = properties;
|
||||
var communityId = ConnectHelper.getCommunityFromDomain(properties.domain);
|
||||
if (communityId) {
|
||||
this.connectCommunityId = communityId;
|
||||
this.setCommunity();
|
||||
} else {
|
||||
this.route.queryParams.subscribe(params => {
|
||||
if (params['communityId'] && params['communityId'] != "") {
|
||||
this.connectCommunityId = params['communityId'];
|
||||
this.setCommunity();
|
||||
}
|
||||
|
||||
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
setCommunity(){
|
||||
this.piwikSiteId = PiwikHelper.getSiteId(this.connectCommunityId,properties.environment);
|
||||
this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
|
||||
this.sub = this._communityService.getCommunityByState(this.properties, this.properties.communityAPI + this.connectCommunityId).subscribe(community =>{
|
||||
if(community != null){
|
||||
this.customFilter.valueName = community.shortTitle;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@ export class PiwikHelper{
|
|||
public static siteIDs={
|
||||
"connect": 80,
|
||||
"dh-ch":81,
|
||||
"ee":82,
|
||||
"sdsn-gr":82,
|
||||
"egi":83,
|
||||
"elixir-gr":84,
|
||||
"fam":85,
|
||||
|
@ -25,25 +25,25 @@ export class PiwikHelper{
|
|||
public static siteIDsProduction={
|
||||
"connect": 112,
|
||||
"dh-ch":198,
|
||||
"ee":200,
|
||||
"egi":'',
|
||||
"elixir-gr":'',
|
||||
"sdsn-gr":200,
|
||||
"egi":83,
|
||||
"elixir-gr":84,
|
||||
"fam":197,
|
||||
"instruct":'',
|
||||
"instruct":86,
|
||||
"mes":196,
|
||||
"ni":199,
|
||||
"oa-pg":'',
|
||||
"rda":'',
|
||||
"aginfra":'',
|
||||
"clarin":'',
|
||||
"dariah":'',
|
||||
"epos": null,
|
||||
"beopen" :null,
|
||||
"risis":null,
|
||||
"science-innovation-policy":null,
|
||||
"covid-19":null,
|
||||
"rural-digital-europe":null,
|
||||
"enermaps":null
|
||||
"oa-pg":89,
|
||||
"rda":90,
|
||||
"aginfra":93,
|
||||
"clarin":100,
|
||||
"dariah":103,
|
||||
"epos": 217,
|
||||
"beopen": 218,
|
||||
"risis":219,
|
||||
"science-innovation-policy":253,
|
||||
"covid-19":267,
|
||||
"rural-digital-europe":319,
|
||||
"enermaps":318
|
||||
};
|
||||
public static getSiteId(communityId:string, environment:string){
|
||||
// if(environment == 'production'){
|
||||
|
|
|
@ -2,9 +2,10 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-propert
|
|||
|
||||
export let properties: EnvProperties = {
|
||||
environment: "production",
|
||||
adminToolsPortalType: "connect",
|
||||
dashboard: "connect",
|
||||
enablePiwikTrack: false,
|
||||
useCache: true,
|
||||
enablePiwikTrack: true,
|
||||
useCache: false,
|
||||
useLongCache: true,
|
||||
showContent: true,
|
||||
showAddThis: true,
|
||||
|
@ -85,9 +86,9 @@ export let properties: EnvProperties = {
|
|||
searchLinkToDataProvider: "/search/dataprovider?datasourceId=",
|
||||
searchLinkToDataset: "/search/dataset?datasetId=",
|
||||
searchLinkToSoftwareLanding: "/search/software?softwareId=",
|
||||
searchLinkToOrp: "/search/other?orpId=",
|
||||
searchLinkToOrganization: "/search/organization?organizationId=",
|
||||
|
||||
searchLinkToOrp: "/search/other?orpId=",
|
||||
|
||||
searchLinkToCommunities: "/search/find/communities",
|
||||
searchLinkToPublications: "/search/find/publications",
|
||||
searchLinkToDataProviders: "/search/find/dataproviders",
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en-gb" dir="ltr" vocab="http://schema.org/">
|
||||
<html lang="en" dir="ltr" vocab="http://schema.org/">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
|
@ -7,8 +7,6 @@
|
|||
<base href="/" />
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
||||
<meta name="description" content="OpenAIRE Connect, Connect,Community Dashboard, communities, open access, research, projects "/>
|
||||
<meta name="google-site-verification" content="rZ-58gIX8IqzBte6Qv4J5yY9aSiDP15Dfc1Yr9yezqE" />
|
||||
|
||||
<meta property="og:description" content="OpenAIRE Connect, Connect,Community Dashboard, communities, open access, research, projects"/>
|
||||
<meta property="og:title" content="OpenAIRE - Connect "/>
|
||||
|
||||
|
@ -54,8 +52,6 @@
|
|||
</script>
|
||||
|
||||
<link id="customCss" rel="stylesheet" href="">
|
||||
<!-- <script src="assets/common-assets/clipboard.min.js"></script>-->
|
||||
|
||||
|
||||
</head>
|
||||
<body class="" style="">
|
||||
|
|
|
@ -1,13 +1,4 @@
|
|||
User-Agent: *
|
||||
Disallow: /participate/direct-claim
|
||||
Disallow: /participate/direct-claim?*
|
||||
Disallow: /participate/claim
|
||||
Disallow: /myclaims
|
||||
Disallow: /myclaims?*
|
||||
Disallow: /claims
|
||||
Disallow: /claims?*
|
||||
Disallow: /search/advanced/organizations?*
|
||||
Disallow: /search/advanced/dataproviders?*
|
||||
Disallow: /search/advanced/projects?*
|
||||
|
||||
Crawl-delay: 30
|
||||
Sitemap: /sitemap.xml
|
||||
|
|
Loading…
Reference in New Issue