-
-
-
- Manage Classes
- Super Admin
--
-- -
- - -- Admin Dashboard - {{pageHelpContent ? 'Update ' : 'Add new '}} class help text +-+-+ +-+ +-{{page.name}} (unsaved changes)
--@@ -58,7 +58,7 @@-- --{ - this.pageId = params['pageId']; - this.myForm = this.form; - this.pageContentId = params['pageContentId']; - if (!this.pageId) { - this._router.navigate(['../'], {relativeTo: this.route}); - } - this.getInfo(this.pageId); - })); + this.pageId = params['pageId']; + this.myForm = this.form; + this.pageContentId = params['pageContentId']; + if (!this.pageId) { + this._router.navigate(['../'], {relativeTo: this.route}); + } + this.getInfo(this.pageId); + })); } - + ngOnDestroy() { this.subs.forEach(value => { if (value instanceof Subscriber) { @@ -53,7 +56,7 @@ export class ClassContentFormComponent implements OnInit { } }); } - + getInfo(pageId: string) { this.showLoading = true; let obs = zip(this._helpContentService.getPageByPortal(pageId, this.properties.adminToolsAPIURL, this.portal), @@ -66,25 +69,44 @@ export class ClassContentFormComponent implements OnInit { } this.setOptions(results[1]); if (!this.pageContentId) { - this.updateForm(null); + this.updateForm(null); this.showLoading = false; + this.initCKEditor(); } else { - this.subs.push(this._helpContentService.getDivHelpContent( this.pageContentId, this.properties.adminToolsAPIURL, this.portal).subscribe(pageHelpContent=>{ - this.pageHelpContent = pageHelpContent; - if (this.properties.adminToolsPortalType != this.page.portalType) { - this._router.navigate(['../'], {relativeTo: this.route}); - } - this.updateForm(this.pageHelpContent); - this.showLoading = false; - }, + this.subs.push(this._helpContentService.getDivHelpContent(this.pageContentId, this.properties.adminToolsAPIURL, this.portal).subscribe(pageHelpContent => { + this.pageHelpContent = pageHelpContent; + if (this.properties.adminToolsPortalType != this.page.portalType) { + this._router.navigate(['../'], {relativeTo: this.route}); + } + this.updateForm(this.pageHelpContent); + this.showLoading = false; + this.initCKEditor(); + }, error => { - this.handleError('System error retrieving content by id '+ this.pageContentId, error) - })); + this.handleError('System error retrieving content by id ' + this.pageContentId, error) + })); } })); } + private initCKEditor() { + this.cdr.detectChanges(); + if (this.ckEditor) { + this.ckEditor.instance.on('mode', () => { + let editor = this.ckEditor.instance; + if (editor.mode === 'source') { + let editable = editor.editable(); + editable.attachListener(editable, 'input', () => { + this.myForm.get('content').setValue(editor.getData()); + this.myForm.get('content').markAsDirty(); + this.cdr.detectChanges(); + }); + } + }); + } + } + private updateForm(pageHelpContent: DivHelpContent) { this.pageHelpContent = pageHelpContent; this.myForm = this.form; @@ -93,48 +115,48 @@ export class ClassContentFormComponent implements OnInit { this.myForm.get('divId').disable(); } this.myForm.markAsPristine(); - + } - + public setOptions(divIds) { this.classOptions = []; - for(let divid of divIds){ - this.classOptions.push({label:divid.name, value:divid._id}); + for (let divid of divIds) { + this.classOptions.push({label: divid.name, value: divid._id}); } } - + public get form() { return this._fb.group({ divId: ['', Validators.required], content: ['', Validators.required], isActive: true, portal: this.portal, - _id : '', + _id: '', }); } - + public reset() { this.myForm.patchValue({ divId: ['', Validators.required], content: ['', Validators.required], isActive: true, portal: '', - _id : '', + _id: '', }); this.myForm.markAsPristine(); } - + handleError(message: string, error = null) { - if(error) { + if (error) { console.error('Server responded: ' + error); } NotificationHandler.rise(message, 'danger'); this.showLoading = false; } - + public saveCustom() { if (this.myForm.valid) { this.showLoading = true; @@ -159,13 +181,13 @@ export class ClassContentFormComponent implements OnInit { this.updateForm(this.pageHelpContent); this.showLoading = false; } - + handleUpdateError(message: string, error) { console.error('Server responded: ' + error); NotificationHandler.rise(message, 'danger'); this.showLoading = false; } - + changeStatus() { this.myForm.get('isActive').setValue(!this.myForm.get('isActive').value); if (this.pageHelpContent && this.myForm.get('isActive').value != this.pageHelpContent.isActive || !this.pageHelpContent && !this.myForm.get('isActive').value) { @@ -174,7 +196,7 @@ export class ClassContentFormComponent implements OnInit { this.myForm.get('isActive').markAsPristine() } } - + contentChanged() { if (this.pageHelpContent && this.myForm.get('content').value != this.pageHelpContent.content || !this.pageHelpContent && this.myForm.get('content').value != '') { this.myForm.get('content').markAsDirty(); diff --git a/dashboard/divhelpcontent/class-help-contents.component.html b/dashboard/divhelpcontent/class-help-contents.component.html index ded1d491..b584338b 100644 --- a/dashboard/divhelpcontent/class-help-contents.component.html +++ b/dashboard/divhelpcontent/class-help-contents.component.html @@ -1,20 +1,15 @@ -- -- - -- Admin Dashboard - Manage class help texts +-+-+ --{{page.name}}
---diff --git a/dashboard/entity/entities.component.html b/dashboard/entity/entities.component.html index e21a4b7b..cd7e230b 100644 --- a/dashboard/entity/entities.component.html +++ b/dashboard/entity/entities.component.html @@ -1,11 +1,5 @@----Manage Entities-{{name?name:'Super Admin'}}
--
-- -
- - -- Admin Dashboard - {{pageHelpContent ? 'Update ' : 'Add new '}} page help text +-+-+ +-+ +-{{page.name}} (unsaved changes)
--@@ -62,7 +62,7 @@-- --this.handleError('System error retrieving page with id: ' + pageId, error) )); } + private initCKEditor() { + this.cdr.detectChanges(); + if(this.ckEditor) { + this.ckEditor.instance.on('mode', () => { + let editor = this.ckEditor.instance; + if (editor.mode === 'source') { + let editable = editor.editable(); + editable.attachListener(editable, 'input', () => { + this.myForm.get('content').setValue(editor.getData()); + this.myForm.get('content').markAsDirty(); + this.cdr.detectChanges(); + }); + } + }); + } + } + private updateForm(pageHelpContent: PageHelpContent) { this.pageHelpContent = pageHelpContent; this.myForm = this.form; diff --git a/dashboard/helpTexts/page-help-contents.component.html b/dashboard/helpTexts/page-help-contents.component.html index 30e7ed91..595a4de6 100644 --- a/dashboard/helpTexts/page-help-contents.component.html +++ b/dashboard/helpTexts/page-help-contents.component.html @@ -1,20 +1,15 @@ -- -- - -- Admin Dashboard - Manage page help texts +-+-+ --{{page.name}}
---diff --git a/dashboard/menu/menu.component.html b/dashboard/menu/menu.component.html index 7b966ee4..ea4b77d3 100644 --- a/dashboard/menu/menu.component.html +++ b/dashboard/menu/menu.component.html @@ -1,14 +1,5 @@--- --
--Admin Dashboard - Manage Menus-{{name ? name : 'Super Admin'}}
-diff --git a/dashboard/page/pages.component.html b/dashboard/page/pages.component.html index 5b85e3d4..24296b20 100644 --- a/dashboard/page/pages.component.html +++ b/dashboard/page/pages.component.html @@ -1,11 +1,5 @@----Manage Pages-{{name ? name : 'Super Admin'}}
--
----Manage Portals-
Super Admin
-- {
- if (subscription instanceof (ResizeObserver || IntersectionObserver)) {
+ if (typeof ResizeObserver !== "undefined" && subscription instanceof ResizeObserver) {
+ subscription.disconnect();
+ } else if (typeof ResizeObserver !== "undefined" && subscription instanceof IntersectionObserver) {
subscription.disconnect();
}
});
diff --git a/dashboard/sharedComponents/sidebar/layout.service.ts b/dashboard/sharedComponents/sidebar/layout.service.ts
index 4bd6bfa3..ed91e514 100644
--- a/dashboard/sharedComponents/sidebar/layout.service.ts
+++ b/dashboard/sharedComponents/sidebar/layout.service.ts
@@ -85,7 +85,7 @@ export class LayoutService {
this.subscriptions.forEach(subscription => {
if (subscription instanceof Subscriber) {
subscription.unsubscribe();
- } else if (subscription instanceof ResizeObserver) {
+ } else if (typeof ResizeObserver !== "undefined" && subscription instanceof ResizeObserver) {
subscription.disconnect();
}
})
diff --git a/dashboard/sharedComponents/sidebar/sideBar.component.html b/dashboard/sharedComponents/sidebar/sideBar.component.html
index ad3f6fe9..9bba0b18 100644
--- a/dashboard/sharedComponents/sidebar/sideBar.component.html
+++ b/dashboard/sharedComponents/sidebar/sideBar.component.html
@@ -5,10 +5,14 @@
- +--+ +- - - OpenAIRE Research Graph - - - 
+
+
+
-
diff --git a/landingPages/organization/organization.component.html b/landingPages/organization/organization.component.html
index f720c53c..426c44d4 100644
--- a/landingPages/organization/organization.component.html
+++ b/landingPages/organization/organization.component.html
@@ -54,22 +54,19 @@
- +--+ +- - - OpenAIRE Research Graph - - -
+
+
+
-
diff --git a/landingPages/project/project.component.html b/landingPages/project/project.component.html
index 6905df01..813953a2 100644
--- a/landingPages/project/project.component.html
+++ b/landingPages/project/project.component.html
@@ -94,22 +94,19 @@
- +--+ +- - - OpenAIRE Research Graph - - -
+
+
+
-
diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html
index d0200e89..dd5d400c 100644
--- a/landingPages/result/resultLanding.component.html
+++ b/landingPages/result/resultLanding.component.html
@@ -91,21 +91,18 @@
- +--+ +- - - OpenAIRE Research Graph - - -
+
+
+
-
diff --git a/login/user.component.ts b/login/user.component.ts
index 15922fe7..e279b7b6 100644
--- a/login/user.component.ts
+++ b/login/user.component.ts
@@ -43,8 +43,8 @@ export class UserComponent {
this.loginUrl = this.properties.loginUrl;
if (typeof document !== 'undefined') {
this.server = false;
- this.userManagementsService.getUserInfo().subscribe( user => {
- this.user = user;
+ this.userManagementsService.updateUserInfo( () => {
+ this.user = this.userManagementsService.user;
this.loggedIn = !!this.user;
this.errorMessage = "";
this.loading = true;
diff --git a/login/userMini.component.ts b/login/userMini.component.ts
index b1795bf6..4434a1e2 100644
--- a/login/userMini.component.ts
+++ b/login/userMini.component.ts
@@ -1,10 +1,16 @@
-import {Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges} from '@angular/core';
+import {Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild} from '@angular/core';
import {ActivatedRoute, Router} from '@angular/router';
import {Session, User} from './utils/helper.class';
import {RouterHelper} from '../utils/routerHelper.class';
import {Subscriber} from "rxjs";
import {MenuItem} from "../sharedComponents/menu";
import {UserManagementService} from "../services/user-management.service";
+import {
+ NotificationConfiguration,
+ NotificationsSidebarComponent
+} from "../notifications/notifications-sidebar/notifications-sidebar.component";
+
+declare var UIkit;
@Component({
selector: 'user-mini',
@@ -25,6 +31,7 @@ import {UserManagementService} from "../services/user-management.service";
-
{{item.title}}
@@ -41,42 +48,67 @@ import {UserManagementService} from "../services/user-management.service";
- + + + + + + - -- --- +@@ -95,7 +127,9 @@ export class UserMiniComponent implements OnInit, OnChanges { @Input() logInUrl; @Input() logOutUrl; @Input() cookieDomain; - @Output() closeCanvasEmitter: EventEmitter+ - + ++ +++ ++ +++ {{user.fullname}} +
+= new EventEmitter (); + @Input() notificationConfiguration: NotificationConfiguration; + @ViewChild('notificationsSidebar') notificationsSidebar: NotificationsSidebarComponent; + public showNotifications = false; private subscriptions = []; constructor(private router: Router, private route: ActivatedRoute, private userManagementService: UserManagementService) { @@ -122,8 +156,8 @@ export class UserMiniComponent implements OnInit, OnChanges { }); } - closeCanvas() { - this.closeCanvasEmitter.emit(true); + closeCanvas(canvas) { + UIkit.offcanvas(canvas).hide(); } initUser() { @@ -166,4 +200,8 @@ export class UserMiniComponent implements OnInit, OnChanges { this.firstLetters += matches.join(''); } } + + toggleNotifications() { + this.showNotifications = !this.showNotifications; + } } diff --git a/login/userMiniModule.module.ts b/login/userMiniModule.module.ts index b48df909..80ff9cfd 100644 --- a/login/userMiniModule.module.ts +++ b/login/userMiniModule.module.ts @@ -7,10 +7,11 @@ import {UserMiniComponent} from "./userMini.component"; import {IconsModule} from "../utils/icons/icons.module"; import {IconsService} from "../utils/icons/icons.service"; import {login} from "../utils/icons/icons"; +import {NotificationsSidebarModule} from "../notifications/notifications-sidebar/notifications-sidebar.module"; @NgModule({ imports: [ - CommonModule, FormsModule, RouterModule, IconsModule + CommonModule, FormsModule, RouterModule, IconsModule, NotificationsSidebarModule ], declarations: [ UserMiniComponent diff --git a/monitor/entities/stakeholder.ts b/monitor/entities/stakeholder.ts index b3f5b35a..3c14d3ec 100644 --- a/monitor/entities/stakeholder.ts +++ b/monitor/entities/stakeholder.ts @@ -165,6 +165,7 @@ export class Indicator { visibility: Visibility; defaultId: string; indicatorPaths: IndicatorPath[]; + descriptionOverlay: boolean = false; constructor(name: string, description: string, additionalDescription:string, type: IndicatorType, width: IndicatorSize,height: IndicatorSize, visibility: Visibility, indicatorPaths: IndicatorPath[], defaultId: string = null) { this._id = null; diff --git a/notifications/notifications-sidebar/notification-sidebar.component.less b/notifications/notifications-sidebar/notification-sidebar.component.less index ca48bd96..4f8222c4 100644 --- a/notifications/notifications-sidebar/notification-sidebar.component.less +++ b/notifications/notifications-sidebar/notification-sidebar.component.less @@ -5,7 +5,7 @@ } #notifications .notification-list { - padding: @global-medium-gutter 0 @global-medium-gutter @global-medium-gutter; + padding: 0 @global-medium-gutter; } #notifications .notification-list:not(:last-child) { @@ -17,7 +17,7 @@ #notifications .notification-list ul { overflow: auto; padding: 20px @global-medium-gutter 20px 0; - height: calc(100% - 104px); + height: calc(100% - 150px); } #notifications .notification-list ul > li:nth-child(n+2){ @@ -29,6 +29,6 @@ } #notifications .notification { - padding: @global-medium-gutter @global-medium-gutter; + padding: 0 @global-medium-gutter @global-medium-gutter @global-medium-gutter; overflow: auto; } diff --git a/notifications/notifications-sidebar/notifications-sidebar.component.ts b/notifications/notifications-sidebar/notifications-sidebar.component.ts index 4b4edcdc..157a9db9 100644 --- a/notifications/notifications-sidebar/notifications-sidebar.component.ts +++ b/notifications/notifications-sidebar/notifications-sidebar.component.ts @@ -1,4 +1,14 @@ -import {Component, Input, OnDestroy, OnInit, ViewEncapsulation} from "@angular/core"; +import { + Component, + ElementRef, + EventEmitter, + Input, + OnDestroy, + OnInit, + Output, + ViewChild, + ViewEncapsulation +} from "@angular/core"; import {Notification} from "../notifications"; import {NotificationService} from "../notification.service"; import {Subscription} from "rxjs"; @@ -8,71 +18,92 @@ import {Option} from "../../sharedComponents/input/input.component"; declare var UIkit; +export class NotificationConfiguration { + availableGroups: Option[] = []; + entities: string[] = []; + service: string; +} + @Component({ selector: 'notification-sidebar', template: ` - +-{{unreadCount}} -- -- --- -Notifications
-- --No notifications
--
-
-
- --
- -
-
-- -+ + + +-+ +
+- {{notification.title}}
+Notifications++--+ +- - {{notification.name + ' ' + notification.surname}}+ + +
- +No notifications
+-
+
-
+ ++
+ +
+
+++ +
++ + {{notification.title}}++-+ + {{notification.name + ' ' + notification.surname}}-
+ {{notification.date | date:'medium'}} ({{getDate(notification.date)}}) -++ +++`, styleUrls: ['notification-sidebar.component.less'], @@ -81,21 +112,21 @@ declare var UIkit; export class NotificationsSidebarComponent implements OnInit, OnDestroy { @Input() public user: User; + @Input() + public mobile: boolean = false; + @Input() + public configuration: NotificationConfiguration; + @Output() + public showNotificationsEmitter: EventEmitter= new EventEmitter (); public notifications: Notification[] = []; - @Input() - public availableGroups: Option[] = []; - @Input() - public entities: string[] = []; - @Input() - public service: string; public notification: Notification; private subscriptions: any[] = []; - + constructor(private notificationService: NotificationService) { } ngOnInit() { - this.subscriptions.push(this.notificationService.getNotifications(this.service).subscribe(notifications => { + this.subscriptions.push(this.notificationService.getNotifications(this.configuration.service).subscribe(notifications => { this.notifications = notifications; }, error => { this.notifications = []; @@ -141,8 +172,12 @@ export class NotificationsSidebarComponent implements OnInit, OnDestroy { this.notification = null; } + closeCanvas(canvas) { + UIkit.offcanvas(canvas).hide(); + } + readAll() { - this.notificationService.markAllAsRead(this.service).subscribe(() => { + this.notificationService.markAllAsRead(this.configuration.service).subscribe(() => { this.notifications.forEach(notification => { notification.read = true; }); diff --git a/sdg/sdg-selection/sdg-selection.component.ts b/sdg/sdg-selection/sdg-selection.component.ts index 68990afd..aba9acdf 100644 --- a/sdg/sdg-selection/sdg-selection.component.ts +++ b/sdg/sdg-selection/sdg-selection.component.ts @@ -4,6 +4,7 @@ import {UntypedFormArray, UntypedFormBuilder} from "@angular/forms"; import {properties} from "../../../../environments/environment"; import {EnvProperties} from "../../utils/properties/env-properties"; import {StringUtils} from "../../utils/string-utils.class"; +import {ISVocabulariesService} from "../../utils/staticAutoComplete/ISVocabularies.service"; @Component({ selector: 'sdg-selection', @@ -20,14 +21,14 @@ export class SdgSelectionComponent { public sdgs: UntypedFormArray; constructor( - private httpClient: HttpClient, + private vocabulariesService: ISVocabulariesService, private fb: UntypedFormBuilder ) {} ngOnInit() { this.loading = true; this.sdgs = this.fb.array([]); - this.httpClient.get(this.properties.domain+'/assets/common-assets/vocabulary/sdg.json').subscribe(data => { + this.vocabulariesService.getSDGs(properties).subscribe(data => { data['sdg'].forEach(element => { // this.sdgs.push({code: element.code, id: element.id, label: element.label, html: element.html, checked: this.subjects?.includes(element.id)}); this.sdgs.push(this.fb.group({ @@ -80,4 +81,4 @@ export class SdgSelectionComponent { private getEntityName (entityType:string) { return StringUtils.getEntityName(entityType, false); } -} \ No newline at end of file +} diff --git a/sdg/sdg.component.ts b/sdg/sdg.component.ts index 47cffd86..ac2ba65a 100644 --- a/sdg/sdg.component.ts +++ b/sdg/sdg.component.ts @@ -11,6 +11,7 @@ import {Router} from '@angular/router'; import {Meta, Title} from "@angular/platform-browser"; import {SEOService} from "../sharedComponents/SEO/SEO.service"; import {PiwikService} from "../utils/piwik/piwik.service"; +import {ISVocabulariesService} from "../utils/staticAutoComplete/ISVocabularies.service"; @Component({ selector: 'sdg', @@ -36,7 +37,7 @@ export class SdgComponent implements OnInit, OnDestroy { subscriptions: Subscription[] = []; constructor( - private httpClient: HttpClient, private refineFieldResultsService: RefineFieldResultsService, + private vocabulariesService: ISVocabulariesService, private refineFieldResultsService: RefineFieldResultsService, private _router: Router, private _meta: Meta, private _title: Title, @@ -54,7 +55,7 @@ export class SdgComponent implements OnInit, OnDestroy { this.updateUrl(this.url); this.updateTitle(this.pageTitle); this.updateDescription(this.pageDescription); - this.httpClient.get(properties.domain+'/assets/common-assets/vocabulary/sdg.json').subscribe(data => { + this.vocabulariesService.getSDGs(properties).subscribe(data => { this.sdgs = data['sdg']; }); let refineParams = null; diff --git a/searchPages/searchUtils/newSearchPage.component.html b/searchPages/searchUtils/newSearchPage.component.html index b2e4ed18..385ff5c0 100644 --- a/searchPages/searchUtils/newSearchPage.component.html +++ b/searchPages/searchUtils/newSearchPage.component.html @@ -326,16 +326,12 @@ [isDisabled]="disabled" [isMobile]="mobile"> +---- - - OpenAIRE Research Graph - - + +
+
+ diff --git a/sharedComponents/navigationBar.component.ts b/sharedComponents/navigationBar.component.ts index a24eb2d0..4f3cf8e4 100644 --- a/sharedComponents/navigationBar.component.ts +++ b/sharedComponents/navigationBar.component.ts @@ -8,6 +8,7 @@ import {Subscription} from 'rxjs'; import {HelpContentService} from '../services/help-content.service'; import {properties} from "../../../environments/environment"; import {LayoutService} from "../dashboard/sharedComponents/sidebar/layout.service"; +import {NotificationConfiguration} from "../notifications/notifications-sidebar/notifications-sidebar.component"; declare var UIkit; @@ -48,6 +49,7 @@ export class NavigationBarComponent implements OnInit, OnDestroy, OnChanges { @Input() searchRoute: string = '/search/find'; @Input() searchPlaceHolder: string = 'Search for research results'; @Input() showLogo: boolean = true; + @Input() notificationConfiguration: NotificationConfiguration; replaceHeader: boolean = false; public activeHeader: Header; keyword: string = ''; diff --git a/sharedComponents/tabs/slider-tabs.component.ts b/sharedComponents/tabs/slider-tabs.component.ts index 6c420987..59149387 100644 --- a/sharedComponents/tabs/slider-tabs.component.ts +++ b/sharedComponents/tabs/slider-tabs.component.ts @@ -27,21 +27,21 @@ declare var UIkit; [attr.uk-switcher]="type === 'static'?('connect:' + connect):null" [ngClass]="'uk-flex-' + flexPosition + ' ' + tabsClass">- - +
- {{tab.title}}
-- {{tab.title}}
- - +
- {{tab.title}}
-- - +
- {{tab.title}}
-- {{tab.title}} @@ -206,6 +206,7 @@ export class SliderTabsComponent implements AfterViewInit, OnDestroy { public showActive(index) { this.activeIndex = index; + this.activeEmitter.emit(this.tabs.get(this.activeIndex).id); if(this.slider) { this.slider.show(this.activeIndex); } diff --git a/utils/full-page-slider/full-page-slider.module.ts b/utils/full-page-slider/full-page-slider.module.ts index 5931bef7..1dd8a466 100644 --- a/utils/full-page-slider/full-page-slider.module.ts +++ b/utils/full-page-slider/full-page-slider.module.ts @@ -4,16 +4,10 @@ import {FullPageSliderComponent} from "./full-page-slider.component"; import {SlideComponent} from "./slide.component"; import {BottomModule} from '../../sharedComponents/bottom.module'; import {IconsModule} from '../icons/icons.module'; -import {IconsService} from '../icons/icons.service'; -import {arrow_down, arrow_up} from '../icons/icons'; @NgModule({ imports: [CommonModule, BottomModule, IconsModule], declarations: [FullPageSliderComponent, SlideComponent], exports: [FullPageSliderComponent, SlideComponent], }) -export class FullPageSliderModule { - constructor(private iconsService: IconsService) { - this.iconsService.registerIcons([arrow_up, arrow_down]); - } -} +export class FullPageSliderModule {} diff --git a/utils/modal/alert.ts b/utils/modal/alert.ts index 8f7fada7..d43ab3f2 100644 --- a/utils/modal/alert.ts +++ b/utils/modal/alert.ts @@ -157,7 +157,7 @@ export class AlertModal implements OnInit, AfterViewInit, OnDestroy { } ngAfterViewInit() { - if(this.element) { + if(this.element && typeof document !== "undefined") { this.subscriptions.push(UIkit.util.on(document, 'hide', '#' + this.id, () => { this.cancelOutput.emit(true); })); diff --git a/utils/number-utils.class.ts b/utils/number-utils.class.ts index 61054a75..4e17cfb1 100644 --- a/utils/number-utils.class.ts +++ b/utils/number-utils.class.ts @@ -1,5 +1,5 @@ export enum Level { - NONE, + ALL, K, M, B @@ -14,7 +14,8 @@ export interface NumberSize { export class NumberUtils { - public static roundNumber(num: number, level: Level = Level.NONE, decimal = 0): any { + public static roundNumber(num: number | string, level: Level = Level.ALL, decimal = 0): any { + num = Number.parseFloat(num.toString()); let roundNum: NumberSize; let initialNum = num; let variance = Math.pow(10, decimal); @@ -30,11 +31,6 @@ export class NumberUtils { num = num / 1000; num = Math.round(num * variance) / variance; roundNum = {number: num, size: "K", count: initialNum}; - } else if (num >= 100) { - num = num / 100; - num = Math.round(num * variance) / variance; - num = num * 100; - roundNum = {number: num, size: "", count: initialNum}; } else { roundNum = {number: num, size: "", count: initialNum}; } diff --git a/utils/pipes/number-round.pipe.ts b/utils/pipes/number-round.pipe.ts index 62608761..b42a93aa 100644 --- a/utils/pipes/number-round.pipe.ts +++ b/utils/pipes/number-round.pipe.ts @@ -5,19 +5,24 @@ import {DecimalPipe} from "@angular/common"; @Pipe({name: 'numberRound'}) export class NumberRoundPipe implements PipeTransform { decimalPipe: DecimalPipe = new DecimalPipe("en"); - - constructor() {} - - transform(value: number, ...args: any[]): any { - let level = Level.NONE; + + constructor() { + } + + /** + * Args: Level: 0 (default): ALL, 1: K, 2: M, 3:B + * Decimal: how many decimals should be shown (e.g 1 -> 62.1) + * */ + transform(value: number | string, ...args: any[]): any { + let level = Level.ALL; let decimal = 0; - if(args[0]) { + if (args[0]) { level = args[0]; } - if(args[1]) { + if (args[1]) { decimal = args[1]; } let size: NumberSize = NumberUtils.roundNumber(value, level, decimal); - return this.decimalPipe.transform(size.number) + (size.size?'' + size.size + '':''); + return this.decimalPipe.transform(size.number) + (size.size ? '' + size.size + '' : ''); } } diff --git a/utils/staticAutoComplete/ISVocabularies.service.ts b/utils/staticAutoComplete/ISVocabularies.service.ts index 295ba7d6..e635b8ec 100644 --- a/utils/staticAutoComplete/ISVocabularies.service.ts +++ b/utils/staticAutoComplete/ISVocabularies.service.ts @@ -107,21 +107,28 @@ export class ISVocabulariesService { getLocalVocabularyFromService(vocabularyName: string, properties: EnvProperties): Observable
res.json()) + return this.getSDGs(properties) .pipe(map(res => res['sdg'])) .pipe(map(res => this.parseSDGs(res))) .pipe(catchError(this.handleError)); }else if( vocabularyName == "fos"){ - let url = properties.domain+"/assets/common-assets/vocabulary/fos.json"; - return this.http.get((properties.useLongCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url) - //.map(res => res.json()) + return this.getFos(properties) .pipe(map(res => res['fos'])) .pipe(map(res => this.parseFOS(res))) .pipe(catchError(this.handleError)); } } + + + getFos(properties: EnvProperties): Observable { + let url = "/assets/common-assets/vocabulary/fos.json"; + return this.http.get((properties.useLongCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url) + } + + getSDGs(properties: EnvProperties): Observable { + let url = "/assets/common-assets/vocabulary/sdg.json"; + return this.http.get((properties.useLongCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url) + } parseSDGs(data: any): AutoCompleteValue[] { var array: AutoCompleteValue[] = [] @@ -160,6 +167,7 @@ export class ISVocabulariesService { } return array; } + parse(data: any, vocabularyName: string): AutoCompleteValue[] { var array: AutoCompleteValue[] = [] for (var i = 0; i < data.length; i++) { diff --git a/utils/string-utils.class.ts b/utils/string-utils.class.ts index ced29bc7..61d45b48 100644 --- a/utils/string-utils.class.ts +++ b/utils/string-utils.class.ts @@ -261,9 +261,9 @@ export class Identifier { export class StringUtils { - public static urlRegex = 'https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|www\.' + - '[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9]+\.[^\s]{2,}|www\.' + - '[a-zA-Z0-9]+\.[^\s]{2,}'; + public static urlRegex = 'https?:\\/\\/(?:www(2?)\\.|(?!www(2?)))[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\\.[^\\s]{2,}|www(2?)\\.' + + '[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\\.[^\\s]{2,}|https?:\\/\\/(?:www(2?)\\.|(?!www(2?)))[a-zA-Z0-9]+\\.[^\\s]{2,}|www(2?)\\.' + + '[a-zA-Z0-9]+\\.[^\\s]{2,}'; public static routeRegex = '^[a-zA-Z0-9\/][a-zA-Z0-9\/-]*$'; -
-
-
{{item.title}}
@@ -41,42 +48,67 @@ import {UserManagementService} from "../services/user-management.service";
- {
- if (subscription instanceof (ResizeObserver || IntersectionObserver)) {
+ if (typeof ResizeObserver !== "undefined" && subscription instanceof ResizeObserver) {
+ subscription.disconnect();
+ } else if (typeof ResizeObserver !== "undefined" && subscription instanceof IntersectionObserver) {
subscription.disconnect();
}
});
diff --git a/dashboard/sharedComponents/sidebar/layout.service.ts b/dashboard/sharedComponents/sidebar/layout.service.ts
index 4bd6bfa3..ed91e514 100644
--- a/dashboard/sharedComponents/sidebar/layout.service.ts
+++ b/dashboard/sharedComponents/sidebar/layout.service.ts
@@ -85,7 +85,7 @@ export class LayoutService {
this.subscriptions.forEach(subscription => {
if (subscription instanceof Subscriber) {
subscription.unsubscribe();
- } else if (subscription instanceof ResizeObserver) {
+ } else if (typeof ResizeObserver !== "undefined" && subscription instanceof ResizeObserver) {
subscription.disconnect();
}
})
diff --git a/dashboard/sharedComponents/sidebar/sideBar.component.html b/dashboard/sharedComponents/sidebar/sideBar.component.html
index ad3f6fe9..9bba0b18 100644
--- a/dashboard/sharedComponents/sidebar/sideBar.component.html
+++ b/dashboard/sharedComponents/sidebar/sideBar.component.html
@@ -5,10 +5,14 @@
-
-