diff --git a/angular.json b/angular.json
index 2e88879..4f72345 100644
--- a/angular.json
+++ b/angular.json
@@ -212,13 +212,16 @@
"main": "server.ts",
"tsConfig": "src/tsconfig.server.json",
"sourceMap": true,
- "optimization": false
+ "optimization": false,
+ "buildOptimizer": false
},
"configurations": {
"development": {
"outputHashing": "media",
"sourceMap": false,
- "optimization": true
+ "optimization": true,
+ "vendorChunk": true,
+ "buildOptimizer": true
},
"beta": {
"outputHashing": "media",
@@ -229,7 +232,8 @@
}
],
"sourceMap": false,
- "optimization": true
+ "optimization": true,
+ "buildOptimizer": true
},
"production": {
"outputHashing": "media",
@@ -240,7 +244,8 @@
}
],
"sourceMap": false,
- "optimization": true
+ "optimization": true,
+ "buildOptimizer": true
}
},
"defaultConfiguration": ""
diff --git a/package.json b/package.json
index dc15ceb..3e8abc1 100644
--- a/package.json
+++ b/package.json
@@ -21,19 +21,19 @@
},
"private": true,
"dependencies": {
- "@angular/animations": "^14.2.3",
- "@angular/cdk": "^14.2.2",
- "@angular/common": "^14.2.3",
- "@angular/compiler": "^14.2.3",
- "@angular/core": "^14.2.3",
- "@angular/forms": "^14.2.3",
- "@angular/localize": "^14.2.3",
- "@angular/material": "^14.2.2",
- "@angular/platform-browser": "^14.2.3",
- "@angular/platform-browser-dynamic": "^14.2.3",
- "@angular/platform-server": "^14.2.3",
- "@angular/router": "^14.2.3",
- "@nguniversal/express-engine": "^14.2.0",
+ "@angular/animations": "^16.1.8",
+ "@angular/cdk": "^16.1.7",
+ "@angular/common": "^16.1.8",
+ "@angular/compiler": "^16.1.8",
+ "@angular/core": "^16.1.8",
+ "@angular/forms": "^16.1.8",
+ "@angular/localize": "^16.1.8",
+ "@angular/material": "^16.1.7",
+ "@angular/platform-browser": "^16.1.8",
+ "@angular/platform-browser-dynamic": "^16.1.8",
+ "@angular/platform-server": "^16.1.8",
+ "@angular/router": "^16.1.8",
+ "@nguniversal/express-engine": "^16.1.1",
"@node-minify/clean-css": "^6.2.0",
"@node-minify/core": "^6.2.0",
"axios": "^0.27.2",
@@ -41,25 +41,25 @@
"core-js": "^2.5.4",
"express": "^4.15.2",
"jquery": "^3.4.1",
- "ng-recaptcha": "^10.0.0",
+ "ng-recaptcha": "^12.0.2",
"ng2-ckeditor": "1.3.7",
"rxjs": "^6.5.1",
"ts-md5": "^1.2.0",
"tslib": "^2.0.0",
- "uikit": "3.13.10",
- "zone.js": "~0.11.4"
+ "uikit": "3.16.24",
+ "zone.js": "~0.13.1"
},
"devDependencies": {
- "@angular-devkit/build-angular": "^14.2.3",
- "@angular/cli": "^14.2.3",
- "@angular/compiler-cli": "^14.2.3",
- "@angular/language-service": "^14.2.3",
- "@nguniversal/builders": "^14.2.0",
+ "@angular-devkit/build-angular": "^16.1.7",
+ "@angular/cli": "^16.1.7",
+ "@angular/compiler-cli": "^16.1.8",
+ "@angular/language-service": "^16.1.8",
+ "@nguniversal/builders": "^16.1.1",
"@types/compression": "^1.7.0",
"@types/express": "^4.17.0",
"@types/jasmine": "~3.6.0",
"@types/jasminewd2": "~2.0.3",
- "@types/node": "^12.11.1",
+ "@types/node": "^16.18.50",
"@types/ckeditor": "^4.9.10",
"codelyzer": "^6.0.0",
"jasmine-core": "~3.8.0",
@@ -71,6 +71,6 @@
"karma-jasmine-html-reporter": "^1.6.0",
"protractor": "~7.0.0",
"ts-node": "~7.0.0",
- "typescript": "~4.6.4"
+ "typescript": "~4.9.5"
}
}
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 258233c..6fc032e 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -20,11 +20,12 @@ const routes: Routes = [
/** Other Pages */
{
path: '',
- loadChildren: () => import('./communitywrapper/communityWrapper.module').then(m => m.CommunityWrapperModule)
+ loadChildren: () => import('./communitywrapper/communityWrapper.module').then(m => m.CommunityWrapperModule),
+ data: {hasStickyHeaderOnMobile: true}
},
{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: 'about/learn-how', loadChildren: () => import('./learn-how/learn-how.module').then(m => m.LearnHowModule), data: {hasStickyHeaderOnMobile: true}},
+ {path: 'about/faq', loadChildren: () => import('./learn-how/faqs/faqs.module').then(m => m.FaqsModule), data: {hasStickyHeaderOnMobile: true}},
{path: 'get-started', loadChildren: () => import('./get-started/get-started.module').then(m => m.GetStartedModule)},
{
path: 'contact-us',
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index b1db9f0..8e06f1b 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -28,7 +28,7 @@ import {LoginErrorCodes} from "./openaireLibrary/login/utils/guardHelper.class";
import {Layout} from "./openaireLibrary/connect/community/CustomizationOptions";
import {CustomizationService} from "./openaireLibrary/services/customization.service";
import {SmoothScroll} from "./openaireLibrary/utils/smooth-scroll";
-import {makeStateKey, Meta, StateKey, TransferState} from "@angular/platform-browser";
+import {makeStateKey, StateKey, TransferState} from "@angular/core";
import {CommunityInfo} from "./openaireLibrary/connect/community/communityInfo";
import {SEOService} from "./openaireLibrary/sharedComponents/SEO/SEO.service";
import {UntypedFormBuilder, UntypedFormGroup, Validators} from "@angular/forms";
@@ -42,20 +42,19 @@ import {OpenaireEntities} from "./openaireLibrary/utils/properties/searchFields"
import {DOCUMENT, isPlatformServer} from "@angular/common";
import {AdvancedAsyncSubject} from "./openaireLibrary/utils/AdvancedAsyncSubject";
import {LayoutService} from "./openaireLibrary/dashboard/sharedComponents/sidebar/layout.service";
+import {Meta} from "@angular/platform-browser";
@Component({
selector: 'app-root',
template: `
-
-
+
Get Started
@@ -88,8 +87,8 @@ import {LayoutService} from "./openaireLibrary/dashboard/sharedComponents/sideba
-
-
+
+
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 363c148..4913b10 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,8 +1,8 @@
-import {NgModule} from '@angular/core';
+import {APP_ID, NgModule} from '@angular/core';
import {FormsModule} from '@angular/forms';
import {CommonModule} from '@angular/common';
import {HTTP_INTERCEPTORS, HttpClientModule} from "@angular/common/http";
-import {BrowserModule, BrowserTransferStateModule} from '@angular/platform-browser';
+import {BrowserModule} from '@angular/platform-browser';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {AppComponent} from './app.component';
@@ -41,9 +41,8 @@ import {CustomizationService} from "./openaireLibrary/services/customization.ser
BottomModule,
CookieLawModule,
SubscribeModule.forRoot(), InviteBasicModule,
- BrowserModule.withServerTransition({appId: 'serverApp'}),
+ BrowserModule,
AppRoutingModule,
- BrowserTransferStateModule,
BrowserAnimationsModule,
PageURLResolverModule, Schema2jsonldModule, RoleVerificationModule, QuickContactModule, AlertModalModule
],
@@ -51,6 +50,7 @@ import {CustomizationService} from "./openaireLibrary/services/customization.ser
exports: [AppComponent],
providers: [
CommunitiesService, CustomizationService, IsCommunity, SubscribeService,
+ {provide: APP_ID, useValue: 'serverApp'},
{
provide: HTTP_INTERCEPTORS,
useClass: HttpInterceptorService,
diff --git a/src/app/app.server.module.ts b/src/app/app.server.module.ts
index cc86a55..9c8c71e 100644
--- a/src/app/app.server.module.ts
+++ b/src/app/app.server.module.ts
@@ -1,5 +1,5 @@
import { NgModule } from '@angular/core';
-import {ServerModule, ServerTransferStateModule} from '@angular/platform-server';
+import {ServerModule} from '@angular/platform-server';
import { AppModule } from './app.module';
import { AppComponent } from './app.component';
@@ -8,7 +8,6 @@ import { AppComponent } from './app.component';
imports: [
AppModule,
ServerModule,
- ServerTransferStateModule
],
bootstrap: [AppComponent],
})
diff --git a/src/app/communities/communities.component.html b/src/app/communities/communities.component.html
index 4a04861..95a0a94 100644
--- a/src/app/communities/communities.component.html
+++ b/src/app/communities/communities.component.html
@@ -1,302 +1,287 @@
-
-
-
-
-
-
- Build a Gateway
- for your Community.
-
-
-
Turn Open Science into Practice.
-
It takes your open and linked {{entities.RESULTS | lowercase}}.
-
A service customized to your needs.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Find a repository to deposit
- your {{entities.RESULT | lowercase}}
- .
-
-
-
-
- Link your {{entities.RESULT | lowercase}}
- with your community, funding, and other {{entities.RESULTS | lowercase}}
- .
-
-
-
-
- View community's
- overview at a glance.
-
-
-
-
- Search & browse
- your community's {{entities.RESULTS | lowercase}}
- .
-
-
-
-
-
-
-
- Benefits.
-
- Find the best for your community.
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ Build a Gateway
+ for your Community.
+
+
+
Turn Open Science into Practice.
+
It takes your open and linked {{entities.RESULTS | lowercase}}.
+
A service customized to your needs.
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+ Benefits.
+
+ Find the best for your community.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Find a repository
+ to deposit your {{entities.RESULT | lowercase}}
+ .
+
+
+
+
+ Link your {{entities.RESULT | lowercase}}
+ with your community, funding, and other {{entities.RESULTS | lowercase}}
+ .
+
+
+
+
+ View community's
+ overview at a glance.
+
+
+
+
+ Search & browse
+ your community's {{entities.RESULTS | lowercase}}
+ .
+
+
+
+
+
+
-
-
-
- Our mission for an Open and FAIR science.
-
-
-
-
-
-
+
+
+
-
-
-
Customized to your needs
-
A Gateway with your own brand, rules for aggregation, text & data mining, and presentation. Run
- by you via a simple, yet powerful backend administration tool.
-
-
-
-
-
- -
-
- Access control
-
-
- -
-
- Look & feel to match your brand
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
Customized to your needs
+
A Gateway with your own brand, rules for aggregation, text & data mining,
+ and presentation. Run
+ by you via a simple, yet powerful backend administration tool.
+
+
+
+
+
+ -
+
+ Access control
+
+
+ -
+
+ Look & feel to match your brand
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
Let us Help you Develop a Collaborative Science Gateway.
- It is fast. It is reliable.
-
-
Contact us
-
+
+
+
Let us Help you Develop a Collaborative Science Gateway.
+ It is fast. It is reliable.
+
+
+
Contact
+ us
+
diff --git a/src/app/communities/communities.component.less b/src/app/communities/communities.component.less
index 3600bb2..8f5fcd4 100644
--- a/src/app/communities/communities.component.less
+++ b/src/app/communities/communities.component.less
@@ -7,7 +7,11 @@
.connect-dark-logo-background {
background-image: url("~src/assets/connect-assets/home/connect-dark-logo.svg");
background-repeat: no-repeat;
- background-position: left 95%;
- background-size: 65%;
+ background-position: -5% 102%;
+ background-size: 35%;
}
-}
\ No newline at end of file
+
+ .slider-nav {
+ max-width: 650px;
+ }
+}
diff --git a/src/app/communities/communities.module.ts b/src/app/communities/communities.module.ts
index 7807f63..0e66899 100644
--- a/src/app/communities/communities.module.ts
+++ b/src/app/communities/communities.module.ts
@@ -14,19 +14,19 @@ import {ErrorMessagesModule} from '../openaireLibrary/utils/errorMessages.m
import {SearchFormModule} from '../openaireLibrary/searchPages/searchUtils/searchForm.module';
import {BrowseCommunityModule} from './browseCommunity/browse-community.module';
import {HelperModule} from "../openaireLibrary/utils/helper/helper.module";
-import {GifSliderModule} from "../openaireLibrary/utils/gif-slider/gif-slider.module";
import {OtherPortalsModule} from "../openaireLibrary/sharedComponents/other-portals/other-portals.module";
import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module";
import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard";
import {SectionScrollModule} from "../openaireLibrary/utils/section-scroll/section-scroll.module";
import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
+import {SliderUtilsModule} from "../openaireLibrary/sharedComponents/slider-utils/slider-utils.module";
@NgModule({
imports: [
CommonModule, FormsModule, RouterModule,
ManageModule, ErrorMessagesModule,
- SearchFormModule, BrowseCommunityModule, GifSliderModule, OtherPortalsModule,
- HelperModule, SEOServiceModule, SectionScrollModule, IconsModule
+ SearchFormModule, BrowseCommunityModule, OtherPortalsModule,
+ HelperModule, SEOServiceModule, SectionScrollModule, IconsModule, SliderUtilsModule
],
declarations: [
CommunitiesComponent
diff --git a/src/app/community/community.component.html b/src/app/community/community.component.html
index 5a60ce9..46f3a18 100644
--- a/src/app/community/community.component.html
+++ b/src/app/community/community.component.html
@@ -737,9 +737,11 @@
*ngIf="activeTab == 'enermaps' && communityId == 'enermaps' && fetchFeaturedDatasets.searchUtils.totalResults > 0 && isEntityEnabled('dataset')">
-
+
+
+ Featured Datasets
+
+
Here are listed some of the most important energy datasets as selected by energy experts.
@@ -747,12 +749,16 @@
using only well-known datasets which you can trust.
- size" [type]="'Featured Datasets'"
+ size" [type]="'Featured Datasets'"
(pageChange)="updatePage($event)"
- [page]="page" [pageSize]="size"
- [totalResults]="fetchFeaturedDatasets.results.length" >
+ [page]="fetchFeaturedDatasets.searchUtils.page" [pageSize]="size"
+ [totalResults]="fetchFeaturedDatasets.searchUtils.totalResults" >
-
+
+
diff --git a/src/app/community/community.component.ts b/src/app/community/community.component.ts
index 8cba6db..e692324 100644
--- a/src/app/community/community.component.ts
+++ b/src/app/community/community.component.ts
@@ -219,7 +219,7 @@ export class CommunityComponent {
this._title.setTitle(community.title);
this.subs.push(this._piwikService.trackView(this.properties, community.title).subscribe());
if (this.community.zenodoCommunity) {
- this.subs.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties, this.properties.zenodoCommunities + this.community.zenodoCommunity).subscribe(
+ this.subs.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties, this.community.zenodoCommunity).subscribe(
result => {
this.masterZenodoCommunity = result;
},
@@ -386,7 +386,6 @@ export class CommunityComponent {
)
) {
this.fetchFeaturedDatasets.getAllResultsForCommunity("dataset", this.communityId, page, size, this.properties, "enermaps::selection");
- // console.log(this.fetchFeaturedDatasets);
}
this.reloadFeaturedDatasets = false;
}
@@ -663,5 +662,7 @@ export class CommunityComponent {
public updatePage(event) {
this.page = event.value;
+ this.fetchFeaturedDatasets.searchUtils.page = event.value;
+ this.fetchFeaturedDatasets.results = this.fetchFeaturedDatasets.allResults.slice((this.page - 1) * this.searchNumber, this.page * this.searchNumber) ;
}
}
diff --git a/src/app/deposit/utils/fetchZenodoInformation.class.ts b/src/app/deposit/utils/fetchZenodoInformation.class.ts
index 6d58826..5dd3b13 100644
--- a/src/app/deposit/utils/fetchZenodoInformation.class.ts
+++ b/src/app/deposit/utils/fetchZenodoInformation.class.ts
@@ -24,7 +24,7 @@ export class FetchZenodoInformation {
});
}
public getZenodoCommunityNameAndUrlById(masterZenodoCommunityId: string, properties:EnvProperties, zenodoInformation: ZenodoInformationClass){
- this.subscriptions.push(this._zenodoCommunitieService.getZenodoCommunityById(properties, properties.zenodoCommunities+masterZenodoCommunityId).subscribe(
+ this.subscriptions.push(this._zenodoCommunitieService.getZenodoCommunityById(properties, masterZenodoCommunityId).subscribe(
result => {
console.info("getZenodoCommunityNameAndUrlById", result);
var masterZenodoCommunity = result;
diff --git a/src/app/deposit/zenodo/shareInZenodo.component.html b/src/app/deposit/zenodo/shareInZenodo.component.html
index 707bc41..4bcd642 100644
--- a/src/app/deposit/zenodo/shareInZenodo.component.html
+++ b/src/app/deposit/zenodo/shareInZenodo.component.html
@@ -19,7 +19,7 @@
@@ -108,7 +108,7 @@
diff --git a/src/app/deposit/zenodo/shareInZenodo.component.ts b/src/app/deposit/zenodo/shareInZenodo.component.ts
index 25467cc..914758e 100644
--- a/src/app/deposit/zenodo/shareInZenodo.component.ts
+++ b/src/app/deposit/zenodo/shareInZenodo.component.ts
@@ -82,7 +82,7 @@ export class ShareInZenodoComponent {
this.community = community;
this.masterZenodoCommunityId = this.community.zenodoCommunity;
if (this.masterZenodoCommunityId) {
- this.subs.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties, this.properties.zenodoCommunities + this.masterZenodoCommunityId).subscribe(
+ this.subs.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties, this.masterZenodoCommunityId).subscribe(
result => {
this.masterZenodoCommunity = result;
@@ -143,7 +143,7 @@ export class ShareInZenodoComponent {
}
getZenodoCommunityById(zenodoid) {
- this.subs.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties, this.properties.zenodoCommunities + zenodoid).subscribe(
+ this.subs.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties, zenodoid).subscribe(
result => {
this.communities[zenodoid] = result;
this.zenodoCommunitiesLoadedCount++;
diff --git a/src/app/learn-how/learn-how.module.ts b/src/app/learn-how/learn-how.module.ts
index cebc5d5..5196eb8 100644
--- a/src/app/learn-how/learn-how.module.ts
+++ b/src/app/learn-how/learn-how.module.ts
@@ -7,7 +7,6 @@ import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.servic
import {LearnHowComponent} from "./learn-how.component";
import {LearnHowRoutingModule} from "./learn-how-routing.module";
-import {GifSliderModule} from "../openaireLibrary/utils/gif-slider/gif-slider.module";
import {HelperModule} from "../openaireLibrary/utils/helper/helper.module";
import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard";
import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
@@ -20,7 +19,7 @@ import {TabsModule} from '../openaireLibrary/utils/tabs/tabs.module';
@NgModule({
imports: [
- CommonModule, RouterModule, LearnHowRoutingModule, GifSliderModule, HelperModule,
+ CommonModule, RouterModule, LearnHowRoutingModule, HelperModule,
Schema2jsonldModule, SEOServiceModule, BreadcrumbsModule, HtmlPagesModule, IconsModule, TabsModule
],
declarations: [
diff --git a/src/app/searchPages/simple/searchProjects.component.ts b/src/app/searchPages/simple/searchProjects.component.ts
index 177e87d..483ab32 100644
--- a/src/app/searchPages/simple/searchProjects.component.ts
+++ b/src/app/searchPages/simple/searchProjects.component.ts
@@ -13,6 +13,7 @@ import {Subscriber} from "rxjs";
import {NewSearchPageComponent} from "../../openaireLibrary/searchPages/searchUtils/newSearchPage.component";
import {SearchResult} from "../../openaireLibrary/utils/entities/searchResult";
import {StringUtils} from "../../openaireLibrary/utils/string-utils.class";
+import {IndexInfoService} from "../../openaireLibrary/utils/indexInfo.service";
@Component({
selector: 'openaire-search-projects',
@@ -72,13 +73,17 @@ export class OpenaireSearchProjectsComponent {
public loadPaging: boolean = true;
public oldTotalResults: number = 0;
keyword;
- constructor (private route: ActivatedRoute, private _searchProjectsService: SearchCommunityProjectsService, private _communityService: CommunityService) {
+ lastDBLoadDate = null;
+ constructor (private route: ActivatedRoute, private _searchProjectsService: SearchCommunityProjectsService, private _communityService: CommunityService, private indexInfoService: IndexInfoService) {
this.errorCodes = new ErrorCodes();
this.errorMessages = new ErrorMessagesComponent();
this.searchUtils.status = this.errorCodes.LOADING;
}
public ngOnInit() {
+ this.subscriptions.push(this.indexInfoService.getLastIndexDate(this.properties).subscribe(res => {
+ this.lastDBLoadDate = res;
+ }));
this.searchUtils.baseUrl = this.properties.searchLinkToProjects;
this.subscriptions.push(this._communityService.getCommunityAsObservable().subscribe(community =>{
if(community != null){
@@ -179,7 +184,11 @@ export class OpenaireSearchProjectsComponent {
let results:SearchResult[]=[];
for(let result of data){
let sResult:SearchResult = new SearchResult();
- sResult.id = result.openaireId;
+ if(!result["availableSince"] || !this.lastDBLoadDate || (result["availableSince"] && this.lastDBLoadDate && result["availableSince"] < this.lastDBLoadDate)){
+ sResult.id = result.openaireId;
+ }else{
+ sResult.id = "-1"; //not yet in the graph
+ }
sResult.title = {name:"", accessMode: null};
sResult.title.name = result.name?result.name:result.acronym;
sResult.acronym = result['acronym'];
diff --git a/src/app/utils/subscribe/invite/invite-routing.module.ts b/src/app/utils/subscribe/invite/invite-routing.module.ts
index c23d9d3..01cf3cc 100644
--- a/src/app/utils/subscribe/invite/invite-routing.module.ts
+++ b/src/app/utils/subscribe/invite/invite-routing.module.ts
@@ -2,13 +2,13 @@ import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
import {InviteComponent} from './invite.component';
-import {LoginGuard} from '../../../openaireLibrary/login/loginGuard.guard';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {ConnectAdminLoginGuard} from "../../../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard";
@NgModule({
imports: [
RouterModule.forChild([
- { path: '', component: InviteComponent, canActivate: [LoginGuard], canDeactivate: [PreviousRouteRecorder] }
+ { path: '', component: InviteComponent, canActivate: [ConnectAdminLoginGuard], canDeactivate: [PreviousRouteRecorder] }
])
]
diff --git a/src/app/utils/subscribe/invite/invite.component.html b/src/app/utils/subscribe/invite/invite.component.html
index e9bb6dd..c9632b2 100644
--- a/src/app/utils/subscribe/invite/invite.component.html
+++ b/src/app/utils/subscribe/invite/invite.component.html
@@ -30,8 +30,12 @@
diff --git a/src/app/utils/subscribe/invite/invite.component.ts b/src/app/utils/subscribe/invite/invite.component.ts
index de4d80c..c27780e 100644
--- a/src/app/utils/subscribe/invite/invite.component.ts
+++ b/src/app/utils/subscribe/invite/invite.component.ts
@@ -21,6 +21,7 @@ declare var UIkit;
export class InviteComponent implements OnInit {
@Input() longView: boolean = true;
@Input() communityId = null;
+ @Input() isOpen: boolean = true;
public properties: EnvProperties = properties;
public pageTitle: string = "Invite";
public user: User;
@@ -31,13 +32,11 @@ export class InviteComponent implements OnInit {
private subs: Subscription[] = [];
constructor(
- private route: ActivatedRoute,
private _router: Router,
private _meta: Meta,
private helper: HelperService,
private _title: Title,
private seoService: SEOService,
- private _piwikService: PiwikService,
private userManageService: UserManagementService) {
}
@@ -46,9 +45,9 @@ export class InviteComponent implements OnInit {
user => {
this.user = user;
}));
- this.getPageContents();
- this.url = this.properties.domain + this._router.url;
if(this.longView) {
+ this.url = this.properties.domain + this._router.url;
+ this.getPageContents();
this.seoService.createLinkForCanonicalURL(this.url);
this.updateUrl(this.url);
this.updateTitle(this.pageTitle);
@@ -90,9 +89,12 @@ export class InviteComponent implements OnInit {
private updateUrl(url: string) {
this._meta.updateTag({content: url}, "property='og:url'");
}
+
+ get adminInviteURL() {
+ return this.properties.adminPortalURL + '/' + this.communityId + '/users/member';
+ }
close(element) {
UIkit.dropdown(element).hide();
- this
}
}
diff --git a/src/app/utils/subscribe/invite/invite.module.ts b/src/app/utils/subscribe/invite/invite.module.ts
index ebb20e0..f947a41 100644
--- a/src/app/utils/subscribe/invite/invite.module.ts
+++ b/src/app/utils/subscribe/invite/invite.module.ts
@@ -1,13 +1,12 @@
-import {NgModule} from '@angular/core';
+import {NgModule} from '@angular/core';
-import {InviteRoutingModule} from './invite-routing.module';
-
-import {LoginGuard} from '../../../openaireLibrary/login/loginGuard.guard';
+import {InviteRoutingModule} from './invite-routing.module';
import {InviteBasicModule} from "./inviteBasic.module";
+import {ConnectAdminLoginGuard} from "../../../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard";
@NgModule({
imports: [InviteBasicModule, InviteRoutingModule],
- providers: [LoginGuard]
+ providers: [ConnectAdminLoginGuard]
})
export class InviteModule { }
diff --git a/src/assets/community.less b/src/assets/community.less
index 5a6b8da..adebe47 100644
--- a/src/assets/community.less
+++ b/src/assets/community.less
@@ -20,7 +20,7 @@
#joinAndInviteBtn #join,
#joinAndInviteBtn #member,
#joinAndInviteBtn #invite {
- width: 140px;
+ width: 160px;
line-height: 60px;
height: 60px;
padding: 0 20px;
diff --git a/src/assets/connect.less b/src/assets/connect.less
index 9587453..b796fe1 100644
--- a/src/assets/connect.less
+++ b/src/assets/connect.less
@@ -30,4 +30,4 @@
@inverse-text-primary-color: @connect-color;
/* General */
-@general-search-form-background: fade(@global-secondary-background, 20%);
+@general-search-form-background: lighten(@global-secondary-background, 33%);
diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts
index 15a3979..3f7b05b 100644
--- a/src/environments/environment.beta.ts
+++ b/src/environments/environment.beta.ts
@@ -1,120 +1,22 @@
import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
+import {common, commonBeta} from "../app/openaireLibrary/utils/properties/environments/environment";
-export let properties: EnvProperties = {
- environment: "beta",
+let props: EnvProperties = {
+
+ dashboard: 'connect',
adminToolsPortalType: "connect",
- dashboard: "connect",
- enablePiwikTrack: true,
+ adminToolsCommunity: 'connect',
+ enablePiwikTrack: false,
+ piwikSiteId: '80',
useCache: false,
useLongCache: true,
showContent: true,
- showAddThis: true,
- framesAPIURL: "https://beta.openaire.eu/stats3/",
- statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
- statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
- statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/",
- useNewStatistisTool: true,
- enermapsURL:"https://lab.idiap.ch/enermaps",
- impactFactorsAPIURL: "https://bip-api.imsi.athenarc.gr/paper/scores/batch/",
- claimsAPIURL: "https://beta.services.openaire.eu/claims/rest/claimsService/",
- searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/",
- searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources",
- openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=",
- csvAPIURL: "https://beta.services.openaire.eu/search/v2/api/reports",
- searchCrossrefAPIURL: "https://api.crossref.org/works",
- searchDataciteAPIURL: "https://api.datacite.org/works",
- searchOrcidURL: "https://pub.orcid.org/v2.1/",
- orcidURL: "https://orcid.org/",
- orcidAPIURL: "https://services.openaire.eu/uoa-orcid-service/",
- orcidTokenURL: "https://orcid.org/oauth/authorize?",
- orcidClientId: "APP-IN0O56SBVVTB7NN4",
- doiURL: "https://doi.org/",
- pmcURL: "http://europepmc.org/articles/",
- pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
- handleURL: "http://hdl.handle.net/",
- cordisURL: "http://cordis.europa.eu/projects/",
- openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
- r3DataURL: "http://service.re3data.org/repository/",
- swhURL: "https://archive.softwareheritage.org/",
- fairSharingURL: "https://fairsharing.org/",
- eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/",
- sherpaURL: "http://sherpa.ac.uk/romeo/issn/",
- sherpaURLSuffix: "/",
- zenodo: "https://zenodo.org/",
- zenodoCommunities: "https://zenodo.org/api/communities/",
- openAccess: "https://www.openaire.eu/support/faq#article-id-234",
- openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310",
- fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme",
- h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020",
- ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf",
- helpdesk: "https://www.openaire.eu/support/helpdesk",
- helpdeskEmail: "helpdesk@openaire.eu",
- utilsService: "https://demo.openaire.eu/utils-service",
- vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/",
- piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
- piwikSiteId: "80",
- loginUrl: "https://beta.services.openaire.eu/login-service/openid_connect_login",
- userInfoUrl: "https://beta.services.openaire.eu/login-service/userInfo",
- registryUrl: 'https://beta.services.openaire.eu/uoa-user-management/api/registry/',
- logoutUrl: "https://beta.services.openaire.eu/login-service/openid_logout",
- cookieDomain: ".openaire.eu",
- feedbackmail: "feedback@openaire.eu",
- cacheUrl: "https://demo.openaire.eu/cache/get?url=",
- adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-admin-tools/",
- adminToolsCommunity: "connect",
- datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/",
- contextsAPI: "https://beta.services.openaire.eu/openaire/context",
- communityAPI: "https://beta.services.openaire.eu/openaire/community/",
- communitiesAPI: "https://beta.services.openaire.eu/openaire/community/communities",
- csvLimit: 2000,
- pagingLimit: 20,
- resultsPerPage: 10,
- baseLink:"",
- domain:"https://beta.connect.openaire.eu",
- afterLoginRedirectLink: "/myCommunities",
- searchLinkToResult: "/search/result?id=",
- searchLinkToPublication: "/search/publication?articleId=",
- searchLinkToProject: "/search/project?projectId=",
- searchLinkToDataProvider: "/search/dataprovider?datasourceId=",
- searchLinkToDataset: "/search/dataset?datasetId=",
- searchLinkToSoftwareLanding: "/search/software?softwareId=",
- searchLinkToOrganization: "/search/organization?organizationId=",
- searchLinkToOrp: "/search/other?orpId=",
- searchLinkToCommunities: "/search/find/communities",
- searchLinkToPublications: "/search/find/publications",
- searchLinkToDataProviders: "/search/find/dataproviders",
- searchLinkToProjects: "/search/find/projects",
- searchLinkToDatasets: "/search/find/datasets",
- searchLinkToSoftware: "/search/find/software",
- searchLinkToOrps: "/search/find/other",
- searchLinkToOrganizations: "/search/find/organizations",
- searchLinkToCompatibleDataProviders: "/search/content-providers",
- searchLinkToEntityRegistriesDataProviders: "/search/entity-registries",
- searchLinkToJournals: "/search/journals",
- searchLinkToResults: "/search/find/research-outcomes",
- searchLinkToAdvancedPublications: "/search/advanced/publications",
- searchLinkToAdvancedProjects: "/search/advanced/projects",
- searchLinkToAdvancedDatasets: "/search/advanced/datasets",
- searchLinkToAdvancedSoftware: "/search/advanced/software",
- searchLinkToAdvancedOrps: "/search/advanced/other",
- searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders",
- searchLinkToAdvancedOrganizations: "/search/advanced/organizations",
- searchLinkToAdvancedResults: "/search/advanced/research-outcomes",
- errorLink: '/error',
- lastIndexInformationLink: "https://beta.openaire.eu/aggregation-and-content-provision-workflows",
- showLastIndexInformationLink: true,
- bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=",
- widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
- claimsInformationLink: "https://beta.openaire.eu/linking",
- depositLearnHowPage: "/participate/deposit/learn-how",
- depositSearchPage: "/participate/deposit/search",
- shareInZenodoPage: "/participate/deposit/zenodo",
- reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
- admins: ["feedback@openaire.eu"],
- lastIndexUpdate: "2020-05-06",
- indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/",
- altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
- b2noteAPIURL: 'https://b2note.eudat.eu/',
- adminPortalURL: "https://beta.admin.connect.openaire.eu",
- myOrcidLinksPage: "/my-orcid-links"
+ showAddThis: false,
+ domain: 'https://beta.connect.openaire.eu',
+ baseLink : "",
+
};
+
+export let properties: EnvProperties = {
+ ...common, ...commonBeta, ...props
+}
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 40df9fc..6249155 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,121 +1,22 @@
import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
+import {common, commonProd} from "../app/openaireLibrary/utils/properties/environments/environment";
-export let properties: EnvProperties = {
- environment: "production",
+let props: EnvProperties = {
+
+ dashboard: 'connect',
adminToolsPortalType: "connect",
- dashboard: "connect",
- enablePiwikTrack: true,
+ adminToolsCommunity: 'connect',
+ enablePiwikTrack: false,
+ piwikSiteId: '80',
useCache: false,
useLongCache: true,
showContent: true,
- showAddThis: true,
- framesAPIURL: "https://www.openaire.eu/stats3/",
- statisticsAPIURL: "https://services.openaire.eu/stats-api/",
- statisticsFrameAPIURL: "https://www.openaire.eu/stats/",
- statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/",
- useNewStatistisTool: true,
- enermapsURL:"https://lab.idiap.ch/enermaps",
- impactFactorsAPIURL: "https://bip-api.imsi.athenarc.gr/paper/scores/batch/",
- claimsAPIURL: "https://services.openaire.eu/claims/rest/claimsService/",
- searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/",
- searchResourcesAPIURL: "https://services.openaire.eu/search/v2/api/resources",
- openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=",
- csvAPIURL: "https://services.openaire.eu/search/v2/api/reports",
- searchCrossrefAPIURL: "https://api.crossref.org/works",
- searchDataciteAPIURL: "https://api.datacite.org/works",
- searchOrcidURL: "https://pub.orcid.org/v2.1/",
- orcidURL: "https://orcid.org/",
- orcidAPIURL: "https://services.openaire.eu/uoa-orcid-service/",
- orcidTokenURL: "https://orcid.org/oauth/authorize?",
- orcidClientId: "APP-IN0O56SBVVTB7NN4",
- doiURL: "https://doi.org/",
- pmcURL: "http://europepmc.org/articles/",
- pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
- handleURL: "http://hdl.handle.net/",
- cordisURL: "http://cordis.europa.eu/projects/",
- openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
- r3DataURL: "http://service.re3data.org/repository/",
- swhURL: "https://archive.softwareheritage.org/",
- fairSharingURL: "https://fairsharing.org/",
- eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/",
- sherpaURL: "http://sherpa.ac.uk/romeo/issn/",
- sherpaURLSuffix: "/",
- zenodo: "https://zenodo.org/",
- zenodoCommunities: "https://zenodo.org/api/communities/",
- openAccess: "https://www.openaire.eu/support/faq#article-id-234",
- openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310",
- fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme",
- h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020",
- ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf",
- helpdesk: "https://www.openaire.eu/support/helpdesk",
- helpdeskEmail: "helpdesk@openaire.eu",
- utilsService: "https://explore.openaire.eu/utils-service",
- vocabulariesAPI: "https://services.openaire.eu/provision/mvc/vocabularies/",
- piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
- piwikSiteId: "112",
- loginUrl: "https://services.openaire.eu/login-service/openid_connect_login",
- registryUrl: 'https://services.openaire.eu/uoa-user-management/api/registry/',
- userInfoUrl: "https://services.openaire.eu/login-service/userInfo",
- logoutUrl: "https://services.openaire.eu/login-service/openid_logout",
- cookieDomain: ".openaire.eu",
- feedbackmail: "feedback@openaire.eu",
- cacheUrl: "https://explore.openaire.eu/cache/get?url=",
- datasourcesAPI: "https://services.openaire.eu/openaire/ds/search/",
- adminToolsAPIURL: "https://services.openaire.eu/uoa-admin-tools/",
- adminToolsCommunity: "connect",
- contextsAPI: "https://services.openaire.eu/openaire/context",
- communityAPI: "https://services.openaire.eu/openaire/community/",
- communitiesAPI: "https://services.openaire.eu/openaire/community/communities",
- csvLimit: 2000,
- pagingLimit: 20,
- resultsPerPage: 10,
- baseLink:"",
- domain: "https://connect.openaire.eu",
- afterLoginRedirectLink: "/myCommunities",
- searchLinkToResult: "/search/result?id=",
- searchLinkToPublication: "/search/publication?articleId=",
- searchLinkToProject: "/search/project?projectId=",
- searchLinkToDataProvider: "/search/dataprovider?datasourceId=",
- searchLinkToDataset: "/search/dataset?datasetId=",
- searchLinkToSoftwareLanding: "/search/software?softwareId=",
- searchLinkToOrganization: "/search/organization?organizationId=",
- searchLinkToOrp: "/search/other?orpId=",
- searchLinkToCommunities: "/search/find/communities",
- searchLinkToPublications: "/search/find/publications",
- searchLinkToDataProviders: "/search/find/dataproviders",
- searchLinkToProjects: "/search/find/projects",
- searchLinkToDatasets: "/search/find/datasets",
- searchLinkToSoftware: "/search/find/software",
- searchLinkToOrps: "/search/find/other",
- searchLinkToOrganizations: "/search/find/organizations",
- searchLinkToCompatibleDataProviders: "/search/content-providers",
- searchLinkToEntityRegistriesDataProviders: "/search/entity-registries",
- searchLinkToJournals: "/search/journals",
- searchLinkToResults: "/search/find/research-outcomes",
- searchLinkToAdvancedPublications: "/search/advanced/publications",
- searchLinkToAdvancedProjects: "/search/advanced/projects",
- searchLinkToAdvancedDatasets: "/search/advanced/datasets",
- searchLinkToAdvancedSoftware: "/search/advanced/software",
- searchLinkToAdvancedOrps: "/search/advanced/other",
- searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders",
- searchLinkToAdvancedOrganizations: "/search/advanced/organizations",
- searchLinkToAdvancedResults: "/search/advanced/research-outcomes",
- errorLink: '/error',
- lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows",
- showLastIndexInformationLink: true,
- bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=",
- widgetLink: "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
- claimsInformationLink: "https://www.openaire.eu/linking",
- depositLearnHowPage: "/participate/deposit/learn-how",
- depositSearchPage: "/participate/deposit/search",
- shareInZenodoPage: "/participate/deposit/zenodo",
- reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
- admins: ["feedback@openaire.eu"],
- lastIndexUpdate: "2019-07-24",
- indexInfoAPI: "https://services.openaire.eu/openaire/info/",
- altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
- b2noteAPIURL: 'https://b2note.eudat.eu/',
- adminPortalURL: "https://admin.connect.openaire.eu",
- myOrcidLinksPage: "/my-orcid-links",
+ showAddThis: false,
+ domain: 'https://connect.openaire.eu',
+ baseLink : "",
hasMachineCache: true
};
+
+export let properties: EnvProperties = {
+ ...common, ...commonProd, ...props
+}
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 34a2835..4a8a496 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,122 +4,24 @@
// The list of which env maps to which file can be found in `.angular.json`.
import {EnvProperties} from '../app/openaireLibrary/utils/properties/env-properties';
+import {common, commonDev} from "../app/openaireLibrary/utils/properties/environments/environment";
-export let properties: EnvProperties = {
- environment: 'development',
- adminToolsPortalType: "connect",
+let props: EnvProperties = {
dashboard: 'connect',
+ adminToolsPortalType: "connect",
+ adminToolsCommunity: 'connect',
enablePiwikTrack: false,
+ piwikSiteId: '80',
useCache: false,
useLongCache: false,
showContent: true,
showAddThis: false,
- framesAPIURL: 'https://beta.openaire.eu/stats3/',
- statisticsAPIURL: 'https://beta.services.openaire.eu/stats-api/',
- statisticsFrameAPIURL: 'https://beta.openaire.eu/stats/',
- statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/",
- useNewStatistisTool: true,
- enermapsURL:"https://lab.idiap.ch/enermaps",
- impactFactorsAPIURL: 'https://bip-api.imsi.athenarc.gr/paper/scores/batch/',
- claimsAPIURL: 'http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/',
- searchAPIURLLAst: 'https://beta.services.openaire.eu/search/v2/api/',
- searchResourcesAPIURL: 'https://beta.services.openaire.eu/search/v2/api/resources',
- openCitationsAPIURL: 'https://services.openaire.eu/opencitations/getCitations?id=',
- csvAPIURL: 'https://beta.services.openaire.eu/search/v2/api/reports',
- searchCrossrefAPIURL: 'https://api.crossref.org/works',
- searchDataciteAPIURL: 'https://api.datacite.org/works',
- searchOrcidURL: "https://pub.orcid.org/v2.1/",
- orcidURL: "https://orcid.org/",
- orcidAPIURL: "http://duffy.di.uoa.gr:19480/uoa-orcid-service/",
- orcidTokenURL: "https://sandbox.orcid.org/oauth/authorize?",
- orcidClientId: "APP-A5M3KTX6NCN67L91",
- doiURL: 'https://doi.org/',
- pmcURL: 'http://europepmc.org/articles/',
- pmidURL: 'https://www.ncbi.nlm.nih.gov/pubmed/',
- handleURL: 'http://hdl.handle.net/',
- cordisURL: 'http://cordis.europa.eu/projects/',
- openDoarURL: 'http://v2.sherpa.ac.uk/id/repository/',
- r3DataURL: 'http://service.re3data.org/repository/',
- swhURL: "https://archive.softwareheritage.org/",
- fairSharingURL: "https://fairsharing.org/",
- eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/",
- sherpaURL: 'http://sherpa.ac.uk/romeo/issn/',
- sherpaURLSuffix: '/',
- zenodo: 'https://zenodo.org/',
- zenodoCommunities: 'https://zenodo.org/api/communities/',
- openAccess: 'https://www.openaire.eu/support/faq#article-id-234',
- openAccessRepo: 'https://www.openaire.eu/support/faq#article-id-310',
- fp7Guidlines: 'https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme',
- h2020Guidlines: 'https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020',
- ercGuidlines: 'http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf',
- helpdesk: 'https://www.openaire.eu/support/helpdesk',
- helpdeskEmail: 'helpdesk@openaire.eu',
- utilsService: 'http://mpagasas.di.uoa.gr:8000',
- vocabulariesAPI: 'https://dev-openaire.d4science.org/provision/mvc/vocabularies/',
- 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",
- 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',
- feedbackmail: 'openaire.test@gmail.com',
- cacheUrl: 'http://dl170.madgik.di.uoa.gr:3000/get?url=',
- adminToolsAPIURL: 'http://duffy.di.uoa.gr:19280/uoa-admin-tools/',
- adminToolsCommunity: 'connect',
- datasourcesAPI: 'https://beta.services.openaire.eu/openaire/ds/search/',
- contextsAPI: 'https://dev-openaire.d4science.org/openaire/context',
- communityAPI: 'https://dev-openaire.d4science.org/openaire/community/',
- communitiesAPI: 'https://dev-openaire.d4science.org/openaire/community/communities',
- csvLimit: 2000,
- pagingLimit: 20,
- resultsPerPage: 10,
- baseLink: "",
domain: 'https://beta.connect.openaire.eu',
- afterLoginRedirectLink: '/myCommunities',
- searchLinkToResult: "/search/result?id=",
- searchLinkToPublication: '/search/publication?articleId=',
- searchLinkToProject: '/search/project?projectId=',
- searchLinkToDataProvider: '/search/dataprovider?datasourceId=',
- searchLinkToDataset: '/search/dataset?datasetId=',
- searchLinkToSoftwareLanding: '/search/software?softwareId=',
- searchLinkToOrganization: '/search/organization?organizationId=',
- searchLinkToOrp: '/search/other?orpId=',
- searchLinkToCommunities: '/search/find/communities',
- searchLinkToPublications: '/search/find/publications',
- searchLinkToDataProviders: '/search/find/dataproviders',
- searchLinkToProjects: '/search/find/projects',
- searchLinkToDatasets: '/search/find/datasets',
- searchLinkToSoftware: '/search/find/software',
- searchLinkToOrps: '/search/find/other',
- searchLinkToOrganizations: '/search/find/organizations',
- searchLinkToCompatibleDataProviders: '/search/content-providers',
- searchLinkToEntityRegistriesDataProviders: '/search/entity-registries',
- searchLinkToJournals: '/search/journals',
- searchLinkToResults: '/search/find/research-outcomes',
- searchLinkToAdvancedPublications: '/search/advanced/publications',
- searchLinkToAdvancedProjects: '/search/advanced/projects',
- searchLinkToAdvancedDatasets: '/search/advanced/datasets',
- searchLinkToAdvancedSoftware: '/search/advanced/software',
- searchLinkToAdvancedOrps: '/search/advanced/other',
- searchLinkToAdvancedDataProviders: '/search/advanced/dataproviders',
- searchLinkToAdvancedOrganizations: '/search/advanced/organizations',
- searchLinkToAdvancedResults: '/search/advanced/research-outcomes',
- errorLink: '/error',
- lastIndexInformationLink: 'https://beta.openaire.eu/aggregation-and-content-provision-workflows',
- showLastIndexInformationLink: true,
- bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=",
- widgetLink: 'https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=',
- claimsInformationLink: 'https://beta.openaire.eu/linking',
- depositLearnHowPage: '/participate/deposit/learn-how',
- depositSearchPage: '/participate/deposit/search',
- shareInZenodoPage: '/participate/deposit/zenodo',
- reCaptchaSiteKey: '6LcVtFIUAAAAAB2ac6xYivHxYXKoUvYRPi-6_rLu',
- admins: ['kostis30fylloy@gmail.com'],
- lastIndexUpdate: '2019-11-01',
- indexInfoAPI: 'https://dev-openaire.d4science.org/openaire/info/',
- altMetricsAPIURL: 'https://api.altmetric.com/v1/doi/',
- b2noteAPIURL: 'https://b2note.eudat.eu/',
- adminPortalURL: 'https://beta.admin.connect.openaire.eu',
- myOrcidLinksPage: "/my-orcid-links"
+ baseLink : "",
+
};
+
+
+export let properties: EnvProperties = {
+ ...common, ...commonDev, ...props
+}
diff --git a/src/main.server.ts b/src/main.server.ts
index d8775d6..0930b37 100644
--- a/src/main.server.ts
+++ b/src/main.server.ts
@@ -12,4 +12,4 @@ if (properties.environment !== "development") {
}
export { AppServerModule } from './app/app.server.module';
-export { renderModule } from '@angular/platform-server';
+
diff --git a/src/test.ts b/src/test.ts
index 6b03dbe..ae25f27 100644
--- a/src/test.ts
+++ b/src/test.ts
@@ -7,8 +7,6 @@ import {
platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing';
-declare const require: any;
-
// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
@@ -16,7 +14,3 @@ getTestBed().initTestEnvironment(
teardown: { destroyAfterEach: false }
}
);
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().map(context);
diff --git a/src/tsconfig.server.json b/src/tsconfig.server.json
index 39f85aa..5601502 100644
--- a/src/tsconfig.server.json
+++ b/src/tsconfig.server.json
@@ -2,7 +2,6 @@
"extends": "./tsconfig.app.json",
"compilerOptions": {
"outDir": "../out-tsc/app-server",
- "target": "es2016",
"types": [
"node"
]
diff --git a/tsconfig.json b/tsconfig.json
index fc8b4c1..668d981 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -10,13 +10,14 @@
"moduleResolution": "node",
"experimentalDecorators": true,
"importHelpers": true,
- "target": "es2020",
+ "target": "ES2022",
"typeRoots": [
"node_modules/@types"
],
"lib": [
"es2018",
"dom"
- ]
+ ],
+ "useDefineForClassFields": false
}
}