MaDgIK
/
connect
13
0
Fork 0
Code Issues Pull Requests Projects Releases 13 Wiki Activity

Merge from origin/develop

This commit is contained in:
Konstantinos Triantafyllou 2023-06-09 21:08:31 +03:00
parent 3f9dc502b3 4394b63736
commit 302419dd5d
16 changed files with 301 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/app/app-routing.module.ts
View File

@ -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),

84
src/app/app.component.ts
View File

@ -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";
<a routerLink="/get-started">Get Started</a>
</li>
</ul>
<a *ngIf="showGetStarted" extra-m class="uk-button uk-button-small uk-button-primary uk-text-uppercase uk-margin-left" routerLink="/get-started">Get Started</a>
<a *ngIf="showGetStarted" extra-m
class="uk-button uk-button-small uk-button-primary uk-text-uppercase uk-margin-left"
routerLink="/get-started">Get Started</a>
</navbar>
<navbar *ngIf="properties && showMenu && community && header" [portal]="community.communityId" [onlyTop]=false
[communityId]="community.communityId" [header]="header"
@ -65,7 +77,8 @@ import {DOCUMENT} from "@angular/common";
<schema2jsonld *ngIf="properties && showMenu && communityId && communityId.length > 0 && community"
[URL]="properties.domain + properties.baseLink"
[logoURL]="community.logoUrl" type="home" [searchActionRoute]="properties.searchLinkToResults"
[name]="(community.shortTitle) ? community.shortTitle : community.title" [description]="community.description">
[name]="(community.shortTitle) ? community.shortTitle : community.title"
[description]="community.description">
</schema2jsonld>
<div class="custom-main-content">
<main>
@ -92,14 +105,14 @@ import {DOCUMENT} from "@angular/common";
[properties]="properties"></bottom>
<bottom *ngIf="properties && isClient && showMenu && community" class=" communityPanelBackground "
[showSocialButtons]="true" [showMenuItems]="true" [grantAdvance]="false" [showOpenaire]="true"
[communityId]="community.communityId" [menuItems]=bottomMenuItems [properties]="properties"
[darkBackground]="true" [centered]="true"></bottom>
[communityId]="community.communityId" [menuItems]=bottomMenuItems [properties]="properties" [centered]="true"></bottom>
<quick-contact #quickContact *ngIf="showQuickContact && contactForm" (sendEmitter)="send($event)"
[contact]="'Help'" [images]="images" [background]="{class: 'uk-background-primary', dark: false}"
[contactForm]="contactForm" [sending]="sending"></quick-contact>
<modal-alert #modal [overflowBody]="false"></modal-alert>
<role-verification *ngIf="community" service="connect"
[id]="community.communityId" [name]="community.title" [type]="community.type"></role-verification>
[id]="community.communityId" [name]="community.title"
[type]="community.type"></role-verification>
</div>
`
@ -131,8 +144,13 @@ export class AppComponent implements OnInit, OnDestroy {
layouts: Layout[] = null;
layoutDefault: Layout = null;
layoutConnect: Layout = null;
layoutSub = new AsyncSubject();
layoutSub = new AdvancedAsyncSubject<Layout[]>();
previewLayout = null;
/**
* key for portal identity check (client - server: using transfer state
* */
key: StateKey<string> = makeStateKey<string>('portal');
constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService,
private _communitiesService: CommunitiesService, private smoothScroll: SmoothScroll,
private router: Router, private userManagementService: UserManagementService,
@ -141,7 +159,10 @@ 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) {
@ -157,7 +178,6 @@ 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") {
@ -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;
}));
@ -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) {
try {
const renderer = this.rendererFactory.createRenderer(this.document, {
id: '-1',
encapsulation: ViewEncapsulation.None,
@ -259,30 +280,27 @@ export class AppComponent implements OnInit, OnDestroy {
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"));
}
} 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 {
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() {
this.customizationService.getLayouts(this.properties).subscribe(
layouts => {
@ -290,16 +308,22 @@ export class AppComponent implements OnInit, OnDestroy {
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 => {
this.layoutSub.next([]);
}
);
}
initLayout(communityId) {
if(!this.layout && (typeof location == 'undefined') && !this.previewLayout) {
let portal = this.transferState.get<string>(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.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)
}));
@ -308,6 +332,7 @@ export class AppComponent implements OnInit, OnDestroy {
this.initCss(communityId, this.previewLayout.split(communityId)[1]);
}
}
public buildMenu(communityId: string) {
if (communityId) {
if (!this.community || this.communityId !== communityId) {
@ -331,6 +356,7 @@ export class AppComponent implements OnInit, OnDestroy {
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,6 +403,8 @@ 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(
@ -406,9 +434,7 @@ 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) {
@ -432,7 +458,9 @@ export class AppComponent implements OnInit, OnDestroy {
}
}
}
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();
});

1
src/app/community/community.component.ts
View File

@ -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,

20
src/app/fos/fos-routing.module.ts Normal file
View File

@ -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 {
}

24
src/app/fos/fos.component.ts Normal file
View File

@ -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: `
<fos [piwikSiteId]="piwikSiteId"></fos>
`
})
export class CommunityFosComponent {
piwikSiteId;
communityId;
constructor() {
}
ngOnInit() {
this.communityId = ConnectHelper.getCommunityFromDomain(properties.domain);
this.piwikSiteId = PiwikHelper.getSiteId(this.communityId);
}
}

27
src/app/fos/fos.module.ts Normal file
View File

@ -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 {
}

1
src/app/htmlPages/htmlPage.component.ts
View File

@ -28,6 +28,7 @@ export class HtmlPageComponent {
@Input() description: string;
private subscriptions = [];
communityId;
piwikSiteId;
constructor(private route: ActivatedRoute, private _router: Router,
private _meta: Meta,

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit 49e2edfe84d441bf1b5bf4bbfb7f94f98d88cb7a
Subproject commit b6ead8d7e2fa94ede8f45c6295d9b37575fc1f92

20
src/app/sdg/sdg-routing.module.ts Normal file
View File

@ -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 {
}

26
src/app/sdg/sdg.component.ts Normal file
View File

@ -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: `
<sdg [piwikSiteId]="piwikSiteId" [customFilter]="customFilter"></sdg>
`
})
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, "");
}
}

27
src/app/sdg/sdg.module.ts Normal file
View File

@ -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 {
}

6
src/app/utils/piwikHelper.ts
View File

@ -40,11 +40,13 @@ export class PiwikHelper{
"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];
}
}

2
src/assets/common-assets

@ -1 +1 @@
Subproject commit ca209a54baaa2d9e0004613a68088fdcf4bee43a
Subproject commit f15bbfa7265f170e06b256f086f2acedfa3f72e0

2
src/assets/openaire-theme

@ -1 +1 @@
Subproject commit aa1e6c9df390a4ba0919b5f8591374f7eec75089
Subproject commit 468b2b008f474c88dacc52991a5231693833f1f9

3
src/environments/environment.prod.ts
View File

@ -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
};

2
src/environments/environment.ts
View File

@ -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',