diff --git a/app-routing.module.ts b/app-routing.module.ts index 7a9d130d..068943f6 100644 --- a/app-routing.module.ts +++ b/app-routing.module.ts @@ -15,12 +15,6 @@ import {ProjectComponent} from './landingPages/project/project.component'; import {OrganizationComponent} from './landingPages/organization/organization.component'; -import {DepositDatasetsComponent} from './deposit/datasets/depositDatasets.component'; -import {DepositDatasetsResultComponent} from './deposit/datasets/depositDatasetsResult.component'; -import {DepositBySubjectResultComponent} from './deposit/datasets/depositBySubjectResult.component'; -import {DepositPublicationsComponent} from './deposit/publications/depositPublications.component'; -import {DepositPublicationsResultComponent} from './deposit/publications/depositPublicationsResult.component'; - import {SearchResearchResultsComponent} from './searchPages/simple/searchResearchResults.component'; import {SearchDataprovidersComponent} from './searchPages/simple/searchDataproviders.component'; import {SearchProjectsComponent} from './searchPages/simple/searchProjects.component'; @@ -58,11 +52,6 @@ const routes: Routes = [ { path: 'search/project', component: ProjectComponent , resolve: { envSpecific: EnvironmentSpecificResolver } }, { path: 'search/dataprovider', component: DataProviderComponent , resolve: { envSpecific: EnvironmentSpecificResolver } }, { path: 'search/organization', component: OrganizationComponent , resolve: { envSpecific: EnvironmentSpecificResolver } }, - { path: 'participate/deposit-datasets', component: DepositDatasetsComponent , resolve: { envSpecific: EnvironmentSpecificResolver } }, - { path: 'participate/deposit-datasets-result', component: DepositDatasetsResultComponent, resolve: { envSpecific: EnvironmentSpecificResolver } }, - { path: 'participate/deposit-subject-result', component: DepositBySubjectResultComponent , resolve: { envSpecific: EnvironmentSpecificResolver } }, - { path: 'participate/deposit-publications', component: DepositPublicationsComponent , resolve: { envSpecific: EnvironmentSpecificResolver } }, - { path: 'participate/deposit-publications-result', component: DepositPublicationsResultComponent, resolve: { envSpecific: EnvironmentSpecificResolver } }, { path: 'search/find', component: SearchComponent, resolve: { envSpecific: EnvironmentSpecificResolver } }, { path: 'search/find/publications', component: SearchResearchResultsComponent , resolve: { envSpecific: EnvironmentSpecificResolver }, canActivate: [ ] }, { path: 'search/find/datasets', component:SearchResearchResultsComponent, resolve: { envSpecific: EnvironmentSpecificResolver } }, diff --git a/app.module.ts b/app.module.ts index 2938c6aa..3b2f1e1f 100755 --- a/app.module.ts +++ b/app.module.ts @@ -20,11 +20,6 @@ import {ProjectModule} from './landingPages/project/project.module'; import {OrganizationModule} from './landingPages/organization/organization.module'; import {ReloadModule} from './reload/reload.module'; import {ErrorModule} from './error/error.module'; -import {DepositDatasetsModule} from './deposit/datasets/depositDatasets.module'; -import {DepositDatasetsResultsModule} from './deposit/datasets/depositDatasetsResults.module'; -import {DepositBySubjectResultsModule} from './deposit/datasets/depositBySubjectResults.module'; -import {DepositPublicationsModule} from './deposit/publications/depositPublications.module'; -import {DepositPublicationsResultsModule} from './deposit/publications/depositPublicationsResults.module'; import {SearchResearchResultsModule} from './searchPages/simple/searchResearchResults.module'; import {SearchDataProvidersModule} from './searchPages/simple/searchDataProviders.module'; @@ -67,7 +62,6 @@ import { AppRoutingModule } from './app-routing.module'; NavigationBarModule, MainSearchModule, ErrorModule, - DepositDatasetsModule,DepositDatasetsResultsModule, DepositBySubjectResultsModule,DepositPublicationsModule , DepositPublicationsResultsModule, SearchResearchResultsModule, SearchDataProvidersModule, SearchProjectsModule, SearchOrganizationsModule, AdvancedSearchResearchResultsModule, AdvancedSearchDataProvidersModule, AdvancedSearchProjectsModule, AdvancedSearchOrganizationsModule, ResultLandingModule, DataProviderModule, OrganizationModule, ProjectModule, diff --git a/deposit/datasets/depositBySubject.component.ts b/deposit/datasets/depositBySubject.component.ts deleted file mode 100644 index 12b6317a..00000000 --- a/deposit/datasets/depositBySubject.component.ts +++ /dev/null @@ -1,63 +0,0 @@ -import {Component, Input} from '@angular/core'; -import {Router, ActivatedRoute} from '@angular/router'; -import {Title, Meta} from '@angular/platform-browser'; - -import {Observable} from 'rxjs'; - -import {EnvProperties} from '../../utils/properties/env-properties'; - -import {PiwikService} from '../../utils/piwik/piwik.service'; - - -@Component({ - selector: 'deposit-by-subject', - template: ` -
- -
Or search for domain specific repositories
- -
- - - -
-
- ` -}) - -export class DepositBySubjectComponent { - @Input() subjectKeyword: string=''; - @Input() piwikSiteId = null; - properties:EnvProperties; - - constructor (private _router: Router,private route: ActivatedRoute, - private _meta: Meta, private _title: Title, - private _piwikService: PiwikService) { } - ngOnInit() { - this.route.data - .subscribe((data: { envSpecific: EnvProperties }) => { - this.properties = data.envSpecific; - - var title = "Deposit by Subjects"; - var description = "Openaire, repositories, open access, content provider, compatibility, organization, deposit by subject" - var url = data.envSpecific.baseLink+this._router.url; - - this._title.setTitle(title); - this._meta.updateTag({content:title},"property='og:title'"); - this._meta.updateTag({content:description},"name='description'"); - this._meta.updateTag({content:description},"property='og:description'"); - this._meta.updateTag({content:url},"property='og:url'"); - - if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){ - this._piwikService.trackView(this.properties, "Deposit by subjects" , this.piwikSiteId).subscribe(); - } - - }); - - } - public search() { - this._router.navigate( ['participate/deposit-subject-result'], { queryParams: { "subject": this.subjectKeyword } } ); - } -} diff --git a/deposit/datasets/depositBySubjectResult.component.html b/deposit/datasets/depositBySubjectResult.component.html deleted file mode 100644 index d4c6cf09..00000000 --- a/deposit/datasets/depositBySubjectResult.component.html +++ /dev/null @@ -1,98 +0,0 @@ - -
-
-
- - -
-
- Share {{requestFor}} -
- -
-
- - - -
-
- Keywords: {{subject}} - - - - - -
-
-
- -
-
- -
- - - - -
-

