diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 4d06e93..5dfc9a2 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -10,14 +10,27 @@ const routes: Routes = [ {path: 'my-orcid-links', loadChildren: () => import('./orcid/my-orcid-links/myOrcidLinks.module').then(m => m.LibMyOrcidLinksModule)}, /** Other Pages */ - {path: '', loadChildren: () => import('./communitywrapper/communityWrapper.module').then(m => m.CommunityWrapperModule)}, + { + path: '', + loadChildren: () => import('./communitywrapper/communityWrapper.module').then(m => m.CommunityWrapperModule) + }, {path: 'about', redirectTo: 'about/learn-how', pathMatch: 'full'}, {path: 'about/learn-how', loadChildren: () => import('./learn-how/learn-how.module').then(m => m.LearnHowModule)}, {path: 'about/faq', loadChildren: () => import('./learn-how/faqs/faqs.module').then(m => m.FaqsModule)}, {path: 'get-started', loadChildren: () => import('./get-started/get-started.module').then(m => m.GetStartedModule)}, {path: 'contact-us', loadChildren: () => import('./contact/contact.module').then(m => m.ContactModule)}, {path: 'invite', loadChildren: () => import('./utils/subscribe/invite/invite.module').then(m => m.InviteModule)}, - {path: 'content', loadChildren: () => import('./content/contentPage.module').then(m => m.ContentPageModule), canActivate: [IsCommunity]}, + { + path: 'content', + loadChildren: () => import('./content/contentPage.module').then(m => m.ContentPageModule), + canActivate: [IsCommunity] + }, + {path: 'sdgs', loadChildren: () => import('./sdg/sdg.module').then(m => m.LibSdgModule)}, + { + path: 'fields-of-science', + loadChildren: () => import('./fos/fos.module').then(m => m.LibFosModule), + data: {extraOffset: 100} + }, { path: 'organizations', loadChildren: () => import('./htmlPages/organizations/organizationsPage.module').then(m => m.OrganizationsPageModule), diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 58f675c..d314da3 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,4 +1,13 @@ -import {Component, ElementRef, Inject, OnDestroy, OnInit, RendererFactory2, ViewChild, ViewEncapsulation} from '@angular/core'; +import { + Component, + ElementRef, + Inject, + OnDestroy, + OnInit, PLATFORM_ID, + RendererFactory2, + ViewChild, + ViewEncapsulation +} from '@angular/core'; import {ActivatedRoute, NavigationEnd, Router} from '@angular/router'; import {EnvProperties} from './openaireLibrary/utils/properties/env-properties'; @@ -11,14 +20,14 @@ import {UserManagementService} from "./openaireLibrary/services/user-management. import {ConfigurationService} from "./openaireLibrary/utils/configuration/configuration.service"; import {properties} from '../environments/environment'; import {Header} from "./openaireLibrary/sharedComponents/navigationBar.component"; -import {AsyncSubject, Subscriber} from "rxjs"; +import {Subscriber} from "rxjs"; import {CommunityService} from "./openaireLibrary/connect/community/community.service"; import {StringUtils} from "./openaireLibrary/utils/string-utils.class"; import {LoginErrorCodes} from "./openaireLibrary/login/utils/guardHelper.class"; -import {CustomizationOptions, Layout} from "./openaireLibrary/connect/community/CustomizationOptions"; +import {Layout} from "./openaireLibrary/connect/community/CustomizationOptions"; import {CustomizationService} from "./openaireLibrary/services/customization.service"; import {SmoothScroll} from "./openaireLibrary/utils/smooth-scroll"; -import {Meta} from "@angular/platform-browser"; +import {makeStateKey, Meta, StateKey, TransferState} from "@angular/platform-browser"; import {CommunityInfo} from "./openaireLibrary/connect/community/communityInfo"; import {SEOService} from "./openaireLibrary/sharedComponents/SEO/SEO.service"; import {UntypedFormBuilder, UntypedFormGroup, Validators} from "@angular/forms"; @@ -29,7 +38,8 @@ import {QuickContactComponent} from "./openaireLibrary/sharedComponents/quick-co import {Composer} from "./openaireLibrary/utils/email/composer"; import {NotificationHandler} from "./openaireLibrary/utils/notification-handler"; import {OpenaireEntities} from "./openaireLibrary/utils/properties/searchFields"; -import {DOCUMENT} from "@angular/common"; +import {DOCUMENT, isPlatformServer} from "@angular/common"; +import {AdvancedAsyncSubject} from "./openaireLibrary/utils/AdvancedAsyncSubject"; @Component({ selector: 'app-root', @@ -44,7 +54,9 @@ import {DOCUMENT} from "@angular/common"; Get Started - Get Started + Get Started + [name]="(community.shortTitle) ? community.shortTitle : community.title" + [description]="community.description">
@@ -89,17 +102,17 @@ import {DOCUMENT} from "@angular/common"; + [properties]="properties"> - + [showSocialButtons]="true" [showMenuItems]="true" [grantAdvance]="false" [showOpenaire]="true" + [communityId]="community.communityId" [menuItems]=bottomMenuItems [properties]="properties" [centered]="true"> + + [id]="community.communityId" [name]="community.title" + [type]="community.type">
` @@ -109,7 +122,7 @@ export class AppComponent implements OnInit, OnDestroy { userMenuItems: MenuItem[] = []; menuItems: MenuItem [] = []; bottomMenuItems: MenuItem[] = []; - public community:CommunityInfo = null; + public community: CommunityInfo = null; properties: EnvProperties = properties; showMenu: boolean = false; communities = null; @@ -125,15 +138,20 @@ export class AppComponent implements OnInit, OnDestroy { public images: string[] = []; @ViewChild('modal') modal: AlertModal; @ViewChild('quickContact') quickContact: QuickContactComponent; - @ViewChild('bottom', {read: ElementRef}) bottom: ElementRef; + @ViewChild('bottom', {read: ElementRef}) bottom: ElementRef; private subscriptions = []; layout: Layout = null; layouts: Layout[] = null; layoutDefault: Layout = null; layoutConnect: Layout = null; - layoutSub = new AsyncSubject(); + layoutSub = new AdvancedAsyncSubject(); previewLayout = null; - constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService, + /** + * key for portal identity check (client - server: using transfer state + * */ + key: StateKey = makeStateKey('portal'); + + constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService, private _communitiesService: CommunitiesService, private smoothScroll: SmoothScroll, private router: Router, private userManagementService: UserManagementService, private configurationService: ConfigurationService, private _communityService: CommunityService, @@ -141,8 +159,11 @@ export class AppComponent implements OnInit, OnDestroy { private quickContactService: QuickContactService, private fb: UntypedFormBuilder, private emailService: EmailService, - @Inject(DOCUMENT) private document, private rendererFactory: RendererFactory2 - ) { + @Inject(DOCUMENT) private document, + private transferState: TransferState, + @Inject(PLATFORM_ID) private platformId: any, + private rendererFactory: RendererFactory2 + ) { this.subscriptions.push(router.events.forEach((event) => { if (event instanceof NavigationEnd) { if (event.url === '/contact-us') { @@ -157,15 +178,14 @@ export class AppComponent implements OnInit, OnDestroy { } ngOnInit() { - - this.subscriptions.push(this.route.queryParams.subscribe(data => { - this.previewLayout = (data['previewLayout'] && data['previewLayout'].length >0 ? data['previewLayout']: null); - if (this.properties.environment == "production" || this.properties.environment == "development") { - this._meta.updateTag({content: 'all', name: 'robots'}); - this.seoService.removeLinkForPrevURL(); - this.seoService.removeLinkForNextURL(); - } - })); + this.subscriptions.push(this.route.queryParams.subscribe(data => { + this.previewLayout = (data['previewLayout'] && data['previewLayout'].length > 0 ? data['previewLayout'] : null); + if (this.properties.environment == "production" || this.properties.environment == "development") { + this._meta.updateTag({content: 'all', name: 'robots'}); + this.seoService.removeLinkForPrevURL(); + this.seoService.removeLinkForNextURL(); + } + })); this._communitiesService.updateCommunities(this.properties, this.properties.communitiesAPI); if (typeof document !== 'undefined') { try { @@ -177,7 +197,8 @@ export class AppComponent implements OnInit, OnDestroy { this.user = user; this.init(); }, error => { - this.init()})); + this.init(); + })); this.subscriptions.push(this.quickContactService.isDisplayed.subscribe(display => { this.showQuickContact = display; })); @@ -195,15 +216,15 @@ export class AppComponent implements OnInit, OnDestroy { this._communityService.clearSubscriptions(); this.smoothScroll.clearSubscriptions(); } - - createObservers() { - let options = { - root: null, - rootMargin: '0px', - threshold: 0.1 - }; - let intersectionObserver = new IntersectionObserver(entries => { - entries.forEach(entry => { + + createObservers() { + let options = { + root: null, + rootMargin: '0px', + threshold: 0.1 + }; + let intersectionObserver = new IntersectionObserver(entries => { + entries.forEach(entry => { if (entry.isIntersecting && this.showQuickContact) { this.showQuickContact = false; this.quickContactService.setDisplay(this.showQuickContact); @@ -212,15 +233,15 @@ export class AppComponent implements OnInit, OnDestroy { this.quickContactService.setDisplay(this.showQuickContact); } }); - }, options); - intersectionObserver.observe(this.bottom.nativeElement); - this.subscriptions.push(intersectionObserver); - } + }, options); + intersectionObserver.observe(this.bottom.nativeElement); + this.subscriptions.push(intersectionObserver); + } get isManager() { return Session.isCommunityCurator(this.user) || Session.isPortalAdministrator(this.user) || (this.communityId && Session.isManager('community', this.communityId, this.user)) } - + get isPrivate() { return this.community && !ConnectHelper.isPrivate(this.community, this.user) } @@ -228,7 +249,7 @@ export class AppComponent implements OnInit, OnDestroy { private init() { let communityId: string = ConnectHelper.getCommunityFromDomain(this.properties.domain); this.showMenu = false; - this.initAdminToolCommunity(communityId); + // this.initAdminToolCommunity(communityId); this.buildMenu(communityId); // this.communityId = communityId; if (!communityId) { @@ -238,9 +259,9 @@ export class AppComponent implements OnInit, OnDestroy { this.userManagementService.fixRedirectURL = null; } } - initCss(communityId, suffix=null) { + + initCss(communityId, suffix = null) { try { - const renderer = this.rendererFactory.createRenderer(this.document, { id: '-1', encapsulation: ViewEncapsulation.None, @@ -251,70 +272,74 @@ export class AppComponent implements OnInit, OnDestroy { if (head === null) { throw new Error(' not found within DOCUMENT.'); } - if(!this.document.getElementById("dashboardStyle")) { + if (!this.document.getElementById("dashboardStyle")) { const script = renderer.createElement('link'); renderer.setAttribute(script, "id", "dashboardStyle"); - renderer.setAttribute(script, "href", ((communityId) ? communityId : this.properties.adminToolsPortalType) + (suffix?"-"+suffix:"") + ".css"); + renderer.setAttribute(script, "href", ((communityId) ? communityId : this.properties.adminToolsPortalType) + (suffix ? "-" + suffix : "") + ".css"); renderer.setAttribute(script, "rel", "stylesheet"); renderer.appendChild(head, script); - }else if(!this.previewLayout){ - this.document.getElementById("dashboardStyle").href = ((communityId) ? communityId : this.properties.adminToolsPortalType)+ (suffix?"-"+suffix:"") + ".css"; - // console.log(this.document.getElementById("dashboardStyle")); + } else if (!this.previewLayout) { + this.document.getElementById("dashboardStyle").href = ((communityId) ? communityId : this.properties.adminToolsPortalType) + (suffix ? "-" + suffix : "") + ".css"; } - } catch (e) { console.error('Renderrer Error to append style ', e); } - } initAdminToolCommunity(communityId) { if (communityId) { this.properties.adminToolsPortalType = "community"; - if (typeof document === 'undefined') { + if (this.document) { this.initLayout(communityId); } - }else{ + } else { this.properties.adminToolsPortalType = "connect"; - if (typeof document === 'undefined') { + if (this.document) { this.initLayout('connect'); } } this.configurationService.initPortal(this.properties, (communityId) ? communityId : this.properties.adminToolsPortalType); - } - getLayouts(){ + + getLayouts() { this.customizationService.getLayouts(this.properties).subscribe( - layouts => { - this.layouts = layouts; - this.layoutDefault = layouts.filter(layout => layout.portalPid == 'default')[0]; - this.layoutConnect = layouts.filter(layout => layout.portalPid == 'connect')[0]; - this.layoutSub.next(this.layouts); - this.layoutSub.complete(); - }, - error => { - - } - ); + layouts => { + this.layouts = layouts; + this.layoutDefault = layouts.filter(layout => layout.portalPid == 'default')[0]; + this.layoutConnect = layouts.filter(layout => layout.portalPid == 'connect')[0]; + this.layoutSub.next(this.layouts); + }, + error => { + this.layoutSub.next([]); + } + ); } - initLayout(communityId){ - if(!this.layout && (typeof location == 'undefined') && !this.previewLayout) { + + initLayout(communityId) { + let portal = this.transferState.get(this.key, null); + if(isPlatformServer(this.platformId)) { + this.transferState.set(this.key, communityId); + } + if (!this.layout && (portal !== communityId) && !this.previewLayout) { + // if((typeof location == 'undefined') && !this.previewLayout) { this.subscriptions.push(this.layoutSub.subscribe(value => { - this.layout = this.layouts.filter(layout => layout.portalPid == communityId)[0]?this.layouts.filter(layout => layout.portalPid == communityId)[0]:this.layouts.filter(layout => layout.portalPid == 'default')[0]; - this.initCss(this.layout.portalPid, this.layout.date?this.layout.date:null) + this.layouts = value; + this.layout = this.layouts.filter(layout => layout.portalPid == communityId)[0] ? this.layouts.filter(layout => layout.portalPid == communityId)[0] : this.layouts.filter(layout => layout.portalPid == 'default')[0]; + this.initCss(this.layout.portalPid, this.layout.date ? this.layout.date : null) })); - - }else if(this.previewLayout && this.previewLayout.split("-preview-")[0] == communityId){ + + } else if (this.previewLayout && this.previewLayout.split("-preview-")[0] == communityId) { this.initCss(communityId, this.previewLayout.split(communityId)[1]); } } + public buildMenu(communityId: string) { if (communityId) { if (!this.community || this.communityId !== communityId) { this.subscriptions.push(this._communityService.getCommunity(communityId).subscribe(community => { if (community) { - this.community = community; - }else{ + this.community = community; + } else { this.community = null; this.communityId = null; } @@ -327,10 +352,11 @@ export class AppComponent implements OnInit, OnDestroy { this.buildConnectMenu(); } } - - buildCommunityMenu(){ + + buildCommunityMenu() { if (this.community && !ConnectHelper.isPrivate(this.community, this.user)) { this.communityId = this.community.communityId; + this.initAdminToolCommunity(this.communityId); this.header = { // url: 'https://' + (this.properties.environment == 'beta' ? 'beta.' : '') + this.community.id + '.openaire.eu', route: "/", @@ -377,10 +403,12 @@ export class AppComponent implements OnInit, OnDestroy { new MenuItem("", "National Bulletins", "", "/national-bulletins", false, [], ["/national-bulletins"], {}), new MenuItem("", "Subjects", "", "/subjects", false, [], ["/subjects"], {}), new MenuItem("", "Projects and funding Opportunities", "", "/projects", false, [], ["/projects"], {}), + new MenuItem("", "Fields of Science", "", "/fields-of-science", false, [], ["/fields-of-science"], {}), + new MenuItem("", "Sustainable Development Goals", "", "/sdgs", false, [], ["/sdgs"], {}), ] )); - this.menuItems.push( - new MenuItem("develop", "Develop", "", "/develop", false, [], ["/develop"], {}), + this.menuItems.push( + new MenuItem("develop", "Develop", "", "/develop", false, [], ["/develop"], {}), ); if (this.isManager) { this.menuItems.push( @@ -406,13 +434,11 @@ export class AppComponent implements OnInit, OnDestroy { this.showMenu = true; } else { this.communityId = null; - this.properties.adminToolsPortalType = "connect"; this.configurationService.initPortal(this.properties, "connect"); - this.initAdminToolCommunity(null); this.buildConnectMenu(true); if (this.community && this.community.status == "manager") { - if (!this.user ) { - if(typeof location !== 'undefined' && location.pathname.indexOf("user-info") == -1) { + if (!this.user) { + if (typeof location !== 'undefined' && location.pathname.indexOf("user-info") == -1) { this.router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_LOGIN, @@ -420,19 +446,21 @@ export class AppComponent implements OnInit, OnDestroy { } }); } - } else { - if(typeof location !== 'undefined' && location.pathname.indexOf("user-info") == -1) { + } else { + if (typeof location !== 'undefined' && location.pathname.indexOf("user-info") == -1) { this.router.navigate(['/'], {queryParamsHandling: "merge"}); } } - }else if (this.community && this.community.status == "hidden") { + } else if (this.community && this.community.status == "hidden") { this.router.navigate([this.properties.errorLink]); - }else{ - this.router.navigate(['/'], this.community && this.community.status ? { queryParamsHandling: "merge" } : {}); + } else { + this.router.navigate(['/'], this.community && this.community.status ? {queryParamsHandling: "merge"} : {}); } } } + buildConnectMenu(restrictedData: boolean = false) { + this.initAdminToolCommunity(null); let url = "https://" + (properties.environment != "production" ? "beta." : "") + "connect.openaire.eu"; this.header = { route: restrictedData ? "" : "/", @@ -474,7 +502,7 @@ export class AppComponent implements OnInit, OnDestroy { restrictedData ? "" : "/myCommunities", false, [], [], {})); } this.showMenu = true; - if (typeof document !== "undefined") { + if (typeof document !== "undefined" && this.bottom) { setTimeout(() => { this.createObservers(); }); diff --git a/src/app/community/community.component.ts b/src/app/community/community.component.ts index 742a183..51dbd01 100644 --- a/src/app/community/community.component.ts +++ b/src/app/community/community.component.ts @@ -307,6 +307,7 @@ export class CommunityComponent { this.showOrp = !!showEntity["orp"]; this.showProjects = !!showEntity["project"]; this.showDataProviders = !!showEntity["datasource"]; + this.resultTypes.values = []; if (this.showPublications) { this.resultTypes.values.push({ name: this.openaireEntities.PUBLICATIONS, diff --git a/src/app/fos/fos-routing.module.ts b/src/app/fos/fos-routing.module.ts new file mode 100644 index 0000000..fdbb09c --- /dev/null +++ b/src/app/fos/fos-routing.module.ts @@ -0,0 +1,20 @@ +import {NgModule} from "@angular/core"; +import {RouterModule} from "@angular/router"; +import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; +import {CommunityFosComponent} from "./fos.component"; +import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard"; + +@NgModule({ + imports: [ + RouterModule.forChild([ + { + path: '', + component: CommunityFosComponent, + canActivate: [IsRouteEnabled], + canDeactivate: [PreviousRouteRecorder] + } + ]) + ] +}) +export class LibFosRoutingModule { +} \ No newline at end of file diff --git a/src/app/fos/fos.component.ts b/src/app/fos/fos.component.ts new file mode 100644 index 0000000..b2e9471 --- /dev/null +++ b/src/app/fos/fos.component.ts @@ -0,0 +1,24 @@ +import {Component} from "@angular/core"; +import {properties} from "../../environments/environment"; +import {ConnectHelper} from "../openaireLibrary/connect/connectHelper"; +import {PiwikHelper} from "../utils/piwikHelper"; + +@Component({ + selector: 'community-fos', + template: ` + + ` +}) + +export class CommunityFosComponent { + piwikSiteId; + communityId; + + constructor() { + } + + ngOnInit() { + this.communityId = ConnectHelper.getCommunityFromDomain(properties.domain); + this.piwikSiteId = PiwikHelper.getSiteId(this.communityId); + } +} \ No newline at end of file diff --git a/src/app/fos/fos.module.ts b/src/app/fos/fos.module.ts new file mode 100644 index 0000000..5d1d24e --- /dev/null +++ b/src/app/fos/fos.module.ts @@ -0,0 +1,27 @@ +import {CommonModule} from "@angular/common"; +import {NgModule} from "@angular/core"; +import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; +import {LibFosRoutingModule} from "./fos-routing.module"; +import {FosRoutingModule} from "../openaireLibrary/fos/fos-routing.module"; +import {FosModule} from "../openaireLibrary/fos/fos.module"; +import {CommunityFosComponent} from "./fos.component"; + +@NgModule({ + imports: [ + CommonModule, + LibFosRoutingModule, + FosRoutingModule, + FosModule + ], + declarations: [ + CommunityFosComponent + ], + exports: [ + CommunityFosComponent + ], + providers: [ + PreviousRouteRecorder + ] +}) +export class LibFosModule { +} \ No newline at end of file diff --git a/src/app/htmlPages/htmlPage.component.ts b/src/app/htmlPages/htmlPage.component.ts index 313db86..4cfd350 100644 --- a/src/app/htmlPages/htmlPage.component.ts +++ b/src/app/htmlPages/htmlPage.component.ts @@ -22,14 +22,15 @@ export class HtmlPageComponent { properties: EnvProperties = properties; public pageContents = null; public divContents = null; - + @Input() url: string = null; @Input() pageTitle: string; @Input() description: string; private subscriptions = []; communityId; - - constructor(private route: ActivatedRoute, private _router: Router, + piwikSiteId; + + constructor(private route: ActivatedRoute, private _router: Router, private _meta: Meta, private _title: Title, private seoService: SEOService, @@ -37,7 +38,7 @@ export class HtmlPageComponent { private configurationService: ConfigurationService, private helper: HelperService) { } - + public ngOnInit() { if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) { this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle).subscribe()); diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 49e2edf..b6ead8d 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 49e2edfe84d441bf1b5bf4bbfb7f94f98d88cb7a +Subproject commit b6ead8d7e2fa94ede8f45c6295d9b37575fc1f92 diff --git a/src/app/sdg/sdg-routing.module.ts b/src/app/sdg/sdg-routing.module.ts new file mode 100644 index 0000000..b1020cd --- /dev/null +++ b/src/app/sdg/sdg-routing.module.ts @@ -0,0 +1,20 @@ +import {NgModule} from "@angular/core"; +import {RouterModule} from "@angular/router"; +import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; +import {CommunitySdgComponent} from "./sdg.component"; +import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard"; + +@NgModule({ + imports: [ + RouterModule.forChild([ + { + path: '', + component: CommunitySdgComponent, + canActivate: [IsRouteEnabled], + canDeactivate: [PreviousRouteRecorder] + } + ]) + ] +}) +export class LibSdgRoutingModule { +} \ No newline at end of file diff --git a/src/app/sdg/sdg.component.ts b/src/app/sdg/sdg.component.ts new file mode 100644 index 0000000..b33c4d4 --- /dev/null +++ b/src/app/sdg/sdg.component.ts @@ -0,0 +1,26 @@ +import {Component} from "@angular/core"; +import {properties} from "../../environments/environment"; +import {ConnectHelper} from "../openaireLibrary/connect/connectHelper"; +import {PiwikHelper} from "../utils/piwikHelper"; +import {SearchCustomFilter} from "../openaireLibrary/searchPages/searchUtils/searchUtils.class"; + +@Component({ + selector: 'community-sdg', + template: ` + + ` +}) +export class CommunitySdgComponent { + piwikSiteId; + communityId; + customFilter: SearchCustomFilter = null; + + constructor() { + } + + ngOnInit() { + this.communityId = ConnectHelper.getCommunityFromDomain(properties.domain); + this.piwikSiteId = PiwikHelper.getSiteId(this.communityId); + this.customFilter = new SearchCustomFilter("Community", "communityId", this.communityId, ""); + } +} \ No newline at end of file diff --git a/src/app/sdg/sdg.module.ts b/src/app/sdg/sdg.module.ts new file mode 100644 index 0000000..b3c4f2a --- /dev/null +++ b/src/app/sdg/sdg.module.ts @@ -0,0 +1,27 @@ +import {CommonModule} from "@angular/common"; +import {NgModule} from "@angular/core"; +import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; +import {LibSdgRoutingModule} from "./sdg-routing.module"; +import {SdgRoutingModule} from "../openaireLibrary/sdg/sdg-routing.module"; +import {SdgModule} from "../openaireLibrary/sdg/sdg.module"; +import {CommunitySdgComponent} from "./sdg.component"; + +@NgModule({ + imports: [ + CommonModule, + LibSdgRoutingModule, + SdgRoutingModule, + SdgModule + ], + declarations: [ + CommunitySdgComponent + ], + exports: [ + CommunitySdgComponent + ], + providers: [ + PreviousRouteRecorder + ] +}) +export class LibSdgModule { +} \ No newline at end of file diff --git a/src/app/utils/piwikHelper.ts b/src/app/utils/piwikHelper.ts index 0682210..43c98d9 100644 --- a/src/app/utils/piwikHelper.ts +++ b/src/app/utils/piwikHelper.ts @@ -30,21 +30,23 @@ export class PiwikHelper{ "inspired-ris":530, "citizen-science":538, "eut":558, - "aurora":560, + "aurora": 560, "ebrains": 592, - "neanias-space":604, - "heritage-science":607, - "eutopia":608, + "neanias-space": 604, + "heritage-science": 607, + "eutopia": 608, "north-america-studies": 609, - "iperionhs":610, + "iperionhs": 610, "neanias-atmospheric": 613, "forthem": 625, "argo-france": 634, - "knowmad": 640 + "knowmad": 640, + "egrise": 710, + "euconexus": 707, + "dth": 719 }; public static getSiteId(communityId:string){ return this.siteIDs[communityId]; } - } diff --git a/src/assets/common-assets b/src/assets/common-assets index ca209a5..f15bbfa 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit ca209a54baaa2d9e0004613a68088fdcf4bee43a +Subproject commit f15bbfa7265f170e06b256f086f2acedfa3f72e0 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index aa1e6c9..468b2b0 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit aa1e6c9df390a4ba0919b5f8591374f7eec75089 +Subproject commit 468b2b008f474c88dacc52991a5231693833f1f9 diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index ae3369b..d3247e0 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -114,5 +114,6 @@ export let properties: EnvProperties = { altMetricsAPIURL: "https://api.altmetric.com/v1/doi/", b2noteAPIURL: 'https://b2note.eudat.eu/', adminPortalURL: "https://admin.connect.openaire.eu", - myOrcidLinksPage: "/my-orcid-links" + myOrcidLinksPage: "/my-orcid-links", + hasMachineCache: true }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 3b574d9..43e6812 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -58,7 +58,7 @@ export let properties: EnvProperties = { piwikBaseUrl: 'https://analytics.openaire.eu/piwik.php?idsite=', piwikSiteId: '80', registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/', - loginUrl: "http://mpagasas.di.uoa.gr:19080/login-service//openid_connect_login", + loginUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_connect_login", userInfoUrl: "http://mpagasas.di.uoa.gr:19080/login-service/userInfo", logoutUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_logout", cookieDomain: '.di.uoa.gr',