From 6b5b7df8be8bf141b3f0e50a7063efbcd51d4af6 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 29 Jan 2024 19:55:26 +0200 Subject: [PATCH] [develop | DONE | DELETED]: Deleted legacy unused files mailPrefs.component.html, mailPrefs.component.ts, mailPrefs.module.ts, htmlProjectReport.component.ts, htmlProjectReport.module.ts. --- .../mailPrefs.component.html | 55 ---- .../mailPrefs.component.ts | 259 --------------- .../userEmailPreferences/mailsPrefs.module.ts | 23 -- .../htmlProjectReport.component.ts | 302 ------------------ .../htmlProjectReport.module.ts | 30 -- 5 files changed, 669 deletions(-) delete mode 100644 connect/userEmailPreferences/mailPrefs.component.html delete mode 100644 connect/userEmailPreferences/mailPrefs.component.ts delete mode 100644 connect/userEmailPreferences/mailsPrefs.module.ts delete mode 100644 landingPages/htmlProjectReport/htmlProjectReport.component.ts delete mode 100644 landingPages/htmlProjectReport/htmlProjectReport.module.ts diff --git a/connect/userEmailPreferences/mailPrefs.component.html b/connect/userEmailPreferences/mailPrefs.component.html deleted file mode 100644 index 4bbe55a2..00000000 --- a/connect/userEmailPreferences/mailPrefs.component.html +++ /dev/null @@ -1,55 +0,0 @@ - -
-
- User Email Preferences for Claims Notifications -
- - - - - - -
- - -
- -
-
Notify - for new user links:
- - -
- -
-
Frequency:
-
- -
-
- -
- - -
- -
- -
- - - -
- diff --git a/connect/userEmailPreferences/mailPrefs.component.ts b/connect/userEmailPreferences/mailPrefs.component.ts deleted file mode 100644 index 6243387f..00000000 --- a/connect/userEmailPreferences/mailPrefs.component.ts +++ /dev/null @@ -1,259 +0,0 @@ -import {Component, Input} from '@angular/core'; -import {Location} from '@angular/common'; -import {ActivatedRoute, Router} from '@angular/router'; -import {Session} from '../../login/utils/helper.class'; -import {EnvProperties} from '../../utils/properties/env-properties'; -import {MailPrefsService} from './mailPrefs.service'; -import {ConnectHelper} from '../connectHelper'; -import {ErrorCodes} from '../../utils/properties/errorCodes'; -import {ErrorMessagesComponent} from '../../utils/errorMessages.component'; -import {LoginErrorCodes} from '../../login/utils/guardHelper.class'; -import {properties} from "../../../../environments/environment"; -import {Subscriber} from "rxjs"; - -declare var UIkit: any; - -@Component({ - selector: 'mailPrefs', - templateUrl: 'mailPrefs.component.html', - providers:[MailPrefsService] - -}) -export class MailPrefsComponent { - properties:EnvProperties; - subscriptions = []; - @Input() communityId: string; - public preferencesFor: string = "community"; - public status: number; - - public notifications = []; - public initialNotifications = []; - public prefsChanged = {}; - public hidden: boolean = true; - - //public showForbiddenMessage:boolean = false; - public userValidMessage:string = ""; - public savedMessage: string = ""; - - private errorCodes: ErrorCodes; - private errorMessages: ErrorMessagesComponent; - - @Input() showSaveResetButtons: boolean = true; - - constructor (private _mailPrefsService: MailPrefsService, private route: ActivatedRoute, private _router:Router, private location: Location) { - this.errorCodes = new ErrorCodes(); - this.errorMessages = new ErrorMessagesComponent(); - this.status = this.errorCodes.LOADING; - } - - ngOnInit() { - this.properties = properties; - this.subscriptions.push(this.route.params.subscribe(params => { - this.hidden = true; - console.debug(this.communityId); - if(!this.communityId){ - this.communityId = ConnectHelper.getCommunityFromDomain(this.properties.domain); - } - if(!this.communityId) { - this.communityId = params['community']; - } - console.debug(this.communityId, params) - this.getEmailPreferences(); - })); - - - } - - getEmailPreferences() { - if(!Session.isLoggedIn()){ - //this.userValidMessage = "User session has expired. Please login again."; - if(this.showSaveResetButtons) { - this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this._router.url} }); - } - } else { - this.status = this.errorCodes.LOADING; - this.savedMessage = ""; - - if(this.communityId && this.communityId != "openaire") { - this.preferencesFor = "community"; - this.subscriptions.push(this._mailPrefsService.getUserEmailPreferencesForCommunity(this.communityId, this.properties.claimsAPIURL).subscribe( - data => { - if(data.code == "204") { - this.status = this.errorCodes.NONE; - this.initialNotifications = [{notify: true, frequency:24, openaireId: this.communityId}]; - } else { - this.initialNotifications = data.data; - } - this.notifications = JSON.parse(JSON.stringify( this.initialNotifications )); - - this.status = this.errorCodes.DONE; - this.hidden = false; - - }, - err => { - this.hidden = false; - this.handleErrors(err); - this.handleError("Error getting user email preferences for community with id: "+this.communityId, err); - } - )); - } else { - this.preferencesFor = "project"; - this.subscriptions.push(this._mailPrefsService.getUserEmailPreferencesForOpenaire(this.properties.claimsAPIURL).subscribe( - data => { - - if(data.code == "204") { - this.status = this.errorCodes.NONE; - } else { - - this.initialNotifications = data.data; - this.notifications = JSON.parse(JSON.stringify( this.initialNotifications )); - //this.notifications = this.initialNotifications.map(x => Object.assign({}, x)); - //this.notifications = this.initialNotifications; - - this.status = this.errorCodes.DONE; - } - }, - err => { - //console.info(err); - this.handleErrors(err); - this.handleError("Error getting user email preferences for openaire", err); - } - )); - } - } - } - - changeNotify(notification: any, checked: boolean, index: number) { - if(!Session.isLoggedIn()){ - //this.userValidMessage = "User session has expired. Please login again."; - if(this.showSaveResetButtons) { - this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this._router.url} }); - } - } else { - this.savedMessage = ""; - this.status = this.errorCodes.DONE; - notification.notify = checked; - this.prefsChanged[index] = true; - } - } - - changeFrequency(index: number) { - if(!Session.isLoggedIn()){ - //this.userValidMessage = "User session has expired. Please login again."; - if(this.showSaveResetButtons) { - this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this._router.url} }); - } - } else { - this.savedMessage = ""; - this.status = this.errorCodes.DONE; - if(this.initialNotifications[index].frequency != this.notifications[index].frequency) { - this.prefsChanged[index] = true; - } - } - } - - saveNotification(index: number) { - if(this.notifications.length > 0 && this.initialNotifications.length > 0) { - if(!Session.isLoggedIn()){ - //this.userValidMessage = "User session has expired. Please login again."; - if(this.showSaveResetButtons) { - this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this._router.url} }); - } - } else { - if(JSON.stringify(this.notifications[index]) != JSON.stringify(this.initialNotifications[index])) { - - this.status = this.errorCodes.LOADING; - this.savedMessage = ""; - - this.subscriptions.push(this._mailPrefsService.saveUserEmailPreferences(this.notifications[index], this.properties.claimsAPIURL).subscribe( - data => { - this.initialNotifications[index] = JSON.parse(JSON.stringify( this.notifications[index] )); - - this.status = this.errorCodes.DONE; - - /*UIkit.notification({ - message : 'Your email preferences for '+this.notifications[index].openaireName+' have been successfully changed', - status : 'success', - timeout : 3000, - pos : 'top-center' - });*/ - this.savedMessage = "Notification settings for claims saved!"; - }, - err => { - //console.log(err); - this.handleError("Error saving user email preferences: "+JSON.stringify(this.notifications[index]), err); - this.status = this.errorCodes.NOT_SAVED; - } - )); - } - else { - /*UIkit.notification({ - message : 'No changes selected for '+this.notifications[index].openaireName+' email preferences', - status : 'primary', - timeout : 3000, - pos : 'top-center' - });*/ - this.savedMessage = "Notification settings for claims saved!"; - } - } - } - } - - restoreNotification(index: number) { - if(!Session.isLoggedIn()){ - //this.userValidMessage = "User session has expired. Please login again."; - if(this.showSaveResetButtons) { - this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this._router.url} }); - } - } else { - if(this.notifications.length > 0 && this.initialNotifications.length > 0) { - this.status = this.errorCodes.LOADING; - this.savedMessage = ""; - this.notifications[index] = JSON.parse(JSON.stringify( this.initialNotifications[index] )); - this.status = this.errorCodes.DONE; - this.prefsChanged[index] = false; - } - } - } - /* - prefsChanged(index: number) : boolean { - if(this.notifications.length > 0 && this.initialNotifications.length > 0) { - if(JSON.stringify(this.notifications[index]) != JSON.stringify(this.initialNotifications[index])) { - return true; - } - } - return false; - } - */ - ngOnDestroy() { - this.subscriptions.forEach(subscription => { - if (subscription instanceof Subscriber) { - subscription.unsubscribe(); - } - }); - } - - - handleErrors(err){ - //this.showErrorMessage = true; - //try{ - var code = ""; - if(!err.status) { - var error = err.json(); - code = error.code; - } else { - code = err.status; - } - this.status = this.errorMessages.getErrorCode(code); - } - - private handleError(message: string, error) { - console.error("User mail notification preferences Page (for claims): "+message, error); - } - - - //}catch (e) { - //console.log("Couldn't parse answer as json") - //this.showErrorMessage = true; - //} -} diff --git a/connect/userEmailPreferences/mailsPrefs.module.ts b/connect/userEmailPreferences/mailsPrefs.module.ts deleted file mode 100644 index f670212e..00000000 --- a/connect/userEmailPreferences/mailsPrefs.module.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { RouterModule } from '@angular/router'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; - -import { MailPrefsComponent } from './mailPrefs.component'; -import { MailPrefsService } from './mailPrefs.service'; -import {ErrorMessagesModule} from '../../utils/errorMessages.module'; -import { MatSlideToggleModule } from '@angular/material/slide-toggle'; - -@NgModule({ - imports: [ - CommonModule, RouterModule, FormsModule, ReactiveFormsModule, ErrorMessagesModule, MatSlideToggleModule - ], - declarations: [ - MailPrefsComponent - ], - providers:[MailPrefsService], - exports: [ - MailPrefsComponent - ] -}) -export class MailPrefsModule { } diff --git a/landingPages/htmlProjectReport/htmlProjectReport.component.ts b/landingPages/htmlProjectReport/htmlProjectReport.component.ts deleted file mode 100644 index b17c82c5..00000000 --- a/landingPages/htmlProjectReport/htmlProjectReport.component.ts +++ /dev/null @@ -1,302 +0,0 @@ -import {Component, Input} from '@angular/core'; -import {ActivatedRoute, Router} from '@angular/router'; -import {Meta, Title} from '@angular/platform-browser'; - -import {EnvProperties} from '../../utils/properties/env-properties'; - -import {HtmlProjectReportService} from './htmlProjectReport.service'; -import {ProjectService} from '../project/project.service'; -import {PiwikService} from '../../utils/piwik/piwik.service'; -import {SEOService} from '../../sharedComponents/SEO/SEO.service'; -import {HelperService} from "../../utils/helper/helper.service"; -import {Subscriber} from "rxjs"; -import {properties} from "../../../../environments/environment"; - -declare var UIkit: any; - -@Component({ - selector: 'htmlProjectReport', - template: ` -
-
-
- -
- - - -
-
{{header1}}
-
{{header2}}
- -
- -
- -
- - -
-
- -
-
-
- - ` -}) -export class HtmlProjectReportComponent { - @Input() communityId = null; - private projectId: string; - private totalResults: number = 10; - private resultsType: string = "publication"; - - public header1: string = ""; - public header2: string = ""; - public htmlResult: string = ""; - - subscriptions = []; - - public warningMessage: string = ""; - public errorMessage: string = ""; - public showLoading: boolean = true; - properties: EnvProperties; - public pageContents = null; - public divContents = null; - - constructor(private route: ActivatedRoute, - private htmlService: HtmlProjectReportService, - private _piwikService: PiwikService, - private _projectService: ProjectService, - private _meta: Meta, - private _title: Title, - private _router: Router, - private helper: HelperService, - private seoService: SEOService) { - } - - ngOnInit() { - - this.properties = properties; - //this.getDivContents(); - this.getPageContents(); - this.updateUrl(this.properties.domain + this.properties.baseLink + this._router.url); - this.seoService.createLinkForCanonicalURL(this.properties.domain + this.properties.baseLink + this._router.url); - - - this.subscriptions.push(this.route.queryParams.subscribe(params => { - this.projectId = params['projectId']; - - if (params['size'] == parseInt(params['size'], 10)) { - this.totalResults = params['size']; - } else { - this.showLoading = false; - this.warningMessage = "Requested size is not an integer"; - } - - if (params['type'] && (params['type'] == "publication" || params['type'] == "dataset" || params['type'] == "software" || params['type'] == "other")) { - if (params['type'] == "publication") { - this.resultsType = 'publication'; - } else if (params['type'] == "dataset") { - this.resultsType = 'research data'; - } else if (params['type'] == "software") { - this.resultsType = 'software'; - } else if (params['type'] == "other") { - this.resultsType = "other research product"; - } - - var title = "Project's " + this.resultsType + " report"; - var description = "project, project " + this.resultsType + " report, funding, open access, publications, research data, software, other research products"; - this.updateTitle(title); - this.updateDescription(description); - - - } else { - this.showLoading = false; - this.warningMessage = "Requested type should be publication or research data or software or other research product"; - } - - //showLoading is true if no warnings - if (this.showLoading) { - if (this.projectId) { - this.createHeaders(); - } else { - this.showLoading = false; - this.warningMessage = "No valid project id"; - } - } - })); - } - - private getPageContents() { - if(this.communityId) { - this.subscriptions.push(this.helper.getPageHelpContents(this.properties, this.communityId, this._router.url).subscribe(contents => { - this.pageContents = contents; - })); - } - } - - private getDivContents() { - if(this.communityId) { - this.subscriptions.push(this.helper.getDivHelpContents(this.properties, this.communityId, this._router.url).subscribe(contents => { - this.divContents = contents; - })); - } - } - - ngOnDestroy() { - this.subscriptions.forEach(subscription => { - if (subscription instanceof Subscriber) { - subscription.unsubscribe(); - } - }); - } - - private createHeaders() { - this.subscriptions.push(this._projectService.getHTMLInfo(this.projectId, this.properties).subscribe( - data => { - this.createHeader1(data); - if (data.acronym) { - this.updateTitle(data.acronym + " " + this.resultsType + " report"); - } else if (data.title) { - this.updateTitle(data.title + " " + this.resultsType + " report"); - } - this.subscriptions.push(this._piwikService.trackView(this.properties, ((data.acronym) ? data.acronym : data.title) + " " + this.resultsType + " report").subscribe()); - }, - err => { - this.handleError("Error getting html information for project id: " + this.projectId, err); - //console.log(err); - this.createClipboard(); - } - )); - - if (this.resultsType == "publication") { - this.header2 += this.totalResults.toLocaleString('en-US') + " publications"; - } else if (this.resultsType == "research data") { - this.header2 += this.totalResults.toLocaleString('en-US') + " research data"; - } else if (this.resultsType == "software") { - this.header2 += this.totalResults.toLocaleString('en-US') + " software"; - } else if (this.resultsType == "other research product") { - this.header2 += this.totalResults.toLocaleString('en-US') + " other"; - } - } - - private createClipboard() { - let intro: string = ''; - intro += ''; - intro += ''; - intro += '' + this.header1 + '' - intro += ''; - - if (typeof window !== 'undefined') { - this.subscriptions.push(this.htmlService.getHTML(this.projectId, this.resultsType, this.properties.csvAPIURL).subscribe( - data => { - //let body: string = intro+'

'+this.header1+'

'+this.header2+'

'+data+''; - let body: string = intro + '

' + this.header1 + '

' + this.header2 + '

'; - body += "" + data + "
TitleAuthorsPublication YearDOIPermanent IdentifierPublication typeJournalProject Name (GA Number)Access Mode
"; - body += ''; - - //this.htmlResult = data; - this.htmlResult = "" + data + "
TitleAuthorsPublication YearDOIPermanent IdentifierPublication typeJournalProject Name (GA Number)Access Mode
"; - - let clipboard; - let Clipboard; - Clipboard = require('clipboard'); - clipboard = new Clipboard('.clipBtn', { - /*target: function(trigger) { - return document.getElementById("clipboard"); - }*/ - text: function (trigger) { - return body;//document.getElementById("clipboard").getAttribute('innerHTML');//"aaaa"+tmp+"oo"; - } - }); - - this.showLoading = false; - }, - err => { - //console.log(err); - this.handleError("Error getting html for id: " + this.projectId, err); - - this.errorMessage = 'Service not available'; - this.showLoading = false; - } - )); - } - } - - createHeader1(data: { "title": string, "acronym": string, "callIdentifier": string }) { - if (this.resultsType == "publication") { - this.header1 += "Publications"; - } else if (this.resultsType == "research data") { - this.header1 += "Research Data"; - } else if (this.resultsType == "software") { - this.header1 += "Software"; - } else if (this.resultsType == "other research product") { - this.header1 += "Other Research Products"; - } - - if (data != undefined) { - if (data.title != undefined && data.title != "") { - this.header1 += data.title; - } - if ((data.title != undefined && data.title != "") && - ((data.acronym != undefined && data.acronym != "") || - (data.callIdentifier != undefined && data.callIdentifier != ""))) { - this.header1 += "("; - } - if (data.acronym != undefined && data.acronym != "") { - this.header1 += data.acronym + " - "; - } - if (data.callIdentifier != undefined && data.callIdentifier != "") { - this.header1 += data.callIdentifier; - } - if ((data.title != undefined && data.title != "") && - ((data.acronym != undefined && data.acronym != "") || - (data.callIdentifier != undefined && data.callIdentifier != ""))) { - this.header1 += ")"; - } - } - - this.createClipboard(); - } - - public copied() { - UIkit.notification({ - message: 'Raw html is copied. Please paste it on an html file.', - status: 'success', - timeout: 3000, - pos: 'top-center' - }); - } - - 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 = ""; - if(!this.communityId) { - _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("Html Project Report Page: " + message, error); - } -} diff --git a/landingPages/htmlProjectReport/htmlProjectReport.module.ts b/landingPages/htmlProjectReport/htmlProjectReport.module.ts deleted file mode 100644 index f80a1974..00000000 --- a/landingPages/htmlProjectReport/htmlProjectReport.module.ts +++ /dev/null @@ -1,30 +0,0 @@ -//import {MaterialModule} from '@angular/material'; -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { ProjectServiceModule} from '../project/projectService.module'; - - -import {HtmlProjectReportService} from './htmlProjectReport.service'; -import {HtmlProjectReportComponent} from './htmlProjectReport.component'; -import {PiwikServiceModule} from '../../utils/piwik/piwikService.module'; -import { SEOServiceModule } from '../../sharedComponents/SEO/SEOService.module'; -import {HelperModule} from "../../utils/helper/helper.module"; -import {RouterModule} from '@angular/router'; - -@NgModule({ - imports: [ - CommonModule, FormsModule, ProjectServiceModule, PiwikServiceModule, SEOServiceModule, HelperModule, - RouterModule - ], - declarations: [ - HtmlProjectReportComponent - ], - providers:[ - HtmlProjectReportService - ], - exports: [ - HtmlProjectReportComponent - ] -}) -export class HtmlProjectReportModule { }