Please use the information/contacts shown below to deposit your {{requestFor}}.

- -
- -
-
- {{fetchDataproviders.searchUtils.totalResults | number}} content providers, page {{fetchDataproviders.searchUtils.page | number}} of {{(totalPages()) | number}} -
- - - -
- -
- No content providers found with classification "{{subject}}". -
-
- An error occured. -
- - -
- -
- - -
- Deposit your {{requestFor}} in - - {{zenodoInformation.name}} () - -
- - -
-
- - - -
-
-
-
diff --git a/deposit/datasets/depositBySubjectResult.component.ts b/deposit/datasets/depositBySubjectResult.component.ts deleted file mode 100644 index 055c8ac6..00000000 --- a/deposit/datasets/depositBySubjectResult.component.ts +++ /dev/null @@ -1,58 +0,0 @@ -import {Component, Input} from '@angular/core'; -import {Router} from '@angular/router'; -import {ActivatedRoute} from '@angular/router'; -import {Title, Meta} from '@angular/platform-browser'; - -import {Observable} from 'rxjs'; - -import {EnvProperties} from '../../utils/properties/env-properties'; - -import {ErrorCodes} from '../../utils/properties/errorCodes'; - -import {FetchDataproviders} from '../../utils/fetchEntitiesClasses/fetchDataproviders.class'; -import {RouterHelper} from '../../utils/routerHelper.class'; - -import {SearchDataprovidersService} from '../../services/searchDataproviders.service'; -import {OrganizationService} from '../../services/organization.service'; -import {PiwikService} from '../../utils/piwik/piwik.service'; -import { SEOService } from '../../sharedComponents/SEO/SEO.service'; - -import {ZenodoInformationClass} from '../utils/zenodoInformation.class'; - -@Component({ - selector: 'deposit-by-subject-result', - template: ` - - - ` - //templateUrl: 'depositBySubjectResult.component.html' -}) - -export class DepositBySubjectResultComponent { - @Input() piwikSiteId = null; - @Input() zenodoInformation: ZenodoInformationClass; - - public subject: string = ""; - properties:EnvProperties; - - constructor (private route: ActivatedRoute) {} - - ngOnInit() { - this.route.data - .subscribe((data: { envSpecific: EnvProperties }) => { - this.properties = data.envSpecific; - - if(!this.zenodoInformation) { - this.zenodoInformation = new ZenodoInformationClass(); - } - if(!this.zenodoInformation.url) { - this.zenodoInformation.url = this.properties.zenodo; - } - if(!this.zenodoInformation.name) { - this.zenodoInformation.name = "Zenodo"; - } - }); - } -} diff --git a/deposit/datasets/depositBySubjectResults.module.ts b/deposit/datasets/depositBySubjectResults.module.ts deleted file mode 100644 index e0bfa1b0..00000000 --- a/deposit/datasets/depositBySubjectResults.module.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { DepositBySubjectResultComponent } from './depositBySubjectResult.component'; - -import {DepositModule} from '../deposit.module'; -import {FreeGuard} from'../../login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard'; -import {PagingModule } from '../../utils/paging.module'; -import {DataProvidersServiceModule} from '../../services/dataProvidersService.module'; -import {SearchResultsModule } from '../../searchPages/searchUtils/searchResults.module'; -import {HelperModule} from '../../utils/helper/helper.module'; -import {IsRouteEnabled} from '../../error/isRouteEnabled.guard'; -import {Schema2jsonldModule} from '../../sharedComponents/schema2jsonld/schema2jsonld.module'; -import { SEOServiceModule } from '../../sharedComponents/SEO/SEOService.module'; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - DepositModule, - SearchResultsModule, DataProvidersServiceModule, PagingModule, - HelperModule, Schema2jsonldModule, SEOServiceModule - ], - declarations: [ - - DepositBySubjectResultComponent - - ], - exports: [ - DepositBySubjectResultComponent - ], - providers: [FreeGuard,PreviousRouteRecorder, IsRouteEnabled] -}) -export class DepositBySubjectResultsModule { } diff --git a/deposit/datasets/depositDatasets.component.ts b/deposit/datasets/depositDatasets.component.ts deleted file mode 100644 index e3ef163a..00000000 --- a/deposit/datasets/depositDatasets.component.ts +++ /dev/null @@ -1,48 +0,0 @@ -import {Component, Input} from '@angular/core'; -import {ActivatedRoute} from '@angular/router'; -import {EnvProperties} from '../../utils/properties/env-properties'; -import {ZenodoInformationClass} from '../utils/zenodoInformation.class'; - -@Component({ - selector: 'deposit-datasets', - template: ` -
-
-
- -
- - -
-
-
-
- ` -}) - -export class DepositDatasetsComponent { - @Input() piwikSiteId = null; - properties:EnvProperties; - @Input() zenodoInformation: ZenodoInformationClass; - - constructor (private route: ActivatedRoute) {} - - ngOnInit() { - this.route.data - .subscribe((data: { envSpecific: EnvProperties }) => { - this.properties = data.envSpecific; - - if(!this.zenodoInformation) { - this.zenodoInformation = new ZenodoInformationClass(); - } - if(!this.zenodoInformation.url) { - this.zenodoInformation.url = this.properties.zenodo; - } - if(!this.zenodoInformation.name) { - this.zenodoInformation.name = "Zenodo"; - } - }); - } -} diff --git a/deposit/datasets/depositDatasets.module.ts b/deposit/datasets/depositDatasets.module.ts deleted file mode 100644 index 471b277a..00000000 --- a/deposit/datasets/depositDatasets.module.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { DepositDatasetsComponent } from './depositDatasets.component'; -import { DepositDatasetsResultComponent } from './depositDatasetsResult.component'; - import {DepositModule} from '../deposit.module'; -import {FreeGuard} from'../../login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../error/isRouteEnabled.guard'; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - DepositModule - ], - declarations: [ - - DepositDatasetsComponent - - ], - exports: [ - DepositDatasetsComponent - ], - providers: [FreeGuard,PreviousRouteRecorder, IsRouteEnabled] -}) -export class DepositDatasetsModule { } diff --git a/deposit/datasets/depositDatasetsResult.component.ts b/deposit/datasets/depositDatasetsResult.component.ts deleted file mode 100644 index 84826d8d..00000000 --- a/deposit/datasets/depositDatasetsResult.component.ts +++ /dev/null @@ -1,40 +0,0 @@ -import {Component, Input} from '@angular/core'; -import {ActivatedRoute} from '@angular/router'; -import {EnvProperties} from '../../utils/properties/env-properties'; -import {ZenodoInformationClass} from '../utils/zenodoInformation.class'; - -@Component({ - selector: 'deposit-datasets-result', - template: ` - - - ` -}) - -export class DepositDatasetsResultComponent { - @Input() zenodoInformation: ZenodoInformationClass; - properties:EnvProperties; - - @Input() piwikSiteId = null; - - constructor (private route: ActivatedRoute) {} - - ngOnInit() { - this.route.data - .subscribe((data: { envSpecific: EnvProperties }) => { - this.properties = data.envSpecific; - - if(!this.zenodoInformation) { - this.zenodoInformation = new ZenodoInformationClass(); - } - if(!this.zenodoInformation.url) { - this.zenodoInformation.url = this.properties.zenodo; - } - if(!this.zenodoInformation.name) { - this.zenodoInformation.name = "Zenodo"; - } - }); - } -} diff --git a/deposit/datasets/depositDatasetsResults.module.ts b/deposit/datasets/depositDatasetsResults.module.ts deleted file mode 100644 index cdad3153..00000000 --- a/deposit/datasets/depositDatasetsResults.module.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { DepositDatasetsResultComponent } from './depositDatasetsResult.component'; - -import {DepositModule} from '../deposit.module'; -import {FreeGuard} from'../../login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../error/isRouteEnabled.guard'; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - DepositModule - ], - declarations: [ - - DepositDatasetsResultComponent, - - ], - exports: [ - DepositDatasetsResultComponent, - ], - providers: [FreeGuard,PreviousRouteRecorder, IsRouteEnabled] -}) -export class DepositDatasetsResultsModule { } diff --git a/deposit/deposit.component.html b/deposit/deposit.component.html deleted file mode 100644 index 159c9651..00000000 --- a/deposit/deposit.component.html +++ /dev/null @@ -1,74 +0,0 @@ -
-
- Share {{requestFor}} -
- - -
- -
-
- -
- -
See if your institution has a repository
- -
-
- - -
- -
- - -
- -
-
-
Or locate repository on map
-
- -
-
-
-
- - -
- Deposit your {{requestFor}} in - - {{zenodoInformation.name}} () - - -
- - -
- -
- -
diff --git a/deposit/deposit.component.ts b/deposit/deposit.component.ts deleted file mode 100644 index f097d03b..00000000 --- a/deposit/deposit.component.ts +++ /dev/null @@ -1,112 +0,0 @@ -import {Component, Input} from '@angular/core'; -import {Router, ActivatedRoute} from '@angular/router'; -import {Title, Meta} from '@angular/platform-browser'; - -import {Observable} from 'rxjs'; - -import {EnvProperties} from '../utils/properties/env-properties'; - -import {PiwikService} from '../utils/piwik/piwik.service'; -import { SEOService } from '../sharedComponents/SEO/SEO.service'; - -import {ZenodoInformationClass} from './utils/zenodoInformation.class'; - -@Component({ - selector: 'deposit', - templateUrl: 'deposit.component.html' -}) - -export class DepositComponent { - @Input() zenodoInformation: ZenodoInformationClass; - @Input() compatibility: string = ''; - @Input() mapUrl: string = null; // optional in case i-frame is needed - @Input() searchBySubjects: boolean = false; // optional: in case search by subjects is needed - @Input() piwikSiteId = null; - - public status: number; - - // Type of entity: Publication or Research Data - @Input() requestFor: string = "Publications"; - - // url's needed for information text - public openAccess: string; - public openAccessRepo: string; - public fp7Guidlines: string; - public h2020Guidlines: string; - public ercGuidlines: string; - public helpdesk: string; - - // Id of the new selected organization to be searched - public selectedId: string = ""; - - public warningMessage: string = ""; - - piwiksub:any; - properties:EnvProperties; - url=null; - constructor (private route: ActivatedRoute, private _router: Router, - private _meta: Meta, private _title: Title, - private _piwikService:PiwikService, - private seoService: SEOService ) { - - var title = "Deposit "+this.requestFor; - var description = "Openaire, repositories, open access, content provider, compatibility, organization, deposit "+ this.requestFor; - this.updateTitle(title); - this.updateDescription(description); - } - ngOnInit() { - this.route.data - .subscribe((data: { envSpecific: EnvProperties }) => { - this.properties = data.envSpecific; - this.seoService.createLinkForCanonicalURL(this.properties.baseLink+this._router.url, false); - this.updateUrl(data.envSpecific.baseLink+this._router.url); - this.url = data.envSpecific.baseLink+this._router.url; - - this.openAccess = this.properties.openAccess; - this.openAccessRepo = this.properties.openAccessRepo; - this.fp7Guidlines = this.properties.fp7Guidlines - this.h2020Guidlines = this.properties.h2020Guidlines - this.ercGuidlines = this.properties.ercGuidlines - this.helpdesk = this.properties.helpdesk; - - if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){ - this.piwiksub = this._piwikService.trackView(this.properties, "Deposit "+this.requestFor, this.piwikSiteId).subscribe(); - } - }); - } - ngOnDestroy() { - if(this.piwiksub){ - this.piwiksub.unsubscribe(); - } - } - - public organizationSelected(id: string) { - if(id && id.length > 0){ - if(this.requestFor == "Publications") { - this._router.navigate( ['participate/deposit-publications-result'], { queryParams: { "organizationId": id } } ); - } else if(this.requestFor == "Research Data") { - this._router.navigate( ['participate/deposit-datasets-result'], { queryParams: { "organizationId": id } } ); - } - } else { - this.warningMessage = "No organization selected"; - } - } - - public valueChanged($event) { - this.selectedId = $event.value; - } - - private updateDescription(description:string) { - this._meta.updateTag({content:description},"name='description'"); - this._meta.updateTag({content:description},"property='og:description'"); - } - private updateTitle(title:string) { - var _prefix ="OpenAIRE | "; - var _title = _prefix + ((title.length> 50 ) ?title.substring(0,50):title); - this._title.setTitle(_title); - this._meta.updateTag({content:_title},"property='og:title'"); - } - private updateUrl(url:string) { - this._meta.updateTag({content:url},"property='og:url'"); - } -} diff --git a/deposit/deposit.module.ts b/deposit/deposit.module.ts deleted file mode 100644 index c07d8e0f..00000000 --- a/deposit/deposit.module.ts +++ /dev/null @@ -1,49 +0,0 @@ -/* Common Component of deposit for both research data & ppublications*/ - -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { RouterModule } from '@angular/router'; - -import { DepositComponent } from './deposit.component'; -import { DepositResultComponent } from './depositResult.component'; -import {EntitiesAutocompleteModule} from '../utils/entitiesAutoComplete/entitiesAutoComplete.module'; -import {DataProvidersServiceModule} from '../services/dataProvidersService.module'; -import {OrganizationServiceModule} from '../services/organizationService.module'; -import {SearchResultsModule } from '../searchPages/searchUtils/searchResults.module'; -import {PiwikServiceModule} from '../utils/piwik/piwikService.module'; -import {HelperModule} from '../utils/helper/helper.module'; -import { DepositBySubjectComponent } from './datasets/depositBySubject.component'; -import {IFrameModule} from '../utils/iframe.module'; -import {Schema2jsonldModule} from '../sharedComponents/schema2jsonld/schema2jsonld.module'; -import { SEOServiceModule } from '../sharedComponents/SEO/SEOService.module'; -import{SearchPagingModule} from '../searchPages/searchUtils/searchPaging.module'; -import {ApprovedByCommunityModule} from '../connect/approvedByCommunity/approved.module'; - - - @NgModule({ - imports: [ - CommonModule, FormsModule, - RouterModule, - EntitiesAutocompleteModule, - DataProvidersServiceModule, - OrganizationServiceModule, - SearchResultsModule, - PiwikServiceModule, - HelperModule, - IFrameModule, Schema2jsonldModule, SEOServiceModule, - SearchPagingModule, ApprovedByCommunityModule - ], - declarations: [ - DepositComponent, - DepositResultComponent, - DepositBySubjectComponent - ], - exports: [ - DepositComponent, - DepositResultComponent - ], - providers: [ - ] -}) -export class DepositModule { } diff --git a/deposit/depositResult.component.ts b/deposit/depositResult.component.ts deleted file mode 100644 index bc93826b..00000000 --- a/deposit/depositResult.component.ts +++ /dev/null @@ -1,473 +0,0 @@ -import {Component, Input} from '@angular/core'; -import {Router, ActivatedRoute} from '@angular/router'; -import {Title, Meta} from '@angular/platform-browser'; - -import {Observable} from 'rxjs'; -import {ErrorCodes} from '../utils/properties/errorCodes'; - -import {EnvProperties} from '../utils/properties/env-properties'; - -import {RouterHelper} from '../utils/routerHelper.class'; -import {FetchDataproviders} from '../utils/fetchEntitiesClasses/fetchDataproviders.class'; -import {SearchDataprovidersService} from '../services/searchDataproviders.service'; -import {OrganizationService} from '../services/organization.service'; -import {PiwikService} from '../utils/piwik/piwik.service'; -import {SEOService} from '../sharedComponents/SEO/SEO.service'; - -import {ZenodoInformationClass} from './utils/zenodoInformation.class'; -import {properties} from "../../../environments/environment"; - -@Component({ - selector: 'deposit-result', - template: ` -
-
-
- - -
-
- Share {{requestFor}} -
- -
- -
- - -

- - {{organization['name']}} - - {{organization['name']}} -

- -
-
- - - -
-
- Keywords: {{subject}} - - - - - -
-
- -

- Please use the information below and contact your repository to deposit your {{requestFor}}. -

- -
- - -
- - - -
-
-
- - - - - - [no title available] - -

-

[no title available]

-
- - - {{result['type']}} - {{result.compatibility}} - -
- Organization: - - - - {{organization.name}} - {{organization.name}}, - - ... -
-
- Country: {{country}}{{(i < (result['countries'].slice(0, 10).length - 1)) ? ", " : ""}}{{(i == result['countries'].slice(0, 10).length - 1 && result['countries'].length > 10) ? "..." : ""}} -
-
- Website URL: - - - {{result['websiteURL']}} - - -
-
- OAI-PMH URL: - - - {{result['OAIPMHURL']}} - - -
- -
- Subject: {{subject}}{{(i < (result['subjects'].slice(0, 10).length - 1)) ? ", " : ""}}{{(i == result['subjects'].slice(0, 10).length - 1 && result['subjects'].length > 10) ? "..." : ""}} -
-
-
- -
-
-
- No organization with ID: {{organizationId}} found. -
-
- An error occured. -
- - Service temprorarily unavailable. Please try again later. - -
- No ID for organization. -
-
-
-
- - An error occured. - - - Service temprorarily unavailable. Please try again later. - - - Requested page out of bounds. - -
- No content providers found for institution: - - {{organization['name']}} () - - {{organization['name']}} - . -
-
- No content providers found with classification "{{subject}}". -
-
-
- -
- - -
- Deposit your {{requestFor}} in - - {{zenodoInformation.name}} () - -
- - - - -
-
- - -
-
-
-
- - ` -}) - -export class DepositResultComponent { - @Input() zenodoInformation: ZenodoInformationClass; - @Input() compatibility: string = ''; - @Input() piwikSiteId = null; - // Type of entity: Publication or Research Data - @Input() requestFor: string = "Publications"; - - public organization: { "name": string, "url": string }; - public organizationId: string = ""; - - // Id of the new selected organization to be searched - public selectedId: string = ""; - - @Input() subjectResults: boolean = false; - @Input() subject: string = ""; - - public status: number; - public warningMessage: string = ""; - - public fetchDataproviders: FetchDataproviders; - public linkToSearchDataproviders: string = ""; - - public parameterNames: string[] = []; - public parameterValues: string[] = []; - - public routerHelper: RouterHelper = new RouterHelper(); - public errorCodes: ErrorCodes = new ErrorCodes(); - sub: any; - piwiksub: any; - properties: EnvProperties = properties; - url = null; - - constructor(private _router: Router, - private route: ActivatedRoute, - private _searchDataprovidersService: SearchDataprovidersService, - private _organizationService: OrganizationService, - private _meta: Meta, - private _title: Title, - private _piwikService: PiwikService, - private seoService: SEOService) { - - this.fetchDataproviders = new FetchDataproviders(this._searchDataprovidersService); - - this.status = this.errorCodes.LOADING; - - - var title = "Deposit " + this.requestFor; - var description = "Openaire, repositories, open access, content provider, compatibility, organization, deposit " + this.requestFor; - - this.updateTitle(title); - this.updateDescription(description); - - } - - ngOnInit() { - this.seoService.createLinkForCanonicalURL(this.properties.baseLink + this._router.url, false); - this.updateUrl(this.properties.baseLink + this._router.url); - this.url = this.properties.baseLink + this._router.url; - - if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) { - this.piwiksub = this._piwikService.trackView(this.properties, "Deposit " + this.requestFor, this.piwikSiteId).subscribe(); - } - this.sub = this.route.queryParams.subscribe(params => { - this.fetchDataproviders.searchUtils.page = (params['page'] === undefined) ? 1 : +params['page']; - - if (this.subjectResults) { - this.status = this.errorCodes.DONE; - - this.subject = params['subject']; - if (!this.subject) { - this.subject = ""; - } - this.parameterNames.push('subject'); - this.parameterValues.push(this.subject); - - this.searchDataprovidersBySubject(); - } else { - if (this.organizationId) { - this.searchDataproviders(); - } else { - this.organizationId = params['organizationId']; - this.parameterNames.push('organizationId'); - this.parameterValues.push(this.organizationId); - - if (this.organizationId) { - this.getOrganizationInfo(); - } - } - this.selectedId = ""; - } - }); - } - - ngDoCheck() { - if (!this.subjectResults && (this.organizationId == "" || this.organizationId == undefined)) { - this.organizationId = ""; - this.status = this.errorCodes.NONE; - this.fetchDataproviders.searchUtils.status = this.errorCodes.NONE; - } - } - - ngOnDestroy() { - this.sub.unsubscribe(); - if (this.piwiksub) { - this.piwiksub.unsubscribe(); - } - } - - public newSubject() { - this._router.navigate(['participate/deposit-subject-result'], {queryParams: {"subject": this.subject}}); - } - - public searchDataprovidersBySubject() { - this.parameterNames = []; - this.parameterValues = []; - this.parameterNames.push('subject'); - this.parameterValues.push(this.subject); - - this.fetchDataproviders.getResultsBySubjectsForDeposit((this.subject == "") ? "*" : this.subject, this.requestFor, this.fetchDataproviders.searchUtils.page, this.fetchDataproviders.searchUtils.size, this.properties); - this.linkToSearchDataproviders = this.properties.searchLinkToDataProviders; - } - - private searchDataproviders() { - // if(this.organization != undefined) { - // this.fetchDataproviders.getResults(this.organization.name, false, 1, 10); - // } else if(this.organizationId != undefined) { - this.fetchDataproviders.getResultsForDeposit(this.organizationId, this.requestFor, this.fetchDataproviders.searchUtils.page, this.fetchDataproviders.searchUtils.size, this.properties); - //} - this.linkToSearchDataproviders = this.properties.searchLinkToDataProviders; - } - - private getOrganizationInfo() { - this.fetchDataproviders.oldTotalResults = 0; - this.fetchDataproviders.searchUtils.totalResults = 0; - - this._organizationService.getOrganizationNameAndUrlById(this.organizationId, this.properties).subscribe( - data => { - if (data == null) { - this.status = this.errorCodes.NOT_FOUND; - this.fetchDataproviders.searchUtils.status = this.errorCodes.NONE; - } else { - this.organization = data; - this.status = this.errorCodes.DONE; - this.searchDataproviders(); - } - }, - err => { - //console.log(err) - this.handleError("Error getting organization name and url for id: " + this.organizationId, err); - - this.fetchDataproviders.searchUtils.status = this.errorCodes.NONE; - if (err.status == '404') { - this.status = this.errorCodes.NOT_FOUND; - } else if (err.status == '500') { - this.status = this.errorCodes.ERROR; - } else { - this.status = this.errorCodes.NOT_AVAILABLE; - } - } - ); - } - - public goToDeposit() { - if (this.requestFor == "Publications") { - this._router.navigate(['participate/deposit-publications']); - } else if (this.requestFor == "Research Data") { - this._router.navigate(['participate/deposit-datasets']); - } - } - - public valueChanged($event) { - this.selectedId = $event.value; - } - - public organizationSelected(id: string) { - if (id && id.length > 0 && id != this.organizationId) { - this.organization = null; - this.status = this.errorCodes.LOADING; - - if (this.requestFor == "Publications") { - this._router.navigate(['participate/deposit-publications-result'], {queryParams: {"organizationId": id}}); - } else if (this.requestFor == "Research Data") { - this._router.navigate(['participate/deposit-datasets-result'], {queryParams: {"organizationId": id}}); - } - } else { - this.warningMessage = "No new organization selected"; - } - } - - private updateDescription(description: string) { - this._meta.updateTag({content: description}, "name='description'"); - this._meta.updateTag({content: description}, "property='og:description'"); - } - - private updateTitle(title: string) { - var _prefix = "OpenAIRE | "; - var _title = _prefix + ((title.length > 50) ? title.substring(0, 50) : title); - this._title.setTitle(_title); - this._meta.updateTag({content: _title}, "property='og:title'"); - } - - private updateUrl(url: string) { - this._meta.updateTag({content: url}, "property='og:url'"); - } - - private handleError(message: string, error) { - console.error("Deposit Result Page: " + message, error); - } -} diff --git a/deposit/publications/depositPublications.component.ts b/deposit/publications/depositPublications.component.ts deleted file mode 100644 index 92cb4a92..00000000 --- a/deposit/publications/depositPublications.component.ts +++ /dev/null @@ -1,51 +0,0 @@ -import {Component, Input} from '@angular/core'; -import {ActivatedRoute} from '@angular/router'; -import {EnvProperties} from '../../utils/properties/env-properties'; -import {ZenodoInformationClass} from '../utils/zenodoInformation.class'; - -@Component({ - selector: 'deposit-publications', - template: ` -
-
-
- -
- - -
-
-
-
- ` -}) - -export class DepositPublicationsComponent { - @Input() zenodoInformation: ZenodoInformationClass; - - public mapUrl = null; - @Input() piwikSiteId = null; - properties:EnvProperties; - - constructor (private route: ActivatedRoute) {} - - ngOnInit() { - this.route.data - .subscribe((data: { envSpecific: EnvProperties }) => { - this.properties = data.envSpecific; - this.mapUrl = this.properties.statisticsFrameAPIURL+"markers-test.html"; - - if(!this.zenodoInformation) { - this.zenodoInformation = new ZenodoInformationClass(); - } - if(!this.zenodoInformation.url) { - this.zenodoInformation.url = this.properties.zenodo; - } - if(!this.zenodoInformation.name) { - this.zenodoInformation.name = "Zenodo"; - } - }); - } -} diff --git a/deposit/publications/depositPublications.module.ts b/deposit/publications/depositPublications.module.ts deleted file mode 100644 index 77e922bf..00000000 --- a/deposit/publications/depositPublications.module.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { DepositPublicationsComponent } from './depositPublications.component'; - -import {DepositModule} from '../deposit.module'; -import {FreeGuard} from'../../login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../error/isRouteEnabled.guard'; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - DepositModule - ], - declarations: [ - DepositPublicationsComponent - ], - exports: [ - DepositPublicationsComponent, - ], - providers: [FreeGuard,PreviousRouteRecorder, IsRouteEnabled] -}) -export class DepositPublicationsModule { } diff --git a/deposit/publications/depositPublicationsResult.component.ts b/deposit/publications/depositPublicationsResult.component.ts deleted file mode 100644 index 60434974..00000000 --- a/deposit/publications/depositPublicationsResult.component.ts +++ /dev/null @@ -1,40 +0,0 @@ -import {Component, Input} from '@angular/core'; -import {ActivatedRoute} from '@angular/router'; -import {EnvProperties} from '../../utils/properties/env-properties'; -import {ZenodoInformationClass} from '../utils/zenodoInformation.class'; - -@Component({ - selector: 'deposit-publications-result', - template: ` - - - ` -}) - -export class DepositPublicationsResultComponent { - @Input() zenodoInformation: ZenodoInformationClass; - properties:EnvProperties; - - @Input() piwikSiteId = null; - - constructor (private route: ActivatedRoute) {} - - ngOnInit() { - this.route.data - .subscribe((data: { envSpecific: EnvProperties }) => { - this.properties = data.envSpecific; - - if(!this.zenodoInformation) { - this.zenodoInformation = new ZenodoInformationClass(); - } - if(!this.zenodoInformation.url) { - this.zenodoInformation.url = this.properties.zenodo; - } - if(!this.zenodoInformation.name) { - this.zenodoInformation.name = "Zenodo"; - } - }); - } -} diff --git a/deposit/publications/depositPublicationsResults.module.ts b/deposit/publications/depositPublicationsResults.module.ts deleted file mode 100644 index 9a8e144a..00000000 --- a/deposit/publications/depositPublicationsResults.module.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { DepositPublicationsResultComponent } from './depositPublicationsResult.component'; - -import {DepositModule} from '../deposit.module'; -import {FreeGuard} from'../../login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../error/isRouteEnabled.guard'; - -@NgModule({ - imports: [ - CommonModule, FormsModule, - DepositModule - - ], - declarations: [ - DepositPublicationsResultComponent - ], - exports: [ - DepositPublicationsResultComponent - ], - providers: [FreeGuard,PreviousRouteRecorder, IsRouteEnabled] -}) -export class DepositPublicationsResultsModule { }