diff --git a/claims/claim-utils/service/searchOrcid.service.ts b/claims/claim-utils/service/searchOrcid.service.ts index 208ce16e..892dc77d 100644 --- a/claims/claim-utils/service/searchOrcid.service.ts +++ b/claims/claim-utils/service/searchOrcid.service.ts @@ -21,14 +21,38 @@ export class SearchOrcidService { let url = properties.searchOrcidURL + term + '/record'; return this.http.get(url, { headers: headers }) - //.map(res => res.json()['person']) - .pipe(map(res => res['person'])) - .pipe(map(res => [res['name']['given-names'], - res['name']['family-name'], - res['name']])) - .pipe(map(res => SearchOrcidService.parseOrcidAuthor(res, authorIds, authors, addId))); - } + //.map(res => res.json()['person']) + .pipe(map(res => res['person'])) + .pipe(map(res => [res['name']['given-names'], + res['name']['family-name'], + res['name'], res['name']['institution-name']])) + .pipe(map(res => SearchOrcidService.parseOrcidAuthor(res, authorIds, authors, addId))); + } + searchOrcidSingleAuthor(term: string, properties: EnvProperties, addId): any { + + //var headers = new Headers(); + //headers.append('Accept', 'application/orcid+json'); + let headers = new HttpHeaders({'Accept': 'application/orcid+json'}); + + let url ="https://pub.orcid.org/v3.0/expanded-search/?q=orcid:" + term + '&start=0&rows=50'; + return this.http.get(url, {headers: headers}) + .pipe(map(res => res['expanded-result'])) + .pipe(map(res => { + if(res) { + for (let auth_result of res) { + const author = {}; + author['id'] = auth_result['orcid-id']; + author['authorGivenName'] = auth_result['given-names']; + author['authorFamilyName'] = auth_result['family-names']; + author['institutions'] = auth_result['institution-name']; + return author; + } + } + return null; + + })); + } searchOrcidAuthors(term: string, properties: EnvProperties): any { @@ -45,17 +69,46 @@ export class SearchOrcidService { } + searchOrcidAuthorsNew(term: string, + properties: EnvProperties, size = 10): any { + let headers = new HttpHeaders({'Accept': 'application/orcid+json'}); + // let url = properties.searchOrcidURL+'search?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'; + let url = /*properties.searchOrcidURL +*/ 'https://pub.orcid.org/v3.0/expanded-search?q=' + StringUtils.URIEncode('{!edismax qf="given-and-family-names^50.0 family-name^10.0 given-names^10.0 credit-name^10.0 other-names^5.0 text^1.0" pf="given-and-family-names^50.0" bq="current-institution-affiliation-name:[* TO *]^100.0 past-institution-affiliation-name:[* TO *]^70" mm=1}') + term + '&start=0&rows=' + size; + // given-and-family-names^50.0 family-name^10.0 given-names^10.0 credit-name^10.0 other-names^5.0 text^1.0" pf="given-and-family-names^50.0" bq="current-institution-affiliation-name:[* TO *]^100.0 past-institution-affiliation-name:[* TO *]^70" mm=1} + // https://pub.orcid.org/v3.0/expanded-search/?q=%7B!edismax%20qf%3D%22given-and-family-names%5E50.0%20family-name%5E10.0%20given-names%5E10.0%20credit-name%5E10.0%20other-names%5E5.0%20text%5E1.0%22%20pf%3D%22given-and-family-names%5E50.0%22%20bq%3D%22current-institution-affiliation-name%3A%5B*%20TO%20*%5D%5E100.0%20past-institution-affiliation-name%3A%5B*%20TO%20*%5D%5E70%22%20mm%3D1%7Dpaolo%20manghi&start=0&rows=50 + + //q={!edismax qf="given-and-family-names^50.0 family-name^10.0 given-names^5.0 credit-name^10.0 other-names^5.0 text^1.0" pf="given-and-family-names^50.0" mm=1}alessia bardi&start=0&rows=10 + let key = url; + return this.http.get(url, {headers: headers}) + .pipe(map(res => res['expanded-result'])) + .pipe(map(res => { + let authors = []; + if(res) { + for (let auth_result of res) { + const author = {}; + author['id'] = auth_result['orcid-id']; + author['authorGivenName'] = auth_result['given-names']; + author['authorFamilyName'] = auth_result['family-names']; + author['institutions'] = auth_result['institution-name']; + authors.push(author); + } + } + return authors; + + })); + } searchOrcidPublications(id: string, properties: EnvProperties, parse: boolean = false): any { let headers = new HttpHeaders({'Accept': 'application/orcid+json'}); let url = properties.searchOrcidURL + id + '/works'; - return this.http.get(url, { headers: headers }) - .pipe(map(res => res['group'])) - .pipe(map(request => (parse ? SearchOrcidService.parse(id, request) : request))); - } + return this.http.get(url, { headers: headers }) + .pipe(map(res => res['group'])) + .pipe(map(request => (parse ? SearchOrcidService.parse(id, request) : request))); + } static parseOrcidAuthor(data: any, authorIds: string[], authors, addId): any { + console.log(data) if (data[2] != null) { if (addId) { authorIds.push(data[2].path); @@ -72,7 +125,12 @@ export class SearchOrcidService { } else { author['authorFamilyName'] = ""; } + if (data[3] != null) { + author['institution'] = data[3]; + } + console.log(author['institution']) authors.push(author); + return true; } return false; diff --git a/claims/claim-utils/service/searchOrcidService.module.ts b/claims/claim-utils/service/searchOrcidService.module.ts new file mode 100644 index 00000000..64b31c1d --- /dev/null +++ b/claims/claim-utils/service/searchOrcidService.module.ts @@ -0,0 +1,19 @@ +import { NgModule} from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; +import {SearchOrcidService} from "./searchOrcid.service"; + + +@NgModule({ + imports: [ + CommonModule, FormsModule + ], + declarations: [ + ], + providers:[ + SearchOrcidService +], + exports: [ + ] +}) +export class SearchOrcidServiceModule { } diff --git a/claims/claimsAdmin/claimsAdmin.component.ts b/claims/claimsAdmin/claimsAdmin.component.ts index 8b142399..d1240a38 100644 --- a/claims/claimsAdmin/claimsAdmin.component.ts +++ b/claims/claimsAdmin/claimsAdmin.component.ts @@ -37,7 +37,6 @@ export class ClaimsAdminComponent { @Input() isConnect: boolean = false; @Input() externalPortalUrl: string; @Input() claimsInfoURL: string; - @Input() userInfoURL: string; public user: User = null; sub; diff --git a/claims/directLinking/directLinking.component.ts b/claims/directLinking/directLinking.component.ts index 229558ea..3fcd7537 100644 --- a/claims/directLinking/directLinking.component.ts +++ b/claims/directLinking/directLinking.component.ts @@ -29,7 +29,7 @@ export class DirectLinkingComponent { // linkTo: string = null; // entity type (project or context or entity) // linkToEntities: string[] = []; showOptions:ShowOptions = new ShowOptions(); - validEntityTypes = ["dataset", "publication", "software", "orp", "project", "context"]; + validEntityTypes = ["dataset", "publication", "software", "other", "project", "context"]; sources: ClaimEntity[] = []; inlineEntity: ClaimEntity = null; validInput: boolean = null;//'true; @@ -74,7 +74,7 @@ export class DirectLinkingComponent { this.getResearchResultById("dataset", this.id); } else if (this.type == "software") { this.getResearchResultById("software", this.id); - } else if (this.type == "orp") { + } else if (this.type == "other") { this.getResearchResultById("other", this.id); } else { this.validInput = this.isValidInput(null); @@ -110,9 +110,9 @@ export class DirectLinkingComponent { return false; } else if (this.type == "project" && this.showOptions.linkTo != "result") { return false; - } else if (["dataset", "publication", "software", "orp"].indexOf(this.type) != -1 && (["project", "context", "result"].indexOf(this.showOptions.linkTo) == -1)) { + } else if (["dataset", "publication", "software", "other"].indexOf(this.type) != -1 && (["project", "context", "result"].indexOf(this.showOptions.linkTo) == -1)) { return false; - } else if (["project", "dataset", "publication", "software", "orp"].indexOf(this.type) == -1) { + } else if (["project", "dataset", "publication", "software", "other"].indexOf(this.type) == -1) { return false; } else { return true; diff --git a/claims/linking/insertClaim/insertClaim.component.ts b/claims/linking/insertClaim/insertClaim.component.ts index a2be4b98..d9314aeb 100644 --- a/claims/linking/insertClaim/insertClaim.component.ts +++ b/claims/linking/insertClaim/insertClaim.component.ts @@ -16,6 +16,7 @@ import { import {UserManagementService} from "../../../services/user-management.service"; import {Subscriber, timer} from "rxjs"; import {map} from "rxjs/operators"; +import {LogService} from "../../../utils/log/log.service"; @Component({ selector: 'claim-insert', @@ -59,7 +60,7 @@ import {map} from "rxjs/operators"; }) export class ClaimInsertComponent { constructor(private claimService: ClaimsService, private _router: Router, private route: ActivatedRoute, - private userManagementService: UserManagementService) { + private userManagementService: UserManagementService, private _logService: LogService) { } subscriptions = []; ngOnDestroy() { @@ -127,6 +128,7 @@ export class ClaimInsertComponent { public feedRecordsJob; public claims2Insert; public records2Insert + infoToLog = []; public insert() { this.confirmOpen(); } @@ -145,6 +147,7 @@ export class ClaimInsertComponent { this.errorInClaims = []; this.insertedRecords = []; this.errorInRecords = []; + this.infoToLog = []; this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => { if (!user) { this.saveAndNavigate(); @@ -190,10 +193,11 @@ export class ClaimInsertComponent { } else if (entity.project) { claims.push(ClaimInsertComponent.createProjectClaim(result, entity, user.email, dashboard)); } - + this.infoToLog.push([ result.title?result.title: result.id, entity.title?entity.title:entity.id]); } if (this.inlineEntity) { + this.infoToLog.push([ this.inlineEntity.title?this.inlineEntity.title: this.inlineEntity.id, entity.title?entity.title:entity.id]); if (this.inlineEntity.result) { if (entity.result) { @@ -256,6 +260,12 @@ export class ClaimInsertComponent { data => { this.claims2Insert = claims.length; this.claimsJob = data.data; + if(this.properties.logServiceUrl) { + for(let info of this.infoToLog) { + this.subscriptions.push(this._logService.logLink(this.properties, info[0],info[1]).subscribe(res => { + })); + } + } this.saveLocalStorage(); let timerSubscription = timer(0, 10000).pipe( map(() => { @@ -375,7 +385,7 @@ export class ClaimInsertComponent { localStorage.removeItem(this.localStoragePrefix + "claimsJob"); localStorage.removeItem(this.localStoragePrefix + "feedRecordsJob"); - this._router.navigate(['/myclaims'], {queryParams: this.params}); + this._router.navigate([this.properties.myClaimsLink], {queryParams: this.params}); } } diff --git a/claims/linking/insertClaim/insertClaim.module.ts b/claims/linking/insertClaim/insertClaim.module.ts index 5b756a47..991ffc4a 100644 --- a/claims/linking/insertClaim/insertClaim.module.ts +++ b/claims/linking/insertClaim/insertClaim.module.ts @@ -6,10 +6,11 @@ import {LoadingModalModule} from '../../../utils/modal/loadingModal.module'; import {ClaimInsertComponent} from './insertClaim.component'; import {ClaimServiceModule} from '../../claim-utils/service/claimsService.module'; import {IconsModule} from "../../../utils/icons/icons.module"; +import {LogServiceModule} from "../../../utils/log/LogService.module"; @NgModule({ imports: [ - SharedModule, AlertModalModule, LoadingModalModule, ClaimServiceModule, IconsModule + SharedModule, AlertModalModule, LoadingModalModule, ClaimServiceModule, IconsModule, LogServiceModule ], declarations: [ClaimInsertComponent], exports:[ ClaimInsertComponent] diff --git a/claims/myClaims/myClaims.component.ts b/claims/myClaims/myClaims.component.ts index 5f2369df..5e6d8833 100644 --- a/claims/myClaims/myClaims.component.ts +++ b/claims/myClaims/myClaims.component.ts @@ -30,7 +30,6 @@ import {Subscriber} from "rxjs"; export class MyClaimsComponent { @Input() claimsInfoURL: string; @Input() communityId:string; - @Input() userInfoURL: string; public user: User = null; constructor(private userManagementService: UserManagementService, private _router: Router) {} diff --git a/connect/connectHelper.ts b/connect/connectHelper.ts index 14542fa2..18c60846 100644 --- a/connect/connectHelper.ts +++ b/connect/connectHelper.ts @@ -6,6 +6,9 @@ import {CommunityInfo} from "./community/communityInfo"; export class ConnectHelper { public static getCommunityFromDomain(domain: string): string{ + if(properties.dashboard === 'irish') { + return properties.adminToolsCommunity; + } if(properties.environment == "development" && (properties.adminToolsPortalType == "connect" || properties.adminToolsPortalType == "community" || properties.adminToolsPortalType == "aggregator" || properties.adminToolsPortalType == "eosc")) { diff --git a/dashboard/portal/portalHelper.ts b/dashboard/portal/portalHelper.ts index bc08cd2a..3f915e10 100644 --- a/dashboard/portal/portalHelper.ts +++ b/dashboard/portal/portalHelper.ts @@ -1,17 +1,18 @@ import {Option} from "../../sharedComponents/input/input.component"; -import {StakeholderEntities} from "../../monitor/entities/stakeholder"; +import {StakeholderConfiguration} from "../../monitor-admin/utils/indicator-utils"; -export class PortalUtils{ +export class PortalUtils { portalTypes: Option[] = [ {value: 'explore', label: 'Explore Portal'}, {value: 'connect', label: 'Connect portal'}, {value: 'monitor', label: 'Monitor portal'}, {value: 'community', label: 'Community Gateway'}, - {value: 'funder', label: StakeholderEntities.FUNDER + ' Dashboard'}, - {value: 'ri', label: StakeholderEntities.RI + ' Dashboard'}, - {value: 'organization', label: StakeholderEntities.ORGANIZATION + ' Dashboard'}, - {value: 'project', label: StakeholderEntities.PROJECT + ' Dashboard'} + {value: 'funder', label: StakeholderConfiguration.ENTITIES.funder + ' ' + StakeholderConfiguration.ENTITIES.stakeholder}, + {value: 'ri', label: StakeholderConfiguration.ENTITIES.ri + ' ' + StakeholderConfiguration.ENTITIES.stakeholder}, + {value: 'organization', label: StakeholderConfiguration.ENTITIES.organization + ' ' + StakeholderConfiguration.ENTITIES.stakeholder}, + {value: 'project', label: StakeholderConfiguration.ENTITIES.project + ' ' + StakeholderConfiguration.ENTITIES.stakeholder}, + {value: 'country', label: StakeholderConfiguration.ENTITIES.country + ' ' + StakeholderConfiguration.ENTITIES.stakeholder}, ]; } diff --git a/dashboard/sharedComponents/sidebar/layout.service.ts b/dashboard/sharedComponents/sidebar/layout.service.ts index 02754405..17657431 100644 --- a/dashboard/sharedComponents/sidebar/layout.service.ts +++ b/dashboard/sharedComponents/sidebar/layout.service.ts @@ -83,7 +83,11 @@ export class LayoutService { * Add hasStickyHeaderOnMobile: true in order to activate uk-sticky in header of mobile/tablet devices. * */ private hasStickyHeaderOnMobileSubject: BehaviorSubject = new BehaviorSubject(false); - + /** + * Add a class in root element of the html. (For different theme apply) + * Handle it manually in the component, it doesn't use data + * */ + private rootClassSubject: BehaviorSubject = new BehaviorSubject(null); private subscriptions: any[] = []; ngOnDestroy() { @@ -329,4 +333,14 @@ export class LayoutService { setHasStickyHeaderOnMobile(value: boolean) { this.hasStickyHeaderOnMobileSubject.next(value); } + + get rootClass(): Observable { + return this.rootClassSubject.asObservable(); + } + + setRootClass(value: string = null): void { + if(this.rootClassSubject.value != value) { + this.rootClassSubject.next(value); + } + } } diff --git a/dashboard/sharedComponents/sidebar/sideBar.component.html b/dashboard/sharedComponents/sidebar/sideBar.component.html index 9e772ea8..4d92e286 100644 --- a/dashboard/sharedComponents/sidebar/sideBar.component.html +++ b/dashboard/sharedComponents/sidebar/sideBar.component.html @@ -28,6 +28,9 @@ [class.hide-on-close]="backItem.icon">{{backItem.title}} +
    diff --git a/dashboard/sharedComponents/sidebar/sideBar.component.ts b/dashboard/sharedComponents/sidebar/sideBar.component.ts index 0610d6f3..6de0037e 100644 --- a/dashboard/sharedComponents/sidebar/sideBar.component.ts +++ b/dashboard/sharedComponents/sidebar/sideBar.component.ts @@ -28,6 +28,7 @@ export class SideBarComponent implements OnInit, AfterViewInit, OnDestroy, OnCha @Input() activeSubItem: string = ''; @Input() backItem: MenuItem = null; @Input() queryParamsHandling; + @Input() logoURL: string; @ViewChild("nav") nav: ElementRef; @ViewChild("sidebar_offcanvas") sidebar_offcanvas: ElementRef; public offset: number; diff --git a/dashboard/sharedComponents/sidebar/sidebar-base.component.ts b/dashboard/sharedComponents/sidebar/sidebar-base.component.ts new file mode 100644 index 00000000..0c2cd59f --- /dev/null +++ b/dashboard/sharedComponents/sidebar/sidebar-base.component.ts @@ -0,0 +1,48 @@ +import {ChangeDetectorRef, Directive, OnInit} from "@angular/core"; +import {BaseComponent} from "../../../sharedComponents/base/base.component"; +import {MenuItem} from "../../../sharedComponents/menu"; +import {LayoutService} from "./layout.service"; + +@Directive() +export class SidebarBaseComponent extends BaseComponent implements OnInit { + hasSidebar: boolean = false; + hasInternalSidebar: boolean = false; + hasAdminMenu: boolean = false; + /** + * Menu Items + * */ + sideBarItems: MenuItem[] = []; + adminMenuItems: MenuItem[] = []; + backItem: MenuItem = null; + + protected layoutService: LayoutService; + protected cdr: ChangeDetectorRef; + + constructor() { + super(); + } + + ngOnInit() { + this.subscriptions.push(this.layoutService.hasSidebar.subscribe(hasSidebar => { + this.hasSidebar = hasSidebar; + this.cdr.detectChanges(); + })); + this.subscriptions.push(this.layoutService.hasInternalSidebar.subscribe(hasInternalSidebar => { + this.hasInternalSidebar = hasInternalSidebar; + this.cdr.detectChanges(); + })); + this.subscriptions.push(this.layoutService.hasAdminMenu.subscribe(hasAdminMenu => { + this.hasAdminMenu = hasAdminMenu; + this.cdr.detectChanges(); + })); + this.layoutService.setOpen(true); + } + + public get open() { + return this.layoutService.open; + } + + public get hover() { + return this.layoutService.hover; + } +} diff --git a/dashboard/users/role-users/role-users.component.ts b/dashboard/users/role-users/role-users.component.ts index 665a8303..cb53ed14 100644 --- a/dashboard/users/role-users/role-users.component.ts +++ b/dashboard/users/role-users/role-users.component.ts @@ -8,14 +8,7 @@ import { SimpleChanges, ViewChild } from '@angular/core'; -import { - UntypedFormArray, - UntypedFormBuilder, - UntypedFormControl, - UntypedFormGroup, - ValidatorFn, - Validators -} from '@angular/forms'; +import {UntypedFormArray, UntypedFormBuilder, UntypedFormGroup, ValidatorFn, Validators} from '@angular/forms'; import {AlertModal} from "../../../utils/modal/alert"; import {UserRegistryService} from "../../../services/user-registry.service"; import {EnvProperties} from "../../../utils/properties/env-properties"; @@ -29,7 +22,6 @@ import {forkJoin, of, Subscription} from "rxjs"; import {NotificationHandler} from "../../../utils/notification-handler"; import {ClearCacheService} from "../../../services/clear-cache.service"; import {catchError, map, tap} from "rxjs/operators"; -import notification = CKEDITOR.plugins.notification; import {InputComponent} from "../../../sharedComponents/input/input.component"; class InvitationResponse { @@ -148,9 +140,8 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges { updateLists() { this.loadActive = true; this.loadPending = true; - this.subs.push(this.userRegistryService.getActive(this.type, this.id, this.role).subscribe(users => { + this.subs.push(this.userRegistryService.getActive(this.type, this.id, this.role, true).subscribe(users => { this.active = users; - // users.forEach(user => this.active.push(user)); this.filterActiveBySearch(this.filterForm.value.active); this.loadActive = false; this.exists = true; @@ -162,7 +153,7 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges { } this.loadActive = false; })); - this.subs.push(this.userRegistryService.getPending(this.type, this.id, this.role).subscribe(users => { + this.subs.push(this.userRegistryService.getPending(this.type, this.id, this.role, true).subscribe(users => { this.pending = users; this.filterPendingBySearch(this.filterForm.value.pending); this.loadPending = false; @@ -214,8 +205,8 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges { this.createRoleModal.okButtonLeft = false; this.createRoleModal.okButtonText = 'Create'; this.roleFb = this.fb.group({ - name: this.fb.control(Role.mapType(this.type) + '.' + this.id, Validators.required), - description: this.fb.control(Role.mapType(this.type) + ' ' + this.id, Validators.required) + name: this.fb.control(Role.roleName(this.type, this.id), Validators.required), + description: this.fb.control(Role.roleName(this.type, this.id), Validators.required) }); setTimeout(() => { this.roleFb.get('name').disable(); @@ -285,7 +276,7 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges { if (!this.pending.includes(response.email)) { this.pending.push(response.email); } - if(this.notificationFn) { + if(this.notificationFn && properties.notificationsAPIURL) { return this.notificationService.sendNotification(this.notificationFn(this.name, response.email, this.role, response.invitation)).pipe(map(notification => { return notification; }), tap(() => { diff --git a/dashboard/users/subscribers/subscribers.component.ts b/dashboard/users/subscribers/subscribers.component.ts index 0d0cd490..5b7976e7 100644 --- a/dashboard/users/subscribers/subscribers.component.ts +++ b/dashboard/users/subscribers/subscribers.component.ts @@ -105,7 +105,7 @@ export class SubscribersComponent implements OnInit, OnDestroy, OnChanges { updateList() { this.loading = true; - this.subs.push( this.userRegistryService.getActive(this.type, this.id, 'member').subscribe(users => { + this.subs.push( this.userRegistryService.getActive(this.type, this.id, 'member', true).subscribe(users => { this.subscribers = users; this.filterBySearch(this.filterForm.value.keyword); this.loading = false; diff --git a/deposit/depositFirstPage.component.ts b/deposit/depositFirstPage.component.ts index 4b8fa3e7..03704688 100644 --- a/deposit/depositFirstPage.component.ts +++ b/deposit/depositFirstPage.component.ts @@ -15,7 +15,7 @@ import {FullScreenModalComponent} from '../utils/modal/full-screen-modal/full-sc @Component({ selector: 'deposit-first-page', template: ` -
    +
    diff --git a/error-interceptor.service.ts b/error-interceptor.service.ts index 713949c3..701c6697 100644 --- a/error-interceptor.service.ts +++ b/error-interceptor.service.ts @@ -11,7 +11,7 @@ import * as url from "url"; @Injectable() export class ErrorInterceptorService implements HttpInterceptor { - private static UNAUTHORIZED_WHITELIST = [properties.userInfoUrl, properties.orcidAPIURL, properties.registryUrl? (properties.registryUrl + 'verification/'):null, properties.eoscDataTransferAPI].filter(value => !!value); + private static UNAUTHORIZED_WHITELIST = [properties.orcidAPIURL, properties.registryUrl? (properties.registryUrl + 'verification/'):null, properties.eoscDataTransferAPI].filter(value => !!value); private url: string = null; constructor(private router: Router) { diff --git a/landingPages/feedback/feedback.component.html b/landingPages/feedback/feedback.component.html index 837c76bc..9a569781 100644 --- a/landingPages/feedback/feedback.component.html +++ b/landingPages/feedback/feedback.component.html @@ -9,7 +9,8 @@ + [year]="resultLandingInfo.date" [embargoEndDate]="resultLandingInfo.embargoEndDate" + [publiclyFunded]="resultLandingInfo.publiclyFunded" [projects]="resultLandingInfo.fundedByProjects"> -
    +
    {{instance.types.join(" . ")}} . {{instance.years.join(" . ")}} + . + Peer-reviewed
    License: diff --git a/landingPages/landing-utils/entity-metadata.component.ts b/landingPages/landing-utils/entity-metadata.component.ts index caad8627..d9e0cf98 100644 --- a/landingPages/landing-utils/entity-metadata.component.ts +++ b/landingPages/landing-utils/entity-metadata.component.ts @@ -31,22 +31,20 @@ import {RouterHelper} from "../../utils/routerHelper.class"; - - - - - - - - - + + + + + + + {{entityType}} @@ -150,6 +148,9 @@ import {RouterHelper} from "../../utils/routerHelper.class"; Thematic + + Publicly funded + @@ -246,6 +247,7 @@ export class EntityMetadataComponent { @Input() type; // data provider landing @Input() provenanceAction: string; // search result @Input() relationName: string; // search result + @Input() publiclyFunded: boolean; // search result @Input() projects: Project[]; @Input() organizations: Organization[]; @Input() subjects: string[]; diff --git a/landingPages/landing-utils/entity-metadata.module.ts b/landingPages/landing-utils/entity-metadata.module.ts new file mode 100644 index 00000000..60fb36b3 --- /dev/null +++ b/landingPages/landing-utils/entity-metadata.module.ts @@ -0,0 +1,16 @@ +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {EntityMetadataComponent} from './entity-metadata.component'; +import {IconsModule} from '../../utils/icons/icons.module'; +import {AlertModalModule} from '../../utils/modal/alertModal.module'; +import {ShowPublisherModule} from "./showPublisher.module"; + +@NgModule({ + imports: [ + CommonModule, IconsModule, AlertModalModule, ShowPublisherModule + ], + declarations: [EntityMetadataComponent], + providers:[], + exports: [EntityMetadataComponent] +}) +export class EntityMetadataModule { } diff --git a/landingPages/landing-utils/landing-header/landing-header.component.ts b/landingPages/landing-utils/landing-header/landing-header.component.ts index adfe3268..649a6ec1 100644 --- a/landingPages/landing-utils/landing-header/landing-header.component.ts +++ b/landingPages/landing-utils/landing-header/landing-header.component.ts @@ -21,7 +21,7 @@ import {AlertModal} from "../../../utils/modal/alert"; [languages]="languages" [programmingLanguages]="programmingLanguages" [compatibility]="compatibility" [aggregationStatus]="aggregationStatus" [thematic]="thematic" [type]="type" [prevPath]="prevPath" - [countries]="countries" [projects]="projects" + [countries]="countries" [publiclyFunded]="publiclyFunded" [projects]="projects" >
    @@ -63,5 +63,6 @@ export class LandingHeaderComponent { @Input() type; // data provider landing @Input() prevPath: string = ""; @Input() countries; + @Input() publiclyFunded; @Input() projects; } diff --git a/landingPages/landing-utils/landing-header/landing-header.module.ts b/landingPages/landing-utils/landing-header/landing-header.module.ts index 9435afa8..2bca0be7 100644 --- a/landingPages/landing-utils/landing-header/landing-header.module.ts +++ b/landingPages/landing-utils/landing-header/landing-header.module.ts @@ -4,12 +4,12 @@ import {CommonModule} from "@angular/common"; import {LandingModule} from "../landing.module"; import {ShowAuthorsModule} from "../../../utils/authors/showAuthors.module"; import {IconsModule} from "src/app/openaireLibrary/utils/icons/icons.module"; -import {ShowPublisherModule} from "../showPublisher.module"; import {RouterModule} from "@angular/router"; import {ResultLandingUtilsModule} from "../resultLandingUtils.module"; +import {EntityMetadataModule} from "../entity-metadata.module"; @NgModule({ - imports: [CommonModule, LandingModule, ShowAuthorsModule, IconsModule, ShowPublisherModule, RouterModule, ResultLandingUtilsModule], + imports: [CommonModule, LandingModule, ShowAuthorsModule, IconsModule, RouterModule, ResultLandingUtilsModule, EntityMetadataModule], declarations: [LandingHeaderComponent], exports: [LandingHeaderComponent] }) diff --git a/landingPages/landing-utils/parsingFunctions.class.ts b/landingPages/landing-utils/parsingFunctions.class.ts index 112eb192..105c54cf 100644 --- a/landingPages/landing-utils/parsingFunctions.class.ts +++ b/landingPages/landing-utils/parsingFunctions.class.ts @@ -265,7 +265,8 @@ export class ParsingFunctions { "types": [], "years": [], "license": "", - "fulltext": "" + "fulltext": "", + "peerReviewed": null }; if (instance.hasOwnProperty("hostedby")) { @@ -358,6 +359,10 @@ export class ParsingFunctions { if(instance.hasOwnProperty("fulltext")) { available.fulltext = instance['fulltext']; } + + if(instance.hasOwnProperty("refereed") && instance.refereed.classname == "peerReviewed") { + available.peerReviewed = true; + } hostedBy_collectedFrom.push(available); } diff --git a/landingPages/landing-utils/resultLandingUtils.module.ts b/landingPages/landing-utils/resultLandingUtils.module.ts index 7ae62115..44a91f3c 100644 --- a/landingPages/landing-utils/resultLandingUtils.module.ts +++ b/landingPages/landing-utils/resultLandingUtils.module.ts @@ -9,7 +9,6 @@ import {ShowSubjectsComponent} from './showSubjects.component'; import {FundedByComponent} from './fundedBy.component'; import {AvailableOnComponent} from './availableOn.component'; import {TabTableComponent} from './tabTable.component'; -import {ShowPublisherComponent} from "./showPublisher.component"; import {ShowPublisherModule} from "./showPublisher.module"; import {RelatedToComponent} from "./relatedTo.component"; import {FosComponent} from "./fos.component"; @@ -17,13 +16,11 @@ import {SdgComponent} from "./sdg.component"; import {IconsModule} from "../../utils/icons/icons.module"; import {AlertModalModule} from "../../utils/modal/alertModal.module"; import { SearchInputModule } from '../../sharedComponents/search-input/search-input.module'; -import {EntityMetadataComponent} from "./entity-metadata.component"; import {IconsService} from "../../utils/icons/icons.service"; import {book, closed_access, cog, database, earth, open_access, unknown_access} from "../../utils/icons/icons"; import {FullScreenModalModule} from "../../utils/modal/full-screen-modal/full-screen-modal.module"; import {MobileDropdownModule} from "../../utils/mobile-dropdown/mobile-dropdown.module"; - @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, PagingModule, ShowPublisherModule, IconsModule, AlertModalModule, @@ -32,15 +29,14 @@ import {MobileDropdownModule} from "../../utils/mobile-dropdown/mobile-dropdown. declarations: [ ShowIdentifiersComponent,ShowSubjectsComponent, FundedByComponent,AvailableOnComponent,TabTableComponent, - RelatedToComponent, FosComponent, SdgComponent, - EntityMetadataComponent + RelatedToComponent, FosComponent, SdgComponent ], providers:[ ], exports: [ ShowIdentifiersComponent, ShowSubjectsComponent, - FundedByComponent,AvailableOnComponent, TabTableComponent, ShowPublisherComponent, - RelatedToComponent, FosComponent, SdgComponent, EntityMetadataComponent + FundedByComponent,AvailableOnComponent, TabTableComponent, + RelatedToComponent, FosComponent, SdgComponent ] }) export class ResultLandingUtilsModule { diff --git a/landingPages/result/deletedByInference/deletedByInference.component.ts b/landingPages/result/deletedByInference/deletedByInference.component.ts index 69a47dab..30ebb017 100644 --- a/landingPages/result/deletedByInference/deletedByInference.component.ts +++ b/landingPages/result/deletedByInference/deletedByInference.component.ts @@ -27,7 +27,7 @@ import {HelperFunctions} from "../../../utils/HelperFunctions.class";
    diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html index b43476da..1d64f1f3 100644 --- a/landingPages/result/resultLanding.component.html +++ b/landingPages/result/resultLanding.component.html @@ -229,6 +229,7 @@ [publisher]="resultLandingInfo.publisher" [journal]="resultLandingInfo.journal" [languages]="resultLandingInfo.languages" [programmingLanguages]="resultLandingInfo.programmingLanguages" [prevPath]="prevPath" [countries]="resultLandingInfo.countries" + [publiclyFunded]="resultLandingInfo.publiclyFunded" [projects]="resultLandingInfo.fundedByProjects"> @@ -454,6 +455,29 @@
    + +
    +
    +
    +
    +
    +
    +
    Green
    +
    +
    +
    +
    {{resultLandingInfo.oaRoutes.oaColor}}
    +
    +
    +
    +
    +
    Published in a Diamond OA journal
    +
    +
    +
    +
    +
    @@ -540,6 +565,31 @@
    + +
    +
    + Access Routes +
    +
    +
    +
    +
    +
    +
    Green
    +
    +
    +
    +
    {{resultLandingInfo.oaRoutes.oaColor}}
    +
    +
    +
    +
    +
    Published in a Diamond OA journal
    +
    +
    +
    +
    +
    diff --git a/landingPages/result/resultLanding.service.ts b/landingPages/result/resultLanding.service.ts index d0f7060c..6c9b1d1d 100644 --- a/landingPages/result/resultLanding.service.ts +++ b/landingPages/result/resultLanding.service.ts @@ -142,6 +142,19 @@ export class ResultLandingService { this.resultLandingInfo.publisher = data[0].publisher; this.resultLandingInfo.description = this.parsingFunctions.parseDescription(data[0] && data[0].description ? data[0].description : []); this.resultLandingInfo.embargoEndDate = data[0].embargoenddate ? Dates.getDate(data[0].embargoenddate) : null; + + if(data[0].hasOwnProperty("publiclyfunded") && data[0].publiclyfunded) { + this.resultLandingInfo.publiclyFunded = data[0].publiclyfunded; + } + if((data[0].hasOwnProperty("isgreen") && data[0].isgreen) + || (data[0].hasOwnProperty("openaccesscolor") && data[0].openaccesscolor) + || (data[0].hasOwnProperty("isindiamondjournal") && data[0].isindiamondjournal)) { + this.resultLandingInfo.oaRoutes = { + "green": data[0].isgreen, + "oaColor": data[0].openaccesscolor, + "isInDiamondJournal":data[0].isindiamondjournal + }; + } } if (data[0]['bestaccessright'] && data[0]['bestaccessright'].hasOwnProperty("classname")) { @@ -325,11 +338,13 @@ export class ResultLandingService { if (this.resultLandingInfo.fos) { this.resultLandingInfo.fos.sort((a, b) => a.id.localeCompare(b.id)); } - this.resultLandingInfo.sdg = subjectResults[4]; - if (this.resultLandingInfo.sdg) { - this.resultLandingInfo.sdg.sort((a, b) => { - return HelperFunctions.sortSDGs(a, b); - }) + if(properties.dashboard != "irish") { + this.resultLandingInfo.sdg = subjectResults[4]; + if (this.resultLandingInfo.sdg) { + this.resultLandingInfo.sdg.sort((a, b) => { + return HelperFunctions.sortSDGs(a, b); + }) + } } // if(!this.resultLandingInfo.eoscSubjects) { diff --git a/login/user.component.ts b/login/user.component.ts index f95adf67..08497f70 100644 --- a/login/user.component.ts +++ b/login/user.component.ts @@ -27,7 +27,6 @@ export class UserComponent { public errorCode: string = ""; public redirectUrl: string = ""; public routerHelper: RouterHelper = new RouterHelper(); - public loginUrl; public properties: EnvProperties = properties; @Input() mainComponent = true; @@ -40,7 +39,6 @@ export class UserComponent { } ngOnInit() { - this.loginUrl = this.properties.loginUrl; if (typeof document !== 'undefined') { this.server = false; this.userManagementsService.updateUserInfo( () => { diff --git a/login/userMini.component.ts b/login/userMini.component.ts index e8293086..87029003 100644 --- a/login/userMini.component.ts +++ b/login/userMini.component.ts @@ -122,12 +122,8 @@ export class UserMiniComponent implements OnInit, OnChanges { public isAuthorized: boolean = false; @Input() public mobileView: boolean = false; public firstLetters: string = ""; - public server: boolean = true; public routerHelper: RouterHelper = new RouterHelper(); @Input() userMenuItems; - @Input() logInUrl; - @Input() logOutUrl; - @Input() cookieDomain; @Input() notificationConfiguration: NotificationConfiguration; @ViewChild('notificationsSidebar') notificationsSidebar: NotificationsSidebarComponent; public showNotifications = false; @@ -137,9 +133,6 @@ export class UserMiniComponent implements OnInit, OnChanges { } ngOnInit() { - if (typeof document !== 'undefined') { - this.server = false; - } this.initUser(); } diff --git a/login/utils/helper.class.ts b/login/utils/helper.class.ts index 8fdd6229..92c2a62e 100644 --- a/login/utils/helper.class.ts +++ b/login/utils/helper.class.ts @@ -1,4 +1,5 @@ -import {stakeholderTypes} from "../../monitor/entities/stakeholder"; +import {StakeholderConfiguration} from "../../monitor-admin/utils/indicator-utils"; + export class User { email: string; @@ -9,6 +10,7 @@ export class User { expirationDate: number; role: string[]; accessToken?: string; + orcid?: string; refreshToken?: string; constructor(info: any) { @@ -22,6 +24,9 @@ export class User { if(info.refreshToken) { this.refreshToken = info.refreshToken; } + if(info.orcid) { + this.orcid = info.orcid; + } this.fullname = (info.name) ? info.name : ""; if (this.fullname == "") { if (this.firstname != "") { @@ -37,7 +42,7 @@ export class User { this.role = []; if (info.roles) { info.roles.forEach(role => { - this.role.push(role); + this.role.push(decodeURIComponent(role).replace('$$', '::')); }); } else { if (info.edu_person_entitlements) { @@ -63,21 +68,32 @@ export class Session { var cookie = COOKIE.getCookie(COOKIE.cookieName_id); return (cookie != null && cookie != ""); } - + public static clearReloadUrl() { + COOKIE.setCookie("reloadURLs", JSON.stringify([]), -1); + } public static setReloadUrl(host: string, path: string, params: string, fragment: string) { - var URL = {}; + let URLs:any[] = this.getReloadUrl(); + let URL = {}; URL["host"] = host; URL["path"] = path; URL["params"] = params; URL["fragment"] = fragment; - COOKIE.setCookie("reloadURL", JSON.stringify(URL), -1); + URLs.push(URL); + COOKIE.setCookie("reloadURLs", JSON.stringify(URLs), -1); } public static getReloadUrl() { - var URL = COOKIE.getCookie("reloadURL"); - URL = JSON.parse(URL); - return URL; + let URLs = COOKIE.getCookie("reloadURLs"); + let array = JSON.parse(URLs); + return array?array:[]; + } + public static popReloadUrl() { + let array = this.getReloadUrl(); + let Url = array.length>0?array[0]:null; + COOKIE.setCookie("reloadURLs", JSON.stringify(array.slice(1)), -1); + return Url; + } public static getParamsObj(params: string) { @@ -100,7 +116,7 @@ export class Session { } public static isMonitorCurator(user: User): boolean { - return stakeholderTypes.filter(stakeholderType => this.isTypeCurator(stakeholderType.value, user)).length > 0; + return StakeholderConfiguration.TYPES.filter(stakeholderType => this.isTypeCurator(stakeholderType.value, user)).length > 0; } public static isCommunityCurator(user: User): boolean { @@ -112,7 +128,7 @@ export class Session { } public static isCurator(type: string, user: User): boolean { - return (type === 'community' || stakeholderTypes.find(stakeholderType => stakeholderType.value == type)) && this.isTypeCurator(type, user); + return (type === 'community' || StakeholderConfiguration.TYPES.find(stakeholderType => stakeholderType.value == type)) && this.isTypeCurator(type, user); } public static isPortalAdministrator(user: User): boolean { @@ -206,20 +222,24 @@ export class COOKIE { } export class Role { + public static GROUP = ''; public static PORTAL_ADMIN = 'PORTAL_ADMINISTRATOR'; public static REGISTERED_USER = 'REGISTERED_USER'; public static ANONYMOUS_USER = 'ROLE_ANONYMOUS'; public static USER_MANAGER = 'USER_MANAGER'; public static CURATOR_CLAIM = 'CURATOR_CLAIM'; - - + + public static roleName(type: string, id: string) { + return this.GROUP + this.mapType(type) + '.' + id; + } + public static mapType(type: string, communityMap: boolean = true): string { if (type == "ri" && communityMap) { type = "community"; } else if (type == "organization") { type = "institution"; } - return type; + return Role.GROUP + type; } /** diff --git a/monitor-admin/general/edit-stakeholder/edit-stakeholder.component.ts b/monitor-admin/general/edit-stakeholder/edit-stakeholder.component.ts index f84f197d..72be3c8a 100644 --- a/monitor-admin/general/edit-stakeholder/edit-stakeholder.component.ts +++ b/monitor-admin/general/edit-stakeholder/edit-stakeholder.component.ts @@ -1,11 +1,8 @@ -import {Component, Input, OnDestroy, ViewChild} from "@angular/core"; +import {Component, Input, ViewChild} from "@angular/core"; import {Stakeholder} from "../../../monitor/entities/stakeholder"; import {UntypedFormBuilder, UntypedFormGroup, Validators} from "@angular/forms"; -import {StakeholderUtils} from "../../utils/indicator-utils"; import {Option} from "../../../sharedComponents/input/input.component"; import {Subscription} from "rxjs"; -import {EnvProperties} from "../../../utils/properties/env-properties"; -import {properties} from "src/environments/environment"; import {StakeholderService} from "../../../monitor/services/stakeholder.service"; import {UtilitiesService} from "../../../services/utilities.service"; import {Role, Session, User} from "../../../login/utils/helper.class"; @@ -16,121 +13,132 @@ import {NotificationUtils} from "../../../notifications/notification-utils"; import {Notification} from "../../../notifications/notifications"; import {NotificationHandler} from "../../../utils/notification-handler"; import {StatsProfilesService} from "../../utils/services/stats-profiles.service"; +import {StakeholderBaseComponent} from "../../utils/stakeholder-base.component"; @Component({ selector: 'edit-stakeholder', template: ` -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    +
    + +
    +
    +
    +
    +
    +
    -
    +
    - -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    - OR +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +     +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    + OR +
    +
    -
    +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    {{uploadError}}
    -
    -
    - -
    -
    - -
    -
    - +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    - -
    {{uploadError}}
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -     -
    - -
    + +
    +
    `, styleUrls: ['edit-stakeholder.component.less'] }) -export class EditStakeholderComponent implements OnDestroy { +export class EditStakeholderComponent extends StakeholderBaseComponent { @Input() public disableAlias: boolean = false; public stakeholderFb: UntypedFormGroup; public secure: boolean = false; - public stakeholderUtils: StakeholderUtils = new StakeholderUtils(); public defaultStakeholdersOptions: Option[]; public defaultStakeholders: Stakeholder[]; public alias: string[]; @@ -138,10 +146,8 @@ export class EditStakeholderComponent implements OnDestroy { public isDefault: boolean; public isNew: boolean; public loading: boolean = false; - public types: Option[]; + public typesByRole: Option[]; public statsProfiles: string[]; - public properties: EnvProperties = properties; - private subscriptions: any[] = []; /** * Photo upload * */ @@ -153,21 +159,26 @@ export class EditStakeholderComponent implements OnDestroy { user: User; @ViewChild('notify', {static: true}) notify: NotifyFormComponent; private notification: Notification; - + constructor(private fb: UntypedFormBuilder, private stakeholderService: StakeholderService, private statsProfileService: StatsProfilesService, private utilsService: UtilitiesService, private userManagementService: UserManagementService,) { + super(); } - + ngOnDestroy() { this.reset(); + super.ngOnDestroy(); } - + public init(stakeholder: Stakeholder, alias: string[], defaultStakeholders: Stakeholder[], isDefault: boolean, isNew: boolean) { this.reset(); this.deleteCurrentPhoto = false; this.stakeholder = stakeholder; + if (this.stakeholderUtils.defaultValue(this.stakeholderUtils.visibilities)) { + this.stakeholder.visibility = this.stakeholderUtils.defaultValue(this.stakeholderUtils.visibilities); + } this.alias = alias; this.defaultStakeholders = defaultStakeholders; this.isDefault = isDefault; @@ -183,7 +194,7 @@ export class EditStakeholderComponent implements OnDestroy { } else { this.statsProfiles = []; } - this.types = this.stakeholderUtils.getTypesByUserRoles(this.user, this.stakeholder.alias); + this.typesByRole = this.stakeholderUtils.getTypesByUserRoles(this.user, this.stakeholder.alias); this.stakeholderFb = this.fb.group({ _id: this.fb.control(this.stakeholder._id), defaultId: this.fb.control(this.stakeholder.defaultId), @@ -191,21 +202,22 @@ export class EditStakeholderComponent implements OnDestroy { description: this.fb.control(this.stakeholder.description), index_name: this.fb.control(this.stakeholder.index_name, Validators.required), index_id: this.fb.control(this.stakeholder.index_id, Validators.required), - index_shortName: this.fb.control(this.stakeholder.index_shortName, Validators.required), + index_shortName: this.fb.control(this.stakeholder.index_shortName), statsProfile: this.fb.control(this.stakeholder.statsProfile, Validators.required), locale: this.fb.control(this.stakeholder.locale, Validators.required), projectUpdateDate: this.fb.control(this.stakeholder.projectUpdateDate), creationDate: this.fb.control(this.stakeholder.creationDate), alias: this.fb.control(this.stakeholder.alias, - [ - Validators.required, - this.stakeholderUtils.aliasValidatorString( - this.alias.filter(alias => alias !== this.stakeholder.alias) - )] + [ + Validators.required, + this.stakeholderUtils.aliasValidatorString( + this.alias.filter(alias => alias !== this.stakeholder.alias) + )] ), isDefault: this.fb.control((this.isDefault)), visibility: this.fb.control(this.stakeholder.visibility, Validators.required), type: this.fb.control(this.stakeholder.type, Validators.required), + funderType: this.fb.control(this.stakeholder.funderType), topics: this.fb.control(this.stakeholder.topics), isUpload: this.fb.control(this.stakeholder.isUpload), logoUrl: this.fb.control(this.stakeholder.logoUrl), @@ -234,7 +246,7 @@ export class EditStakeholderComponent implements OnDestroy { this.subscriptions.push(this.stakeholderFb.get('type').valueChanges.subscribe(value => { this.onTypeChange(value, defaultStakeholders); })); - this.stakeholderFb.setControl('defaultId', this.fb.control(stakeholder.defaultId, (this.isDefault && !this.isNew)?[]:Validators.required)); + this.stakeholderFb.setControl('defaultId', this.fb.control(stakeholder.defaultId, (this.isDefault && !this.isNew) ? [] : Validators.required)); if (!this.isNew) { this.notification = NotificationUtils.editStakeholder(this.user.firstname + ' ' + this.user.lastname, this.stakeholder.name); this.notify.reset(this.notification.message); @@ -269,29 +281,29 @@ export class EditStakeholderComponent implements OnDestroy { } })); } - + public get isAdmin() { return Session.isPortalAdministrator(this.user); } - + public get isCurator() { return this.stakeholder && (this.isAdmin || Session.isCurator(this.stakeholder.type, this.user)); } - + public get disabled(): boolean { return (this.stakeholderFb && this.stakeholderFb.invalid) || - (this.stakeholderFb && this.stakeholderFb.pristine && !this.isNew && !this.file) || - (this.uploadError && this.uploadError.length > 0); + (this.stakeholderFb && this.stakeholderFb.pristine && !this.isNew && !this.file) || + (this.uploadError && this.uploadError.length > 0); } - + public get dirty(): boolean { return this.stakeholderFb && this.stakeholderFb.dirty; } - + public get canChooseTemplate(): boolean { return this.isNew && this.stakeholderFb.get('type').valid && !!this.defaultStakeholdersOptions; } - + reset() { this.uploadError = null; this.stakeholderFb = null; @@ -301,9 +313,9 @@ export class EditStakeholderComponent implements OnDestroy { } }); } - + onTypeChange(value, defaultStakeholders: Stakeholder[]) { - this.stakeholderFb.setControl('defaultId', this.fb.control(this.stakeholder.defaultId, (this.isDefault && !this.isNew)?[]:Validators.required)); + this.stakeholderFb.setControl('defaultId', this.fb.control(this.stakeholder.defaultId, (this.isDefault && !this.isNew) ? [] : Validators.required)); this.defaultStakeholdersOptions = [{ label: 'New blank profile', value: '-1' @@ -315,7 +327,7 @@ export class EditStakeholderComponent implements OnDestroy { }) }); } - + public save(callback: Function, errorCallback: Function = null) { this.loading = true; if (this.file) { @@ -335,14 +347,14 @@ export class EditStakeholderComponent implements OnDestroy { this.saveStakeholder(callback, errorCallback); } } - + public saveStakeholder(callback: Function, errorCallback: Function = null) { if (this.isNew) { let defaultStakeholder = this.defaultStakeholders.find(value => value._id === this.stakeholderFb.getRawValue().defaultId); this.stakeholderFb.setValue(this.stakeholderUtils.createFunderFromDefaultProfile(this.stakeholderFb.getRawValue(), - (defaultStakeholder ? defaultStakeholder.topics : []), this.stakeholderFb.getRawValue().isDefault)); + (defaultStakeholder ? defaultStakeholder.topics : []), this.stakeholderFb.getRawValue().isDefault)); this.removePhoto(); - if(this.stakeholderFb.getRawValue().isDefault) { + if (this.stakeholderFb.getRawValue().isDefault) { this.stakeholderFb.get('defaultId').setValue(null); } this.subscriptions.push(this.stakeholderService.buildStakeholder(this.properties.monitorServiceAPIURL, @@ -381,7 +393,7 @@ export class EditStakeholderComponent implements OnDestroy { })); } } - + fileChangeEvent(event) { if (event.target.files && event.target.files[0]) { this.file = event.target.files[0]; @@ -407,13 +419,13 @@ export class EditStakeholderComponent implements OnDestroy { } } } - + initPhoto() { if (this.stakeholderFb.getRawValue().isUpload) { this.photo = this.properties.utilsService + "/download/" + this.stakeholderFb.get('logoUrl').value; } } - + removePhoto() { if (this.file) { if (typeof document != 'undefined') { @@ -423,7 +435,7 @@ export class EditStakeholderComponent implements OnDestroy { this.file = null; } } - + remove() { this.stakeholderFb.get('isUpload').setValue(false); this.stakeholderFb.get('isUpload').markAsDirty(); @@ -433,11 +445,15 @@ export class EditStakeholderComponent implements OnDestroy { this.deleteCurrentPhoto = true; } } - + public deletePhoto() { if (this.stakeholder.logoUrl && this.stakeholder.isUpload) { this.subscriptions.push(this.utilsService.deletePhoto(this.properties.utilsService + '/delete/' + - encodeURIComponent(this.stakeholder.type) + "/" + encodeURIComponent(this.stakeholder.alias) + "/" + this.stakeholder.logoUrl).subscribe()); + encodeURIComponent(this.stakeholder.type) + "/" + encodeURIComponent(this.stakeholder.alias) + "/" + this.stakeholder.logoUrl).subscribe()); } } + + get showFunderType() { + return super.showFunderType && this.stakeholderFb?.get('type').value === 'funder' && !this.isDefault; + } } diff --git a/monitor-admin/general/general.component.ts b/monitor-admin/general/general.component.ts index 611032b4..fda34d94 100644 --- a/monitor-admin/general/general.component.ts +++ b/monitor-admin/general/general.component.ts @@ -1,29 +1,28 @@ -import {ChangeDetectorRef, Component, OnDestroy, OnInit, ViewChild} from "@angular/core"; +import {ChangeDetectorRef, Component, OnInit, ViewChild} from "@angular/core"; import {StakeholderService} from "../../monitor/services/stakeholder.service"; -import {EnvProperties} from "../../utils/properties/env-properties"; import {Stakeholder} from "../../monitor/entities/stakeholder"; -import { Subscription, zip} from "rxjs"; +import {zip} from "rxjs"; import {EditStakeholderComponent} from "./edit-stakeholder/edit-stakeholder.component"; -import {properties} from "src/environments/environment"; import {Title} from "@angular/platform-browser"; +import {BaseComponent} from "../../sharedComponents/base/base.component"; +import {ActivatedRoute} from "@angular/router"; @Component({ selector: 'general', templateUrl: "./general.component.html" }) -export class GeneralComponent implements OnInit, OnDestroy { - +export class GeneralComponent extends BaseComponent implements OnInit { public stakeholder: Stakeholder; public alias: string[]; - public properties: EnvProperties = properties; public defaultStakeholders: Stakeholder[]; public loading: boolean = false; - private subscriptions: any[] = []; @ViewChild('editStakeholderComponent') editStakeholderComponent: EditStakeholderComponent; constructor(private stakeholderService: StakeholderService, private cdr: ChangeDetectorRef, - private title: Title) { + protected _route: ActivatedRoute, + protected _title: Title) { + super(); } ngOnInit() { @@ -32,7 +31,8 @@ export class GeneralComponent implements OnInit, OnDestroy { this.stakeholder = stakeholder; this.cdr.detectChanges(); if(this.stakeholder) { - this.title.setTitle(this.stakeholder.name + " | General"); + this.title = this.stakeholder.name + " | General"; + this.setMetadata(); let data = zip( this.stakeholderService.getDefaultStakeholders(this.properties.monitorServiceAPIURL), this.stakeholderService.getAlias(this.properties.monitorServiceAPIURL) @@ -51,10 +51,9 @@ export class GeneralComponent implements OnInit, OnDestroy { this.editStakeholderComponent.init(this.stakeholder, this.alias, this.defaultStakeholders, this.stakeholder.defaultId == null, false) } - public save() { this.loading = true; - this.editStakeholderComponent.save((stakeholder) => { + this.editStakeholderComponent.save(stakeholder => { this.stakeholder = stakeholder; this.stakeholderService.setStakeholder(this.stakeholder); this.reset(); @@ -64,12 +63,4 @@ export class GeneralComponent implements OnInit, OnDestroy { this.loading = false; }); } - - ngOnDestroy() { - this.subscriptions.forEach(subscription => { - if(subscription instanceof Subscription) { - subscription.unsubscribe(); - } - }); - } } diff --git a/monitor-admin/manageStakeholders/manageStakeholders.component.html b/monitor-admin/manageStakeholders/manageStakeholders.component.html index 5b981cde..cf96dbc3 100644 --- a/monitor-admin/manageStakeholders/manageStakeholders.component.html +++ b/monitor-admin/manageStakeholders/manageStakeholders.component.html @@ -1,138 +1,173 @@
    -
    - -
    - - - - - +
    + +
    + + + + + +
    -
    -
    -
    -
    -
    -
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    -
    -
    -
    - -
    -
    -
    -
    -

    Profile Templates

    -
    - - - -
    - -
    -
    -
    -
    -

    - No profiles to manage yet -

    -
    -
    -

    Profiles

    -
    - - - -
    - + +
    +
    +
    +
    +
    +

    Profile Templates

    + + +
    +
    + + + +
    + +
    +
    +
    +
    +

    + No profiles to manage yet +

    +
    +
    +
    +

    Profiles

    + + +
    +
    + + + +
    + -
    -
    -
    -
    +
    +
    +
    +
    +
    -
    - - -
    - -
    -
    - {{text}} -
    -
    + +
    +
    + {{text}} +
    +
    -
    -
    -     +
    +
    +     -
    - -
    -
    - -
    + (alertOutput)="editStakeholderComponent.save(callback)" + (cancelOutput)="editStakeholderComponent.removePhoto()" + [okDisabled]="editStakeholderComponent.disabled"> +
    + +
    +
    + +
    -
    - -
    -
    - This stakeholder will permanently be deleted. Are you sure you want to proceed? -
    +
    + +
    +
    + This stakeholder will permanently be deleted. Are you sure you want to proceed? +
    diff --git a/monitor-admin/manageStakeholders/manageStakeholders.component.less b/monitor-admin/manageStakeholders/manageStakeholders.component.less index ee701579..ee7a7aaa 100644 --- a/monitor-admin/manageStakeholders/manageStakeholders.component.less +++ b/monitor-admin/manageStakeholders/manageStakeholders.component.less @@ -1,7 +1,8 @@ @import (reference) "~src/assets/openaire-theme/less/color.less"; +@import (optional) "~src/assets/extend-theme/less/color.less"; .setType(@color) { - border-bottom: 4px solid fade(@color, 30%); + border-bottom: 4px solid if(@color = none, none, fade(@color, 30%)); & .type { color: @color; @@ -20,4 +21,12 @@ &.organization { .setType(@organization-color); } + + &.country { + .setType(@country-color); + } + + &.datasource { + .setType(@datasource-color); + } } diff --git a/monitor-admin/manageStakeholders/manageStakeholders.component.ts b/monitor-admin/manageStakeholders/manageStakeholders.component.ts index 5e637b3e..22fd4ffe 100644 --- a/monitor-admin/manageStakeholders/manageStakeholders.component.ts +++ b/monitor-admin/manageStakeholders/manageStakeholders.component.ts @@ -1,9 +1,7 @@ import {Component, OnDestroy, OnInit, ViewChild} from "@angular/core"; import {StakeholderService} from "../../monitor/services/stakeholder.service"; -import {EnvProperties} from "../../utils/properties/env-properties"; -import {Stakeholder, StakeholderEntities, Visibility} from "../../monitor/entities/stakeholder"; -import {Subscriber, zip} from "rxjs"; -import {StakeholderUtils} from "../utils/indicator-utils"; +import {Stakeholder, Visibility} from "../../monitor/entities/stakeholder"; +import {zip} from "rxjs"; import {UntypedFormBuilder, UntypedFormGroup} from "@angular/forms"; import {AlertModal} from "../../utils/modal/alert"; import {Option} from "../../sharedComponents/input/input.component"; @@ -11,10 +9,10 @@ import {Title} from "@angular/platform-browser"; import {UserManagementService} from "../../services/user-management.service"; import {Session} from "../../login/utils/helper.class"; import {EditStakeholderComponent} from "../general/edit-stakeholder/edit-stakeholder.component"; -import {properties} from "src/environments/environment"; import {ActivatedRoute} from "@angular/router"; import {CacheIndicatorsService} from "../utils/cache-indicators/cache-indicators.service"; import {NotificationHandler} from "../../utils/notification-handler"; +import {StakeholderBaseComponent} from "../utils/stakeholder-base.component"; type Tab = 'all' | 'templates'| 'profiles'; @@ -25,12 +23,9 @@ declare var UIkit; templateUrl: "./manageStakeholders.component.html", styleUrls: ["./manageStakeholders.component.less"] }) -export class ManageStakeholdersComponent implements OnInit, OnDestroy { - - public properties: EnvProperties; +export class ManageStakeholdersComponent extends StakeholderBaseComponent implements OnInit, OnDestroy { public loading: boolean = true; public deleteLoading: boolean = false; - public stakeholderUtils: StakeholderUtils = new StakeholderUtils(); public defaultStakeholders: Stakeholder[]; public stakeholders: Stakeholder[]; public alias: string[]; @@ -38,26 +33,24 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { public index: number; public user = null; public tab: Tab = 'all'; + public currentPage: number = 1; + public currentTemplatesPage: number = 1; + public pageSize: number = 15; + public typeOptions: Option[]; /** * Filtered Stakeholders */ - public displayDefaultStakeholders: Stakeholder[]; - public displayStakeholders: Stakeholder[]; + public displayDefaultStakeholders: Stakeholder[] = []; + public displayStakeholders: Stakeholder[] = []; /** * Top filters */ public filters: UntypedFormGroup; - public all: Option = { - value: 'all', - label: 'All' - }; - public callback: Function; /** * Grid or List View */ - private subscriptions: any[] = []; @ViewChild('editStakeholderModal', { static: true }) editStakeholderModal: AlertModal; @ViewChild('deleteStakeholderModal', { static: true }) deleteStakeholderModal: AlertModal; @ViewChild('editStakeholderComponent', { static: true }) editStakeholderComponent: EditStakeholderComponent; @@ -65,15 +58,17 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { constructor(private stakeholderService: StakeholderService, private cacheIndicatorsService: CacheIndicatorsService, private userManagementService: UserManagementService, - private route: ActivatedRoute, - private title: Title, + protected _route: ActivatedRoute, + protected _title: Title, private fb: UntypedFormBuilder) { + super(); } ngOnInit(): void { + this.typeOptions = [{value: 'all', label: 'All'}].concat(this.stakeholderUtils.types); this.buildFilters(); - this.properties = properties; - this.title.setTitle('Manage profiles'); + this.title = 'Manage Profiles'; + this.setMetadata(); this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => { this.user = user; })); @@ -94,51 +89,42 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { })); } - ngOnDestroy(): void { - this.subscriptions.forEach(value => { - if (value instanceof Subscriber) { - value.unsubscribe(); - } else if (value instanceof Function) { - value(); - } - }); - } - hide(element: any) { UIkit.dropdown(element).hide(); } - private buildFilters() { this.filters = this.fb.group({ status: this.fb.control('all'), + type: this.fb.control('all'), keyword: this.fb.control('') }); this.subscriptions.push(this.filters.get('status').valueChanges.subscribe(value => { - this.onStatusChange(value); + this.filtering(); + })); + this.subscriptions.push(this.filters.get('type').valueChanges.subscribe(value => { + this.filtering(); })); this.subscriptions.push(this.filters.get('keyword').valueChanges.subscribe(value => { - this.onKeywordChange(value); + this.filtering(); })); } - onStatusChange(value) { - this.displayDefaultStakeholders = this.filterStatus(this.defaultStakeholders, value); - this.displayStakeholders = this.filterStatus(this.stakeholders, value); - } - - onKeywordChange(value) { - this.displayDefaultStakeholders = this.filterByKeyword(this.defaultStakeholders, value); - this.displayStakeholders = this.filterByKeyword(this.stakeholders, value); - } - - private filterStatus(stakeholders: Stakeholder[], value): Stakeholder[] { + private filterByStatus(stakeholders: Stakeholder[], value): Stakeholder[] { if (value === 'all') { return stakeholders; } else { return stakeholders.filter(stakeholder => stakeholder.visibility == value); } } + + private filterByType(stakeholders: Stakeholder[], value) { + if(value == 'all') { + return stakeholders; + } else { + return stakeholders.filter(item => item.type == value); + } + } private filterByKeyword(stakeholders: Stakeholder[], value): Stakeholder[] { if (!value) { @@ -153,6 +139,26 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { ); } } + + filtering() { + let keyword = this.filters.get('keyword').value; + let type = this.filters.get('type').value; + let status = this.filters.get('status').value; + let displayStakeholders = this.stakeholders; + let displayDefaultStakeholders = this.defaultStakeholders; + + displayStakeholders = this.filterByKeyword(displayStakeholders, keyword); + displayStakeholders = this.filterByType(displayStakeholders, type); + displayStakeholders = this.filterByStatus(displayStakeholders, status); + displayDefaultStakeholders = this.filterByKeyword(displayDefaultStakeholders, keyword); + displayDefaultStakeholders = this.filterByType(displayDefaultStakeholders, type); + displayDefaultStakeholders = this.filterByStatus(displayDefaultStakeholders, status); + + this.displayStakeholders = displayStakeholders; + this.displayDefaultStakeholders = displayDefaultStakeholders; + this.currentPage = 1; + this.currentTemplatesPage = 1; + } public editStakeholder(stakeholder: Stakeholder = null, isDefault: boolean = false) { if (isDefault) { @@ -193,6 +199,7 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { } this.alias.push(stakeholder.alias); this.editStakeholderModal.cancel(); + this.filtering(); }; this.editStakeholderModal.alertTitle = 'Create a new ' + (isDefault?'Default ':'') + 'Profile'; this.editStakeholderModal.okButtonText = 'Create'; @@ -244,6 +251,7 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { this.alias = this.alias.filter(item => item !== this.stakeholder.alias); this.deleteLoading = false; this.deleteStakeholderModal.cancel(); + this.filtering(); }, error => { UIkit.notification('An error has occurred. Please try again later', { status: 'danger', @@ -296,16 +304,11 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { ' or ' + this.stakeholderUtils.types[this.stakeholderUtils.types.length - 1].label } - private isTab(tab: Tab): boolean { - switch (tab) { - case "all": - return true; - case "profiles": - return true; - case "templates": - return true; - default: - return false; - } + public updateCurrentPage($event) { + this.currentPage = $event.value; + } + + public updateCurrentTemplatesPage($event) { + this.currentTemplatesPage = $event.value; } } diff --git a/monitor-admin/manageStakeholders/manageStakeholders.module.ts b/monitor-admin/manageStakeholders/manageStakeholders.module.ts index 41847068..5ea2b818 100644 --- a/monitor-admin/manageStakeholders/manageStakeholders.module.ts +++ b/monitor-admin/manageStakeholders/manageStakeholders.module.ts @@ -19,6 +19,7 @@ import { } from "../../dashboard/sharedComponents/sidebar/sidebar-mobile-toggle/sidebar-mobile-toggle.module"; import {SliderTabsModule} from "../../sharedComponents/tabs/slider-tabs.module"; import {EditStakeholderModule} from "../general/edit-stakeholder/edit-stakeholder.module"; +import {PagingModule} from "../../utils/paging.module"; @NgModule({ declarations: [ManageStakeholdersComponent], @@ -36,7 +37,8 @@ import {EditStakeholderModule} from "../general/edit-stakeholder/edit-stakeholde LogoUrlPipeModule, SearchInputModule, SidebarMobileToggleModule, - SliderTabsModule + SliderTabsModule, + PagingModule ], providers: [ PreviousRouteRecorder, diff --git a/monitor-admin/topic/indicators.component.html b/monitor-admin/topic/indicators.component.html index ecdc0cdb..e5723eb8 100644 --- a/monitor-admin/topic/indicators.component.html +++ b/monitor-admin/topic/indicators.component.html @@ -39,26 +39,28 @@
    - +
    • Edit
      • -
    • - -
    • - -
      - - {{v.label}} - -
      -       -
      • -       + +
    • + +
    • + +
      + + {{v.label}} + +
      +       +
      • +       +
    • Delete
      • @@ -136,26 +138,28 @@
      - +
      • Edit
        • -
      • - -
      • - -
        - - {{v.label}} - -
        -         -
        • -         + +
      • + +
      • + +
        + + {{v.label}} + +
        +         +
        • +         +
      • Delete
        • @@ -231,8 +235,8 @@
        -
        +
        @@ -346,8 +350,8 @@
        -
        +
        diff --git a/monitor-admin/topic/indicators.component.ts b/monitor-admin/topic/indicators.component.ts index 10e19b97..2d09461d 100644 --- a/monitor-admin/topic/indicators.component.ts +++ b/monitor-admin/topic/indicators.component.ts @@ -5,7 +5,6 @@ import { HostListener, Input, OnChanges, - OnDestroy, OnInit, SimpleChanges, ViewChild @@ -20,7 +19,6 @@ import { Stakeholder, Visibility } from "../../monitor/entities/stakeholder"; -import {IndicatorUtils, StakeholderUtils} from "../utils/indicator-utils"; import { AbstractControl, UntypedFormArray, @@ -34,7 +32,6 @@ import {StatisticsService} from "../utils/services/statistics.service"; import {HelperFunctions} from "../../utils/HelperFunctions.class"; import {DomSanitizer, SafeResourceUrl} from "@angular/platform-browser"; import {Reorder, StakeholderService} from "../../monitor/services/stakeholder.service"; -import {EnvProperties} from "../../utils/properties/env-properties"; import {Observable, Subscriber} from "rxjs"; import {LayoutService} from "../../dashboard/sharedComponents/sidebar/layout.service"; import {Router} from "@angular/router"; @@ -44,8 +41,9 @@ import {Notification} from "../../notifications/notifications"; import {NotificationUtils} from "../../notifications/notification-utils"; import {NotifyFormComponent} from "../../notifications/notify-form/notify-form.component"; import {NotificationService} from "../../notifications/notification.service"; -import {properties} from "src/environments/environment"; import {NotificationHandler} from "../../utils/notification-handler"; +import {IndicatorStakeholderBaseComponent} from "../utils/stakeholder-base.component"; +import {properties} from "../../../../environments/environment"; declare var UIkit; declare var copy; @@ -54,10 +52,9 @@ declare var copy; selector: 'indicators', templateUrl: './indicators.component.html' }) -export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterViewInit { +export class IndicatorsComponent extends IndicatorStakeholderBaseComponent implements OnInit, OnChanges, AfterViewInit { filesToUpload: Array; errorMessage = ""; - public properties: EnvProperties = properties; @Input() public topicIndex: number = 0; @Input() @@ -71,8 +68,6 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV @Input() public user: User = null; public preview: string; - public indicatorUtils: IndicatorUtils = new IndicatorUtils(); - public stakeholderUtils: StakeholderUtils = new StakeholderUtils(); public numberIndicatorFb: UntypedFormGroup; public chartIndicatorFb: UntypedFormGroup; public chartSections: UntypedFormArray; @@ -118,7 +113,6 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV /** * Subscriptions **/ - private subscriptions: any[] = []; private urlSubscriptions: any[] = []; private numberSubscription: any[] = []; @@ -127,9 +121,10 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV private statisticsService: StatisticsService, private notificationService: NotificationService, private fb: UntypedFormBuilder, - private router: Router, + protected _router: Router, private cdr: ChangeDetectorRef, private sanitizer: DomSanitizer) { + super() this.filesToUpload = []; } @@ -146,13 +141,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV } ngOnDestroy(): void { - this.subscriptions.forEach(value => { - if (value instanceof Subscriber) { - value.unsubscribe(); - } else if (value instanceof Function) { - value(); - } - }); + super.ngOnDestroy(); this.urlSubscriptions.forEach(value => { if (value instanceof Subscriber) { value.unsubscribe(); @@ -857,39 +846,42 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV this.setCharts(); this.setNumbers(); this.initReorder(); - this.notification = NotificationUtils.importIndicators(this.user.fullname, this.stakeholder.alias); - this.notification.entity = this.stakeholder.topics[this.topicIndex].categories[this.categoryIndex].subCategories[this.index]._id; - this.notification.name = this.user.firstname; - this.notification.surname = this.user.lastname; - this.notification.stakeholder = this.stakeholder.alias; - this.notification.stakeholderType = this.stakeholder.type; - this.notification.groups = [Role.curator(this.stakeholder.type)]; - if (this.stakeholder.defaultId) { - this.notification.groups.push(Role.manager(this.stakeholder.type, this.stakeholder.alias)); - this.notificationService.sendNotification(this.notification).subscribe(notification => { - UIkit.notification('A notification has been sent successfully', { - status: 'success', - timeout: 6000, - pos: 'bottom-right' - }); - }, error => { - UIkit.notification('An error has occurred. Please try again later', { - status: 'danger', - timeout: 6000, - pos: 'bottom-right' - }); - }); - } else { - this.stakeholderService.getStakeholders(this.properties.monitorServiceAPIURL, null, this.stakeholder._id).subscribe(stakeholders => { - stakeholders.forEach(value => { - this.notification.groups.push(Role.manager(value.type, value.alias)) - }); + if(properties.notificationsAPIURL) { + this.notification = NotificationUtils.importIndicators(this.user.fullname, this.stakeholder.alias); + this.notification.entity = this.stakeholder.topics[this.topicIndex].categories[this.categoryIndex].subCategories[this.index]._id; + this.notification.name = this.user.firstname; + this.notification.surname = this.user.lastname; + this.notification.stakeholder = this.stakeholder.alias; + this.notification.stakeholderType = this.stakeholder.type; + this.notification.groups = [Role.curator(this.stakeholder.type)]; + if (this.stakeholder.defaultId) { + this.notification.groups.push(Role.manager(this.stakeholder.type, this.stakeholder.alias)); this.notificationService.sendNotification(this.notification).subscribe(notification => { - NotificationHandler.rise('A notification has been sent successfully'); + UIkit.notification('A notification has been sent successfully', { + status: 'success', + timeout: 6000, + pos: 'bottom-right' + }); }, error => { - NotificationHandler.rise('An error has occurred. Please try again later', 'danger'); + UIkit.notification('An error has occurred. Please try again later', { + status: 'danger', + timeout: 6000, + pos: 'bottom-right' + }); }); - }); + } else { + this.stakeholderService.getStakeholders(this.properties.monitorServiceAPIURL, null, this.stakeholder._id).subscribe(stakeholders => { + stakeholders.forEach(value => { + this.notification.groups.push(Role.manager(value.type, value.alias)) + }); + + this.notificationService.sendNotification(this.notification).subscribe(notification => { + NotificationHandler.rise('A notification has been sent successfully'); + }, error => { + NotificationHandler.rise('An error has occurred. Please try again later', 'danger'); + }); + }); + } } this.editing = false; this.importLoading = false; @@ -1207,7 +1199,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV } private checkForSchemaEnhancements(url: string) { - this.showCheckForSchemaEnhancements = this.isAdministrator && url && !this.properties.useOldStatisticsSchema && this.indicatorUtils.checkForSchemaEnhancements(url); + this.showCheckForSchemaEnhancements = this.isAdministrator && url && !this.properties.useOldStatisticsSchema && this.indicatorUtils.checkForSchemaEnhancements(url) && this.properties.dashboard != 'irish'; } migrateFromOldImportJsonFile(charts) { @@ -1237,6 +1229,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV let duplicates = 0; charts = this.migrateFromOldImportJsonFile(charts); for (let chart of charts) { + chart.visibility = this.showVisibility?chart.visibility:this.stakeholderUtils.defaultValue(this.stakeholderUtils.visibilities); if (!sectionsToSave[chart['sectionIndex']]) { let sectionToSave = new Section(chart['sectionType'] ? chart['sectionType'] : chart['type'], chart['sectionTitle']); sectionToSave.indicators = []; @@ -1295,7 +1288,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV noValidParams++; } if (!exists) { - let i: Indicator = new Indicator(chart.name, chart.description, chart.additionalDescription, chart.type, chart.width, chart.height, "RESTRICTED", [indicatorPath]); + let i: Indicator = new Indicator(chart.name, chart.description, chart.additionalDescription, chart.type, chart.width, chart.height, this.showVisibility?"RESTRICTED":this.stakeholderUtils.defaultValue(this.stakeholderUtils.visibilities), [indicatorPath]); sectionsToSave[chart['sectionIndex']].indicators.push(i); countIndicators++; } @@ -1309,7 +1302,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV pos: 'bottom-right' }); } - if (noValidParams > 0) { + if (noValidParams > 0 && !(this.stakeholder.type == 'country')) { let noValidMessage = "Some indicators couldn't be generated properly. Please make sure chart data is for the current stakeholder."; if (this.stakeholder.defaultId == null) { noValidMessage = "Some indicators couldn't be generated properly. Stakeholders based on this profile may not inherit the data correctly."; @@ -1379,7 +1372,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV let topic = this.stakeholder ? this.stakeholder.topics[this.topicIndex] : null; let category = topic ? topic.categories[this.categoryIndex] : null; - let subCategory = category ? category.subCategories[this.subcategoryIndex] : null; + let subCategory = category ? category.subCategories[subcategoryIndex] : null; var jsonFileUrl = window.URL.createObjectURL(new Blob([JSON.stringify(indicators)], {type: 'application/json'})); var a = window.document.createElement('a'); diff --git a/monitor-admin/topic/topic.component.html b/monitor-admin/topic/topic.component.html index e11e98c5..46806ed5 100644 --- a/monitor-admin/topic/topic.component.html +++ b/monitor-admin/topic/topic.component.html @@ -9,6 +9,9 @@ Indicators
        +
        -
        -
        +
        +
        -
      • - + +
      • +
      • @@ -293,6 +301,7 @@
        • +
      • @@ -348,8 +357,8 @@
        -
        +
        diff --git a/monitor-admin/topic/topic.component.ts b/monitor-admin/topic/topic.component.ts index 57f65930..b178eb46 100644 --- a/monitor-admin/topic/topic.component.ts +++ b/monitor-admin/topic/topic.component.ts @@ -1,32 +1,32 @@ import { AfterViewInit, ChangeDetectorRef, - Component, Inject, + Component, + Inject, OnDestroy, - OnInit, PLATFORM_ID, + OnInit, + PLATFORM_ID, QueryList, ViewChild, ViewChildren } from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {Title} from '@angular/platform-browser'; -import {EnvProperties} from '../../utils/properties/env-properties'; import {Category, Stakeholder, SubCategory, Topic, Visibility} from "../../monitor/entities/stakeholder"; import {StakeholderService} from "../../monitor/services/stakeholder.service"; import {HelperFunctions} from "../../utils/HelperFunctions.class"; import {AlertModal} from "../../utils/modal/alert"; import {BehaviorSubject, Subject, Subscriber, Subscription} from "rxjs"; import {UntypedFormBuilder, UntypedFormGroup, Validators} from "@angular/forms"; -import {StakeholderUtils} from "../utils/indicator-utils"; import {StringUtils} from "../../utils/string-utils.class"; import {IDeactivateComponent} from "../../utils/can-exit.guard"; -import {LayoutService} from "../../dashboard/sharedComponents/sidebar/layout.service"; import {Option} from "../../sharedComponents/input/input.component"; import {properties} from "src/environments/environment"; import {Session, User} from "../../login/utils/helper.class"; import {UserManagementService} from "../../services/user-management.service"; import {TransitionGroupComponent} from "../../utils/transition-group/transition-group.component"; import {NotificationHandler} from "../../utils/notification-handler"; +import {StakeholderBaseComponent} from "../utils/stakeholder-base.component"; declare var UIkit; @@ -34,14 +34,12 @@ declare var UIkit; selector: 'topic', templateUrl: './topic.component.html', }) -export class TopicComponent implements OnInit, OnDestroy, AfterViewInit, IDeactivateComponent { +export class TopicComponent extends StakeholderBaseComponent implements OnInit, OnDestroy, AfterViewInit, IDeactivateComponent { private topicSubscriptions: any[] = []; - private subscriptions: any[] = []; - public properties: EnvProperties = properties; public offset: number; - public stakeholderUtils: StakeholderUtils = new StakeholderUtils(); public loading: boolean = false; public stakeholder: Stakeholder; + public showLogo: boolean = false; public user: User; /** * Stakeholder change event @@ -84,18 +82,21 @@ export class TopicComponent implements OnInit, OnDestroy, AfterViewInit, IDeacti }; constructor( - private route: ActivatedRoute, - private router: Router, - private title: Title, + protected _route: ActivatedRoute, + protected _router: Router, + protected _title: Title, private fb: UntypedFormBuilder, private stakeholderService: StakeholderService, private userManagementService: UserManagementService, - private layoutService: LayoutService, - private cdr: ChangeDetectorRef, + protected cdr: ChangeDetectorRef, @Inject(PLATFORM_ID) private platformId) { + super(); } public ngOnInit() { + if(this._route.snapshot.data?.showLogo === true) { + this.showLogo = true; + } if (typeof document !== "undefined") { this.offset = Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--header-height')); } @@ -115,7 +116,7 @@ export class TopicComponent implements OnInit, OnDestroy, AfterViewInit, IDeacti this.subCategoryIndex = index; }); })); - this.subscriptions.push(this.route.params.subscribe(params => { + this.subscriptions.push(this._route.params.subscribe(params => { if (subscription) { subscription.unsubscribe(); } @@ -136,7 +137,8 @@ export class TopicComponent implements OnInit, OnDestroy, AfterViewInit, IDeacti if (this.topicIndex === -1) { this.navigateToError(); } else { - this.title.setTitle(stakeholder.name + " | Indicators"); + this.title = stakeholder.name + " | Indicators" + this.setMetadata(); } } }); @@ -146,7 +148,7 @@ export class TopicComponent implements OnInit, OnDestroy, AfterViewInit, IDeacti this.user = user; })) } - + ngAfterViewInit() { if(this.topics) { let activeIndex = UIkit.nav(this.topics.element.nativeElement).items.findIndex(item => item.classList.contains('uk-open')); @@ -163,16 +165,12 @@ export class TopicComponent implements OnInit, OnDestroy, AfterViewInit, IDeacti } public ngOnDestroy() { + super.ngOnDestroy(); this.topicSubscriptions.forEach(value => { if (value instanceof Subscriber) { value.unsubscribe(); } }); - this.subscriptions.forEach(value => { - if (value instanceof Subscriber) { - value.unsubscribe(); - } - }); } canExit(): boolean { @@ -665,10 +663,6 @@ export class TopicComponent implements OnInit, OnDestroy, AfterViewInit, IDeacti }); } - private navigateToError() { - this.router.navigate([this.properties.errorLink], {queryParams: {'page': this.router.url}}); - } - get isCurator(): boolean { return Session.isPortalAdministrator(this.user) || Session.isCurator(this.stakeholder.type, this.user); } @@ -714,8 +708,8 @@ export class TopicComponent implements OnInit, OnDestroy, AfterViewInit, IDeacti this.editModal.cancel(); NotificationHandler.rise(message); if (redirect) { - this.router.navigate(['../' + saveElement.alias], { - relativeTo: this.route + this._router.navigate(['../' + saveElement.alias], { + relativeTo: this._route }); } }, error => { @@ -758,8 +752,8 @@ export class TopicComponent implements OnInit, OnDestroy, AfterViewInit, IDeacti } back() { - this.router.navigate(['../'], { - relativeTo: this.route + this._router.navigate(['../'], { + relativeTo: this._route }); } @@ -774,19 +768,6 @@ export class TopicComponent implements OnInit, OnDestroy, AfterViewInit, IDeacti return this.type; } } - - public get isSmallScreen() { - return this.layoutService.isSmallScreen; - } - - public get open() { - return this.layoutService.open; - } - - public toggleOpen(event: MouseEvent) { - event.preventDefault(); - this.layoutService.setOpen(!this.open); - } public openVisibilityModal(index: number, visibility: Visibility, type: any) { this.index = index; diff --git a/monitor-admin/utils/adminDashboard.guard.ts b/monitor-admin/utils/adminDashboard.guard.ts index 664fa7d3..9d645cba 100644 --- a/monitor-admin/utils/adminDashboard.guard.ts +++ b/monitor-admin/utils/adminDashboard.guard.ts @@ -8,12 +8,14 @@ import {StakeholderService} from "../../monitor/services/stakeholder.service"; import {Observable, zip} from "rxjs"; -@Injectable() +@Injectable({ + providedIn: 'root' +}) export class AdminDashboardGuard { - constructor(private router: Router, - private stakeholderService: StakeholderService, - private userManagementService: UserManagementService) { + constructor(protected router: Router, + protected stakeholderService: StakeholderService, + protected userManagementService: UserManagementService) { } check(path: string, alias: string): Observable | boolean { @@ -38,6 +40,6 @@ export class AdminDashboardGuard { } canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable | Promise | boolean | UrlTree { - return this.check(state.url, childRoute.params.stakeholder); + return this.check(state.url, childRoute.data?.stakeholder?childRoute.data.stakeholder:childRoute.params.stakeholder); } } diff --git a/monitor-admin/utils/indicator-utils.ts b/monitor-admin/utils/indicator-utils.ts index 4dae319c..7397b837 100644 --- a/monitor-admin/utils/indicator-utils.ts +++ b/monitor-admin/utils/indicator-utils.ts @@ -7,11 +7,9 @@ import { IndicatorPathType, IndicatorType, SourceType, - Stakeholder, - StakeholderEntities, - SubCategory, - Topic, stakeholderTypes, - Visibility + Stakeholder, SubCategory, + Topic, + Visibility, } from "../../monitor/entities/stakeholder"; import {AbstractControl, ValidatorFn, Validators} from "@angular/forms"; import {Option} from "../../sharedComponents/input/input.component"; @@ -19,35 +17,86 @@ import {Session} from "../../login/utils/helper.class"; import {HelperFunctions} from "../../utils/HelperFunctions.class"; import {properties} from "src/environments/environment"; -export class StakeholderUtils { - - statuses: Option[] = [ - {value: 'PUBLIC', label: 'Public'}, - {value: 'RESTRICTED', label: 'Restricted'}, - {value: 'PRIVATE', label: 'Private'} +class Entities { + stakeholder = 'Dashboard'; + funder = 'Funder'; + ri = 'Research Initiative'; + organization = 'Research Institution'; + project = 'Project'; + country = 'National'; + datasource = 'Repository'; + researcher = 'Researcher'; + + stakeholders = 'Dashboards'; + funders = 'Funders'; + ris = 'Research Initiatives'; + organizations = 'Research Institutions'; + projects = 'Projects'; + datasources = 'Repositories'; + researchers = 'Researchers'; +} + +export class StakeholderConfiguration { + public static ENTITIES: Entities = new Entities(); + public static TYPES: Option[] = [ + {value: 'funder', label: StakeholderConfiguration.ENTITIES.funder}, + {value: 'ri', label: StakeholderConfiguration.ENTITIES.ri}, + {value: 'organization', label: StakeholderConfiguration.ENTITIES.organization}, + {value: 'project', label: StakeholderConfiguration.ENTITIES.project} ]; - - types: Option[] = [ - ...stakeholderTypes + public static LOCALES: Option[] = [ + {value: "en", label: 'English'}, + {value: "eu", label: 'Europe'} ]; - - visibility: Option[] = [ + public static FUNDER_TYPES: Option[] = []; + public static VISIBILITIES: Option[] = [ {icon: 'earth', value: "PUBLIC", label: 'Public'}, {icon: 'restricted', value: "RESTRICTED", label: 'Restricted'}, {icon: 'incognito', value: "PRIVATE", label: 'Private'}, ]; - - locales: Option[] = [ - {value: "en", label: 'English'}, - {value: "eu", label: 'Europe'} - ]; - - visibilityIcon: Map = new Map([ - ["PUBLIC", 'earth'], - ["PRIVATE", 'incognito'], - ["RESTRICTED", 'restricted'] - ]); - + public static CACHE_INDICATORS: boolean = true; +} + +export class StakeholderUtils { + get entities() { + return StakeholderConfiguration.ENTITIES; + } + + get types() { + return StakeholderConfiguration.TYPES + } + + get funderTypes() { + return StakeholderConfiguration.FUNDER_TYPES; + } + + get locales() { + return StakeholderConfiguration.LOCALES; + } + + get visibilities() { + return StakeholderConfiguration.VISIBILITIES; + } + + get isCachingIndicators() { + return StakeholderConfiguration.CACHE_INDICATORS; + } + + visibilityIcon: Map = new Map(this.visibilities.map(option => [option.value, option.icon])); + + defaultValue(options: Option[]) { + return options.length === 1?options[0].value:null; + } + + showField(options: Option[]) { + return options.length > 1; + } + + getLabel(options: Option[], value) { + let option = options.find(option => option.value === value); + return option?option.label:null; + } + getTypesByUserRoles(user, id: string = null): Option[] { let types = []; for (let type of this.types) { @@ -57,7 +106,7 @@ export class StakeholderUtils { } return types; } - + public createFunderFromDefaultProfile(funder: Stakeholder, defaultTopics: Topic[], isDefault: boolean = false): Stakeholder { funder.topics = HelperFunctions.copy(defaultTopics); for (let topic of funder.topics) { @@ -105,36 +154,36 @@ export class StakeholderUtils { indicator._id = null; } } - + } category.subCategories = subTokeep; } } return funder; } - + aliasValidatorString(elements: string[]): ValidatorFn { return (control: AbstractControl): { [key: string]: string } | null => { if (control.value && elements.find(element => - element === control.value + element === control.value )) { return {'error': 'Alias already in use'}; } return null; } } - + aliasValidator(elements: any[]): ValidatorFn { return (control: AbstractControl): { [key: string]: string } | null => { if (control.value && elements.find(element => - element.alias === control.value + element.alias === control.value )) { return {'error': 'Alias already in use'}; } return null; } } - + generateAlias(name: string): string { let alias = name.toLowerCase(); while (alias.includes('/') || alias.includes(' ')) { @@ -147,7 +196,7 @@ export class StakeholderUtils { } export class IndicatorUtils { - + allChartTypes: Option[] = [ {value: 'pie', label: 'Pie'}, {value: 'table', label: 'Table'}, @@ -163,64 +212,64 @@ export class IndicatorUtils { {value: 'medium', label: 'Medium'}, {value: 'large', label: 'Large'} ]; - + allSourceTypes: Option[] = [ {value: 'search', label: 'Search'}, {value: 'statistics', label: 'Statistics'}, {value: 'stats-tool', label: 'Statistics tool'} ]; - + formats: Option[] = [ {value: "NUMBER", label: "Number"}, {value: "PERCENTAGE", label: "Percentage"} ]; - + sourceTypes: Option[] = [ {value: 'stats-tool', label: 'Statistics tool'} ]; - + isActive: Option[] = [ {icon: 'brightness_1', iconClass: '', value: true, label: 'Active'}, {icon: 'brightness_1', value: false, label: 'Inactive'}, ]; - + parametersValidators: Map = new Map([ ['start_year', [Validators.required, Validators.pattern('^\\d+$')]], ['end_year', [Validators.required, Validators.pattern('^\\d+$')]] ]); ignoredParameters = ['index_name', 'index_id', 'index_shortName']; statsProfileParameter = 'profile'; - + numberSources: Map = new Map(); chartSources: Map = new Map(); - + constructor() { this.numberSources.set('statistics', [properties.statisticsAPIURL]); this.numberSources.set('search', [properties.searchAPIURLLAst]); - this.numberSources.set('stats-tool', [properties.monitorStatsFrameUrl, "http://marilyn.athenarc.gr:8080/stats-api/", "http://88.197.53.71:8080/stats-api/", "https://stats.madgik.di.uoa.gr/stats-api/","https://beta.services.openaire.eu/stats-tool/","https://services.openaire.eu/stats-tool/","https://services.openaire.eu/monitor-stats-tool/"]); - this.chartSources.set('stats-tool', [properties.monitorStatsFrameUrl, "http://marilyn.athenarc.gr:8080/stats-api/", "http://88.197.53.71:8080/stats-api/", "https://stats.madgik.di.uoa.gr/stats-api/","https://beta.services.openaire.eu/stats-tool/","https://services.openaire.eu/stats-tool/","https://services.openaire.eu/monitor-stats-tool/"]); + this.numberSources.set('stats-tool', [properties.monitorStatsFrameUrl, "http://marilyn.athenarc.gr:8080/stats-api/", "http://88.197.53.71:8080/stats-api/", "https://stats.madgik.di.uoa.gr/stats-api/", "https://beta.services.openaire.eu/stats-tool/", "https://services.openaire.eu/stats-tool/", "https://services.openaire.eu/monitor-stats-tool/"]); + this.chartSources.set('stats-tool', [properties.monitorStatsFrameUrl, "http://marilyn.athenarc.gr:8080/stats-api/", "http://88.197.53.71:8080/stats-api/", "https://stats.madgik.di.uoa.gr/stats-api/", "https://beta.services.openaire.eu/stats-tool/", "https://services.openaire.eu/stats-tool/", "https://services.openaire.eu/monitor-stats-tool/"]); this.chartSources.set('old', [properties.statisticsFrameAPIURL]); this.chartSources.set('image', [""]); } - - getSourceType(source:string): SourceType{ + + getSourceType(source: string): SourceType { let sourceType: SourceType = 'search'; this.numberSources.forEach((values, key) => { - if(key == source) { + if (key == source) { sourceType = key; } }); return sourceType; } - + getChartUrl(source: SourceType, url: string): string { return this.chartSources.get(source)[0] + url; } - + getNumberUrl(source: SourceType, url: string): string { return this.numberSources.get(this.getSourceType(source))[0] + url; } - + getNumberSource(url: string): SourceType { let source: SourceType = 'search'; this.numberSources.forEach((values, key) => { @@ -232,7 +281,7 @@ export class IndicatorUtils { }); return source; } - + getChartSource(url: string): SourceType { let source: SourceType = 'image'; this.chartSources.forEach((values, key) => { @@ -244,7 +293,7 @@ export class IndicatorUtils { }); return source; } - + getChartTypes(initialType) { let types: Option[] = []; if (this.basicChartTypes.indexOf(initialType) != -1) { @@ -265,7 +314,7 @@ export class IndicatorUtils { return this.allChartTypes; } } - + public getFullUrl(stakeholder: Stakeholder, indicatorPath: IndicatorPath, fundingL0: string = null, startYear: string = null, endYear: string = null): string { let replacedUrl = indicatorPath.chartObject ? indicatorPath.chartObject : indicatorPath.url; if (stakeholder.statsProfile) { @@ -289,7 +338,7 @@ export class IndicatorUtils { if (key == "index_shortName") { replacedValue = stakeholder.index_shortName.toLowerCase(); } - + replacedUrl = replacedUrl.split(ChartHelper.prefix + key + ChartHelper.suffix).join(replacedValue) }); } @@ -307,7 +356,7 @@ export class IndicatorUtils { } if (startYear && indicatorPath.filters["start_year"]) { let newJsonObject = JSON.parse(replacedUrl); - + for (let queries of this.getQueryObjectName(newJsonObject) ? newJsonObject[this.getDescriptionObjectName(newJsonObject)][this.getQueryObjectName(newJsonObject)] : newJsonObject[this.getDescriptionObjectName(newJsonObject)]) { if (!queries["query"]["filters"] || queries["query"]["filters"].length == 0) { queries["query"]["filters"] = []; @@ -328,7 +377,7 @@ export class IndicatorUtils { } replacedUrl = JSON.stringify(newJsonObject); } - + } //For numbers (e.g. from stats-api , search service, etc) if (replacedUrl.indexOf(ChartHelper.prefix + 'index_id' + ChartHelper.suffix) != -1) { @@ -342,13 +391,72 @@ export class IndicatorUtils { } return (indicatorPath.chartObject ? indicatorPath.url + encodeURIComponent(replacedUrl) : replacedUrl); } - - public getFullUrlWithFilters(stakeholder: Stakeholder, indicatorPath: IndicatorPath, fundingL0: string = null, startYear: string = null, endYear: string = null, coFunded: boolean = false): string { + + public getFullUrlWithFilters(stakeholder: Stakeholder, indicatorPath: IndicatorPath, fundingL0: string = null, startYear: string = null, endYear: string = null, coFunded: boolean = false, foslvl1:string[]=[], foslvl2:string[]=[], publiclyFunded: "all"| "true"| "false"= "all" ): string { + let filterSubtitleText = []; indicatorPath.filtersApplied = 0; let replacedUrl = indicatorPath.chartObject ? indicatorPath.chartObject : indicatorPath.url; if (stakeholder.statsProfile) { replacedUrl = replacedUrl.split(ChartHelper.prefix + this.statsProfileParameter + ChartHelper.suffix).join(stakeholder.statsProfile); } + if (fundingL0) { + if (indicatorPath.source == "stats-tool" && indicatorPath.chartObject) { + let filterResults = this.addFilter(replacedUrl, 'fundingL0', fundingL0); + replacedUrl = filterResults.url; + indicatorPath.filtersApplied += filterResults.filtersApplied; + filterSubtitleText.push( "Funding level 0: " ) ; + } + } + if (startYear) { + if (indicatorPath.source == "stats-tool" && indicatorPath.chartObject) { + let filterResults = this.addFilter(replacedUrl, 'start_year', startYear); + replacedUrl = filterResults.url; + indicatorPath.filtersApplied += filterResults.filtersApplied; + } + } + if (endYear) { + if (indicatorPath.source == "stats-tool" && indicatorPath.chartObject) { + let filterResults = this.addFilter(replacedUrl, 'end_year', endYear); + replacedUrl = filterResults.url; + indicatorPath.filtersApplied += filterResults.filtersApplied; + } + } + if(startYear || endYear) { + filterSubtitleText.push(startYear && endYear ? (startYear + ' - ' + endYear) : (endYear ? ('until ' + endYear) : '')); + } + if (coFunded) { + if (indicatorPath.source == "stats-tool" && indicatorPath.chartObject) { + let filterResults = this.addFilter(replacedUrl, 'co-funded', coFunded); + replacedUrl = filterResults.url; + indicatorPath.filtersApplied += filterResults.filtersApplied; + filterSubtitleText.push( "Co-funded: " + (coFunded?'yes':'no') ) ; + } + } + if (publiclyFunded && publiclyFunded !="all") { + if (indicatorPath.source == "stats-tool" && indicatorPath.chartObject) { + let filterResults = this.addFilter(replacedUrl, 'publicly-funded', publiclyFunded); + replacedUrl = filterResults.url; + indicatorPath.filtersApplied += filterResults.filtersApplied; + filterSubtitleText.push( "Publicly funded: " + (publiclyFunded?'yes':'no') ) ; + } + } + if (foslvl1) { + if (indicatorPath.source == "stats-tool" && indicatorPath.chartObject) { + let filterResults = this.addFilter(replacedUrl, 'foslvl1', foslvl1); + replacedUrl = filterResults.url; + indicatorPath.filtersApplied +=filterResults.filtersApplied?foslvl1.length:0; + } + } + if (foslvl2) { + if (indicatorPath.source == "stats-tool" && indicatorPath.chartObject) { + let filterResults = this.addFilter(replacedUrl, 'foslvl2', foslvl2); + replacedUrl = filterResults.url; + indicatorPath.filtersApplied += filterResults.filtersApplied?foslvl2.length:0; + } + } + if((foslvl1 && foslvl1.length > 0) || (foslvl2 && foslvl2.length > 0)){ + filterSubtitleText.push( "Field of Science: " + foslvl1.join(', ') + ( foslvl1.length > 0 && foslvl2.length > 0? ', ': '') + foslvl2.join(", ") ) ; + } if (indicatorPath.parameters) { Object.keys(indicatorPath.parameters).forEach(key => { let replacedValue = indicatorPath.parameters[key]; @@ -371,39 +479,12 @@ export class IndicatorUtils { if (key == "index_shortName") { replacedValue = stakeholder.index_shortName.toLowerCase(); } - + if (key == "subtitle" && filterSubtitleText.length > 0) { + replacedValue = replacedValue + (replacedValue.length > 0 ? ' - ':'') + ' Active filters: ('+filterSubtitleText.join(", ") + ')'; + } replacedUrl = replacedUrl.split(ChartHelper.prefix + key + ChartHelper.suffix).join(replacedValue) }); } - if (fundingL0) { - if (indicatorPath.source == "stats-tool" && indicatorPath.chartObject) { - let filterResults = this.addFilter(replacedUrl, 'fundingL0', fundingL0); - replacedUrl = filterResults.url; - indicatorPath.filtersApplied += filterResults.filtersApplied; - } - } - if (startYear) { - if (indicatorPath.source == "stats-tool" && indicatorPath.chartObject) { - let filterResults = this.addFilter(replacedUrl, 'start_year', startYear); - replacedUrl = filterResults.url; - indicatorPath.filtersApplied += filterResults.filtersApplied; - } - } - if (endYear) { - if (indicatorPath.source == "stats-tool" && indicatorPath.chartObject) { - let filterResults = this.addFilter(replacedUrl, 'end_year', endYear); - replacedUrl = filterResults.url; - indicatorPath.filtersApplied += filterResults.filtersApplied; - } - } - if (coFunded) { - if (indicatorPath.source == "stats-tool" && indicatorPath.chartObject) { - let filterResults = this.addFilter(replacedUrl, 'co-funded', endYear); - replacedUrl = filterResults.url; - indicatorPath.filtersApplied += filterResults.filtersApplied; - } - } - //For numbers if (replacedUrl.indexOf(ChartHelper.prefix + 'index_id' + ChartHelper.suffix) != -1) { replacedUrl = replacedUrl.split(ChartHelper.prefix + 'index_id' + ChartHelper.suffix).join(encodeURIComponent(stakeholder.index_id)); @@ -414,11 +495,10 @@ export class IndicatorUtils { if (replacedUrl.indexOf(ChartHelper.prefix + 'index_shortName' + ChartHelper.suffix) != -1) { replacedUrl = replacedUrl.split(ChartHelper.prefix + 'index_shortName' + ChartHelper.suffix).join(encodeURIComponent(stakeholder.index_shortName)); } - //Check apply enhancements return this.applySchemaEnhancements( ..); return (indicatorPath.chartObject ? indicatorPath.url + encodeURIComponent(replacedUrl) : replacedUrl); - + } - + private addFilter(replacedUrl, filterType: FilterType, filterValue) { let newJsonObject = JSON.parse(replacedUrl); let filterApplied: boolean = false; @@ -426,7 +506,7 @@ export class IndicatorUtils { for (let queries of this.getQueryObjectName(newJsonObject) ? newJsonObject[this.getDescriptionObjectName(newJsonObject)][this.getQueryObjectName(newJsonObject)] : newJsonObject[this.getDescriptionObjectName(newJsonObject)]) { /*Chart with Named Queries*/ if (queries["query"]["name"] && !queries["query"]["select"]) { - + if (queries["query"]["name"].indexOf("monitor.") == -1 || !queries["query"]["parameters"]) { continue; } @@ -493,7 +573,7 @@ export class IndicatorUtils { /*Chart with proper json object*/ //apply the filter in any select fields for (let select of queries["query"]["select"]) { - let filterString = IndicatorFilterUtils.getFilter(select["field"], filterType); + let filterString = IndicatorFilterUtils.getFilter(select["field"], filterType,filterValue); if (filterString) { let filter = JSON.parse(filterString); //check if filter already exists @@ -537,7 +617,7 @@ export class IndicatorUtils { } return {"url": JSON.stringify(newJsonObject), "filtersApplied": (filterApplied) ? 1 : 0}; } - + isComparingChart(newJsonObject, filter,) { let queriesCount = this.getQueryObjectName(newJsonObject) ? newJsonObject[this.getDescriptionObjectName(newJsonObject)][this.getQueryObjectName(newJsonObject)].length : newJsonObject[this.getDescriptionObjectName(newJsonObject)].length; let values = []; @@ -554,10 +634,10 @@ export class IndicatorUtils { } return values.length > 1; } - + generateIndicatorByForm(form: any, indicatorPaths: IndicatorPath[], type: IndicatorType, addParameters: boolean = true): Indicator { let indicator: Indicator = new Indicator(form.name, form.description, form.additionalDescription, type, - form.width, form.height, form.visibility, indicatorPaths, form.defaultId); + form.width, form.height, form.visibility, indicatorPaths, form.defaultId); indicator._id = form._id; form.indicatorPaths.forEach((indicatorPath, index) => { indicator.indicatorPaths[index].type = indicatorPath.type; @@ -573,7 +653,7 @@ export class IndicatorUtils { }); return indicator; } - + generateIndicatorByNumberUrl(source: SourceType, url: string, stakeholder: Stakeholder, jsonPath = [], sourceServices: string[] = []): IndicatorPath { let indicatorPath = new IndicatorPath(null, source, url, null, jsonPath); if (source === 'stats-tool') { @@ -611,7 +691,7 @@ export class IndicatorUtils { } return indicatorPath; } - + generateIndicatorByChartUrl(source: SourceType, url: string, type: IndicatorPathType = null, stakeholder: Stakeholder): IndicatorPath { let indicatorPath = new IndicatorPath(type, source, null, null, []); try { @@ -621,13 +701,13 @@ export class IndicatorUtils { indicatorPath.chartObject = decodeURIComponent(url.split("json=")[1]); let chart = JSON.parse(indicatorPath.chartObject); if (indicatorPath.url == "chart?json=") { - + if (chart["library"] && (chart["library"] == "HighCharts" || chart["library"] == "eCharts" || chart["library"] == "HighMaps")) { indicatorPath.type = this.extractType(chart, indicatorPath); } else { indicatorPath.type = this.defaultChartType; } - + this.extractTitle(chart, indicatorPath); this.extractSubTitle(chart, indicatorPath); this.extractXTitle(chart, indicatorPath); @@ -667,7 +747,7 @@ export class IndicatorUtils { } return indicatorPath; } - + private getQueryObjectName(obj) { if ((obj[this.getDescriptionObjectName(obj)]).hasOwnProperty("queriesInfo")) { return "queriesInfo"; @@ -675,7 +755,7 @@ export class IndicatorUtils { return "queries"; } } - + private getDescriptionObjectName(obj) { if (obj.hasOwnProperty("mapDescription")) { return "mapDescription"; @@ -687,7 +767,7 @@ export class IndicatorUtils { return "series"; } } - + private extractType(obj, indicatorPath: IndicatorPath): IndicatorPathType { let type = (obj[this.getDescriptionObjectName(obj)] && obj[this.getDescriptionObjectName(obj)][this.getQueryObjectName(obj)][0]["type"]) ? obj[this.getDescriptionObjectName(obj)][this.getQueryObjectName(obj)][0]["type"] : ""; if (this.basicChartTypes.indexOf(type) == -1) { @@ -698,13 +778,15 @@ export class IndicatorUtils { } return type; } - + private extractStakeHolders(obj, indicatorPath: IndicatorPath, stakeholder: Stakeholder) { this.extractFunder(obj, indicatorPath, stakeholder); this.extractRI(obj, indicatorPath, stakeholder); this.extractOrganization(obj, indicatorPath, stakeholder); + this.extractDatasource(obj, indicatorPath, stakeholder); + this.extractResearcher(obj, indicatorPath, stakeholder); } - + private extractFunder(obj, indicatorPath: IndicatorPath, stakeholder: Stakeholder) { if (stakeholder.type != "funder") { return; @@ -719,21 +801,19 @@ export class IndicatorUtils { for (let filter of query["query"]["filters"]) { for (let gfilter of filter["groupFilters"]) { //ignore field No Of Funders - if (gfilter["field"].indexOf(" funder") != -1 && gfilter["field"].indexOf(" funders") == -1) {//new statistcs schema - gfilter["values"][0] = ChartHelper.prefix + "index_name" + ChartHelper.suffix; - indicatorPath.parameters["index_name"] = stakeholder.index_name; - } else if (gfilter["field"].indexOf(".funder") != -1) { - gfilter["values"][0] = ChartHelper.prefix + "index_name" + ChartHelper.suffix; - indicatorPath.parameters["index_name"] = stakeholder.index_name; - } else if (gfilter["field"].indexOf(".funder.id") != -1) { - gfilter["values"][0] = ChartHelper.prefix + "index_shortName" + ChartHelper.suffix; - indicatorPath.parameters["index_shortName"] = stakeholder.index_shortName; + let replacedValue = this.replaceIndexValues(gfilter["values"][0], stakeholder, indicatorPath.parameters); + if(replacedValue) { // don't proceed in replacement if no replaced value matches + if ((gfilter["field"].indexOf(" funder") != -1 && gfilter["field"].indexOf(" funders") == -1 ) || + (gfilter["field"].indexOf(".funder") != -1) || + (gfilter["field"].indexOf(".funder.id") != -1)) { + gfilter["values"][0] = replacedValue; + } } } } } } - + private extractRI(obj, indicatorPath: IndicatorPath, stakeholder: Stakeholder) { if (stakeholder.type != "ri") { return; @@ -747,18 +827,18 @@ export class IndicatorUtils { } for (let filter of query["query"]["filters"]) { for (let gfilter of filter["groupFilters"]) { - if (gfilter["field"].indexOf(".context.name") != -1) { - gfilter["values"][0] = ChartHelper.prefix + "index_name" + ChartHelper.suffix; - indicatorPath.parameters["index_name"] = stakeholder.index_name; - } else if (gfilter["field"].indexOf(".context.id") != -1) { - gfilter["values"][0] = ChartHelper.prefix + "index_shortName" + ChartHelper.suffix; - indicatorPath.parameters["index_shortName"] = stakeholder.index_shortName; + let replacedValue = this.replaceIndexValues(gfilter["values"][0], stakeholder, indicatorPath.parameters); + if(replacedValue) { // don't proceed in replacement if no replaced value matches + if ((gfilter["field"].indexOf(".context.name") != -1) + || (gfilter["field"].indexOf(".context.id") != -1)) { + gfilter["values"][0] = replacedValue; + } } } } } } - + private extractOrganization(obj, indicatorPath: IndicatorPath, stakeholder: Stakeholder) { // works for publication.project.organization.name // and publication.organization.name @@ -774,18 +854,80 @@ export class IndicatorUtils { } for (let filter of query["query"]["filters"]) { for (let gfilter of filter["groupFilters"]) { - if (gfilter["field"].indexOf(".organization.name") != -1) { - gfilter["values"][0] = ChartHelper.prefix + "index_name" + ChartHelper.suffix; - indicatorPath.parameters["index_name"] = stakeholder.index_name; - } else if (gfilter["field"].indexOf(".organization.id") != -1) { - gfilter["values"][0] = ChartHelper.prefix + "index_shortName" + ChartHelper.suffix; - indicatorPath.parameters["index_shortName"] = stakeholder.index_shortName; + let replacedValue = this.replaceIndexValues(gfilter["values"][0], stakeholder, indicatorPath.parameters); + if(replacedValue) { // don't proceed in replacement if no replaced value matches + if ((gfilter["field"].indexOf(".organization.name") != -1)|| + (gfilter["field"].indexOf(".organization.id") != -1)) { + gfilter["values"][0] = replacedValue; + } } } } } } - + private extractDatasource(obj, indicatorPath: IndicatorPath, stakeholder: Stakeholder) { + // works for .datasource.name and .HostedBy datasource + // and .datasource.id + if (stakeholder.type != "datasource") { + return; + } + for (let query of this.getQueryObjectName(obj) ? obj[this.getDescriptionObjectName(obj)][this.getQueryObjectName(obj)] : obj[this.getDescriptionObjectName(obj)]) { + if (query["query"]["profile"]) { + query["query"]["profile"] = ChartHelper.prefix + this.statsProfileParameter + ChartHelper.suffix; + } + if (!query["query"]["filters"]) { + return; + } + for (let filter of query["query"]["filters"]) { + for (let gfilter of filter["groupFilters"]) { + let replacedValue = this.replaceIndexValues(gfilter["values"][0], stakeholder, indicatorPath.parameters); + if(replacedValue) { // don't proceed in replacement if no replaced value matches + if ((gfilter["field"].indexOf(".datasource.name") != -1 || gfilter["field"].indexOf(".HostedBy datasource") != -1)|| + (gfilter["field"].indexOf(".datasource.id") != -1) || (gfilter["field"].indexOf(".hostedby") != -1)) { + gfilter["values"][0] = replacedValue; + } + } + } + } + } + } + private extractResearcher(obj, indicatorPath: IndicatorPath, stakeholder: Stakeholder) { + // works for .orcid + if (stakeholder.type != "researcher") { + return; + } + for (let query of this.getQueryObjectName(obj) ? obj[this.getDescriptionObjectName(obj)][this.getQueryObjectName(obj)] : obj[this.getDescriptionObjectName(obj)]) { + if (query["query"]["profile"]) { + query["query"]["profile"] = ChartHelper.prefix + this.statsProfileParameter + ChartHelper.suffix; + } + if (!query["query"]["filters"]) { + return; + } + for (let filter of query["query"]["filters"]) { + for (let gfilter of filter["groupFilters"]) { + let replacedValue = this.replaceIndexValues(gfilter["values"][0], stakeholder, indicatorPath.parameters); + if(replacedValue) { // don't proceed in replacement if no replaced value matches + if ((gfilter["field"].indexOf(".orcid") != -1 )) { + gfilter["values"][0] = replacedValue; + } + } + } + } + } + } + private replaceIndexValues(currentValue, stakeholder, parameters ){ + if(currentValue == stakeholder.index_name){ + parameters["index_name"] = stakeholder.index_name; + return ChartHelper.prefix + "index_name" + ChartHelper.suffix; + }else if(currentValue == stakeholder.index_id){ + parameters["index_id"] = stakeholder.index_id; + return ChartHelper.prefix + "index_id" + ChartHelper.suffix; + }else if(currentValue == stakeholder.index_shortName) { + parameters["index_shortName"] = stakeholder.index_shortName; + return ChartHelper.prefix + "index_shortName" + ChartHelper.suffix; + } + + } private extractStartYear(obj, indicatorPath: IndicatorPath) { let start_year; for (let query of obj[this.getDescriptionObjectName(obj)][this.getQueryObjectName(obj)]) { @@ -803,7 +945,7 @@ export class IndicatorUtils { } } } - + private extractEndYear(obj, indicatorPath: IndicatorPath) { let end_year; for (let query of obj[this.getDescriptionObjectName(obj)][this.getQueryObjectName(obj)]) { @@ -821,7 +963,7 @@ export class IndicatorUtils { } } } - + private parameterizeDefaultQuery(obj, indicatorPath: IndicatorPath, stakeholder: Stakeholder) { let name = ""; for (let query of this.getQueryObjectName(obj) ? obj[this.getDescriptionObjectName(obj)][this.getQueryObjectName(obj)] : obj[this.getDescriptionObjectName(obj)]) { @@ -843,7 +985,7 @@ export class IndicatorUtils { } else if (name.split('.')[0] == "monitor" && parameters.length > 0 && name.split('.')[1] == stakeholder.type) { // new parameterized queries //monitor.{{type}}.{{queryname}}.{{param1 - id }}.{{param2 result-type}}.{{fl0}} --> params [start year, end year, id, result type, fl0] - + let index = (name.split('.').slice(3).length + 2 == parameters.length) ? [2] : ((name.split('.').slice(3).length * 2 + 4 == parameters.length) ? [2, name.split('.').slice(3).length + 4] : [0]); for (let i of index) { if (name.split('.').length > 3 && name.split('.')[3] == "id") { @@ -861,7 +1003,7 @@ export class IndicatorUtils { } } } - + private extractDataTitle(obj, indicatorPath: IndicatorPath) { let index = 0; if (!obj[this.getDescriptionObjectName(obj)] || !obj[this.getDescriptionObjectName(obj)][this.getQueryObjectName(obj)]) { @@ -876,7 +1018,7 @@ export class IndicatorUtils { index++; } } - + private extractTitle(obj, indicatorPath: IndicatorPath) { let title = ""; if (obj[this.getDescriptionObjectName(obj)]["title"]) { @@ -888,7 +1030,7 @@ export class IndicatorUtils { } indicatorPath.parameters["title"] = title ? title : ""; } - + private extractSubTitle(obj, indicatorPath: IndicatorPath) { let subtitle = ""; if (obj[this.getDescriptionObjectName(obj)]["subtitle"]) { @@ -901,7 +1043,7 @@ export class IndicatorUtils { indicatorPath.parameters["subtitle"] = subtitle ? subtitle : ""; } } - + private extractXTitle(obj, indicatorPath: IndicatorPath) { let title = ""; if (obj[this.getDescriptionObjectName(obj)]["xAxis"] && obj[this.getDescriptionObjectName(obj)]["xAxis"]["title"]) { @@ -916,7 +1058,7 @@ export class IndicatorUtils { } indicatorPath.parameters["xAxisTitle"] = title ? title : ""; } - + private extractYTitle(obj, indicatorPath: IndicatorPath) { let title = ""; if (obj[this.getDescriptionObjectName(obj)]["yAxis"] && obj[this.getDescriptionObjectName(obj)]["yAxis"]["title"]) { @@ -931,17 +1073,17 @@ export class IndicatorUtils { } indicatorPath.parameters["yAxisTitle"] = title ? title : ""; } - + private extractOldToolTitle(obj, indicatorPath: IndicatorPath) { let title = ""; if (obj["title"]) { title = obj["title"]; obj["title"] = ChartHelper.prefix + "title" + ChartHelper.suffix; indicatorPath.parameters["title"] = title; - + } } - + private extractOldToolXTitle(obj, indicatorPath: IndicatorPath) { let title = ""; if (obj["xaxistitle"]) { @@ -950,7 +1092,7 @@ export class IndicatorUtils { indicatorPath.parameters["xAxisTitle"] = title; } } - + private extractOldToolYTitle(obj, indicatorPath: IndicatorPath) { let title = ""; if (obj["fieldsheaders"]) { @@ -963,11 +1105,11 @@ export class IndicatorUtils { indicatorPath.parameters["yAxisTitle"] = title; } } - + public checkForSchemaEnhancements(url: string): boolean { return url != this.applySchemaEnhancements(url); } - + public applySchemaEnhancements(url: string): string { let resultEnhancements = [ [".project.acronym", ".project acronym"], @@ -986,7 +1128,7 @@ export class IndicatorUtils { } } } - + if (url.split('json=').length > 1) { let obj = JSON.parse(decodeURIComponent(url.split('json=')[1])); for (let query of this.getQueryObjectName(obj) ? obj[this.getDescriptionObjectName(obj)][this.getQueryObjectName(obj)] : obj[this.getDescriptionObjectName(obj)]) { diff --git a/monitor-admin/utils/stakeholder-base.component.ts b/monitor-admin/utils/stakeholder-base.component.ts new file mode 100644 index 00000000..b8905a6e --- /dev/null +++ b/monitor-admin/utils/stakeholder-base.component.ts @@ -0,0 +1,54 @@ +import {Directive} from "@angular/core"; +import {BaseComponent} from "../../sharedComponents/base/base.component"; +import {IndicatorUtils, StakeholderUtils} from "./indicator-utils"; +import {ConnectHelper} from "../../connect/connectHelper"; + +@Directive() +export abstract class StakeholderBaseComponent extends BaseComponent { + + stakeholderUtils: StakeholderUtils = new StakeholderUtils(); + + get entities() { + return this.stakeholderUtils.entities; + } + + get showVisibility() { + return this.stakeholderUtils.showField(this.stakeholderUtils.visibilities); + } + + get showType() { + return this.stakeholderUtils.showField(this.stakeholderUtils.types); + } + + get showFunderType() { + return this.stakeholderUtils.showField(this.stakeholderUtils.funderTypes); + } + + getFunderTypeLabel(value: any) { + return this.stakeholderUtils.getLabel(this.stakeholderUtils.funderTypes, value); + } + + get showLocale() { + return this.stakeholderUtils.showField(this.stakeholderUtils.locales); + } + + protected navigateToError() { + this._router.navigate([this.properties.errorLink], {queryParams: {'page': this._router.url}}); + } + + setProperties(id, type = null, configurationService) { + this.properties.adminToolsCommunity = id; + if (type) { + this.properties.adminToolsPortalType = type; + } else { + ConnectHelper.setPortalTypeFromPid(id); + } + configurationService.initPortal(this.properties, this.properties.adminToolsCommunity); + } +} + +@Directive() +export abstract class IndicatorStakeholderBaseComponent extends StakeholderBaseComponent { + + indicatorUtils: IndicatorUtils = new IndicatorUtils(); +} diff --git a/monitor/entities/stakeholder.ts b/monitor/entities/stakeholder.ts index 357f42ab..474456c4 100644 --- a/monitor/entities/stakeholder.ts +++ b/monitor/entities/stakeholder.ts @@ -1,24 +1,25 @@ import {SafeResourceUrl} from "@angular/platform-browser"; import {properties} from "../../../../environments/environment"; import {Session, User} from "../../login/utils/helper.class"; -import {Option} from "../../sharedComponents/input/input.component"; export const ChartHelper = { prefix: "((__", suffix: "__))" }; -export type StakeholderType = 'funder' | 'ri' | 'project' | 'organization'; +export type StakeholderType = 'funder' | 'ri' | 'project' | 'organization' | 'country' | 'researcher' | 'datasource'; export type IndicatorType = 'number' | 'chart'; export type IndicatorSize = 'small' | 'medium' | 'large'; export type IndicatorPathType = 'table' | 'bar' | 'column' | 'pie' | 'line' | 'other'; export type SourceType = 'statistics' | 'search' |'stats-tool' | 'old' | 'image'; export type Format = 'NUMBER' | 'PERCENTAGE'; export type Visibility = 'PUBLIC' | 'PRIVATE' | 'RESTRICTED'; +export type Overlay = 'embed' | 'description' | false; export class Stakeholder { _id: string; type: StakeholderType; + funderType: string; name: string; index_id; index_name: string; @@ -36,8 +37,9 @@ export class Stakeholder { isUpload: boolean = false; description: string; topics: any[]; + details?: any; - constructor(_id: string, type: StakeholderType, index_id, index_name: string, index_shortName: string, alias: string, visibility: Visibility, logoUrl: string, defaultId: string = null, description: string = null) { + constructor(_id: string, type: StakeholderType, index_id: string, index_name: string, index_shortName: string, alias: string, visibility: Visibility, logoUrl: string, defaultId: string = null, description: string = null) { this._id = _id; this.type = type; this.index_id = index_id; @@ -170,7 +172,7 @@ export class Indicator { visibility: Visibility; defaultId: string; indicatorPaths: IndicatorPath[]; - descriptionOverlay: boolean = false; + overlay: Overlay = false; constructor(name: string, description: string, additionalDescription:string, type: IndicatorType, width: IndicatorSize,height: IndicatorSize, visibility: Visibility, indicatorPaths: IndicatorPath[], defaultId: string = null) { this._id = null; @@ -221,66 +223,104 @@ export class IndicatorPath { } -export type FilterType = "fundingL0"|"start_year" | "end_year" | "co-funded"; +export type FilterType = "fundingL0"|"start_year" | "end_year" | "co-funded" | "foslvl1" | "foslvl2" | "publicly-funded"; export class IndicatorFilterUtils { - - static getFilter(fieldPath: string, filterType:FilterType) { - if((filterType == "start_year" || filterType == "end_year") && (fieldPath.indexOf(".year") != -1 || fieldPath.indexOf(".start year") != -1) - && fieldPath.indexOf("indi_pub_downloads_year.year") == -1){ - // make it work for any table with field year or start year no matter the type or the table name - //exclude indi_pub_downloads_year.year because it throws errors. when there is a solution remove the exclusion - if (filterType == "start_year") { - return '{"groupFilters":[{"field":"' + fieldPath + '","type":">=","values":["' + ChartHelper.prefix + 'start_year' + ChartHelper.suffix + '"]}],"op":"AND"}'; - } else if (filterType == "end_year") { - return '{"groupFilters":[{"field":"' + fieldPath + '","type":"<=","values":["' + ChartHelper.prefix + 'end_year' + ChartHelper.suffix + '"]}],"op":"AND"}'; - } - } - let table = fieldPath&&fieldPath.length > 0? fieldPath.split(".")[0]:""; - if(["publication", "software", "dataset", "other", "result"].indexOf(table)!=-1){ - return this.getResultFilter(table,filterType); - }else if (table == "project"){ - return this.getProjectFilter(filterType); - } - else if (table == "country"){ - return this.getCountryFilter(filterType); - }else if (table == "organization"){ - return this.getOrganizationFilter(filterType); + public static filteredFields = { + "year":{ + "result": "result.year", + "indi_pub_downloads_year": "indi_pub_downloads_year.year", //exclude indi_pub_downloads_year.year because it throws errors. when there is a solution remove the exclusion + "indi_pub_downloads":"indi_pub_downloads.result.year", + "result_apc":"result_apc.result.year", + "result_apc_affiliations":"result_apc_affiliations.result.year", + "result_country":"result_country.result.year", + "indi_impact_measures": "indi_impact_measures.result.year", + "project": "project.start year" + }, + "fundingL0":{ + "result": "result.project funding level 0", + "project": "project.funding level 0", + "country":"country.organization.project.funding level 0", + "organization":"organization.project.funding level 0" + }, + "co-funded":{ + "result": "result.No of funders", + }, + "foslvl1": + { + "publication":"publication.topics.result.result_fos.lvl1", + "result":"result.topics.result.result_fos.lvl1", + "indi_pub_downloads":"indi_pub_downloads.result.result_fos.lvl1", + "indi_pub_downloads_year":"indi_pub_downloads_year.result.result_fos.lvl1", + "indi_impact_measures":"indi_impact_measures.result.result_fos.lvl1", + "result_apc":"result_apc.result.result_fos.lvl1", + "result_apc_affiliations":"result_apc_affiliations.result.result_fos.lvl1", + "result_country":"result_country.result.result_fos.lvl1", + "historical_snapshots_irish_fos":"historical_snapshots_irish_fos.lvl1" + }, + "foslvl2":{ + "publication":"publication.topics.result.result_fos.lvl2", + "result":"result.topics.result.result_fos.lvl2", + "indi_pub_downloads":"indi_pub_downloads.result.result_fos.lvl2", + "indi_pub_downloads_year":"indi_pub_downloads_year.result.result_fos.lvl2", + "indi_impact_measures":"indi_impact_measures.result.result_fos.lvl2", + "result_apc":"result_apc.result.result_fos.lvl2", + "result_apc_affiliations":"result_apc_affiliations.result.result_fos.lvl2", + "result_country":"result_country.result.result_fos.lvl2", + "historical_snapshots_irish_fos":"historical_snapshots_irish_fos.lvl2" + }, + "publicly-funded":{ + "result":"result.indi_pub_publicly_funded.publicly_funded", + "indi_pub_downloads":"indi_pub_downloads.result.indi_pub_publicly_funded.publicly_funded", + "indi_pub_downloads_year":"indi_pub_downloads_year.result.indi_pub_publicly_funded.publicly_funded", + "indi_impact_measures":"indi_impact_measures.result.indi_pub_publicly_funded.publicly_funded", + "result_apc":"result_apc.result.indi_pub_publicly_funded.publicly_funded", + "result_apc_affiliations":"result_apc_affiliations.result.indi_pub_publicly_funded.publicly_funded", + "result_country":"result_country.result.indi_pub_publicly_funded.publicly_funded" } - return ""; } - static getResultFilter(table: string = null, filterType:FilterType) { - //works for tables ["publication", "software", "dataset", "other", "result"] - if (filterType == "fundingL0") { - if(properties.useOldStatisticsSchema) { - return '{"groupFilters":[{"field":"' + table + '.project.funding level 0","type":"=","values":["' + ChartHelper.prefix + 'fundingL0' + ChartHelper.suffix + '"]}],"op":"AND"}'; - }else{//new statistcs schema - return '{"groupFilters":[{"field":"' + table + '.project funding level 0","type":"=","values":["' + ChartHelper.prefix + 'fundingL0' + ChartHelper.suffix + '"]}],"op":"AND"}'; + static getFieldForTable(field, table){ + if(["publication", "software", "dataset", "other", "result"].indexOf(table)!=-1 && IndicatorFilterUtils.filteredFields[field]["result"]){ + return IndicatorFilterUtils.filteredFields[field]["result"]; + }else{ + return IndicatorFilterUtils.filteredFields[field][table]; + } + } + static getFilter(fieldPath: string, filterType:FilterType, value:string|string[] =null) { + let tablename = fieldPath.split(".")[0]; + if ((filterType == "start_year" || filterType == "end_year") && (IndicatorFilterUtils.getFieldForTable("year",tablename))){ + if (filterType == "start_year") { + return '{"groupFilters":[{"field":"' + IndicatorFilterUtils.getFieldForTable("year",tablename) + '","type":">=","values":["' + ChartHelper.prefix + 'start_year' + ChartHelper.suffix + '"]}],"op":"AND"}'; + } else if (filterType == "end_year") { + return '{"groupFilters":[{"field":"' + IndicatorFilterUtils.getFieldForTable("year",tablename) + '","type":"<=","values":["' + ChartHelper.prefix + 'end_year' + ChartHelper.suffix + '"]}],"op":"AND"}'; } - }else if (filterType == "co-funded") { - return '{"groupFilters":[{"field":"' + table + '.No of funders","type":">","values":["1"]}],"op":"AND"}'; } - return ""; - } - static getProjectFilter( filterType:FilterType) { - //works for table "project" - if (filterType == "fundingL0") { - return '{"groupFilters":[{"field":"project.funding level 0","type":"=","values":["' + ChartHelper.prefix + 'fundingL0' + ChartHelper.suffix + '"]}],"op":"AND"}'; - } - return ""; - } - static getOrganizationFilter( filterType:FilterType) { - //works for table "organization" - if (filterType == "fundingL0") { - return '{"groupFilters":[{"field":"organization.project.funding level 0","type":"=","values":["' + ChartHelper.prefix + 'fundingL0' + ChartHelper.suffix + '"]}],"op":"AND"}'; - } - return ""; - } - static getCountryFilter( filterType:FilterType) { - //works for table "country" - if (filterType == "fundingL0") { - return '{"groupFilters":[{"field":"country.organization.project.funding level 0","type":"=","values":["' + ChartHelper.prefix + 'fundingL0' + ChartHelper.suffix + '"]}],"op":"AND"}'; + if (filterType == "fundingL0" && IndicatorFilterUtils.getFieldForTable("fundingL0",tablename)) { + return '{"groupFilters":[{"field":"' + IndicatorFilterUtils.getFieldForTable("fundingL0",tablename) + '","type":"=","values":["' + ChartHelper.prefix + 'fundingL0' + ChartHelper.suffix + '"]}],"op":"AND"}'; + + }else if (filterType == "co-funded" && IndicatorFilterUtils.getFieldForTable("co-funded",tablename)) { + return '{"groupFilters":[{"field":"' + IndicatorFilterUtils.getFieldForTable("co-funded",tablename) + '","type":">","values":["1"]}],"op":"AND"}'; + }else if (filterType == "publicly-funded" && IndicatorFilterUtils.getFieldForTable("publicly-funded",tablename)) { + return '{"groupFilters":[{"field":"' + IndicatorFilterUtils.getFieldForTable("publicly-funded",tablename) + '","type":"=","values":["' + (value=="true"?"1":"0") +'"]}],"op":"AND"}'; + }else if (filterType == "foslvl1" && IndicatorFilterUtils.getFieldForTable("foslvl1",tablename) && value && value.length > 0) { + let filterString = '{"groupFilters":[' ; + let filters = []; + for(let v of value) { + filters.push('{"field":"' + IndicatorFilterUtils.getFieldForTable("foslvl1",tablename) + '","type":"=","values":["' + v + '"]}'); + } + filterString+=filters.join(", ") + filterString+='],"op":"OR"}' + return filterString; + }else if (filterType == "foslvl2" && IndicatorFilterUtils.getFieldForTable("foslvl2",tablename) && value && value.length > 0) { + let filterString = '{"groupFilters":[' ; + let filters = []; + for(let v of value) { + filters.push('{"field":"' + IndicatorFilterUtils.getFieldForTable("foslvl2",tablename) + '","type":"=","values":["' + v + '"]}'); + } + filterString+=filters.join(", ") + filterString+='],"op":"OR"}' + return filterString; } return ""; } @@ -297,12 +337,18 @@ export class IndicatorFilterUtils { } } +/** + * @deprecated + * + * TODO: Remove after merge with develop + * */ export enum StakeholderEntities { STAKEHOLDER = 'Dashboard', FUNDER = 'Funder', RI = 'Research Initiative', ORGANIZATION = 'Research Institution', PROJECT = 'Project', + COUNTRY = 'National', STAKEHOLDERS = 'Dashboards', FUNDERS = 'Funders', @@ -310,10 +356,3 @@ export enum StakeholderEntities { ORGANIZATIONS = 'Research Institutions', PROJECTS = 'Projects' } - -export let stakeholderTypes: Option[] = [ - {value: 'funder', label: StakeholderEntities.FUNDER}, - {value: 'ri', label: StakeholderEntities.RI}, - {value: 'organization', label: StakeholderEntities.ORGANIZATION}, - {value: 'project', label: StakeholderEntities.PROJECT} -]; diff --git a/monitor/indicators/indicator-themes.component.ts b/monitor/indicators/indicator-themes.component.ts index 4fb9e7e0..01ed1aed 100644 --- a/monitor/indicators/indicator-themes.component.ts +++ b/monitor/indicators/indicator-themes.component.ts @@ -5,7 +5,7 @@ import {Meta, Title} from "@angular/platform-browser"; import {SEOService} from "../../sharedComponents/SEO/SEO.service"; import {Breadcrumb} from "../../utils/breadcrumbs/breadcrumbs.component"; import {Subscriber} from "rxjs"; -import {StakeholderEntities} from "../entities/stakeholder"; +import {StakeholderBaseComponent} from "../../monitor-admin/utils/stakeholder-base.component"; @Component({ selector: 'indicator-themes-page', @@ -30,10 +30,10 @@ import {StakeholderEntities} from "../entities/stakeholder"; This is the current set of indicator themes we cover. We’ll keep enriching it as new requests and data are coming into the OpenAIRE Graph. We are at your disposal, should you have any recommendations!

        - Check out the indicator pages (for funders, - research institutions and - research initiatives) - for the specific indicators for each type of dashboard, and the methodology and terminology page on how we produce the metrics. + Check out the indicator pages (for funders, + research institutions and + research initiatives) + for the specific indicators for each type of dashboard, and the methodology and terminology page on how we produce the metrics.

        • @@ -54,10 +54,10 @@ import {StakeholderEntities} from "../entities/stakeholder"; This is the current set of indicator themes we cover. We’ll keep enriching it as new requests and data are coming into the OpenAIRE Graph. We are at your disposal, should you have any recommendations!

        - Check out the indicator pages (for {{entities.FUNDERS}}, - {{entities.ORGANIZATIONS}} and - {{entities.RIS}}) - for the specific indicators for each type of dashboard, and the methodology and terminology page on how we produce the metrics. + Check out the indicator pages (for {{entities.funders}}, + {{entities.organizations}} and + {{entities.ris}}) + for the specific indicators for each type of dashboard, and the methodology and terminology page on how we produce the metrics.

        @@ -65,44 +65,24 @@ import {StakeholderEntities} from "../entities/stakeholder";
        ` }) -export class IndicatorThemesComponent implements OnInit, OnDestroy { - private subscriptions: any[] = []; - public properties = properties; - public entities = StakeholderEntities; +export class IndicatorThemesComponent extends StakeholderBaseComponent implements OnInit { public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'Resources - Themes'}]; - constructor(private router: Router, - private meta: Meta, - private title: Title, - private seoService: SEOService, - public route: ActivatedRoute) { + constructor(protected _router: Router, + protected _meta: Meta, + protected _title: Title, + protected seoService: SEOService, + protected _route: ActivatedRoute) { + super(); } ngOnInit() { - this.subscriptions.push(this.route.params.subscribe(params => { - const description = "Monitor | Indicator Themes"; - const title = "Monitor | Indicator Themes"; - this.metaTags(title, description); + this.subscriptions.push(this._route.params.subscribe(params => { + this.title = "Monitor | Indicator Themes"; + this.description = "Monitor | Indicator Themes"; + this.setMetadata(); this.breadcrumbs[0].route = '/' + (params['stakeholder']?params['stakeholder']:''); this.breadcrumbs[0].name = (params['stakeholder']?'dashboard':'home'); })); } - - ngOnDestroy() { - this.subscriptions.forEach(subscription => { - if (subscription instanceof Subscriber) { - subscription.unsubscribe(); - } - }); - } - - metaTags(title, description) { - const url = properties.domain + properties.baseLink + this.router.url; - this.seoService.createLinkForCanonicalURL(url, false); - this.meta.updateTag({content: url}, "property='og:url'"); - this.meta.updateTag({content: description}, "name='description'"); - this.meta.updateTag({content: description}, "property='og:description'"); - this.meta.updateTag({content: title}, "property='og:title'"); - this.title.setTitle(title); - } } diff --git a/monitor/monitor-indicator-stakeholder-base.component.ts b/monitor/monitor-indicator-stakeholder-base.component.ts new file mode 100644 index 00000000..9a7a3648 --- /dev/null +++ b/monitor/monitor-indicator-stakeholder-base.component.ts @@ -0,0 +1,484 @@ +import {ChangeDetectorRef, Directive, HostListener, OnInit, ViewRef} from "@angular/core"; +import {IndicatorStakeholderBaseComponent} from "../monitor-admin/utils/stakeholder-base.component"; +import {DomSanitizer} from "@angular/platform-browser"; +import { + Category, + Indicator, IndicatorPath, + IndicatorSize, Overlay, + Section, + Stakeholder, + SubCategory, + Topic, + Visibility +} from "./entities/stakeholder"; +import {LayoutService} from "../dashboard/sharedComponents/sidebar/layout.service"; +import {ClickEvent} from "../utils/click/click-outside-or-esc.directive"; +import {Session, User} from "../login/utils/helper.class"; +import {Filter, Value} from "../searchPages/searchUtils/searchHelperClasses.class"; +import {RangeFilter} from "../utils/rangeFilter/rangeFilterHelperClasses.class"; +import {RangeFilterComponent} from "../utils/rangeFilter/rangeFilter.component"; +import {Dates, StringUtils} from "../utils/string-utils.class"; +import {Params} from "@angular/router"; +import {StatisticsService} from "../monitor-admin/utils/services/statistics.service"; +import {SearchResearchResultsService} from "../services/searchResearchResults.service"; +import {CustomFilterService} from "../shared/customFilter.service"; + +@Directive() +export abstract class MonitorIndicatorStakeholderBaseComponent extends IndicatorStakeholderBaseComponent implements OnInit { + /** Status */ + public loading: boolean = true; + public isMobile: boolean = false; + public isFullscreen: boolean = false; + + /** Variables */ + public user: User; + public requireLogin: boolean = true; + public view: Visibility; + public stakeholder: Stakeholder; + public activeTopic: Topic = null; + public activeCategory: Category = null; + public activeSubCategory: SubCategory = null; + public filters: Filter[] = []; + public queryParams: any = {}; + public periodFilter: RangeFilter = { + title: "Time range", + filterId: "year", + originalFilterIdFrom: null, + originalFilterIdTo: null, + selectedFromValue: null, + selectedToValue: null, + selectedFromAndToValues: "" + }; + rangeFilter: RangeFilterComponent; + + public numberResults: Map = new Map(); + public chartsActiveType: Map = new Map(); + public currentYear = new Date().getFullYear(); + public clipboard; + + /** Services */ + protected sanitizer: DomSanitizer; + protected cdr: ChangeDetectorRef; + protected layoutService: LayoutService; + protected statisticsService: StatisticsService; + protected searchResearchResultsService: SearchResearchResultsService; + protected customFilterService: CustomFilterService; + + @HostListener('fullscreenchange', ['$event']) + @HostListener('webkitfullscreenchange', ['$event']) + @HostListener('mozfullscreenchange', ['$event']) + @HostListener('MSFullscreenChange', ['$event']) + screenChange() { + this.isFullscreen = !this.isFullscreen; + } + + ngOnInit() { + this.layoutService.isMobile.subscribe(isMobile => { + this.isMobile = isMobile; + this.cdr.detectChanges(); + }); + this.createClipboard(); + } + + protected setView(params: Params) { + this.setSelectedFilters(); + this.loading = false; + if (params['topic']) { + this.activeTopic = this.stakeholder.topics.find(topic => topic.alias === decodeURIComponent(params['topic']) && this.hasPermission(topic.visibility)); + if (this.activeTopic) { + if (params['category']) { + this.activeCategory = this.activeTopic.categories.find(category => + (category.alias === params['category']) && this.hasPermission(category.visibility)); + if (!this.activeCategory) { + this.navigateToError(); + return; + } + } else { + this.activeCategory = this.activeTopic.categories.find(category => this.hasPermission(category.visibility)); + if (this.activeCategory) { + this.activeSubCategory = this.activeCategory.subCategories.find(subCategory => + this.hasPermission(subCategory.visibility)); + if (this.activeSubCategory) { + this.setIndicators(); + } + } + return; + } + if (this.activeCategory) { + if (params['subCategory']) { + this.activeSubCategory = this.activeCategory.subCategories.find(subCategory => + (subCategory.alias === params['subCategory'] && this.hasPermission(subCategory.visibility))); + if (!this.activeSubCategory) { + this.navigateToError(); + return; + } + } else { + this.activeSubCategory = this.activeCategory.subCategories.find(subCategory => + this.hasPermission(subCategory.visibility)); + } + if (this.activeSubCategory) { + this.setIndicators(); + } else { + this.navigateToError(); + } + return; + } else { + this.activeSubCategory = null; + } + } else { + this.navigateToError(); + return; + } + } else { + this.activeTopic = this.stakeholder.topics.find(topic => this.hasPermission(topic.visibility)); + if (this.activeTopic) { + this.activeCategory = this.activeTopic.categories.find(category => this.hasPermission(category.visibility)); + if (this.activeCategory) { + this.activeSubCategory = this.activeCategory.subCategories.find(subCategory => this.hasPermission(subCategory.visibility)); + if (this.activeSubCategory) { + this.setIndicators(); + } + } + } + } + } + + protected handleQueryParams(queryParams, params) { + this.queryParams = Object.assign({}, queryParams); + this.initializeFilters(); + this.setView(params); + if(this.requireLogin && !this.user && (this.filters.filter(filter => this.queryParams[filter.filterId]).length > 0 || this.queryParams['year'])) { + if(queryParams['view']) { + this._router.navigate([], {queryParams: {view: queryParams['view']}}); + } else { + this._router.navigate([], {queryParams: {}}); + } + } + this.view = queryParams['view']; + } + + protected initializeFilters() { + this.periodFilter.selectedFromValue = (this.queryParams['year'] && this.queryParams['year'].indexOf("range") == 0) ? this.queryParams['year'].split("range")[1].split(":")[0] : ""; + this.periodFilter.selectedToValue = (this.queryParams['year'] && this.queryParams['year'].indexOf("range") == 0) ? this.queryParams['year'].split("range")[1].split(":")[1] : ""; + this.validateYearRange(false); + + for (let filter of this.filters) { + if (this.queryParams[filter.filterId]) { + for (let value of filter.values) { + if (value.id == StringUtils.URIDecode(StringUtils.unquote(this.queryParams[filter.filterId]))) { + value.selected = true; + filter.countSelectedValues = 1; + break; + } + } + } else { + this.clearFilter(filter); + } + } + } + + protected validateYearRange(navigateTo: boolean = false) { + let validYears = true; + if (this.periodFilter.selectedToValue && (this.periodFilter.selectedToValue.length == 0 || !Dates.isValidYear(this.periodFilter.selectedToValue, Dates.currentYear - 20, Dates.currentYear))) { + this.periodFilter.selectedToValue = Dates.currentYear + ""; + validYears = false; + } + if (this.periodFilter.selectedFromValue && (this.periodFilter.selectedFromValue.length == 0 || !Dates.isValidYear(this.periodFilter.selectedFromValue, Dates.currentYear - 20, Dates.currentYear))) { + this.periodFilter.selectedFromValue = Dates.currentYear - 20 + ""; + validYears = false; + } + if (this.periodFilter.selectedFromValue && this.periodFilter.selectedFromValue.length && this.periodFilter.selectedToValue && this.periodFilter.selectedToValue.length > 0 && parseInt(this.periodFilter.selectedFromValue, 10) > parseInt(this.periodFilter.selectedToValue, 10)) { + this.periodFilter.selectedFromValue = this.periodFilter.selectedToValue; + validYears = false; + } + if (!validYears || navigateTo) { + if (this.periodFilter.selectedFromValue || this.periodFilter.selectedToValue) { + this.queryParams["year"] = 'range' + (this.periodFilter.selectedFromValue ? this.periodFilter.selectedFromValue : '') + ":" + (this.periodFilter.selectedToValue ? this.periodFilter.selectedToValue : ""); + } else { + delete this.queryParams["year"]; + } + this._router.navigate([], {queryParams: this.queryParams}); + this.setIndicators(); + } + } + + protected getFullUrl(indicatorPath: IndicatorPath) { + let fosValues = this.getSelectedFilterValues("fos"); + return this.indicatorUtils.getFullUrlWithFilters(this.stakeholder, indicatorPath,null, this.periodFilter.selectedFromValue, this.periodFilter.selectedToValue, false, fosValues?fosValues.lvl1:[],fosValues?fosValues.lvl2:[], this.getSelectedFilterValues("publiclyfunded")); + } + + protected setIndicators() { + this.periodFilter.selectedFromAndToValues = (this.periodFilter.selectedFromValue || this.periodFilter.selectedToValue ? ((this.periodFilter.selectedFromValue && !this.periodFilter.selectedToValue ? "From " : "") + (!this.periodFilter.selectedFromValue && this.periodFilter.selectedToValue ? "Until " : "") + (this.periodFilter.selectedFromValue ? this.periodFilter.selectedFromValue : "") + + (this.periodFilter.selectedFromValue && this.periodFilter.selectedToValue ? " - " : "") + (this.periodFilter.selectedToValue ? this.periodFilter.selectedToValue : "")) : ""); + //clear numbers when filters change + this.numberResults.clear(); + let urls: Map = new Map(); + this.activeSubCategory.numbers.forEach((section, i) => { + section.indicators.forEach((number, j) => { + if (this.hasPermission(number.visibility)) { + let url = this.getFullUrl(number.indicatorPaths[0]); + const pair = JSON.stringify([number.indicatorPaths[0].source, url]); + const indexes = urls.get(pair) ? urls.get(pair) : []; + indexes.push([i, j]); + urls.set(pair, indexes); + } + }); + }); + urls.forEach((indexes, pair) => { + pair = JSON.parse(pair); + let activeSubcategory = this.activeSubCategory._id; + this.subscriptions.push(this.statisticsService.getNumbers(this.indicatorUtils.getSourceType(pair[0]), pair[1]).subscribe(response => { + if(activeSubcategory === this.activeSubCategory._id) { + indexes.forEach(([i, j]) => { + if( this.activeSubCategory?.numbers[i]?.indicators[j]) { + let result = JSON.parse(JSON.stringify(response)); + this.activeSubCategory.numbers[i].indicators[j].indicatorPaths[0].jsonPath.forEach(jsonPath => { + if (result) { + result = result[jsonPath]; + } + }); + if (typeof result === 'string' || typeof result === 'number') { + result = Number(result); + if (result === Number.NaN) { + result = 0; + } + } else { + result = 0; + } + this.numberResults.set(i + '-' + j, result); + } + }); + } + })); + }); + this.activeSubCategory.charts.forEach((section, i) => { + section.indicators.forEach((indicator, j) => { + if (indicator.indicatorPaths.length > 0) { + indicator.indicatorPaths[0].safeResourceUrl = this.getUrlByStakeHolder(indicator.indicatorPaths[0]); + this.chartsActiveType.set(i + '-' + j, indicator.indicatorPaths[0]); + } + }); + }); + if (this.cdr && !(this.cdr as ViewRef).destroyed) { + this.cdr.detectChanges(); + } + } + + public getUrlByStakeHolder(indicatorPath: IndicatorPath) { + return this.sanitizer.bypassSecurityTrustResourceUrl( + this.indicatorUtils.getChartUrl(indicatorPath.source, this.getFullUrl(indicatorPath))); + } + + public setActiveChart(i: number, j: number, type: string) { + let activeChart = this.activeSubCategory.charts[i].indicators[j].indicatorPaths.filter(indicatorPath => indicatorPath.type === type)[0]; + activeChart.safeResourceUrl = this.getUrlByStakeHolder(activeChart); + this.chartsActiveType.set(i + '-' + j, activeChart); + } + + public filter() { + this.validateYearRange(true); + } + + public filterChanged($event, navigate: boolean = true) { + let selected = []; + for (let value of $event.value.values) { + if (value.selected) { + selected.push( StringUtils.quote(StringUtils.URIEncode(value.id))); + } + } + if (selected.length > 0) { + this.queryParams[$event.value.filterId] = selected.join(","); + } else { + delete this.queryParams[$event.value.filterId]; + } + if (navigate) { + this._router.navigate([], {queryParams: this.queryParams}); + this.setIndicators(); + } + + } + + public countSelectedFilters(): number { + let count = 0; + if (this.periodFilter.selectedFromAndToValues.length > 0) { + count += 1; + } + for (let filter of this.filters) { + count += filter.countSelectedValues; + } + return count; + } + + public clearAll() { + for (let filter of this.filters) { + this.clearFilter(filter); + } + this.periodFilter.selectedFromValue = ""; + this.periodFilter.selectedToValue = ""; + this.validateYearRange(true) + } + + public clearFilter(filter: Filter) { + filter.countSelectedValues = 0; + filter.radioValue = ""; + for (let value of filter.values) { + if (value.selected) { + value.selected = false; + } + } + if (this.queryParams[filter.filterId]) { + delete this.queryParams[filter.filterId]; + } + } + + clearPeriodFilter() { + if (this.periodFilter.selectedFromValue || this.periodFilter.selectedToValue) { + this.periodFilter.selectedFromValue = ""; + this.periodFilter.selectedToValue = ""; + if(this.rangeFilter) { + this.rangeFilter.clearFilter(); + } + this.filter(); + } + } + + clearFilterValue(filter: Filter, value: Value) { + value.selected = false; + filter.radioValue = ''; + filter.countSelectedValues = filter.countSelectedValues - 1; + this.filterChanged({ + value:filter + }); + } + + public hasPermission(visibility: Visibility): boolean { + if(visibility === 'PUBLIC') { + return true; + } else if(visibility === 'RESTRICTED') { + return (!this.view || this.view === 'RESTRICTED') && this.isMember(this.stakeholder); + } else { + return !this.view && this.isManager(this.stakeholder); + } + } + + public isMember(stakeholder: Stakeholder) { + return this.user && (Session.isPortalAdministrator(this.user) || Session.isCurator(stakeholder.type, this.user) + || Session.isManager(stakeholder.type, stakeholder.alias, this.user) || Session.isMember(stakeholder.type, stakeholder.alias, this.user)); + } + + public isManager(stakeholder: Stakeholder) { + return this.user && (Session.isPortalAdministrator(this.user) || Session.isCurator(stakeholder.type, this.user) || Session.isManager(stakeholder.type, stakeholder.alias, this.user)); + } + + public countSubCategoriesToShow(category: Category): number { + return category.subCategories.filter(subCategory => this.hasPermission(subCategory.visibility)).length; + } + + public countSectionsWithIndicatorsToShow(sections: Section[]):number { + return sections.map(section => this.countIndicatorsToShow(section.indicators)).reduce((sum, current) => sum + current, 0); + } + + public countIndicatorsToShow(indicators: Indicator[]): number { + return indicators.filter(indicator => this.hasPermission(indicator.visibility)).length; + } + + public getNumberClassBySize(size: IndicatorSize) { + if (size === 'small') { + return 'uk-width-medium@m uk-width-1-1'; + } else if (size === 'medium') { + return 'uk-width-1-4@l uk-width-1-2@m uk-width-1-1'; + } else { + return 'uk-width-1-2@l uk-width-1-1@m uk-width-1-1'; + } + } + + public getChartClassBySize(size: IndicatorSize): string { + if (size === 'small') { + return 'uk-width-1-3@xl uk-width-1-2@m uk-width-1-1'; + } else if (size === 'medium') { + return 'uk-width-1-2@l uk-width-1-1'; + } else { + return 'uk-width-1-1'; + } + } + + public printReport() { + window.print(); + } + + changeOverlay(event, indicator: Indicator, overlay: Overlay) { + event.stopPropagation(); + indicator.overlay = overlay; + } + + closeOverlay(event: ClickEvent, indicator: Indicator) { + if(event.clicked && indicator.overlay) { + indicator.overlay = false; + } + } + + private createClipboard() { + if (typeof window !== 'undefined') { + delete this.clipboard; + let Clipboard; + Clipboard = require('clipboard'); + this.clipboard = new Clipboard('.clipboard_btn'); + } + } + + //Refine Type Filters + + setSelectedFilters(){ + for (var i = 0; i < this.filters.length; i++) { + var filter: Filter = this.filters[i]; + filter.countSelectedValues = 0; + let parameterNames = Object.keys(this.queryParams); + if (parameterNames.indexOf(filter.filterId) != -1) { + let values = (decodeURIComponent(this.queryParams[filter.filterId])).split(/,(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)/, -1); + for (let filterValue of filter.values) { + if (values.indexOf(StringUtils.quote(filterValue.id)) > -1) { + filterValue.selected = true; + filter.countSelectedValues++; + } else { + filterValue.selected = false; + + } + } + + } else { + for (let filterValue of filter.values) { + filterValue.selected = false; + } + } + + } + } + getSelectedFilterValues(filterId){ + let values = null; + for (let filter of this.filters) { + if(filterId == filter.filterId && filter.countSelectedValues > 0) { + values =filterId == "fos"?{lvl1:[],lvl2:[]}:[]; + for (let filterValue of filter.values) { + if (filterValue.selected) { + if(filterId == "fos"){ + let code = filterValue.id.split(" ")[0]; + if(code.length == 2){ + values.lvl1.push(filterValue.id) + }else{ + values.lvl2.push(filterValue.id) + } + }else if(filterId == "publiclyfunded"){ + // console.log("publiclyFunded", filterValue) + return filterValue.id; + }else{ + values.push(filterValue.id); + } + } + } + } + + } + return values; + } + +} diff --git a/monitor/services/resources.service.ts b/monitor/services/resources.service.ts index 841ff3a4..8884ed22 100644 --- a/monitor/services/resources.service.ts +++ b/monitor/services/resources.service.ts @@ -1,12 +1,12 @@ import {Injectable} from "@angular/core"; import {MenuItem} from "../../sharedComponents/menu"; import {Option} from "../../sharedComponents/input/input.component"; -import {StakeholderEntities} from "../entities/stakeholder"; import {from, Subscription} from "rxjs"; import {HttpClient} from "@angular/common/http"; import {properties} from "../../../../environments/environment"; import {Page} from "../../utils/entities/adminTool/page"; import {map} from "rxjs/operators"; +import {StakeholderConfiguration} from "../../monitor-admin/utils/indicator-utils"; @Injectable({ providedIn: 'root' @@ -16,12 +16,7 @@ export class ResourcesService { private subscription: Subscription; private routes = ResourcesService.types.map(type => '/indicators/' + type.value); - public static readonly types: Option[] = [ - {value: 'funder', label: StakeholderEntities.FUNDERS}, - {value: 'ri', label: StakeholderEntities.RIS}, - {value: 'project', label: StakeholderEntities.PROJECTS}, - {value: 'organization', label: StakeholderEntities.ORGANIZATIONS} - ]; + public static readonly types: Option[] = StakeholderConfiguration.TYPES; constructor(private http: HttpClient) { } diff --git a/monitor/services/stakeholder.service.ts b/monitor/services/stakeholder.service.ts index 21fffb88..37fd7a3c 100644 --- a/monitor/services/stakeholder.service.ts +++ b/monitor/services/stakeholder.service.ts @@ -53,6 +53,30 @@ export class StakeholderService { } return from(this.getStakeholderAsync()); } + getResearcherStakeholder( orcid, name, results, shouldUpdate: boolean = false): Observable { + if (!this.stakeholderSubject.value || this.stakeholderSubject.value.alias !== orcid || shouldUpdate) { + this.promise = new Promise((resolve, reject) => { + this.sub = this.http.get(properties.monitorServiceAPIURL + '/stakeholder/' + encodeURIComponent("researcher"), CustomOptions.registryOptions()).pipe(map(stakeholder => { + return this.formalize(this.checkIsUpload(stakeholder)); + })).subscribe(stakeholder => { + stakeholder.index_id = orcid; + stakeholder.index_name = name; + stakeholder.name = name; + stakeholder.alias = orcid; + if(results <7 && stakeholder.topics[0]?.categories[0]?.subCategories[0]){ + stakeholder.topics[0].categories[0].subCategories[0].charts=[]; // keep only numbers - charts wont show much anyway + } + this.stakeholderSubject.next(stakeholder); + resolve(); + }, error => { + let stakeholder = new Stakeholder(null,"researcher", orcid,name,name,orcid,"PUBLIC", null, null,""); + this.stakeholderSubject.next(stakeholder); + resolve(); + }); + }); + } + return from(this.getStakeholderAsync()); + } async getStakeholderAsync() { if (this.promise) { diff --git a/notifications/notifications-sidebar/notification-sidebar.component.less b/notifications/notifications-sidebar/notification-sidebar.component.less index 4f8222c4..6f07e3a8 100644 --- a/notifications/notifications-sidebar/notification-sidebar.component.less +++ b/notifications/notifications-sidebar/notification-sidebar.component.less @@ -1,4 +1,5 @@ -@import "~src/assets/openaire-theme/less/_import-variables"; +@import (reference) "~src/assets/openaire-theme/less/_import-variables"; +@import (optional) "~src/assets/extend-theme/less/_import-variables"; #notifications-switcher { top: 480px !important; diff --git a/notifications/notifications-sidebar/notifications-sidebar.component.ts b/notifications/notifications-sidebar/notifications-sidebar.component.ts index 83cc74cb..d07f1c6a 100644 --- a/notifications/notifications-sidebar/notifications-sidebar.component.ts +++ b/notifications/notifications-sidebar/notifications-sidebar.component.ts @@ -40,7 +40,7 @@ export class NotificationConfiguration { -
        Notifications
        + Notifications
        @@ -75,7 +75,7 @@ export class NotificationConfiguration { -
        {{notification.title}}
        + {{notification.title}}
        diff --git a/notifications/notify-form/notify-form.component.ts b/notifications/notify-form/notify-form.component.ts index 0072855c..c9196149 100644 --- a/notifications/notify-form/notify-form.component.ts +++ b/notifications/notify-form/notify-form.component.ts @@ -7,11 +7,12 @@ import {NotificationService} from "../notification.service"; import {Notification} from "../notifications"; import {InputComponent, Option} from "../../sharedComponents/input/input.component"; import {NotificationHandler} from "../../utils/notification-handler"; +import {BaseComponent} from "../../sharedComponents/base/base.component"; @Component({ selector: '[notify-form]', template: ` -
        +
        @@ -44,7 +45,7 @@ import {NotificationHandler} from "../../utils/notification-handler"; styleUrls: ['notify-form.component.less'], encapsulation: ViewEncapsulation.None }) -export class NotifyFormComponent implements OnInit, OnDestroy { +export class NotifyFormComponent extends BaseComponent implements OnInit { @Input() public label: string = 'Notify Managers'; public form: UntypedFormGroup; @@ -57,13 +58,13 @@ export class NotifyFormComponent implements OnInit, OnDestroy { public focused: boolean = false; @ViewChild('recipients', { static: false }) recipients: InputComponent; private notification: Notification; - private subscriptions: any[] = []; public sending: boolean = false; constructor(private fb: UntypedFormBuilder, private cdr: ChangeDetectorRef, private userManagementService: UserManagementService, private notificationService: NotificationService) { + super(); } @Input() @@ -79,14 +80,6 @@ export class NotifyFormComponent implements OnInit, OnDestroy { })); } - ngOnDestroy() { - this.subscriptions.forEach(subscription => { - if (subscription instanceof Subscription) { - subscription.unsubscribe(); - } - }) - } - reset(message: string = null) { if (!this.availableGroups) { this.form = this.fb.group({ @@ -116,7 +109,7 @@ export class NotifyFormComponent implements OnInit, OnDestroy { } sendNotification(notification: Notification = null) { - if (this.message) { + if (this.message && this.properties.notificationsAPIURL) { if(notification === null) { notification = new Notification('CUSTOM', [this.service], null, null); notification.groups = this.parseGroups(); @@ -162,16 +155,12 @@ export class NotifyFormComponent implements OnInit, OnDestroy { } get message(): string { - if ((this.form.get('notify') && !this.form.get('notify').value) || (this.groupsAsFromArray && this.groupsAsFromArray.length === 0)) { + if (!this.properties.notificationsAPIURL || (this.form.get('notify') && !this.form.get('notify').value) || (this.groupsAsFromArray && this.groupsAsFromArray.length === 0)) { return null; } return this.form.get('message').value; } - onFocus(event: boolean) { - this.focused = event; - } - focus(event) { this.focused = true; event.stopPropagation(); diff --git a/orcid/my-orcid-links/myOrcidLinks.component.ts b/orcid/my-orcid-links/myOrcidLinks.component.ts index 29d66592..ed8238d6 100644 --- a/orcid/my-orcid-links/myOrcidLinks.component.ts +++ b/orcid/my-orcid-links/myOrcidLinks.component.ts @@ -32,10 +32,14 @@ declare var UIkit: any; My ORCID links
        - Discover {{openaireEntities.RESULTS | lowercase}} related to you + + Discover {{openaireEntities.RESULTS | lowercase}} related to you +
        @@ -203,7 +207,7 @@ export class MyOrcidLinksComponent { this.subscriptions.push(this._orcidService.getPersonalDetails().subscribe( details => { let author: string = ""; - +console.log(details) if(details && details['name']) { let name: string = details['name']; if(name['given-names'] && name['given-names']['value']) { diff --git a/orcid/orcid-work.component.ts b/orcid/orcid-work.component.ts index c7cd5b74..6153d146 100644 --- a/orcid/orcid-work.component.ts +++ b/orcid/orcid-work.component.ts @@ -12,6 +12,8 @@ import {EnvProperties} from "../utils/properties/env-properties"; import {UserManagementService} from "../services/user-management.service"; import {OpenaireEntities} from "../utils/properties/searchFields"; import {FullScreenModalComponent} from "../utils/modal/full-screen-modal/full-screen-modal.component"; +import {LogService} from "../utils/log/log.service"; +import {UserProfileService} from "../services/userProfile.service"; declare var UIkit: any; @@ -20,88 +22,54 @@ declare var UIkit: any; template: ` - - - - Claim - -
        + [ngClass]="isMobile && pageType == 'landing' ? ' uk-width-1-1' : ''" + [attr.uk-tooltip]="isMobile? 'cls: uk-invisible' : 'pos: bottom; cls: uk-active uk-text-small uk-padding-small'" + [title]="(noPids || !isLoggedIn) ? ((noPids) ? tooltipNoPid : tooltipNoLoggedInUser) : tooltipAdd"> + + + + + Claim + +
        +         - - - - - Remove - -
        + [title]="(noPids || !isLoggedIn) ? ((noPids) ? tooltipNoPid : tooltipNoLoggedInUser) : tooltipDelete"> + + + + + Remove + +
        +         - - -
        {{requestGrantMessage}}
        - - - - - - - - - - - - - - - - - -
        @@ -290,18 +258,6 @@ declare var UIkit: any; instead.
        - - - - - - - - - - - - @@ -364,12 +320,9 @@ export class OrcidWorkComponent { public window: any; public isLoggedIn: boolean = false; - + public hasConsent: boolean = false; public currentAction: string = ""; - public hoverAdd: boolean = false; - public hoverDelete: boolean = false; - public properties: EnvProperties = properties; public openaireEntities = OpenaireEntities; @@ -377,7 +330,7 @@ export class OrcidWorkComponent { private _router: Router, private orcidService: OrcidService, private resultLandingService: ResultLandingService, - private userManagementService: UserManagementService) { + private userManagementService: UserManagementService, private _logService: LogService, private _userProfileService: UserProfileService) { if (typeof document !== 'undefined') { this.tokenUrl = properties.orcidTokenURL + "client_id=" + properties.orcidClientId @@ -389,18 +342,27 @@ export class OrcidWorkComponent { } ngOnInit() { - this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => { - if (user) { - this.isLoggedIn = true; - if (!this.givenPutCode) { - this.getPutCode(); + if(this.properties.environment != 'beta') { + this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => { + if (user) { + this.isLoggedIn = true; + if (!this.givenPutCode) { + this.getPutCode(); + } + } else { + this.isLoggedIn = false; } - } else { + }, error => { this.isLoggedIn = false; + })); + if (properties.dashboard == 'irish') { + this.subscriptions.push(this._userProfileService.getUserProfile().subscribe(userProfile => { + this.hasConsent = userProfile.consent; + }, error => { + this.hasConsent = false; + })); } - }, error => { - this.isLoggedIn = false; - })); + } } ngOnDestroy() { @@ -441,7 +403,7 @@ export class OrcidWorkComponent { } openGrantWindow() { - if (!Session.isLoggedIn()) { + if (!this.isLoggedIn) { //this.userValidMessage = "User session has expired. Please login again."; this._router.navigate(['/user-info'], { queryParams: { @@ -513,7 +475,7 @@ export class OrcidWorkComponent { } public saveWorkPreparation() { - if (!Session.isLoggedIn()) { + if (!this.isLoggedIn) { //this.userValidMessage = "User session has expired. Please login again."; this._router.navigate(['/user-info'], { queryParams: { @@ -522,7 +484,15 @@ export class OrcidWorkComponent { } }); } else { - + if(properties.dashboard == 'irish' && !this.hasConsent){ + this._router.navigate(['/consent'], { + queryParams: { + "errorCode": LoginErrorCodes.NOT_VALID, + "redirectUrl": this._router.url + } + }); + return; + } if (this.requestGrant) { this.openGrantModal("Add, delete or edit work in your ORCID record"); } else { @@ -540,7 +510,9 @@ export class OrcidWorkComponent { private saveWork() { this.subscriptions.push(this.orcidService.saveWork(this.resultLandingInfo, this.pids).subscribe( response => { - + if(this.properties.logServiceUrl) { + this.subscriptions.push(this._logService.logOrcidLink(this.properties, "added", this.resultLandingInfo.title, this.resultLandingInfo.identifiers.get('doi')[0]).subscribe(res => { })); + } // for testing only // this.openGrantModal("Add work in your ORCID record"); // this.requestGrant = true; @@ -722,6 +694,9 @@ export class OrcidWorkComponent { if (deletedPutCodes) { for (let i = 0; i < deletedPutCodes.length; i++) { let deletedPutCode = deletedPutCodes[i]; + if(this.properties.logServiceUrl) { + this.subscriptions.push(this._logService.logRemoveOrcidLink(this.properties, deletedPutCode).subscribe(res => { })); + } if (deletedPutCode == null) { deletedAll = false; } else { @@ -872,13 +847,18 @@ export class OrcidWorkComponent { } this.showLoading = false; } - + + get tooltipBETA() { + // return "Login to the production environment to add works to your ORCID record"; + return "Add or delete a work from your ORCID record. This feature is not available on BETA."; + } + get tooltipAdd() { - return "Add this work to your ORCID record" + ((properties.environment == "beta") ? ". The action will affect your real ORCID iD." : ""); + return (properties.environment == "beta") ? this.tooltipBETA : ("Add this work to your ORCID record" + ((properties.environment == "test") ? ". The action will affect your real ORCID iD." : "")); } get tooltipDelete() { - return "Delete this work from your ORCID record" + ((properties.environment == "beta") ? ". The action will affect your real ORCID iD." : ""); + return "Delete this work from your ORCID record" + ((properties.environment == "test") ? ". The action will affect your real ORCID iD." : ""); } get tooltipNoPid() { @@ -886,16 +866,14 @@ export class OrcidWorkComponent { } get tooltipNoLoggedInUser() { - return "Add or delete a work from your ORCID record. Please log in first." + return (properties.environment == "beta") ? this.tooltipBETA : "Add or delete a work from your ORCID record. Please log in first." } - - hoverEvent($event, action: string = "add") { - if (action == "add") { - this.hoverAdd = $event.type == "mouseover"; - this.hoverDelete = false; - } else if (action == "delete") { - this.hoverDelete = $event.type == "mouseover"; - this.hoverAdd = false; - } + + get isDisabled() { + return (this.properties.environment == 'beta' || this.showLoading || !this.isLoggedIn || (!this.pids && (!this.identifiers || this.identifiers.size == 0))); + } + + get noPids() { + return (!this.pids && (!this.identifiers || this.identifiers.size == 0)); } } diff --git a/orcid/orcid.module.ts b/orcid/orcid.module.ts index fd8428e0..097be324 100644 --- a/orcid/orcid.module.ts +++ b/orcid/orcid.module.ts @@ -16,11 +16,12 @@ import {IconsModule} from '../utils/icons/icons.module'; import {IconsService} from "../utils/icons/icons.service"; import {orcid_add, orcid_bin} from "../utils/icons/icons"; import {FullScreenModalModule} from "../utils/modal/full-screen-modal/full-screen-modal.module"; +import {LogServiceModule} from "../utils/log/LogService.module"; @NgModule({ imports: [ CommonModule, RouterModule, AlertModalModule, LoadingModule, ResultLandingUtilsModule, - IconsModule, FullScreenModalModule + IconsModule, FullScreenModalModule, LogServiceModule ], declarations: [ OrcidComponent, diff --git a/reload/reload.component.ts b/reload/reload.component.ts index e86df79c..bc728233 100644 --- a/reload/reload.component.ts +++ b/reload/reload.component.ts @@ -15,7 +15,7 @@ export class ReloadComponent { } public ngOnInit() { - let URL = Session.getReloadUrl(); + let URL = Session.popReloadUrl(); if (URL && URL["path"] && URL["path"] != "") { let url: string = URL["path"]; let host = URL["host"]; @@ -24,14 +24,12 @@ export class ReloadComponent { let baseUrl = (document && document.getElementsByTagName('base')) ? document.getElementsByTagName('base')[0].href.split(document.location.host)[1] : "/"; url = (baseUrl.length > 1 && url.indexOf(baseUrl) != -1) ? ("/" + url.split(baseUrl)[1]) : url; if (paramsObject) { - Session.setReloadUrl("", "", "", ""); if(URL['fragment'] && URL['fragment'] !== '') { this._router.navigate([url], {queryParams: paramsObject, fragment: URL['fragment']}); } else { this._router.navigate([url], {queryParams: paramsObject}); } } else { - Session.setReloadUrl("", "", "", ""); if(URL['fragment'] && URL['fragment'] !== '') { this._router.navigate([url], {fragment: URL['fragment']}); } else { @@ -39,12 +37,10 @@ export class ReloadComponent { } } } else { - Session.setReloadUrl("", "", "", ""); window.location.href = host + url + ((URL["params"] && URL["params"] != null) ? ((URL["params"].indexOf("?") == -1 ? "?" : "") + URL["params"]) : ""); } } else { - Session.setReloadUrl("", "", "", ""); this._router.navigate(['/']); } } diff --git a/role-verification/role-verification.component.ts b/role-verification/role-verification.component.ts index c4a9a71a..416c2624 100644 --- a/role-verification/role-verification.component.ts +++ b/role-verification/role-verification.component.ts @@ -1,16 +1,17 @@ -import {AfterViewInit, ChangeDetectorRef, Component, Input, OnDestroy, OnInit, ViewChild} from "@angular/core"; -import {User} from "../login/utils/helper.class"; +import {AfterViewInit, ChangeDetectorRef, Component, Input, OnInit, ViewChild} from "@angular/core"; +import {Role, User} from "../login/utils/helper.class"; import {ActivatedRoute, Router} from "@angular/router"; import {UserManagementService} from "../services/user-management.service"; import {UserRegistryService} from "../services/user-registry.service"; import {LoginErrorCodes} from "../login/utils/guardHelper.class"; -import {Subscriber, Subscription} from "rxjs"; +import {Subscription} from "rxjs"; import {UntypedFormBuilder, UntypedFormControl, Validators} from "@angular/forms"; import {AlertModal} from "../utils/modal/alert"; import {properties} from "../../../environments/environment"; import {EmailService} from "../utils/email/email.service"; import {Composer} from "../utils/email/composer"; import {ClearCacheService} from "../services/clear-cache.service"; +import {BaseComponent} from "../sharedComponents/base/base.component"; @Component({ selector: 'role-verification', @@ -77,15 +78,17 @@ import {ClearCacheService} from "../services/clear-cache.service"; ` }) -export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewInit { +export class RoleVerificationComponent extends BaseComponent implements OnInit, AfterViewInit { @Input() public id: string; @Input() - public type: string; + set type(type: string) { + this._type = Role.GROUP + type; + } @Input() public name: string; @Input() - public service: "connect" | "monitor" = "monitor"; + public service: "connect" | "monitor" | "irish" = "monitor"; @Input() public userInfoLinkPrefix = ''; @Input() @@ -93,7 +96,7 @@ export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewIn public user: User; public verification: any; public code: UntypedFormControl; - private subscriptions: any[] = []; + private _type: string; private paramsSubscription: Subscription; @ViewChild('managerModal') managerModal: AlertModal; @ViewChild('memberModal') memberModal: AlertModal; @@ -102,14 +105,15 @@ export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewIn public loading: boolean = false; public isMember: boolean = false; - constructor(private route: ActivatedRoute, - private router: Router, + constructor(protected _route: ActivatedRoute, + protected _router: Router, private fb: UntypedFormBuilder, private emailService: EmailService, private userManagementService: UserManagementService, private userRegistryService: UserRegistryService, private clearCacheService: ClearCacheService, private cdr: ChangeDetectorRef) { + super(); } ngOnInit() { @@ -119,14 +123,14 @@ export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewIn ngAfterViewInit() { this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => { this.user = user; - this.paramsSubscription = this.route.queryParams.subscribe(params => { + this.paramsSubscription = this._route.queryParams.subscribe(params => { if (params) { this.cdr.detectChanges(); if(params['verify'] && !this.isMember) { if (this.user) { this.subscriptions.push(this.userRegistryService.getInvitation(params['verify']).subscribe(verification => { this.verification = verification; - if (this.user.email === this.verification.email.toLowerCase() && this.id === this.verification.entity && this.type === this.verification.type) { + if (this.user.email === this.verification.email.toLowerCase() && this.id === this.verification.entity && this._type === this.verification.type) { if (this.verification.verificationType === 'manager') { this.openManagerModal(); } else if (this.verification.verificationType === 'member') { @@ -141,12 +145,12 @@ export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewIn this.openErrorModal(); })); } else { - this.router.navigate(['user-info'], { + this._router.navigate(['user-info'], { queryParams: { 'errorCode': LoginErrorCodes.NOT_LOGIN, - 'redirectUrl': this.router.url + 'redirectUrl': this._router.url }, - relativeTo: this.route + relativeTo: this._route }); } } else if(this.isMember) { @@ -161,14 +165,10 @@ export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewIn } ngOnDestroy() { + super.ngOnDestroy(); if (this.paramsSubscription instanceof Subscription) { this.paramsSubscription.unsubscribe(); } - this.subscriptions.forEach(subscription => { - if (subscription instanceof Subscriber) { - subscription.unsubscribe(); - } - }); } public openManagerModal() { @@ -216,9 +216,12 @@ export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewIn if (this.paramsSubscription instanceof Subscription) { this.paramsSubscription.unsubscribe(); } - if (this.service === "monitor") { + if(this.service === "irish") { this.loading = false; - this.router.navigate(['/admin/' + this.verification.entity]); + this.userManagementService.login(properties.domain + '/admin/' + this.verification.entity); + } else if (this.service === "monitor" ) { + this.loading = false; + this._router.navigate(['/admin/' + this.verification.entity]); } else { this.subscriptions.push(this.emailService.notifyManagers(this.id, 'manager', Composer.composeEmailToInformOldManagersForTheNewOnes(this.name, this.id)).subscribe(() => { @@ -275,6 +278,6 @@ export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewIn cancel() { this.isMember = false; - this.router.navigate([]); + this._router.navigate([]); } } diff --git a/sdg/sdg.component.less b/sdg/sdg.component.less index 56f50806..e911a7b9 100644 --- a/sdg/sdg.component.less +++ b/sdg/sdg.component.less @@ -1,4 +1,5 @@ @import (reference) "~src/assets/openaire-theme/less/_import-variables"; +@import (optional) "~src/assets/extend-theme/less/_import-variables"; @sdgs: #E6233D, #DF9F00, #19A220, #D70023, #FF0B00, #00BFE8, #FFC300, #B10240, #FF5D00, #F50D86, #FF8A00, #CA8A03, #2B772B, #0098DF, #00B91C, #0069A2, #1C336A; diff --git a/searchPages/searchDataProviders.component.ts b/searchPages/searchDataProviders.component.ts index 5f086b29..c5483431 100644 --- a/searchPages/searchDataProviders.component.ts +++ b/searchPages/searchDataProviders.component.ts @@ -53,8 +53,15 @@ import {RefineFieldResultsService} from "../services/refineFieldResults.service" export class SearchDataProvidersComponent { private errorCodes: ErrorCodes; private errorMessages: ErrorMessagesComponent; - @Input() customFilter:SearchCustomFilter= null; - @Input() tableViewLink; + @Input() customFilters: SearchCustomFilter[] = null; + @Input() + set customFilter(customFilter: SearchCustomFilter | SearchCustomFilter[]) { + if(!Array.isArray(customFilter)) { + this.customFilters = customFilter?[customFilter]:null; + }else{ + this.customFilters = customFilter; + } + } @Input() tableViewLink; @Input() searchForm: SearchForm = {class: 'search-form', dark: true}; public results =[]; public filters =[]; @@ -159,7 +166,7 @@ export class SearchDataProvidersComponent { this.searchPage.keywordFields = this.searchFields.DEPOSIT_DATASOURCE_KEYWORD_FIELDS; this.searchPage.usedBy = "deposit"; } - this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, [], this.staticFields, this.fieldIdsMap,this.customFilter,params, this.entityType); + this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, [],this.staticFields, this.fieldIdsMap,this.customFilters,params, this.entityType); if(refine) { this._getFilters(this.searchPage.getSearchAPIQueryForAdvancedSearhFields(params), this.searchUtils.page, 0, true, this.searchPage.getSearchAPIQueryForRefineFields(params, firstLoad)); } else { @@ -381,7 +388,7 @@ export class SearchDataProvidersComponent { } let index: number = this.filters.findIndex((fltr: Filter) => fltr.filterId == filter.filterId); - filter.isOpen = true; + filter.isViewAllOpen = true; this.filters[index] = filter; this.cdr.detectChanges(); }, diff --git a/searchPages/searchOrganizations.component.ts b/searchPages/searchOrganizations.component.ts index 46055ee4..50deb4a2 100644 --- a/searchPages/searchOrganizations.component.ts +++ b/searchPages/searchOrganizations.component.ts @@ -62,8 +62,15 @@ export class SearchOrganizationsComponent { public loadPaging: boolean = true; public oldTotalResults: number = 0; public pagingLimit: number = 0; - @Input() customFilter:SearchCustomFilter= null; - public refineFields: string[] = this.searchFields.ORGANIZATION_REFINE_FIELDS; + @Input() customFilters: SearchCustomFilter[] = null; + @Input() + set customFilter(customFilter: SearchCustomFilter | SearchCustomFilter[]) { + if(!Array.isArray(customFilter)) { + this.customFilters = customFilter?[customFilter]:null; + }else{ + this.customFilters = customFilter; + } + } public refineFields: string[] = this.searchFields.ORGANIZATION_REFINE_FIELDS; @ViewChild(NewSearchPageComponent, { static: true }) searchPage: NewSearchPageComponent; @Input() simpleView: boolean = true; @Input() simpleSearchLink: string = ""; @@ -132,7 +139,7 @@ export class SearchOrganizationsComponent { // this.searchPage.fieldIdsMap = this.fieldIdsMap; // this.searchPage.customFilter = this.customFilter; // this.searchPage.getSelectedFiltersFromUrl(params); - this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, [], [], this.fieldIdsMap,this.customFilter,params, "organization"); + this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, [], [], this.fieldIdsMap,this.customFilters,params, "organization"); if(refine) { this._getFilters(this.searchPage.getSearchAPIQueryForAdvancedSearhFields(), this.searchUtils.page, 0, true, this.searchPage.getSearchAPIQueryForRefineFields(params, firstLoad)); } else { @@ -340,7 +347,7 @@ export class SearchOrganizationsComponent { } let index: number = this.filters.findIndex((fltr: Filter) => fltr.filterId == filter.filterId); - filter.isOpen = true; + filter.isViewAllOpen = true; this.filters[index] = filter; this.cdr.detectChanges(); }, diff --git a/searchPages/searchProjects.component.ts b/searchPages/searchProjects.component.ts index dd70ff8c..5e4e36c5 100644 --- a/searchPages/searchProjects.component.ts +++ b/searchPages/searchProjects.component.ts @@ -46,8 +46,15 @@ import {RefineFieldResultsService} from "../services/refineFieldResults.service" export class SearchProjectsComponent { private errorCodes: ErrorCodes; private errorMessages: ErrorMessagesComponent; - @Input() customFilter: SearchCustomFilter = null; - @Input() searchForm: SearchForm = {class: 'search-form', dark: true}; + @Input() customFilters: SearchCustomFilter[] = null; + @Input() + set customFilter(customFilter: SearchCustomFilter | SearchCustomFilter[]) { + if(!Array.isArray(customFilter)) { + this.customFilters = customFilter?[customFilter]:null; + }else{ + this.customFilters = customFilter; + } + } @Input() searchForm: SearchForm = {class: 'search-form', dark: true}; public results = []; public filters = []; public rangeFilters: RangeFilter[] = []; @@ -133,7 +140,7 @@ export class SearchProjectsComponent { this.searchPage.fieldIds = this.fieldIds; this.selectedFields = []; - this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, this.rangeFields, [], this.fieldIdsMap, this.customFilter, params, "project"); + this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, this.rangeFields,[], this.fieldIdsMap, this.customFilters, params, "project"); if (refine) { this._getFilters(this.searchPage.getSearchAPIQueryForAdvancedSearhFields(), this.searchUtils.page, 0, "", true, this.searchPage.getSearchAPIQueryForRangeFields(params) + this.searchPage.getSearchAPIQueryForRefineFields(params, firstLoad)); } else { @@ -369,7 +376,7 @@ export class SearchProjectsComponent { } let index: number = this.filters.findIndex((fltr: Filter) => fltr.filterId == filter.filterId); - filter.isOpen = true; + filter.isViewAllOpen = true; this.filters[index] = filter; this.cdr.detectChanges(); }, @@ -381,4 +388,4 @@ export class SearchProjectsComponent { } ) } -} \ No newline at end of file +} diff --git a/searchPages/searchResearchResults.component.ts b/searchPages/searchResearchResults.component.ts index 00bc7bc2..176ae26c 100644 --- a/searchPages/searchResearchResults.component.ts +++ b/searchPages/searchResearchResults.component.ts @@ -19,7 +19,7 @@ import {RefineFieldResultsService} from "../services/refineFieldResults.service" selector: 'search-research-results', template: ` oldFilter.filterId == filter.filterId); + // if(index != -1 && this.filters[index].isOpen) { + // filter.isOpen = true; + // } + // } + this.filters = refineFilters; this.rangeFilters = this.searchPage.prepareRangeFiltersToShow(); this.staticFilters = this.searchPage.prepareStaticFiltersToShow(); @@ -319,9 +335,14 @@ export class SearchResearchResultsComponent { if (group.type == "refine") { let groupedFilters = {title: group.title, values: []}; for (let field of group.values) { - let index = this.filters.findIndex(filter => filter.filterId == field); + let index = this.staticFilters.findIndex(filter => filter.filterId == field); if (index > -1) { - groupedFilters.values.push(this.filters[index]); + groupedFilters.values.push(this.staticFilters[index]); + } else { + index = this.filters.findIndex(filter => filter.filterId == field); + if (index > -1) { + groupedFilters.values.push(this.filters[index]); + } } } if (groupedFilters.values.length > 0) { @@ -526,7 +547,7 @@ export class SearchResearchResultsComponent { } let index: number = this.filters.findIndex((fltr: Filter) => fltr.filterId == filter.filterId); - filter.isOpen = true; + filter.isViewAllOpen = true; filter.countSelectedValues = oldFilter.countSelectedValues; filter.radioValue = oldFilter.radioValue; this.filters[index] = filter; diff --git a/searchPages/searchUtils/entitiesSelection.component.ts b/searchPages/searchUtils/entitiesSelection.component.ts index d4df8e7b..73388a0c 100644 --- a/searchPages/searchUtils/entitiesSelection.component.ts +++ b/searchPages/searchUtils/entitiesSelection.component.ts @@ -106,7 +106,8 @@ export class EntitiesSelectionComponent { })); } else if ((this.customFilter && this.customFilter.queryFieldName == "community") || (this.customFilter && (this.customFilter.queryFieldName == "relfunder" || this.customFilter.queryFieldName == "funder")) || - (this.customFilter && this.customFilter.queryFieldName == "relorganizationid")) { + (this.customFilter && this.customFilter.queryFieldName == "relorganizationid") + || this.properties.dashboard == "irish") { this.entities.push({label: OpenaireEntities.RESULTS, value: 'result'}); this.entities.push({label: OpenaireEntities.PROJECTS, value: 'project'}); this.entities.push({label: OpenaireEntities.ORGANIZATIONS, value: 'organization'}); diff --git a/searchPages/searchUtils/newSearchPage.component.html b/searchPages/searchUtils/newSearchPage.component.html index ce07b7af..51dc82fa 100644 --- a/searchPages/searchUtils/newSearchPage.component.html +++ b/searchPages/searchUtils/newSearchPage.component.html @@ -4,15 +4,15 @@
          - + +
        • {{customFilter.valueName}}
          • +           @@ -49,9 +49,13 @@ - {{filter.title}}: - {{value.name=='true'?'Yes':'No'}} - + + + {{filter.title}}: + {{(value.name=='true'||value.name=='Yes')?'Yes':'No'}} + + + {{value.name}} @@ -66,14 +70,16 @@ -
        • - {{filter.title}}: - {{value.name=='true'?'Yes':'No'}} - + class="uk-margin-small-right uk-width-expand uk-text-truncate"> + + {{filter.title}}: + {{(value.name=='true'||value.name=='Yes')?'Yes':'No'}} + + {{value.name}} @@ -94,13 +100,13 @@ - + + [actionRoute]="true" [grouped]="grouped"> @@ -125,15 +131,15 @@
            -
            {{group.title}}
            - +
            {{group.title}}
            +
            • -
          • - +
          • +
            • @@ -222,12 +228,13 @@
        -
        @@ -254,7 +261,7 @@ [advancedSearchLinkParameters]="this.routerHelper.createQueryParams(this.parameterNames, this.parameterValues)" [simpleView]="simpleView" [formPlaceholderText]="formPlaceholderText" [isMobile]="mobile" [resultTypes]="resultTypes" [quickFilter]="quickFilter" [entitiesSelection]="entitiesSelection" - [showSwitchSearchLink]="showSwitchSearchLink" [customFilter]="customFilter" + [showSwitchSearchLink]="showSwitchSearchLink" [customFilter]="customFilters?customFilters[0]:null" >
        @@ -317,18 +324,13 @@
        - -
        - Do you want to see results only for {{customFilter.valueName}}? Click here. -
        - The following results are related to + The following results are related to {{customFilter.valueName}}. + Are you interested to view more results? Visit -
        +
        {{searchUtils.totalResults|number}} {{type}} @@ -365,6 +367,11 @@ [isDisabled]="disabled" [type]="csvPath" [csvParams]="csvParams" [totalResults]="searchUtils.totalResults"> + + + Data dump + +
        @@ -444,4 +451,3 @@
        - diff --git a/searchPages/searchUtils/newSearchPage.component.ts b/searchPages/searchUtils/newSearchPage.component.ts index 4bdbdaaf..5f62d7d6 100644 --- a/searchPages/searchUtils/newSearchPage.component.ts +++ b/searchPages/searchUtils/newSearchPage.component.ts @@ -69,7 +69,15 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges { @Input() loadPaging: boolean = true; @Input() oldTotalResults: number = 0; @Input() openaireLink: string; - @Input() customFilter: SearchCustomFilter; + @Input() customFilters: SearchCustomFilter[] = null; + @Input() + set customFilter(customFilter: SearchCustomFilter | SearchCustomFilter[]) { + if(!Array.isArray(customFilter)) { + this.customFilters = customFilter?[customFilter]:null; + }else{ + this.customFilters = customFilter; + } + } @Input() sort: boolean = true; @Input() sortedByChanged: string = ""; @Input() searchForm: SearchForm = {class: 'search-form', dark: true}; @@ -144,11 +152,9 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges { //Dashboard filterToggle = false; - customFilterEnabled: boolean = false; //stickyform @Input() stickyForm: boolean = false; - - @ViewChild('removeCustomFilter') removeCustomFilter: AlertModal; + currentValueToRemove; currentFilterToRemove; public indexUpdateDate: Date; @@ -159,7 +165,7 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges { advancedSearchTerms: number = 0; @Output() filterRequestAll = new EventEmitter(); - + constructor(private route: ActivatedRoute, private location: Location, private _meta: Meta, @@ -195,7 +201,6 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges { if (params['page'] && params['page'] != 1) { HelperFunctions.scrollToId("searchForm"); } - this.customFilterEnabled = params['cf'] && params['cf'] == "true"; if (this.basicMetaDescription.length == 0) { if (this.entityType == "result") { this.basicMetaDescription = [OpenaireEntities.RESULTS, "Discover" + (this.properties.adminToolsCommunity == 'openaire' ? " over 100 million of" : "") + " "+OpenaireEntities.RESULTS+" ", "categorized by research type, year range, funder, languages, "+OpenaireEntities.COMMUNITY+" and "+OpenaireEntities.DATASOURCES+"."]; @@ -229,14 +234,14 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges { } private getPageContents() { - this.subscriptions.push(this.helper.getPageHelpContents(this.properties, (this.customFilter && this.customFilter.queryFieldName == "communityId") ? this.customFilter.valueId : this.properties.adminToolsCommunity, this.router.url).subscribe(contents => { + this.subscriptions.push(this.helper.getPageHelpContents(this.properties, (this.customFilters && this.customFilters[0] && this.customFilters[0].queryFieldName == "communityId") ? this.customFilters[0].valueId : this.properties.adminToolsCommunity, this.router.url).subscribe(contents => { this.pageContents = contents; })); } private getDivContents() { - this.subscriptions.push(this.helper.getDivHelpContents(this.properties, (this.customFilter && this.customFilter.queryFieldName == "communityId") ? this.customFilter.valueId : this.properties.adminToolsCommunity, this.router.url).subscribe(contents => { + this.subscriptions.push(this.helper.getDivHelpContents(this.properties, (this.customFilters && this.customFilters[0] && this.customFilters[0].queryFieldName == "communityId") ? this.customFilters[0].valueId : this.properties.adminToolsCommunity, this.router.url).subscribe(contents => { this.divContents = contents; })); } @@ -422,13 +427,19 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges { /* * Get A sub-array of this.refineFields array, which contains the ids of the selected filters */ - public getSelectedFilters(): string[] { - var selected: string[] = []; + public getSelectedFilters(): Map { + var selected: Map = new Map(); var filters = this.URLCreatedFilters; for (var i = 0; i < filters.length; i++) { var filter: Filter = filters[i]; if (filter.countSelectedValues > 0) { - selected.push(filter.filterId); + let selectedValues: string[] = []; + for(let value of filter.values) { + if(value.selected) { + selectedValues.push(value.id); + } + } + selected.set(filter.filterId, selectedValues); } } return selected; @@ -437,31 +448,96 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges { /* * Get A sub-array of this.refineFields array, which contains the ids of the selected parameters */ - private getSelectedParameters(): string[] { - var selected: string[] = []; + private getSelectedParameters(): Map { + var selected: Map = new Map(); for (var i = 0; i < this.refineFields.length; i++) { - if (this.parameterNames.indexOf(this.refineFields[i]) != -1) { - selected.push(this.refineFields[i]); + let selectedValues: string[] = []; + let index = this.parameterNames.indexOf(this.refineFields[i]); + if (index != -1) { + for(let values of this.parameterValues[index]) { + let split = values.split('"'); + for(let value of split) { + if(value != "" && value != ",") { + selectedValues.push(value); + } + } + } + selected.set(this.refineFields[i], selectedValues); } } return selected; } - + + /* +* Get A sub-array of this.staticFields array, which contains the ids of the selected filters +*/ + public getSelectedStaticFilters(): Map { + var selected: Map = new Map(); + var filters = this.URLCreatedStaticFilters; + for (var i = 0; i < filters.length; i++) { + var filter: Filter = filters[i]; + if (filter.countSelectedValues > 0) { + let selectedValues: string[] = []; + for(let value of filter.values) { + if(value.selected) { + selectedValues.push(value.id); + } + } + selected.set(filter.filterId, selectedValues); + } + } + return selected; + } + + /* + * Get A sub-array of this.staticFields array, which contains the ids of the selected parameters + */ + private getSelectedStaticParameters(): Map { + var selected: Map = new Map(); + for (var i = 0; i < this.staticFields.length; i++) { + let selectedValues: string[] = []; + let index = this.parameterNames.indexOf(this.staticFields[i]); + if (index != -1) { + let split = this.parameterValues[index].split('"'); + for(let value of split) { + if(value != "" && value != ",") { + selectedValues.push(value); + } + } + selected.set(this.staticFields[i], selectedValues); + } + } + return selected; + } + /* * Get A sub-array of this.refineFields array, which hides hidden fields (e.g Funding level 0,1,2,..), and contains those that depend on another fields (e.g Funding level 0 if Funder is selected ) */ public getFields(): string[] { - var selected_filters: string[] = this.getSelectedFilters(); - if (selected_filters.length == 0) { + var selected_filters: Map = this.getSelectedFilters(); + if (selected_filters.size == 0) { selected_filters = this.getSelectedParameters(); } + + var selected_static_filters: Map = this.getSelectedStaticFilters(); + if (selected_static_filters.size == 0) { + selected_static_filters = this.getSelectedStaticParameters(); + } + + let all_selected_filters = new Map([...selected_filters, ...selected_static_filters]); + // let all_selected_filters = selected_filters.concat(selected_static_filters); + var fields: string[] = []; for (var i = 0; i < this.refineFields.length; i++) { var dependentTo = this.searchFieldsHelper.DEPENDENT_FIELDS[this.refineFields[i]]; + var dependentToValues = this.searchFieldsHelper.DEPENDENT_FIELDS_AND_VALUES[this.refineFields[i]]; // TODO check again the checks //if filter is not marked as hidden OR it is hidden but it is dependent to a field that it IS selected if (this.searchFieldsHelper.HIDDEN_FIELDS.indexOf(this.refineFields[i]) == -1 - || (selected_filters.indexOf(dependentTo) != -1) || (selected_filters.indexOf(this.refineFields[i]) != -1) + || (all_selected_filters.has(this.refineFields[i])) + || (!dependentTo && !dependentToValues) + || (all_selected_filters.has(dependentTo)) + || (dependentToValues && (all_selected_filters.has(dependentToValues.field) && dependentToValues.values.some(dependentValue=> all_selected_filters.get(dependentToValues.field).includes(dependentValue)))) || (this.resultTypes && this.resultTypes.filterId == dependentTo && this.resultTypes.countSelectedValues > 0) // || (this.resultAccesses && this.resultAccesses.filterId == dependentTo && this.resultAccesses.countSelectedValues > 0) ) { @@ -490,8 +566,12 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges { */ public checkSelectedFilters(filters: Filter[]) { this.filters = filters; - if (this.customFilter && !this.customFilter.isHiddenFilter) { - this.customFilter.selected = null; + if (this.customFilters) { + for (let customFilter of this.customFilters) { + if (!customFilter.isHiddenFilter) { + customFilter.selected = null; + } + } } for (var i = 0; i < filters.length; i++) { var filter: Filter = filters[i]; @@ -507,8 +587,10 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges { } } - if (this.customFilter) { - this.customFilter.selected = this.customFilter.queryFieldName == filter.filterId && values.indexOf(StringUtils.quote(this.customFilter.valueId)) != -1; + if (this.customFilters) { + for (let customFilter of this.customFilters) { + customFilter.selected = customFilter.queryFieldName == filter.filterId && values.indexOf(StringUtils.quote(customFilter.valueId)) != -1; + } } // } else if (this.quickFilter && this.quickFilter.filterId == filter.filterId && this.quickFilter.selected) { // for (let filterValue of filter.values) { @@ -528,11 +610,6 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges { // this.quickFilter.filter = filter; // } } - if (this.parameterNames.indexOf("cf") != -1 && this.parameterValues[this.parameterNames.indexOf("cf")] == "true") { - this.customFilter.selected = true; - } else if (this.customFilter && this.customFilter.selected == null) { - this.customFilter.selected = false; - } this.filterFilterValues(this.filters); if (!this.includeOnlyResultsAndFilter) { this.updateMeta(this.pageTitle); @@ -634,7 +711,7 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges { this.staticFilters = filters; return filters; } - + get existingFiltersWithValues() { if (this.filters.length == 0) { return 0; @@ -709,7 +786,7 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges { } return this.selectedStaticFilters; } - + private clearKeywords() { if (this.searchUtils.keyword.length > 0) { this.searchUtils.keyword = ''; @@ -720,10 +797,6 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges { public removeFilter(value: Value, filter: Filter, forceRemove: boolean = false) { this.currentValueToRemove = value; this.currentFilterToRemove = filter; - if (!forceRemove && this.customFilter && this.customFilter.queryFieldName == filter.filterId && this.customFilter.valueId == value.id && this.customFilter.promptToAddFilter) { - this.openRemoveCustomFilterModal(); - return; - } filter.countSelectedValues--; this.selectedFilters--; if (value.selected == true) { @@ -737,20 +810,7 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges { // } this.goTo(1); } - - public openRemoveCustomFilterModal() { - this.removeCustomFilter.alertTitle = 'Remove filter'; - this.removeCustomFilter.message = 'You are about to see results that are not related to ' + this.customFilter.valueName + '. Do you want to proceed?'; - this.removeCustomFilter.okButtonText = 'Yes'; - this.removeCustomFilter.cancelButtonText = 'No'; - this.removeCustomFilter.open(); - } - - closeCustomFilterModal() { - this.customFilterEnabled = false; - this.removeFilter(this.currentValueToRemove, this.currentFilterToRemove, true); - } - + public removeRangeFilter(filter: RangeFilter) { filter.selectedFromValue = null; filter.selectedToValue = null; @@ -781,7 +841,7 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges { filterToggled($event) { this.filterRequestAll.emit($event) } - + /** * if there is a change in the values of the quick filter, this function has to be run, to also update the quickFilter */ @@ -798,42 +858,7 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges { } }*/ - /** - * Set selected the value of the custom filter. - */ - addCustomFilter() { - this.customFilter.selected = true; - this.customFilterEnabled = true; - if (this.refineFields.indexOf(this.customFilter.queryFieldName) != -1) { - let found = false; - for (let filter of this.filters) { - if (this.customFilter.queryFieldName == filter.filterId) { - for (let value of filter.values) { - if (value.id == this.customFilter.valueId) { - value.selected = true; - filter.countSelectedValues++; - found = true; - break; - } - } - //add filter when field exist in refine but not in the refine values - if (!found) { - filter.countSelectedValues++; - filter.values.push({ - selected: true, - name: this.customFilter.valueName, - id: this.customFilter.valueId, - number: 0 - }); - } - break; - } - } - } - this.filterChanged(null); - - } - + // for loading public openLoading() { this.loading.open(); @@ -1219,9 +1244,16 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges { } } - this.customFilterEnabled = URLparams["cf"] == "true"; - if (this.customFilter && (this.customFilter.isHiddenFilter || this.customFilterEnabled)) { - allFqs += "&fq=" + StringUtils.URIEncode(this.customFilter.queryFieldName + " exact " + StringUtils.quote((this.customFilter.valueId))); + if (this.customFilters) { + for (let customFilter of this.customFilters) { + if (customFilter.isHiddenFilter) { + if(customFilter.customQuery){ + allFqs += "&fq=" + StringUtils.URIEncode(customFilter.customQuery); + }else { + allFqs += "&fq=" + StringUtils.URIEncode(customFilter.queryFieldName + " exact " + StringUtils.quote((customFilter.valueId))); + } + } + } } /* if (this.quickFilter && this.entityType == "result") { @@ -1579,12 +1611,7 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges { this.parameterNames.push("keyword"); this.parameterValues.push(this.searchUtils.keyword); } - - - if (this.customFilterEnabled) { - this.parameterNames.push("cf"); - this.parameterValues.push("true"); - } + // if (this.searchUtils.size != this.resultsPerPage) { // // allLimits += ((allLimits.length == 0) ? '?' : '&') + 'size=' + this.searchUtils.size; // this.parameterNames.push("size"); @@ -1698,7 +1725,7 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges { // } // } // } - + this.URLCreatedFilters = filters; this.URLCreatedStaticFilters = staticFilters; } @@ -1812,14 +1839,45 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges { } public prepareStaticFiltersToShow() { - this.staticFilters = RefineResultsUtils.parse(this.staticFieldValues, this.staticFields, this.entityType, "search", true); + var selected_filters: Map = this.getSelectedFilters(); + if (selected_filters.size == 0) { + selected_filters = this.getSelectedParameters(); + } + + var selected_static_filters: Map = this.getSelectedStaticFilters(); + if (selected_static_filters.size == 0) { + selected_static_filters = this.getSelectedStaticParameters(); + } + + let all_selected_filters = new Map([...selected_filters, ...selected_static_filters]); + // let all_selected_filters = selected_filters.concat(selected_static_filters); + + let staticFields: string[] = []; + + for (var i = 0; i < this.staticFields.length; i++) { + var dependentTo = this.searchFieldsHelper.DEPENDENT_FIELDS[this.staticFields[i]]; + var dependentToValues = this.searchFieldsHelper.DEPENDENT_FIELDS_AND_VALUES[this.staticFields[i]]; + + // TODO check again the checks + //if filter is not marked as hidden OR it is hidden but it is dependent to a field that it IS selected + if (this.searchFieldsHelper.HIDDEN_FIELDS.indexOf(this.staticFields[i]) == -1 + || (all_selected_filters.has(this.staticFields[i])) + || (!dependentTo && !dependentToValues) + || (all_selected_filters.has(dependentTo)) + || (dependentToValues && (all_selected_filters.has(dependentToValues.field) && dependentToValues.values.some(dependentValue=> all_selected_filters.get(dependentToValues.field).includes(dependentValue)))) + ) { + staticFields.push(this.staticFields[i]); + } + } + + this.staticFilters = RefineResultsUtils.parse(this.staticFieldValues, staticFields, this.entityType, "search", true); this.checkSelectedStaticFilters(this.staticFilters); this.countSelectedStaticFilters(this.staticFilters); this.cdr.detectChanges(); return this.staticFilters; } - + /** * Used to set the variables and search page, and prepare it before the getResults query * @param fieldIds diff --git a/searchPages/searchUtils/portal-search-result.component.less b/searchPages/searchUtils/portal-search-result.component.less index a631ad17..c8e8fd14 100644 --- a/searchPages/searchUtils/portal-search-result.component.less +++ b/searchPages/searchUtils/portal-search-result.component.less @@ -1,5 +1,6 @@ -@import (reference) "~src/assets/openaire-theme/less/color.less"; @import (reference) "~src/assets/openaire-theme/less/_import-variables.less"; +@import (optional) "~src/assets/extend-theme/less/_import-variables.less"; + .setType(@color, @position: left) { border-@{position}: 4px solid fade(@color, 30%); diff --git a/searchPages/searchUtils/portal-search-result.component.ts b/searchPages/searchUtils/portal-search-result.component.ts index cbf85974..7b44fbe7 100644 --- a/searchPages/searchUtils/portal-search-result.component.ts +++ b/searchPages/searchUtils/portal-search-result.component.ts @@ -60,7 +60,7 @@ export class PortalSearchResultComponent implements OnInit{ hasPermission(result: CommunityInfo & StakeholderInfo) { if(this.type === "community") { - return result.status === "all" || (result.status === "manager" && result.isManager); + return result.isPublic() || (result.isRestricted() && result.isManager); } else if(this.type === "stakeholder") { return result.visibility === "PUBLIC" || (result.visibility === "RESTRICTED" && (result.isManager || result.isMember)) || (result.visibility === "PRIVATE" && result.isManager); diff --git a/searchPages/searchUtils/searchDownload.component.ts b/searchPages/searchUtils/searchDownload.component.ts index 820d2daf..39448aec 100644 --- a/searchPages/searchUtils/searchDownload.component.ts +++ b/searchPages/searchUtils/searchDownload.component.ts @@ -14,12 +14,13 @@ import {properties} from "../../../../environments/environment"; @Component({ selector: 'search-download', template: ` - diff --git a/searchPages/searchUtils/searchFilter.component.html b/searchPages/searchUtils/searchFilter.component.html index c797bb2c..8495aebe 100644 --- a/searchPages/searchUtils/searchFilter.component.html +++ b/searchPages/searchUtils/searchFilter.component.html @@ -1,9 +1,35 @@
        -
        +
        {{_formatTitle(filter.title, filter.values.length)}}
        Clear
        -
        + +
        +
        {{_formatTitle(filter.title, filter.values.length)}}
        + Clear +
        +         + +
        + + + +
        {{value.name}}
        +         + + + + + + + + +         +         +
        + +
        @@ -12,10 +38,10 @@
        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -65,7 +152,7 @@ {{value.name=='true'?'Yes':'No'}} - {{_formatName(value)}} + {{_formatName(value)}} ({{value.number|number}}) diff --git a/searchPages/searchUtils/searchFilter.component.ts b/searchPages/searchUtils/searchFilter.component.ts index 12a4bed0..2cf3b93e 100644 --- a/searchPages/searchUtils/searchFilter.component.ts +++ b/searchPages/searchUtils/searchFilter.component.ts @@ -43,9 +43,10 @@ export class SearchFilterComponent implements OnInit, OnChanges { @Input() actionRoute: boolean = false; @Input() quickFilter: { filter: Filter, selected: boolean, filterId: string, value: string }; sub; - @Input() isOpen: boolean = false; + // @Input() isViewAllOpen: boolean = false; sortedValues; hasMatch: boolean = false; + @Input() grouped: boolean = false; constructor(private _router: Router, private route: ActivatedRoute, @@ -60,11 +61,11 @@ export class SearchFilterComponent implements OnInit, OnChanges { ngOnInit() { if(this.filterValuesNum == 0){ - this.filter.isOpen = true; + this.filter.isViewAllOpen = true; this.sortBy = "num"; } // else{ - // this.filter.isOpen = false; + // this.filter.isViewAllOpen = false; // } this.sub = this.route.queryParams.subscribe(params => { this.queryParams = Object.assign({}, params); @@ -90,7 +91,7 @@ export class SearchFilterComponent implements OnInit, OnChanges { // && value.name.toLowerCase() != "null" // ); - if (this.filter.filterType == "radio") { + if (this.filter.filterType == "radio" || this.filter.filterType == "triplet") { this.filter.radioValue = ""; this.filter.values.forEach(value => { if (value.selected) { @@ -164,6 +165,20 @@ export class SearchFilterComponent implements OnInit, OnChanges { value: this.filter }); } + + tripletFilterChange() { + if(this.filter.radioValue == "") { + this.clearFilter(); + } else { + this.filter.countSelectedValues = 1; + this.filter.values.forEach(value => { + value.selected = (value.id == this.filter.radioValue); + }); + this.onFilterChange.emit({ + value: this.filter + }); + } + } clearFilter() { for (var i = 0; i < this.filter.values.length; i++) { @@ -274,7 +289,7 @@ export class SearchFilterComponent implements OnInit, OnChanges { } toggle(event) { - this.filter.isOpen = !this.filter.isOpen; + this.filter.isViewAllOpen = !this.filter.isViewAllOpen; event.stopPropagation(); this.toggleWithoutUpdate(); } @@ -283,7 +298,7 @@ export class SearchFilterComponent implements OnInit, OnChanges { if(this.filter.countAllValues == 0) { this.filter.countAllValues = -1; // if request failed, try again automatically if toggled again } - if(this.filter.isOpen && this.filter.countAllValues < 0) { + if(this.filter.isViewAllOpen && this.filter.countAllValues < 0) { this.onFilterToggle.emit(this.filter); } } diff --git a/searchPages/searchUtils/searchFilter.module.ts b/searchPages/searchUtils/searchFilter.module.ts index 5f014308..940d93e8 100644 --- a/searchPages/searchUtils/searchFilter.module.ts +++ b/searchPages/searchUtils/searchFilter.module.ts @@ -9,11 +9,12 @@ import {RouterModule} from "@angular/router"; import {InputModule} from '../../sharedComponents/input/input.module'; import {IconsModule} from "../../utils/icons/icons.module"; import {LoadingModule} from "../../utils/loading/loading.module"; +import {MatButtonToggleModule} from "@angular/material/button-toggle"; @NgModule({ imports: [ CommonModule, FormsModule, ModalModule, RouterModule, - InputModule, IconsModule, LoadingModule + InputModule, IconsModule, LoadingModule, MatButtonToggleModule ], declarations: [ SearchFilterComponent, SearchFilterModalComponent diff --git a/searchPages/searchUtils/searchHelperClasses.class.ts b/searchPages/searchUtils/searchHelperClasses.class.ts index 03d5a603..9a64e04a 100644 --- a/searchPages/searchUtils/searchHelperClasses.class.ts +++ b/searchPages/searchUtils/searchHelperClasses.class.ts @@ -12,7 +12,8 @@ export class Filter{ public radioValue?: string = ""; // public uniqueValueIdSelected: string; public countAllValues?: number = -1; // -1: not yet requested, 0: request failed, >0 OK - public isOpen?: boolean = false; + // public isOpen?: boolean = false; + public isViewAllOpen?: boolean = false; public countUnfilteredValues?: number = 0; } diff --git a/searchPages/searchUtils/searchUtils.class.ts b/searchPages/searchUtils/searchUtils.class.ts index f3cc2ace..433e5e1e 100644 --- a/searchPages/searchUtils/searchUtils.class.ts +++ b/searchPages/searchUtils/searchUtils.class.ts @@ -27,18 +27,20 @@ export class SearchCustomFilter{ valueName:string; // Greece isHiddenFilter:boolean; selected:boolean; - promptToAddFilter:boolean; - constructor( fieldName:string, queryFieldName:string, valueId:string, valueName:string ){ + showFilterMessage:boolean; + customQuery:string; + constructor( fieldName:string, queryFieldName:string, valueId:string, valueName:string, showFilterMessage:boolean = true, customQuery = null ){ if(valueId == "test" && properties.environment == "development"){ valueId = "covid-19"; } + this.showFilterMessage = showFilterMessage; this.isHiddenFilter = true; this.fieldName = fieldName; this.queryFieldName = queryFieldName; this.valueId = valueId; this.valueName = valueName; this.selected = null; - this.promptToAddFilter = false; + this.customQuery = customQuery; } public getParameters(params={}){ diff --git a/services/searchDataproviders.service.ts b/services/searchDataproviders.service.ts index 0277841c..7919e017 100644 --- a/services/searchDataproviders.service.ts +++ b/services/searchDataproviders.service.ts @@ -6,6 +6,7 @@ import {StringUtils} from '../utils/string-utils.class'; import{EnvProperties} from '../utils/properties/env-properties'; import {map} from "rxjs/operators"; import {ParsingFunctions} from "../landingPages/landing-utils/parsingFunctions.class"; +import {properties} from '../../../environments/environment'; @Injectable() export class SearchDataprovidersService { @@ -116,7 +117,7 @@ export class SearchDataprovidersService { } else { result['englishname'] = ""; } - + result['originalId'] = resData.originalId; //result['title'].url = OpenaireProperties.getsearchLinkToDataProvider(); //result['title'].url += Array.isArray(data) ? data[i]['result']['header']['dri:objIdentifier'] : data['result']['header']['dri:objIdentifier']; result['id'] = Array.isArray(data) ? data[i]['result']['header']['dri:objIdentifier'] : data['result']['header']['dri:objIdentifier']; @@ -289,4 +290,11 @@ export class SearchDataprovidersService { return this.http.get((properties.useCache)? (properties.cacheUrl+encodeURIComponent(url)): url) .pipe(map(res => res['meta']['total'])); } + + searchDataproviderById(id: string):any { + let url = properties.searchAPIURLLAst + "datasources/" + id + '?format=json'; + + return this.http.get((properties.useCache)? (properties.cacheUrl+encodeURIComponent(url)): url) + .pipe(map(res => this.parseResults(res))); + } } diff --git a/services/searchResearchResults.service.ts b/services/searchResearchResults.service.ts index d916157a..3e49a7cc 100644 --- a/services/searchResearchResults.service.ts +++ b/services/searchResearchResults.service.ts @@ -426,7 +426,21 @@ export class SearchResearchResultsService { result.hostedBy_collectedFrom = this.parsingFunctions.addPublisherToHostedBy_collectedFrom( result.hostedBy_collectedFrom, result.publisher, result['journal']?result['journal'].journal:null, result.identifiers); - + + + if(resData.hasOwnProperty("publiclyfunded") && resData.publiclyfunded) { + result.publiclyFunded = resData.publiclyfunded; + } + if((resData.hasOwnProperty("isgreen") && resData.isgreen) + || (resData.hasOwnProperty("openaccesscolor") && resData.openaccesscolor) + || (resData.hasOwnProperty("isindiamondjournal") && resData.isindiamondjournal)) { + result.oaRoutes = { + "green": resData.isgreen, + "oaColor": resData.openaccesscolor, + "isInDiamondJournal":resData.isindiamondjournal + }; + } + results.push(result); } return results; @@ -598,4 +612,9 @@ export class SearchResearchResultsService { return this.http.get((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url) .pipe(map(res => res['meta']['total'])); } + fetchByDOIs(DOIs:string[],query:string): any { + let url = properties.searchAPIURLLAst + "/researchProducts/byDoi?type=publications" + (query?query:""); + return this.http.post(url, {doiArray: DOIs}) + .pipe(map(res => [res['meta'].total, this.parseResults("result", res['results'], properties), RefineResultsUtils.parse(res['refineResults'], null, "publication")])); + } } diff --git a/services/user-management.service.ts b/services/user-management.service.ts index 3b0a9d3f..08f4c0ff 100644 --- a/services/user-management.service.ts +++ b/services/user-management.service.ts @@ -7,13 +7,18 @@ import {properties} from "../../../environments/environment"; import {StringUtils} from "../utils/string-utils.class"; import {CustomOptions} from "./servicesUtils/customOptions.class"; import {AdvancedAsyncSubject} from "../utils/AdvancedAsyncSubject"; +import {isArray} from "rxjs/internal-compatibility"; @Injectable({ providedIn: 'root' }) export class UserManagementService { private readonly getUserInfoSubject: AdvancedAsyncSubject = new AdvancedAsyncSubject(); + private static LOGIN = 'openid_connect_login'; + private static LOGOUT: string = 'openid_logout'; + private static USERINFO: string = 'userInfo'; public fixRedirectURL: string = null; + public allowDoubleRedirectToFixAndCurrentPage: boolean = false; private redirectUrl: string = null; private subscription; private readonly routerSubscription; @@ -30,7 +35,11 @@ export class UserManagementService { this.routerSubscription.unsubscribe(); } } - + + public static userInfoUrl(index = 0): string { + return (isArray(properties.loginServiceURL)?properties.loginServiceURL[index]:properties.loginServiceURL) + UserManagementService.USERINFO; + } + public get user(): User { return this.getUserInfoSubject.getValue(); } @@ -38,11 +47,16 @@ export class UserManagementService { public getUserInfo(): Observable { return this.getUserInfoSubject.asObservable(); } - - public updateUserInfo(resolve: Function = null) { - this.subscription = this.http.get(properties.userInfoUrl, CustomOptions.registryOptions()).pipe(map(userInfo => { + + public getUserInfoAt(index = 0): Observable { + return this.http.get(UserManagementService.userInfoUrl(index), CustomOptions.registryOptions()).pipe(map(userInfo => { return new User(userInfo); - })).subscribe(user => { + })) + } + + + public updateUserInfo(resolve: Function = null) { + this.subscription = this.getUserInfoAt().subscribe(user => { this.getUserInfoSubject.next(user); if (resolve) { resolve(); @@ -55,8 +69,9 @@ export class UserManagementService { }); } - public setRedirectUrl(url: string = null) { - if (url) { + public setRedirectUrl(redirectTo: string | string [] = null) { + let urls = Array.isArray(redirectTo)?redirectTo:(redirectTo?[redirectTo]:[]) + for(let url of urls) { let parts = url.split('?'); let path = properties.baseLink + parts[0]; let params = null; @@ -74,24 +89,47 @@ export class UserManagementService { Session.setReloadUrl(location.protocol + "//" + location.host, path, params, fragment); } this.redirectUrl = StringUtils.URIEncode(location.protocol + "//" + location.host + this.fixRedirectURL); - } else { + } + if(urls.length == 0){ this.redirectUrl = StringUtils.URIEncode(location.href); Session.setReloadUrl(location.protocol + "//" + location.host, location.pathname, location.search, location.hash); } } - public login() { - if (this.fixRedirectURL) { - this.setRedirectUrl(this.fixRedirectURL); + public login(redirect: string = null) { + Session.clearReloadUrl(); + if(redirect) { + this.redirectUrl = redirect; + } else if (this.fixRedirectURL) { + this.setRedirectUrl(this.allowDoubleRedirectToFixAndCurrentPage?[this.fixRedirectURL,location.href.split(location.host)[1]]:this.fixRedirectURL); } else { this.setRedirectUrl(); } - window.location.href = properties.loginUrl + "?redirect=" + this.redirectUrl; + let loginURL: string | string[] = isArray(properties.loginServiceURL)?properties.loginServiceURL.map(url => url + UserManagementService.LOGIN):(properties.loginServiceURL + UserManagementService.LOGIN); + window.location.href = this.setURL(loginURL) + this.redirectUrl; } - + public logout() { + Session.clearReloadUrl(); this.setRedirectUrl(); Session.removeUser(); - window.location.href = properties.logoutUrl + "?redirect=" + this.redirectUrl; + let logoutURL: string | string[] = isArray(properties.loginServiceURL)?properties.loginServiceURL.map(url => url + UserManagementService.LOGOUT):(properties.loginServiceURL + UserManagementService.LOGOUT); + window.location.href = this.setURL(logoutURL) + this.redirectUrl; + } + + setURL(url: string | string[]) { + if(isArray(url)) { + let redirectURL = ''; + url.forEach((url, index) => { + if(index === 0) { + redirectURL = url + "?redirect="; + } else { + redirectURL += encodeURIComponent(url + "?redirect="); + } + }); + return redirectURL; + } else { + return url + "?redirect="; + } } } diff --git a/services/user-registry.service.ts b/services/user-registry.service.ts index 0e8db8ea..1f06cae7 100644 --- a/services/user-registry.service.ts +++ b/services/user-registry.service.ts @@ -1,9 +1,10 @@ import {Injectable} from '@angular/core'; -import {HttpClient, HttpErrorResponse} from '@angular/common/http'; +import {HttpClient} from '@angular/common/http'; import {Observable} from 'rxjs'; import {properties} from '../../../environments/environment'; import {CustomOptions} from './servicesUtils/customOptions.class'; import {map} from 'rxjs/operators'; +import {Role} from "../login/utils/helper.class"; @Injectable({ providedIn: 'root' @@ -14,7 +15,7 @@ export class UserRegistryService { } public createRole(type: string, id: string): Observable { - return this.http.post(properties.registryUrl + 'create/' + type + '/' + id, null, + return this.http.post(properties.registryUrl + 'create/' + Role.GROUP + type + '/' + id, null, CustomOptions.registryOptions()).pipe(map((response: any) => response.response)); } @@ -35,12 +36,12 @@ export class UserRegistryService { public remove(type: string, id: string, email: string, role: "member" | "manager" = "manager"): Observable { return this.http.delete(properties.registryUrl + - type + '/' + id + '/' + role + '/' + encodeURIComponent(email), CustomOptions.registryOptions()); + Role.GROUP + type + '/' + id + '/' + role + '/' + encodeURIComponent(email), CustomOptions.registryOptions()); } public invite(type: string, id: string, details: any, role: "member" | "manager" = "manager"): Observable { return this.http.post(properties.registryUrl + 'invite/' + - type + '/' + id + '/' + role, details, + Role.GROUP + type + '/' + id + '/' + role, details, CustomOptions.registryOptions()).pipe(map((response: any) => response.response)); } @@ -57,9 +58,9 @@ export class UserRegistryService { return this.http.delete(properties.registryUrl + 'verification/' + id, CustomOptions.registryOptions()); } - public getActive(type: string, id: string, role: "member" | "manager" = "manager"): Observable { - let url = properties.registryUrl + type + '/' + id + "/" + role + 's'; - return this.http.get((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url, + public getActive(type: string, id: string, role: "member" | "manager" = "manager", admin = false): Observable { + let url = properties.registryUrl + Role.GROUP + type + '/' + id + "/" + role + 's'; + return this.http.get((properties.useCache && !admin) ? (properties.cacheUrl + encodeURIComponent(url)) : url, CustomOptions.registryOptions()).pipe(map((response:any) => response.response), map(users => { if(users.length > 0 && !users[0].email) { return []; @@ -68,16 +69,16 @@ export class UserRegistryService { } })); } - - public getPending(type: string, id: string, role: "member" | "manager" = "manager"): Observable { - let url = properties.registryUrl + 'invite/' +type + '/' +id + "/" + role + 's/'; - return this.http.get((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url, + + public getPending(type: string, id: string, role: "member" | "manager" = "manager", admin = false): Observable { + let url = properties.registryUrl + 'invite/' + Role.GROUP + type + '/' +id + "/" + role + 's/'; + return this.http.get((properties.useCache && !admin) ? (properties.cacheUrl + encodeURIComponent(url)) : url, CustomOptions.registryOptions()).pipe(map((response: any) => response.response)); } public cancelInvitation(type: string, id: string, email: string, role: "member" | "manager" = "manager"): Observable { return this.http.delete(properties.registryUrl + 'invite/' + - type + '/' + id + '/' + role + '/' + encodeURIComponent(email), + Role.GROUP + type + '/' + id + '/' + role + '/' + encodeURIComponent(email), CustomOptions.registryOptions()); } } diff --git a/services/userProfile.service.ts b/services/userProfile.service.ts new file mode 100644 index 00000000..f16bd788 --- /dev/null +++ b/services/userProfile.service.ts @@ -0,0 +1,70 @@ +import {Injectable} from "@angular/core"; +import {HttpClient} from "@angular/common/http"; +import {Observable} from "rxjs"; +import {EnvProperties} from "../utils/properties/env-properties"; +import {CustomOptions} from "./servicesUtils/customOptions.class"; +import {AdvancedAsyncSubject} from "../utils/AdvancedAsyncSubject"; +import {properties} from "../../../environments/environment"; +import {map} from "rxjs/operators"; + +export class UserProfile{ + id:string; + aaiId:string; + consent:boolean = false; + constructor(consent:boolean) { + this.consent = consent; + } +} + +@Injectable({ + providedIn: "root" +}) +export class UserProfileService { + private subscription; + private readonly userProfileSubject: AdvancedAsyncSubject = new AdvancedAsyncSubject(); + constructor(private http: HttpClient) { + } + + clearSubscriptions() { + if (this.subscription) { + this.subscription.unsubscribe(); + } + + } + + public get user(): UserProfile { + return this.userProfileSubject.getValue(); + } + + public getUserProfile(): Observable { + return this.userProfileSubject.asObservable(); + } + + public setUserProfile(userProfile:UserProfile) { + this.userProfileSubject.next(userProfile?userProfile:new UserProfile(false)); + } + public initUserProfile(resolve: Function = null) { + + this.subscription = this.http.get(properties.monitorServiceAPIURL + 'user', CustomOptions.registryOptions()).pipe(map(userProfile => { + return userProfile; + })).subscribe(user => { + this.userProfileSubject.next(user); + if (resolve) { + resolve(); + } + }, error => { + this.userProfileSubject.next(new UserProfile(false)); + if (resolve) { + resolve(); + } + }); + } + + saveConsentInUserProfile(properties:EnvProperties): Observable { + return this.http.post(properties.monitorServiceAPIURL + 'user/save', new UserProfile(true), CustomOptions.registryOptions(),); + } + undoConsentInUserProfile(properties:EnvProperties): Observable { + return this.http.post(properties.monitorServiceAPIURL + 'user/save', new UserProfile(false), CustomOptions.registryOptions(),); + } + +} diff --git a/shared/customFilter.service.ts b/shared/customFilter.service.ts new file mode 100644 index 00000000..9828e183 --- /dev/null +++ b/shared/customFilter.service.ts @@ -0,0 +1,56 @@ +import {Injectable} from "@angular/core"; +import {HttpClient} from "@angular/common/http"; +import {BehaviorSubject, from, Observable, Subscriber} from "rxjs"; +import {SearchCustomFilter} from "../searchPages/searchUtils/searchUtils.class"; + + +@Injectable({ + providedIn: "root" +}) +export class CustomFilterService { + + private customFilterSubject: BehaviorSubject = null; + private promise: Promise; + private sub; + + constructor(private http: HttpClient) { + this.customFilterSubject = new BehaviorSubject(null); + } + + ngOnDestroy() { + this.clearSubscriptions(); + } + + clearSubscriptions() { + if (this.sub instanceof Subscriber) { + this.sub.unsubscribe(); + } + } + + async getCustomFilterAsync() { + if (this.promise) { + await this.promise; + this.promise = null; + } + this.clearSubscriptions(); + return this.customFilterSubject.getValue(); + } + + + getCustomFilterAsObservable(): Observable { + return this.customFilterSubject.asObservable(); + } + + setCustomFilter(customFilters: SearchCustomFilter[]) { + this.customFilterSubject.next(customFilters); + } +/* + static getDefaultFilters(){ + let defaultFilters = new Map(); + defaultFilters.set("result",[new SearchCustomFilter("National", "country", "IE", "Irish National Monitor")]); + defaultFilters.set("project",[new SearchCustomFilter("National", "country", "IE", "Irish National Monitor")]); + defaultFilters.set("organization",[new SearchCustomFilter("National", "country", "IE", "Irish National Monitor")]); + defaultFilters.set("datasource",[new SearchCustomFilter("National", "country", "IE", "Irish National Monitor")]); + return defaultFilters; + }*/ +} diff --git a/sharedComponents/SEO/SEO.service.ts b/sharedComponents/SEO/SEO.service.ts index 8543d17f..2267be0f 100644 --- a/sharedComponents/SEO/SEO.service.ts +++ b/sharedComponents/SEO/SEO.service.ts @@ -2,7 +2,9 @@ import { Injectable, Inject } from '@angular/core'; import { DOCUMENT } from '@angular/common'; import { Optional, RendererFactory2, ViewEncapsulation } from '@angular/core'; -@Injectable() +@Injectable({ + providedIn: 'root' +}) export class SEOService { constructor( @Inject(DOCUMENT) private doc, private rendererFactory: RendererFactory2, diff --git a/sharedComponents/base/base.component.ts b/sharedComponents/base/base.component.ts new file mode 100644 index 00000000..922db351 --- /dev/null +++ b/sharedComponents/base/base.component.ts @@ -0,0 +1,112 @@ +import {Directive, OnDestroy} from "@angular/core"; +import {BehaviorSubject, Subscriber} from "rxjs"; +import {EnvProperties} from "../../utils/properties/env-properties"; +import {properties} from "src/environments/environment"; +import {PiwikService} from "../../utils/piwik/piwik.service"; +import {Meta, Title} from "@angular/platform-browser"; +import {SEOService} from "../SEO/SEO.service"; +import {ActivatedRoute, Data, NavigationEnd, Params, Router} from "@angular/router"; +import {StringUtils} from "../../utils/string-utils.class"; +import {RouterHelper} from "../../utils/routerHelper.class"; + +@Directive() +export abstract class BaseComponent implements OnDestroy { + public properties: EnvProperties = properties; + /** Router params */ + protected paramsResolved: boolean = false; + protected params: BehaviorSubject; + protected data: BehaviorSubject; + protected subscriptions: any[] = []; + /** Metadata */ + public title: string; + public description: string; + public url: string; + protected _route: ActivatedRoute; + protected _piwikService: PiwikService; + protected _meta: Meta; + protected seoService: SEOService; + protected _title: Title; + protected _router: Router; + public routerHelper: RouterHelper = new RouterHelper(); + + protected constructor() { + } + + ngOnDestroy() { + this.subscriptions.forEach(subscription => { + if (subscription instanceof Subscriber) { + subscription.unsubscribe() + } else if (subscription instanceof Function) { + subscription(); + } else if (typeof IntersectionObserver !== 'undefined' && subscription instanceof IntersectionObserver) { + subscription.disconnect(); + } else if (typeof ResizeObserver !== 'undefined' && subscription instanceof ResizeObserver) { + subscription.disconnect(); + } + }); + } + + /** + * Initialize router params and data (should be called in the constructor of a component with router-outlet) + * */ + initRouterParams(route: ActivatedRoute = null, navigationChange: ((event: NavigationEnd) => void) = null) { + if (route) { + this.params = new BehaviorSubject(null); + this.data = new BehaviorSubject(null); + this.subscriptions.push(this._router.events.subscribe(event => { + if (event instanceof NavigationEnd) { + if(navigationChange) { + navigationChange(event); + } + let r = route; + while (r.firstChild) { + r = r.firstChild; + } + let data = r.snapshot.data; + let params = r.snapshot.params; + let current = r.snapshot; + while (current.parent) { + data = {...current.parent.data, ...data}; + params = {...current.parent.params, ...params}; + current = current.parent; + } + r.snapshot.data = data; + r.snapshot.params = params; + this.paramsResolved = true; + this.params.next(r.snapshot.params); + this.data.next(r.snapshot.data); + } + })); + } + } + + public setMetadata() { + if (this._title && this.title) { + this.title = (this._route?.snapshot.data?.title ? this._route.snapshot.data?.title : '') + this.title; + this._title.setTitle(this.title); + } + if (this._router) { + this.url = properties.domain + properties.baseLink + this._router.url; + if (this.seoService) { + this.seoService.createLinkForCanonicalURL(this.url, false); + } + if (this._meta) { + this._meta.updateTag({content: this.url}, "property='og:url'"); + this._meta.updateTag({content: this.description}, "name='description'"); + this._meta.updateTag({content: this.description}, "property='og:description'"); + this._meta.updateTag({content: this.title}, "property='og:title'"); + } + } + this.trackView(); + } + + public trackView() { + if (this._piwikService) { + this.subscriptions.push(this._piwikService.trackView(properties, this.title).subscribe()); + } + } + + public quote(str: string) { + return StringUtils.quote(str); + } +} diff --git a/sharedComponents/cookie-law/cookie-law.component.ts b/sharedComponents/cookie-law/cookie-law.component.ts index 283bd768..bb2a08bd 100644 --- a/sharedComponents/cookie-law/cookie-law.component.ts +++ b/sharedComponents/cookie-law/cookie-law.component.ts @@ -66,7 +66,7 @@ export type CookieLawTarget = '_blank' | '_self'; }) export class CookieLawComponent implements OnInit { public cookieLawSeen: boolean; - + @Input() cookieName = "cookieLawSeen"; @Input('learnMore') get learnMore() { return this._learnMore; } set learnMore(value: string) { @@ -109,10 +109,11 @@ export class CookieLawComponent implements OnInit { this.isSeenEvt = new EventEmitter(); this.animation = 'topIn'; this._position = 'bottom'; - this.cookieLawSeen = this._service.seen(); + } ngOnInit(): void { + this.cookieLawSeen = this._service.seen(this.cookieName); if (typeof document !== 'undefined') { this.animation = this.position === 'bottom' ? 'bottomIn' : 'topIn'; @@ -142,7 +143,7 @@ export class CookieLawComponent implements OnInit { evt.preventDefault(); } - this._service.storeCookie(); + this._service.storeCookie(this.cookieName); this.animation = this.position === 'top' ? 'topOut' : 'bottomOut'; } } diff --git a/sharedComponents/cookie-law/cookie-law.service.ts b/sharedComponents/cookie-law/cookie-law.service.ts index 3143cb18..dd497d7d 100644 --- a/sharedComponents/cookie-law/cookie-law.service.ts +++ b/sharedComponents/cookie-law/cookie-law.service.ts @@ -12,12 +12,12 @@ import { Injectable } from '@angular/core'; export class CookieLawService { - seen(): boolean { - return this.cookieExists('cookieLawSeen'); + seen(cookieName): boolean { + return this.cookieExists(cookieName); } - storeCookie(): void { - return this.setCookie('cookieLawSeen'); + storeCookie(cookieName): void { + return this.setCookie(cookieName); } /** diff --git a/sharedComponents/input/input.component.ts b/sharedComponents/input/input.component.ts index cfcae9d5..35a0f12d 100644 --- a/sharedComponents/input/input.component.ts +++ b/sharedComponents/input/input.component.ts @@ -65,8 +65,6 @@ export interface ControlConfiguration { declare var UIkit; /** - * WARNING! dashboard-input selector is @deprecated, use input instead - * * Autocomplete soft allows values that are not listed in options list. In order to work as expected * avoid providing options with different label and value. * @@ -478,7 +476,7 @@ export class InputComponent implements OnInit, OnDestroy, AfterViewInit, OnChang ngOnChanges(changes: SimpleChanges) { if (this.formControl) { - if (changes.value) { + if (changes.value && changes.value.currentValue !== changes.value.previousValue) { this.formControl.setValue(this.value); } if (changes.validators) { @@ -826,6 +824,7 @@ export class InputComponent implements OnInit, OnDestroy, AfterViewInit, OnChang resetValue(event: any) { event.stopPropagation(); + console.log(1) this.formControl.setValue(''); this.focus(true, event); } diff --git a/sharedComponents/navigationBar.component.html b/sharedComponents/navigationBar.component.html index 873c0cd9..7f502eab 100644 --- a/sharedComponents/navigationBar.component.html +++ b/sharedComponents/navigationBar.component.html @@ -12,9 +12,7 @@
        - +
        @@ -151,11 +149,15 @@