From 21ed77a926b2041852b96e700fc8c0e8af841a1e Mon Sep 17 00:00:00 2001 From: Konstantinos Triantafyllou Date: Thu, 1 Oct 2020 09:18:13 +0000 Subject: [PATCH] [Monitor Dashboard | Trunk]: Add upload image functionality for stakeholder's logo git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59496 d315682c-612b-4755-9ff5-7f18f6832af3 --- src/app/app-routing.module.ts | 5 ++ .../manageStakeholders.component.html | 27 +++++--- .../manageStakeholders.component.ts | 61 +++++++++++++------ src/app/users/users-routing.module.ts | 20 ++++++ src/app/users/users.component.html | 2 + src/app/users/users.component.ts | 7 +++ src/app/users/users.module.ts | 13 ++++ src/environments/environment.ts | 4 ++ 8 files changed, 111 insertions(+), 28 deletions(-) create mode 100644 src/app/users/users-routing.module.ts create mode 100644 src/app/users/users.component.html create mode 100644 src/app/users/users.component.ts create mode 100644 src/app/users/users.module.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index a59ddb4..da9fef5 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -31,6 +31,11 @@ const routes: Routes = [ resolve: {envSpecific: EnvironmentSpecificResolver}, data: {hasAdminMenu: true} }, + /*{ + path: 'admin/:stakeholder/users', + loadChildren: './users/users.module#UsersModule', + resolve: {envSpecific: EnvironmentSpecificResolver} + },*/ { path: 'admin/:stakeholder', loadChildren: './stakeholder/stakeholder.module#StakeholderModule', diff --git a/src/app/manageStakeholders/manageStakeholders.component.html b/src/app/manageStakeholders/manageStakeholders.component.html index d094bd5..8182b31 100644 --- a/src/app/manageStakeholders/manageStakeholders.component.html +++ b/src/app/manageStakeholders/manageStakeholders.component.html @@ -202,6 +202,7 @@
@@ -221,24 +222,32 @@ label="Index short name">
-
+
-
+
+ +
+
+ + +
+ +
+
{{uploadError}}
+ +
+ +
-
+
- OR -
-
- - -
- +
-
{{uploadError}}
{ + this.removePhoto(); + })); } ngOnDestroy(): void { this.subscriptions.forEach(value => { if (value instanceof Subscriber) { value.unsubscribe(); + } else if (value instanceof Function) { + value(); } }); } @@ -222,6 +227,7 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { type: this.fb.control(this.stakeholder.type, Validators.required), topics: this.fb.control(this.stakeholder.topics), managers: this.fb.control(this.stakeholder.managers), + isUpload: this.fb.control(this.stakeholder.isUpload), logoUrl: this.fb.control(this.stakeholder.logoUrl), }); this.initPhoto(); @@ -231,6 +237,8 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { this.subscriptions.push(this.stakeholderFb.get('logoUrl').valueChanges.subscribe(value => { if(value) { this.photo = value; + } else { + this.photo = 'assets/common-assets/curator-default.png'; } })); if (!isDefault) { @@ -253,6 +261,8 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { }, 0); this.editStakeholderModal.okButtonText = 'Create'; } + this.uploadError = null; + this.deleteCurrentPhoto = false; this.editStakeholderModal.cancelButtonText = 'Cancel'; this.editStakeholderModal.okButtonLeft = false; this.editStakeholderModal.alertMessage = false; @@ -263,12 +273,16 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { if (this.file) { this.utilsService.uploadPhoto(this.properties.utilsService + "/upload/stakeholder/" + encodeURIComponent(this.stakeholder.alias), this.file).subscribe(res => { this.deletePhoto(); - this.stakeholderFb.get('logoUrl').setValue(this.properties.utilsService + "/download/" + res.filename); + this.removePhoto(); + this.stakeholderFb.get('logoUrl').setValue(res.filename); this.saveStakeholder(); }, error => { this.uploadError = "An error has been occurred during upload your image. Try again later"; this.saveStakeholder(); }); + } else if (this.deleteCurrentPhoto) { + this.deletePhoto(); + this.saveStakeholder(); } else { this.saveStakeholder(); } @@ -280,9 +294,8 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { let stakeholder = this.defaultStakeholders.find(value => value._id === this.stakeholderFb.value.defaultId); this.stakeholderFb.setValue(this.stakeholderUtils.createFunderFromDefaultProfile(this.stakeholderFb.value, (stakeholder ? stakeholder.topics : []))); - } /*else { - this.stakeholderFb.setValue(StakeholderCreator.createFunderDefaultProfile(this.stakeholderFb.value)); - }*/ + } + this.removePhoto(); this.stakeholderService.buildStakeholder(this.properties.monitorServiceAPIURL, this.stakeholderFb.value).subscribe(stakeholder => { if (stakeholder.defaultId === null) { @@ -293,7 +306,6 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { }); } else { this.stakeholderFb.get('type').enable(); - this.removePhoto(); this.stakeholderService.saveElement(this.properties.monitorServiceAPIURL, this.stakeholderFb.value).subscribe(stakeholder => { if (stakeholder.defaultId == null) { this.defaultStakeholders[this.index] = stakeholder; @@ -351,11 +363,8 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { } public deletePhoto() { - if(this.stakeholderFb.get('logoUrl').value) { - let filename = this.stakeholderFb.get('logoUrl').value.split(this.properties.utilsService + "/download/")[1]; - if(filename) { - this.utilsService.deletePhoto(this.properties.utilsService + '/delete/stakeholder/' + filename).subscribe(); - } + if (this.stakeholder.logoUrl) { + this.utilsService.deletePhoto(this.properties.utilsService + '/delete/stakeholder/' + this.stakeholder.logoUrl).subscribe(); } } @@ -364,19 +373,19 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { this.file = event.target.files[0]; if (this.file.type !== 'image/png' && this.file.type !== 'image/jpeg') { this.uploadError = 'You must choose a file with type: image/png or image/jpeg!'; - this.file = null; + this.stakeholderFb.get('isUpload').setValue(false); + this.removePhoto(); } else if (this.file.size > this.maxsize) { this.uploadError = 'File exceeds size\'s limit! Maximum resolution is 256x256 pixels.'; - this.file = null; + this.stakeholderFb.get('isUpload').setValue(false); + this.removePhoto() } else { this.uploadError = null; const reader = new FileReader(); reader.readAsDataURL(this.file); reader.onload = () => { this.photo = reader.result; - setTimeout(() => { - this.stakeholderFb.get('logoUrl').disable(); - }, 0); + this.stakeholderFb.get('isUpload').setValue(true); }; } } @@ -384,7 +393,11 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { initPhoto() { if (this.stakeholderFb.get('logoUrl').value) { - this.photo = this.stakeholderFb.get('logoUrl').value; + if (!this.stakeholderFb.value.isUpload) { + this.photo = this.stakeholderFb.get('logoUrl').value; + } else { + this.photo = this.properties.utilsService + "/download/" + this.stakeholderFb.get('logoUrl').value; + } } else { this.photo = 'assets/common-assets/curator-default.png'; } @@ -396,6 +409,16 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { } this.initPhoto(); this.file = null; - this.stakeholderFb.get('logoUrl').enable(); + } + + remove() { + this.stakeholderFb.get('isUpload').setValue(false); + if (this.file) { + this.removePhoto(); + } + if (this.stakeholder.isUpload) { + this.stakeholderFb.get('logoUrl').setValue(null); + this.deleteCurrentPhoto = true; + } } } diff --git a/src/app/users/users-routing.module.ts b/src/app/users/users-routing.module.ts new file mode 100644 index 0000000..8330f25 --- /dev/null +++ b/src/app/users/users-routing.module.ts @@ -0,0 +1,20 @@ +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; +import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {AdminDashboardGuard} from "../utils/adminDashboard.guard"; +import {UsersComponent} from "./users.component"; + +@NgModule({ + imports: [ + RouterModule.forChild([ + { + path: '', + component: UsersComponent, + canActivate: [AdminDashboardGuard], + canDeactivate: [PreviousRouteRecorder] + } + ]) + ] +}) +export class UsersRoutingModule { +} diff --git a/src/app/users/users.component.html b/src/app/users/users.component.html new file mode 100644 index 0000000..575af81 --- /dev/null +++ b/src/app/users/users.component.html @@ -0,0 +1,2 @@ +
+
diff --git a/src/app/users/users.component.ts b/src/app/users/users.component.ts new file mode 100644 index 0000000..b2369e5 --- /dev/null +++ b/src/app/users/users.component.ts @@ -0,0 +1,7 @@ +import {Component} from "@angular/core"; + +@Component({ + selector: 'users', + templateUrl: 'users.component.html' +}) +export class UsersComponent {} diff --git a/src/app/users/users.module.ts b/src/app/users/users.module.ts new file mode 100644 index 0000000..62ca824 --- /dev/null +++ b/src/app/users/users.module.ts @@ -0,0 +1,13 @@ +import {NgModule} from "@angular/core"; +import {UsersComponent} from "./users.component"; +import {CommonModule} from "@angular/common"; +import {UsersRoutingModule} from "./users-routing.module"; +import {AdminDashboardGuard} from "../utils/adminDashboard.guard"; + +@NgModule({ + imports: [CommonModule, UsersRoutingModule], + declarations: [UsersComponent], + exports: [UsersComponent], + providers: [AdminDashboardGuard] +}) +export class UsersModule {} diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 6b9d54f..227cf97 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -49,6 +49,10 @@ export let properties: EnvProperties = { vocabulariesAPI: "https://dev-openaire.d4science.org/provision/mvc/vocabularies/", piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", piwikSiteId: "80", + /*registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/', + loginUrl: "http://mpagasas.di.uoa.gr:8180/dnet-login/openid_connect_login", + userInfoUrl: "http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=", + logoutUrl: 'http://mpagasas.di.uoa.gr:8180/dnet-login/openid_logout',*/ loginUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login", userInfoUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=", logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",