-
-
-
+
+
+
-
-
+
+
-
-
{{errorMessage}}
-
{{successMessage}}
-
-
{{ loadingMessage }}
-
-
-
{{noSubscriptions}}
+
+
{{errorMessage}}
+
{{successMessage}}
+
-
-
-
- {{ key }}
-
-
-
-
- Topic
- Creation Date
- Last Notification Date
- # of notifications
- Actions
-
-
-
-
-
-
- {{ sub.topic }}
-
-
-
- {{ sub.creationDate | date:'yyyy-MM-dd HH:mm:ss' }}
-
-
- {{ sub.lastNotificationDate | date:'yyyy-MM-dd HH:mm:ss' }}
-
-
- {{ sub.count }}
-
-
-
-
-
-
-
-
+
{{noSubscriptions}}
+
+
+
+
+
+
+
+ {{ key }}
+
+
+
+
+
+
+ Topic
+ Creation Date
+ Last Notification Date
+ # of notifications
+ Actions
+
+
+
+
+
+
+ {{ sub.topic }}
+
+
+
+ {{ sub.creationDate | date:'yyyy-MM-dd HH:mm:ss' }}
+
+
+ {{ sub.lastNotificationDate | date:'yyyy-MM-dd HH:mm:ss' }}
+
+
+ {{ sub.count }}
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
diff --git a/src/app/pages/content/content-notifications.component.ts b/src/app/pages/content/content-notifications.component.ts
index 0f2b54f89..e6db399a1 100755
--- a/src/app/pages/content/content-notifications.component.ts
+++ b/src/app/pages/content/content-notifications.component.ts
@@ -24,6 +24,11 @@ export class ContentNotificationsComponent implements OnInit {
ngOnInit() {
this.getSubscriptions();
+ let body = document.getElementsByTagName('body')[0];
+ body.classList.remove("top_bar_active"); //remove the class
+ body.classList.remove("page_heading_active");
+ body.classList.remove("landing");
+ body.classList.add("dashboard");
}
getSubscriptions() {
diff --git a/src/app/pages/content/content.module.ts b/src/app/pages/content/content.module.ts
index ba8e99ba6..2f5e13596 100755
--- a/src/app/pages/content/content.module.ts
+++ b/src/app/pages/content/content.module.ts
@@ -1,6 +1,4 @@
import { ReusableComponentsModule } from '../../shared/reusablecomponents/reusable-components.module';
-import { ContentEventsOfRepositoryComponent } from './content-events-of-repository.component';
-import { ContentEventsOfRepoEventslistComponent } from './content-events-of-repo-eventslist.component';
import { ReactiveFormsModule } from '@angular/forms';
import { ContentNotificationsOfSubscriptionComponent } from './content-notifications-of-subscription.component';
import { NgModule } from '@angular/core';
@@ -8,7 +6,6 @@ import { CommonModule } from '@angular/common';
import { TabsModule } from 'ngx-bootstrap';
import { ContentRouting } from './content.routing';
import { ContentComponent } from './content.component';
-import { ContentEventsComponent } from './content-events.component';
import { ContentNotificationsComponent } from './content-notifications.component';
@NgModule ({
@@ -21,9 +18,9 @@ import { ContentNotificationsComponent } from './content-notifications.component
],
declarations: [
ContentComponent,
- ContentEventsComponent,
- ContentEventsOfRepositoryComponent,
- ContentEventsOfRepoEventslistComponent,
+ // ContentEventsComponent,
+ // ContentEventsOfRepositoryComponent,
+ // ContentEventsOfRepoEventslistComponent,
ContentNotificationsComponent,
ContentNotificationsOfSubscriptionComponent
]
diff --git a/src/app/pages/content/content.routing.ts b/src/app/pages/content/content.routing.ts
index 181bfad00..98dc74c4f 100755
--- a/src/app/pages/content/content.routing.ts
+++ b/src/app/pages/content/content.routing.ts
@@ -1,10 +1,7 @@
import { RouterModule, Routes } from '@angular/router';
import { NgModule } from '@angular/core';
-import { ContentEventsComponent } from './content-events.component';
import { ContentComponent } from './content.component';
import { ContentNotificationsComponent } from './content-notifications.component';
-import { ContentEventsOfRepositoryComponent } from './content-events-of-repository.component';
-import { ContentEventsOfRepoEventslistComponent } from './content-events-of-repo-eventslist.component';
import { ContentNotificationsOfSubscriptionComponent } from './content-notifications-of-subscription.component';
const contentRoutes: Routes = [
@@ -12,18 +9,18 @@ const contentRoutes: Routes = [
path: '',
component: ContentComponent,
children: [
- {
- path: 'events',
- component: ContentEventsComponent,
- },
- {
- path: 'events/:name',
- component: ContentEventsOfRepositoryComponent,
- },
- {
- path: 'events/:name/:topic',
- component: ContentEventsOfRepoEventslistComponent,
- },
+ // {
+ // path: 'events',
+ // component: ContentEventsComponent,
+ // },
+ // {
+ // path: 'events/:name',
+ // component: ContentEventsOfRepositoryComponent,
+ // },
+ // {
+ // path: 'events/:name/:topic',
+ // component: ContentEventsOfRepoEventslistComponent,
+ // },
{
path: 'notifications',
component: ContentNotificationsComponent,
diff --git a/src/app/pages/dashboard/dashboard.component.html b/src/app/pages/dashboard/dashboard.component.html
deleted file mode 100755
index faf59c735..000000000
--- a/src/app/pages/dashboard/dashboard.component.html
+++ /dev/null
@@ -1,145 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
MY DATASOURCES AT A GLANCE
-
-
-
- Retrieving your datasources...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{repository.repositoryName}}
-
-
-
-
-
Number of records collected:
- {{repository.recordsCollected}}
- not available
-
-
Last indexed version:
- {{repository.lastIndexedVersion | date :'short'}}
- not available
-
-
Content enrichment events:
- {{repository.enrichmentEvents}}
- not available
-
-
Views:
- {{repository.totalViews}}
- not available
-
-
Downloads:
- {{repository.totalDownloads}}
- not available
-
-
-
-
-
-
- No repositories available...
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/app/pages/dashboard/dashboard.component.ts b/src/app/pages/dashboard/dashboard.component.ts
deleted file mode 100755
index 97ce3a46b..000000000
--- a/src/app/pages/dashboard/dashboard.component.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { AuthenticationService } from '../../services/authentication.service';
-import { RepositoryService } from '../../services/repository.service';
-import {Repository, RepositorySnippet, RepositorySummaryInfo} from '../../domain/typeScriptClasses';
-
-@Component ({
- selector: 'app-dashboard',
- templateUrl: 'dashboard.component.html'
-})
-
-export class DashboardComponent implements OnInit {
-
- constructor(private authService: AuthenticationService,
- private repositoryService: RepositoryService) { }
-
- repositories: RepositorySummaryInfo[] = [];
- userEmail: string;
-
- loading: boolean = true;
-
- ngOnInit() {
- // this.getUserEmail();
- this.userEmail = sessionStorage.getItem('email');
- if (this.userEmail) {
- this.getRepositoriesSummaryInfo();
- }
- }
-
- getIsUserLoggedIn() {
- return this.authService.getIsUserLoggedIn();
- }
-
- getUserEmail() {
- this.userEmail = this.authService.getUserEmail();
- }
-
- getRepos() {
- console.log('in getRepos');
- this.getRepositoriesSummaryInfo();
- }
-
- getRepositoriesSummaryInfo() {
- this.repositoryService.getRepositoriesSummaryInfo().subscribe(
- repositories => { this.repositories = repositories; this.loading=false },
- error => { console.log('Errrrror'); this.loading=false },
- () => { console.log(this.repositories); this.loading=false }
- );
- }
-}
diff --git a/src/app/pages/emptypage/empty-page.component.html b/src/app/pages/emptypage/empty-page.component.html
new file mode 100644
index 000000000..c1d269242
--- /dev/null
+++ b/src/app/pages/emptypage/empty-page.component.html
@@ -0,0 +1,5 @@
+
+
+
This is an empty page
+
+
diff --git a/src/app/pages/emptypage/empty-page.component.ts b/src/app/pages/emptypage/empty-page.component.ts
new file mode 100644
index 000000000..3783ea9b0
--- /dev/null
+++ b/src/app/pages/emptypage/empty-page.component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+
+@Component ({
+ selector: 'app-empty-page',
+ templateUrl: './empty-page.component.html',
+})
+
+export class EmptyPageComponent {
+
+ constructor() {}
+}
diff --git a/src/app/pages/join/join.component.html b/src/app/pages/join/join.component.html
new file mode 100644
index 000000000..d50ee0310
--- /dev/null
+++ b/src/app/pages/join/join.component.html
@@ -0,0 +1,172 @@
+
+
+
+
+
{{ loadingMessage }}
+
+
+
+
+
+
+
You have not yet registered any repositories
+
+
+
+
+
+
+
+
Take a look at the Provide Dashboard and functionalities
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Validate
+
+ Interoperable metadata is key for effective content sharing.
+
+ OpenAIRE guidelines are a global standard to expose and share your content. Use our validation service and see how you can apply them.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Register
+
+ Reach a wider audience around the world.
+
+ Register your literature or data repository, OA Journal, CRIS in OpenAIRE and be part of a global interlinked network.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Enrich
+
+ Improve your metadata. Get more connections.
+
+ Our newly released OA Broker service offers a wealth of information on scholarly communication data. Find out what interests you and subscribe to enrich your records.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Usage statistics
+
+ Open research impact empowers Open Science.
+
+ Share usage data via OpenAIRE's global Open Metrics Service. Get the benefit of an aggregated environment to broaden the mechanisms for impact assessment.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/join/join.component.ts b/src/app/pages/join/join.component.ts
new file mode 100644
index 000000000..e3c45fc6d
--- /dev/null
+++ b/src/app/pages/join/join.component.ts
@@ -0,0 +1,56 @@
+import { Component, OnInit } from '@angular/core';
+import { RepositoryService } from "../../services/repository.service";
+import { SharedService } from "../../services/shared.service";
+import { RepositorySnippet } from "../../domain/typeScriptClasses";
+import { Router } from "@angular/router";
+
+@Component ({
+ selector: 'app-join',
+ templateUrl: './join.component.html',
+})
+
+export class JoinComponent implements OnInit {
+
+ repositoriesOfUser: RepositorySnippet[];
+
+ loadingMessage: string;
+
+ constructor(private repositoryService: RepositoryService,
+ private sharedService: SharedService,
+ private router: Router) {
+ }
+
+ ngOnInit() {
+
+ this.loadingMessage = ' ';
+
+ let body = document.getElementsByTagName('body')[0];
+ body.classList.remove("landing");
+ body.classList.add("dashboard");
+
+ if(this.sharedService.getRepositoriesOfUser() && this.sharedService.getRepositoriesOfUser().length>0) {
+ this.repositoriesOfUser = this.sharedService.getRepositoriesOfUser();
+ if(this.repositoriesOfUser.length>0)
+ this.router.navigate([`/repository/${this.repositoriesOfUser[0].id}/dashboard`]);
+ else
+ this.loadingMessage = null;
+ } else {
+ this.getReposOfUser();
+ }
+
+ }
+
+ getReposOfUser(): void {
+ this.repositoryService.getRepositoriesOfUser()
+ .subscribe(
+ repos => {
+ this.repositoriesOfUser = repos;
+ if(this.repositoriesOfUser.length>0)
+ this.router.navigate([`/repository/${this.repositoriesOfUser[0].id}/dashboard`]);
+ else
+ this.loadingMessage = null;
+ },
+ error => { console.log(error); }
+ );
+ }
+}
diff --git a/src/app/pages/landing/about/about.component.html b/src/app/pages/landing/about/about.component.html
new file mode 100644
index 000000000..328c9770f
--- /dev/null
+++ b/src/app/pages/landing/about/about.component.html
@@ -0,0 +1,367 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Capture the essence
+
+
The OpenAIRE Content Provider Dashboard is a one-stop-shop web service where data providers (repository, data archive, journal, aggregator, CRIS system) interact with OpenAIRE. It provides the front-end access to many of OpenAIRE’s backend services.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Validation & Registration
+
+ The OpenAIRE Validator service allows to test your repository’s compatibility with the OpenAIRE Guidelines. If validation succeeds the data source can be registered for regular aggregation and indexing in OpenAIRE. OpenAIRE allows for registration of institutional and thematic repositories registered in OpenDOAR, research data repositories registered in re3data, individual e-Journals, CRIS, aggregators and publishers.
+
+
+ The Validator service includes two main steps to perform the aggregation and indexing of your datasource in OpenAIRE:
+
+
+
+
+
+
+
+
+
+
+
+
+
1st: Validate your datasource
+
Test the compatibility of your repository/journal or aggregator to the OpenAIRE guidelines. If validation
+ succeeds the data source can be registered for regular aggregation and indexing in OpenAIRE.
+
+
+
+
+
+
+
2nd: Register your datasource
+
Register your literature repository, data repository, journal or aggregator in OpenAIRE.
+
Once registered in OpenAIRE, the data source manager are able to use the Provide functionalities to validate their data source compatibility with the OpenAIRE Guidelines, to get notification to enrich their research results with additional or missing metadata, and to track the data source usage activity.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Enrichments
+
Content enrichment is a powerful tool that enables Content providers to enrich research artifacts with additional metadata, through the OpenAIRE Notification Broker Service.
+
Learn more: https://www.openaire.eu/content-enrichment-guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Usage Statistics
+
OpenAIRE’s Usage Statistic service uses the Matomo Open Source Analytics platform (matomo.org) to track usage activity. It collects and analyzes usage data from the network of OpenAIRE data providers and exploits usage metrics like downloads and metadata views.
+
Learn more: https://www.openaire.eu/guides-usage-statistics
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Contact us to help you.
+
Are you looking for more? Get in touch with our team and let us help you.
+
Get in touch
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Capture the essence
+
+
The OpenAIRE Content Provider Dashboard is a one-stop-shop web service where data providers (repository, data archive, journal, aggregator, CRIS system) interact with OpenAIRE. It provides the front-end access to many of OpenAIRE’s backend services.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Validation & Registration
+
+ The OpenAIRE Validator service allows to test your repository’s compatibility with the OpenAIRE Guidelines. If validation succeeds the data source can be registered for regular aggregation and indexing in OpenAIRE. OpenAIRE allows for registration of institutional and thematic repositories registered in OpenDOAR, research data repositories registered in re3data, individual e-Journals, CRIS, aggregators and publishers.
+
+
+ The Validator service includes two main steps to perform the aggregation and indexing of your datasource in OpenAIRE:
+
+
+
+
+
+
+
+
+
+
+
+
+
1st: Validate your datasource
+
Test the compatibility of your repository/journal or aggregator to the OpenAIRE guidelines. If validation
+ succeeds the data source can be registered for regular aggregation and indexing in OpenAIRE.
+
+
+
+
+
+
+
2nd: Register your datasource
+
Register your literature repository, data repository, journal or aggregator in OpenAIRE.
+
Once registered in OpenAIRE, the data source manager are able to use the Provide functionalities to validate their data source compatibility with the OpenAIRE Guidelines, to get notification to enrich their research results with additional or missing metadata, and to track the data source usage activity.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Enrichments
+
Content enrichment is a powerful tool that enables Content providers to enrich research artifacts with additional metadata, through the OpenAIRE Notification Broker Service.
+
Learn more: https://www.openaire.eu/content-enrichment-guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Usage Statistics
+
OpenAIRE’s Usage Statistic service uses the Matomo Open Source Analytics platform (matomo.org) to track usage activity. It collects and analyzes usage data from the network of OpenAIRE data providers and exploits usage metrics like downloads and metadata views.
+
Learn more: https://www.openaire.eu/guides-usage-statistics
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Contact us to help you.
+
Are you looking for more? Get in touch with our team and let us help you.
+
Get in touch
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/landing/about/about.component.ts b/src/app/pages/landing/about/about.component.ts
new file mode 100644
index 000000000..66fd14b87
--- /dev/null
+++ b/src/app/pages/landing/about/about.component.ts
@@ -0,0 +1,38 @@
+import { Component, OnInit } from '@angular/core';
+import { AuthenticationService } from '../../../services/authentication.service';
+import { StatisticsService } from '../../../services/statistics.service';
+import { Router } from '@angular/router';
+
+@Component ({
+ selector: 'app-about',
+ templateUrl: './about.component.html',
+ styleUrls: ['../../../../assets/css/landingpage/theme.css','../../../../assets/css/landingpage/custom.css','../../../../assets/css/landingpage/custom-provide.css'],
+})
+
+export class AboutComponent implements OnInit {
+
+ constructor(private authService: AuthenticationService,
+ private statsService: StatisticsService,
+ private router: Router) { }
+
+ ngOnInit() {
+ let body = document.getElementsByTagName('body')[0];
+ body.classList.remove("dashboard");
+ body.classList.add("landing");
+ }
+
+ login() {
+ this.authService.loginWithState();
+ }
+
+
+ goToPage(pageUrl: string) {
+ if (this.authService.getIsUserLoggedIn()) {
+ this.router.navigate([pageUrl]);
+ } else {
+ this.authService.redirectUrl = pageUrl;
+ this.login();
+ }
+ }
+
+}
diff --git a/src/app/pages/landing/home/home.component.html b/src/app/pages/landing/home/home.component.html
new file mode 100755
index 000000000..179aa948b
--- /dev/null
+++ b/src/app/pages/landing/home/home.component.html
@@ -0,0 +1,933 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Your data is valuable. Get connected. Participate
+
+
+
+ The Provide Dashboard is a one-stop-service where content providers interact
+ with OpenAIRE and become a building block of a global Open Research community. A gateway to the European Open Science Cloud.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
PROVIDE Dashboard brings all your data together
+
+
Get front-end access to many of OpenAIRE’s backend services
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Validate
+
+ Interoperable metadata is key for effective content sharing.
+
+ OpenAIRE guidelines are a global standard to expose and share your content. Use our validation service and see how you can apply them.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Register
+
+ Reach a wider audience around the world.
+
+ Register your literature or data repository, OA Journal, CRIS in OpenAIRE and be part of a global interlinked network.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Enrich
+
+ Improve your metadata. Get more connections.
+
+ Our newly released OA Broker service offers a wealth of information on scholarly communication data. Find out what interests you and subscribe to enrich your records.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Usage statistics
+
+ Open research impact empowers Open Science.
+
+ Share usage data via OpenAIRE's global Open Metrics Service. Get the benefit of an aggregated environment to broaden the mechanisms for impact assessment.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Do numbers make you happy?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ (statisticsNumbers && statisticsNumbers.literature) ? (statisticsNumbers.literature | number) : 'N/A' }}
+
Literature repositories
+
+
+
+
{{ (statisticsNumbers && statisticsNumbers.journal) ? (statisticsNumbers.journal | number) : 'N/A' }}
+
Data repositories
+
+
+
+
{{ (statisticsNumbers && statisticsNumbers.dataRepositories) ? (statisticsNumbers.dataRepositories | number) : 'N/A' }}
+
OA journals
+
+
+
+
{{ (statisticsNumbers && statisticsNumbers.aggregators) ? (statisticsNumbers.aggregators | number) : 'N/A' }}
+
Aggregators
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Follow OpenAIRE Guidelines
+
+
+
+
+
+
+
+
+
+
+
+
Our Data Policies
+
+ Data Acquisition - How we retrieve data, how often, what processes it goes through (aggregating cleaning, transforming, inferring, de-duplicating), what are the quality checks along all data processing stages.
+
+
+ Data usage - Who is able to retrieve our data, what are the licences, what about specific SLAs. https://www.openaire.eu/content-aquisition-policy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
We're here to help you.
+
Do you want more information? Our team is happy to assist you.
+
Get in touch
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Your data is valuable. Get connected. Participate
+
+
+
+ The Provide Dashboard is a one-stop-service where content providers interact
+ with OpenAIRE and become a building block of a global Open Research community. A gateway to the European Open Science Cloud.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
PROVIDE Dashboard brings all your data together
+
+
Get front-end access to many of OpenAIRE’s backend services
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Validate
+
+ Interoperable metadata is key for effective content sharing.
+
+ OpenAIRE guidelines are a global standard to expose and share your content. Use our validation service and see how you can apply them.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Register
+
+ Reach a wider audience around the world.
+
+ Register your literature or data repository, OA Journal, CRIS in OpenAIRE and be part of a global interlinked network.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Enrich
+
+ Improve your metadata. Get more connections.
+
+ Our newly released OA Broker service offers a wealth of information on scholarly communication data. Find out what interests you and subscribe to enrich your records.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Usage statistics
+
+ Open research impact empowers Open Science.
+
+ Share usage data via OpenAIRE's global Open Metrics Service. Get the benefit of an aggregated environment to broaden the mechanisms for impact assessment.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Do numbers make you happy?
+
+
+
+
+
{{ (statisticsNumbers && statisticsNumbers.literature) ? (statisticsNumbers.literature | number) : 'N/A' }}
+
Literature repositories
+
+
+
+
{{ (statisticsNumbers && statisticsNumbers.dataRepositories) ? (statisticsNumbers.dataRepositories | number) : 'N/A' }}
+
Data repositories
+
+
+
+
{{ (statisticsNumbers && statisticsNumbers.journal) ? (statisticsNumbers.journal | number) : 'N/A' }}
+
OA journals
+
+
+
+
{{ (statisticsNumbers && statisticsNumbers.aggregators) ? (statisticsNumbers.aggregators | number) : 'N/A' }}
+
Aggregators
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ (statisticsNumbers && statisticsNumbers.publications) ? (statisticsNumbers.publications | number) : 'N/A' }}
+
+ publications
+
+
+
+
{{ (statisticsNumbers && statisticsNumbers.datasets) ? (statisticsNumbers.datasets | number) : 'N/A' }}
+
+ datasets
+
+
+
+
{{ (statisticsNumbers && statisticsNumbers.software) ? (statisticsNumbers.software | number) : 'N/A' }}
+
+ software
+
+
+
+
{{ (statisticsNumbers && statisticsNumbers.usagestats) ? (statisticsNumbers.usagestats | number) : 'N/A' }}
+
+ metadata exchange events
+
+
+
+
{{ statisticsNumbers ? (statisticsNumbers.lastYearUsagestats.number | number) : 'N/A' }}
+
+ usage statistics views & downloads ({{ statisticsNumbers ? statisticsNumbers.lastYearUsagestats.year : 'N/A' }})
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Follow OpenAIRE Guidelines
+
+
+
+
+
+
+
+
+
+
+
Our Data Policies
+
+ Data Acquisition - How we retrieve data, how often, what processes it goes through (aggregating cleaning, transforming, inferring, de-duplicating), what are the quality checks along all data processing stages.
+
+
+ Data usage - Who is able to retrieve our data, what are the licences, what about specific SLAs. https://www.openaire.eu/content-aquisition-policy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Follow OpenAIRE Guidelines
+
+
+
+
+
+
+
+
+
+
+
Our Data Policies
+
+ Data Acquisition - How we retrieve data, how often, what processes it goes through (aggregating cleaning, transforming, inferring, de-duplicating), what are the quality checks along all data processing stages.
+
+
+ Data usage - Who is able to retrieve our data, what are the licences, what about specific SLAs. https://www.openaire.eu/content-aquisition-policy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
We're here to help you.
+
Do you want more information? Our team is happy to assist you.
+
Get in touch
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/landing/home/home.component.ts b/src/app/pages/landing/home/home.component.ts
new file mode 100755
index 000000000..362cfc866
--- /dev/null
+++ b/src/app/pages/landing/home/home.component.ts
@@ -0,0 +1,61 @@
+import { Component, OnInit } from '@angular/core';
+import { UsageStatsSummary } from '../../../domain/typeScriptClasses';
+import { AuthenticationService } from '../../../services/authentication.service';
+import { StatisticsService } from '../../../services/statistics.service';
+import { Router } from '@angular/router';
+
+@Component ({
+ selector: 'app-landing',
+ templateUrl: './home.component.html',
+ styleUrls: ['../../../../assets/css/landingpage/theme.css','../../../../assets/css/landingpage/custom.css','../../../../assets/css/landingpage/custom-provide.css'],
+})
+
+export class HomeComponent implements OnInit {
+
+ statisticsNumbers: UsageStatsSummary;
+ inBeta: boolean;
+
+
+ constructor(private authService: AuthenticationService,
+ private statsService: StatisticsService,
+ private router: Router) { }
+
+ ngOnInit() {
+ this.getStatisticsNumbers();
+
+ const baseUrl = window.location.origin;
+ this.inBeta = ( baseUrl.includes('beta') || baseUrl.includes('athenarc') );
+
+ let body = document.getElementsByTagName('body')[0];
+ body.classList.remove("dashboard");
+ body.classList.add("landing");
+ }
+
+
+ login() {
+ this.authService.loginWithState();
+ }
+
+ getStatisticsNumbers() {
+ this.statsService.getStatisticsNumbers().subscribe(
+ res => {
+ this.statisticsNumbers = res;
+ // this.statisticsNumbers.lastYearUsagestats = JSON.parse(res['lastYearUsagestats'].toString());
+ },
+ error => console.log(error),
+ () => {
+ console.log('statisticsNumbers is', JSON.stringify(this.statisticsNumbers));
+ }
+ );
+ }
+
+ goToPage(pageUrl: string) {
+ if (this.authService.getIsUserLoggedIn()) {
+ this.router.navigate([pageUrl]);
+ } else {
+ this.authService.redirectUrl = pageUrl;
+ this.login();
+ }
+ }
+
+}
diff --git a/src/app/pages/landing/landing.component.html b/src/app/pages/landing/landing.component.html
deleted file mode 100755
index de69fe0e8..000000000
--- a/src/app/pages/landing/landing.component.html
+++ /dev/null
@@ -1,294 +0,0 @@
-
-
-
-
-
-
-
-
-
-
Content Provider Dashboard
-
A one-stop-shop for sharing, finding and enriching your content
-
Start here
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Validate
-
-
-
Interoperable metadata is key for effective content sharing.
-
Use our validation service and see how you can apply the OpenAIRE Guidelines to expose your content using global standards.
-
-
-
-
-
-
-
-
Register
-
-
Reach a wider audience around the world
-
Register your literature or data repository, OA Journal, CRIS in OpenAIRE and be part of a global interlinked network. Start now!
-
-
-
-
-
-
-
-
Enrich
-
-
Improve your metadata. Get more connections
-
Our newly released OA Broker service offers a wealth of information on scholarly communication data. Find out what interests you and subscribe to enrich your records. Learn more!
-
-
-
-
-
-
-
-
Measure
-
-
Open research impact empowers Open Science
-
Participate in the Open Metrics service by sharing your usage data. Get the benefit of an aggregated environment to broaden the mechanisms for impact assesment. Learn more!
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Have more questions?
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Our community
-
-
-
-
-
-
-
- {{ (statisticsNumbers && statisticsNumbers.literature) ? (statisticsNumbers.literature | number) : 'N/A' }} literature repositories
-
-
- {{ (statisticsNumbers && statisticsNumbers.journal) ? (statisticsNumbers.journal | number) : 'N/A' }} OA Journals
-
-
-
-
- {{ (statisticsNumbers && statisticsNumbers.dataRepositories) ? (statisticsNumbers.dataRepositories | number) : 'N/A' }} data repositories
-
-
- {{ (statisticsNumbers && statisticsNumbers.aggregators) ? (statisticsNumbers.aggregators | number) : 'N/A' }} aggregators
-
-
-
-
-
-
-
-
-
- {{ (statisticsNumbers && statisticsNumbers.publications) ? (statisticsNumbers.publications | number) : 'N/A' }}
- publications
-
-
- {{ (statisticsNumbers && statisticsNumbers.datasets) ? (statisticsNumbers.datasets | number) : 'N/A' }}
- datasets
-
-
- {{ (statisticsNumbers && statisticsNumbers.software) ? (statisticsNumbers.software | number) : 'N/A' }}
- software
-
-
-
-
- {{ statisticsNumbers ? (statisticsNumbers.lastYearUsagestats.number | number) : 'N/A' }}
- usage events
- ({{ statisticsNumbers ? statisticsNumbers.lastYearUsagestats.year : 'N/A' }})
-
-
-
- {{ (statisticsNumbers && statisticsNumbers.usagestats) ? statisticsNumbers.usagestats : 'N/A' }}
-
- metadata exchange events
-
-
-
-
-
-
-
-
-
-
-
- Our data policies
-
-
-
-
-
- Data acquisition
-
- How we retrieve data, how often, what processes it goes through (aggregating cleaning, transforming, inferring, de-duplicating), what are the quality checks along all data processing stages.
-
-
-
- Data usage
-
- Who is able to retrieve our data, what are the licences, what about specific SLAs.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/app/pages/landing/landing.component.ts b/src/app/pages/landing/landing.component.ts
deleted file mode 100755
index 2e3214cd5..000000000
--- a/src/app/pages/landing/landing.component.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { UsageStatsSummary } from '../../domain/typeScriptClasses';
-import { AuthenticationService } from '../../services/authentication.service';
-import { StatisticsService } from '../../services/statistics.service';
-import { Router } from '@angular/router';
-
-@Component ({
- selector: 'app-landing',
- templateUrl: './landing.component.html'
-})
-
-export class LandingComponent implements OnInit {
-
- statisticsNumbers: UsageStatsSummary;
- inBeta: boolean;
-
-
- constructor(private authService: AuthenticationService,
- private statsService: StatisticsService,
- private router: Router) { }
-
- ngOnInit() {
- this.getStatisticsNumbers();
-
- const baseUrl = window.location.origin;
- this.inBeta = ( baseUrl.includes('beta') || baseUrl.includes('athenarc') );
- }
-
-
- login() {
- this.authService.loginWithState();
- }
-
- getStatisticsNumbers() {
- this.statsService.getStatisticsNumbers().subscribe(
- res => {
- this.statisticsNumbers = res;
- // this.statisticsNumbers.lastYearUsagestats = JSON.parse(res['lastYearUsagestats'].toString());
- },
- error => console.log(error),
- () => {
- console.log('statisticsNumbers is', JSON.stringify(this.statisticsNumbers));
- }
- );
- }
-
- goToPage(pageUrl: string) {
- if (this.authService.getIsUserLoggedIn()) {
- this.router.navigate([pageUrl]);
- } else {
- this.authService.redirectUrl = pageUrl;
- this.login();
- }
- }
-
-}
diff --git a/src/app/pages/metrics/metrics-enable.component.html b/src/app/pages/metrics/metrics-enable.component.html
deleted file mode 100755
index 04619799c..000000000
--- a/src/app/pages/metrics/metrics-enable.component.html
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-
-
-
-
-
-
Metrics
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{ successMessage }}
-
{{ errorMessage }}
-
-
- {{ loadingMessage }}
-
-
-
-
-
-
You don't have metrics enabled for this repository yet. Would you like to enable them?
-
-
Once you select to enable metrics for your repository, the following steps need to be performed:
-
On your side
-
On the OpenAIRE's side
-
-
Enable Metrics
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Are you sure you want to enable metrics for this repository?
-
diff --git a/src/app/pages/metrics/metrics-enable.component.ts b/src/app/pages/metrics/metrics-enable.component.ts
deleted file mode 100755
index 35abaf32a..000000000
--- a/src/app/pages/metrics/metrics-enable.component.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ConfirmationDialogComponent } from '../../shared/reusablecomponents/confirmation-dialog.component';
-import { PiwikService } from '../../services/piwik.service';
-import { RepositoryService } from '../../services/repository.service';
-import { PiwikInfo, Repository } from '../../domain/typeScriptClasses';
-import { enabledMetricsError, enabledMetricsSuccess, enablingMetrics,
- loadingRepoError, loadingRepoMessage } from '../../domain/shared-messages';
-import { AuthenticationService } from '../../services/authentication.service';
-
-@Component ({
- selector: 'metrics-enable',
- templateUrl: 'metrics-enable.component.html'
-})
-
-export class MetricsEnableComponent implements OnInit {
- successMessage: string;
- errorMessage: string;
- loadingMessage: string;
-
- readonly analyticsUrl = 'https://analytics.openaire.eu/addsite.php?';
- readonly authenticationToken = '32846584f571be9b57488bf4088f30ea'; /* THE ACTUAL TOKEN WILL BE NEEDED EVENTUALLY!! */
- repo: Repository;
- oaId: string;
-
- modalTitle = 'Confirmation';
- modalButton = 'Yes, enable it';
- isModalShown: boolean;
-
- @ViewChild('confirmEnablingModal')
- public confirmEnablingModal: ConfirmationDialogComponent;
-
-
- constructor (
- private route: ActivatedRoute,
- private router: Router,
- private authService: AuthenticationService,
- private piwikService: PiwikService,
- private repoService: RepositoryService
- ) {}
-
- ngOnInit() {
- this.getRepo();
- this.isModalShown = false;
- }
-
- getRepo(): void {
- const id = this.route.snapshot.paramMap.get('id');
- this.loadingMessage = loadingRepoMessage;
- this.repoService.getRepositoryById(id).subscribe(
- repo => {
- this.repo = repo;
- },
- error => {
- console.log(error);
- this.errorMessage = loadingRepoError;
- this.loadingMessage = '';
- }, () => {
- if (this.repo) {
- this.getOAid();
- }
- this.loadingMessage = '';
- }
- );
- }
-
- getOAid () {
- this.piwikService.getOpenaireId(this.repo.id).subscribe(
- id => {
- this.oaId = id;
- console.log(`getOpenaireId responded: ${this.oaId}`);
- },
- error => console.log(`ERROR is ${error}`)
- );
- }
-
- confirmEnabling() {
- if (this.repo) {
- this.confirmEnablingModal.showModal();
- }
- }
-
- confirmedEnabling(event: any) {
- if (this.repo) {
- this.loadingMessage = enablingMetrics;
- const piwik: PiwikInfo = {
- repositoryId: this.repo.id,
- openaireId: this.oaId,
- repositoryName: this.repo.officialName,
- country: this.repo.countryName,
- siteId: '',
- authenticationToken: this.authenticationToken,
- creationDate: null,
- requestorName: this.authService.getUserName(),
- requestorEmail: this.authService.getUserEmail(),
- validated: false,
- validationDate: null,
- comment: ''
- };
-
- this.piwikService.enableMetricsForRepository(this.repo.officialName, this.repo.websiteUrl, piwik).subscribe(
- response => {
- console.log(`enableMetrics answered: ${response}`);
- this.successMessage = enabledMetricsSuccess;
- this.loadingMessage = '';
- },
- error => {
- console.log(error);
- this.errorMessage = enabledMetricsError;
- this.loadingMessage = '';
- },
- () => {
- this.router.navigate([`/getImpact/instructions/${this.repo.id}`]);
- }
- );
- }
- }
-}
diff --git a/src/app/pages/metrics/metrics-instructions.component.html b/src/app/pages/metrics/metrics-instructions.component.html
deleted file mode 100755
index cd03c8322..000000000
--- a/src/app/pages/metrics/metrics-instructions.component.html
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
-
-
-
-
-
-
-
Metrics Configuration & Software Details
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{ errorMessage }}
-
-
- {{ loadingMessage }}
-
-
-
-
-
- OpenAIRE’s usage statistic service uses the Matomo Open Source Analytics platform (matomo.org) to track usage activity. When metrics
- are enabled for a repository, two unique identifiers are generated - a matomo-ID that associates the repository with its usage events in Matomo
- and an authentication-ID that allows to track usage activity on the Matomo platform. Metadata views and item downloads are tracked and automatically sent to Matomo. Statistics are generated using the COUNTER Code of practice directives.
-
-
- OpenAIRE's usage statistics service tracking code exploits Matomo’s API. In order to make the tracking of usage events from repositories more robust, it was necessary to implement repository platform specific patches and plugins starting with DSpace and EPrints. The code is maintained on Github:
-
-
-
- To configure your repository to allow tracking in Matomo platform, please change the configuration files with the following parameters and values, generated for your site:
-
-
- MatomoID
- {{ piwik.siteId }}
- AuthenticationToken
- {{ piwik.authenticationToken }}
-
-
- Details for the configuration files are given in the README of the tracking code.
-
-
- NOTE
- - You will be informed by e-mail that the installation of the tracking code has been validated and when the usage statistics will be available.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/app/pages/metrics/metrics-instructions.component.ts b/src/app/pages/metrics/metrics-instructions.component.ts
deleted file mode 100755
index 06295b20d..000000000
--- a/src/app/pages/metrics/metrics-instructions.component.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Created by myrto on 11/24/17.
- */
-import { Component, OnInit } from '@angular/core';
-import { PiwikInfo } from '../../domain/typeScriptClasses';
-import { ActivatedRoute, Router } from '@angular/router';
-import { PiwikService } from '../../services/piwik.service';
-import { AuthenticationService } from '../../services/authentication.service';
-import { loadingUserRepoInfoError } from '../../domain/shared-messages';
-
-@Component ({
- selector: 'app-metrics-instructions',
- templateUrl: 'metrics-instructions.component.html'
-})
-
-export class MetricsInstructionsComponent implements OnInit {
- piwik: PiwikInfo;
- errorMessage: string;
- loadingMessage: string;
-
- constructor(
- private route: ActivatedRoute,
- private router: Router,
- private piwikService: PiwikService,
- private authService: AuthenticationService) {}
-
- ngOnInit() {
- this.getPiwik();
- }
-
- getPiwik(): void {
- this.loadingMessage = 'Retrieving instructions ...';
- const id = this.route.snapshot.paramMap.get('id');
- this.piwikService.getPiwikInfo(id).subscribe(
- piwik => this.piwik = piwik,
- error => {
- console.log(error);
- this.loadingMessage = '';
- this.errorMessage = loadingUserRepoInfoError;
- },
- () => {
- this.loadingMessage = '';
- }
- );
- }
-
-}
diff --git a/src/app/pages/metrics/metrics-show.component.html b/src/app/pages/metrics/metrics-show.component.html
deleted file mode 100755
index 588938dda..000000000
--- a/src/app/pages/metrics/metrics-show.component.html
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
-
-
-
-
-
-
-
{{ piwik ? piwik.repositoryName : 'Metrics'}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{ errorMessage }}
-
-
- {{ loadingMessage }}
-
-
-
-
-
-
-
-
-
-
-
-
{{ pageViews }}
-
views in OpenAIRE
-
-
-
-
-
{{ totalViews }}
- ( {{ repoMetrics.metricsNumbers.total_openaire_views }} from OpenAIRE )
-
-
views in local repository
-
-
-
-
-
{{ totalDownloads }}
- ( {{ repoMetrics.metricsNumbers.total_openaire_downloads }} from OpenAIRE )
-
downloads in local repository
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/app/pages/metrics/metrics-show.component.ts b/src/app/pages/metrics/metrics-show.component.ts
deleted file mode 100755
index ed3ab8a91..000000000
--- a/src/app/pages/metrics/metrics-show.component.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { MetricsInfo, PiwikInfo } from '../../domain/typeScriptClasses';
-import { PiwikService } from '../../services/piwik.service';
-import { RepositoryService } from '../../services/repository.service';
-import { loadingMetrics, loadingMetricsError } from '../../domain/shared-messages';
-import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
-import { AuthenticationService } from '../../services/authentication.service';
-
-@Component ({
- selector: 'metrics-show',
- templateUrl: 'metrics-show.component.html'
-})
-
-export class MetricsShowComponent implements OnInit {
- errorMessage: string;
- loadingMessage: string;
-
- repoId: string;
- piwik: PiwikInfo;
- repoMetrics: MetricsInfo;
- pageViews = '--';
- totalViews = '--';
- totalDownloads = '--';
- viewsUrl: SafeResourceUrl;
- downloadsUrl: SafeResourceUrl;
-
- constructor(
- private route: ActivatedRoute,
- private router: Router,
- private sanitizer: DomSanitizer,
- private piwikService: PiwikService,
- private repoService: RepositoryService,
- private authService: AuthenticationService) {}
-
- ngOnInit() {
- this.repoId = this.route.snapshot.paramMap.get('id');
- this.getPiwik();
- }
-
-
- getPiwik() {
- this.loadingMessage = loadingMetrics;
- this.piwikService.getPiwikInfo(this.repoId).subscribe(
- piwik => this.piwik = piwik,
- error => {
- this.loadingMessage = '';
- this.errorMessage = loadingMetricsError;
- console.log(error);
- },
- () => {
- this.loadingMessage = '';
- this.errorMessage = '';
- this.getMetrics();
- }
- );
- }
-
- getMetrics() {
- this.loadingMessage = loadingMetrics;
- this.repoService.getMetricsInfoForRepository(this.repoId).subscribe(
- metrics => {
- this.repoMetrics = metrics;
- if (this.repoMetrics.metricsNumbers.pageviews) {
- this.pageViews = this.repoMetrics.metricsNumbers.pageviews;
- }
- if (this.repoMetrics.metricsNumbers.total_views) {
- this.totalViews = this.repoMetrics.metricsNumbers.total_views;
- }
- if (this.repoMetrics.metricsNumbers.total_downloads) {
- this.totalDownloads = this.repoMetrics.metricsNumbers.total_downloads;
- }
- this.getViewsUrl();
- this.getDownloadsUrl();
- },
- error => {
- this.loadingMessage = '';
- this.errorMessage = loadingMetricsError;
- console.log(error);
- },
- () => {
- this.loadingMessage = '';
- this.errorMessage = '';
- }
- );
- }
-
-
- getViewsUrl () {
- this.viewsUrl = this.sanitizer.bypassSecurityTrustResourceUrl(
- `${this.repoMetrics.diagramsBaseURL}merge.php?com=query
- &data=[{"query":"dtsrcRepoViews","dtsrcName":"${this.piwik.openaireId}",
- "table":"","fields":[{"fld":"sum","agg":"sum","type":"chart","yaxis":1,"c":false}],
- "xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,
- "sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"",
- "xaxistitle":"","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[]}]
- &info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]
- &style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},
- {"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)
- &colors[]=rgba(124,181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125,1)
- &colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233,1)&colors[]=rgba(241, 92, 128, 1)
- &colors[]=rgba(228, 211, 84,1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91,1)
- &colors[]=rgba(145, 232, 225,1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false`
- );
- }
-
- getDownloadsUrl () {
- this.downloadsUrl = this.sanitizer.bypassSecurityTrustResourceUrl(
- `${this.repoMetrics.diagramsBaseURL}merge.php?com=query
- &data=[{"query":"dtsrcRepoDownloads","dtsrcName":"${this.piwik.openaireId}",
- "table":"","fields":[{"fld":"sum","agg":"sum","type":"chart","yaxis":1,"c":false}],
- "xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,
- "sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"",
- "xaxistitle":"","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[]}]
- &info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]
- &style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0,1)","size":"18"},
- {"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)
- &colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125,1)
- &colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233,1)&colors[]=rgba(241, 92, 128, 1)
- &colors[]=rgba(228, 211, 84,1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91,1)
- &colors[]=rgba(145, 232, 225,1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false`
- );
- }
-
-}
diff --git a/src/app/pages/metrics/metrics-usagestats-report-results.component.html b/src/app/pages/metrics/metrics-usagestats-report-results.component.html
deleted file mode 100755
index 7a1aea071..000000000
--- a/src/app/pages/metrics/metrics-usagestats-report-results.component.html
+++ /dev/null
@@ -1,229 +0,0 @@
-
-
-
-
-
-
-
-
-
-
Get usage statistics report
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{errorMessage}}
-
-
- {{ loadingMessage }}
-
-
-
-
-
{{ repoResponse.ReportDefinition['@Name'] }} Report Results
- for {{ repoResponse.Report.Report.Customer.ReportItems[0].ItemPlatform }}
-
-
-
-
- Period covered
- {{ coveredPeriod }}
-
-
- Filters
-
-
-
-
-
-
- Date run
- {{ repoResponse.Report.Report['@Created'] | date: "yyyy-MM-dd HH:mm:ss" }}
-
-
- Number of results
- {{ repoResponse.ReportDefinition.Filters.ReportAttribute[1].Value }}
-
-
-
-
-
-
-
Results per page:
-
-
- 10
- 25
- 50
- 100
-
-
-
-
-
-
-
-
-
-
page {{ (totalPages > 0) ? page+1 : 0 }} of {{ totalPages }}
-
-
-
-
-
-
-
-
-
-
page {{ (totalPages > 0) ? page+1 : 0 }} of {{ totalPages }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/app/pages/metrics/metrics-usagestats-report-results.component.ts b/src/app/pages/metrics/metrics-usagestats-report-results.component.ts
deleted file mode 100755
index b2132ff03..000000000
--- a/src/app/pages/metrics/metrics-usagestats-report-results.component.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { AuthenticationService } from '../../services/authentication.service';
-import { UsagestatsService } from '../../services/usagestats.service';
-import { ReportResponse } from '../../domain/usageStatsClasses';
-import { FormBuilder, FormGroup } from '@angular/forms';
-
-@Component({
- selector: 'metrics-usagestats-report-results',
- templateUrl: 'metrics-usagestats-report-results.component.html',
- styleUrls: ['metrics-usagestats-report-results.component.css']
-})
-export class MetricsUsagestatsReportResultsComponent implements OnInit {
-
- loadingMessage: string;
- errorMessage: string;
- infoMessage: string;
-
- repoResponse: ReportResponse;
- coveredPeriod: string;
- params: URLSearchParams;
- page: number;
- pageSize: number;
- totalPages: number;
- selectedItemIndex: number;
-
- pageSizeSelect: FormGroup;
- chosenReport: string;
-
- constructor(private route: ActivatedRoute,
- private authService: AuthenticationService,
- private usageService: UsagestatsService,
- private fb: FormBuilder) {}
-
- ngOnInit() {
- this.page = 0;
- this.pageSize = 10;
- this.readParams();
- this.pageSizeSelect = this.fb.group({selectPageSize: ['']});
- }
-
- readParams() {
- this.params = new URLSearchParams();
-
- this.route.queryParams.subscribe( qparams => {
- this.params.append('Report', qparams['report']);
- this.params.append('Release', '4');
- this.params.append('RequestorID', this.authService.getUserEmail());
- this.params.append('BeginDate', qparams['beginDate']);
- this.params.append('EndDate', qparams['endDate']);
- this.params.append('RepositoryIdentifier', qparams['repoId']);
- this.params.append('ItemIdentifier', qparams['itemIdentifier']);
- this.params.append('ItemDataType', qparams['itemIdentifier']);
- this.params.append('Granularity', qparams['granularity']);
- });
-
- this.chosenReport = this.params.get('Report');
- this.getReportResponse();
- }
-
- getReportResponse() {
- this.errorMessage = '';
- this.loadingMessage = 'Loading results...';
- this.infoMessage = '';
- this.selectedItemIndex = null;
- this.repoResponse = null;
-
- this.usageService.getReportResponse(this.page.toString(), this.pageSize.toString(), this.params).subscribe(
- responseWrapper => {
- this.repoResponse = responseWrapper.ReportResponse;
- },
- error => {
- this.errorMessage = 'Failed to load the report results!';
- this.loadingMessage = '';
- },
- () => {
- this.errorMessage = '';
- this.loadingMessage = '';
-
- this.pageSizeSelect.get('selectPageSize').setValue(this.pageSize);
- this.pageSizeSelect.get('selectPageSize').updateValueAndValidity();
-
- this.totalPages = Math.ceil(
- +this.repoResponse.ReportDefinition.Filters
- .ReportAttribute.filter(x => x['Name'] === 'ReportItemCount')[0].Value / this.pageSize);
- if ( this.totalPages === 0 ) {
- this.infoMessage = 'No results were found';
- }
-
- if (this.repoResponse.ReportDefinition && this.repoResponse.ReportDefinition.Filters &&
- this.repoResponse.ReportDefinition.Filters.ReportAttribute) {
-
- if (this.repoResponse.Report && this.repoResponse.ReportDefinition.Filters.UsageDateRange &&
- this.repoResponse.ReportDefinition.Filters.UsageDateRange.Begin &&
- this.repoResponse.ReportDefinition.Filters.UsageDateRange.End) {
- this.coveredPeriod = this.repoResponse.ReportDefinition.Filters.UsageDateRange.Begin + ' to ';
- this.coveredPeriod = this.coveredPeriod + this.repoResponse.ReportDefinition.Filters.UsageDateRange.End;
- } else {
- const defaultDatePeriod = this.repoResponse.Exception.filter(x => x['Message'] === 'Unspecified Date Arguments');
-
- this.coveredPeriod = defaultDatePeriod[0].Data.split(':')[1].trim() + ' to ';
- this.coveredPeriod = this.coveredPeriod + defaultDatePeriod[1].Data.split(':')[1].trim() + ' (default)';
- }
-
- } else {
- this.repoResponse = null;
- }
- }
- );
-
- }
-
-
- getPageSize() {
- this.pageSize = +(this.pageSizeSelect.get('selectPageSize').value);
- this.page = 0;
- this.getReportResponse();
- }
-
- goToNextPage() {
- if ( (this.page + 1) < this.totalPages) {
- this.page++;
- console.log(`Get me page ${this.page}!`);
- this.getReportResponse();
- }
- }
-
- goToPreviousPage() {
- if (this.page > 0) {
- this.page--;
- console.log(`Get me page ${this.page}!`);
- this.getReportResponse();
- }
- }
-
- displayItemPerformance(i: number) {
- if (this.selectedItemIndex === i) {
- this.selectedItemIndex = null;
- } else {
- this.selectedItemIndex = i;
- }
- }
-
- transformItem(itemIdentifiers: any[]) {
- let field: string;
- if (this.chosenReport === 'RR1') {
- field = 'URL';
- } else {
- field = 'URLs';
- }
- const i = itemIdentifiers.findIndex(x => x['Type'] === field);
- if ( i > -1 ) {
- const urls = itemIdentifiers[i]['Value'];
- return urls.split(';');
- }
- return '';
- }
-
-}
diff --git a/src/app/pages/metrics/metrics-usagestats-report.component.html b/src/app/pages/metrics/metrics-usagestats-report.component.html
deleted file mode 100755
index 57e6d7bea..000000000
--- a/src/app/pages/metrics/metrics-usagestats-report.component.html
+++ /dev/null
@@ -1,210 +0,0 @@
-
-
-
-
-
-
-
-
-
-
{{ title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{errorMessage}}
-
-
- {{ loadingMessage }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/app/pages/metrics/metrics-usagestats-report.component.ts b/src/app/pages/metrics/metrics-usagestats-report.component.ts
deleted file mode 100755
index cd84ea580..000000000
--- a/src/app/pages/metrics/metrics-usagestats-report.component.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { Repository } from '../../domain/typeScriptClasses';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RepositoryService } from '../../services/repository.service';
-import { AuthenticationService } from '../../services/authentication.service';
-import { loadingRepoMessage } from '../../domain/shared-messages';
-
-@Component({
- selector: 'metrics-usagestats-report',
- templateUrl: './metrics-usagestats-report.component.html'
-})
-
-export class MetricsUsagestatsReportComponent implements OnInit {
-
- errorMessage: string;
- loadingMessage: string;
- title: string;
-
- repo: Repository;
- repoId: string;
- shownRepoId: string;
- shownOpenaireId: string;
- useCurrentRepo: boolean;
- issnToShow = '';
- chosen_report: string;
-
- userEmail: string;
- beginDate = '';
- endDate = '';
- itemIdentifier = '';
- itemDataType = '';
- granularity = 'Monthly';
-
- constructor(private repoService: RepositoryService,
- private route: ActivatedRoute,
- private router: Router,
- private authService: AuthenticationService) {}
-
- ngOnInit() {
- this.getParams();
- this.getUserEmail();
- this.getRepo();
- }
-
- getParams() {
- this.repoId = this.route.snapshot.paramMap.get('id');
- this.chosen_report = this.route.snapshot.paramMap.get('reportID');
- this.shownRepoId = this.convertToDisplayedFormat(this.repoId);
- console.log(`shownRepoId is ${this.repoId}`);
- this.title = `${this.chosen_report} report`;
- if (this.chosen_report !== 'RR1') {
- this.useCurrentRepo = true;
- }
- }
-
- convertToDisplayedFormat(input: string) {
- const tempArray = this.repoId.split('____::');
- return tempArray[0] + ':' + tempArray[1];
- }
-
- getUserEmail() {
- this.userEmail = this.authService.getUserEmail();
- }
-
- getRepo() {
- this.loadingMessage = loadingRepoMessage;
- this.repoService.getRepositoryById(this.repoId).subscribe(
- repo => this.repo = repo,
- error => {
- console.log(error);
- this.loadingMessage = '';
- this.errorMessage = 'The repository could not be retrieved';
- },
- () => {
- this.loadingMessage = '';
- if (this.repo.piwikInfo) {
- this.shownOpenaireId = this.convertToDisplayedFormat(this.repo.piwikInfo.openaireId);
- }
- if (this.repo.issn && this.repo.issn !== 'null') {
- this.shownRepoId = this.repo.issn.slice(0, 4) + '-' + this.repo.issn.toString().slice(4);
- }
- this.title = `${this.chosen_report} report for ${this.repo.officialName}`;
- }
- );
- }
-
- updateBeginDate(event: any) {
- this.beginDate = event.target.value;
- }
-
- updateEndDate(event: any) {
- this.endDate = event.target.value;
- }
-
- updateItemDataType(event: any) {
- this.itemDataType = event.target.value;
- }
-
- updateItemIdentifier(event: any) {
- this.itemIdentifier = event.target.value;
- }
-
- updateGranularity(event: any) {
- this.granularity = event.target.value;
- }
-
- updateUseCurrentRepo(event: any) {
- this.useCurrentRepo = event.target.value;
- }
-
- goToReport() {
- if (!this.useCurrentRepo) { this.shownRepoId = ''; }
- this.router.navigate(['/getImpact/usagestats-report-results'], {
- queryParams: {
- report: this.chosen_report,
- beginDate: this.beginDate,
- endDate: this.endDate,
- repoId: this.shownRepoId,
- itemDataType: this.itemDataType,
- itemIdentifier: this.itemIdentifier,
- granularity: this.granularity
- }
- });
-
- /*const params = new URLSearchParams();
-
- params.append('Report', this.chosen_report);
- params.append('Release', '4');
- params.append('RequestorID', this.authService.getUserEmail());
- params.append('BeginDate', this.beginDate);
- params.append('EndDate', this.endDate);
- params.append('RepositoryIdentifier', this.shownRepoId);
- if (this.itemIdentifier) {
- params.append('ItemIdentifier', this.itemIdentifier);
- }
- if (this.itemDataType) {
- params.append('ItemDataType', this.itemDataType);
- }
- params.append('Pretty', 'Pretty');
-
- let url = `http://beta.services.openaire.eu/usagestats/sushilite/GetReport/?${params}`;
- console.log(`going to: ${url}`);
-
- window.location.href = url;*/
- }
-
-}
diff --git a/src/app/pages/metrics/metrics-usagestats.component.html b/src/app/pages/metrics/metrics-usagestats.component.html
deleted file mode 100755
index fc2ca0eaf..000000000
--- a/src/app/pages/metrics/metrics-usagestats.component.html
+++ /dev/null
@@ -1,136 +0,0 @@
-
-
-
-
-
-
-
-
-
-
{{ title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{ errorMessage }}
-
-
Supported Reports
-
-
-
-
-
-
-
-
- Article Report 1, number of successful article download requests by month and repository.
-
-
-
-
-
-
-
-
-
-
- Item Report 1, number of successful item download requests by month and repository.
-
-
-
-
-
-
-
-
-
-
- Repository Report 1, number of successful item downloads for all repositories participating in the usage statistics service.
-
-
-
-
-
-
-
-
-
-
- Journal Report 1, number of successful full-text article requests by month and journal.
-
-
-
-
-
-
-
-
-
-
- Book Report 1, number of successful title requests by month and title.
-
-
-
-
-
-
-
-
-
-
- Book Report 2, number of successful section requests by month and title.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/app/pages/metrics/metrics-usagestats.component.ts b/src/app/pages/metrics/metrics-usagestats.component.ts
deleted file mode 100755
index 672d0e75b..000000000
--- a/src/app/pages/metrics/metrics-usagestats.component.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { Repository } from '../../domain/typeScriptClasses';
-import { RepositoryService } from '../../services/repository.service';
-import { AuthenticationService } from '../../services/authentication.service';
-import { ActivatedRoute, Router } from '@angular/router';
-
-@Component({
- selector: 'metrics-usagestats',
- templateUrl: 'metrics-usagestats.component.html'
-})
-
-export class MetricsUsagestatsComponent implements OnInit {
-
- errorMessage: string;
- title = 'Get usage statistics report';
-
- repo: Repository;
- repoId: string;
-
- constructor(private repoService: RepositoryService,
- private authService: AuthenticationService,
- private route: ActivatedRoute,
- private router: Router) {}
-
- ngOnInit() {
- this.getRepo();
- }
-
- getRepo() {
- this.repoId = this.route.snapshot.paramMap.get('id');
-
- if (this.repoId) {
- this.repoService.getRepositoryById(this.repoId).subscribe(
- repo => this.repo = repo,
- error => {
- console.log(error);
- this.errorMessage = 'The repository could not be retrieved';
- },
- () => {
- this.title = this.title + ' for ' + this.repo.officialName;
- console.log(this.authService.getUserEmail(), this.repo.registeredBy);
- }
- );
- }
- }
-
-}
diff --git a/src/app/pages/metrics/metrics.component.html b/src/app/pages/metrics/metrics.component.html
deleted file mode 100755
index 6dc189866..000000000
--- a/src/app/pages/metrics/metrics.component.html
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
-
-
-
-
-
-
Metrics
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/app/pages/metrics/metrics.component.ts b/src/app/pages/metrics/metrics.component.ts
deleted file mode 100755
index 0dd32f495..000000000
--- a/src/app/pages/metrics/metrics.component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Created by myrto on 11/27/17.
- */
-import { Component, OnInit } from '@angular/core';
-
-@Component ({
- selector: 'app-metrics',
- templateUrl: 'metrics.component.html'
-})
-
-export class MetricsComponent implements OnInit {
-
- constructor() {}
-
- ngOnInit() { }
-
-}
diff --git a/src/app/pages/metrics/metrics.module.ts b/src/app/pages/metrics/metrics.module.ts
deleted file mode 100755
index 2f9ace74c..000000000
--- a/src/app/pages/metrics/metrics.module.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Created by myrto on 11/27/17.
- */
-import { NgModule } from '@angular/core';
-import { TabsModule } from 'ngx-bootstrap';
-import { CommonModule } from '@angular/common';
-import { MetricsRouting } from './metrics.routing';
-import { ReusableComponentsModule } from '../../shared/reusablecomponents/reusable-components.module';
-import { ReactiveFormsModule } from '@angular/forms';
-import { MetricsComponent } from './metrics.component';
-import { MetricsEnableComponent } from './metrics-enable.component';
-import { MetricsInstructionsComponent } from './metrics-instructions.component';
-import { MetricsShowComponent } from './metrics-show.component';
-import { MetricsUsagestatsComponent } from './metrics-usagestats.component';
-import { MetricsUsagestatsReportComponent } from './metrics-usagestats-report.component';
-import { MetricsUsagestatsReportResultsComponent } from './metrics-usagestats-report-results.component';
-
-@NgModule ({
- imports: [
- CommonModule,
- TabsModule.forRoot(),
- MetricsRouting,
- ReusableComponentsModule,
- ReactiveFormsModule
- ],
- declarations: [
- MetricsComponent,
- MetricsEnableComponent,
- MetricsInstructionsComponent,
- MetricsShowComponent,
- MetricsUsagestatsComponent,
- MetricsUsagestatsReportComponent,
- MetricsUsagestatsReportResultsComponent
- ]
-})
-
-export class MetricsModule { }
diff --git a/src/app/pages/metrics/metrics.routing.ts b/src/app/pages/metrics/metrics.routing.ts
deleted file mode 100755
index ac5db6ed4..000000000
--- a/src/app/pages/metrics/metrics.routing.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Created by myrto on 11/27/17.
- */
-import { RouterModule, Routes } from '@angular/router';
-import { MetricsComponent } from './metrics.component';
-import { MetricsEnableComponent } from './metrics-enable.component';
-import { MetricsShowComponent } from './metrics-show.component';
-import { MetricsInstructionsComponent } from './metrics-instructions.component';
-import { MetricsUsagestatsComponent } from './metrics-usagestats.component';
-import { MetricsUsagestatsReportComponent } from './metrics-usagestats-report.component';
-import { MetricsUsagestatsReportResultsComponent } from './metrics-usagestats-report-results.component';
-import { NgModule } from '@angular/core';
-
-const metricsRoutes: Routes = [
- {
- path: '',
- component: MetricsComponent
- },
- {
- path: 'enable/:id',
- component: MetricsEnableComponent
- },
- {
- path: 'show_metrics/:id',
- component: MetricsShowComponent
- },
- {
- path: 'instructions/:id',
- component: MetricsInstructionsComponent
- },
- {
- path: 'usagestats/:id',
- component: MetricsUsagestatsComponent
- },
- {
- path: 'usagestats/:id/:reportID',
- component: MetricsUsagestatsReportComponent
- },
- {
- path: 'usagestats-report-results',
- component: MetricsUsagestatsReportResultsComponent
- }
-];
-
-
-@NgModule ({
- imports: [RouterModule.forChild(metricsRoutes)],
- exports: [RouterModule]
-})
-
-export class MetricsRouting {}
-
diff --git a/src/app/pages/pageContainer.html b/src/app/pages/pageContainer.html
index 8f2e0b4ea..3887e951e 100755
--- a/src/app/pages/pageContainer.html
+++ b/src/app/pages/pageContainer.html
@@ -1,8 +1,10 @@
-
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/repository/aggregationhistory/compatibility-monitor-fullHistory-repo.component.html b/src/app/pages/repository/aggregationhistory/compatibility-monitor-fullHistory-repo.component.html
new file mode 100755
index 000000000..497f40dcb
--- /dev/null
+++ b/src/app/pages/repository/aggregationhistory/compatibility-monitor-fullHistory-repo.component.html
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ errorMessage }}
+
+
+ {{ loadingMessage }}
+
+
+
+
{{ noAggregations }}
+
+
+
+
+ {{ year }}
+
+
+
+
+
+
+
+
+
+ Date
+ Aggregation stage
+ Collection mode
+ Number of records
+ Indexed version?
+
+
+
+
+
+
+ {{ aggr.date | date : "yyyy-MM-dd" }} {{ aggr.aggregationStage }} {{ aggr.collectionMode }} {{ aggr.numberOfRecords }} Indexed version
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/repository/aggregationhistory/compatibility-monitor-fullHistory-repo.component.ts b/src/app/pages/repository/aggregationhistory/compatibility-monitor-fullHistory-repo.component.ts
new file mode 100755
index 000000000..ae27ce586
--- /dev/null
+++ b/src/app/pages/repository/aggregationhistory/compatibility-monitor-fullHistory-repo.component.ts
@@ -0,0 +1,74 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { AggregationDetails, Repository } from '../../../domain/typeScriptClasses';
+import { RepositoryService } from '../../../services/repository.service';
+import { loadingAggregationHistory, loadingAggregationHistoryError, noAggregationHistory } from '../../../domain/shared-messages';
+import { SharedService } from "../../../services/shared.service";
+
+@Component ({
+ selector: 'app-compatibility-fullhistory-monitor-repo',
+ templateUrl: 'compatibility-monitor-fullHistory-repo.component.html'
+})
+
+export class CompatibilityMonitorFullHistoryRepoComponent implements OnInit {
+ loadingMessage: string;
+ errorMessage: string;
+ noAggregations: string;
+
+ repoName = '';
+ repo: Repository;
+
+ aggregationsMap: Map
= new Map();
+ years: string[] = [];
+
+ constructor(private route: ActivatedRoute,
+ private router: Router,
+ private repoService: RepositoryService,
+ private sharedService: SharedService) {}
+
+ ngOnInit() {
+
+ if(this.sharedService.getRepository()) {
+ this.repo = this.sharedService.getRepository();
+ this.repoName = this.repo.officialName;
+ this.getAllAggregationHistory();
+ }
+
+ this.sharedService.repository$.subscribe(
+ r => {
+ this.repo = r;
+ if (this.repo) {
+ this.repoName = this.repo.officialName;
+ this.getAllAggregationHistory();
+ }
+ }
+ );
+
+ let body = document.getElementsByTagName('body')[0];
+ body.classList.remove("top_bar_active"); //remove the class
+ body.classList.remove("page_heading_active");
+ body.classList.remove("landing");
+ body.classList.add("dashboard");
+ }
+
+ getAllAggregationHistory() {
+ this.loadingMessage = loadingAggregationHistory;
+ this.repoService.getRepositoryAggregationsByYear(this.repo.id).subscribe(
+ aggr => this.aggregationsMap = aggr,
+ error => {
+ this.loadingMessage = '';
+ this.errorMessage = loadingAggregationHistoryError;
+ },
+ () => {
+ this.loadingMessage = '';
+ this.years = Object.keys(this.aggregationsMap);
+ if ( this.years.length === 0 ) {
+ this.noAggregations = noAggregationHistory;
+ } else {
+ this.years.sort( (a, b) => ( a > b ? -1 : 1 ) );
+ }
+ }
+ );
+ }
+
+}
diff --git a/src/app/pages/repository/aggregationhistory/compatibility-monitor-repo.component.html b/src/app/pages/repository/aggregationhistory/compatibility-monitor-repo.component.html
new file mode 100755
index 000000000..789f63086
--- /dev/null
+++ b/src/app/pages/repository/aggregationhistory/compatibility-monitor-repo.component.html
@@ -0,0 +1,118 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ errorMessage }}
+
+
+ {{ loadingMessage }}
+
+
+
+
{{ noAggregations }}
+
+
+
+
+
+
+
+ {{ aggr.date | date : "yyyy-MM-dd" }}
+
+
+
Indexed version
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Aggregation stage
+ {{ aggr.aggregationStage }}
+
+
+
+
+
+
+
+
+
+
+ Collection mode
+ {{ aggr.collectionMode }}
+
+
+
+
+
+
+
+
+
+ Number of records
+ {{ aggr.numberOfRecords }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ errorMessage }}
+
+
+
+ {{ loadingMessage }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
7,5,8,7,6,5,2,5,3,10,10,3,6,5,6,3,3,6,8,3
+
+ Records collected on {{lastIndexedVersion.date | date : "yyyy-MM-dd"}}
+ {{lastIndexedVersion.numberOfRecords | number}}
+
+
+ Records collected
+ no data available
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Aggregation History
+
{{ errorAggregationsMessage }}
+
+
+ {{ loadingAggregationsMessage }}
+
+
+
+
{{ noAggregations }}
+
+
+
+
+
+
+
+
+
+ {{ aggr.date | date : "yyyy-MM-dd" }}
+
+
+
+
Indexed version
+
+
+
+
+
+
+
+
+
+
+
+
Aggregation stage
+
{{ aggr.aggregationStage }}
+
+
+
+
+
+
+
+
+
+
+
+
Collection mode
+
{{ aggr.collectionMode }}
+
+
+
+
+
+
+
+
+
+
+
+
Number of records
+
{{ aggr.numberOfRecords | number }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Usage Counts
+
+
{{ errorUsageStatsMessage }}
+
{{ noUsageStats }}
+
+
+ {{ loadingUsageStatsMessage }}
+
+
+
+
+
+
+
+
+
+
+
+ Last month's reports
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Events - MORE
+
+
+
+
{{ errorTopicsMessage }}
+
+
+ {{ loadingTopicsMessage }}
+
+
+
+
No topics for these kind of events were found
+
+
+
+
+
+
+
+
+
+
+
+ Events - MISSING
+
+
+
+
{{ errorTopicsMessage }}
+
+
+ {{ loadingTopicsMessage }}
+
+
+
+
No topics for these kind of events were found
+
+
+
+
+
+
+
+
+
+
+
+ Notifications
+
+
+
+
{{ errorSubscriptionsMessage }}
+
+
+ {{ loadingSubscriptionsMessage }}
+
+
+
+
No notifications were found
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ topic }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{errorMessage}}
+
{{successMessage}}
+
+
{{ loadingMessage }}
+
+
+
{{ noEvents }}
+
+
+
+
+
+
+
+
+
+ This is a preview of the top 100 events generated for this topic. If you are interested to receive the full list, please subscribe to these events and then be notified about the new enrichment events for your data source.
+
+
+
+
+
+ {{eventsPage.total}} RESULTS, PAGE {{(currentPage)+1}} OF {{ eventsPage.totalPages }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
ID: {{event.result.originalId}}
+
+
+
+
+
+
+
+
+
{{event.highlight.creators.length}} author ORCID(s) added
+
FROM:
+
+ {{ event.provenance.repositoryName }}
+ (ID: {{ event.provenance.id }})
+
+
+ {{ event.provenance.repositoryName }}
+
+
+
+ {{(p_index + 1)}}.
+ {{ author.fullname }} ({{ author.orcid }})
+
+
+
+
+
+
+
{{event.highlight.pids.length}} PID(s) added
+
FROM:
+
+ {{ event.provenance.repositoryName }}
+ (ID: {{ event.provenance.id }})
+
+
+ {{ event.provenance.repositoryName }}
+
+
+
+ {{(p_index + 1)}}.
+ {{ pid.value }} ({{ pid.type }})
+
+
+
+
+
+
+
{{event.highlight.abstracts.length}} Abstract(s) added
+
FROM:
+
+ {{ event.provenance.repositoryName }}
+ (ID: {{ event.provenance.id }})
+
+
+ {{ event.provenance.repositoryName }}
+
+
+
+ {{(a_index + 1)}}.
+
+
+
+
+
+
+
{{event.highlight.projects.length}} Project(s) added
+
FROM:
+
+ {{ event.provenance.repositoryName }}
+ (ID: {{ event.provenance.id }})
+
+
+ {{ event.provenance.repositoryName }}
+
+
+
+ {{(p_index + 1)}}.
+ {{ proj.acronym }}
+ {{ proj.title }}
+
+ ({{ proj.funder }}
+ /
+ {{ proj.fundingProgram }} )
+
+
+
+
+
+
+
+
{{event.highlight.subjects.length}} Subject(s) added
+
FROM:
+
+ {{ event.provenance.repositoryName }}
+ (ID: {{ event.provenance.id }})
+
+
+ {{ event.provenance.repositoryName }}
+
+
+
+ {{(s_index + 1)}}.
+ {{ subj.value }}
+
+
+
+
+
+
+
{{event.highlight.publications.length}} Publications(s) added
+
FROM:
+
+ {{ event.provenance.repositoryName }}
+ (ID: {{ event.provenance.id }})
+
+
+ {{ event.provenance.repositoryName }}
+
+
+
+ {{(p_index + 1)}}.
+ {{ pub.title }} (ID: {{pub.originalId}})
+
+
+
+
+
+
+
{{event.highlight.datasets.length}} Dataset(s) added
+
FROM:
+
+ {{ event.provenance.repositoryName }}
+ (ID: {{ event.provenance.id }})
+
+
+ {{ event.provenance.repositoryName }}
+
+
+
+ {{(d_index + 1)}}.
+ {{ dataset.title }} ({{dataset.pids[0].type}}: {{dataset.pids[0].value}})
+
+
+
+
+
+
+
{{event.highlight.softwares.length}} Software(s) added
+
FROM:
+
+ {{ event.provenance.repositoryName }}
+ (ID: {{ event.provenance.id }})
+
+
+ {{ event.provenance.repositoryName }}
+
+
+
+
+
+
+
{{event.highlight.instances.length}} OA version(s) added
+
FROM:
+
+ {{ event.provenance.repositoryName }}
+ (ID: {{ event.provenance.id }})
+
+
+ {{ event.provenance.repositoryName }}
+
+
+
+
{{(l_index + 1)}}.
+
+ {{ l.license }} {{ l.hostedby }}
+ {{ l.url }}
+
+
+
+
+
+
+
+
+
+
+ Author(s):
+
+ |
+ {{ auth.fullname }} ({{ auth.orcid }})
+
+
+
+
+
+ PID(s):
+
+ {{ pid.value }} ({{ pid.type }})
+
+
+
+
+
+ Abstract(s):
+
+
+
+
+
+
+
+
+ Project(s)/Relation(s):
+
+ {{ proj.acronym }}
+ {{ proj.title }}
+
+ ({{ proj.funder }}
+ /
+ {{ proj.fundingProgram }} )
+
+
+
+
+
+
+ Subject(s):
+
+ |
+ {{ subj.value }}
+
+
+
+
+
+ {{this.lastTopicEntry}} Publication(s):
+ Publication(s):
+
+ {{ pub.title }} (ID: {{pub.originalId}})
+
+
+
+
+
+ {{this.lastTopicEntry}} Dataset(s):
+ Dataset(s):
+
+ {{ dataset.titles[0] }} ({{dataset.pids[0].type}}: {{dataset.pids[0].value}})
+
+
+
+
+
+
+
+
+ Publication date(s):
+
+ {{ event.result.publicationdate }}
+
+
+
+
+
+
Rights:
+
+
+ {{ l.license }} {{ l.hostedby }} - {{ l.url }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Filters
+ Apply
+ Clear
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ modalErrorMessage }}
+
+
+ {{ eventsPage.datasource }}
+ {{ eventsPage.topic }}
+
+
+
+
+ Email
+
+
+
+
+
+
+
+
+
Selected Options
+
+
+
+
+ Trust
+ [{{advanceSearch.trust.min}}, {{advanceSearch.trust.max}}]
+
+
+ Titles
+
+
+
+
+
+
+ Authors
+
+
+
+
+
+
+ Subjects
+
+
+
+
+
+
+ Dates
+
+
+ - {{date.max}}
+
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/repository/events/content-events-of-repo-eventslist.component.ts b/src/app/pages/repository/events/content-events-of-repo-eventslist.component.ts
new file mode 100755
index 000000000..e1a9ffe8c
--- /dev/null
+++ b/src/app/pages/repository/events/content-events-of-repo-eventslist.component.ts
@@ -0,0 +1,381 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { AdvQueryObject, EventsPage, NotificationFrequency, NotificationMode } from '../../../domain/typeScriptClasses';
+import { BrokerService } from '../../../services/broker.service';
+import { loadingEvents, noEventsForTopic, noEventsWithParams, noServiceMessage,
+ subscribingChooseFrequency, subscribingToEvents, subscribingToEventsError,
+ subscribingToeventsSuccess } from '../../../domain/shared-messages';
+import { AbstractControl, FormArray, FormBuilder, FormGroup } from '@angular/forms';
+import { AuthenticationService } from '../../../services/authentication.service';
+import { ConfirmationDialogComponent } from '../../../shared/reusablecomponents/confirmation-dialog.component';
+import { SharedService } from "../../../services/shared.service";
+
+@Component ({
+ selector: 'app-content-events-of-repo-eventslist',
+ templateUrl: 'content-events-of-repo-eventslist.component.html'
+})
+
+export class ContentEventsOfRepoEventslistComponent implements OnInit {
+ errorMessage: string;
+ loadingMessage: string;
+ successMessage: string;
+ noEvents: string;
+ eventsPageInitialized = false;
+
+ topic = '';
+ lastTopicEntry = '';
+ correctTopic = '';
+ repoName = '';
+
+ advanceSearch: AdvQueryObject;
+ eventsPage: EventsPage;
+ currentPage: number; /* DELETE WHEN ADVANCED SHOW EVENTS IS FIXED AND SENDS CORRECT VALUE FOR CURRENT PAGE */
+
+ selectedItemIndex: number;
+
+ group: FormGroup;
+ readonly titleDefinition = { eventTitle: [''] };
+ readonly authorDefinition = { eventAuthor: [''] };
+ readonly subjectDefinition = { eventSubject: [''] };
+ readonly dateRangeDefinition = { dateFrom: '', dateTo: '' };
+ readonly groupDefinition = {
+ trustMin: [+''],
+ trustMax: [+''],
+ eventTitles: this.fb.array([this.initControl(this.titleDefinition)]),
+ eventAuthors: this.fb.array([this.initControl(this.authorDefinition)]),
+ eventSubjects: this.fb.array([this.initControl(this.subjectDefinition)]),
+ eventDateRanges: this.fb.array([this.initControl(this.dateRangeDefinition)])
+ };
+
+ eventTitleFormArray: any;
+ eventAuthorFormArray: any;
+ eventSubjectsFormArray: any;
+ eventDateRangesFormArray: any;
+
+ frequencyChoice = 'daily';
+ userEmail: string;
+ modalErrorMessage: string;
+
+ isModalShown: boolean;
+ @ViewChild('subscribeToEventsModal')
+ public subscribeToEventsModal: ConfirmationDialogComponent;
+
+ constructor (private route: ActivatedRoute,
+ private fb: FormBuilder,
+ private brokerService: BrokerService,
+ private authService: AuthenticationService,
+ private sharedService: SharedService) {}
+
+ ngOnInit () {
+
+ this.userEmail = this.authService.getUserEmail();
+
+ this.getParams();
+
+
+ if(this.sharedService.getRepository()) {
+ this.repoName = this.sharedService.getRepository().officialName;
+ this.initQuery();
+ this.initForm();
+ this.currentPage = 0; /* DELETE WHEN ADVANCED SHOW EVENTS IS FIXED AND SENDS CORRECT VALUE FOR CURRENT PAGE */
+ this.getEventsPage(0);
+ }
+
+ this.sharedService.repository$.subscribe(
+ r => {
+ if (r) {
+ this.repoName = r.officialName;
+ this.initQuery();
+ this.initForm();
+ this.currentPage = 0; /* DELETE WHEN ADVANCED SHOW EVENTS IS FIXED AND SENDS CORRECT VALUE FOR CURRENT PAGE */
+ this.getEventsPage(0);
+ }
+ }
+ );
+
+ let body = document.getElementsByTagName('body')[0];
+ body.classList.remove("top_bar_active"); //remove the class
+ body.classList.add("page_heading_active");
+ body.classList.remove("landing");
+ body.classList.add("dashboard");
+ }
+
+ getParams() {
+ this.topic = this.route.snapshot.paramMap.get('topic');
+ console.log(`my topic is: ${this.topic}`);
+ this.lastTopicEntry = this.topic.substring(this.topic.lastIndexOf('|') + 1).toLowerCase();
+ this.lastTopicEntry = this.replaceAll(this.lastTopicEntry, '_', ' ');
+ this.getCorrectTopic();
+ // this.repoName = this.route.snapshot.paramMap.get('name');
+ }
+
+ replaceAll(str, find, replace) {
+ return str.replace(new RegExp(find, 'g'), replace);
+ }
+
+ initQuery() {
+ this.advanceSearch = {
+ datasource: this.repoName,
+ topic: this.correctTopic,
+ titles: [],
+ subjects: [],
+ authors: [],
+ dates: [],
+ trust: {min: '0', max: '1'},
+ page: 0
+ };
+ }
+
+ initForm() {
+ this.group = this.fb.group( this.groupDefinition, { validator: checkMinMax } );
+ this.group.get('trustMin').setValue(0);
+ this.group.get('trustMax').setValue(1);
+ }
+
+ initControl(definition: any) {
+ return this.fb.group(definition);
+ }
+
+ removeControl(controlName: string, i: number) {
+ const controlArray = this.group.controls[controlName];
+ controlArray.removeAt(i);
+ }
+
+ addControl(controlName: string, definition: any) {
+ const controlArray = this.group.controls[controlName];
+ controlArray.push(this.initControl(definition));
+ }
+
+ clearForm() {
+ let controlArray: FormArray;
+ controlArray = this.group.controls['eventTitles'];
+ controlArray.controls = [];
+ controlArray.push(this.initControl(this.titleDefinition));
+
+ controlArray = this.group.controls['eventAuthors'];
+ controlArray.controls = [];
+ controlArray.push(this.initControl(this.authorDefinition));
+
+ controlArray = this.group.controls['eventSubjects'];
+ controlArray.controls = [];
+ controlArray.push(this.initControl(this.subjectDefinition));
+
+ controlArray = this.group.controls['eventDateRanges'];
+ controlArray.controls = [];
+ controlArray.push(this.initControl(this.dateRangeDefinition));
+
+ this.group.get('trustMin').setValue(0);
+ this.group.get('trustMax').setValue(1);
+
+ this.initQuery();
+ this.getEventsPage(0);
+ }
+
+ updateQuery() {
+ let i: number;
+ let controlArray: FormArray;
+
+ if ( this.group.valid ) {
+ this.initQuery();
+ this.advanceSearch.trust.min = this.group.get('trustMin').value;
+ this.advanceSearch.trust.max = this.group.get('trustMax').value;
+
+ controlArray = this.group.controls['eventTitles'];
+ for (i = 0; i < controlArray.length; i++) {
+ if (controlArray.at(i).get('eventTitle').value) {
+ this.advanceSearch.titles.push(controlArray.at(i).get('eventTitle').value);
+ }
+ }
+ controlArray = this.group.controls['eventAuthors'];
+ for (i = 0; i < controlArray.length; i++) {
+ if (controlArray.at(i).get('eventAuthor').value) {
+ this.advanceSearch.authors.push(controlArray.at(i).get('eventAuthor').value);
+ }
+ }
+ controlArray = this.group.controls['eventSubjects'];
+ for (i = 0; i < controlArray.length; i++) {
+ if (controlArray.at(i).get('eventSubject').value) {
+ this.advanceSearch.subjects.push(controlArray.at(i).get('eventSubject').value);
+ }
+ }
+ controlArray = this.group.controls['eventDateRanges'];
+ for (i = 0; i < controlArray.length; i++) {
+ if (controlArray.at(i).get('dateFrom').value) {
+ let toDate;
+ if (controlArray.at(i).get('dateTo').value ||
+ (controlArray.at(i).get('dateFrom').value > controlArray.at(i).get('dateTo').value) ) {
+ toDate = controlArray.at(i).get('dateTo').value;
+ } else {
+ toDate = Date.now();
+ }
+ this.advanceSearch.dates.push({
+ min: controlArray.at(i).get('dateFrom').value,
+ max: toDate
+ });
+ }
+ }
+ console.log(this.advanceSearch);
+ this.currentPage = 0; /* DELETE WHEN ADVANCED SHOW EVENTS IS FIXED AND SENDS CORRECT VALUE FOR CURRENT PAGE */
+ this.getEventsPage(0);
+ }
+ }
+
+ getEventsPage(page: number) {
+ this.noEvents = '';
+ this.errorMessage = '';
+ this.successMessage = '';
+ this.loadingMessage = loadingEvents;
+ this.brokerService.advancedShowEvents(page, 10, this.advanceSearch).subscribe(
+ events => this.eventsPage = events,
+ error => {
+ this.loadingMessage = '';
+ this.errorMessage = noServiceMessage;
+ console.log(error);
+ },
+ () => {
+ this.loadingMessage = '';
+ console.log(this.eventsPage);
+ if (!this.eventsPage.total) {
+ if (!this.eventsPageInitialized) {
+ this.noEvents = noEventsForTopic;
+ } else {
+ this.noEvents = noEventsWithParams;
+ }
+ }
+ let tempArray = this.group.controls['eventTitles'];
+ this.eventTitleFormArray = tempArray.controls;
+ tempArray = this.group.controls['eventAuthors'];
+ this.eventAuthorFormArray = tempArray.controls;
+ tempArray = this.group.controls['eventSubjects'];
+ this.eventSubjectsFormArray = tempArray.controls;
+ tempArray = this.group.controls['eventDateRanges'];
+ this.eventDateRangesFormArray = tempArray.controls;
+ console.log(`total pages is ${this.eventsPage.totalPages}`);
+ this.eventsPageInitialized = true;
+ }
+ );
+ }
+
+ isHighlighted(item: any, itemList: any[]) {
+ return itemList.some(x => x === item);
+ }
+
+ getCorrectTopic() {
+ const temp = this.topic.split('|');
+ this.correctTopic = temp[0];
+ this.topic = temp[0];
+ for (let i = 1; i < temp.length; i++) {
+ this.correctTopic += `/${temp[i]}`;
+ this.topic += ` | ${temp[i]}`;
+ }
+ }
+
+ goToNextPage() {
+ /* RESTORE WHEN ADVANCED SHOW EVENTS IS FIXED AND SENDS CORRECT VALUE FOR CURRENT PAGE */
+ /*if(this.eventsPage.currPage < this.eventsPage.totalPages) {
+ console.log(`Get me page ${this.eventsPage.currPage+1}!`);
+ this.getEventsPage(this.eventsPage.currPage+1);
+ }*/
+
+ /* DELETE WHEN ADVANCED SHOW EVENTS IS FIXED AND SENDS CORRECT VALUE FOR CURRENT PAGE */
+ if ( (this.currentPage + 1) < this.eventsPage.totalPages) {
+ this.currentPage = this.currentPage + 1;
+ console.log(`Get me page ${this.currentPage}!`);
+ this.getEventsPage(this.currentPage);
+
+ window.scrollTo(0, 0);
+ }
+
+ }
+
+ goToPreviousPage() {
+ /* RESTORE WHEN ADVANCED SHOW EVENTS IS FIXED AND SENDS CORRECT VALUE FOR CURRENT PAGE */
+ /*if(this.eventsPage.currPage > 0) {
+ console.log(`Get me page ${this.eventsPage.currPage-1}!`);
+ this.getEventsPage(this.eventsPage.currPage-1);
+ }*/
+
+ /* DELETE WHEN ADVANCED SHOW EVENTS IS FIXED AND SENDS CORRECT VALUE FOR CURRENT PAGE */
+ if (this.currentPage > 0) {
+ this.currentPage = this.currentPage - 1;
+ console.log(`Get me page ${this.currentPage}!`);
+ this.getEventsPage(this.currentPage);
+
+ window.scrollTo(0, 0);
+ }
+ }
+
+ showSubscriptionModal() {
+ if (this.advanceSearch && this.eventsPage) {
+ this.subscribeToEventsModal.confirmed = false;
+ this.subscribeToEventsModal.showModal();
+ }
+ }
+
+ choseFrequency(freq: string) {
+ this.frequencyChoice = freq;
+ }
+
+ subscribeToEvents(event: any) {
+ this.modalErrorMessage = '';
+ if (this.frequencyChoice) {
+ this.subscribeToEventsModal.confirmed = true;
+ const freq = this.frequencyChoice;
+ const mod: NotificationMode = 'EMAIL';
+ const sub = {
+ subscriber: this.userEmail,
+ frequency: freq,
+ mode: mod,
+ query: this.advanceSearch
+ };
+ this.errorMessage = '';
+ this.successMessage = '';
+ console.log(JSON.stringify(sub));
+ this.loadingMessage = subscribingToEvents;
+ this.brokerService.subscribeToEvent(sub).subscribe(
+ response => console.log(`subscribeToEvents responded ${JSON.stringify(response)}`),
+ error => {
+ this.errorMessage = subscribingToEventsError;
+ this.loadingMessage = '';
+ },
+ () => {
+ this.loadingMessage = '';
+ this.successMessage = subscribingToeventsSuccess;
+ }
+ );
+ } else {
+ this.modalErrorMessage = subscribingChooseFrequency;
+ }
+ }
+
+ // displayFullResultInfo(i: number) {
+ // if (this.selectedItemIndex === i) {
+ // this.selectedItemIndex = null;
+ // } else {
+ // this.selectedItemIndex = i;
+ // }
+ // }
+
+ showMore(i: number) {
+ this.selectedItemIndex = i;
+ }
+
+ showLess(i: number) {
+ this.selectedItemIndex = null;
+ }
+
+}
+
+export function checkMinMax(c: AbstractControl) {
+ if ( c.get('trustMin').value > c.get('trustMax').value ) {
+ return 'invalid';
+ }
+ return null;
+}
+
+export function checkDates(c: AbstractControl) {
+ if ( c.get('dateFrom').value > c.get('dateTo').value ) {
+ return 'invalid';
+ }
+ return null;
+}
diff --git a/src/app/pages/repository/events/content-events-of-repository.component.html b/src/app/pages/repository/events/content-events-of-repository.component.html
new file mode 100755
index 000000000..160bfe604
--- /dev/null
+++ b/src/app/pages/repository/events/content-events-of-repository.component.html
@@ -0,0 +1,140 @@
+
+
Enrich Your Content - Browse Events
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{errorMessage}}
+
+
{{ loadingMessage }}
+
+
+
{{ noTopics }}
+
+
+
+
+ For each topic a sample of 100 events will be displayed, as well as the total number that can be potentially built for your data source. If you are interested to receive the full list, you can subscribe to these events and then be notified about the new enrichment events.
+
+
+
+
+
+
+
+
+
+
+
+
+ More
+
+
+
+
+
+
+ Additional metadata information that may enrich or supplement {{ repoName }} content
+ # of events
+
+
+
+
+
+ {{ moreTopic.value }}
+ {{ topics[moreTopic.value]['englishName'] }}
+
+
+ {{ moreTopic.size }}
+
+
+
+
+ Total
+
+
+ {{ totalMore }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Missing
+
+
+
+
+
+
+ Missing metadata information that may enrich or complete {{ repoName }} content
+ # of events
+
+
+
+
+
+ {{ missingTopic.value }}
+ {{ topics[missingTopic.value]['englishName'] }}
+
+
+ {{ missingTopic.size }}
+
+
+
+
+ Total
+
+
+ {{ totalMissing }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
= new Map();
+ repoTopics: BrowseEntry[] = [];
+ moreList: BrowseEntry[] = [];
+ missingList: BrowseEntry[] = [];
+ totalMore = 0;
+ totalMissing = 0;
+
+ constructor(
+ private route: ActivatedRoute,
+ private router: Router,
+ private brokerService: BrokerService,
+ private sharedService: SharedService
+ ) {}
+
+ ngOnInit() {
+
+ if(this.sharedService.getRepository()) {
+ this.repoName = this.sharedService.getRepository().officialName;
+ this.getCorrectName();
+ this.getTopics();
+ }
+
+ this.sharedService.repository$.subscribe(
+ r => {
+ if (r) {
+ this.repoName = r.officialName;
+ this.getCorrectName();
+ this.getTopics();
+ }
+ }
+ );
+
+ // this.repoName = this.route.snapshot.paramMap.get('name');
+ // this.getCorrectName();
+ // this.getTopics();
+ let body = document.getElementsByTagName('body')[0];
+ body.classList.remove("top_bar_active"); //remove the class
+ body.classList.remove("page_heading_active");
+ body.classList.remove("landing");
+ body.classList.add("dashboard");
+ }
+
+ getRepoTopics(): void {
+ this.loadingMessage = loadingTopics;
+ this.brokerService.getTopicsForDataSource(this.correctName)
+ .subscribe(
+ topics => {
+ this.repoTopics = topics;
+ },
+ error => {
+ console.log(error);
+ this.errorMessage = loadingTopicsError;
+ this.loadingMessage = '';
+ },
+ () => {
+ this.loadingMessage = '';
+ if (this.repoTopics.length === 0) {
+ this.noTopics = noTopicsFound;
+ } else {
+ for (const browseEntry of this.repoTopics) {
+ if (browseEntry.value.startsWith('ENRICH/MORE')) {
+ this.totalMore += browseEntry.size;
+ this.moreList.push(browseEntry);
+ } else if (browseEntry.value.startsWith('ENRICH/MISSING')) {
+ this.totalMissing += browseEntry.size;
+ this.missingList.push(browseEntry);
+ }
+ }
+ }
+ }
+ );
+ }
+
+
+ getTopics () {
+ this.loadingMessage = loadingTopics;
+ this.brokerService.getDnetTopics().subscribe(
+ topics => this.topics = topics,
+ error => {
+ console.log(error);
+ this.errorMessage = loadingTopicsError;
+ this.loadingMessage = '';
+ },
+ () => {
+ this.loadingMessage = '';
+ console.log(this.topics);
+ this.getRepoTopics();
+ }
+ );
+ }
+
+ goToEventsList(topic: string) {
+ const temp = topic.replace(/\//g, '|');
+ let chosenTopic = temp[0];
+ for (let i = 1; i < temp.length; i++) {
+ chosenTopic += '|' + temp[i];
+ }
+ chosenTopic = encodeURIComponent(chosenTopic);
+ /*this.router.navigate([`/content/events/${this.repoName}`, chosenTopic]);*/
+ console.log(temp, this.route.url);
+ this.router.navigate([temp], {relativeTo: this.route});
+
+ }
+
+ getCorrectName() {
+ const temp = this.repoName.split('|');
+ this.correctName = temp[0];
+ this.repoName = temp[0];
+ for (let i = 1; i < temp.length; i++) {
+ this.correctName += `/${temp[i]}`;
+ this.repoName += ` | ${temp[i]}`;
+ }
+ }
+
+}
diff --git a/src/app/pages/repository/events/events-routing.module.ts b/src/app/pages/repository/events/events-routing.module.ts
new file mode 100644
index 000000000..0602af825
--- /dev/null
+++ b/src/app/pages/repository/events/events-routing.module.ts
@@ -0,0 +1,27 @@
+import { RouterModule, Routes } from '@angular/router';
+import { NgModule } from '@angular/core';
+import { AuthGuardService } from "../../../services/auth-guard.service";
+import { ContentEventsOfRepositoryComponent } from "./content-events-of-repository.component";
+import { ContentEventsOfRepoEventslistComponent } from "./content-events-of-repo-eventslist.component";
+
+const eventsRoutes: Routes = [
+ {
+ path: '',
+ component: ContentEventsOfRepositoryComponent,
+ canActivate: [AuthGuardService],
+ },
+ {
+ path: ':topic',
+ component: ContentEventsOfRepoEventslistComponent,
+ canActivate: [AuthGuardService]
+ }
+];
+
+
+@NgModule ({
+ imports: [RouterModule.forChild(eventsRoutes)],
+ exports: [RouterModule]
+})
+
+export class EventsRoutingModule {}
+
diff --git a/src/app/pages/repository/events/events.module.ts b/src/app/pages/repository/events/events.module.ts
new file mode 100644
index 000000000..79e947b2c
--- /dev/null
+++ b/src/app/pages/repository/events/events.module.ts
@@ -0,0 +1,25 @@
+import { NgModule } from '@angular/core';
+import { TabsModule } from 'ngx-bootstrap';
+import { CommonModule } from '@angular/common';
+import { ReusableComponentsModule } from "../../../shared/reusablecomponents/reusable-components.module";
+import { EventsRoutingModule } from "./events-routing.module";
+import { ContentEventsOfRepositoryComponent } from "./content-events-of-repository.component";
+import { ContentEventsOfRepoEventslistComponent } from "./content-events-of-repo-eventslist.component";
+import { ReactiveFormsModule } from "@angular/forms";
+
+
+@NgModule ({
+ imports: [
+ CommonModule,
+ TabsModule.forRoot(),
+ EventsRoutingModule,
+ ReusableComponentsModule,
+ ReactiveFormsModule,
+ ],
+ declarations: [
+ ContentEventsOfRepositoryComponent,
+ ContentEventsOfRepoEventslistComponent
+ ]
+})
+
+export class EventsModule { }
diff --git a/src/app/pages/repository/metrics/metrics-enable.component.html b/src/app/pages/repository/metrics/metrics-enable.component.html
new file mode 100755
index 000000000..d8c040602
--- /dev/null
+++ b/src/app/pages/repository/metrics/metrics-enable.component.html
@@ -0,0 +1,91 @@
+
+
+
Metrics for {{repo.officialName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ successMessage }}
+
{{ errorMessage }}
+
+
+ {{ loadingMessage }}
+
+
+
+
+
+
+
+
+
+
You don't have metrics enabled for this repository yet. Would you like to enable them?
+
+
+
+ Usage stats enable workflow
+
+
+
+
Once you select to enable metrics for your repository, the following actions need to be performed:
+
As the repository manager, on datasource site:
+
As OpenAIRE's Usage Counts Technical Staff, on our data analytics platform:
+
+
+
+
+ For more details about the workflows, please consult the
+ OpenAIRE Usage Counts Guidelines .helpdesk ticket or write to usagecounts-helpdesk@openaire.eu .
+
+
+
+
Enable Metrics
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Are you sure you want to enable metrics for this repository?
+
diff --git a/src/app/pages/repository/metrics/metrics-enable.component.ts b/src/app/pages/repository/metrics/metrics-enable.component.ts
new file mode 100755
index 000000000..3c75bedcd
--- /dev/null
+++ b/src/app/pages/repository/metrics/metrics-enable.component.ts
@@ -0,0 +1,146 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { ConfirmationDialogComponent } from '../../../shared/reusablecomponents/confirmation-dialog.component';
+import { PiwikService } from '../../../services/piwik.service';
+import { RepositoryService } from '../../../services/repository.service';
+import { PiwikInfo, Repository } from '../../../domain/typeScriptClasses';
+import { enabledMetricsError, enabledMetricsSuccess, enablingMetrics,
+ loadingRepoError, loadingRepoMessage } from '../../../domain/shared-messages';
+import { AuthenticationService } from '../../../services/authentication.service';
+import { SharedService } from "../../../services/shared.service";
+
+@Component ({
+ selector: 'metrics-enable',
+ templateUrl: 'metrics-enable.component.html'
+})
+
+export class MetricsEnableComponent implements OnInit {
+ successMessage: string;
+ errorMessage: string;
+ loadingMessage: string;
+
+ readonly analyticsUrl = 'https://analytics.openaire.eu/addsite.php?';
+ readonly authenticationToken = '32846584f571be9b57488bf4088f30ea'; /* THE ACTUAL TOKEN WILL BE NEEDED EVENTUALLY!! */
+
+ repo: Repository;
+ oaId: string;
+
+ modalTitle = 'Confirmation';
+ modalButton = 'Yes, enable it';
+ isModalShown: boolean;
+
+ @ViewChild('confirmEnablingModal')
+ public confirmEnablingModal: ConfirmationDialogComponent;
+
+
+ constructor (
+ private route: ActivatedRoute,
+ private router: Router,
+ private authService: AuthenticationService,
+ private piwikService: PiwikService,
+ private repoService: RepositoryService,
+ private sharedService: SharedService
+ ) {}
+
+ ngOnInit() {
+
+ if(this.sharedService.getRepository()) {
+ this.repo = this.sharedService.getRepository();
+ this.getOAid();
+ }
+
+ this.sharedService.repository$.subscribe(
+ r => {
+ this.repo = r;
+ if (this.repo) {
+ this.getOAid();
+ }
+ }
+ );
+
+ // this.getRepo();
+ this.isModalShown = false;
+ let body = document.getElementsByTagName('body')[0];
+ body.classList.remove("top_bar_active"); //remove the class
+ body.classList.remove("page_heading_active");
+ body.classList.remove("landing");
+ body.classList.add("dashboard");
+ }
+
+ // getRepo(): void {
+ // const id = this.route.snapshot.paramMap.get('id');
+ // this.loadingMessage = loadingRepoMessage;
+ // this.repoService.getRepositoryById(id).subscribe(
+ // repo => {
+ // this.repo = repo;
+ // },
+ // error => {
+ // console.log(error);
+ // this.errorMessage = loadingRepoError;
+ // this.loadingMessage = '';
+ // }, () => {
+ // if (this.repo) {
+ // this.getOAid();
+ // }
+ // this.loadingMessage = '';
+ // }
+ // );
+ // }
+
+ getOAid () {
+ this.piwikService.getOpenaireId(this.repo.id).subscribe(
+ id => {
+ this.oaId = id;
+ console.log(`getOpenaireId responded: ${this.oaId}`);
+ },
+ error => console.log(`ERROR is ${error}`)
+ );
+ }
+
+ confirmEnabling() {
+ if (this.repo) {
+ this.confirmEnablingModal.showModal();
+ }
+ }
+
+ confirmedEnabling(event: any) {
+ if (this.repo) {
+ this.loadingMessage = enablingMetrics;
+ const piwik: PiwikInfo = {
+ repositoryId: this.repo.id,
+ openaireId: this.oaId,
+ repositoryName: this.repo.officialName,
+ country: this.repo.countryName,
+ siteId: '',
+ authenticationToken: this.authenticationToken,
+ creationDate: null,
+ requestorName: this.authService.getUserName(),
+ requestorEmail: this.authService.getUserEmail(),
+ validated: false,
+ validationDate: null,
+ comment: ''
+ };
+
+ this.piwikService.enableMetricsForRepository(this.repo.officialName, this.repo.websiteUrl, piwik).subscribe(
+ response => {
+ console.log(`enableMetrics answered: ${response}`);
+ this.successMessage = enabledMetricsSuccess;
+ this.loadingMessage = '';
+
+ //save piwik and update shareRepo
+ this.repo.piwikInfo = piwik;
+ this.sharedService.setRepository(this.repo);
+ },
+ error => {
+ console.log(error);
+ this.errorMessage = enabledMetricsError;
+ this.loadingMessage = '';
+ },
+ () => {
+ this.router.navigate([`../instructions/`]);
+ // this.router.navigate([`/getImpact/instructions/${this.repo.id}`]);
+ }
+ );
+ }
+ }
+}
diff --git a/src/app/pages/repository/metrics/metrics-instructions.component.html b/src/app/pages/repository/metrics/metrics-instructions.component.html
new file mode 100755
index 000000000..3a1539224
--- /dev/null
+++ b/src/app/pages/repository/metrics/metrics-instructions.component.html
@@ -0,0 +1,80 @@
+
+
Usage Statistics Configuration & Software Details for {{piwik.repositoryName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ errorMessage }}
+
+
+
+
+
+
+
+ OpenAIRE’s usage statistic service uses the Matomo Open Source Analytics platform (matomo.org) to track usage activity. When metrics
+ are enabled for a repository, two unique identifiers are generated - a matomo-ID that associates the repository with its usage events in Matomo
+ and an authentication-ID that allows to track usage activity on the Matomo platform. Metadata views and item downloads are tracked and automatically sent to Matomo. Statistics are generated using the COUNTER Code of practice directives.
+
+
+ OpenAIRE's usage statistics service tracking code exploits Matomo’s API. In order to make the tracking of usage events from repositories more robust, it was necessary to implement repository platform specific patches and plugins starting with DSpace and EPrints. The code is maintained on Github:
+
+
+
+ To configure your repository to allow tracking in Matomo platform, please change the configuration files with the following parameters and values, generated for your site:
+
+
+ MatomoID
+ {{ piwik.siteId }}
+ AuthenticationToken
+ {{ piwik.authenticationToken }}
+
+
+ Details for the configuration files are given in the README of the tracking code.
+
+
+ NOTE
+ - You will be informed by e-mail that the installation of the tracking code has been validated and when the usage statistics will be available.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ piwik ? piwik.repositoryName : 'Metrics'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ errorMessage }}
+
+
+ {{ loadingMessage }}
+
+
+
+
+
+
+
+
+
+
+
+
+
views in OpenAIRE
+
{{ pageViews | number }}
+
+
+
+
+
+
+
3,5,2,10,2,7,0,2,8,8,7,2,4,8,0,6,6,7,9,5
+
views in local repository
+
{{ totalViews | number }}
+
+
+
+
+
+
+
+
5,3,9,6,5,9,7
+
downloads in local repository
+
{{ totalDownloads | number }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Get usage statistics report
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{errorMessage}}
+
+
+ {{ loadingMessage }}
+
+
+
+
+
+
+
+
+
+
+
+
{{ repoResponse.ReportDefinition['@Name'] }} Report Results
+
+
+
+
+
+
+
+
+
+ Results per page
+
+ 10
+ 25
+ 50
+ 100
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Title
+ Publisher
+ Platform name
+ {{ (chosenReport !== 'RR1') ? 'Item Urls' : 'Url' }}
+ Type
+ Downloads/Views
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ infoMessage }}
+
+
+
+
+ {{ item.ItemName }}
+ {{ item.ItemPublisher }}
+ {{ item.ItemPlatform }}
+
+
+
+ {{ url }}
+
+
+ {{ item.ItemDataType }}
+
+ {{ (selectedItemIndex === item_i) ? 'Hide' : 'See' }} results
+
+
+ {{ item.ItemPerformance[0].Instance[0].Count }}
+
+
+ {{ item.ItemPerformance[0].Instance[1].Count }}
+
+
+
+
+
+
+
+ Month
+ Downloads
+ Views
+
+
+ {{ month.Period.Begin | date: "MMM yyyy" }}
+ {{ month.Instance[0].Count }}
+ {{ month.Instance[1].Count }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Number of results:
+ {{ repoResponse.ReportDefinition.Filters.ReportAttribute[1].Value }}
+
+
+ Filters:
+
+ {{ filter.Name }}: {{ filter.Value }}
+
+
+
+
Details
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{errorMessage}}
+
+
+ {{ loadingMessage }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Report Filters
+
+
Date range
+
+
+
Valid date formats are yyyy-mm-dd or yyyy-mm. Default range is the last available month.
+
+
+
+
+
Optional Filters
+
+
+
+ For more specific results, provide an Item Identifier.namespace:value openaire , doi or oid (for OAI-PMH).
+
+
+ By default results are returned for all repositories.
+
+
+
+
+
+
+ Journal Identifier
+
+
+
+
+
+
+ Item Identifier
+
+
+
+
+
+
+
+
Optional filter to only show results for a single item type, e.g. article, book, etc.
+
+
+
+ Item Data Type
+
+
+ --- Select Item Data Type ---
+ Annotation
+ Article
+ Bachelor thesis
+ Book
+ clinical trial
+ Collection
+ Conference object
+ Contribution for newspaper or weekly magazine
+ Dataset
+ Doctoral thesis
+ Event
+ External research report
+ Film
+ Image
+ InteractiveResource
+ Internal report
+ Lecture
+ Master thesis
+ Newsletter
+ Other
+ Part of book or chapter of book
+ Patent
+ PhysicalObject
+ Preprint
+ Report
+ Research
+ Review
+ Software
+ Sound
+ Unknown
+
+
+
+
+
+
+
+
+
+
+
Report Attributes
+
+
+
Valid Granularity values: Monthly or Totals
+
+
+
+ Granularity
+
+ Monthly
+ Totals
+
+
+
+
+
+
+
+
Get Report
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ errorMessage }}
+
+
+
Supported Reports
+
+
+
+
+
+
+
+
+ Article Report 1, number of successful article download requests by month and repository.
+
+
+
+
+
+
+
+
+
+
+ Item Report 1, number of successful item download requests by month and repository.
+
+
+
+
+
+
+
+
+
+
+ Repository Report 1, number of successful item downloads for all repositories participating in the usage statistics service.
+
+
+
+
+
+
+
+
+
+
+
+
+ Book Report 1, number of successful title requests by month and title.
+
+
+
+
+
+
+
+
+
+
+ Book Report 2, number of successful section requests by month and title.
+
+
+
+
+
+
+
+
+
+
+ Journal Report 1, number of successful full-text article requests by month and journal.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ loadingMessage }}
+
+
+
+
+
{{ errorMessage }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ loadingMessage }}
+
+
+
+
+
{{ errorMessage }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
This is a mock representation of the update admins functionality coming soon..
+
+
+
+
+
+ Email:
+ admin1@gmail.com
+
+
+
+
+
+
+
+ Email:
+ admin2@gmail.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/repository/update/sources-update-repo.component.ts b/src/app/pages/repository/update/sources-update-repo.component.ts
new file mode 100755
index 000000000..b4f81cd5d
--- /dev/null
+++ b/src/app/pages/repository/update/sources-update-repo.component.ts
@@ -0,0 +1,201 @@
+import { Component, OnInit, QueryList, ViewChild, ViewChildren } from '@angular/core';
+import { FormBuilder, FormGroup } from '@angular/forms';
+import { Repository, RepositoryInterface } from '../../../domain/typeScriptClasses';
+import { RepositoryService } from '../../../services/repository.service';
+import { ActivatedRoute, Router } from '@angular/router';
+import { formInfoLoading, loadingRepoError } from '../../../domain/shared-messages';
+import { DatasourceUpdateFormComponent } from '../../../shared/reusablecomponents/sources-forms/datasource-update-form.component';
+import { ConfirmationDialogComponent } from '../../../shared/reusablecomponents/confirmation-dialog.component';
+import { AuthenticationService } from '../../../services/authentication.service';
+import { DatasourceNewInterfaceFormComponent } from '../../../shared/reusablecomponents/sources-forms/datasource-new-interface-form.component';
+import {SharedService} from "../../../services/shared.service";
+
+@Component ({
+ selector: 'sources-update-repo',
+ templateUrl: 'sources-update-repo.component.html',
+})
+
+export class SourcesUpdateRepoComponent implements OnInit {
+ loadingMessage: string;
+ errorMessage: string;
+
+ // repoId: string;
+ logoURL: string;
+ repo: Repository;
+ repoInterfaces: RepositoryInterface[] = [];
+
+ @ViewChild('datasourceUpdateForm') datasourceUpdateForm: DatasourceUpdateFormComponent;
+
+ group: FormGroup;
+
+ @ViewChildren('interfacesArray') interfacesArray: QueryList;
+ dataForInterfaceComp: any[] = [];
+
+ isModalShown: boolean;
+ @ViewChild('updateLogoUrlModal')
+ public updateLogoUrlModal: ConfirmationDialogComponent;
+
+ constructor ( private fb: FormBuilder,
+ private repoService: RepositoryService,
+ private authService: AuthenticationService,
+ private route: ActivatedRoute,
+ private sharedService: SharedService,
+ private router: Router) { }
+
+ @ViewChild('updateTermsForm')
+
+ ngOnInit() {
+
+ if(this.sharedService.getRepository()) {
+ this.repo = this.sharedService.getRepository();
+ this.logoURL = this.repo.logoUrl;
+ this.getRepoInterfaces();
+ }
+
+ this.sharedService.repository$.subscribe(
+ r => {
+ this.repo = r;
+ if (this.repo) {
+ this.logoURL = this.repo.logoUrl;
+ this.getRepoInterfaces();
+ }
+ }
+ );
+
+ // this.readRepoId();
+ let body = document.getElementsByTagName('body')[0];
+ body.classList.remove("top_bar_active"); //remove the class
+ body.classList.remove("page_heading_active");
+ body.classList.remove("landing");
+ body.classList.add("dashboard");
+ }
+
+ // readRepoId() {
+ // this.repoId = this.route.snapshot.paramMap.get('id');
+ // console.log(`repoId is ${this.repoId}`);
+ // this.getRepo();
+ // }
+ //
+ // getRepo() {
+ // if (this.repoId) {
+ // this.loadingMessage = formInfoLoading;
+ // this.repoService.getRepositoryById(this.repoId).subscribe(
+ // repo => {
+ // this.repo = repo;
+ // },
+ // error => {
+ // console.log(error);
+ // this.loadingMessage = '';
+ // this.errorMessage = loadingRepoError;
+ // },
+ // () => {
+ // this.logoURL = this.repo.logoUrl;
+ // this.getRepoInterfaces();
+ // }
+ // );
+ // }
+ // }
+
+ getRepoInterfaces() {
+ this.group = this.fb.group({});
+ this.repoService.getRepositoryInterface(this.repo.id).subscribe(
+ interfaces => {
+ this.repoInterfaces = interfaces.sort( function(a, b) {
+ if (a.id < b.id) {
+ return -1;
+ } else if (a.id > b.id) {
+ return 1;
+ } else {
+ return 0;
+ }
+ });
+ console.log(`the number of interfaces for ${this.repo.id} is ${this.repoInterfaces.length}`);
+ },
+ error => {
+ console.log(error);
+ this.loadingMessage = '';
+ this.errorMessage = loadingRepoError;
+ },
+ () => {
+ this.loadingMessage = '';
+ this.fillInterfacesForms();
+ }
+ );
+ }
+
+
+ fillInterfacesForms() {
+ this.dataForInterfaceComp = [];
+ if (this.repoInterfaces && (this.repoInterfaces.length > 0)) {
+ for (let i = 0; i < this.repoInterfaces.length; i++) {
+ this.dataForInterfaceComp.push([
+ false, i,
+ { id: this.repo.id,
+ datasourceType: this.repo.datasourceType,
+ datasourceClass: this.repo.datasourceClass,
+ registeredBy: this.repo.registeredBy
+ },
+ this.repoInterfaces[i]
+ ]);
+ }
+ } else {
+ this.dataForInterfaceComp.push([
+ false, 0,
+ { id: this.repo.id,
+ datasourceType: this.repo.datasourceType,
+ datasourceClass: this.repo.datasourceClass,
+ registeredBy: this.repo.registeredBy
+ }
+ ]);
+ }
+ }
+
+ addInterfaceToList(intrf?: RepositoryInterface) {
+ const curIndex = this.dataForInterfaceComp.length;
+ const curRepoInfo = { id: this.repo.id, datasourceType: this.repo.datasourceType,
+ datasourceClass: this.repo.datasourceClass, registeredBy: this.repo.registeredBy };
+ if (intrf) {
+ this.dataForInterfaceComp.push([false, curIndex, curRepoInfo, intrf]);
+ } else {
+ this.dataForInterfaceComp.push([false, curIndex, curRepoInfo]);
+ }
+ }
+
+ removeInterfaceFromList(i: number) {
+ const tempArray = this.dataForInterfaceComp;
+ this.dataForInterfaceComp = [];
+ tempArray.splice(i, 1);
+ this.dataForInterfaceComp = tempArray;
+ console.log(JSON.stringify(this.dataForInterfaceComp));
+ }
+
+ getInterfaces() {
+ this.repoInterfaces = [];
+ for (const el of this.interfacesArray.toArray()) {
+ const intrf = el.getInterface();
+ if (intrf) {
+ this.repoInterfaces.push(intrf);
+ console.log(JSON.stringify(intrf));
+ }
+ }
+ console.log('new interfaces is ', this.repoInterfaces);
+ }
+
+ updateLogoUrl(logoUrl: string) {
+ this.updateLogoUrlModal.ids = [logoUrl];
+ this.updateLogoUrlModal.showModal();
+ }
+
+ updatedLogoUrl(event: any) {
+ this.repo.logoUrl = this.logoURL;
+ this.datasourceUpdateForm.updateGroup.get('logoUrl').setValue(this.logoURL);
+ this.datasourceUpdateForm.updateRepo();
+
+ }
+
+ getNewLogoUrl( event: any ) {
+ this.logoURL = event.target.value;
+
+ }
+
+}
diff --git a/src/app/pages/sources/sources-forms/datasource-create-form.component.html b/src/app/pages/sources/sources-forms/datasource-create-form.component.html
deleted file mode 100755
index 42238ecd7..000000000
--- a/src/app/pages/sources/sources-forms/datasource-create-form.component.html
+++ /dev/null
@@ -1,118 +0,0 @@
-
diff --git a/src/app/pages/sources/sources-forms/datasource-create-form.component.ts b/src/app/pages/sources/sources-forms/datasource-create-form.component.ts
deleted file mode 100755
index 47985a7fd..000000000
--- a/src/app/pages/sources/sources-forms/datasource-create-form.component.ts
+++ /dev/null
@@ -1,257 +0,0 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { Country, Repository, Timezone, Typology } from '../../../domain/typeScriptClasses';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { adminEmailDesc, countryDesc, datasourceTypeDesc, Description, eissnDesc, englishNameDesc, institutionNameDesc,
- issnDesc, latitudeDesc, lissnDesc, logoUrlDesc, longtitudeDesc, officialNameDesc, repoDescriptionDesc,
- softwarePlatformDesc, timezoneDesc, websiteUrlDesc } from '../../../domain/oa-description';
-import { ActivatedRoute } from '@angular/router';
-import { RepositoryService } from '../../../services/repository.service';
-import { AuthenticationService } from '../../../services/authentication.service';
-import { formErrorRequiredFields, noServiceMessage } from '../../../domain/shared-messages';
-
-@Component ({
- selector: 'datasource-create-form',
- templateUrl: './datasource-create-form.component.html'
-})
-
-export class DatasourceCreateFormComponent implements OnInit {
- errorMessage: string;
- successMessage: string;
- loadingMessage: string;
-
- typologies: Typology[] = [];
- timezones: Timezone[] = [];
- countries: Country[] = [];
- datasourceClasses: Map = new Map();
- classCodes: string[] = [];
-
- @Input() mode: string;
-
- @Output() emittedInfo: EventEmitter = new EventEmitter();
-
- @Input() selectedRepo: Repository;
-
- formSubmitted = false;
- group: FormGroup;
-
- // old issn regex
- // issn : ['', [Validators.pattern('^\\d\\d\\d\\d[-]\\d\\d\\d\\d$')] ],
- readonly groupDefinition = {
- softwarePlatform : ['', Validators.required],
- officialName : ['', Validators.required],
- issn : ['', [Validators.pattern('^\\d{4}-\\d{3}[\\dxX]$')] ],
- eissn : ['', Validators.pattern('^\\d{4}-\\d{3}[\\dxX]$') ],
- lissn : ['', Validators.pattern('^\\d{4}-\\d{3}[\\dxX]$') ],
- repoDescription : ['', Validators.required],
- country : ['', Validators.required],
- longtitude : ['', [Validators.required, Validators.min(-180), Validators.max(180)] ],
- latitude : ['', [Validators.required, Validators.min(-90), Validators.max(90)] ],
- websiteUrl : ['', [Validators.required, Validators.pattern('^(http:\\/\\/www\\.|https:\\/\\/www\\.|http:\\/\\/|https:\\/\\/)?[a-z0-9]+([\\-\\.]{1}[a-z0-9]+)*\\.[a-z]{2,5}(:[0-9]{1,5})?(\\/.*)?$')] ],
- institutionName : ['', Validators.required],
- englishName: ['', Validators.required],
- logoUrl: ['', Validators.pattern('^(http:\\/\\/www\\.|https:\\/\\/www\\.|http:\\/\\/|https:\\/\\/)?[a-z0-9]+([\\-\\.]{1}[a-z0-9]+)*\\.[a-z]{2,5}(:[0-9]{1,5})?(\\/.*)?$') ],
- timezone: ['', Validators.required],
- datasourceType: ['', Validators.required],
- adminEmail: ['', [Validators.required, Validators.email] ]
- };
-
- softwarePlatformDesc: Description = softwarePlatformDesc;
- officialNameDesc: Description = officialNameDesc;
- issnDesc: Description = issnDesc;
- eissnDesc: Description = eissnDesc;
- lissnDesc: Description = lissnDesc;
- repoDescriptionDesc: Description = repoDescriptionDesc;
- countryDesc: Description = countryDesc;
- longtitudeDesc: Description = longtitudeDesc;
- latitudeDesc: Description = latitudeDesc;
- websiteUrlDesc: Description = websiteUrlDesc;
- institutionNameDesc: Description = institutionNameDesc;
- englishNameDesc: Description = englishNameDesc;
- logoUrlDesc: Description = logoUrlDesc;
- timezoneDesc: Description = timezoneDesc;
- datasourceTypeDesc: Description = datasourceTypeDesc;
- adminEmailDesc: Description = adminEmailDesc;
-
- constructor(
- private fb: FormBuilder,
- private route: ActivatedRoute,
- private repoService: RepositoryService,
- private authService: AuthenticationService
- ) {}
-
- ngOnInit() {
- this.loadForm();
- }
-
- loadForm() {
- if (!this.mode) {
- this.mode = this.route.snapshot.url[0].path.toString();
- console.log(`my mode is ${this.mode}`);
- }
- this.group = this.fb.group(this.groupDefinition);
- if (this.mode === 'journal') {
- this.group.get('issn').clearValidators();
- this.group.get('issn').setValidators([Validators.required, Validators.pattern('^\\d{4}-\\d{3}[\\dxX]$')]);
- }
- this.getTypologies();
- this.getTimezones();
- this.getCountries();
- this.getDatasourceClasses();
-
- if (this.selectedRepo) {
- this.setupForm();
- }
- }
-
- setupForm() {
- if (this.selectedRepo) {
- console.log(`my datasource type is: ${this.selectedRepo.datasourceType}`);
-
- this.group.setValue({
- softwarePlatform: this.selectedRepo.typology,
- officialName: this.selectedRepo.officialName,
- issn: '',
- eissn: '',
- lissn: '',
- repoDescription: this.selectedRepo.description,
- country: this.selectedRepo.countryCode,
- longtitude: this.selectedRepo.longitude,
- latitude: this.selectedRepo.latitude,
- websiteUrl: this.selectedRepo.websiteUrl,
- institutionName: this.selectedRepo.organization,
- englishName: this.selectedRepo.englishName,
- logoUrl: this.selectedRepo.logoUrl,
- timezone: this.selectedRepo.timezone,
- datasourceType: this.selectedRepo.datasourceClass,
- adminEmail: this.selectedRepo.contactEmail
- });
-
- if (this.selectedRepo.datasourceType === 'journal') {
-
- let ssnToShow = this.selectedRepo.issn.slice(0, 4) + '-' + this.selectedRepo.issn.toString().slice(4);
- this.group.get('issn').setValue(ssnToShow);
-
- if (this.selectedRepo.eissn.trim().length) {
- ssnToShow = this.selectedRepo.eissn.slice(0, 4) + '-' + this.selectedRepo.eissn.toString().slice(4);
- this.group.get('eissn').setValue(ssnToShow);
- }
-
- if (this.selectedRepo.lissn.trim().length) {
- ssnToShow = this.selectedRepo.lissn.slice(0, 4) + '-' + this.selectedRepo.lissn.toString().slice(4);
- this.group.get('lissn').setValue(ssnToShow);
- }
-
- }
- }
- }
-
- getCountries() {
- this.repoService.getCountries()
- .subscribe(
- countries => this.countries = countries.sort( function(a, b) {
- if (a.name < b.name) {
- return -1;
- } else if (a.name > b.name) {
- return 1;
- } else {
- return 0;
- }
- } ),
- error => {
- this.errorMessage = noServiceMessage;
- console.log(error);
- });
- }
-
- getDatasourceClasses() {
- this.repoService.getDatasourceClasses(this.mode).subscribe(
- classes => this.datasourceClasses = classes,
- error => {
- this.errorMessage = noServiceMessage;
- console.log(error);
- },
- () => {
- for (const key of Object.keys(this.datasourceClasses)) {
- this.classCodes.push(key);
- }
- }
- );
- }
-
- getTypologies() {
- this.repoService.getTypologies().subscribe(
- types => this.typologies = types,
- error => console.log(error)
- );
- }
-
- getTimezones() {
- this.repoService.getTimezones().subscribe(
- zones => this.timezones = zones,
- error => console.log(error)
- );
- }
-
- registerDatasource() {
- this.formSubmitted = true;
- this.errorMessage = '';
- this.successMessage = '';
- window.scroll(1, 1);
-
- if (this.group.valid) {
- this.selectedRepo = this.createNewRepository();
- this.emittedInfo.emit(this.selectedRepo);
- } else {
- this.errorMessage = formErrorRequiredFields;
- }
- }
-
- createNewRepository(): Repository {
- const newRepo: Repository = new Repository();
- newRepo.officialName = this.group.get('officialName').value.toString();
- newRepo.englishName = this.group.get('englishName').value.toString();
- newRepo.websiteUrl = this.group.get('websiteUrl').value;
- newRepo.logoUrl = this.group.get('logoUrl').value;
- newRepo.contactEmail = this.group.get('adminEmail').value;
- newRepo.countryName = this.countries.filter(x => x.code === this.group.get('country').value)[0].name;
- newRepo.countryCode = this.group.get('country').value;
- newRepo.organization = this.group.get('institutionName').value.toString();
- newRepo.latitude = this.group.get('latitude').value;
- newRepo.longitude = this.group.get('longtitude').value;
- newRepo.timezone = this.group.get('timezone').value;
- newRepo.datasourceClass = this.group.get('datasourceType').value;
- newRepo.typology = this.group.get('softwarePlatform').value;
- newRepo.description = this.group.get('repoDescription').value.toString();
- newRepo.issn = '';
- newRepo.eissn = '';
- newRepo.lissn = '';
-
- if ( this.group.get('issn').value ) {
- let ssnParts = this.group.get('issn').value.split('-');
- let correctSSN = ssnParts[0] + ssnParts[1];
- newRepo.issn = correctSSN;
- if ( this.group.get('eissn').value ) {
- ssnParts = this.group.get('eissn').value.split('-');
- correctSSN = ssnParts[0] + ssnParts[1];
- newRepo.eissn = correctSSN;
- }
- if ( this.group.get('lissn').value ) {
- ssnParts = this.group.get('lissn').value.split('-');
- correctSSN = ssnParts[0] + ssnParts[1];
- newRepo.lissn = correctSSN;
- }
- }
-
- newRepo.registeredBy = this.authService.getUserEmail();
-
- /* THE BELOW FIELDS ARE NOT SET IN GWT CODE*/
- newRepo.datasourceType = this.mode;
- newRepo.dateOfCreation = new Date(Date.now()); // NOT NEEDED ??
- newRepo.registered = true;
- newRepo.registrationDate = new Date(Date.now()); // NOT NEEDED ??
-
- return newRepo;
- }
-
-
-}
diff --git a/src/app/pages/sources/sources-forms/datasource-new-interface-form.component.html b/src/app/pages/sources/sources-forms/datasource-new-interface-form.component.html
deleted file mode 100644
index 7fee56ad3..000000000
--- a/src/app/pages/sources/sources-forms/datasource-new-interface-form.component.html
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
- {{ loadingMessage }}
-
-
-
-
-
-
{{ successMessage }}
-
{{ errorMessage }}
-
- Base OAI-PMH URL (*)
-
- Identified
-
-
-
-
- Desired Compatibility Level (*)
-
- -- none selected --
- {{compClasses[key]}}
-
-
-
-
Current Compatibility Level
-
{{ existingCompLevel ? existingCompLevel : 'not available' }}
-
-
-
= new EventEmitter();
- interfaceToExport: RepositoryInterface;
-
- repoInterfaceForm: FormGroup;
- readonly repoInterfaceFormDef = {
- baseUrl: ['', Validators.required],
- selectValidationSet: [''],
- customValidationSet: [''],
- compatibilityLevel: ['']
- };
- baseUrlDesc: Description = baseUrlDesc;
- existingValSetDesc: Description = existingValSetDesc;
- customValSetDesc: Description = customValSetDesc;
- compatibilityLevelDesc: Description = compatibilityLevelDesc;
-
- identifiedBaseUrl: boolean;
- valsetList: string[] = [];
- existingCompLevel: string;
- classCodes: string[] = [];
- compClasses: Map = new Map();
- existingValSet: boolean;
- interfaceInfo: InterfaceInformation;
-
- constructor(private fb: FormBuilder,
- private valService: ValidatorService,
- private repoService: RepositoryService) {}
-
- ngOnInit() {
- if (this.data && (this.data.length >= 3)) {
- this.inRegister = this.data[0];
- this.interfaceID = this.data[1];
- this.currentRepo = this.data[2];
- this.repoInterfaceForm = this.fb.group(this.repoInterfaceFormDef);
- this.chooseValSet(true);
- if (this.data[3]) {
- this.currentInterface = this.data[3];
- this.repoInterfaceForm.get('baseUrl').setValue(this.currentInterface.baseUrl);
- this.repoInterfaceForm.get('compatibilityLevel').setValue(this.currentInterface.desiredCompatibilityLevel);
- }
- this.getInterfaceInfo();
- this.getCompatibilityClasses();
- }
- }
-
-
- getInterfaceInfo() {
- this.successMessage = '';
- this.errorMessage = '';
-
- const baseUrl = this.repoInterfaceForm.get('baseUrl').value;
- if (baseUrl) {
- this.loadingMessage = formInfoLoading;
- this.valService.getInterfaceInformation(baseUrl).subscribe(
- info => {
- this.interfaceInfo = info;
- if (this.interfaceInfo.identified) {
- this.identifiedBaseUrl = true;
- } else {
- this.errorMessage = invalidCustomBaseUrl;
- }
- if (this.interfaceInfo.sets) {
- this.valsetList = this.interfaceInfo.sets;
- console.log(this.valsetList);
- }
- },
- error => {
- console.log(error);
- this.loadingMessage = '';
- this.identifiedBaseUrl = false;
- this.errorMessage = noServiceMessage;
- },
- () => {
- if ( this.currentInterface && this.currentInterface.accessParams && this.currentInterface.accessParams['set'] ) {
- if ( this.valsetList.some( x => x === this.currentInterface.accessParams['set']) ) {
- this.repoInterfaceForm.get('selectValidationSet').setValue(this.currentInterface.accessParams['set']);
- } else {
- this.repoInterfaceForm.get('customValidationSet').setValue(this.currentInterface.accessParams['set']);
- }
- }
- this.loadingMessage = '';
- this.repoInterfaceForm.updateValueAndValidity();
- this.checkIfValid();
- }
- );
- }
- }
-
- getCompatibilityClasses() {
- this.repoService.getCompatibilityClasses(this.currentRepo.datasourceType).subscribe(
- classes => {
- this.compClasses = classes;
- this.classCodes = Object.keys(this.compClasses);
- },
- error => {
- this.errorMessage = noServiceMessage;
- console.log(error);
- },
- () => {
- this.getExistingCompatibilityLevel();
- this.repoInterfaceForm.updateValueAndValidity();
- }
- );
- }
-
- getExistingCompatibilityLevel() {
- if (this.currentInterface) {
- if (this.currentInterface.desiredCompatibilityLevel &&
- this.classCodes.some( x => x === this.currentInterface.desiredCompatibilityLevel ) ) {
- this.existingCompLevel = this.compClasses[this.currentInterface.desiredCompatibilityLevel];
- } else {
- this.repoInterfaceForm.get('compatibilityLevel').setValue('');
- this.existingCompLevel = this.currentInterface.desiredCompatibilityLevel;
- }
- }
- }
-
- chooseValSet(fromList: boolean) {
- this.existingValSet = fromList;
- if (this.existingValSet) {
- this.repoInterfaceForm.get('selectValidationSet').enable();
- this.repoInterfaceForm.get('customValidationSet').disable();
- } else {
- this.repoInterfaceForm.get('selectValidationSet').disable();
- this.repoInterfaceForm.get('customValidationSet').enable();
- }
- this.checkIfValid();
- }
-
- checkIfCompatibilityLevelWasChosen() {
- return ( (this.repoInterfaceForm.get('compatibilityLevel').value !== '') ||
- (this.existingCompLevel && (this.existingCompLevel !== '')) );
- }
-
- formIsValid() {
- return (this.repoInterfaceForm.valid &&
- this.identifiedBaseUrl &&
- this.checkIfCompatibilityLevelWasChosen());
- }
-
- checkIfValid() {
- if (this.formIsValid()) {
- if (this.inRegister) {
- this.successMessage = 'The interface will be stored when the registration procedure is completed.';
- this.saveInterface();
- }
- } else {
- this.successMessage = '';
- this.interfaceToExport = null;
- }
-
- }
-
- saveInterface() {
- this.errorMessage = '';
- this.successMessage = '';
- if (this.formIsValid()) {
- const baseUrl = this.repoInterfaceForm.get('baseUrl').value;
- let valset = '';
- if (this.existingValSet) {
- valset = this.repoInterfaceForm.get('selectValidationSet').value;
- } else {
- valset = this.repoInterfaceForm.get('customValidationSet').value;
- }
- let compLvl = '';
- if (this.repoInterfaceForm.get('compatibilityLevel').value) {
- this.existingCompLevel = this.compClasses[this.repoInterfaceForm.get('compatibilityLevel').value];
- console.log('this.existingCompLevel is', this.existingCompLevel);
- compLvl = this.repoInterfaceForm.get('compatibilityLevel').value;
- } else {
- compLvl = this.existingCompLevel;
- }
-
- if (this.currentInterface) {
- this.updateCurrent(baseUrl, valset, compLvl);
- } else {
- this.addCurrent(baseUrl, valset, compLvl);
- }
- } else {
- this.interfaceToExport = null;
- this.errorMessage = 'Please make sure all required fields are filled with acceptable values.';
- }
- }
-
- getCurrentValues() {
- let intrf = this.currentInterface;
- if (intrf == null) {
- intrf = new RepositoryInterface();
- }
- intrf.baseUrl = this.repoInterfaceForm.get('baseUrl').value;
- if (this.existingValSet) {
- intrf.accessSet = this.repoInterfaceForm.get('selectValidationSet').value;
- intrf.accessParams = {'set': this.repoInterfaceForm.get('selectValidationSet').value};
- } else {
- intrf.accessSet = this.repoInterfaceForm.get('customValidationSet').value;
- intrf.accessParams = {'set': this.repoInterfaceForm.get('customValidationSet').value};
- }
- if (this.repoInterfaceForm.get('compatibilityLevel').value) {
- intrf.desiredCompatibilityLevel = this.repoInterfaceForm.get('compatibilityLevel').value;
- intrf.compliance = this.repoInterfaceForm.get('compatibilityLevel').value;
- } else {
- intrf.desiredCompatibilityLevel = this.existingCompLevel;
- intrf.compliance = this.existingCompLevel;
- }
- intrf.typology = this.currentRepo.datasourceClass;
-
- return intrf;
- }
-
- addCurrent (baseUrl: string, valset: string, compLvl: string) {
- const currentInterface = new RepositoryInterface();
- currentInterface.baseUrl = baseUrl;
- currentInterface.accessSet = valset;
- currentInterface.accessParams = {'set': valset};
- currentInterface.desiredCompatibilityLevel = compLvl;
- currentInterface.compliance = compLvl;
- currentInterface.typology = this.currentRepo.datasourceClass;
- if (!this.inRegister) {
- this.addInterface(currentInterface);
- } else {
- this.successMessage = 'The interface will be stored when the registration procedure is completed';
- console.log('SAVED !');
- this.interfaceToExport = currentInterface;
- }
- }
-
- addInterface(newInterface: RepositoryInterface) {
- this.loadingMessage = formSubmitting;
- this.repoService.addInterface(this.currentRepo.datasourceType,
- this.currentRepo.id,
- this.currentRepo.registeredBy,
- newInterface).subscribe(
- addedInterface => {
- console.log(`addInterface responded ${JSON.stringify(addedInterface)}`);
- this.currentInterface = addedInterface;
- },
- error => {
- console.log(error);
- this.loadingMessage = '';
- this.errorMessage = formErrorWasntSaved;
- this.currentInterface = null;
- },
- () => {
- this.loadingMessage = '';
- if (this.currentInterface.id) {
- this.successMessage = formSuccessAddedInterface;
- this.getExistingCompatibilityLevel();
- } else {
- this.errorMessage = formErrorWasntSaved;
- }
- }
- );
-
- }
-
-
- updateCurrent (baseUrl: string, valset: string, compLvl: string) {
- this.currentInterface.baseUrl = baseUrl;
- this.currentInterface.accessSet = valset;
- this.currentInterface.accessParams['set'] = valset;
- this.currentInterface.desiredCompatibilityLevel = compLvl;
- this.currentInterface.compliance = compLvl;
- this.currentInterface.typology = this.currentRepo.datasourceClass;
-
- if (!this.inRegister) {
- this.updateInterface();
- } else {
- this.successMessage = 'The interface will be stored when the registration procedure is completed';
- console.log('SAVED !');
- this.interfaceToExport = this.currentInterface;
- }
- }
-
- updateInterface() {
- this.loadingMessage = formSubmitting;
- this.repoService.updateInterface(this.currentRepo.id,
- this.currentRepo.registeredBy,
- this.currentInterface).subscribe(
- response => {
- console.log(`updateRepository responded ${JSON.stringify(response)}`);
- if (response) {
- this.currentInterface = response;
- this.successMessage = formSuccessUpdatedInterface;
- } else {
- this.errorMessage = formErrorWasntSaved;
- }
- },
- error => {
- console.log(error);
- this.loadingMessage = '';
- this.errorMessage = formErrorWasntSaved;
- },
- () => {
- this.loadingMessage = '';
- this.getExistingCompatibilityLevel();
- }
- );
- }
-
- removeInterface() {
- this.errorMessage = '';
- this.successMessage = '';
- if (this.interfaceID > 0) {
- if (this.currentInterface && (this.currentInterface.id !== null) && !this.inRegister) {
- this.repoService.deleteInterface(this.currentInterface.id, this.currentRepo.registeredBy).subscribe(
- res => console.log(`deleteInterface responded: ${JSON.stringify(res)}`),
- er => console.log(er),
- () => this.emitDeleteInterface.emit(this.interfaceID)
- );
- } else {
- this.emitDeleteInterface.emit(this.interfaceID);
- }
- } else {
- this.errorMessage = nonRemovableInterface;
- }
- }
-
- getInterface() {
- return this.interfaceToExport;
- }
-
-}
diff --git a/src/app/pages/sources/sources-forms/datasource-update-form.component.html b/src/app/pages/sources/sources-forms/datasource-update-form.component.html
deleted file mode 100755
index 0bf0e8d16..000000000
--- a/src/app/pages/sources/sources-forms/datasource-update-form.component.html
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
- {{ loadingMessage }}
-
-
-
{{ errorMessage }}
-{{ successMessage }}
-
-
diff --git a/src/app/pages/sources/sources-forms/datasource-update-form.component.ts b/src/app/pages/sources/sources-forms/datasource-update-form.component.ts
deleted file mode 100755
index af0bb6e94..000000000
--- a/src/app/pages/sources/sources-forms/datasource-update-form.component.ts
+++ /dev/null
@@ -1,326 +0,0 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { formErrorRequiredFields, formErrorWasntSaved, formSubmitting, formSuccessUpdatedRepo, loadingRepoError,
- loadingRepoMessage, noServiceMessage } from '../../../domain/shared-messages';
-import { RepositoryService } from '../../../services/repository.service';
-import { AbstractControl, FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { Country, Repository, Timezone, Typology } from '../../../domain/typeScriptClasses';
-import { Description, softwarePlatformDesc, platformNameDesc, officialNameDesc, repoDescriptionDesc, countryDesc,
- longtitudeDesc, latitudeDesc, websiteUrlDesc, institutionNameDesc, englishNameDesc, logoUrlDesc, timezoneDesc,
- datasourceTypeDesc, adminEmailDesc, lissnDesc, eissnDesc, issnDesc } from '../../../domain/oa-description';
-import { AuthenticationService } from '../../../services/authentication.service';
-
-@Component ({
- selector: 'datasource-update-form',
- templateUrl: './datasource-update-form.component.html'
-})
-
-export class DatasourceUpdateFormComponent implements OnInit {
-
- errorMessage: string;
- successMessage: string;
- loadingMessage: string;
-
- typologies: Typology[] = [];
- timezones: Timezone[] = [];
- countries: Country[] = [];
- datasourceClasses: Map = new Map();
- classCodes: string[] = [];
-
- /* in sources/register (in literature or data mode) the updated repository is emitted */
- @Output() emittedInfo: EventEmitter = new EventEmitter();
-
- @Input() selectedRepo: Repository;
-
- @Input() showButton: boolean;
-
- repoId: string;
- formSubmitted = false;
- updateGroup: FormGroup;
- readonly updateGroupDefinition = {
- softwarePlatform : '',
- platformName : '',
- officialName : ['', Validators.required],
- issn : ['', [Validators.pattern('^\\d{4}-\\d{3}[\\dxX]$')] ],
- eissn : ['', Validators.pattern('^\\d{4}-\\d{3}[\\dxX]$') ],
- lissn : ['', Validators.pattern('^\\d{4}-\\d{3}[\\dxX]$') ],
- repoDescription : ['', Validators.required],
- country : '',
- longtitude : '',
- latitude : '',
- websiteUrl : [''],
- institutionName : ['', Validators.required],
- englishName: ['', Validators.required],
- logoUrl: ['', Validators.pattern('^(http:\\/\\/www\\.|https:\\/\\/www\\.|http:\\/\\/|https:\\/\\/)?[a-z0-9]+([\\-\\.]{1}[a-z0-9]+)*\\.[a-z]{2,5}(:[0-9]{1,5})?(\\/.*)?$') ],
- timezone: ['', Validators.required],
- datasourceType: ['', Validators.required],
- adminEmail: ['', [Validators.required, Validators.email]]
- };
-
- softwarePlatformDesc: Description = softwarePlatformDesc;
- platformNameDesc: Description = platformNameDesc;
- officialNameDesc: Description = officialNameDesc;
- issnDesc: Description = issnDesc;
- eissnDesc: Description = eissnDesc;
- lissnDesc: Description = lissnDesc;
- repoDescriptionDesc: Description = repoDescriptionDesc;
- countryDesc: Description = countryDesc;
- longtitudeDesc: Description = longtitudeDesc;
- latitudeDesc: Description = latitudeDesc;
- websiteUrlDesc: Description = websiteUrlDesc;
- institutionNameDesc: Description = institutionNameDesc;
- englishNameDesc: Description = englishNameDesc;
- logoUrlDesc: Description = logoUrlDesc;
- timezoneDesc: Description = timezoneDesc;
- datasourceTypeDesc: Description = datasourceTypeDesc;
- adminEmailDesc: Description = adminEmailDesc;
-
- constructor(
- private fb: FormBuilder,
- private repoService: RepositoryService,
- private authService: AuthenticationService
- ) {}
-
- ngOnInit() {
- this.loadForm();
- }
-
- loadForm() {
- if (this.selectedRepo) {
- this.repoId = this.selectedRepo.id.split('::')[1];
- this.loadingMessage = loadingRepoMessage;
- this.updateGroup = this.fb.group(this.updateGroupDefinition, {validator: checkPlatform});
- this.getDatasourceClasses();
- } else {
- this.errorMessage = loadingRepoError;
- }
- }
-
- setupUpdateForm() {
- if (this.selectedRepo) {
- console.log(`my datasource type is: ${this.selectedRepo.datasourceType}`);
-
- this.updateGroup.setValue({
- softwarePlatform: this.selectedRepo.typology,
- platformName: '',
- officialName: this.selectedRepo.officialName,
- issn: '',
- eissn: '',
- lissn: '',
- repoDescription: this.selectedRepo.description,
- country: this.selectedRepo.countryCode,
- longtitude: this.selectedRepo.longitude,
- latitude: this.selectedRepo.latitude,
- websiteUrl: this.selectedRepo.websiteUrl,
- institutionName: this.selectedRepo.organization,
- englishName: this.selectedRepo.englishName,
- logoUrl: this.selectedRepo.logoUrl,
- timezone: this.selectedRepo.timezone,
- datasourceType: this.selectedRepo.datasourceClass,
- adminEmail: this.selectedRepo.contactEmail
- });
-
- if ( this.selectedRepo.typology === '' || !this.typologies.some(x => x.value === this.selectedRepo.typology) ) {
- this.updateGroup.get('softwarePlatform').setValue('');
- this.updateGroup.get('platformName').setValue(this.selectedRepo.typology);
- }
-
- if ((this.selectedRepo.datasourceType === 'opendoar') ||
- (this.selectedRepo.datasourceType === 're3data')) {
-
- // this.updateGroup.get('officialName').disable();
- this.updateGroup.get('country').disable();
- // this.updateGroup.get('longtitude').disable();
- // this.updateGroup.get('latitude').disable();
- this.updateGroup.get('websiteUrl').disable();
- // this.updateGroup.get('institutionName').disable();
-
- }
-
- if (this.selectedRepo.datasourceType === 'journal') {
-
- let ssnToShow = this.selectedRepo.issn.slice(0, 4) + '-' + this.selectedRepo.issn.toString().slice(4);
- this.updateGroup.get('issn').setValue(ssnToShow);
- this.updateGroup.get('issn').clearValidators();
- this.updateGroup.get('issn').setValidators([Validators.required, Validators.pattern('^\\d{4}-\\d{3}[\\dxX]$')]);
-
- if (this.selectedRepo.eissn.trim().length) {
- ssnToShow = this.selectedRepo.eissn.slice(0, 4) + '-' + this.selectedRepo.eissn.toString().slice(4);
- this.updateGroup.get('eissn').setValue(ssnToShow);
- }
-
- if (this.selectedRepo.lissn.trim().length) {
- ssnToShow = this.selectedRepo.lissn.slice(0, 4) + '-' + this.selectedRepo.lissn.toString().slice(4);
- this.updateGroup.get('lissn').setValue(ssnToShow);
- }
-
- /* it was decided that all fields will be open, 21-12-2018 */
- /*this.updateGroup.get('issn').disable();
- this.updateGroup.get('eissn').disable();
- this.updateGroup.get('lissn').disable();*/
- }
- /*this.getDatasourceClasses();*/
- }
- }
-
- getDatasourceClasses() {
- this.repoService.getDatasourceClasses(this.selectedRepo.datasourceType).subscribe(
- classes => this.datasourceClasses = classes,
- error => {
- this.loadingMessage = '';
- this.errorMessage = noServiceMessage;
- console.log(error);
- },
- () => {
- for (const key of Object.keys(this.datasourceClasses)) {
- this.classCodes.push(key);
- }
- this.getCountries();
- }
- );
- }
-
- getCountries() {
- this.repoService.getCountries()
- .subscribe(
- countries => this.countries = countries.sort( function(a, b) {
- if (a.name < b.name) {
- return -1;
- } else if (a.name > b.name) {
- return 1;
- } else {
- return 0;
- }
- } ),
- error => {
- this.loadingMessage = '';
- this.errorMessage = noServiceMessage;
- console.log(error);
- }, () => {
- this.getTypologies();
- });
- }
-
- getTypologies() {
- this.repoService.getTypologies().subscribe(
- types => this.typologies = types,
- error => {
- this.loadingMessage = '';
- console.log(error);
- },
- () => {
- this.getTimezones();
- }
- );
- }
-
- getTimezones() {
- this.repoService.getTimezones().subscribe(
- zones => this.timezones = zones,
- error => {
- this.loadingMessage = '';
- console.log(error);
- },
- () => {
- this.loadingMessage = '';
- this.setupUpdateForm();
- }
- );
- }
-
- updateRepo() {
- this.formSubmitted = true;
- this.errorMessage = '';
- this.successMessage = '';
- window.scroll(1, 1);
-
- if (this.updateGroup.valid) {
- if ( this.selectedRepo.datasourceType !== 'journal' || this.updateGroup.get('issn').value ) {
- this.refreshSelectedRepo();
-
- /*
- call the api only if the current page is sources/update
- [otherwise the repository will be updated during the registration procedure, after the first interface is saved]
- */
- if (this.showButton) {
- this.loadingMessage = formSubmitting;
- this.errorMessage = '';
- this.repoService.updateRepository(this.selectedRepo).subscribe(
- response => {
- if (response) {
- this.selectedRepo = response;
- console.log(`updateRepository responded: ${JSON.stringify(response)}`);
- }
- },
- error => {
- console.log(error);
- this.loadingMessage = '';
- this.errorMessage = formErrorWasntSaved;
- },
- () => {
- this.loadingMessage = '';
- if (!this.selectedRepo) {
- this.errorMessage = formErrorWasntSaved;
- } else {
- this.successMessage = formSuccessUpdatedRepo;
- }
- }
- );
- }
- } else {
- this.errorMessage = formErrorRequiredFields;
- }
- } else {
- this.errorMessage = formErrorRequiredFields;
- }
- }
-
- refreshSelectedRepo() {
- if (this.updateGroup.get('softwarePlatform').value ) {
- this.selectedRepo.typology = this.updateGroup.get('softwarePlatform').value;
- } else if (this.updateGroup.get('platformName').value) {
- this.selectedRepo.typology = this.updateGroup.get('platformName').value;
- }
- this.selectedRepo.officialName = this.updateGroup.get('officialName').value.toString();
- this.selectedRepo.description = this.updateGroup.get('repoDescription').value.toString();
- this.selectedRepo.countryCode = this.updateGroup.get('country').value;
- this.selectedRepo.countryName = this.countries.filter(x => x.code === this.updateGroup.get('country').value)[0].name;
- this.selectedRepo.longitude = this.updateGroup.get('longtitude').value;
- this.selectedRepo.latitude = this.updateGroup.get('latitude').value;
- this.selectedRepo.websiteUrl = this.updateGroup.get('websiteUrl').value;
- this.selectedRepo.organization = this.updateGroup.get('institutionName').value.toString();
- this.selectedRepo.englishName = this.updateGroup.get('englishName').value.toString();
- this.selectedRepo.logoUrl = this.updateGroup.get('logoUrl').value;
- this.selectedRepo.timezone = this.updateGroup.get('timezone').value;
- this.selectedRepo.datasourceClass = this.updateGroup.get('datasourceType').value;
- this.selectedRepo.contactEmail = this.updateGroup.get('adminEmail').value;
- if (this.selectedRepo.datasourceType === 'journal') {
- let ssnParts = this.updateGroup.get('issn').value.split('-');
- let correctSSN = ssnParts[0] + ssnParts[1];
- this.selectedRepo.issn = correctSSN;
- if ( this.updateGroup.get('eissn').value ) {
- ssnParts = this.updateGroup.get('eissn').value.split('-');
- correctSSN = ssnParts[0] + ssnParts[1];
- this.selectedRepo.eissn = correctSSN;
- }
- if ( this.updateGroup.get('lissn').value ) {
- ssnParts = this.updateGroup.get('lissn').value.split('-');
- correctSSN = ssnParts[0] + ssnParts[1];
- this.selectedRepo.lissn = correctSSN;
- }
- }
- if (!this.showButton) {
- this.selectedRepo.registeredBy = this.authService.getUserEmail();
- this.selectedRepo.registered = true;
- this.selectedRepo.registrationDate = new Date(Date.now()); // NOT NEEDED ??
- this.emittedInfo.emit(this.selectedRepo);
- }
- }
-
-}
-
-export function checkPlatform(c: AbstractControl) {
- if ( c.get('softwarePlatform').value || c.get('platformName').value ) {
- return null;
- }
- return 'invalid';
-}
diff --git a/src/app/pages/sources/sources-register.component.html b/src/app/pages/sources/sources-register.component.html
index f92daeb5f..6b6a17948 100755
--- a/src/app/pages/sources/sources-register.component.html
+++ b/src/app/pages/sources/sources-register.component.html
@@ -1,176 +1,85 @@
-
-
-
-
Register your datasource
+
+
+
Register your datasource
-
-
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
- Make sure your repository is already registered in OpenDOAR, the authoritative directory of institutional and thematic OA repositories.
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
- Make sure your data repository is registered in Re3Data, the global registry of research data repositories from different academic disciplines.
-
-
-
+
Literature repository
+
+
+
Make sure your repository is already registered in OpenDOAR, the authoritative
+ directory of institutional and thematic OA repositories, and is compatible with the OpenAIRE Guidelines for Literature Repositories.
+
+ List provided by
+
+
-
-
-
-
-
-
- Make sure that your Open Access Journal is compatible with the OpenAIRE literature Guidelines.
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
- Make sure that your publications aggregator is compatible with the OpenAIRE literature Guidelines.
-
-
-
+
Data repository
+
+
+
Make sure your data repository is registered in Re3Data, the global registry
+ of research data repositories from different academic disciplines, and is compatible with the OpenAIRE Guidelines for Data Archives.
+
+ List provided by
+
-
-
-
+
+
+
+
+
+
+
-
-
-
-
@@ -178,21 +87,124 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
Aggregator
+
+
+
+
+
+
+
+
+
+
Coming soon
+
+
+
+
+
+
+
+
+
+
+
CRIS systems
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Software
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Catch-all
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Other sources
+
+
+
+
+
+
+
-
+
+
+
+
+
-
+
diff --git a/src/app/pages/sources/sources-register.component.ts b/src/app/pages/sources/sources-register.component.ts
index d1b059235..5feb8155b 100755
--- a/src/app/pages/sources/sources-register.component.ts
+++ b/src/app/pages/sources/sources-register.component.ts
@@ -1,9 +1,5 @@
-/*
-* created by myrto
-*/
-
-
import { Component, OnInit } from '@angular/core';
+import { Router } from "@angular/router";
@Component({
selector: 'app-sources-register',
@@ -12,9 +8,27 @@ import { Component, OnInit } from '@angular/core';
export class SourcesRegisterComponent implements OnInit {
- constructor() {
+ constructor(private router: Router) {
}
ngOnInit() {
+ let body = document.getElementsByTagName('body')[0];
+ body.classList.remove("top_bar_active"); //remove the class
+ body.classList.remove("page_heading_active");
+ body.classList.remove("landing");
+ body.classList.add("dashboard");
+ }
+
+ // fixme still when I click the link inside the text in overlay, this event happens as well (I go to the first step of the wizard)
+ goTo(datasourceType: string) {
+ if(datasourceType==='literature') {
+ this.router.navigateByUrl(`/sources/register/${datasourceType}?step=selectDatasource`);
+ } else if(datasourceType==='data') {
+ this.router.navigateByUrl(`/sources/register/${datasourceType}?step=selectDatasource`);
+ } else if(datasourceType==='journal') {
+ this.router.navigateByUrl(`/sources/register/${datasourceType}?step=basicInformation`);
+ } else if(datasourceType==='aggregator') {
+ this.router.navigateByUrl(`/sources/register/${datasourceType}?step=basicInformation`);
+ }
}
}
diff --git a/src/app/pages/sources/sources-register/register-datasource-select-existing.component.html b/src/app/pages/sources/sources-register/register-datasource-select-existing.component.html
index 5b82a7932..b6cca6342 100755
--- a/src/app/pages/sources/sources-register/register-datasource-select-existing.component.html
+++ b/src/app/pages/sources/sources-register/register-datasource-select-existing.component.html
@@ -1,68 +1,81 @@
-
-
-
-
- {{ alertMessage }}
-
-
- Please make sure your repository is registered in
-
-
- .
-
+
+
+
+
+ {{ alertMessage }}
+
+
+ Please make sure your repository is registered in
+
+
+ .
+
Last Updated: {{ latestUpdate }}
-
-
-
- Select repository's country
-
- -- none selected --
- {{ country.name ? country.name : country.code }}
-
-
-
- Start typing in the name of your repository to narrow down the view
-
-
-
-
-
{{ sourceTitle }} Repositories in {{ selectedCountry.name ? selectedCountry.name : selectedCountry.code }}
-
-
-
- {{ loadingMessage }}
-
-
-
-
{{ noRepositories }}
-
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/sources/sources-register/register-existing-datasource.component.html b/src/app/pages/sources/sources-register/register-existing-datasource.component.html
index f59759545..2807f9c97 100644
--- a/src/app/pages/sources/sources-register/register-existing-datasource.component.html
+++ b/src/app/pages/sources/sources-register/register-existing-datasource.component.html
@@ -1,150 +1,222 @@
-
-
-
-
Register your datasource
+
+
+
Register your datasource
-
-
+
-
-
-
+
+
+
-
-
+
+
+
+
+
diff --git a/src/app/pages/sources/sources-register/register-existing-datasource.component.ts b/src/app/pages/sources/sources-register/register-existing-datasource.component.ts
index 906342b48..0199e635a 100644
--- a/src/app/pages/sources/sources-register/register-existing-datasource.component.ts
+++ b/src/app/pages/sources/sources-register/register-existing-datasource.component.ts
@@ -8,7 +8,7 @@ import { ActivatedRoute, Router } from '@angular/router';
import { FormBuilder } from '@angular/forms';
import { AsideHelpContentComponent, HelpContentComponent } from '../../../shared/reusablecomponents/help-content.component';
import { RepositoryService } from '../../../services/repository.service';
-import { DatasourceNewInterfaceFormComponent } from '../sources-forms/datasource-new-interface-form.component';
+import { DatasourceNewInterfaceFormComponent } from '../../../shared/reusablecomponents/sources-forms/datasource-new-interface-form.component';
import { from, of } from 'rxjs';
import { concatMap } from 'rxjs/operators';
import {
@@ -17,7 +17,7 @@ import {
formInfoLoading, formInterfacesLoading, loadingInterfacesError, loadingRepoError,
noInterfacesSaved
} from '../../../domain/shared-messages';
-import { DatasourceUpdateFormComponent } from '../sources-forms/datasource-update-form.component';
+import { DatasourceUpdateFormComponent } from '../../../shared/reusablecomponents/sources-forms/datasource-update-form.component';
import { RegisterDatasourceSelectExistingComponent } from './register-datasource-select-existing.component';
@Component({
@@ -34,6 +34,7 @@ export class RegisterExistingDatasourceComponent implements OnInit {
repo: Repository;
repoInterfaces: RepositoryInterface[] = [];
interfacesToDelete: string[] = [];
+ // comments: string;
/* queryParams are used to follow the steps without refreshing the page
* This was needed for Help Service [which sends back info according to the current router.url].
@@ -56,6 +57,9 @@ export class RegisterExistingDatasourceComponent implements OnInit {
@ViewChild ('registerDatasource')
registerDatasource: DatasourceUpdateFormComponent;
+ @ViewChild ('interfaceComments')
+ interfaceComments: DatasourceNewInterfaceFormComponent;
+
@ViewChildren('interfacesArray') interfacesArray: QueryList
;
dataForInterfaceComp: any[] = [];
@@ -64,6 +68,8 @@ export class RegisterExistingDatasourceComponent implements OnInit {
private router: Router,
private repoService: RepositoryService) {}
+ // @ViewChild('updateTermsForm')
+
ngOnInit() {
if (this.datasourceType && this.currentMode) {
// will execute getStep() every time there is a change in query params
@@ -94,6 +100,15 @@ export class RegisterExistingDatasourceComponent implements OnInit {
}
} else if (stepName === 'finish') {
this.currentStep = 3;
+ // ToU: to enable ToU delete the 2 lines above and uncomment the section below
+ /*} else if (stepName === 'termsOfUse') {
+ if (!this.interfacesArray) {
+ this.router.navigateByUrl(`/sources/register/${this.datasourceType}?step=selectDatasource`);
+ } else {
+ this.currentStep = 3;
+ }
+ } else if (stepName === 'finish') {
+ this.currentStep = 4;*/
}
}
this.rightHelperContent.ngOnInit();
@@ -103,6 +118,7 @@ export class RegisterExistingDatasourceComponent implements OnInit {
}
moveAStep() {
+ window.scrollTo(0, 0);
this.errorMessage = '';
if (this.currentStep === 0) {
if (this.datasourcesByCountry.goToNextStep()) {
@@ -120,6 +136,8 @@ export class RegisterExistingDatasourceComponent implements OnInit {
} else {
if (this.repoInterfaces.length > 0) {
this.registerRepository();
+// ToU: replace above line with the comment below
+ // this.router.navigateByUrl(`/sources/register/${this.datasourceType}?step=termsOfUse`);
} else {
this.errorMessage = noInterfacesSaved;
window.scrollTo(1, 1);
@@ -127,10 +145,14 @@ export class RegisterExistingDatasourceComponent implements OnInit {
}
}
);
+ // ToU: uncomment these lines
+ // } else if (this.currentStep === 3) {
+ // this.registerRepository();
}
}
moveBackAStep() {
+ window.scrollTo(0, 0);
this.errorMessage = '';
if (this.currentStep === 1) {
this.repoInterfaces = [];
@@ -140,10 +162,16 @@ export class RegisterExistingDatasourceComponent implements OnInit {
of(this.getInterfaces()).subscribe(
() => this.router.navigateByUrl(`/sources/register/${this.datasourceType}?step=basicInformation`)
);
+ // ToU: uncomment these lines
+ // } else if (this.currentStep === 3) {
+ // this.router.navigateByUrl(`/sources/register/${this.datasourceType}?step=interfaces`);
}
}
addInterfaceToList(intrf?: RepositoryInterface) {
+
+ console.log('clicked add interface to list');
+
const curIndex = this.dataForInterfaceComp.length;
const curRepoInfo = { id: this.repo.id, datasourceType: this.repo.datasourceType,
datasourceClass: this.repo.datasourceClass, registeredBy: this.repo.registeredBy };
@@ -313,6 +341,7 @@ export class RegisterExistingDatasourceComponent implements OnInit {
},
() => {
this.saveNewInterfaces();
+ // TODO: update terms when backend is ready, maybe POST with updateRepository
}
);
}
@@ -327,11 +356,13 @@ export class RegisterExistingDatasourceComponent implements OnInit {
if (this.interfacesToDelete.some(id => id === intrf.id)) {
req = this.repoService.deleteInterface(intrf.id, this.repo.registeredBy);
} else {
- req = this.repoService.updateInterface(this.repo.id, this.repo.registeredBy, intrf);
+ const comments = this.interfaceComments.getComments();
+ req = this.repoService.updateInterface(this.repo.id, this.repo.registeredBy, comments, intrf);
}
return req;
} else {
- return this.repoService.addInterface(this.repo.datasourceType, this.repo.id, this.repo.registeredBy, intrf);
+ const comments = this.interfaceComments.getComments();
+ return this.repoService.addInterface(this.repo.datasourceType, this.repo.id, this.repo.registeredBy, comments, intrf);
}
})
).subscribe(
diff --git a/src/app/pages/sources/sources-register/register-new-datasource.component.html b/src/app/pages/sources/sources-register/register-new-datasource.component.html
index ca6c11caf..a7b5502e5 100644
--- a/src/app/pages/sources/sources-register/register-new-datasource.component.html
+++ b/src/app/pages/sources/sources-register/register-new-datasource.component.html
@@ -1,137 +1,354 @@
-
-
-
-
Register your datasource
+
+
+
Register your datasource
-