-
-
-
-
-
-
-
-
-
-
-
Claims related to
-
-
-
-
-
-
-
-
-
-
diff --git a/portal/src/app/claimPages/claims/claims.component.ts b/portal/src/app/claimPages/claims/claims.component.ts
deleted file mode 100644
index 3e83ad13..00000000
--- a/portal/src/app/claimPages/claims/claims.component.ts
+++ /dev/null
@@ -1,377 +0,0 @@
-import {Component, ViewChild, Input} from '@angular/core';
-import {JSONP_PROVIDERS} from '@angular/http';
-import {Location} from '@angular/common';
-import {Observable} from 'rxjs/Observable';
-import { RouteParams, RouteConfig, ROUTER_DIRECTIVES, Router } from '@angular/router-deprecated';
-import {ClaimsService} from '../../services/claims.service';
-import {Claim} from '../../entities/claim';
-import {ClaimTextFilterPipe} from '../../pipes/claimTextFilter.pipe';
-import {ClaimTypeFilterPipe} from '../../pipes/claimTypeFilter.pipe';
-import {PagingFormatter} from '../../common/pagingFormatter.component';
-import {pagingFormatterNoLoad} from '../../common/pagingFormatterNoLoad.component';
-import {ClaimEntityFormatter} from '../../common/claimEntityFormatter.component';
-import {Alert} from '../../common/modal/alert';
-import {Loading} from '../../common/modal/loading.component';
-
-@Component({
- selector: 'claims',
- directives: [...ROUTER_DIRECTIVES, PagingFormatter, pagingFormatterNoLoad, ClaimEntityFormatter, Alert, Loading],
- templateUrl: 'src/app/claimPages/claims/claims.component.html',
- providers:[ ClaimsService, JSONP_PROVIDERS],
- pipes: [ClaimTextFilterPipe, ClaimTypeFilterPipe]
-
-})
-export class ClaimsComponent {
- constructor (private _claimService: ClaimsService, private _routeParams: RouteParams, private _router:Router, private location: Location) {
- }
-
- ngOnInit() {
- console.info(this.isAdmin+" "+this.myClaims+" Fetch by: "+this.fetchBy+" Fetch id: "+this.fetchId);
- if( this.myClaims == 'true' ){
- console.info("Is myclaims");
- this.fetchBy = "User";
- }else{
- console.info("Is admin");
-
- console.info(this.isAdmin);
-
- this.fetchBy = this._routeParams.get('fetchBy');
- this.fetchBy = (this.types.indexOf(this.fetchBy) != -1)? this.fetchBy:'All';
- this.fetchId = this._routeParams.get('fetchId');
- console.info("Fetch by:"+this.fetchBy+"Fetch id:"+this.fetchId);
- this.fetchId=this.fetchId?this.fetchId:'';
-
- }
- console.info(this.isAdmin+" "+this.myClaims+" Fetch by: "+this.fetchBy+" Fetch id: "+this.fetchId);
-
- let page = +this._routeParams.get('page');
- let size = +this._routeParams.get('size');
- this.keyword = (this._routeParams.get('keyword')?this._routeParams.get('keyword'):"");
- this.inputkeyword = this.keyword;
- this.page = ( page <= 0 ) ? 1 : page;
- this.size = ( size <= 0 ) ? 10 : size;
- this.entityTypes = (this._routeParams.get('types')?this._routeParams.get('types'):'');
- this.setTypes(); // check the appropriate checkboxes
- this.setSortby(this._routeParams.get('sort'));
- this.getClaims();
-
- }
- //string because comes as input from component directive
- @Input() enableDelete: string = 'false';
- @Input() myClaims: string= 'false' ;
- @Input() isAdmin:string = 'false';
- page : number;
- size:number;
- keyword:string; // the keyword string to give to the request as parameter
- inputkeyword:string; // the string written in the input field (keyword=inputkeyword when its length is bigger than 3 and the user stops typing)
- lengths = [10,20,30,50];
- types = ["All","Project","Context","Result","User"];
- @Input() fetchBy:string;
- @Input() fetchId:string;
-
- navigateTo: string = "Claims";
- resultsNum: number ;
- claims: string[];
-
- @ViewChild (Loading) loading : Loading ;
-
- //checkboxes:
- publicationCB = false;
- datasetCB = false;
- contextCB = false;
- projectCB = false;
- entityTypes : string ='' ;
-
- descending = true;
- sortby = "date";
-
- selected=[];
- selectAllClaims:boolean = false;
-
-
-
- //params for pagingFormatter to use when navigate to page
- params;
- @ViewChild(Alert) alert;
-
- claimsDeleted:number = 0;
-
- getClaims () {
- this.selectAllClaims = false;
- this.selected=[];
- if(this.fetchBy =="Project" ){
- this._claimService.getClaimsByProject(this.size,this.page,this.fetchId,this.keyword,this.sortby,this.descending, this.entityTypes).subscribe(
- data => {
- this.claims = data.data;
- this.resultsNum= data.total;
- },
- err => console.error(err)
- );
- }else if(this.fetchBy =="User"){
- console.info("Fetch by:"+this.fetchBy+"Fetch id:"+this.fetchId);
-
- this._claimService.getClaimsByUser(this.size,this.page,this.fetchId,this.keyword,this.sortby,this.descending, this.entityTypes).subscribe(
- data => {
- this.claims = data.data;
- this.resultsNum= data.total;
- },
- err => console.error(err)
- );
- }else if(this.fetchBy =="Result"){
- this._claimService.getClaimsByResult(this.size,this.page,this.fetchId,this.keyword,this.sortby,this.descending, this.entityTypes).subscribe(
- data => {
- this.claims = data.data;
- this.resultsNum= data.total;
- },
- err => console.error(err)
- );
- }else if(this.fetchBy =="Context"){
- this._claimService.getClaimsBycontext(this.size,this.page,this.fetchId,this.keyword,this.sortby,this.descending, this.entityTypes).subscribe(
- data => {
- this.claims = data.data;
- this.resultsNum= null;
- this.resultsNum= data.total;//data.length; //TODO get the total results num
- },
- err => console.error(err)
- );
- }else{
- this._claimService.getClaims(this.size,this.page,this.keyword,this.sortby,this.descending, this.entityTypes).subscribe(
- data => {
- this.claims = data.data;
- this.resultsNum = null;
- this.resultsNum= data.total;//data.length; //TODO get the total results num
- },
- err => console.error(err)
- );
- }
- }
-
- goToClaim(claimId: number){
- this._router.navigate( ['Claim', { id: claimId}] );
- }
- goTo(page:number = 1){
-
- this.page = page;
-
- this.location.go(location.pathname,this.getParametersString());
- this.getClaims();
- // console.info("In goto - params( page:"+params.page+", size: "+params.size+", fetchId:"+params.fetchId);
- //this._router.navigate( [this.navigateTo,this.getParameters()] );
- }
- getParameters(){
- let params={ page: this.page, size: this.size, types: this.entityTypes, fetchBy: this.fetchBy, fetchId:this.fetchId, keyword : this.keyword, sort: this.getSortby() };
- return params;
- }
- getParametersString(){
- var params='';
- params+=(this.page==1?"":(params.length>0?'&':'')+"page="+this.page);
- params+=(this.size==10?"":(params.length>0?'&':'')+"size="+this.size);
- params+=(this.entityTypes==''?"":(params.length>0?'&':'')+"types="+this.entityTypes);
- if(this.isAdmin === 'true'){
- params+=(this.fetchBy=='All'?"":(params.length>0?'&':'')+"fetchBy="+this.fetchBy);
- params+=(this.fetchId==''?"":(params.length>0?'&':'')+"fetchId="+this.fetchId);
- }
- params+=(this. getSortby()=='datedesc'?"":(params.length>0?'&':'')+"sort="+this. getSortby());
- params+=(this.keyword==''?"":(params.length>0?'&':'')+"keyword="+this.keyword);
- return params;
- }
- changeLength(){
- this.goTo();
- }
- clearFilters(){
- this.keyword = '';
- this.inputkeyword = '';
- this.publicationCB = false;
- this.projectCB = false;
- this.datasetCB = false;
- this.contextCB = false;
- this.entityTypes = '';
- this.goTo();
- }
- changeOrderby(sortby:string){
- if(sortby==this.sortby){
- this.descending = !this.descending;
- }else{
- this.sortby = sortby;
- this.descending = false;
- }
- this.goTo();
- }
- setSortby(sortby:string){
- if(!sortby|| sortby == "datedesc"){
- this.descending = true;
- this.sortby = "date";
- }else if(sortby == "dateasc"){
- this.descending = false;
- this.sortby = "date";
- }else if(sortby == "userasc"){
- this.descending = false;
- this.sortby = "user";
- }else if(sortby == "userdesc"){
- this.descending = true;
- this.sortby = "user";
- }if(sortby =="sourceasc"){
- this.descending = false;
- this.sortby = "source";
- }else if(sortby == "sourcedesc"){
- this.descending = true;
- this.sortby = "source";
- }else if(sortby == "targetasc"){
- this.descending = false;
- this.sortby = "target";
- }else if(sortby == "targetdesc"){
- this.descending = true;
- this.sortby = "target";
- }
- }
- getSortby():string{
- if(this.descending){
- return this.sortby+"desc";
- }else{
- return this.sortby+"asc";
- }
-
- }
- changeType(){
- console.debug("ChangingType: "+this.entityTypes+" types"+this.publicationCB+ this.datasetCB + this.contextCB + this.projectCB);
- if(this.publicationCB == true && this.datasetCB == true && this.contextCB == true && this.projectCB == true ){
- this.entityTypes="";
- }else{
- this.entityTypes = "";
- if(this.publicationCB == true){
- this.entityTypes = "publication";
- }
- if(this.datasetCB == true){
- this.entityTypes += (this.entityTypes.length > 0?",":"")+"dataset";
- }
- if(this.contextCB == true){
- this.entityTypes += (this.entityTypes.length > 0?",":"")+"context";
- }
- if(this.projectCB == true){
- this.entityTypes += (this.entityTypes.length > 0?",":"")+"project";
- }
- }
- console.debug("Type changed: "+this.entityTypes+" "+this.publicationCB+ this.datasetCB + this.contextCB + this.projectCB);
- this.goTo();
- }
- setTypes(){
- if(this.entityTypes.length > 0){
- if(this.entityTypes.indexOf("publication")!=-1){
- this.publicationCB = true;
- }
- if(this.entityTypes.indexOf("dataset")!=-1){
- this.datasetCB = true;
- }
- if(this.entityTypes.indexOf("project")!=-1){
- this.projectCB = true;
- }
- if(this.entityTypes.indexOf("context")!=-1){
- this.contextCB = true;
- }
- }
- if(this.publicationCB && this.datasetCB && this.contextCB && this.projectCB){
- this.entityTypes='';
- }else{
- if(this.publicationCB){
- this.entityTypes = "publication";
- }
- if(this.datasetCB){
- this.entityTypes = (this.entityTypes.length > 0?",":"")+"dataset";
- }
- if(this.contextCB){
- this.entityTypes = (this.entityTypes.length > 0?",":"")+"context";
- }
- if(this.projectCB){
- this.entityTypes = (this.entityTypes.length > 0?",":"")+"project";
- }
- }
- }
- changekeyword(){
-
- if(this.inputkeyword.length >= 3 || this.inputkeyword.length == 0 ){
- this.keyword = this.inputkeyword;
- this.page = 1;
- this.goTo();
- }
-
- }
- select(item:any,event){
- var value = event.currentTarget.checked;
- console.debug("value:"+value);
- if(value){
- this.selectAllClaims = false;
- this.selected.push(item);
- console.debug("select one more! with id:"+item.id);
- }else{
-
- var index:number =this.selected.indexOf(item);
- console.info("Try to remove item from :"+this.selected.indexOf(item));
- if (index > -1) {
- this.selected.splice(index, 1);
- }
- console.info("Item removed "+this.selected.indexOf(item));
- }
- }
- selectAll(){
- this.selectAllClaims = true;
- this.selected = this.claims;
- }
- deselectAll(){
- this.selectAllClaims = false;
- this.selected = [];
- }
-
- confirmOpen(){
- this.alert.cancelButton = true;
- this.alert.okButton = true;
- this.alert.alertTitle = "Delete "+this.selected.length+" claim(s)";
- this.alert.message = this.selected.length+" claims will be deleted. Do you want to proceed? ";
- this.alert.okButtonText = "Yes";
- this.alert.cancelButtonText = "No";
- this.alert.open();
- }
- confirmClose(data){
- this.delete();
- }
- delete(){
- this.loading.open();
- this.claimsDeleted = 0;
- for (var i = 0; i < this.selected.length; i++){
- var id =this.selected[i].id;
- var selected =this.selected[i].id;
- console.warn("Deleting claim with id:"+id);
- this.deleteById(id);
- //TODO for multiple concurrent
- }
- }
- deleteById(id:string){
-
- console.warn("Deleting claim with id:"+id);
- // this._claimService.deleteClaimById(id);
- this._claimService.deleteClaimById(id).subscribe(
- res => {
- console.info('Delete response'+res.code );
- console.warn("Deleted claim with id:"+ id);
- //remove this claim from the
- let newClaims=this.claims;
- for (var _i = 0; _i < this.claims.length; _i++) {
- let claim = this.claims[_i];
- if(claim['id'] == id){
- newClaims.splice(_i, 1);
- }
- }
- //TODO should call getClaims???
- this.claimsDeleted++;
- this.claims = newClaims;
- if(this.claimsDeleted == this.selected.length){
- this.loading.close();
- }
-
-
- });
- }
- pageChange($event) {
- var page:number = +$event.value
- this.goTo(page);
- }
-}
diff --git a/portal/src/app/claimPages/claims/claimsAdmin.component.ts b/portal/src/app/claimPages/claims/claimsAdmin.component.ts
deleted file mode 100644
index 7f946956..00000000
--- a/portal/src/app/claimPages/claims/claimsAdmin.component.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import {Component, ViewChild, Input} from '@angular/core';
-import {JSONP_PROVIDERS} from '@angular/http';
-import {Location} from '@angular/common';
-import {Observable} from 'rxjs/Observable';
-import { RouteParams, RouteConfig, ROUTER_DIRECTIVES, Router } from '@angular/router-deprecated';
-import {ClaimsService} from '../../services/claims.service';
-import {Claim} from '../../entities/claim';
-import {ClaimTextFilterPipe} from '../../pipes/claimTextFilter.pipe';
-import {ClaimTypeFilterPipe} from '../../pipes/claimTypeFilter.pipe';
-import {PagingFormatter} from '../../common/pagingFormatter.component';
-import {pagingFormatterNoLoad} from '../../common/pagingFormatterNoLoad.component';
-import {ClaimEntityFormatter} from '../../common/claimEntityFormatter.component';
-import {Alert} from '../../common/modal/alert';
-import {Loading} from '../../common/modal/loading.component';
-import {ClaimsComponent} from './claims.component';
-
-@Component({
- selector: 'claims',
- directives: [...ROUTER_DIRECTIVES , ClaimsComponent],
- template: `
-
-
-
-
- TODO login
-
- `,
-
-})
-export class ClaimsAdminComponent {
- constructor ( ) {
-
- }
-user:string="argirok@di.uoa.gr";
- ngOnInit() {
-
-
- }
-
-
-}
diff --git a/portal/src/app/claimPages/inlineClaimContext/inlineClaimContext.component.ts b/portal/src/app/claimPages/inlineClaimContext/inlineClaimContext.component.ts
deleted file mode 100644
index 38672061..00000000
--- a/portal/src/app/claimPages/inlineClaimContext/inlineClaimContext.component.ts
+++ /dev/null
@@ -1,259 +0,0 @@
-import {Component, Input, ViewChild, Output, EventEmitter} from '@angular/core';
-import {JSONP_PROVIDERS} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-import { RouteParams, RouteConfig, ROUTER_DIRECTIVES, Router } from '@angular/router-deprecated';
-import {ClaimContextComponent} from '../linking/claimContext/claimContext.component';
-import {ClaimSelectedComponent} from '../linking/selected/selected.component';
-import {ClaimInsertComponent} from '../linking/insertClaim/insertClaim.component';
-
-@Component({
- selector: 'inline-claim-context',
- directives: [ROUTER_DIRECTIVES, ClaimContextComponent, ClaimSelectedComponent, ClaimInsertComponent],
- template: `
-
-
-
-
-
-
-
-
-
-
Finish
-
Cancel
-
-
-
-
-
-
-`
-
-})
- export class InlineClaimContextComponent {
- constructor ( private _router: Router ) {
-
- }
-
- @Input() public inlineEntity:any;
- @Input() public inlineType:string;
-
-
- contexts=[];
- publications;
- datasets;
- private show = 'context';
- private showComp:string = 'false';
- private enableButton:boolean=true;
- keyword: string = "";
-
- @Output() contextAdded = new EventEmitter();
-
-@ViewChild (ClaimInsertComponent) claimInsert : ClaimInsertComponent ;
- ngOnInit() {
-
- }
- next(){
- if(this.inlineType === 'dataset'){
- this.datasets = [];
- this.datasets.push(this.inlineEntity[0]);
- }else if(this.inlineType === 'publication'){
- this.publications = [];
- this.publications.push(this.inlineEntity[0]);
- console.info(" result: :targetId: " +this.publications[0].id + "targetType :"+ this.publications[0].type+" targetCollectedFrom:"+ this.publications[0].source+ "targetAccessRights :"+this.publications[0].accessRights+ " targetEmbargoEndDate:"+this.publications[0].embargoEndDate);
- }
- if( this.show == 'context'){
- this.show='claim';
- }
- }
- prev(){
- if(this.show == 'claim'){
- this.show = 'context';
- }
- }
-
-
- contextsChange($event) {
- this.contexts=$event.value;
- console.log($event.value);
- }
-
- showChange($event) {
- this.show=$event.value;
- if(this.show == "end"){
- //TODO
- this.contextAdded.emit({
- value: this.contexts
- });
- this.contexts = [];
- this.hideComponent();
-
- }else if(this.show == "error"){
- this.showComponent();
- }
- }
- public toggle(){
- if(this.showComp == 'false'){
- this.showComponent();
- }else{
- this.hideComponent();
- }
- }
- private showComponent(){
- this.showComp='true';
- this.enableButton = true;
-
- }
- private hideComponent(){
- this.showComp='false';
- }
- private insert(){
- this.claimInsert.publications = [];
- this.claimInsert.publications.push(this.inlineEntity[0]);
- this.publications = [];
- this.publications.push(this.inlineEntity[0]);
- console.info(" result: :targetId: " +this.publications[0].id + "targetType :"+ this.publications[0].type+" targetCollectedFrom:"+ this.publications[0].source+ "targetAccessRights :"+this.publications[0].accessRights+ " targetEmbargoEndDate:"+this.publications[0].embargoEndDate);
- this.enableButton = false;
- this.claimInsert.insert();
-
- }
- private cancel(){
- this.contexts = [];
-
- this.hideComponent();
- }
-}
-
-// import {Component, Input} from '@angular/core';
-// import {JSONP_PROVIDERS} from '@angular/http';
-// import {Observable} from 'rxjs/Observable';
-// import { RouteParams, RouteConfig, ROUTER_DIRECTIVES, Router } from '@angular/router-deprecated';
-// import {ClaimContextComponent} from '../linking/claimContext/claimContext.component';
-// import {ClaimSelectedComponent} from '../linking/selected/selected.component';
-// import {ClaimInsertComponent} from '../linking/insertClaim/insertClaim.component';
-//
-// @Component({
-// selector: 'inline-claim-context',
-// directives: [ROUTER_DIRECTIVES, ClaimContextComponent, ClaimSelectedComponent, ClaimInsertComponent],
-// template: `
-//
-//
-//
-//
-//
Find Context:
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-// `
-//
-// })
-// export class InlineClaimContextComponent {
-// constructor ( private _router: Router ) {
-//
-// }
-//
-// @Input() public inlineEntity:any;
-// @Input() public inlineType:string;
-//
-//
-// contexts=[];
-// publications;
-// datasets;
-// show = "context";
-// keyword: string = "";
-//
-// ngOnInit() {
-//
-// }
-// next(){
-// if(this.inlineType === 'dataset'){
-// this.datasets = [];
-// this.datasets.push(this.inlineEntity[0]);
-// }else if(this.inlineType === 'publication'){
-// this.publications = [];
-// this.publications.push(this.inlineEntity[0]);
-// console.info(" result: :targetId: " +this.publications[0].id + "targetType :"+ this.publications[0].type+" targetCollectedFrom:"+ this.publications[0].source+ "targetAccessRights :"+this.publications[0].accessRights+ " targetEmbargoEndDate:"+this.publications[0].embargoEndDate);
-// }
-// if( this.show == 'context'){
-// this.show='claim';
-// }
-// }
-// prev(){
-// if(this.show == 'claim'){
-// this.show = 'context';
-// }
-// }
-//
-//
-// contextsChange($event) {
-// this.contexts=$event.value;
-// console.log($event.value);
-// }
-//
-// showChange($event) {
-// this.show=$event.value;
-// if(this.show == "end"){
-// this.contexts = [];
-// this.show = "context";
-// }
-// }
-//
-// }
diff --git a/portal/src/app/claimPages/inlineClaimProject/inlineClaimProject.component.ts b/portal/src/app/claimPages/inlineClaimProject/inlineClaimProject.component.ts
deleted file mode 100644
index 4eae8400..00000000
--- a/portal/src/app/claimPages/inlineClaimProject/inlineClaimProject.component.ts
+++ /dev/null
@@ -1,158 +0,0 @@
-import {Component, Input, ViewChild, Output, EventEmitter} from '@angular/core';
-import {JSONP_PROVIDERS} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-import { RouteParams, RouteConfig, ROUTER_DIRECTIVES, Router } from '@angular/router-deprecated';
-import {ClaimProjectsComponent} from '../linking/claimProject/claimProject.component';
-import {ClaimSelectedComponent} from '../linking/selected/selected.component';
-import {ClaimInsertComponent} from '../linking/insertClaim/insertClaim.component';
-
-@Component({
- selector: 'inline-claim-project',
- directives: [ROUTER_DIRECTIVES, ClaimProjectsComponent, ClaimSelectedComponent, ClaimInsertComponent],
- template: `
-
-
-
-
-
-
-
-
-
-
Finish
-
Cancel
-
-
-
-
-
-`
-
-})
- export class InlineClaimProjectComponent {
- constructor ( private _router: Router ) {
-
- }
-
- @Input() public inlineEntity:any;
- @Input() public inlineType:string;
-
-
- projects=[];
- publications;
- datasets;
- private show = 'project';
- private showComp:boolean = false;
- private enableButton:boolean=true;
- keyword: string = "";
-
- @Output() projectAdded = new EventEmitter();
-
-@ViewChild (ClaimInsertComponent) claimInsert : ClaimInsertComponent ;
- ngOnInit() {
-
- }
- next(){
- if(this.inlineType === 'dataset'){
- this.datasets = [];
- this.datasets.push(this.inlineEntity[0]);
- }else if(this.inlineType === 'publication'){
- this.publications = [];
- this.publications.push(this.inlineEntity[0]);
- console.info(" result: :targetId: " +this.publications[0].id + "targetType :"+ this.publications[0].type+" targetCollectedFrom:"+ this.publications[0].source+ "targetAccessRights :"+this.publications[0].accessRights+ " targetEmbargoEndDate:"+this.publications[0].embargoEndDate);
- }
- if( this.show == 'project'){
- this.show='claim';
- }
- }
- prev(){
- if(this.show == 'claim'){
- this.show = 'project';
- }
- }
-
-
- projectsChange($event) {
- this.projects=$event.value;
- console.log($event.value);
- }
-
- showChange($event) {
- this.show=$event.value;
- if(this.show == "end"){
- //TODO
- this.projectAdded.emit({
- value: this.projects
- });
- this.projects = [];
- this.hideComponent();
-
- }else if(this.show == "error"){
- this.showComponent();
- }
- }
- public toggle(){
- console.info("TOOGLE pr ");
- if(!this.showComp){
- console.info("TOOGLE show ");
- this.showComponent();
- }else{
- console.info("TOOGLE hide ");
- this.hideComponent();
- }
- }
- private showComponent(){
- this.showComp=true;
- this.enableButton = true;
-
- }
- private hideComponent(){
- this.showComp=false;
- }
- private insert(){
- this.claimInsert.publications = [];
- this.claimInsert.publications.push(this.inlineEntity[0]);
- this.publications = [];
- this.publications.push(this.inlineEntity[0]);
- console.info(" result: :targetId: " +this.publications[0].id + "targetType :"+ this.publications[0].type+" targetCollectedFrom:"+ this.publications[0].source+ "targetAccessRights :"+this.publications[0].accessRights+ " targetEmbargoEndDate:"+this.publications[0].embargoEndDate);
- this.enableButton = false;
- this.claimInsert.insert();
-
- }
- private cancel(){
- this.projects = [];
-
- this.hideComponent();
- }
-}
diff --git a/portal/src/app/claimPages/linking/claimContext/claimContext.component.ts b/portal/src/app/claimPages/linking/claimContext/claimContext.component.ts
deleted file mode 100644
index d54dd180..00000000
--- a/portal/src/app/claimPages/linking/claimContext/claimContext.component.ts
+++ /dev/null
@@ -1,274 +0,0 @@
-import {Component, Input,Output, ElementRef, EventEmitter} from '@angular/core';
-import {JSONP_PROVIDERS} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-import { RouteParams, ROUTER_DIRECTIVES} from '@angular/router-deprecated';
-import {ContextsService} from '../../../services/contexts.service';
-
-
-@Component({
- selector: 'claim-contexts',
- template: `
-
-
{{warningMessage}}
-
{{infoMessage}}
- `,
- providers:[ ContextsService ]
-
-})
-export class ClaimContextComponent {
- ngOnInit() {
-this.getCommunities();
-
-}
-@Input() public inline= 'false' ; // for claimed started from landing pages
-@Input() public showComponent= 'true' ; // for claimed started from landing pages
-
-public query = '';
-public filteredList = [];
-@Input() public selectedList ;
-public elementRef;
-@Output() contextsChange = new EventEmitter();
-
-public communities:string[];
-@Input() public selectedCommunityId:string = "0";
- selectedCommunityLabel:string = "Community:";
-@Output() cselectedCommunityChange = new EventEmitter();
-
-public categories:string[];
-@Input() public selectedCategoryId:string ="0";
-selectedCategoryLabel:string ="Category:";
-@Output() selectedCategoryChange = new EventEmitter();
-public concepts:string[];
-public warningMessage = "";
-public infoMessage = "";
-
-constructor(private _contextService: ContextsService,myElement: ElementRef) {
- this.elementRef = myElement;
-}
-
-filter() {
- this.warningMessage = "";
- this.infoMessage = "";
- if(this.selectedCommunityId == "0"){
- this.warningMessage = "Please select Community";
- }else if (this.query !== ""){
- this.warningMessage = "";
- this.infoMessage = "";
- if(this.selectedCategoryId == "0"){
- this.warningMessage = "Specify category for more concepts";
- }
- this.filteredList = this.concepts.filter(function(el){
- return el.label.toLowerCase().indexOf(this.query.toLowerCase()) > -1;
- }.bind(this));
- if(this.filteredList.length == 0 ){
- this.infoMessage = "No results found";
- }
- }else{
- this.filteredList = [];
- }
-}
-
-select(item){
- this.query = "";
- this.filteredList = [];
- var context= { community: this.selectedCommunityLabel, category: this.selectedCategoryLabel, concept: item };
- var found:boolean = false;
- this.warningMessage = "";
- for (var _i = 0; _i < this.selectedList.length; _i++) {
- let item = this.selectedList[_i];
- if(item.concept.id == context.concept.id){
- found=true;
- this.warningMessage = "Concept already in selected list";
- }
- }
- if (!found) {
- this.selectedList.push(context);
- this.contextsChange.emit({
- value: this.selectedList
- });
- }
- // var index:number =this.selectedList.indexOf(context);
- // if (index == -1) {
- // this.selectedList.push(context);
- // this.contextsChange.emit({
- // value: this.selectedList
- // });
- // }
-
-}
-// remove(item){
-// var index:number =this.selectedList.indexOf(item);
-// if (index > -1) {
-// this.selectedList.splice(index, 1);
-// }
-// this.contextsChange.emit({
-// value: this.selectedList
-// });
-// }
-handleClick(event){
- var clickedComponent = event.target;
- var inside = false;
- do {
- if (clickedComponent === this.elementRef.nativeElement) {
- inside = true;
- }
- clickedComponent = clickedComponent.parentNode;
- } while (clickedComponent);
- if(!inside){
- this.filteredList = [];
- }
-}
-getCommunities () {
- this._contextService.getCommunities().subscribe(
- data => {
- this.communities = data.communities;
- // var concept= ["{id: this.communities['id'], label: this.communities['label'] }"];
- // this.filteredList.push(concept);
- // this.concepts.push(concept);
- },
- err => console.error(err)
- );
- }
- getCategories () {
- this.categories=[];
- if(this.selectedCommunityId != '0'){
- this._contextService.getCategories(this.selectedCommunityId).subscribe(
- data => {
- this.categories = data.category;
- this.concepts = [];
- this.filteredList = [];
- if (this.query !== ""){
- this.filter();
- }
-
- },
- err => console.error(err)
- );
- }
- }
- getConcepts () {
- if(this.selectedCategoryId != '0'){
- this._contextService.getConcepts(this.selectedCategoryId, "").subscribe(
- data => {
- this.concepts = data.concept;
- if (this.query !== ""){
- this.filter();
- }
- },
- err => console.error(err)
- );
- }else{
- this.concepts=[];
- }
- }
-communityChanged(communityId:string, communityLabel:string){
- this.warningMessage = "";
- this.infoMessage = "";
- this.selectedCommunityId= communityId;
- this.selectedCommunityLabel= communityLabel;
- this.getCategories();
-
-}
-categoryChanged(categoryId:string, categoryLabel:string){
- this.warningMessage = "";
- this.infoMessage = "";
- this.selectedCategoryId = categoryId;
- this.selectedCategoryLabel = categoryLabel;
- this.getConcepts();
-
-}
-
-}
diff --git a/portal/src/app/claimPages/linking/claimProject/claimProject.component.ts b/portal/src/app/claimPages/linking/claimProject/claimProject.component.ts
deleted file mode 100644
index c37caa55..00000000
--- a/portal/src/app/claimPages/linking/claimProject/claimProject.component.ts
+++ /dev/null
@@ -1,205 +0,0 @@
-import {Component, Input,Output, ElementRef, EventEmitter, ViewChild} from '@angular/core';
-import {JSONP_PROVIDERS} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-import { RouteParams, ROUTER_DIRECTIVES} from '@angular/router-deprecated';
-import {OpenaireProjectsService} from '../../../services/openaireProjects.service';
-import {Loading} from '../../../common/modal/loading.component';
-
-@Component({
- selector: 'claim-projects',
- template: `
-
-
-
{{warningMessage}}
-
{{infoMessage}}
- `,
- providers:[ OpenaireProjectsService ],
- directives: [Loading]
-
-})
-export class ClaimProjectsComponent {
- ngOnInit() {
- console.info("Claim projects - init ....");
-this.getFunders();
-
-}
-@Input() public inline= 'false' ; // for claimed started from landing pages
-public query = '';
-public filteredList = [];
-@Input() public selectedProjects=[] ;
-public elementRef;
-@Output() projectsChange = new EventEmitter();
-
-public funders:string[];
-@Input() public selectedFunderId:string ="0";
-selectedFunderName:string ="Select funder:";
-@Output() cselectedFunderChange = new EventEmitter();
-
-public projects:string[];
-public warningMessage = "";
-public infoMessage = "";
-
-// @ViewChild (Loading) loading : Loading ;
-
-
-constructor(private _projectService: OpenaireProjectsService,myElement: ElementRef) {
- this.elementRef = myElement;
-}
-
-filter() {
- console.info("Search projects");
- if (this.selectedFunderId == '0' ){
- this.warningMessage = "Please select a funder first";
- this.infoMessage = "";
- }else if ( this.query == "" || this.query.length < 3){
- this.warningMessage = "Please type a keyword, containing at least 3 characters"
- this.infoMessage = "";
- }else{
- this.warningMessage = "";
- this.infoMessage = "";
- // this.loading.open();
- this._projectService.searchForProjects(this.query, this.selectedFunderId).subscribe(
- data => {
- this.filteredList =(data == null)?[]:data;
- this.infoMessage = (data == null)?"No Results found":"";
- // this.loading.close();
- },
- err => {
- console.error(err);
- // this.loading.close();
- this.warningMessage = "An error occured";
-
- }
- );
- }
-}
-
-select(item){
- this.query = "";
- this.filteredList = [];
- var project= { funderId: this.selectedFunderId,funderName: this.selectedFunderName, projectId: item.field[0]['@value'], projectName: item.field[3]['@value'] , projectAcronym: item.field[1]['@value'] };
- var index:number =this.selectedProjects.indexOf(project);
- var found:boolean = false;
- this.warningMessage = "";
- for (var _i = 0; _i < this.selectedProjects.length; _i++) {
- let item = this.selectedProjects[_i];
- if(item.projectId == project.projectId){
- found=true;
- this.warningMessage = "Project already in selected list";
- }
- }
- if (!found) {
- this.selectedProjects.push(project);
- this.projectsChange.emit({
- value: this.selectedProjects
- });
- }
-
-}
-remove(item){
- var index:number =this.selectedProjects.indexOf(item);
- if (index > -1) {
- this.selectedProjects.splice(index, 1);
- }
- this.projectsChange.emit({
- value: this.selectedProjects
- });
-}
-handleClick(event){
- var clickedComponent = event.target;
- var inside = false;
- do {
- if (clickedComponent === this.elementRef.nativeElement) {
- inside = true;
- }
- clickedComponent = clickedComponent.parentNode;
- } while (clickedComponent);
- if(!inside){
- this.filteredList = [];
- }
-}
-getFunders () {
- console.info("Getting Funders....");
- this._projectService.getFunders().subscribe(
- data => {
- this.funders = data;
- },
- err => console.error(err)
- );
- }
-
- getProjects () {
- if(this.selectedFunderId != '0'){
-
- }
- }
-funderChanged(funderId:string, funderName:string){
- this.selectedFunderId = funderId;
- this.selectedFunderName = funderName;
- console.info("Selected funder:"+this.selectedFunderId+ ' name:'+funderName );
-
-}
-
-}
diff --git a/portal/src/app/claimPages/linking/claimResult/claimDataset/claimDataset.component.ts b/portal/src/app/claimPages/linking/claimResult/claimDataset/claimDataset.component.ts
deleted file mode 100644
index 71f0f094..00000000
--- a/portal/src/app/claimPages/linking/claimResult/claimDataset/claimDataset.component.ts
+++ /dev/null
@@ -1,181 +0,0 @@
-import {Component, Input, Output, EventEmitter} from '@angular/core';
-import {JSONP_PROVIDERS} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-import { RouteParams, RouteConfig, ROUTER_DIRECTIVES, Router } from '@angular/router-deprecated';
-import {pagingFormatterNoLoad} from '../../../../common/pagingFormatterNoLoad.component';
-import {PublicationTitleFormatter} from '../../../../common/publicationTitleFormatter.component';
-import {SearchDataciteService} from '../../../../services/searchDatacite.service';
-
-
-@Component({
- selector: 'claim-dataset',
- directives: [...ROUTER_DIRECTIVES,pagingFormatterNoLoad, PublicationTitleFormatter],
- template: `
-
-
-
{{warningMessage}}
-
{{infoMessage}}
-
-
-
-
-
-
-
-
-
-
{{dataciteResultsNum }} Total Results
-
-
-
No results found
-
-
-
-
-
-
Under Development....
-
-
No results found
-
-
-
-
-
- `,
- providers:[JSONP_PROVIDERS, SearchDataciteService]
-})
-export class ClaimDatasetComponent {
- constructor (private _searchDataciteService: SearchDataciteService,
- private _routeParams: RouteParams) {
- var myDate = new Date();
- this.todayDate = myDate.getFullYear()+ "-" +(myDate.getMonth() + 1) + "-" + myDate.getDate() ;
- this.nextDate = (myDate.getFullYear()+100)+ "-" +(myDate.getMonth() + 1) + "-" + myDate.getDate() ;
-
- }
- ngOnInit() {
- if(this.keyword !=null && this.keyword.length > 0){
- this.searchDatacite(this.keyword,this.size,this.page);
- }
-}
-
- private page : number = 1;
- private size:number = 10;
- private navigateTo: string = "Search";
- private source: string = "datacite";
- private type : string = "dataset";
- @Input() public select:boolean = true ;
- @Input() public keyword:string = '';
- @Input() public selectedDatasets = [] ;
- @Output() datasetsChange = new EventEmitter();
-
- dataciteResults=[];
- dataciteResultsNum : Observable
= null;
- openaireResults=[];
- openaireResultsNum : Observable = null ;
-
- public warningMessage = "";
- public infoMessage = "";
-
- private todayDate = '';
- private nextDate = '';
- public search(term: string, size : number, page : number){
- this.searchDatacite(term,10,1);
- //TODO add openaire search
- }
- private searchDatacite (term: string, size : number, page : number) {
- this.getDataciteResults(term,size,page);
- this.warningMessage = "";
- this.infoMessage = "";
-
- }
-
- getDataciteResults (term: string, size : number, page : number) {
- this._searchDataciteService.searchDataciteResults(term, size, page).subscribe(
- data => {
- this.dataciteResults = data.docs;
- this.page=page;
- this.dataciteResultsNum = data.numFound;
- },
- err => console.error(err)
- );
- }
-
- add(item, itemId,itemType,itemSource,itemTitle, itemUrl){
- var result ;
- if(itemSource == 'datacite'){
- result = {id: itemId, type :itemType, source : itemSource, title: itemTitle,url: itemUrl, result: item, accessRights: 'OPEN', embargoEndDate: this.nextDate};
- }else if (itemSource == 'openaire'){
-
- }
- var found:boolean = this.isSelected( result.id);
- this.warningMessage = "";
- if (!found) {
- this.selectedDatasets.push(result);
- this.datasetsChange.emit({
- value: this.selectedDatasets
- });
- }else{
- this.warningMessage = "Dataset already in selected list";
- }
-
- }
-
-
- pageChange($event) {
- this.page=$event.value;
- this.dataciteResults=[];
- this.searchDatacite(this.keyword,10,this.page);
- this.warningMessage = "";
- this.infoMessage = "";
-
- }
- isSelected(id:string){
-
- var found:boolean = false;
- this.warningMessage = "";
- for (var _i = 0; _i < this.selectedDatasets.length; _i++) {
- let item = this.selectedDatasets[_i];
- if(item.id == id){
- found=true;
- break;
- }
- }
- return found;
- }
-}
diff --git a/portal/src/app/claimPages/linking/claimResult/claimPublication/claimPublication.component.bck.html b/portal/src/app/claimPages/linking/claimResult/claimPublication/claimPublication.component.bck.html
deleted file mode 100644
index 455c518e..00000000
--- a/portal/src/app/claimPages/linking/claimResult/claimPublication/claimPublication.component.bck.html
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
{{crossrefResultsNum }} Total Results
-
-
-
-
-
-
-
-
TODO put openaire results here...
-
-
-
-
- {{item['work-title']['title'].value}}
-
-
-
-
-
diff --git a/portal/src/app/claimPages/linking/claimResult/claimPublication/claimPublication.component.html b/portal/src/app/claimPages/linking/claimResult/claimPublication/claimPublication.component.html
deleted file mode 100644
index c94d759a..00000000
--- a/portal/src/app/claimPages/linking/claimResult/claimPublication/claimPublication.component.html
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-
-
-
-
Under Development....
-
-
-
-
-
-
No results found
-
-
-
Not the right author? Choose one of these:
-
-
-
- Selected: {{authorGivenName}} {{authorFamilyName}}
-
-
-
-
-
-
-
Results for
- {{authorGivenName}} {{authorFamilyName}} - {{authorId}} :
-
-
-
-
-
-
- {{item['work-title']['title'].value}}
-
-
-
No results found
-
-
-
-
-
-
diff --git a/portal/src/app/claimPages/linking/claimResult/claimPublication/claimPublication.component.ts b/portal/src/app/claimPages/linking/claimResult/claimPublication/claimPublication.component.ts
deleted file mode 100644
index 4a6b574f..00000000
--- a/portal/src/app/claimPages/linking/claimResult/claimPublication/claimPublication.component.ts
+++ /dev/null
@@ -1,246 +0,0 @@
-import {Component, Input, Output, EventEmitter} from '@angular/core';
-import {JSONP_PROVIDERS} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-import { RouteParams, RouteConfig, ROUTER_DIRECTIVES, Router } from '@angular/router-deprecated';
-import {SearchCrossrefService} from '../../../../services/searchCrossref.service';
-import {SearchOrcidService} from '../../../../services/searchOrcid.service';
-import {Publication} from '../../../../entities/publication';
-import {pagingFormatterNoLoad} from '../../../../common/pagingFormatterNoLoad.component';
-import {PublicationTitleFormatter} from '../../../../common/publicationTitleFormatter.component';
-
-
-@Component({
- selector: 'claim-publication',
- directives: [...ROUTER_DIRECTIVES,pagingFormatterNoLoad, PublicationTitleFormatter],
- templateUrl: 'src/app/claimPages/linking/claimResult/claimPublication/claimPublication.component.html',
- providers:[JSONP_PROVIDERS, SearchCrossrefService, SearchOrcidService]
-})
-export class ClaimPublicationComponent {
- constructor (private _searchCrossrefService: SearchCrossrefService,private _searchOrcidService: SearchOrcidService,
- private _routeParams: RouteParams) {
- var myDate = new Date();
- this.todayDate = myDate.getFullYear()+ "-" +(myDate.getMonth() + 1) + "-" + myDate.getDate() ;
- this.nextDate = (myDate.getFullYear()+100)+ "-" +(myDate.getMonth() + 1) + "-" + myDate.getDate() ;
-
- }
- ngOnInit() {
- let page = +this._routeParams.get('page');
- let size = +this._routeParams.get('size');
- this.page = ( page <= 0 ) ? 1 : page;
- this.size = ( size <= 0 ) ? 10 : size;
- if(this.keyword !=null && this.keyword.length > 0){
- this.search(this.keyword,this.size,this.page);
- }
-}
-
- page : number = 1;
- size:number = 10;
- @Input() public keyword:string = "";
- navigateTo: string = "Search";
- source: string = "crossref";
- type : string = "publication";
- @Input() public select:boolean = true ;
- @Input() public selectedPublications = [] ;
- @Output() publicationsChange = new EventEmitter();
-
- crossrefResults=[];
- crossrefResultsNum : Observable
;
-
- orcidResults: string[];
- orcidResultsNum: number ;
- totalPages: number;
- orcidResultsToShow: string[];
-
- authorId: string;
- authorGivenName: string;
- authorFamilyName: string;
-
- authorIds: string[];
- authorGivenNames: string[];
- authorFamilyNames: string[];
-
- authorsNum : number ;
-
- public warningMessage = "";
- public infoMessage = "";
-
- todayDate = '';
- nextDate = '';
-
- private searchOrcid (term: string) {
- this.authorIds = new Array();
- this.authorGivenNames = new Array();
- this.authorFamilyNames = new Array();
-
- this.getOrcidAuthor(term);
-
- console.info('searchOrcid in searchOrcid file');
- }
-
-private readData(data: any) {
- this.authorIds.push(data[2].path);
-
- if(data[0] != null) {
- this.authorGivenNames.push(data[0].value);
- } else {
- this.authorGivenNames.push("");
- }
- if(data[1] != null) {
- this.authorFamilyNames.push(data[1].value);
- } else {
- this.authorFamilyNames.push("");
- }
- }
-
- private getOrcidAuthor (term: string) {
- this.orcidResultsNum = null;
-
- this._searchOrcidService.searchOrcidAuthor(term).subscribe(
- data => {
- if(data[2] != null) {
- this.readData(data);
- this.getOrcidResultsById(0);
- }
-
- },
- err => this.errorHandler(err, term)
- );
- }
-
- private errorHandler(err: any, term: string) {
- if(err.status == 404){
- this.getOrcidAuthors(term);
- } else {
- console.error(err.status);
- }
- }
-
- private getOrcidAuthors (term: string) {
- this.orcidResultsNum = null;
-
- this._searchOrcidService.searchOrcidAuthors(term).subscribe(
- data => {
- if(data[2] != null) {
- this.readData(data);
- this.getOrcidResultsById(0);
- }
- },
- err => console.error(err)
- );
- }
-
-
-private getOrcidResultsById (index:number) {
- let id = this.authorIds[index];
-
- console.info("getOrcidResultsById: "+id);
- this._searchOrcidService.searchOrcidPublications(id).subscribe(
- data => {
- if(data != null) {
- this.orcidResults=data['orcid-work'];
- this.orcidResultsNum = data['orcid-work'].length;
- this.page = 1;
- if((this.orcidResultsNum % this.size) == 0){
- this.totalPages=parseInt(''+(this.orcidResultsNum/this.size));
- } else{
- this.totalPages=parseInt(''+(this.orcidResultsNum/this.size+1));
- }
-
- this.orcidResultsToShow = this.orcidResults.slice(0,10);
- } else {
- this.orcidResultsNum = 0;
- this.totalPages=0;
- }
- this.authorGivenName = this.authorGivenNames[index];
- this.authorFamilyName = this.authorFamilyNames[index];
- this.authorId = id;
- },
- err => console.error(err)
- );
-
- console.info("totalPages = " +this.totalPages);
- }
-
-public search(term: string, size : number, page : number){
- this.warningMessage = "";
- this.infoMessage = "";
- this.getCrossrefResults(term,size,page);
- this.searchOrcid(term);
-
-}
-
-
-private getCrossrefResults (term: string, size : number, page : number) {
- this._searchCrossrefService.searchCrossrefResults(term, size, page).subscribe(
- data => {
- this.crossrefResults = data.items;
- this.page=page;
- this.crossrefResultsNum = data['total-results'];
- },
- err => console.error(err)
- );
-
- }
-
-
- private add(item, id, itemSource, itemType, itemUrl, itemTitle){
- var result ;
- if(itemSource == 'crossref'){
- result = {id: id, type :itemType, source : itemSource, title: itemTitle,url: itemUrl, result: item, accessRights: 'OPEN', embargoEndDate: this.nextDate};
- }else if (itemSource == 'orcid'){
- result = {id:id, type :itemType, source : itemSource, title: itemTitle,url: itemUrl, result: item, accessRights: 'OPEN', embargoEndDate: this.nextDate};
- }else if (itemSource == 'openaire'){
-
- }
- var found:boolean = this.isSelected(result.id);
- this.warningMessage = "";
- if (!found) {
- this.selectedPublications.push(result);
- this.publicationsChange.emit({
- value: this.selectedPublications
- });
- }else{
- this.warningMessage = "Publication already in selected list";
- }
-
- }
- private remove(item){
- this.warningMessage = "";
- this.infoMessage = "";
- var index:number =this.selectedPublications.indexOf(item);
- item.selected=false;
- if (index > -1) {
- this.selectedPublications.splice(index, 1);
- this.publicationsChange.emit({
- value: this.selectedPublications
- });
- }
-
- }
-private pageChange($event) {
- this.page=$event.value;
- this.crossrefResults=[];
- this.getCrossrefResults(this.keyword,this.size,this.page);
- }
-private orcidPageChange($event) {
- this.page=$event.value;
- this.orcidResultsToShow=[];
- this.orcidResultsToShow = this.orcidResults.slice(($event.value-1)*this.size, $event.value*this.size);
- }
-
- private isSelected(id:string){
-
- var found:boolean = false;
- this.warningMessage = "";
- for (var _i = 0; _i < this.selectedPublications.length; _i++) {
- let item = this.selectedPublications[_i];
- if(item.id == id){
- found=true;
- this.warningMessage = "Publication already in selected list";
- }
- }
- return found;
-
-
- }
-}
diff --git a/portal/src/app/claimPages/linking/claimResult/claimResult.component.ts b/portal/src/app/claimPages/linking/claimResult/claimResult.component.ts
deleted file mode 100644
index 334ce228..00000000
--- a/portal/src/app/claimPages/linking/claimResult/claimResult.component.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import {Component, Input, Output, EventEmitter,ViewChild} from '@angular/core';
-import {JSONP_PROVIDERS} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-import { RouteParams, RouteConfig, ROUTER_DIRECTIVES, Router } from '@angular/router-deprecated';
-import {pagingFormatterNoLoad} from '../../../common/pagingFormatterNoLoad.component';
-import {PublicationTitleFormatter} from '../../../common/publicationTitleFormatter.component';
-import {ClaimPublicationComponent} from './claimPublication/claimPublication.component';
-import {ClaimDatasetComponent} from './claimDataset/claimDataset.component';
-
-import {SearchDataciteService} from '../../../services/searchDatacite.service';
-
-@Component({
- selector: 'claim-result',
- directives: [...ROUTER_DIRECTIVES,pagingFormatterNoLoad, PublicationTitleFormatter, ClaimPublicationComponent, ClaimDatasetComponent],
- template: `
-
-
-
-
-
- `,
- providers:[JSONP_PROVIDERS, SearchDataciteService]
-})
-export class ClaimResultComponent {
- constructor (private _searchDataciteService: SearchDataciteService,
- private _routeParams: RouteParams) {
- var myDate = new Date();
- this.todayDate = myDate.getFullYear()+ "-" +(myDate.getMonth() + 1) + "-" + myDate.getDate() ;
- this.nextDate = (myDate.getFullYear()+100)+ "-" +(myDate.getMonth() + 1) + "-" + myDate.getDate() ;
-
- }
- ngOnInit() {
- // if(this.keyword !=null && this.keyword.length > 0){
- // this.searchDatacite(this.keyword,this.size,this.page);
- // }
-}
- @ViewChild (ClaimPublicationComponent) claimPublicationComponent : ClaimPublicationComponent ;
- @ViewChild (ClaimDatasetComponent) claimDatasetComponent : ClaimDatasetComponent ;
-
- page : number = 1;
- size:number = 10;
- navigateTo: string = "Search";
- source: string = "datacite";
- type : string = "dataset";
- searchType ="publication";
- @Input() public select:boolean = true ;
- @Input() public keyword:string = '';
- @Input() public selectedDatasets = [] ;
- @Input() public selectedPublications = [] ;
- @Output() datasetsChange = new EventEmitter();
- @Output() publicationsChange = new EventEmitter();
-
- todayDate = '';
- nextDate = '';
- search(){
- if(this.searchType=='dataset'){
- this.claimDatasetComponent.search(this.keyword,10,1);
- }else{
- this.claimPublicationComponent.search(this.keyword,10,1);
- }
- }
-
- typeChanged(type:string) {
- this.searchType = type;
- }
- publicationsChanged($event) {
- this.selectedPublications=$event.value;
- this.publicationsChange.emit({
- value: this.selectedPublications
- });
-
- }
- datasetsChanged($event) {
- this.selectedDatasets=$event.value;
- this.datasetsChange.emit({
- value: this.selectedDatasets
- });
- }
-}
diff --git a/portal/src/app/claimPages/linking/insertClaim/insertClaim.component.ts b/portal/src/app/claimPages/linking/insertClaim/insertClaim.component.ts
deleted file mode 100644
index db461a00..00000000
--- a/portal/src/app/claimPages/linking/insertClaim/insertClaim.component.ts
+++ /dev/null
@@ -1,157 +0,0 @@
-import {Component, Input, Output, EventEmitter, ViewChild} from '@angular/core';
-import {JSONP_PROVIDERS} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-import { RouteParams, RouteConfig, ROUTER_DIRECTIVES, Router } from '@angular/router-deprecated';
-import {ClaimsService} from '../../../services/claims.service';
-import {PublicationTitleFormatter} from '../../../common/publicationTitleFormatter.component';
-import {Loading} from '../../../common/modal/loading.component';
-
-
-@Component({
- selector: 'claim-insert',
- directives: [...ROUTER_DIRECTIVES, Loading],
- template: `
-
- Finish
-
-
- Now show my claims
-
-
-
-
-
-
-
Link with project
-
Link your research result with funded projects.
-
Link with project
-
-
-
-
-
-
Link with Community
-
Link your research result with research communities.
-
Link with community
-
-
-
-
-
-
-
-
-
-
-
- Selected Concepts ({{(contexts.length)}})
-
-
- {{context.community }} > {{context.category}} > {{context.concept.label}}
-
- There are no contexts
-
-
-
-
-
-
-
-
- Selected Projects ({{(projects.length)}})
-
-
-
- {{project.funderName}} | {{project.projectName}} {{(project.projectAcronym)?'('+project.projectAcronym+')':''}}
-
- There are no projects
-
-
-
-
-
- TODO login
-
-`
-
-})
- export class MyClaimsComponent {
- constructor ( private _router: Router ) {
- }
- user:string="argirok@di.uoa.gr";
- ngOnInit() {
-
- }
-
-}
diff --git a/portal/src/app/claimPages/myClaimsDemo.component.ts b/portal/src/app/claimPages/myClaimsDemo.component.ts
deleted file mode 100644
index 02535d02..00000000
--- a/portal/src/app/claimPages/myClaimsDemo.component.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import {Component, Input} from '@angular/core';
-import {JSONP_PROVIDERS} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-import { RouteParams, RouteConfig, ROUTER_DIRECTIVES, Router } from '@angular/router-deprecated';
-
-
-
-@Component({
- selector: 'my-claims-demo',
- directives: [ROUTER_DIRECTIVES],
- template: `
-
-
-
-
-
-
-
Extra parameters for claims admin
-
-
-
-
-
-
-
-
-
-
-
-
-
Country
-
-
-
-
-
-
-
"
-
-//externalUrl
-@Component({
- selector: 'claim-entity',
- template: `
-
-
-
-
- `,
- directives: [PublicationTitleFormatter,ProjectTitleFormatter]
-})
-
-export class ClaimEntityFormatter {
- @Input() entity: string[];
- @Input() type: string;
-
- constructor () {}
-
- ngOnInit() {
-
- }
-
-
-}
diff --git a/portal/src/app/common/modal/alert.ts b/portal/src/app/common/modal/alert.ts
deleted file mode 100644
index d9f84fd2..00000000
--- a/portal/src/app/common/modal/alert.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import {Component, ViewEncapsulation, ComponentRef, DynamicComponentLoader,ElementRef, Input, EventEmitter, Output} from '@angular/core';
-import {Open} from './open.component';
-
-@Component({
- selector: 'alert',
- template: `
-
- `,
- providers: [],
- directives: [Open],
- encapsulation: ViewEncapsulation.None,
- pipes: []
-})
-/**
- * API to an open alert window.
- */
-export class Alert{
- /**
- * Caption for the title.
- */
- public alertTitle:string;
- /**
- * Describes if the alert contains Ok Button.
- * The default Ok button will close the alert and emit the callback.
- * Defaults to true.
- */
- public okButton:boolean = true;
- /**
- * Caption for the OK button.
- * Default: Ok
- */
- public okButtonText:string= 'Ok';
- /**
- * Describes if the alert contains cancel Button.
- * The default Cancelbutton will close the alert.
- * Defaults to true.
- */
- public cancelButton:boolean = true;
- /**
- * Caption for the Cancel button.
- * Default: Cancel
- */
- public cancelButtonText:string = 'Cancel';
- /**
- * if the alertMessage is true it will show the contentString inside alert body.
- */
- public alertMessage:boolean = true;
- /**
- * Some message/content can be set in message which will be shown in alert body.
- */
- public message:string;
- /**
- * if the value is true alert footer will be visible or else it will be hidden.
- */
- public alertFooter:boolean= true;
- /**
- * shows alert header if the value is true.
- */
- public alertHeader:boolean = true;
- /**
- * if the value is true alert will be visible or else it will be hidden.
- */
- public isOpen:boolean=false;
- /**
- * Emitted when a ok button was clicked
- * or when Ok method is called.
- */
- @Output() public alertOutput:EventEmitter = new EventEmitter();
- constructor(public dcl:DynamicComponentLoader, public _elementRef: ElementRef){}
- /**
- * Opens a alert window creating backdrop.
- */
- open(){
- this.isOpen= true;
- }
- /**
- * ok method closes the modal and emits modalOutput.
- */
- ok(){
- this.isOpen = false;
- this.alertOutput.emit(true);
- }
- /**
- * cancel method closes the moda.
- */
- cancel(){
- this.isOpen = false;
- }
-}
diff --git a/portal/src/app/common/modal/loading.component.ts b/portal/src/app/common/modal/loading.component.ts
deleted file mode 100644
index 18722dbe..00000000
--- a/portal/src/app/common/modal/loading.component.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import {Component, ViewEncapsulation, ComponentRef, DynamicComponentLoader,ElementRef, Input, EventEmitter, Output} from '@angular/core';
-import {Open} from './open.component';
-
-@Component({
- selector: 'loading',
- template: `
-
- `,
- providers: [],
- directives: [Open],
- encapsulation: ViewEncapsulation.None,
- pipes: []
-})
-/**
- * API to an open alert window.
- */
-export class Loading{
-
-@Input() public message:string ="Loading";
-
- /**
- * if the value is true alert will be visible or else it will be hidden.
- */
- public isOpen:boolean=false;
- /**
- * Emitted when a ok button was clicked
- * or when Ok method is called.
- */
- @Output() public alertOutput:EventEmitter = new EventEmitter();
- constructor(public dcl:DynamicComponentLoader, public _elementRef: ElementRef){}
- /**
- * Opens a alert window creating backdrop.
- */
- open(){
- this.isOpen= true;
- }
-
- close(){
- this.isOpen = false;
- }
-}
diff --git a/portal/src/app/common/modal/open.component.ts b/portal/src/app/common/modal/open.component.ts
deleted file mode 100644
index 95add08d..00000000
--- a/portal/src/app/common/modal/open.component.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import {Directive, Input, HostBinding} from '@angular/core';
-
-// todo: add animate
-// todo: add init and on change
-@Directive({selector: '[open]'})
-export class Open {
- @HostBinding('style.display')
- private display:string;
- @HostBinding('class.in')
- @HostBinding('attr.aria-expanded')
- private isExpanded:boolean = true;
-
- @Input()
- private set open(value:boolean) {
- this.isExpanded = value;
- this.toggle();
- }
-
- private get open():boolean {
- return this.isExpanded;
- }
-
- constructor() {
- }
- init() {
- this.isExpanded = false;
- this.display = 'none';
- }
- toggle() {
- if (this.isExpanded) {
- this.hide();
- } else {
- this.show();
- }
- }
-
- hide() {
- this.isExpanded = false;
- this.display = 'none';
- if (typeof document !== 'undefined') {
- let backDrop = document.getElementsByClassName("modal-backdrop");
- if(backDrop.length>0){
- document.body.removeChild(backDrop[0]);
- }
- }
- }
-
- show() {
- let backDrop = document.createElement('div');
- backDrop.className="modal-backdrop fade in";
- document.body.appendChild(backDrop);
- this.isExpanded = true;
- this.display = 'block';
- }
-}
diff --git a/portal/src/app/common/pagingFormatter.component.ts b/portal/src/app/common/pagingFormatter.component.ts
deleted file mode 100644
index d3e591c1..00000000
--- a/portal/src/app/common/pagingFormatter.component.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import {Component, Input} from '@angular/core';
-import {Router, ROUTER_DIRECTIVES} from '@angular/router-deprecated';
-
-//Usage Example
-
-@Component({
- selector: 'paging',
- template: `
-
-
-
- `,
- directives: [
- ...ROUTER_DIRECTIVES
- ]
-})
-
-export class PagingFormatter {
- @Input() currentPage: number = 1;
- @Input() navigateTo: string;
- @Input() term: string='';
- @Input() size: number=10;
- @Input() totalResults: number = 10;
- @Input() params;
-
- constructor ( private _router: Router) {
- }
-
- ngOnInit() {
- console.info("In paging -- CurrentPage:"+this.currentPage+" "+"total Pages = "+this.getTotalPages() +" Results num:"+this.totalResults);
- }
- getTotalPages(){
- var i:number =parseInt(''+(this.totalResults/this.size));
- return (((this.totalResults/this.size) == i )? i :(i+1)) ;
- }
- onPrev(){
- if(this.params){
- let pageparams= this.params;
- pageparams.page=this.currentPage -1
- this._router.navigate( [this.navigateTo, pageparams] );
- }else{
- this._router.navigate( [this.navigateTo, { keyword: this.term, page: (this.currentPage -1) }] );
- }
- }
-
- onNext(){
- if(this.params){
- let pageparams= this.params;
- pageparams.page=this.currentPage +1;
- this._router.navigate( [this.navigateTo, pageparams] );
- }else{
- this._router.navigate( [this.navigateTo, { keyword: this.term, page: (this.currentPage +1) }] );
- }
- }
- onPage(pageNum: number){
- if(this.params){
- let pageparams= this.params;
- pageparams.page=pageNum;
- this._router.navigate( [this.navigateTo, pageparams] );
- }else if(this.term!=''){
- this._router.navigate( [this.navigateTo, { keyword: this.term, page: pageNum, size: this.size }] );
- }else{
- this._router.navigate( [this.navigateTo, { page: pageNum, size: this.size }] );
- }
- }
-}
diff --git a/portal/src/app/common/pagingFormatterNoLoad.component.ts b/portal/src/app/common/pagingFormatterNoLoad.component.ts
deleted file mode 100644
index 626109ab..00000000
--- a/portal/src/app/common/pagingFormatterNoLoad.component.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import {Component, Input, Output, EventEmitter} from '@angular/core';
-import {Router, ROUTER_DIRECTIVES} from '@angular/router-deprecated';
-
-//Usage Example
-
-@Component({
- selector: 'paging-no-load',
- template: `
-
-
-
- `,
- directives: [
- ...ROUTER_DIRECTIVES
- ]
-})
-
-export class pagingFormatterNoLoad {
- @Input() currentPage: number = 1;
- @Input() navigateTo: string;
- @Input() term: string='';
- @Input() size: number=10;
- @Input() totalResults: number = 10;
- @Input() params;
-
- @Output() pageChange = new EventEmitter();
-
- constructor ( private _router: Router) {
- }
-
- ngOnInit() {
- console.info("In paging -- CurrentPage:"+this.currentPage+" "+"total Pages = "+this.getTotalPages() +" Results num:"+this.totalResults);
- }
- getTotalPages(){
- var i= this.totalResults/this.size;
- var integerI=parseInt(''+i);
- return parseInt(''+((i==integerI)?i:i+1));
- }
- onPrev(){
- this.currentPage=this.currentPage-1;
- this.pageChange.emit({
- value: this.currentPage
- });
-
- }
-
- onNext(){
-
- this.currentPage=this.currentPage+1;
- this.pageChange.emit({
- value: this.currentPage
- });
- }
- onPage(pageNum: number){
-
- this.currentPage=pageNum;
- this.pageChange.emit({
- value: this.currentPage
- });
- }
-}
diff --git a/portal/src/app/common/projectTitleFormatter.component.ts b/portal/src/app/common/projectTitleFormatter.component.ts
deleted file mode 100644
index 357a2d70..00000000
--- a/portal/src/app/common/projectTitleFormatter.component.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import {Component, Input} from '@angular/core';
-
-//Usage Example " "
-
-@Component({
- selector: 'project-title',
- template: `
-
-
{{project.name}} ( {{project.funderName}} )
-
- `
-})
-
-export class ProjectTitleFormatter {
- @Input() project: string[];
-
- constructor () {}
-
- ngOnInit() {}
-}
diff --git a/portal/src/app/common/publicationTitleFormatter.component.ts b/portal/src/app/common/publicationTitleFormatter.component.ts
deleted file mode 100644
index 2c87c50a..00000000
--- a/portal/src/app/common/publicationTitleFormatter.component.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import {Component, Input} from '@angular/core';
-
-//Usage Example " "
-
-@Component({
- selector: 'publication-title',
- template: `
-
- `
-})
-
-export class PublicationTitleFormatter {
- @Input() title: string[];
- @Input() url: string[];
-
- constructor () {}
-
- ngOnInit() {
-
- }
-
-
-}
diff --git a/portal/src/app/entities/claim.ts b/portal/src/app/entities/claim.ts
deleted file mode 100644
index b5378c5f..00000000
--- a/portal/src/app/entities/claim.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-export class Claim {
- id: string;
- sourceType: string;
- targetType: string;
- sourceId: string;
- targetId: string;
- date: string;
- DOI: string;
- project: Project
- userMail: string;
-
-}
-export class Project{
-
-}
diff --git a/portal/src/app/entities/datasetInfo.ts b/portal/src/app/entities/datasetInfo.ts
deleted file mode 100644
index 47ac8120..00000000
--- a/portal/src/app/entities/datasetInfo.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-export class DatasetInfo {
- title: { "name": string, "url": string, "accessMode": string};
- authors: { "name": string, "url": string}[];
- date: string;
- embargoEndDate: string;
- type: string;
- downloadFrom: Map; //key is name
- publishedIn: Map; //key is name
- identifiers: Map;
- publisher: string;
- subjects: string[];
- classifiedSubjects: Map;
- description: string;
- bestlicense: string;
- collectedFrom: { "name": string, "url": string}[];
- fundedByProjects: { "url": string, "acronym": string, "title": string,
- "funderShortname": string, "funderName": string,
- "funding": string, "new": boolean}[];
- //relatedPublications: { "name": string, "url": string, "date": string, "trust": string}[];
- //relatedResearchData: { "name": string, "url": string, "date": string, "trust": string}[];
- //similarPublications: { "name": string, "url": string, "date": string, "trust": string}[];
- //similarDatasets: { "name": string, "url": string, "date": string, "trust": string}[];
- relatedResearchResults: { "name": string, "url": string, "date": string, "trust": string, "class": string}[];
- similarResearchResults: {"name": string, "url": string, "date": string, "trust": string, "class": string}[];
- contexts: { "labelContext": string, "labelCategory": string, "labelConcept": string}[];
-}
diff --git a/portal/src/app/entities/personInfo.ts b/portal/src/app/entities/personInfo.ts
deleted file mode 100644
index 046e6f1f..00000000
--- a/portal/src/app/entities/personInfo.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export class PersonInfo {
- fullname: string;
- firstname: string;
- secondnames: string;
- country: string;
-
- publications: any;
- researchData: any;
-}
diff --git a/portal/src/app/entities/projectInfo.ts b/portal/src/app/entities/projectInfo.ts
deleted file mode 100644
index e08e5043..00000000
--- a/portal/src/app/entities/projectInfo.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-export class ProjectInfo {
- acronym: string;
- title: string;
- callIdentifier: string;
- funder: string;
- funding: string;
- contractNum: string;
- startDate: string;
- endDate: string;
- openAccessMandate: string;
- specialClause39: string;
- organizations: Map;
- url: string;
- urlInfo: string;
-
- publications: any;
- researchData: any;
- statistics: any;
-}
diff --git a/portal/src/app/entities/publication.ts b/portal/src/app/entities/publication.ts
deleted file mode 100644
index c3904b15..00000000
--- a/portal/src/app/entities/publication.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export class Publication {
- title: string;
- publisher: string;
- DOI: string;
- source: string;
- type: string;
-}
diff --git a/portal/src/app/entities/publicationInfo.ts b/portal/src/app/entities/publicationInfo.ts
deleted file mode 100644
index 598c5907..00000000
--- a/portal/src/app/entities/publicationInfo.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-export class PublicationInfo {
- title: { "name": string, "url": string, "accessMode": string};
- authors: { "name": string, "url": string}[];
- date: string;
- embargoEndDate: string;
- types: string[];
- downloadFrom: Map; //key is name
- publishedIn: Map; //key is name
- bioentities: Map>; //>
- identifiers: Map; //key is the classname
- publisher: string;
- journal: {"journal": string, "issn": string, "lissn": string};
- languages: string[];
- subjects: string[];
- classifiedSubjects: Map; //
- description: string;
- bestlicense: string;
- collectedFrom: { "name": string, "url": string}[];
- fundedByProjects: { "url": string, "acronym": string, "title": string,
- "funderShortname": string, "funderName": string,
- "funding": string, "new": boolean}[];
- //relatedPublications: { "name": string, "url": string, "date": string, "trust": string}[];
- //relatedResearchData: { "name": string, "url": string, "date": string, "trust": string}[];
- //similarPublications: {"name": string, "url": string, "date": string, "trust": string}[];
- //similarDatasets: {"name": string, "url": string, "date": string, "trust": string}[];
- relatedResearchResults: { "name": string, "url": string, "date": string, "trust": string, "class": string}[];
- similarResearchResults: {"name": string, "url": string, "date": string, "trust": string, "class": string}[];
- references: { "name": string, "url": string}[];
- contexts: { "labelContext": string, "labelCategory": string, "labelConcept": string}[];
-}
diff --git a/portal/src/app/home/home.component.html b/portal/src/app/home/home.component.html
deleted file mode 100644
index 6ae03c49..00000000
--- a/portal/src/app/home/home.component.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
diff --git a/portal/src/app/home/home.component.ts b/portal/src/app/home/home.component.ts
deleted file mode 100644
index 01f853fb..00000000
--- a/portal/src/app/home/home.component.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import {Component} from '@angular/core';
-import {RouteConfig, ROUTER_DIRECTIVES, Router} from '@angular/router-deprecated';
-import {JSONP_PROVIDERS} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-import {SearchComponent} from '../searchPages/search.component';
-import {AutocompleteComponent} from '../common/autoComplete.component';
-@Component({
- selector: 'home',
- templateUrl: 'src/app/home/home.component.html',
- directives: [
- ...ROUTER_DIRECTIVES, AutocompleteComponent
- ],
-})
-
-export class HomeComponent {
- constructor ( private _router: Router) {}
-
- searchTerm(term: string) {
- this._router.navigate( ['Search', { keyword: term }] );
- }
-}
diff --git a/portal/src/app/landingPages/dataset/dataset.component.ts b/portal/src/app/landingPages/dataset/dataset.component.ts
deleted file mode 100644
index 8af4dcaf..00000000
--- a/portal/src/app/landingPages/dataset/dataset.component.ts
+++ /dev/null
@@ -1,326 +0,0 @@
-import {Component, ViewChild} from '@angular/core';
-import {JSONP_PROVIDERS} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-import {DatasetService} from '../../services/dataset.service';
-import {DatasetInfo} from '../../entities/datasetInfo';
-import { RouteParams} from '@angular/router-deprecated';
-import { InlineClaimContextComponent} from '../../claimPages/inlineClaimContext/inlineClaimContext.component';
-import { InlineClaimProjectComponent} from '../../claimPages/inlineClaimProject/inlineClaimProject.component';
-
-import {TabPagingComponent} from '../tabPaging.component.ts';
-import {TabTableComponent} from '../tabTable.component.ts';
-import {ShowTitleComponent} from '../showTitle.component.ts';
-import {ShowAuthorsComponent} from '../showAuthors.component.ts';
-import {ShowIdentifiersComponent} from '../showIdentifiers.component.ts';
-import {ShowSubjectsComponent} from '../showSubjects.component.ts';
-
-@Component({
- selector: 'dataset',
- template: `
-
- `,
- providers:[JSONP_PROVIDERS, DatasetService],
- directives:[InlineClaimContextComponent, InlineClaimProjectComponent,
- TabTableComponent, ShowTitleComponent, ShowAuthorsComponent,
- ShowIdentifiersComponent, ShowSubjectsComponent]
-})
-
-export class DatasetComponent {
- constructor (private _datasetService: DatasetService, private _routeParams: RouteParams) {
- console.info('dataset constructor');
- this.params = _routeParams;
- }
- ngOnInit() {
- this.getDatasetInfo();
- }
-
- private datasetInfo: DatasetInfo;
- private params: RouteParams;
-
- private showStyle: boolean = false;
- private showAllReferences: boolean = false;
- private showAllRelResData: boolean = false;
- private showAllSimilPubl: boolean = false;
- private showAllBioentities: boolean = false;
-
- private result ;
- private claimInline:string = "none" ;
-
- @ViewChild (InlineClaimProjectComponent) inlineClaimProject : InlineClaimProjectComponent ;
- @ViewChild (InlineClaimContextComponent) inlineClaimContext : InlineClaimContextComponent ;
-
- public warningMessage = "";
- public errorMessage = "";
-
- getDatasetInfo() {
- this.warningMessage = '';
- this.errorMessage=""
- if(this.params.get("datasetId")==null || this.params.get("datasetId")==''){
- this.warningMessage="No valid dataset id";
- console.info("novalid");
- }else{
- console.info("do request");
- this._datasetService.getDatasetInfo(this.params.get("datasetId")).subscribe(
- data => {
- this.datasetInfo = data;
-
- this.result = []
- let result_ ={id: this.params.get("datasetId"), type :"dataset", source : "openaire", title: this.datasetInfo.title,url: '', result: '', accessRights: this.datasetInfo.bestlicense, embargoEndDate: ''};
- this.result.push(result_);
- },
- err => {
- console.error(err)
- console.info("error");
-
- this.errorMessage = 'No dataset found';
- }
- );
- }
- }
-
- /********** Methods for Inline Claim of project / dataset ******/
- toggleClaimProject(){
- this.inlineClaimProject.toggle();
- }
- projectAdded($event){
- var projects =$event.value;
- if(projects){
- for(var i=0; i < projects.length; i++){
-
- if(this.datasetInfo.fundedByProjects == undefined) {
- this.datasetInfo.fundedByProjects = new Array<
- { "url": string, "acronym": string, "title": string,
- "funderShortname": string, "funderName": string,
- "funding": string, "new": boolean
- }>();
- }
- var project =projects[i];
-
- let counter = this.datasetInfo.fundedByProjects.length;
- this.datasetInfo.fundedByProjects[counter]['url'] =
- "http://localhost:3000/project?projectId="+project.projectId;
- this.datasetInfo.fundedByProjects[counter]['acronym'] = project.projectAcronym;
- this.datasetInfo.fundedByProjects[counter]['title'] = project.projectName;
- this.datasetInfo.fundedByProjects[counter]['funderShortname'] = project.selectedFunderId;
- this.datasetInfo.fundedByProjects[counter]['funderName'] = project.selectedFunderName;
- this.datasetInfo.fundedByProjects[counter]['new'] = true;
- }
- }
- }
- toggleClaimContext(){
- this.inlineClaimContext.toggle();
- }
- contextAdded($event){
- var contexts =$event.value;
- if(contexts){
- for(var i=0; i < contexts.length; i++){
- }
- }
- }
-}
diff --git a/portal/src/app/landingPages/person/person.component.ts b/portal/src/app/landingPages/person/person.component.ts
deleted file mode 100644
index b4e4d5f0..00000000
--- a/portal/src/app/landingPages/person/person.component.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-import {Component} from '@angular/core';
-import {JSONP_PROVIDERS} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-import { RouteParams } from '@angular/router-deprecated';
-import {PersonService} from '../../services/person.service';
-import {PersonInfo} from '../../entities/personInfo';
-
-@Component({
- selector: 'person',
- template: `
-
-
-
-
-
-
-
-
-
-
-
-
-
- Share - Bookmark
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Share - Bookmark
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item['name']}};
-
-
- ...
-
-
-
- {{item['name']}};
-
-
-
-
-
- view all {{authors.length}} authors
-
-
-
- View less authors
-
-
-
- `
- ,
- directives: [
- ...ROUTER_DIRECTIVES
- ]
- })
-
-export class ShowAuthorsComponent {
- @Input() authors: { [key: string]: string }[];
- private showAll: boolean = false;
-
- constructor (private _router: Router) {
- console.info('showAuthors constructor');
- }
-
- ngOnInit() {
- }
-}
diff --git a/portal/src/app/landingPages/showIdentifiers.component.ts b/portal/src/app/landingPages/showIdentifiers.component.ts
deleted file mode 100644
index 8b662355..00000000
--- a/portal/src/app/landingPages/showIdentifiers.component.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import {Component, Input} from '@angular/core';
-import {Router, ROUTER_DIRECTIVES} from '@angular/router-deprecated';
-
-
-@Component({
- selector: 'showIdentifiers',
- template: `
-
-
- `
- ,
- directives: [
- ...ROUTER_DIRECTIVES
- ]
- })
-
-export class ShowIdentifiersComponent {
- @Input() identifiers: Map;//Map;
-
- constructor (private _router: Router) {
- console.info('showIdentifiers constructor');
- }
-
- ngOnInit() {
- }
-}
diff --git a/portal/src/app/landingPages/showSubjects.component.ts b/portal/src/app/landingPages/showSubjects.component.ts
deleted file mode 100644
index da180fd7..00000000
--- a/portal/src/app/landingPages/showSubjects.component.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import {Component, Input} from '@angular/core';
-import {Router, ROUTER_DIRECTIVES} from '@angular/router-deprecated';
-
-
-@Component({
- selector: 'showSubjects',
- template: `
-
- `
- ,
- directives: [
- ...ROUTER_DIRECTIVES
- ]
- })
-
-export class ShowSubjectsComponent {
- @Input() subjects: string[];
- @Input() classifiedSubjects: Map;
- private showClassifiedSbj: boolean = false;
-
- constructor (private _router: Router) {
- console.info('showSubjects constructor');
- }
-
- ngOnInit() {
- }
-}
diff --git a/portal/src/app/landingPages/showTitle.component.ts b/portal/src/app/landingPages/showTitle.component.ts
deleted file mode 100644
index 805d58db..00000000
--- a/portal/src/app/landingPages/showTitle.component.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import {Component, Input} from '@angular/core';
-import {Router, ROUTER_DIRECTIVES} from '@angular/router-deprecated';
-
-
-@Component({
- selector: 'showTitle',
- template: `
-
-
-
-
- `
- ,
- directives: [
- ...ROUTER_DIRECTIVES
- ]
- })
-
-export class ShowTitleComponent {
- @Input() title: { [key: string]: string };
-
- constructor (private _router: Router) {
- console.info('title constructor');
- }
-
- ngOnInit() {
- }
-}
diff --git a/portal/src/app/landingPages/tabPaging.component.ts b/portal/src/app/landingPages/tabPaging.component.ts
deleted file mode 100644
index b9709214..00000000
--- a/portal/src/app/landingPages/tabPaging.component.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import {Component, Input, Output, EventEmitter} from '@angular/core';
-import {Router, ROUTER_DIRECTIVES} from '@angular/router-deprecated';
-
-
-@Component({
- selector: 'tabPaging',
- template: `
-
- `
- ,
- directives: [
- ...ROUTER_DIRECTIVES
- ]
- })
-
-export class TabPagingComponent {
- @Input() showAll: boolean;
- @Input() length: number;
- @Output() changeShowAll: EventEmitter = new EventEmitter();
-
- constructor (private _router: Router) {
- console.info('publication:paging constructor');
- }
-
- ngOnInit() {
- }
-}
diff --git a/portal/src/app/landingPages/tabTable.component.ts b/portal/src/app/landingPages/tabTable.component.ts
deleted file mode 100644
index e65588a6..00000000
--- a/portal/src/app/landingPages/tabTable.component.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import {Component, Input} from '@angular/core';
-import {Router, ROUTER_DIRECTIVES} from '@angular/router-deprecated';
-
-
-@Component({
- selector: 'tabTable',
- template: `
-
-
-
- Title
- Trust
-
-
-
-
-
-
-
-
-
- {{item['name']}}
-
- {{item['name']}}
-
- ({{item['date']}})
-
-
-
-
-
- {{item['trust']}}
-
-
-
-
-
- `
- ,
- directives: [
- ...ROUTER_DIRECTIVES
- ]
- })
-
-export class TabTableComponent {
- @Input() info: { "name": string, "url": string, "date": string, "trust": string}[];//Map;
-
- constructor (private _router: Router) {
- console.info('tabTable constructor');
- }
-
- ngOnInit() {
- }
-}
diff --git a/portal/src/app/pipes/claimTextFilter.pipe.ts b/portal/src/app/pipes/claimTextFilter.pipe.ts
deleted file mode 100644
index e1d402f0..00000000
--- a/portal/src/app/pipes/claimTextFilter.pipe.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import {Pipe, PipeTransform} from '@angular/core';
-
-@Pipe({
- name: 'claimTextFilter'
-})
-export class ClaimTextFilterPipe implements PipeTransform {
-
- transform(value: any, filter: string): any {
- console.info('ClaimTextFilterPipe word to filter : '+filter);
- filter = filter?filter.toLocaleLowerCase():'';
- return filter ? value.filter(claim=> (
- claim.sourceType.toLocaleLowerCase().indexOf(filter)!=-1|| //sourceType
- claim.targetType.toLocaleLowerCase().indexOf(filter)!=-1|| //targetType
- claim.userMail.toLocaleLowerCase().indexOf(filter)!=-1|| //mail
- ((claim.source.title && claim.source.title.toLocaleLowerCase().indexOf(filter)!=-1)||(claim.source.name && claim.source.name.toLocaleLowerCase().indexOf(filter)!=-1))|| //source title
- ((claim.target.title && claim.target.title.toLocaleLowerCase().indexOf(filter)!=-1)||(claim.target.name && claim.target.name.toLocaleLowerCase().indexOf(filter)!=-1))|| //target title
- ((claim.source.funderName && claim.source.funderName.toLocaleLowerCase().indexOf(filter)!=-1)||(claim.source.funderName && claim.source.funderName.toLocaleLowerCase().indexOf(filter)!=-1))|| //source funder name
- ((claim.target.funderName && claim.target.funderName.toLocaleLowerCase().indexOf(filter)!=-1)||(claim.target.funderName && claim.target.funderName.toLocaleLowerCase().indexOf(filter)!=-1)) //target funder name
- )) : value;
- }
-}
diff --git a/portal/src/app/pipes/claimTypeFilter.pipe.ts b/portal/src/app/pipes/claimTypeFilter.pipe.ts
deleted file mode 100644
index 0c386c76..00000000
--- a/portal/src/app/pipes/claimTypeFilter.pipe.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-
-import {Pipe, PipeTransform} from '@angular/core';
-
-@Pipe({name: 'claimTypeFilter'})
-export class ClaimTypeFilterPipe implements PipeTransform {
- transform(value: any, publication:boolean,dataset:boolean,project:boolean,context:boolean) : any {
- let filter = publication;
- console.info('ClaimTypeFilterPipe types to show : '+(publication?'publication ':' ')+(dataset?'dataset ':' ')+(project?'project ':' ')+(context?'context ':' '));
- return (value)?value.filter((claim) =>{
- let filter =publication;
- if(publication||dataset||project||context) {
- let filter = publication
- if(filter && (claim.sourceType.toLocaleLowerCase().indexOf('publication')!=-1 || claim.targetType.toLocaleLowerCase().indexOf('publication')!=-1 )) {
- return true;
- }
- filter = dataset;
- if(filter && (claim.sourceType.toLocaleLowerCase().indexOf('dataset')!=-1 || claim.targetType.toLocaleLowerCase().indexOf('dataset')!=-1 )) {
- return true;
- }
- filter = project;
- if(filter && (claim.sourceType.toLocaleLowerCase().indexOf('project')!=-1 || claim.targetType.toLocaleLowerCase().indexOf('project')!=-1 )) {
- return true;
- }
- filter = context;
- if(filter && (claim.sourceType.toLocaleLowerCase().indexOf('context')!=-1 || claim.targetType.toLocaleLowerCase().indexOf('context')!=-1 )) {
- return true;
- }
- return false;
- }else{
- return true;
- }
- }):value;
- }
-
-}
diff --git a/portal/src/app/searchAll/searchAll.component.ts b/portal/src/app/searchAll/searchAll.component.ts
deleted file mode 100644
index f504584b..00000000
--- a/portal/src/app/searchAll/searchAll.component.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import {Component, Input, Output, EventEmitter} from '@angular/core';
-import {JSONP_PROVIDERS} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-import { RouteParams, RouteConfig, ROUTER_DIRECTIVES, Router } from '@angular/router-deprecated';
-import {SearchCrossrefService} from '../services/searchCrossref.service';
-import {Publication} from '../entities/publication';
-import {PagingFormatter} from '../common/pagingFormatter.component';
-import {PublicationTitleFormatter} from '../common/publicationTitleFormatter.component';
-
-
-@Component({
- selector: 'search-all',
- directives: [...ROUTER_DIRECTIVES,PagingFormatter, PublicationTitleFormatter],
- template: `
-
-
-
-
Selected publications:
-
{{item.DOI}} --{{item.publisher}} Remove
-
Search
-
-
-
-
{{resultsNum }} Total Results
-
-
-
-
-
{{item.DOI}} --{{item.publisher}} Select
-
-
-
;
- search(term: string, size : number, page : number) {
- // if(this.source == 'crossref' && this.publication){
- this.searchCrossref(term,size,page);
- // }else if(this.source == 'openaire' && this.publication){
- //
- // }else if(this.source == 'openaire' && this.publication){
- //
- // }else if(this.source == 'openaire' && !this.publication){
- //
- // }else if(this.source == 'orcid' && this.publication){
- //
- // }else if(this.source == 'datacite' && !this.publication){
- //
- // }
- }
- searchCrossref (term: string, size : number, page : number) {
- this._searchService.searchCrossrefResults(term, size, page).subscribe(
- data => {
- this.results = data.items;
- this.page=page;
- this.resultsNum = data['total-results'];
- },
- err => console.error(err)
- );
- }
- searchOpenaire (term2: string) {
- //this.items = this._searchService.httpSearchOpenaire(term2);
- }
-
-
-
- add(item){
- this.selected.push(item);
- console.info("Select:"+this.selected);
- for (var i = 0; i < this.selected.length; i++) {
- console.log(this.selected[i]);
- }
-
-
- var index:number =this.results.indexOf(item);
- if (index > -1) {
- this.results.splice(index, 1);
- }
- console.info("Item removed "+this.selected.indexOf(item));
- this.selectedChange.emit({
- value: this.selected
- });
- }
- remove(item){
- var index:number =this.selected.indexOf(item);
- if (index > -1) {
- this.selected.splice(index, 1);
- }
- this.selectedChange.emit({
- value: this.selected
- });
-
- }
-
-}
diff --git a/portal/src/app/searchPages/common/search.class.ts b/portal/src/app/searchPages/common/search.class.ts
deleted file mode 100644
index 95094d78..00000000
--- a/portal/src/app/searchPages/common/search.class.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-export class Filter{
- public title: string;
- public filterId: string;
- public countSelectedValues: number;
- public values: Value[];
-
-}
-export class Value{
- public name: string;
- public id: string;
- public selected: boolean;
- public number: number;
-
-}
diff --git a/portal/src/app/searchPages/common/searchFilter.component.ts b/portal/src/app/searchPages/common/searchFilter.component.ts
deleted file mode 100644
index 20d1072c..00000000
--- a/portal/src/app/searchPages/common/searchFilter.component.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import {Component, Input, Output, EventEmitter} from '@angular/core';
-import {JSONP_PROVIDERS} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-import { RouteParams, RouteConfig, ROUTER_DIRECTIVES, Router } from '@angular/router-deprecated';
-import { Filter, Value} from './search.class';
-
-@Component({
- selector: 'search-filter',
- template: `
- {{filter.title}}
-
- {{value.name}} ({{value.number}})
-
-
- More
-
-
- {{value.name}} ({{value.number}})
-
- Less
-
-
- `
-})
-export class SearchFilterComponent {
- @Input() title;
- @Input() filterId;
- @Input() values; //array[] " name, id, number, selected"
- @Input() countSelectedValues:number = 0; //array[] " name, id, number, selected"
- @Output() change = new EventEmitter();
- @Input() test:{value:number} ;
- @Input() filter:Filter;
- private showAll:boolean = false;
- constructor () {
-
- }
- ngOnInit() {
-
- }
-
- toggleShowAll(){
- this.showAll = !this.showAll;
- }
-
- filterChange(selected:boolean){
- if(selected){
- this.filter.countSelectedValues++;
- }else{
- this.filter.countSelectedValues--;
- }
- this.change.emit({
- value: true
- });
- }
-
-
-}
diff --git a/portal/src/app/searchPages/common/searchPage.component.ts b/portal/src/app/searchPages/common/searchPage.component.ts
deleted file mode 100644
index 2ae05616..00000000
--- a/portal/src/app/searchPages/common/searchPage.component.ts
+++ /dev/null
@@ -1,170 +0,0 @@
-import {Component, Input, ViewChild, Output, EventEmitter} from '@angular/core';
-import {JSONP_PROVIDERS} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-import { RouteParams, RouteConfig, ROUTER_DIRECTIVES, Router } from '@angular/router-deprecated';
-import {Location} from '@angular/common';
-import {SearchResultComponent} from './searchResult.component';
-import {SearchFilterComponent} from './searchFilter.component';
-import {pagingFormatterNoLoad} from '../../common/pagingFormatterNoLoad.component';
-import { Filter, Value} from './search.class';
-
-@Component({
- selector: 'search-page',
- template: `
-
-
-
- `,
- directives:[SearchResultComponent, SearchFilterComponent, pagingFormatterNoLoad]
-})
-export class SearchPageComponent {
- @Input() pageTitle = "";
- @Input() results = [];
- @Input() filters = [];
- @Input() type;
- @Input() page:number = 1;
- @Input() size: number = 10;
- @Input() totalResults: number = 0;
- @Input() keyword:string = '';
-
- test= { value: 0};
-
- @Output() queryChange = new EventEmitter();
- constructor (private location: Location) {
-
- }
- ngOnInit() {
- console.info(" page - value: "+this.page);
-
- }
-
- changekeyword(){
-
- }
-
- private createUrlParameters(){
- var allLimits="";
- for (let filter of this.filters){
- var filterLimits="";
- if(filter.countSelectedValues > 0){
- for (let value of filter.values){
- if(value.selected == true){
- filterLimits+=((filterLimits.length == 0)?'':',') + value.id;
- }
- }
- allLimits+=((filterLimits.length == 0 )?'':((allLimits.length == 0)?'':'&') +filter.filterId + '='+ filterLimits) ;
- }
- }
- if(this.keyword.length > 0 ){
- allLimits+=((allLimits.length == 0)?'':'&') + 'keyword=' + this.keyword;
- }
- if(this.page != 1 ){
- allLimits+=((allLimits.length == 0)?'':'&') + 'page=' + this.page;
- }
- return allLimits;
- }
- private createQueryParameters(){
- var allLimits="";
- for (let filter of this.filters){
- if(filter.countSelectedValues > 0){
- var filterLimits="";
- for (let value of filter.values){
- if(value.selected == true){
- filterLimits+=((filterLimits.length == 0)?'':' or ') + filter.filterId + '='+ value.id;
- }
- }
- allLimits+=((filterLimits.length == 0 )?'':((allLimits.length == 0)?'':' and ')+'('+filterLimits +')') ;
- }
- }
- if(this.keyword.length > 0 ){
- allLimits+=((allLimits.length == 0)?'':' and ') + ' keyword=' + this.keyword;
- }
- return allLimits;
- }
- private isFiltered(){
- var filtered=false;
- for (let filter of this.filters){
- if(filter.countSelectedValues > 0){
- filtered = true;
- break;
- }
- }
- if(this.keyword.length > 0 ){
- filtered = true;
- }
- return filtered;
- }
- clearFilters(){
- for (let filter of this.filters){
- if(filter.countSelectedValues > 0){
- for (let value of filter.values){
- if(value.selected == true){
- value.selected = false;
- }
- }
- filter.countSelectedValues = 0;
- }
- }
- if(this.keyword.length > 0 ){
- this.keyword ='';
- }
- }
-
- goTo(page:number = 1){
- this.page = page;
- var urlParameters = this.createUrlParameters();
- var queryParameters = this.createQueryParameters();
- this.location.go(location.pathname,urlParameters);
- this.queryChange.emit({
- value: queryParameters
- });
-
- }
- filterChanged($event){
- this.goTo(1);
- }
- pageChanged($event) {
- this.page = +$event.value
- this.goTo(this.page);
- }
-
-}
diff --git a/portal/src/app/searchPages/common/searchResult.component.ts b/portal/src/app/searchPages/common/searchResult.component.ts
deleted file mode 100644
index cd766828..00000000
--- a/portal/src/app/searchPages/common/searchResult.component.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import {Component, Input} from '@angular/core';
-import {JSONP_PROVIDERS} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-import { RouteParams, RouteConfig, ROUTER_DIRECTIVES, Router } from '@angular/router-deprecated';
-
-@Component({
- selector: 'search-result',
- template: `
- {{title}}
-
- `
-})
-export class SearchResultComponent {
- @Input() title;
- @Input() id;
- //publications & organizations:
- @Input() projects;
- //datasets & publications
- @Input() description;
- @Input() year;
- @Input() authors;
- //datasets:
- @Input() publisher;
- //dataproviders & projects:
- @Input() organizations;
- //projects:
- @Input() funders;
- //organizations:
- @Input() country;
- //dataproviders:
- @Input() type;
- @Input() websiteURL;
- @Input() OAIPMHURL;
-
- constructor () {
-
- }
- ngOnInit() {
-
- }
-
-}
diff --git a/portal/src/app/searchPages/search.component.ts b/portal/src/app/searchPages/search.component.ts
deleted file mode 100644
index 1636b90a..00000000
--- a/portal/src/app/searchPages/search.component.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import {Component} from '@angular/core';
-import {JSONP_PROVIDERS} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-import { RouteParams, RouteConfig, ROUTER_DIRECTIVES, Router } from '@angular/router-deprecated';
-import {SearchCrossrefService} from '../services/searchCrossref.service';
-import {Publication} from '../entities/publication';
-import {PagingFormatter} from '../common/pagingFormatter.component';
-import {PublicationTitleFormatter} from '../common/publicationTitleFormatter.component';
-import {SearchAllComponent} from '../searchAll/searchAll.component';
-
-@Component({
- selector: 'search',
- directives: [...ROUTER_DIRECTIVES,PagingFormatter, PublicationTitleFormatter,SearchAllComponent],
- template: `
- Search Demo
- Fetches from crossref
-
-
-
-
{{resultsNum }} Total Results
-
-
-
-
{{item.DOI}} --{{item.publisher}}
-
-
-
-
- `,
- directives:[SearchPageComponent]
-})
-export class SearchPublicationsComponent {
- results =[];
- filters =[];
- totalResults:number = 0 ;
- keyword = '';
- page :number = 1;
- constructor (private _routeParams: RouteParams) {
- this.results =[];
- this.filters =[];
- this.totalResults = 123;
- for(var i=0; i<10 ; i++){
- var result = {title: "title"+i, id: "id"+i}
- this.results.push(result);
- }
-
- for(var i=0; i<5 ; i++){
- var values = [];
- for(var j=0; j<10 ; j++){
- var value:Value = {name: "name"+j, id: "filter_"+i+ "_id_"+j, number:j, selected:false}
- values.push(value);
- }
- values.sort((n2,n1) => {
- if (n1.number > n2.number) {
- return 1;
- }
-
- if (n1.number < n2.number) {
- return -1;
- }
-
- return 0;
- });
- var filter:Filter = {title: "title"+i, filterId: "filter_"+i, values : values, countSelectedValues:0}
- this.filters.push(filter);
- }
-
-
- }
- ngOnInit() {
-
- let page = +this._routeParams.get('page');
- let size = +this._routeParams.get('size');
- this.page= (page?page:1);
- this.keyword = (this._routeParams.get('keyword')?this._routeParams.get('keyword'):'');
- //TODO get the rest parameters to create query
-
-
- }
-
- getResults(parameters:string){
- //http://rudie.di.uoa.gr:8080/dnet-functionality-services-1.2.0-SNAPSHOT/search?action=searchNrefine&sTransformer=results_openaire&rTransformer=results_openaire_browse&query=%28oaftype+exact+result%29+and+%28resulttypeid+exact+publication%29&page=5&size=10&fields=instancetypenameid&fields=resultlanguageid&fields=relfunderid&fields=relprojectid&fields=resultacceptanceyear&fields=resultbestlicense&fields=resulthostingdatasourceid&fields=communityid&locale=en_GB
- console.info("Execute search query "+parameters);
- // this.results =[];
- // this.filters =[];
- // for(var i=0; i<30 ; i++){
- // var result = {title: "title"+i, id: "id"+i}
- // this.results.push(result);
- // }
- //
- // for(var i=0; i<5 ; i++){
- // var values = [];
- // for(var j=0; j<10 ; j++){
- // var value = {name: "name"+j, id: "id"+j, number:j, selected:false}
- // values.push(value);
- // }
- // var filter = {title: "title"+i, filterId: "id"+i, values : values}
- // this.filters.push(filter);
- // }
-
- }
- private setFilters(){
- //TODO set filters from
- }
-
- private queryChanged($event) {
- var parameters = $event.value
- this.getResults(parameters)
- console.info("Execute search query "+parameters);
-
- }
-
-
-}
diff --git a/portal/src/app/services/claims.service.ts b/portal/src/app/services/claims.service.ts
deleted file mode 100644
index ef4c73a1..00000000
--- a/portal/src/app/services/claims.service.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import {Injectable} from '@angular/core';
-import {Jsonp, URLSearchParams,ResponseOptions, RequestOptions, Headers} from '@angular/http';
-import {Http, Response} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-import {Claim} from '../entities/claim';
-
-@Injectable()
-export class ClaimsService {
- // baseUrl='http://rudie.di.uoa.gr:8080/dnet-openaire-connector-service-1.0.0-SNAPSHOT/rest/claimsService/';
- baseUrl='http://scoobydoo.di.uoa.gr:8181/dnet-openaire-connector-service-1.0.0-SNAPSHOT/rest/claimsService/';
- constructor(private jsonp: Jsonp, private http: Http) {
-
- }
-
- private getClaimRequest(size : number, page : number, url :string):any {
- console.info('ClaimsService: Claims request: '+url);
- return this.http.get( url)
- .map(request => request.json())
- .do(request => console.info("Get claims: offset = "+(size*(page-1)) + " limit ="+size ))
- .catch(this.handleError);
- }
- getClaims( size : number, page : number, keyword:string, sortby: string, descending: boolean, types: string):any {
- console.info('ClaimsService: getClaims ' );
- console.info('ClaimsService: Types : '+types );
- let url = this.baseUrl +"claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+"&types="+types;
- return this.getClaimRequest(size,page,url);
-
- }
- getClaimsByUser( size : number, page : number, user:string, keyword:string, sortby: string, descending: boolean, types: string):any {
- console.info('ClaimsService: getClaims for user : '+user);
- let url = this.baseUrl +"users/"+user+"/claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+"&types="+types;
- return this.getClaimRequest(size,page,url);
-
- }
- getClaimsBycontext( size : number, page : number, contextId:string, keyword:string, sortby: string, descending: boolean, types: string):any {
- console.info('ClaimsService: getClaims for context : '+contextId);
- let url = this.baseUrl +"contexts/"+contextId+"/claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+"&types="+types;
- return this.getClaimRequest(size,page,url);
-
- }
- getClaimsByResult( size : number, page : number, resultId:string, keyword:string, sortby: string, descending: boolean, types: string):any {
- console.info('ClaimsService: getClaims for result : '+resultId);
- let url = this.baseUrl +"results/"+resultId+"/claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+"&types="+types;
- return this.getClaimRequest(size,page,url);
-
- }
- getClaimsByProject( size : number, page : number, projectId:string, keyword:string, sortby: string, descending: boolean, types: string):any {
- console.info('ClaimsService: getClaims for project : '+projectId);
- let url = this.baseUrl +"projects/"+projectId+"/claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+"&types="+types;
- return this.getClaimRequest(size,page,url);
- }
-
- deleteClaimById(claimId:string):any{
- console.warn('Trying to delete claim with id : '+claimId);
- let url = this.baseUrl +"claims/"+claimId;
- console.warn('Delete url: '+url);
- let headers = new Headers({ 'Content-Type': 'application/json' });
- let options = new RequestOptions({ headers: headers });
- return this.http.delete( url, options).map(request => request.json())
- .do(request => console.info("After delete" ))
- .catch(this.handleError);
-
- }
- insertClaim(claim):any{
- console.warn('Trying toinsert claim : '+claim);
- let url = this.baseUrl +"claims";
- let body = JSON.stringify( claim );
- let headers = new Headers({ 'Content-Type': 'application/json' });
- let options = new RequestOptions({ headers: headers });
- return this.http.post(url, body, options)
- .map(res => res.json())
- .do(request => console.info("Insert Response:"+request.status) )
- .catch(this.handleError);
-
- }
-
- private handleError (error: Response) {
- // in a real world app, we may send the error to some remote logging infrastructure
- // instead of just logging it to the console
- console.error(error);
- return Observable.throw(error || 'Server error');
- }
-
- getClaim(id:string):any {
- let url = this.baseUrl+"claims/"+id;
- return new Promise((resolve, reject) => {
- this.http.get(url)
- .map(res => res.json())
- .subscribe(
- data => {
- resolve(data.data);
- },
- err => {
- reject(err);
- }
- )
- ;
- });
- }
-
-}
diff --git a/portal/src/app/services/contexts.service.ts b/portal/src/app/services/contexts.service.ts
deleted file mode 100644
index 9b28a8b6..00000000
--- a/portal/src/app/services/contexts.service.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import {Injectable} from '@angular/core';
-import {Jsonp, URLSearchParams,ResponseOptions} from '@angular/http';
-import {Http, Response} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-import {Claim} from '../entities/claim';
-
-@Injectable()
-export class ContextsService {
- // baseUrl='http://rudie.di.uoa.gr:8080/dnet-openaire-connector-service-1.0.0-SNAPSHOT/rest/claimsService/';
- baseUrl='http://scoobydoo.di.uoa.gr:8181/dnet-openaire-connector-service-1.0.0-SNAPSHOT/rest/claimsService/';
- //'http://rudie.di.uoa.gr:8080/dnet-openaire-connector-service-1.0.0-SNAPSHOT/rest/claimsService/communities';
-//http://rudie.di.uoa.gr:8080/dnet-openaire-connector-service-1.0.0-SNAPSHOT/rest/claimsService/communities/egi/categories
-//http://rudie.di.uoa.gr:8080/dnet-openaire-connector-service-1.0.0-SNAPSHOT/rest/claimsService/categories/egi::classification/concepts
- constructor(private http: Http) {
-
- }
-
- public getCommunities():any {
- let url = this.baseUrl + 'communities';
- console.info('ContextsService: request communities '+url);
- return this.http.get( url)
- .map(request => request.json().data)
- .do(request => console.info("Get claims: offset = "))
- .catch(this.handleError);
- }
- public getCategories(communityId :string):any {
- console.info('ContextsService: request categories for community with id '+communityId);
- let url= this.baseUrl + 'communities/' + communityId + '/categories';
- return this.http.get( url)
- .map(request => request.json().data)
- .do(request => console.info("Get claims: offset = " ))
- .catch(this.handleError);
- }
- public getConcepts(categoryId :string, keyword: string):any {
- console.info('ContextsService: request concept for category with id '+categoryId + ' and keyword '+ keyword);
- let url= this.baseUrl + 'categories/' + categoryId+ "/concepts";
- return this.http.get( url)
- .map(request => request.json().data)
- .do(request => console.info("Get claims: offset = " ))
- .catch(this.handleError);
- }
-
- private handleError (error: Response) {
- // in a real world app, we may send the error to some remote logging infrastructure
- // instead of just logging it to the console
- console.error(error);
- return Observable.throw(error || 'Server error');
- }
-}
diff --git a/portal/src/app/services/dataset.service.ts b/portal/src/app/services/dataset.service.ts
deleted file mode 100644
index bf870efd..00000000
--- a/portal/src/app/services/dataset.service.ts
+++ /dev/null
@@ -1,616 +0,0 @@
-import {Injectable} from '@angular/core';
-import {Http, Response} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-import {DatasetInfo} from '../entities/datasetInfo';
-
-@Injectable()
-export class DatasetService {
-
- constructor(private http: Http) {}
-
- datasetInfo: DatasetInfo;
-
- getDatasetInfo (id: string):any {
- console.info("getDatasetInfo in service");
-
- //let url = 'http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2.0/api/datasets/'+id;
- //let url = 'http://scoobydoo.di.uoa.gr:8181/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2.0/api/datasets/'+id;
- let url = 'http://astero.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2.0/api/datasets/'+id;
-
-
- return this.http.get(url)
- .map(res => res.json())
- .do(res => console.info(res['result']['metadata']['oaf:entity']))
- .map(res => res['result']['metadata']['oaf:entity']['oaf:result'])
- .map(res => [res,
- res['title'],
- res['rels']['rel'],
- res['children'],
- res['pid'],
- res['subject'],
- res['bestlicense'],
- res['collectedfrom'],
- res['context'],
- res['resulttype']
- ])
- .map(res => this.parseDatasetInfo(res));
-
- }
-
- private handleError (error: Response) {
- // in a real world app, we may send the error to some remote logging infrastructure
- // instead of just logging it to the console
- console.error(error);
- return Observable.throw(error || 'Server error');
- }
-
- parseDatasetInfo (data: any):any {
- this.datasetInfo = new DatasetInfo();
-
- if(data[0] != null) {
- this.datasetInfo.date = data[0].dateofacceptance.substring(0,4);
- this.datasetInfo.publisher = data[0].publisher;
- if(!Array.isArray(data[0].description)) {
- this.datasetInfo.description = data[0].description;
- } else {
- this.datasetInfo.description = data[0].description[0];
- }
- this.datasetInfo.embargoEndDate = data[0].embargoenddate;
- }
-
- if(data[1] != null) {
- this.datasetInfo.title = {"name": "", "url": "", "accessMode": ""};
- if(Array.isArray(data[1])) {
- this.datasetInfo.title['name'] = data[1][0].content;
- } else {
- this.datasetInfo.title['name'] = data[1].content;
- }
- }
-
- if(data[2] != null) {
- let mydata;
- let counter = 0;
- let length = data[2].length!=undefined ? data[2].length : 1;
-
- for(let i=0; i 1 ? data[2][i] : data[2];
- if(mydata.hasOwnProperty("to")) {
- if(mydata['to'].class == "hasAuthor") {
- if(this.datasetInfo.authors == undefined) {
- this.datasetInfo.authors = new Array<{"name": string, "url": string}>();
- }
-
- this.datasetInfo.authors[mydata.ranking-1] = {"name": "", "url": ""};
- this.datasetInfo.authors[mydata.ranking-1]['name'] = mydata.fullname;
- this.datasetInfo.authors[mydata.ranking-1]['url'] = "https://beta.openaire.eu/search/person?personId="+mydata['to'].content;
- } else if(mydata['to'].class == "isProducedBy") {
- if(this.datasetInfo.fundedByProjects == undefined) {
- this.datasetInfo.fundedByProjects = new Array<
- { "url": string, "acronym": string, "title": string,
- "funderShortname": string, "funderName": string,
- "funding": string, "new": boolean
- }>();
- }
-
- counter = this.datasetInfo.fundedByProjects.length;
-
- this.datasetInfo.fundedByProjects[counter] = {
- "url": "", "acronym": "", "title": "",
- "funderShortname": "", "funderName": "",
- "funding": "", "new": false
- }
-
- this.datasetInfo.fundedByProjects[counter]['url'] =
- "http://localhost:3000/project?projectId="+mydata['to'].content;
- this.datasetInfo.fundedByProjects[counter]['acronym'] = mydata.acronym;
- this.datasetInfo.fundedByProjects[counter]['title'] = mydata.title;
-
- if(mydata.hasOwnProperty("funding")) {
- let length1 = Array.isArray(mydata['funding']) ? mydata['funding'].length : 1;
-
- for(let j=0; j 1 ? mydata['funding'][j] : mydata['funding'];
-
- if(mydata1.hasOwnProperty("funder")) {
- this.datasetInfo.fundedByProjects[counter]['funderShortname'] = mydata1['funder'].shortname;
- this.datasetInfo.fundedByProjects[counter]['funderName'] = mydata1['funder'].name;
- }
-
- if(mydata1.hasOwnProperty("funding_level_2")) {
- funding = mydata1['funding_level_2'].content;
- } else if(mydata1.hasOwnProperty("funding_level_1")) {
- funding = mydata1['funding_level_1'].content;
- } else if(mydata1.hasOwnProperty("funding_level_0")) {
- funding = mydata1['funding_level_0'].content;
- }
-
- if(funding != undefined) {
- funding = funding.split("::");
-
- if(this.datasetInfo.fundedByProjects[counter]['funding'] != "") {
- this.datasetInfo.fundedByProjects[counter]['funding'] += ", "+funding[1];
- } else {
- this.datasetInfo.fundedByProjects[counter]['funding'] = funding[1];
- }
- for(let i=2; i();
- }
-
- let url = "http://localhost:3000/publication?articleId="+mydata['to'].content;
- let counter = this.datasetInfo.similarPublications.length;
-
- this.datasetInfo.similarPublications[counter] = {"name": "", "url": "", "date": "", "trust": ""};
- this.datasetInfo.similarPublications[counter]['url'] = url;
- this.datasetInfo.similarPublications[counter]['name'] = mydata['title'].content;
- this.datasetInfo.similarPublications[counter]['date'] = mydata.dateofacceptance.substring(0,4);
- this.datasetInfo.similarPublications[counter]['trust'] = Math.round(mydata.trust*100)+"%";
- } else if(mydata.hasOwnProperty('resulttype') && mydata['resulttype'].classname == "dataset") {
- if(this.datasetInfo.similarDatasets == undefined) {
- this.datasetInfo.similarDatasets = new Array<
- { "name": string, "url": string, "date": string, "trust": string}>();
- }
-
- let url = "http://localhost:3000/dataset?datasetId="+mydata['to'].content;
- let counter = this.datasetInfo.similarDatasets.length;
-
- this.datasetInfo.similarDatasets[counter] = {"name": "", "url": "", "date": "", "trust": ""};
- this.datasetInfo.similarDatasets[counter]['url'] = url;
- this.datasetInfo.similarDatasets[counter]['name'] = mydata['title'].content;
- this.datasetInfo.similarDatasets[counter]['date'] = mydata.dateofacceptance.substring(0,4);
- this.datasetInfo.similarDatasets[counter]['trust'] = Math.round(mydata.trust*100)+"%";
- }*/
-
- if(this.datasetInfo.similarResearchResults == undefined) {
- this.datasetInfo.similarResearchResults = new Array<{
- "name": string, "url": string, "date": string,
- "trust": string, "class": string}>();
- }
-
- counter = this.datasetInfo.similarResearchResults.length;
- this.datasetInfo.similarResearchResults[counter] = {"name": "", "url": "", "date": "", "trust": "", "class": ""}
-
- let url;
- if(mydata['resulttype'].classname == "publication") {
- url = "http://localhost:3000/publication?articleId="+mydata['to'].content;
- this.datasetInfo.similarResearchResults[counter]['class'] = "publication";
- } else {
- url = "http://localhost:3000/dataset?datasetId="+mydata['to'].content;
- this.datasetInfo.similarResearchResults[counter]['class'] = "dataset";
- }
-
- this.datasetInfo.similarResearchResults[counter]['url'] = url;
- this.datasetInfo.similarResearchResults[counter]['name'] = mydata['title'].content;
- this.datasetInfo.similarResearchResults[counter]['date'] = mydata.dateofacceptance.substring(0,4);;
- this.datasetInfo.similarResearchResults[counter]['trust'] = Math.round(mydata.trust*100)+"%";
-
-
- } else if(mydata['to'].class == "isRelatedTo") {
- /*if(mydata.hasOwnProperty('resulttype')) {
- if(mydata['resulttype'].classname == "publication") {
- if(this.datasetInfo.relatedPublications == undefined) {
- this.datasetInfo.relatedPublications = new Array<{
- "name": string, "url": string, "date": string, "trust": string}>();
- }
- let url = "http://localhost:3000/publication?articleId="+mydata['to'].content;
- counter = this.datasetInfo.relatedPublications.length;
-
- this.datasetInfo.relatedPublications[counter] = {"name": "", "url": "", "date": "", "trust": ""}
-
- this.datasetInfo.relatedPublications[counter]['url'] = url;
- this.datasetInfo.relatedPublications[counter]['name'] = mydata['title'].content;
- this.datasetInfo.relatedPublications[counter]['date'] = mydata.dateofacceptance.substring(0,4);;
- this.datasetInfo.relatedPublications[counter]['trust'] = Math.round(mydata.trust*100)+"%";
- } else {
- if(this.datasetInfo.relatedResearchData == undefined) {
- this.datasetInfo.relatedResearchData = new Array<{
- "name": string, "url": string, "date": string, "trust": string}>();
- }
- let url = "http://localhost:3000/dataset?datasetId="+mydata['to'].content;
- counter = this.datasetInfo.relatedResearchData.length;
-
- this.datasetInfo.relatedResearchData[counter] = {"name": "", "url": "", "date": "", "trust": ""}
-
- this.datasetInfo.relatedResearchData[counter]['url'] = url;
- this.datasetInfo.relatedResearchData[counter]['name'] = mydata['title'].content;
- this.datasetInfo.relatedResearchData[counter]['date'] = mydata.dateofacceptance.substring(0,4);;
- this.datasetInfo.relatedResearchData[counter]['trust'] = Math.round(mydata.trust*100)+"%";
- }
- }*/
-
- if(this.datasetInfo.relatedResearchResults == undefined) {
- this.datasetInfo.relatedResearchResults = new Array<{
- "name": string, "url": string, "date": string,
- "trust": string, "class": string}>();
- }
-
- counter = this.datasetInfo.relatedResearchResults.length;
- this.datasetInfo.relatedResearchResults[counter] = {"name": "", "url": "", "date": "", "trust": "", "class": ""}
-
- let url;
- if(mydata['resulttype'].classname == "publication") {
- url = "http://localhost:3000/publication?articleId="+mydata['to'].content;
- this.datasetInfo.relatedResearchResults[counter]['class'] = "publication";
- } else {
- url = "http://localhost:3000/dataset?datasetId="+mydata['to'].content;
- this.datasetInfo.relatedResearchResults[counter]['class'] = "dataset";
- }
-
- this.datasetInfo.relatedResearchResults[counter]['url'] = url;
- this.datasetInfo.relatedResearchResults[counter]['name'] = mydata['title'].content;
- this.datasetInfo.relatedResearchResults[counter]['date'] = mydata.dateofacceptance.substring(0,4);;
- this.datasetInfo.relatedResearchResults[counter]['trust'] = Math.round(mydata.trust*100)+"%";
-
- }
- }
- }
-
- this.datasetInfo.authors = this.datasetInfo.authors.filter(function (item) {
- return (item != undefined);
- });
- }
-
- if(data[3] != null) {
- if(data[3].hasOwnProperty("instance")) {
- this.datasetInfo.downloadFrom = new Map();
- this.datasetInfo.publishedIn = new Map()
-
- let length = data[3]['instance'].length!=undefined ? data[3]['instance'].length : 1;
-
- let counter = 0;
- let counter1 = 0;
- let counter2 = 0;
- let mydata;
- for(let i=0; i 1 ? data[3]['instance'][i] : data[3]['instance'];
-
- if(mydata.hasOwnProperty("webresource")) {
- let url;
- if(mydata['webresource'].length == undefined) {
- url = mydata['webresource'].url;
- } else{
- url = mydata['webresource'][0].url;
- }
-
- if(!this.datasetInfo.downloadFrom.has(url) && mydata.hasOwnProperty("hostedby")) {
- if(mydata['hostedby'].name != "other resources" && mydata['hostedby'].name != "Unknown Repository") {
- if(!this.datasetInfo.downloadFrom.has(mydata['hostedby'].name)) {
- this.datasetInfo.downloadFrom.set(mydata['hostedby'].name, {"url": null, "accessMode": null});
- }
-
- if(this.datasetInfo.downloadFrom.get(mydata['hostedby'].name)['url'] == null) {
- this.datasetInfo.downloadFrom.get(mydata['hostedby'].name)['url'] = new Array();
- }
-
- counter2 = this.datasetInfo.downloadFrom.get(mydata['hostedby'].name)['url'].length;
- this.datasetInfo.downloadFrom.get(mydata['hostedby'].name)['url'][counter2] = url;
-
- if(this.datasetInfo.downloadFrom.get(mydata['hostedby'].name)['accessMode'] == null) {
- this.datasetInfo.downloadFrom.get(mydata['hostedby'].name)['accessMode'] = new Array();
- }
-
- if(mydata.hasOwnProperty("licence")) {
- this.datasetInfo.downloadFrom.get(mydata['hostedby'].name)['accessMode'][counter2] = mydata['licence'].classid;
- } else {
- this.datasetInfo.downloadFrom.get(mydata['hostedby'].name)['accessMode'][counter2] = "";
- }
- } else {
- if(data[0] != null && data[0].hasOwnProperty("source")) {
- let key: string;
- if(Array.isArray(data[0].source)) {
- if(!this.datasetInfo.publishedIn.has(data[0]['source'][counter1])) {
- key = data[0]['source'][counter1];
- }
- } else {
- if(!this.datasetInfo.publishedIn.has(data[0]['source'])) {
- key = data[0]['source'];
- }
- }
-
- this.datasetInfo.publishedIn.set(key, {"url": null, "accessMode": null});
-
- if(this.datasetInfo.publishedIn.get(key)['url'] == null) {
- this.datasetInfo.publishedIn.get(key)['url'] = new Array();
- }
-
- counter2 = this.datasetInfo.publishedIn.get(key)['url'].length;
- this.datasetInfo.publishedIn.get(key)['url'][counter2] = url;
-
- if(this.datasetInfo.publishedIn.get(key)['accessMode'] == null) {
- this.datasetInfo.publishedIn.get(key)['accessMode'] = new Array();
- }
-
- if(mydata.hasOwnProperty("licence")) {
- this.datasetInfo.publishedIn.get(key)['accessMode'][counter2] = mydata['licence'].classid;
- } else {
- this.datasetInfo.publishedIn.get(key)['accessMode'][counter2] = "";
- }
- counter1++;
- }
- }
- if(this.datasetInfo.title != undefined) {
- if(this.datasetInfo.title['url'] == undefined) {
- this.datasetInfo.title['url'] = url;
- }
-
- switch (this.datasetInfo.title['licence']) {
- case undefined:
- this.datasetInfo.title['licence'] = mydata['licence'].classid;
- this.datasetInfo.title['url'] = url;
- break;
- case "CLOSED":
- if(mydata['licence'].classid == "OPEN" ||
- mydata['licence'].classid == "EMBARGO" ||
- mydata['licence'].classid == "RESTRICTED") {
- this.datasetInfo.title['licence'] = mydata['licence'].classid;
- this.datasetInfo.title['url'] = url;
- }
- break;
- case "RESTRICTED":
- if(mydata['licence'].classid == "OPEN" ||
- mydata['licence'].classid == "EMBARGO") {
- this.datasetInfo.title['licence'] = mydata['licence'].classid;
- this.datasetInfo.title['url'] = url;
- }
- break;
- case "EMBARGO":
- if(mydata['licence'].classid == "OPEN") {
- this.datasetInfo.title['licence'] = mydata['licence'].classid;
- this.datasetInfo.title['url'] = url;
- }
- break;
- }
- }
- }
- }
- }
- }
- }
-
- if(data[4] != null) {
- let counter = 0;
- this.datasetInfo.identifiers = new Map();
-
- if(data[4].hasOwnProperty("classname") && data[4]['classname'] != "") {
- if(data[4].classname == "doi" || data[4].classname == "pmc") {
- if(!this.datasetInfo.identifiers.has(data[4].classname)) {
- this.datasetInfo.identifiers.set(data[4].classname, new Array());
- }
- counter = this.datasetInfo.identifiers.get(data[4].classname).length;
- this.datasetInfo.identifiers.get(data[4].classname)[counter] = data[4].content;
- }
- } else {
- for(let i=0; i());
- }
- counter = this.datasetInfo.identifiers.get(data[4][i].classname).length;
- this.datasetInfo.identifiers.get(data[4][i].classname)[counter] = data[4][i].content;
- }
- }
- }
- }
-
- if(data[5] != null) {
- this.datasetInfo.classifiedSubjects = new Map();
- this.datasetInfo.subjects = new Array();
-
- let mydata;
- let length = data[5].length!=undefined ? data[5].length : 1;
-
- for(let i=0; i 1 ? data[5][i] : data[5];
-
- if(mydata.classid != "") {
- if(mydata.inferred == true) {
- if(!this.datasetInfo.classifiedSubjects.has(mydata.classid)) {
- this.datasetInfo.classifiedSubjects.set(mydata.classid, new Array());
- }
-
- let counter = this.datasetInfo.classifiedSubjects.get(mydata.classid).length;
- this.datasetInfo.classifiedSubjects.get(mydata.classid)[counter] = mydata.content;
- } else {
- let counter = this.datasetInfo.subjects.length;
- this.datasetInfo.subjects[counter] = mydata.content;
- }
- }
- }
- }
-
- if(data[6] != null) {
- this.datasetInfo.bestlicense = data[6].classid;
- }
-
- if(data[7] != null) {
- this.datasetInfo.collectedFrom = new Array<{"name": string, "url": string}>();
-
- let mydata;
- let length = data[7].length!=undefined ? data[7].length : 1;
- for(let i=0; i 1 ? data[7][i] : data[7];
- let link = "https://beta.openaire.eu/search/dataprovider?datasourceId=";
- this.datasetInfo.collectedFrom[i] = {"name": "", "url": ""};
- this.datasetInfo.collectedFrom[i]['name'] = mydata.name;
- this.datasetInfo.collectedFrom[i]['url'] = link+mydata.id;
- }
- }
-
- if(this.datasetInfo.publisher != null
- && this.datasetInfo.identifiers != null
- && this.datasetInfo.identifiers.has("doi")) {
-
- if( this.datasetInfo.downloadFrom == null) {
- this.datasetInfo.downloadFrom = new Map();
- }
-
- this.datasetInfo.downloadFrom.set(this.datasetInfo.publisher, {"url": null, "accessMode": null});
-
- let url = "http://dx.doi.org/"+this.datasetInfo.identifiers.get("doi");
- this.datasetInfo.downloadFrom.get(this.datasetInfo.publisher)['url'] = new Array();
- this.datasetInfo.downloadFrom.get(this.datasetInfo.publisher)['accessMode'] = new Array();
-
- this.datasetInfo.downloadFrom.get(this.datasetInfo.publisher)['url'][0] = url;
- this.datasetInfo.downloadFrom.get(this.datasetInfo.publisher)['accessMode'][0] = "";
-
- if(this.datasetInfo.title != undefined && this.datasetInfo.title['url'] == "") {
- this.datasetInfo.title['url'] = url;
- }
- }
-
- if(data[8] != null) {
- this.datasetInfo.contexts = new Array<
- { "labelContext": string, "labelCategory": string, "labelConcept": string}>();
-
- let position = 0;
- let labels = "";
- let mydata;
- let length = data[8].length!=undefined ? data[8].length : 1;
- for(let i=0; i 1 ? data[8][i] : data[8];
-
- if(mydata.hasOwnProperty("type") && mydata['type'] == "community") {
- if(mydata.hasOwnProperty("category")) {
- if(mydata['category'].hasOwnProperty("concept")) {
- let mydata1;
- let length1 = mydata['category']['concept'].length!=undefined ? mydata['category']['concept'].length : 1;
- for(let j=0; j 1 ? mydata['category']['concept'][j] : mydata['category']['concept'];
-
- this.datasetInfo.contexts[position] = {"labelContext": "", "labelCategory": "", "labelConcept": ""};
- this.datasetInfo.contexts[position]['labelContext'] = mydata.label;
- this.datasetInfo.contexts[position]['labelCategory'] = mydata['category'].label;;
- this.datasetInfo.contexts[position]['labelConcept'] = mydata1.label;
-
- position++;
- }
- } else {
- this.datasetInfo.contexts[position] = {"labelContext": "", "labelCategory": "", "labelConcept": ""};
- this.datasetInfo.contexts[position]['labelContext'] = mydata.label;
- this.datasetInfo.contexts[position]['labelCategory'] = mydata['category'].label;;
- this.datasetInfo.contexts[position]['labelConcept'] = null;
- }
- } else {
- this.datasetInfo.contexts[position] = {"labelContext": "", "labelCategory": "", "labelConcept": ""};
- this.datasetInfo.contexts[position]['labelContext'] = mydata.label;
- this.datasetInfo.contexts[position]['labelCategory'] = null;
- this.datasetInfo.contexts[position]['labelConcept'] = null;
- }
- }
- }
- }
-
- if(data[9] != null) {
- if(data[9].hasOwnProperty('classname')) {
- this.datasetInfo.type = data[9].classname;
- }
- }
-
-
- //this.printdatasetInfo();
- return this.datasetInfo;
-
- }
-
- printDatasetInfo() {
- console.info("DATE: "+this.datasetInfo.date);
- console.info("PUBLISHER: "+this.datasetInfo.publisher);
- console.info("DESCRIPTION: "+this.datasetInfo.description);
-
- console.info("TITLE: "+this.datasetInfo.title);
-
- console.info("AUTHORS: "+this.datasetInfo.authors);
- console.info("\nFUNDED BY PROJECTS:");
- if(this.datasetInfo.fundedByProjects != undefined) {
- this.datasetInfo.fundedByProjects.forEach(function (value, key, map) {
- console.info(key + " = " + value);
- });
- } else {
- console.info("undefined");
- }
- console.info("\n");
-/*
- console.info("\nRELATED RESEARCH DATA:");
- if(this.datasetInfo.relatedResearchData != undefined) {
- this.datasetInfo.relatedResearchData.forEach(function (value, key, map) {
- console.info(key + " = " + value);
- });
- } else {
- console.info("undefined");
- }
- console.info("\n");
-
- console.info("\nSIMILAR datasetS:");
- if(this.datasetInfo.similarPublications != undefined) {
- this.datasetInfo.similarPublications.forEach(function (value, key, map) {
- console.info(key + " = " + value);
- });
- } else {
- console.info("undefined");
- }
- console.info("\n");
-*/
- console.info("TYPE: "+this.datasetInfo.type);
- console.info("\nDOWNLOAD FROM:");
- if(this.datasetInfo.downloadFrom != undefined) {
- this.datasetInfo.downloadFrom.forEach(function (value, key, map) {
- console.info(key + " = " + value);
- });
- } else {
- console.info("undefined");
- }
- console.info("\n");
-
- console.info("\nIDENTIFIERS:");
- if(this.datasetInfo.identifiers != undefined) {
- this.datasetInfo.identifiers.forEach(function (value, key, map) {
- console.info(key + " = " + value);
- });
- } else {
- console.info("undefined");
- }
- console.info("\n");
-
- console.info("SUBJECTS: "+this.datasetInfo.subjects);
- console.info("\nCLASSIFIED OBJECTS:");
- if(this.datasetInfo.classifiedSubjects != undefined) {
- this.datasetInfo.classifiedSubjects.forEach(function (value, key, map) {
- console.info(key + " = " + value);
- });
- } else {
- console.info("undefined");
- }
- console.info("\n");
-
- console.info("BEST LICENSE: "+this.datasetInfo.bestlicense);
-
- console.info("\nCOLLECTED FROM:");
- if(this.datasetInfo.collectedFrom != undefined) {
- this.datasetInfo.collectedFrom.forEach(function (value, key, map) {
- console.info(key + " = " + value);
- });
- } else {
- console.info("undefined");
- }
- console.info("\n");
-
- console.info("\nDOWNLOAD FROM:");
- if(this.datasetInfo.downloadFrom != undefined) {
- this.datasetInfo.downloadFrom.forEach(function (value, key, map) {
- console.info(key + " = " + value);
- });
- } else {
- console.info("undefined");
- }
- console.info("\n");
- }
-}
diff --git a/portal/src/app/services/openaireProjects.service.ts b/portal/src/app/services/openaireProjects.service.ts
deleted file mode 100644
index c0c8e69f..00000000
--- a/portal/src/app/services/openaireProjects.service.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-import {Injectable} from '@angular/core';
-// import {Http, Response, Headers} from '@angular/http';
-import {Http, Response} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-// import {Publication} from '../entities/publication';
-@Injectable()
-export class OpenaireProjectsService {
- constructor( private http: Http) {}
- // searchUrl="http://services.openaire.eu:8380/search/";
- // searchUrl="http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/";
- searchUrl="http://scoobydoo.di.uoa.gr:8181/dnet-functionality-services-2.0.0-SNAPSHOT/";
- getFunders():any {
- let url = this.searchUrl+'search?action=refine&rTransformer=results_openaire_browse&fields=funderid&query=%28oaftype+exact+project%29&locale=en_GB&format=json';
- ////"&rows=".$size."&offset=".($page-1)*$size
- return this.http.get( url)
- .map(request => request.json().response.browseResults.result)
- .do(funders => console.log("getFunders : "+funders))
- .catch(this.handleError);
-
- }
-
- searchForProjects(keyword:string, funderId:string):any {
- let url = this.searchUrl+'search?action=search&sTransformer=projects_openaire&query='+
- '%28oaftype+exact+project%29+and+%28%28projecttitle+%3D+%22'+keyword+'%22%29+or+%28projectacronym+%3D+%22'+keyword+'%22%29+or+%28projectcode+%3D+%22'+keyword+'%22%29%29+and+%28funderid+exact+'+funderId+'%29&size=10&locale=en_GB&format=json';
-
- ////"&rows=".$size."&offset=".($page-1)*$size
- return this.http.get( url)
- .map(request => (request.json().response.results)?request.json().response.results.result:request.json().response.results)
- .do(funders => console.log("getFunders : "+funders))
- .catch(this.handleError);
-
- }
-
- private handleError (error: Response) {
- // in a real world app, we may send the error to some remote logging infrastructure
- // instead of just logging it to the console
- console.error(error);
- return Observable.throw(error || 'Server error');
- }
-
-}
-
-/*
-http://services.openaire.eu:8380/search/search?action=search&sTransformer=projects_openaire&query=%28oaftype+exact+project%29+and+%28%28projecttitle+%3D+%22ope%22%29+or+%28projectacronym+%3D+%22ope%22%29+or+%28projectcode+%3D+%22ope%22%29%29+and+%28funderid+exact+ec__________%3A%3AEC%29&size=10&locale=en_GB&format=json
-
-http://services.openaire.eu:8380/search/search?action=refine&rTransformer=results_openaire_browse&fields=funderid&query=%28oaftype+exact+project%29&locale=en_GB&format=json
-
-*/
diff --git a/portal/src/app/services/person.service.ts b/portal/src/app/services/person.service.ts
deleted file mode 100644
index 2c376751..00000000
--- a/portal/src/app/services/person.service.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import {Injectable} from '@angular/core';
-import {Http, Response} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-import {PersonInfo} from '../entities/personInfo';
-
-@Injectable()
-export class PersonService {
-
- constructor(private http: Http) {}
-
- personInfo: PersonInfo;
-
- getPersonInfo (id: string):any {
- console.info("getPersonInfo in service");
-
- //let url = 'http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2.0/api/projects/'+id;
- //let url = 'http://scoobydoo.di.uoa.gr:8181/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2.0/api/projects/'+id;
- let url = 'http://astero.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2.0/api/people/'+id;
-
- return this.http.get(url)
- .map(res => res.json())
- .map(res => res['result']['metadata']['oaf:entity']['oaf:person'])
- .map(res => this.parsePersonInfo(res));
-
- }
-
- private handleError (error: Response) {
- // in a real world app, we may send the error to some remote logging infrastructure
- // instead of just logging it to the console
- console.error(error);
- return Observable.throw(error || 'Server error');
- }
-
- parsePersonInfo (data: any):any {
- console.info("parsePersonInfo");
- this.personInfo = new PersonInfo();
-
- if(data != null) {
- if(data.hasOwnProperty('firstname')) {
- this.personInfo.firstname = data.firstname;
- }
- if(data.hasOwnProperty('secondnames')) {
- this.personInfo.secondnames = data.secondnames;
- }
- if(data.hasOwnProperty('fullname')) {
- this.personInfo.fullname = data.fullname;
- }
- }
-
- return this.personInfo;
-
- }
-
-}
diff --git a/portal/src/app/services/project.service.ts b/portal/src/app/services/project.service.ts
deleted file mode 100644
index 57fbf7de..00000000
--- a/portal/src/app/services/project.service.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import {Injectable} from '@angular/core';
-import {Http, Response} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-import {ProjectInfo} from '../entities/projectInfo';
-
-@Injectable()
-export class ProjectService {
-
- constructor(private http: Http) {}
-
- projectInfo: ProjectInfo;
-
- getProjectInfo (id: string):any {
- console.info("getProjectInfo in service");
-
- //let url = 'http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2.0/api/projects/'+id;
- //let url = 'http://scoobydoo.di.uoa.gr:8181/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2.0/api/projects/'+id;
- let url = 'http://astero.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2.0/api/projects/'+id;
-
- return this.http.get(url)
- .map(res => res.json())
- .map(res => res['result']['metadata']['oaf:entity']['oaf:project'])
- .do(res => console.info(res))
- .map(res => [res,
- res['fundingtree'],
- res['rels']['rel']])
- .map(res => this.parseProjectInfo(res));
-
- }
-
- private handleError (error: Response) {
- // in a real world app, we may send the error to some remote logging infrastructure
- // instead of just logging it to the console
- console.error(error);
- return Observable.throw(error || 'Server error');
- }
-
- parseProjectInfo (data: any):any {
- this.projectInfo = new ProjectInfo();
-
- if(data[0] != null) {
- this.projectInfo.acronym = data[0].acronym;
- this.projectInfo.title = data[0].title;
- this.projectInfo.callIdentifier = data[0].callidentifier;
- this.projectInfo.contractNum = data[0].code;
- this.projectInfo.startDate = data[0].startdate;
- this.projectInfo.endDate = data[0].enddate;
- this.projectInfo.openAccessMandate = data[0].oamandatepublications;
- this.projectInfo.specialClause39 = data[0].ecsc39;
- }
- if(data[1] != null) {
- if(data[1]['funder'] != null) {
- this.projectInfo.funder = data[1]['funder'].shortname;
- }
-
- let funding;
- this.projectInfo.funding = "";
-
- if(data[1]['funding_level_2'] != null) {
- funding = data[1]['funding_level_2'].id;
- } else if(data[1]['funding_level_1'] != null) {
- funding = data[1]['funding_level_1'].id;
- } else if(data[1]['funding_level_0'] != null) {
- funding = data[1]['funding_level_0'].id;
- }
-
- if(funding != undefined) {
- funding = funding.split("::");
- for(let i=1; i();
-
- let name = "";
- let url = "";
-
- if(!Array.isArray(data[2])) {
- if(data[2].hasOwnProperty("legalshortname")) {
- name = data[2].legalshortname;
- } else if(data[2].hasOwnProperty("legalname")) {
- name = data[2].legalname;
- }
-
- if(data[2].hasOwnProperty("to")) {
- url = "https://beta.openaire.eu/search/organization?organizationId="+data[2]['to'].content;
- }
- this.projectInfo.organizations.set(name, url);
- } else {
- for(let i=0; i res.json())
- .do(res => console.info(res['result']['metadata']['oaf:entity']))
- .map(res => res['result']['metadata']['oaf:entity'])
- .map(res => [res['oaf:result'],
- res['oaf:result']['title'],
- res['oaf:result']['rels']['rel'],
- res['oaf:result']['children'],
- res['oaf:result']['pid'],
- res['oaf:result']['journal'],
- res['oaf:result']['language'],
- res['oaf:result']['subject'],
- res['oaf:result']['bestlicense'],
- res['oaf:result']['collectedfrom'],
- (res['extraInfo']!= undefined && res['extraInfo']['citations']!= undefined)? res['extraInfo']['citations']['citation']:null,
- res['oaf:result']['context']
- ])
- .map(res => this.parsePublicationInfo(res));
-
- }
-
- private handleError (error: Response) {
- // in a real world app, we may send the error to some remote logging infrastructure
- // instead of just logging it to the console
- console.error(error);
- return Observable.throw(error || 'Server error');
- }
-
- parsePublicationInfo (data: any):any {
- this.publicationInfo = new PublicationInfo();
-
- if(data[0] != null) {
- this.publicationInfo.date = data[0].dateofacceptance.substring(0,4);
- this.publicationInfo.publisher = data[0].publisher;
- if(!Array.isArray(data[0].description)) {
- this.publicationInfo.description = data[0].description;
- } else {
- this.publicationInfo.description = data[0].description[0];
- }
- this.publicationInfo.embargoEndDate = data[0].embargoenddate;
- }
-
- if(data[1] != null) {
- this.publicationInfo.title = {"name": "", "url": "", "accessMode": ""};
-
- if(Array.isArray(data[1])) {
- this.publicationInfo.title['name'] = data[1][0].content;
- } else {
- this.publicationInfo.title['name'] = data[1].content;
- }
- }
-
- if(data[2] != null) {
- let mydata;
- let counter = 0;
- let length = data[2].length!=undefined ? data[2].length : 1;
-
- for(let i=0; i 1 ? data[2][i] : data[2];
- if(mydata.hasOwnProperty("to")) {
- if(mydata['to'].class == "hasAuthor") {
- if(this.publicationInfo.authors == undefined) {
- this.publicationInfo.authors = new Array<{"name": string, "url": string}>();
- }
-
- this.publicationInfo.authors[mydata.ranking-1] = {"name": "", "url": ""};
- this.publicationInfo.authors[mydata.ranking-1]['name'] = mydata.fullname;
- this.publicationInfo.authors[mydata.ranking-1]['url'] = "https://beta.openaire.eu/search/person?personId="+mydata['to'].content;
- } else if(mydata['to'].class == "isProducedBy") {
- if(this.publicationInfo.fundedByProjects == undefined) {
- this.publicationInfo.fundedByProjects = new Array<
- { "url": string, "acronym": string, "title": string,
- "funderShortname": string, "funderName": string,
- "funding": string, "new": boolean
- }>();
- }
-
- counter = this.publicationInfo.fundedByProjects.length;
-
- this.publicationInfo.fundedByProjects[counter] = {
- "url": "", "acronym": "", "title": "",
- "funderShortname": "", "funderName": "",
- "funding": "", "new": false
- }
-
- this.publicationInfo.fundedByProjects[counter]['url'] =
- "http://localhost:3000/project?projectId="+mydata['to'].content;
- this.publicationInfo.fundedByProjects[counter]['acronym'] = mydata.acronym;
- this.publicationInfo.fundedByProjects[counter]['title'] = mydata.title;
-
- if(mydata.hasOwnProperty("funding")) {
- let length1 = Array.isArray(mydata['funding']) ? mydata['funding'].length : 1;
-
- for(let j=0; j 1 ? mydata['funding'][j] : mydata['funding'];
-
- if(mydata1.hasOwnProperty("funder")) {
- this.publicationInfo.fundedByProjects[counter]['funderShortname'] = mydata1['funder'].shortname;
- this.publicationInfo.fundedByProjects[counter]['funderName'] = mydata1['funder'].name;
- }
-
- if(mydata1.hasOwnProperty("funding_level_2")) {
- funding = mydata1['funding_level_2'].content;
- } else if(mydata1.hasOwnProperty("funding_level_1")) {
- funding = mydata1['funding_level_1'].content;
- } else if(mydata1.hasOwnProperty("funding_level_0")) {
- funding = mydata1['funding_level_0'].content;
- }
-
- if(funding != undefined) {
- funding = funding.split("::");
-
- if(this.publicationInfo.fundedByProjects[counter]['funding'] != "") {
- this.publicationInfo.fundedByProjects[counter]['funding'] += ", "+funding[1];
- } else {
- this.publicationInfo.fundedByProjects[counter]['funding'] = funding[1];
- }
- for(let i=2; i();
- }
-
- let url = "http://localhost:3000/publication?articleId="+mydata['to'].content;
- counter = this.publicationInfo.relatedPublications.length;
-
- this.publicationInfo.relatedPublications[counter] = {"name": "", "url": "", "date": "", "trust": ""}
-
- this.publicationInfo.relatedPublications[counter]['url'] = url;
- this.publicationInfo.relatedPublications[counter]['name'] = mydata['title'].content;
- this.publicationInfo.relatedPublications[counter]['date'] = mydata.dateofacceptance.substring(0,4);;
- this.publicationInfo.relatedPublications[counter]['trust'] = Math.round(mydata.trust*100)+"%";
- } else {
- if(this.publicationInfo.relatedResearchData == undefined) {
- this.publicationInfo.relatedResearchData = new Array<{
- "name": string, "url": string, "date": string, "trust": string}>();
- }
-
- let url = "http://localhost:3000/dataset?datasetId="+mydata['to'].content;
- counter = this.publicationInfo.relatedResearchData.length;
-
- this.publicationInfo.relatedResearchData[counter] = {"name": "", "url": "", "date": "", "trust": ""}
-
- this.publicationInfo.relatedResearchData[counter]['url'] = url;
- this.publicationInfo.relatedResearchData[counter]['name'] = mydata['title'].content;
- this.publicationInfo.relatedResearchData[counter]['date'] = mydata.dateofacceptance.substring(0,4);;
- this.publicationInfo.relatedResearchData[counter]['trust'] = Math.round(mydata.trust*100)+"%";
- }*/
- if(this.publicationInfo.relatedResearchResults == undefined) {
- this.publicationInfo.relatedResearchResults = new Array<{
- "name": string, "url": string, "date": string,
- "trust": string, "class": string}>();
- }
-
- counter = this.publicationInfo.relatedResearchResults.length;
- this.publicationInfo.relatedResearchResults[counter] = {"name": "", "url": "", "date": "", "trust": "", "class": ""}
-
- let url;
- if(mydata['resulttype'].classname == "publication") {
- url = "http://localhost:3000/publication?articleId="+mydata['to'].content;
- this.publicationInfo.relatedResearchResults[counter]['class'] = "publication";
- } else {
- url = "http://localhost:3000/dataset?datasetId="+mydata['to'].content;
- this.publicationInfo.relatedResearchResults[counter]['class'] = "dataset";
- }
-
- this.publicationInfo.relatedResearchResults[counter]['url'] = url;
- this.publicationInfo.relatedResearchResults[counter]['name'] = mydata['title'].content;
- this.publicationInfo.relatedResearchResults[counter]['date'] = mydata.dateofacceptance.substring(0,4);;
- this.publicationInfo.relatedResearchResults[counter]['trust'] = Math.round(mydata.trust*100)+"%";
-
- } else if(mydata['to'].class == "hasAmongTopNSimilarDocuments") {
- /*if(mydata.hasOwnProperty('resulttype') && mydata['resulttype'].classname == "publication") {
- if(this.publicationInfo.similarPublications == undefined) {
- this.publicationInfo.similarPublications = new Array<
- { "name": string, "url": string, "date": string, "trust": string}>();
- }
-
- let url = "http://localhost:3000/publication?articleId="+mydata['to'].content;
- let counter = this.publicationInfo.similarPublications.length;
-
- this.publicationInfo.similarPublications[counter] = {"name": "", "url": "", "date": "", "trust": ""};
- this.publicationInfo.similarPublications[counter]['url'] = url;
- this.publicationInfo.similarPublications[counter]['name'] = mydata['title'].content;
- this.publicationInfo.similarPublications[counter]['date'] = mydata.dateofacceptance.substring(0,4);
- this.publicationInfo.similarPublications[counter]['trust'] = Math.round(mydata.trust*100)+"%";
- } else if(mydata.hasOwnProperty('resulttype') && mydata['resulttype'].classname == "dataset") {
- if(this.publicationInfo.similarDatasets == undefined) {
- this.publicationInfo.similarDatasets = new Array<
- { "name": string, "url": string, "date": string, "trust": string}>();
- }
-
- let url = "http://localhost:3000/dataset?datasetId="+mydata['to'].content;
- let counter = this.publicationInfo.similarDatasets.length;
-
- this.publicationInfo.similarDatasets[counter] = {"name": "", "url": "", "date": "", "trust": ""};
- this.publicationInfo.similarDatasets[counter]['url'] = url;
- this.publicationInfo.similarDatasets[counter]['name'] = mydata['title'].content;
- this.publicationInfo.similarDatasets[counter]['date'] = mydata.dateofacceptance.substring(0,4);
- this.publicationInfo.similarDatasets[counter]['trust'] = Math.round(mydata.trust*100)+"%";
- }*/
-
- if(this.publicationInfo.similarResearchResults == undefined) {
- this.publicationInfo.similarResearchResults = new Array<{
- "name": string, "url": string, "date": string,
- "trust": string, "class": string}>();
- }
-
- counter = this.publicationInfo.similarResearchResults.length;
- this.publicationInfo.similarResearchResults[counter] = {"name": "", "url": "", "date": "", "trust": "", "class": ""}
-
- let url;
- if(mydata['resulttype'].classname == "publication") {
- url = "http://localhost:3000/publication?articleId="+mydata['to'].content;
- this.publicationInfo.similarResearchResults[counter]['class'] = "publication";
- } else {
- url = "http://localhost:3000/dataset?datasetId="+mydata['to'].content;
- this.publicationInfo.similarResearchResults[counter]['class'] = "dataset";
- }
-
- this.publicationInfo.similarResearchResults[counter]['url'] = url;
- this.publicationInfo.similarResearchResults[counter]['name'] = mydata['title'].content;
- this.publicationInfo.similarResearchResults[counter]['date'] = mydata.dateofacceptance.substring(0,4);;
- this.publicationInfo.similarResearchResults[counter]['trust'] = Math.round(mydata.trust*100)+"%";
- }
- }
- }
-
- this.publicationInfo.authors = this.publicationInfo.authors.filter(function (item) {
- return (item != undefined);
- });
- }
-
- if(data[3] != null) {
- if(data[3].hasOwnProperty("instance")) {
- this.publicationInfo.downloadFrom = new Map();
- this.publicationInfo.publishedIn = new Map();
-
- this.publicationInfo.types = new Array();
-
- let length = data[3]['instance'].length!=undefined ? data[3]['instance'].length : 1;
-
- let types = new Set();
- let counter = 0;
- let counter1 = 0;
- let counter2 = 0;
- let mydata;
- for(let i=0; i 1 ? data[3]['instance'][i] : data[3]['instance'];
-
- if(mydata.hasOwnProperty("instancetype")) {
- if(!types.has(mydata['instancetype'].classname)) {
- this.publicationInfo.types[counter] = mydata['instancetype'].classname;
- types.add(mydata['instancetype'].classname);
- counter++;
- }
- }
-
- if(mydata.hasOwnProperty("webresource")) {
- let url;
- if(mydata['webresource'].length == undefined) {
- url = mydata['webresource'].url;
- } else{
- url = mydata['webresource'][0].url;
- }
-
- if(mydata.hasOwnProperty("hostedby")) {
- if(mydata['hostedby'].name != "other resources" && mydata['hostedby'].name != "Unknown Repository") {
- if(!this.publicationInfo.downloadFrom.has(mydata['hostedby'].name)) {
- this.publicationInfo.downloadFrom.set(mydata['hostedby'].name, {"url": null, "accessMode": null});
- }
-
- if(this.publicationInfo.downloadFrom.get(mydata['hostedby'].name)['url'] == null) {
- this.publicationInfo.downloadFrom.get(mydata['hostedby'].name)['url'] = new Array();
- }
-
- counter2 = this.publicationInfo.downloadFrom.get(mydata['hostedby'].name)['url'].length;
- this.publicationInfo.downloadFrom.get(mydata['hostedby'].name)['url'][counter2] = url;
-
- if(this.publicationInfo.downloadFrom.get(mydata['hostedby'].name)['accessMode'] == null) {
- this.publicationInfo.downloadFrom.get(mydata['hostedby'].name)['accessMode'] = new Array();
- }
-
- if(mydata.hasOwnProperty("licence")) {
- this.publicationInfo.downloadFrom.get(mydata['hostedby'].name)['accessMode'][counter2] = mydata['licence'].classid;
- } else {
- this.publicationInfo.downloadFrom.get(mydata['hostedby'].name)['accessMode'][counter2] = "";
- }
- } else {
- if(data[0] != null && data[0].hasOwnProperty("source")) {
- let key: string;
- if(Array.isArray(data[0].source)) {
- if(!this.publicationInfo.publishedIn.has(data[0]['source'][counter1])) {
- key = data[0]['source'][counter1];
- }
- } else {
- if(!this.publicationInfo.publishedIn.has(data[0]['source'])) {
- key = data[0]['source'];
- }
- }
-
- this.publicationInfo.publishedIn.set(key, {"url": null, "accessMode": null});
-
- if(this.publicationInfo.publishedIn.get(key)['url'] == null) {
- this.publicationInfo.publishedIn.get(key)['url'] = new Array();
- }
-
- counter2 = this.publicationInfo.publishedIn.get(key)['url'].length;
- this.publicationInfo.publishedIn.get(key)['url'][counter2] = url;
-
- if(this.publicationInfo.publishedIn.get(key)['accessMode'] == null) {
- this.publicationInfo.publishedIn.get(key)['accessMode'] = new Array();
- }
-
- if(mydata.hasOwnProperty("licence")) {
- this.publicationInfo.publishedIn.get(key)['accessMode'][counter2] = mydata['licence'].classid;
- } else {
- this.publicationInfo.publishedIn.get(key)['accessMode'][counter2] = "";
- }
- counter1++;
- }
- }
- if(this.publicationInfo.title != undefined) {
- if(this.publicationInfo.title['url'] == "") {
- this.publicationInfo.title['url'] = url;
- }
-
- switch (this.publicationInfo.title['accessMode']) {
- case undefined:
- this.publicationInfo.title['accessMode'] = mydata['accessMode'].classid;
- this.publicationInfo.title['url'] = url;
- break;
- case "CLOSED":
- if(mydata['licence'].classid == "OPEN" ||
- mydata['licence'].classid == "EMBARGO" ||
- mydata['licence'].classid == "RESTRICTED") {
- this.publicationInfo.title['accessMode'] = mydata['licence'].classid;
- this.publicationInfo.title['url'] = url;
- }
- break;
- case "RESTRICTED":
- if(mydata['licence'].classid == "OPEN" ||
- mydata['licence'].classid == "EMBARGO") {
- this.publicationInfo.title['accessMode'] = mydata['licence'].classid;
- this.publicationInfo.title['url'] = url;
- }
- break;
- case "EMBARGO":
- if(mydata['licence'].classid == "OPEN") {
- this.publicationInfo.title['accessMode'] = mydata['licence'].classid;
- this.publicationInfo.title['url'] = url;
- }
- break;
- }
- }
- }
- }
- }
- }
-
- if(data[3].hasOwnProperty("externalreference")) {
- this.publicationInfo.bioentities = new Map>();
-
- let length = data[3]['externalreference'].length!=undefined ? data[3]['externalreference'].length : 1;
-
- let mydata;
- for(let i=0; i 1 ? data[3]['externalreference'][i] : data[3]['externalreference'];
-
- if(!this.publicationInfo.bioentities.has(mydata.sitename)) {
- this.publicationInfo.bioentities.set(mydata.sitename, new Map());
- }
- this.publicationInfo.bioentities.get(mydata.sitename).set(mydata.refidentifier, mydata.url);
- }
- }
- }
-
- if(data[4] != null) {
- let counter = 0;
- this.publicationInfo.identifiers = new Map();
-
- if(data[4].hasOwnProperty("classname") && data[4]['classname'] != "") {
- if(data[4].classname == "doi" || data[4].classname == "pmc") {
- if(!this.publicationInfo.identifiers.has(data[4].classname)) {
- this.publicationInfo.identifiers.set(data[4].classname, new Array());
- }
- counter = this.publicationInfo.identifiers.get(data[4].classname).length;
- this.publicationInfo.identifiers.get(data[4].classname)[counter] = data[4].content;
- }
- } else {
- for(let i=0; i());
- }
- counter = this.publicationInfo.identifiers.get(data[4][i].classname).length;
- this.publicationInfo.identifiers.get(data[4][i].classname)[counter] = data[4][i].content;
- }
- }
- }
- }
-
- if(data[5] != null) {
- this.publicationInfo.journal = {"journal": "", "issn": "", "lissn": ""}
-
- this.publicationInfo.journal['journal'] = data[5].content;
- this.publicationInfo.journal['issn'] = data[5].issn;
- this.publicationInfo.journal['lissn'] = data[5].lissn;
- }
-
- if(data[6] != null) {
- this.publicationInfo.languages = new Array();
-
- if(data[6].hasOwnProperty("classname")) {
- this.publicationInfo.languages[0] = data[6].classname;
- } else {
- for(let i=0; i();
- this.publicationInfo.subjects = new Array();
-
- let mydata;
- let length = data[7].length!=undefined ? data[7].length : 1;
-
- for(let i=0; i 1 ? data[7][i] : data[7];
-
- if(mydata.classid != "") {
- if(mydata.inferred == true) {
- if(!this.publicationInfo.classifiedSubjects.has(mydata.classid)) {
- this.publicationInfo.classifiedSubjects.set(mydata.classid, new Array());
- }
-
- let counter = this.publicationInfo.classifiedSubjects.get(mydata.classid).length;
- this.publicationInfo.classifiedSubjects.get(mydata.classid)[counter] = mydata.content;
- } else {
- let counter = this.publicationInfo.subjects.length;
- this.publicationInfo.subjects[counter] = mydata.content;
- }
- }
- }
- }
-
- if(data[8] != null) {
- this.publicationInfo.bestlicense = data[8].classid;
- }
-
- if(data[9] != null) {
- this.publicationInfo.collectedFrom = new Array<{"name": string, "url": string}>();
-
- let mydata;
- let length = data[9].length!=undefined ? data[9].length : 1;
- for(let i=0; i 1 ? data[9][i] : data[9];
- let link = "https://beta.openaire.eu/search/dataprovider?datasourceId=";
- this.publicationInfo.collectedFrom[i] = {"name": "", "url": ""};
- this.publicationInfo.collectedFrom[i]['name'] = mydata.name;
- this.publicationInfo.collectedFrom[i]['url'] = link+mydata.id;
- }
- }
-
- if(this.publicationInfo.publisher != null
- && this.publicationInfo.identifiers != null
- && this.publicationInfo.identifiers.has('doi')) {
-
- if( this.publicationInfo.downloadFrom == null) {
- this.publicationInfo.downloadFrom = new Map();
- }
-
- let key: string;
- if(this.publicationInfo.journal != null) {
- key = this.publicationInfo.publisher + "/ "+this.publicationInfo.journal
- } else {
- key = this.publicationInfo.publisher;
- }
- this.publicationInfo.downloadFrom.set(key, {"url": null, "accessMode": null});
-
- let url = "http://dx.doi.org/"+this.publicationInfo.identifiers.get("doi")[0];
-
- this.publicationInfo.downloadFrom.get(key)['url'] = new Array();
- this.publicationInfo.downloadFrom.get(key)['accessMode'] = new Array();
-
- this.publicationInfo.downloadFrom.get(key)['url'][0] = url;
- this.publicationInfo.downloadFrom.get(key)['accessMode'][0] = "";
-
- if(this.publicationInfo.title != undefined && this.publicationInfo.title['url'] == "") {
- this.publicationInfo.title['url'] = url;
- }
- }
-
- if(data[10] != null) {
- this.publicationInfo.references = new Array<{"name": string, "url": string}>();
-
- let mydata;
- let length = data[10].length!=undefined ? data[10].length : 1;
- for(let i=0; i 1 ? data[10][i] : data[10];
-
- let url;
- if(mydata.hasOwnProperty("id")) {
- let mydata1;
- let length1 = mydata['id'].length!=undefined ? mydata['id'].length : 1;
- for(let j=0; j 1 ? mydata['id'][j] : mydata['id'];
-
- if(mydata1.type == "pmid") {
- url = "http://www.ncbi.nlm.nih.gov/pubmed/"+mydata1.value;
- }
- }
- }
-
- this.publicationInfo.references[mydata.position-1] = { "name": "", "url": ""};
- this.publicationInfo.references[mydata.position-1]['name'] = mydata.rawText;
- this.publicationInfo.references[mydata.position-1]['url'] = url;
- }
- }
-
- if(data[11] != null) {
- this.publicationInfo.contexts = new Array<
- { "labelContext": string, "labelCategory": string, "labelConcept": string}>();
-
- let position = 0;
- let labels = "";
- let mydata;
- let length = data[11].length!=undefined ? data[11].length : 1;
- for(let i=0; i 1 ? data[11][i] : data[11];
-
- if(mydata.hasOwnProperty("type") && mydata['type'] == "community") {
- if(mydata.hasOwnProperty("category")) {
- if(mydata['category'].hasOwnProperty("concept")) {
- let mydata1;
- let length1 = mydata['category']['concept'].length!=undefined ? mydata['category']['concept'].length : 1;
- for(let j=0; j 1 ? mydata['category']['concept'][j] : mydata['category']['concept'];
-
- this.publicationInfo.contexts[position] = {"labelContext": "", "labelCategory": "", "labelConcept": ""};
- this.publicationInfo.contexts[position]['labelContext'] = mydata.label;
- this.publicationInfo.contexts[position]['labelCategory'] = mydata['category'].label;;
- this.publicationInfo.contexts[position]['labelConcept'] = mydata1.label;
-
- position++;
- }
- } else {
- this.publicationInfo.contexts[position] = {"labelContext": "", "labelCategory": "", "labelConcept": ""};
- this.publicationInfo.contexts[position]['labelContext'] = mydata.label;
- this.publicationInfo.contexts[position]['labelCategory'] = mydata['category'].label;;
- this.publicationInfo.contexts[position]['labelConcept'] = null;
- }
- } else {
- this.publicationInfo.contexts[position] = {"labelContext": "", "labelCategory": "", "labelConcept": ""};
- this.publicationInfo.contexts[position]['labelContext'] = mydata.label;
- this.publicationInfo.contexts[position]['labelCategory'] = null;
- this.publicationInfo.contexts[position]['labelConcept'] = null;
- }
- }
- }
- }
-
- //this.printPublicationInfo();
- return this.publicationInfo;
-
- }
-
- printPublicationInfo() {
- console.info("DATE: "+this.publicationInfo.date);
- console.info("PUBLISHER: "+this.publicationInfo.publisher);
- console.info("DESCRIPTION: "+this.publicationInfo.description);
-
- console.info("TITLE: "+this.publicationInfo.title);
-
- console.info("AUTHORS: "+this.publicationInfo.authors);
- console.info("\nFUNDED BY PROJECTS:");
- if(this.publicationInfo.fundedByProjects != undefined) {
- this.publicationInfo.fundedByProjects.forEach(function (value, key, map) {
- console.info(key + " = " + value);
- });
- } else {
- console.info("undefined");
- }
- console.info("\n");
-/*
- console.info("\nRELATED RESEARCH DATA:");
- if(this.publicationInfo.relatedResearchData != undefined) {
- this.publicationInfo.relatedResearchData.forEach(function (value, key, map) {
- console.info(key + " = " + value);
- });
- } else {
- console.info("undefined");
- }
- console.info("\n");
-
- console.info("\nSIMILAR PUBLICATIONS:");
- if(this.publicationInfo.similarPublications != undefined) {
- this.publicationInfo.similarPublications.forEach(function (value, key, map) {
- console.info(key + " = " + value);
- });
- } else {
- console.info("undefined");
- }
- console.info("\n");
-*/
- console.info("TYPES: "+this.publicationInfo.types);
- console.info("\nDOWNLOAD FROM:");
- if(this.publicationInfo.downloadFrom != undefined) {
- this.publicationInfo.downloadFrom.forEach(function (value, key, map) {
- console.info(key + " = " + value);
- });
- } else {
- console.info("undefined");
- }
- console.info("\n");
- console.info("\nBIOENTITIES:");
- if(this.publicationInfo.bioentities != undefined) {
- this.publicationInfo.bioentities.forEach(function (value, key, map) {
- value.forEach(function (value1, key1, map1) {
- console.info(key + " = " + key1 + " = " + value1);
- })
- })
- } else {
- console.info("undefined");
- }
- console.info("\n");
-
- console.info("\nIDENTIFIERS:");
- if(this.publicationInfo.identifiers != undefined) {
- this.publicationInfo.identifiers.forEach(function (value, key, map) {
- console.info(key + " = " + value);
- });
- } else {
- console.info("undefined");
- }
- console.info("\n");
-
- console.info("JOURNAL: "+this.publicationInfo.journal);
-
-
- console.info("LANGUAGES: "+this.publicationInfo.languages);
-
-
- console.info("SUBJECTS: "+this.publicationInfo.subjects);
- console.info("\nCLASSIFIED OBJECTS:");
- if(this.publicationInfo.classifiedSubjects != undefined) {
- this.publicationInfo.classifiedSubjects.forEach(function (value, key, map) {
- console.info(key + " = " + value);
- });
- } else {
- console.info("undefined");
- }
- console.info("\n");
-
- console.info("BEST LICENSE: "+this.publicationInfo.bestlicense);
-
- console.info("\nCOLLECTED FROM:");
- if(this.publicationInfo.collectedFrom != undefined) {
- this.publicationInfo.collectedFrom.forEach(function (value, key, map) {
- console.info(key + " = " + value);
- });
- } else {
- console.info("undefined");
- }
- console.info("\n");
-
- console.info("\nREFERENCES:");
- if(this.publicationInfo.references != undefined) {
- for(let i in this.publicationInfo.references) {
- for(let key in this.publicationInfo.references[i]) {
- console.info(key+" : "+this.publicationInfo.references[i][key]);
- }
- }
- } else {
- console.info("undefined");
- }
- }
-
-}
diff --git a/portal/src/app/services/searchCrossref.service.ts b/portal/src/app/services/searchCrossref.service.ts
deleted file mode 100644
index 493c480c..00000000
--- a/portal/src/app/services/searchCrossref.service.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import {Injectable} from '@angular/core';
-// import {Http, Response, Headers} from '@angular/http';
-import {Http, Response} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-// import {Publication} from '../entities/publication';
-@Injectable()
-export class SearchCrossrefService {
- constructor( private http: Http) {}
-
-
- searchCrossrefResults (term: string, size : number, page : number):any {
- let url = 'http://api.crossref.org/works?query='+term+'&rows='+size+'&offset='+(size*(page-1));
- ////"&rows=".$size."&offset=".($page-1)*$size
- return this.http.get( url)
- .map(request => request.json().message)
- .do(items => console.log("Crossref Results: total results = "+items['total-results']+" keyword = "+term))
- .catch(this.handleError);
-
- }
-
-
-
- private handleError (error: Response) {
- // in a real world app, we may send the error to some remote logging infrastructure
- // instead of just logging it to the console
- console.error(error);
- return Observable.throw(error || 'Server error');
- }
-
-}
diff --git a/portal/src/app/services/searchDatacite.service.ts b/portal/src/app/services/searchDatacite.service.ts
deleted file mode 100644
index c2709f51..00000000
--- a/portal/src/app/services/searchDatacite.service.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import {Injectable} from '@angular/core';
-import {Jsonp, URLSearchParams} from '@angular/http';
-import {Http, Response} from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-
-@Injectable()
-export class SearchDataciteService {
- constructor(private jsonp: Jsonp, private http: Http) {}
-
- searchDataciteResults (term: string, size : number, page : number):any {
- console.info("In search datacite results "+term);
- let url = 'http://search.datacite.org/api?q='+term+'&fl=doi,title,creator,publisher&wt=json&rows='+size+'&start='+(size*(page-1));
-
- return this.http.get( url)
- .map(request => request.json().response)
- .do(items => console.log("Datacite Results: total results = "+items['numFound']+" keyword = "+term))
- .catch(this.handleError);
- }
-
-
- private handleError (error: Response) {
- // in a real world app, we may send the error to some remote logging infrastructure
- // instead of just logging it to the console
- console.error(error);
- return Observable.throw(error || 'Server error');
- }
- private extractData(res: Response) {
- if (res.status < 200 || res.status >= 300) {
- throw new Error('Bad response status: ' + res.status);
- }
- let body = res.json();
- return body.data || { };
- }
-}
diff --git a/portal/src/app/services/searchOrcid.service.ts b/portal/src/app/services/searchOrcid.service.ts
deleted file mode 100644
index ed70e3c7..00000000
--- a/portal/src/app/services/searchOrcid.service.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import {Injectable} from '@angular/core';
-import {Jsonp, URLSearchParams} from '@angular/http';
-import {Http, Response} from '@angular/http';
-import { Headers, RequestOptions } from '@angular/http';
-import {Observable} from 'rxjs/Observable';
-
-@Injectable()
-export class SearchOrcidService {
- constructor(private jsonp: Jsonp, private http: Http) {}
-
- searchOrcidAuthor (term: string):any {
- console.info("In searchOrcidAuthor: "+term);
-
- var headers = new Headers();
- headers.append('Accept', 'application/orcid+json');
-
- let url = 'https://pub.orcid.org/'+term+'/orcid-bio';
-
- return this.http.get(url, { headers: headers })
- .map(res => res.json()['orcid-profile'])
- .map(res => [res['orcid-bio']['personal-details']['given-names'],
- res['orcid-bio']['personal-details']['family-name'],
- res['orcid-identifier']]);
- }
-
- searchOrcidAuthors (term: string):any {
- console.info("In search Orcid authors for keyword: "+term);
-
- var headers = new Headers();
- headers.append('Accept', 'application/orcid+json');
-
- let url = 'https://pub.orcid.org/search/orcid-bio?defType=edismax&q='+term+'&qf=given-name^1.0+family-name^2.0+other-names^1.0+credit-name^1.0&start=0&rows=10';
-
- return this.http.get(url, { headers: headers })
- .map(res => res.json()['orcid-search-results'])
- .flatMap(res => res['orcid-search-result'])
- .map(res => res['orcid-profile'])
- .map(res => [res['orcid-bio']['personal-details']['given-names'],
- res['orcid-bio']['personal-details']['family-name'],
- res['orcid-identifier']]);
- }
-
- searchOrcidPublications (id: string):any {
- console.info("In search Orcid publications for author: "+id);
-
- var headers = new Headers();
- headers.append('Accept', 'application/orcid+json');
-
- let url = 'https://pub.orcid.org/'+id+'/orcid-works';
-
- return this.http.get(url, { headers: headers })
- .map(res => res.json()['orcid-profile']['orcid-activities']['orcid-works'])
- }
-}
diff --git a/portal/src/client.ts b/portal/src/client.ts
deleted file mode 100644
index 479ad902..00000000
--- a/portal/src/client.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import 'angular2-universal/polyfills';
-
-import {bootstrap, enableProdMode, BROWSER_ROUTER_PROVIDERS, BROWSER_HTTP_PROVIDERS} from 'angular2-universal';
-
-import {App} from './app/app.component';
-
-enableProdMode();
-
-bootstrap(App, [
- ...BROWSER_ROUTER_PROVIDERS,
- ...BROWSER_HTTP_PROVIDERS
-]);
diff --git a/portal/src/index.html b/portal/src/index.html
deleted file mode 100644
index 5c7bed67..00000000
--- a/portal/src/index.html
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- OpenAIRE
-
- ... Loading ...
-
-
-
-
-
-
diff --git a/portal/src/logo.png b/portal/src/logo.png
deleted file mode 100644
index afea237f..00000000
Binary files a/portal/src/logo.png and /dev/null differ
diff --git a/portal/src/server.ts b/portal/src/server.ts
deleted file mode 100644
index e20cfcc7..00000000
--- a/portal/src/server.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import 'angular2-universal/polyfills';
-
-import * as path from 'path';
-import * as express from 'express';
-import * as bodyParser from 'body-parser';
-
-// Angular 2 Universal
-import {
- provide,
- enableProdMode,
- expressEngine,
- REQUEST_URL,
- ORIGIN_URL,
- BASE_URL,
- NODE_ROUTER_PROVIDERS,
- NODE_HTTP_PROVIDERS,
- ExpressEngineConfig
-} from 'angular2-universal';
-
-// Application
-import {App} from './app/app.component';
-
-const app = express();
-const ROOT = path.join(path.resolve(__dirname, '..'));
-
-enableProdMode();
-
-// Express View
-app.engine('.html', expressEngine);
-app.set('views', __dirname);
-app.set('view engine', 'html');
-
-app.use(bodyParser.json());
-
-
-function ngApp(req, res) {
- let baseUrl = '/';
- let url = req.originalUrl || '/';
-
- let config: ExpressEngineConfig = {
- directives: [ App ],
- platformProviders: [
- provide(ORIGIN_URL, {useValue: 'http://localhost:3000'}),
- provide(BASE_URL, {useValue: baseUrl}),
- ],
- providers: [
- provide(REQUEST_URL, {useValue: url}),
- NODE_ROUTER_PROVIDERS,
- NODE_HTTP_PROVIDERS,
- ],
- async: true,
- preboot: false // { appRoot: 'app' } // your top level app component selector
- };
-
- res.render('index', config);
-}
-
-function indexFile(req, res) {
- res.sendFile('/index.html', {root: __dirname});
-}
-
-// Serve static files
-app.use(express.static(ROOT, {index: false}));
-
-// Our API for demos only
-app.get('/data.json', (req, res) => {
- res.json({
- data: 'This fake data came from the server.'
- });
-});
-
-// Routes with html5pushstate
-app.use('/', ngApp);
-app.use('/home', ngApp);
-app.use('/search', ngApp);
-// Server
-app.listen(3000, () => {
- console.log('Listening on: http://localhost:3000');
-});
diff --git a/portal/src/typings.d.ts b/portal/src/typings.d.ts
deleted file mode 100644
index bf633427..00000000
--- a/portal/src/typings.d.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Custom Type Definitions
- * When including 3rd party modules you also need to include the type definition for the module
- * if they don't provide one within the module. You can try to install it with typings
-typings install node --save
- * If you can't find the type definition in the registry we can make an ambient definition in
- * this file for now. For example
-declare module "my-module" {
- export function doesSomething(value: string): string;
-}
- *
- * If you're prototying and you will fix the types later you can also declare it as type any
- *
-declare var assert: any;
- *
- * If you're importing a module that uses Node.js modules which are CommonJS you need to import as
- *
-import * as _ from 'lodash'
- * You can include your type definitions in this file until you create one for the typings registry
- * see https://github.com/typings/registry
- *
- */
-
-
-// Extra variables that live on Global that will be replaced by webpack DefinePlugin
-declare var ENV: string;
-declare var HMR: boolean;
-interface GlobalEnvironment {
- ENV;
- HMR;
-}
-
-interface WebpackModule {
- hot: {
- data?: any,
- idle: any,
- accept(dependencies?: string | string[], callback?: (updatedDependencies?: any) => void): void;
- decline(dependencies?: string | string[]): void;
- dispose(callback?: (data?: any) => void): void;
- addDisposeHandler(callback?: (data?: any) => void): void;
- removeDisposeHandler(callback?: (data?: any) => void): void;
- check(autoApply?: any, callback?: (err?: Error, outdatedModules?: any[]) => void): void;
- apply(options?: any, callback?: (err?: Error, outdatedModules?: any[]) => void): void;
- status(callback?: (status?: string) => void): void | string;
- removeStatusHandler(callback?: (status?: string) => void): void;
- };
-}
-
-interface WebpackRequire {
- context(file: string, flag?: boolean, exp?: RegExp): any;
-}
-
-
-interface ErrorStackTraceLimit {
- stackTraceLimit: number;
-}
-
-
-// Extend typings
-interface NodeRequire extends WebpackRequire {}
-interface ErrorConstructor extends ErrorStackTraceLimit {}
-interface NodeModule extends WebpackModule {}
-interface Global extends GlobalEnvironment {}
-
-
-interface Thenable {
- then(
- onFulfilled?: (value: T) => U | Thenable,
- onRejected?: (error: any) => U | Thenable): Thenable;
- then(
- onFulfilled?: (value: T) => U | Thenable,
- onRejected?: (error: any) => void): Thenable;
- catch(onRejected?: (error: any) => U | Thenable): Thenable;
-}
diff --git a/portal/tsconfig.json b/portal/tsconfig.json
deleted file mode 100644
index a6757c02..00000000
--- a/portal/tsconfig.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "compilerOptions": {
- "emitDecoratorMetadata": true,
- "experimentalDecorators": true,
- "target": "es5",
- "module": "commonjs",
- "removeComments": true,
- "sourceMap": true
- },
- "exclude": [
- "typings/main.d.ts",
- "typings/main",
- "node_modules"
- ],
- "compileOnSave": false,
- "buildOnSave": false,
- "atom": { "rewriteTsconfig": false }
-}
diff --git a/portal/typings.json b/portal/typings.json
deleted file mode 100644
index 4dd09099..00000000
--- a/portal/typings.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "ambientDependencies": {
- "body-parser": "registry:dt/body-parser#0.0.0+20160317120654",
- "es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654",
- "express": "registry:dt/express#4.0.0+20160317120654",
- "express-serve-static-core": "registry:dt/express-serve-static-core#0.0.0+20160322035842",
- "mime": "registry:dt/mime#0.0.0+20160316155526",
- "node": "registry:dt/node#4.0.0+20160412142033",
- "serve-static": "registry:dt/serve-static#0.0.0+20160317120654"
- }
-}
diff --git a/portal/webpack.config.js b/portal/webpack.config.js
deleted file mode 100644
index 89003715..00000000
--- a/portal/webpack.config.js
+++ /dev/null
@@ -1,89 +0,0 @@
-var webpack = require('webpack');
-var path = require('path');
-
-var commonConfig = {
- resolve: {
- extensions: ['', '.ts', '.js']
- },
- module: {
- loaders: [
- // TypeScript
- { test: /\.ts$/, loader: 'ts-loader' }
- ]
- },
- plugins: [
- new webpack.optimize.OccurenceOrderPlugin(true)
- ]
-};
-
-
-var clientConfig = {
- target: 'web',
- entry: './src/client',
- output: {
- path: path.join(__dirname, 'dist', 'client')
- },
- node: {
- global: true,
- __dirname: true,
- __filename: true,
- process: true,
- Buffer: false
- }
-};
-
-
-var serverConfig = {
- target: 'node',
- entry: './src/server',
- output: {
- path: path.join(__dirname, 'dist', 'server')
- },
- externals: checkNodeImport,
- node: {
- global: true,
- __dirname: true,
- __filename: true,
- process: true,
- Buffer: true
- }
-};
-
-
-
-// Default config
-var defaultConfig = {
- module: {
- noParse: [
- path.join(__dirname, 'zone.js', 'dist'),
- path.join(__dirname, 'angular2', 'bundles')
- ]
- },
- context: __dirname,
- resolve: {
- root: path.join(__dirname, '/src')
- },
- output: {
- publicPath: path.resolve(__dirname),
- filename: 'bundle.js'
- }
-}
-
-
-
-var webpackMerge = require('webpack-merge');
-module.exports = [
- // Client
- webpackMerge({}, defaultConfig, commonConfig, clientConfig),
-
- // Server
- webpackMerge({}, defaultConfig, commonConfig, serverConfig)
-]
-
-// Helpers
-function checkNodeImport(context, request, cb) {
- if (!path.isAbsolute(request) && request.charAt(0) !== '.') {
- cb(null, 'commonjs ' + request); return;
- }
- cb();
-}