diff --git a/src/app/pages/curator/curator.component.ts b/src/app/pages/curator/curator.component.ts index 15c2070..3dd8cd8 100644 --- a/src/app/pages/curator/curator.component.ts +++ b/src/app/pages/curator/curator.component.ts @@ -9,7 +9,7 @@ import {CuratorService} from '../../openaireLibrary/connect/curators/curator.ser import {Affiliation, Curator} from '../../openaireLibrary/utils/entities/CuratorInfo'; import {HelperFunctions} from '../../openaireLibrary/utils/HelperFunctions.class'; import {AlertModal} from '../../openaireLibrary/utils/modal/alert'; -import {CuratorPhotoService} from '../../openaireLibrary/services/curatorPhoto.service'; +import {UtilitiesService} from '../../openaireLibrary/services/utilities.service'; @Component({ selector: 'curator', @@ -40,7 +40,7 @@ export class CuratorComponent implements OnInit { private route: ActivatedRoute, private _router: Router, private curatorService: CuratorService, - private curatorPhotoService: CuratorPhotoService) { + private utilitiesService: UtilitiesService) { } @@ -223,9 +223,9 @@ export class CuratorComponent implements OnInit { if (this.hasChanged && this.curator && this.curator.name && this.curator.name !== '') { this.showLoading = true; if (this.file) { - this.curatorPhotoService.uploadPhoto(this.properties.uploadService + '/' + this.curator._id, this.file).subscribe((res) => { + this.utilitiesService.uploadPhoto(this.properties.uploadService + '/' + this.curator._id, this.file).subscribe((res) => { if (this.curator.photo && this.curator.photo !== '') { - this.curatorPhotoService.deletePhoto(this.properties.deleteUrl + '/' + this.curator.photo).subscribe(); + this.utilitiesService.deletePhoto(this.properties.deleteUrl + '/' + this.curator.photo).subscribe(); } this.curator.photo = res.filename; this.curatorService.updateCurator(this.properties.adminToolsAPIURL + 'curator', @@ -268,12 +268,24 @@ export class CuratorComponent implements OnInit { addAffiliation() { if (!this.isEmptyAffiliation()) { - if (this.index === -1) { - this.curator.affiliations.push(this.affiliation); + if(!HelperFunctions.isTiny(this.affiliation.logo_url)) { + this.utilitiesService.getTiny(this.properties.tinyUrl + this.affiliation.logo_url).subscribe((res)=> { + this.affiliation.logo_url = res; + if (this.index === -1) { + this.curator.affiliations.push(this.affiliation); + } else { + this.curator.affiliations[this.index] = this.affiliation; + } + this.change(); + }) } else { - this.curator.affiliations[this.index] = this.affiliation; + if (this.index === -1) { + this.curator.affiliations.push(this.affiliation); + } else { + this.curator.affiliations[this.index] = this.affiliation; + } + this.change(); } - this.change(); } } diff --git a/src/app/pages/curator/curator.module.ts b/src/app/pages/curator/curator.module.ts index a0185af..e353693 100644 --- a/src/app/pages/curator/curator.module.ts +++ b/src/app/pages/curator/curator.module.ts @@ -10,7 +10,7 @@ import {IsCommunity} from '../../openaireLibrary/connect/communityGuard/isCommun import {ConnectAdminLoginGuard} from '../../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard'; import {CuratorService} from '../../openaireLibrary/connect/curators/curator.service'; import {AlertModalModule} from '../../openaireLibrary/utils/modal/alertModal.module'; -import {CuratorPhotoService} from '../../openaireLibrary/services/curatorPhoto.service'; +import {UtilitiesService} from '../../openaireLibrary/services/utilities.service'; @NgModule({ imports: [ @@ -21,7 +21,7 @@ import {CuratorPhotoService} from '../../openaireLibrary/services/curatorPhoto.s CuratorComponent ], providers: [ - CuratorService, CuratorPhotoService, IsCommunity, ConnectAdminLoginGuard + CuratorService, UtilitiesService, IsCommunity, ConnectAdminLoginGuard ], exports: [ CuratorComponent diff --git a/src/assets/env-properties.json b/src/assets/env-properties.json index 423aaac..44a479f 100644 --- a/src/assets/env-properties.json +++ b/src/assets/env-properties.json @@ -32,7 +32,7 @@ "uploadService" : "http://mpagasas.di.uoa.gr:8000/upload", "downloadUrl" : "http://mpagasas.di.uoa.gr:8000/download", "deleteUrl" : "http://mpagasas.di.uoa.gr:8000/delete", - "tinyUrl": "http://mpagasas.uoa.gr:8000/tiny?url=", + "tinyUrl": "http://mpagasas.di.uoa.gr:8000/tiny?url=", "vocabulariesAPI" :"https://beta.services.openaire.eu/provision/mvc/vocabularies/",