From 062f1a23c4f55a1d98c185f53f490795c4c89145 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Tue, 10 Jan 2023 02:25:03 +0200
Subject: [PATCH 01/13] [Explore | master & Library | angular-14]: composer.ts:
 [Bug fix] Add parenthesis around ternary operator in method
 composeEmailForExplore() - empty or wrong body | contact-us.component.html:
 Added #captchaElem in <re-captcha> | contact-us.component.ts: Added ViewChild
 for captchaElem and added method "resetRecaptcha()" | contact.component.html:
 Added #contactUs in <contact-us> | contact.component.ts: Added ViewChild for
 contactUs and call contactUsComponent.resetRecaptcha() on reset method.

---
 contact-us/contact-us.component.html | 2 +-
 contact-us/contact-us.component.ts   | 9 ++++++++-
 utils/email/composer.ts              | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/contact-us/contact-us.component.html b/contact-us/contact-us.component.html
index 11285a71..ad78e795 100644
--- a/contact-us/contact-us.component.html
+++ b/contact-us/contact-us.component.html
@@ -26,7 +26,7 @@
   <div *ngIf="contactForm.get('description')" class="uk-width-1-1" input type="textarea" rows="4" placeholder="Description"
        [inputClass]="'inner' + (smallForm?' x-small':'')" [formInput]="contactForm.get('description')"></div>
   <div *ngIf="contactForm.get('recaptcha')" class="uk-flex uk-flex-center" [class.uk-width-1-1]="smallForm" [class.uk-flex-last@s]="!smallForm">
-    <re-captcha (resolved)="handleRecaptcha($event)" [siteKey]="properties.reCaptchaSiteKey"></re-captcha>
+    <re-captcha #captchaElem (resolved)="handleRecaptcha($event)" [siteKey]="properties.reCaptchaSiteKey"></re-captcha>
   </div>
   <div class="uk-flex uk-flex-center" [class.uk-width-1-1]="smallForm" [class.uk-flex-column]="!smallForm">
     <div class="uk-flex uk-flex-center" [class.uk-flex-left@s]="!smallForm">
diff --git a/contact-us/contact-us.component.ts b/contact-us/contact-us.component.ts
index 19c1a9dc..e86006a2 100644
--- a/contact-us/contact-us.component.ts
+++ b/contact-us/contact-us.component.ts
@@ -1,7 +1,8 @@
-import {Component, EventEmitter, Input, Output} from '@angular/core';
+import {Component, EventEmitter, Input, Output, ViewChild} from '@angular/core';
 import {FormGroup} from '@angular/forms';
 import {EnvProperties} from "../utils/properties/env-properties";
 import {properties} from "../../../environments/environment";
+import {RecaptchaComponent} from "ng-recaptcha";
 
 @Component({
   selector: 'contact-us',
@@ -18,6 +19,8 @@ export class ContactUsComponent {
   @Input() public scrollspy: boolean = false;
   @Input() public sending: boolean = false;
   @Output() sendEmitter: EventEmitter<any> = new EventEmitter<any>();
+  @ViewChild('captchaElem') captchaElem: RecaptchaComponent;
+
   public properties: EnvProperties = properties;
   
   public send() {
@@ -29,4 +32,8 @@ export class ContactUsComponent {
   public handleRecaptcha(captchaResponse: string) {
     this.contactForm.get('recaptcha').setValue(captchaResponse);
   }
+
+  public resetRecaptcha() {
+    this.captchaElem.reset();
+  }
 }
diff --git a/utils/email/composer.ts b/utils/email/composer.ts
index 4fc023a1..14de4338 100644
--- a/utils/email/composer.ts
+++ b/utils/email/composer.ts
@@ -86,7 +86,7 @@ export class Composer {
 			+ "<span><b>Name</b>: " + contactForm.name + "</span><br>"
 			+ "<span><b>Surname</b>: " + contactForm.surname + "</span><br>"
 			+ "<span><b>Email</b>: " + contactForm.email + "</span><br>"
-			+ "<span><b>Affiliation</b>: " + contactForm.affiliation ? contactForm.affiliation : '-' + "</span><br>"
+			+ "<span><b>Affiliation</b>: " + (contactForm.affiliation ? contactForm.affiliation : '-') + "</span><br>"
 			+ "<p>" + contactForm.message + "</p>"
 			+ "</div>";
     email.recipients = admins; 

From eddd7e00b9062eb177d3d3db59b9f169da4c1366 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Wed, 11 Jan 2023 15:35:13 +0200
Subject: [PATCH 02/13] Number round: Add level of round and round to 1 decimal

---
 utils/number-utils.class.ts      | 66 +++++++++++++++++---------------
 utils/pipes/number-round.pipe.ts |  9 ++---
 2 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/utils/number-utils.class.ts b/utils/number-utils.class.ts
index 5abe2ce5..064f0c05 100644
--- a/utils/number-utils.class.ts
+++ b/utils/number-utils.class.ts
@@ -1,38 +1,44 @@
+export enum Level {
+  NONE,
+  K,
+  M,
+  B
+}
+
+
 export interface NumberSize {
   number: number;
-  size: "B" | "M" | "K" | "";
+  size: "B" | "M" | "K" | ""
   count: number;
 }
 
-export class NumberUtils{
+export class NumberUtils {
   
-  public static roundNumber(num: number):any {
-      //console.log("Trying to round number: "+ num);
-      var roundNum: NumberSize = null;
-      var initialNum = num;
-      if (num >= 1000000000) {
-        num = num / 1000000;
-        num = Math.round(num);
-        roundNum = {number: num, size: "B", count: initialNum};
-      } else if(num >= 1000000) {
-        num=num/1000000;
-        num= Math.round(num);
-        roundNum =  { number: num, size: "M", count: initialNum};
-      }else if( num >= 1000){
-        num=num/1000;
-        num= Math.round(num);
-        roundNum =  { number: num, size: "K", count: initialNum};
-      }else if (num >= 100) {
-        num=num/100;
-        num= Math.round(num);
-        num=num*100;
-        roundNum =  { number: num, size: "" , count: initialNum};
-      }else{
-        roundNum =  { number: num, size: "" , count: initialNum};
-      }
-      return roundNum;
+  public static roundNumber(num: number, level: Level = Level.NONE): any {
+    var roundNum: NumberSize;
+    var initialNum = num;
+    if (num >= 1000000000 && level <= Level.B) {
+      num = num / 1000000;
+      num = Math.round(num * 10) / 10;
+      roundNum = {number: num, size: "B", count: initialNum};
+    } else if (num >= 1000000 && level <= Level.M) {
+      num = num / 1000000;
+      num = Math.round(num * 10) / 10;
+      roundNum = {number: num, size: "M", count: initialNum};
+    } else if (num >= 1000 && level <= Level.K) {
+      num = num / 1000;
+      num = Math.round(num * 10) / 10;
+      roundNum = {number: num, size: "K", count: initialNum};
+    } else if (num >= 100) {
+      num = num / 100;
+      num = Math.round(num * 10) / 10;
+      num = num * 100;
+      roundNum = {number: num, size: "", count: initialNum};
+    } else {
+      roundNum = {number: num, size: "", count: initialNum};
+    }
+    return roundNum;
   }
-
-
-
+  
+  
 }
diff --git a/utils/pipes/number-round.pipe.ts b/utils/pipes/number-round.pipe.ts
index d714f472..f84ee548 100644
--- a/utils/pipes/number-round.pipe.ts
+++ b/utils/pipes/number-round.pipe.ts
@@ -1,18 +1,15 @@
 import {Pipe, PipeTransform} from "@angular/core";
-import {NumberSize, NumberUtils} from "../number-utils.class";
+import {Level, NumberSize, NumberUtils} from "../number-utils.class";
 import {DecimalPipe} from "@angular/common";
 
 @Pipe({name: 'numberRound'})
 export class NumberRoundPipe implements PipeTransform {
   decimalPipe: DecimalPipe = new DecimalPipe("en");
   
-  
-  constructor() {
-  
-  }
+  constructor() {}
   
   transform(value: number): any {
-    let size: NumberSize = NumberUtils.roundNumber(value);
+    let size: NumberSize = NumberUtils.roundNumber(value, Level.M);
     return this.decimalPipe.transform(size.number) + size.size;
   }
 }

From 4cd5bcd12b6d41cef384b54aa4a9c3fecbb46a1f Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Wed, 11 Jan 2023 15:51:55 +0200
Subject: [PATCH 03/13] Number round: Add decimal argument in order to be
 dynamic

---
 utils/number-utils.class.ts      | 15 ++++++++-------
 utils/pipes/number-round.pipe.ts | 12 ++++++++++--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/utils/number-utils.class.ts b/utils/number-utils.class.ts
index 064f0c05..61054a75 100644
--- a/utils/number-utils.class.ts
+++ b/utils/number-utils.class.ts
@@ -14,24 +14,25 @@ export interface NumberSize {
 
 export class NumberUtils {
   
-  public static roundNumber(num: number, level: Level = Level.NONE): any {
-    var roundNum: NumberSize;
-    var initialNum = num;
+  public static roundNumber(num: number, level: Level = Level.NONE, decimal = 0): any {
+    let roundNum: NumberSize;
+    let initialNum = num;
+    let variance = Math.pow(10, decimal);
     if (num >= 1000000000 && level <= Level.B) {
       num = num / 1000000;
-      num = Math.round(num * 10) / 10;
+      num = Math.round(num * variance) / variance;
       roundNum = {number: num, size: "B", count: initialNum};
     } else if (num >= 1000000 && level <= Level.M) {
       num = num / 1000000;
-      num = Math.round(num * 10) / 10;
+      num = Math.round(num * variance) / variance;
       roundNum = {number: num, size: "M", count: initialNum};
     } else if (num >= 1000 && level <= Level.K) {
       num = num / 1000;
-      num = Math.round(num * 10) / 10;
+      num = Math.round(num * variance) / variance;
       roundNum = {number: num, size: "K", count: initialNum};
     } else if (num >= 100) {
       num = num / 100;
-      num = Math.round(num * 10) / 10;
+      num = Math.round(num * variance) / variance;
       num = num * 100;
       roundNum = {number: num, size: "", count: initialNum};
     } else {
diff --git a/utils/pipes/number-round.pipe.ts b/utils/pipes/number-round.pipe.ts
index f84ee548..ab8398ea 100644
--- a/utils/pipes/number-round.pipe.ts
+++ b/utils/pipes/number-round.pipe.ts
@@ -8,8 +8,16 @@ export class NumberRoundPipe implements PipeTransform {
   
   constructor() {}
   
-  transform(value: number): any {
-    let size: NumberSize = NumberUtils.roundNumber(value, Level.M);
+  transform(value: number, ...args: any[]): any {
+    let level = Level.NONE;
+    let decimal = 0;
+    if(args[0]) {
+      level = args[0];
+    }
+    if(args[1]) {
+      decimal = args[1];
+    }
+    let size: NumberSize = NumberUtils.roundNumber(value, level, decimal);
     return this.decimalPipe.transform(size.number) + size.size;
   }
 }

From da144c1c77012fa4489dd84f013d499f9df8f72a Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Fri, 13 Jan 2023 11:33:53 +0200
Subject: [PATCH 04/13] Round pipe: Make it HTML in order to add class in
 number's size

---
 utils/pipes/number-round.pipe.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/pipes/number-round.pipe.ts b/utils/pipes/number-round.pipe.ts
index ab8398ea..62608761 100644
--- a/utils/pipes/number-round.pipe.ts
+++ b/utils/pipes/number-round.pipe.ts
@@ -18,6 +18,6 @@ export class NumberRoundPipe implements PipeTransform {
       decimal = args[1];
     }
     let size: NumberSize = NumberUtils.roundNumber(value, level, decimal);
-    return this.decimalPipe.transform(size.number) + size.size;
+    return this.decimalPipe.transform(size.number) + (size.size?'<span class="number-size">'  + size.size + '</span>':'');
   }
 }

From 53400f774505b7461ba5773f3d2d40cfc7091e34 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Fri, 20 Jan 2023 17:31:36 +0200
Subject: [PATCH 05/13] Add shouldUpdate in getStakeholder method.
 Role-verification: Add userInfoLink if user-info is on other portal

---
 monitor/services/stakeholder.service.ts          | 10 +++-------
 role-verification/role-verification.component.ts |  7 ++++++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/monitor/services/stakeholder.service.ts b/monitor/services/stakeholder.service.ts
index 8b546afd..272cbb39 100644
--- a/monitor/services/stakeholder.service.ts
+++ b/monitor/services/stakeholder.service.ts
@@ -26,12 +26,8 @@ export class StakeholderService {
   private promise: Promise<void>;
   private sub;
   
-  constructor(private http: HttpClient, private route: ActivatedRoute) {
+  constructor(private http: HttpClient) {
     this.stakeholderSubject = new BehaviorSubject<Stakeholder>(null);
-/*    let source = new EventSource(properties.monitorServiceAPIURL + "/stakeholder/events", {withCredentials: true});
-    source.addEventListener('message', message => {
-      console.log(message.data);
-    });*/
   }
   
   ngOnDestroy() {
@@ -44,8 +40,8 @@ export class StakeholderService {
     }
   }
   
-  getStakeholder(alias: string): Observable<Stakeholder> {
-    if (!this.stakeholderSubject.value || this.stakeholderSubject.value.alias !== alias) {
+  getStakeholder(alias: string, shouldUpdate: boolean = false): Observable<Stakeholder> {
+    if (!this.stakeholderSubject.value || this.stakeholderSubject.value.alias !== alias || shouldUpdate) {
       this.promise = new Promise<void>((resolve, reject) => {
         this.sub = this.http.get<Stakeholder>(properties.monitorServiceAPIURL + '/stakeholder/' + encodeURIComponent(alias), CustomOptions.registryOptions()).pipe(map(stakeholder => {
           return this.formalize(this.checkIsUpload(stakeholder));
diff --git a/role-verification/role-verification.component.ts b/role-verification/role-verification.component.ts
index 326b0d23..1f2b3a72 100644
--- a/role-verification/role-verification.component.ts
+++ b/role-verification/role-verification.component.ts
@@ -65,7 +65,10 @@ import {Composer} from "../utils/email/composer";
         We are unable to process the request. What happened?
         <ul class="uk-margin-top uk-list uk-list-circle uk-list-primary">
           <li>You are logged in with a different email, than the one you have received the invitation.
-            Check <a [routerLink]="[userInfoLinkPrefix + '/user-info']" (click)="errorModal.cancel()">here</a> the email of your account.</li>
+            Check
+            <a *ngIf="!userInfoLink" [routerLink]="[userInfoLinkPrefix + '/user-info']" (click)="errorModal.cancel()">here</a>
+            <a *ngIf="userInfoLink" [href]="userInfoLink" (click)="errorModal.cancel()">here</a>
+            the email of your account.</li>
           <li>The invitation has been canceled.</li>
           <li>The URL is invalid.</li>
         </ul>
@@ -84,6 +87,8 @@ export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewIn
   public service: "connect" | "monitor" = "monitor";
   @Input()
   public userInfoLinkPrefix = '';
+  @Input()
+  public userInfoLink = null;
   public user: User;
   public verification: any;
   public code: UntypedFormControl;

From 9f4be4b29b98118e62dbd6ed6b8cd2b8a3e98b90 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Wed, 25 Jan 2023 08:00:35 +0200
Subject: [PATCH 06/13] Bottom: Fix shortView. Sidebar: Add toggle and hover
 behaviour.

---
 .../sidebar/layout.service.ts                 | 13 +++++
 .../sidebar/sideBar.component.html            | 10 ++--
 .../sidebar/sideBar.component.ts              |  5 --
 .../sidebar/sideBar.module.ts                 |  7 ++-
 .../sidebar/sidebar-content.component.ts      | 29 +++++++++++
 sharedComponents/bottom.component.html        | 52 ++++++++++---------
 6 files changed, 79 insertions(+), 37 deletions(-)
 create mode 100644 dashboard/sharedComponents/sidebar/sidebar-content.component.ts

diff --git a/dashboard/sharedComponents/sidebar/layout.service.ts b/dashboard/sharedComponents/sidebar/layout.service.ts
index f39048df..ed6e67fc 100644
--- a/dashboard/sharedComponents/sidebar/layout.service.ts
+++ b/dashboard/sharedComponents/sidebar/layout.service.ts
@@ -17,6 +17,11 @@ export class LayoutService {
    */
   private openSubject: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
   
+  /**
+   * Set this to true when sidebar is hovered, otherwise false.
+   */
+  private hoverSubject: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+  
   /**
    *  Add hasSidebar: false on data of route config, if sidebar is not needed.
    */
@@ -164,6 +169,14 @@ export class LayoutService {
     this.openSubject.next(value);
   }
   
+  get hover(): boolean {
+    return this.hoverSubject.getValue();
+  }
+  
+  setHover(value: boolean) {
+    this.hoverSubject.next(value);
+  }
+  
   get hasSidebar(): Observable<boolean> {
     return this.hasSidebarSubject.asObservable();
   }
diff --git a/dashboard/sharedComponents/sidebar/sideBar.component.html b/dashboard/sharedComponents/sidebar/sideBar.component.html
index 22c4cb2a..02e606ac 100644
--- a/dashboard/sharedComponents/sidebar/sideBar.component.html
+++ b/dashboard/sharedComponents/sidebar/sideBar.component.html
@@ -1,5 +1,5 @@
 <aside id="sidebar_main">
-  <div id="sidebar_content">
+  <div sidebar-content>
     <div *ngIf="items.length > 0" class="menu_section uk-margin-large-top" style="min-height: 30vh">
       <ul #nav class="uk-list uk-nav uk-nav-default uk-nav-parent-icon" uk-nav="duration: 400">
         <ng-template ngFor [ngForOf]="items" let-item>
@@ -7,12 +7,11 @@
               [class.uk-parent]="item.items.length > 0">
             <a [routerLink]="getItemRoute(item)" [title]="item.title"
                [queryParams]="item.route?item.params:null" [queryParamsHandling]="item.route?queryParamsHandling:null">
-              <div class="uk-flex uk-flex-middle uk-flex-center">
+              <div class="uk-flex uk-flex-middle">
                 <div *ngIf="item.icon && (item.icon.svg || item.icon.name)" class="uk-width-auto">
                   <icon class="menu-icon" [customClass]="item.icon.class" [name]="item.icon.name" ratio="0.9" [svg]="item.icon.svg" [flex]="true"></icon>
                 </div>
-                <span *ngIf="open || !item.icon" [class.uk-text-small]="!open" class="uk-width-expand uk-text-truncate uk-margin-small-left">{{item.title}}</span>
-                <span *ngIf="item.items?.length > 0"></span>
+                <span [class.hide-on-close]="item.icon" class="uk-width-expand uk-text-truncate uk-margin-small-left">{{item.title}}</span>
               </div>
             </a>
             <ul *ngIf="item.items?.length > 0 && (isBrowser || isTheActiveMenuItem(item))" class="uk-nav-sub">
@@ -37,7 +36,8 @@
                 <div *ngIf="specialMenuItem.icon" class="uk-width-auto">
                   <icon class="menu-icon" [customClass]="specialMenuItem.icon.class"  [name]="specialMenuItem.icon.name" ratio="1.2" [svg]="specialMenuItem.icon.svg" [flex]="true"></icon>
                 </div>
-                <span *ngIf="open || !specialMenuItem.icon" [class.uk-text-small]="!open" class="uk-width-expand uk-text-truncate uk-margin-small-left">{{specialMenuItem.title}}</span>
+                <span class="uk-width-expand uk-text-truncate uk-margin-small-left"
+                      [class.hide-on-close]="specialMenuItem.icon">{{specialMenuItem.title}}</span>
               </div>
             </a>
           </li>
diff --git a/dashboard/sharedComponents/sidebar/sideBar.component.ts b/dashboard/sharedComponents/sidebar/sideBar.component.ts
index 4c18aa47..56fd8702 100644
--- a/dashboard/sharedComponents/sidebar/sideBar.component.ts
+++ b/dashboard/sharedComponents/sidebar/sideBar.component.ts
@@ -85,9 +85,4 @@ export class SideBarComponent implements AfterViewInit {
   public get open() {
     return this.layoutService.open;
   }
-  
-  public toggleOpen(event: MouseEvent) {
-    event.preventDefault();
-    this.layoutService.setOpen(!this.open);
-  }
 }
diff --git a/dashboard/sharedComponents/sidebar/sideBar.module.ts b/dashboard/sharedComponents/sidebar/sideBar.module.ts
index b57e2d4c..6bb6d368 100644
--- a/dashboard/sharedComponents/sidebar/sideBar.module.ts
+++ b/dashboard/sharedComponents/sidebar/sideBar.module.ts
@@ -6,6 +6,7 @@ import {RouterModule} from "@angular/router";
 import {SideBarComponent} from './sideBar.component';
 import {UrlPrefixModule} from "../../../utils/pipes/url-prefix.module";
 import {IconsModule} from "../../../utils/icons/icons.module";
+import {SidebarContentComponent} from "./sidebar-content.component";
 
 @NgModule({
   imports: [
@@ -15,11 +16,13 @@ import {IconsModule} from "../../../utils/icons/icons.module";
     IconsModule
   ],
   declarations: [
-    SideBarComponent
+    SideBarComponent,
+    SidebarContentComponent
   ],
   providers: [],
   exports: [
-    SideBarComponent
+    SideBarComponent,
+    SidebarContentComponent
   ]
 })
 export class SideBarModule {
diff --git a/dashboard/sharedComponents/sidebar/sidebar-content.component.ts b/dashboard/sharedComponents/sidebar/sidebar-content.component.ts
new file mode 100644
index 00000000..130a0899
--- /dev/null
+++ b/dashboard/sharedComponents/sidebar/sidebar-content.component.ts
@@ -0,0 +1,29 @@
+import {Component, HostListener} from "@angular/core";
+import {LayoutService} from "./layout.service";
+
+@Component({
+  selector: '[sidebar-content]',
+  template: `
+    <div id="sidebar_toggle" (click)="toggleOpen()"></div>
+    <div id="sidebar_content" (mouseenter)="onMouseEnter()" (mouseleave)="onMouseLeave()">
+      <ng-content></ng-content>
+    </div>
+  `
+})
+export class SidebarContentComponent {
+  
+  constructor(private layoutService: LayoutService) {
+  }
+
+  onMouseEnter() {
+    this.layoutService.setHover(true);
+  }
+
+  onMouseLeave() {
+    this.layoutService.setHover(false);
+  }
+
+  public toggleOpen() {
+    this.layoutService.setOpen(!this.layoutService.open);
+  }
+}
diff --git a/sharedComponents/bottom.component.html b/sharedComponents/bottom.component.html
index 0b6c6c19..b9bd4b45 100644
--- a/sharedComponents/bottom.component.html
+++ b/sharedComponents/bottom.component.html
@@ -11,38 +11,40 @@
   </div>
 </ng-template>
 <ng-container *ngIf="shortView;else longView">
-  <div *ngIf="properties.footerGrantText || (divContents && divContents['footer']?.length > 0)"
-       class="uk-padding uk-flex uk-flex-middle">
-    <div *ngIf="showCommision" class="uk-width-1-2 uk-margin-left">
-      <div class="uk-flex uk-flex-middle@m uk-flex-top">
-        <div>
-          <img style="max-width: 42px;"
-               [src]="assetsPath + 'common/commission.jpg'"
-               alt="flag black white low" width="50px" loading="lazy">
-        </div>
-        <div class="uk-margin-left">
-          <helper *ngIf="divContents && divContents['footer']?.length > 0"
-                  [texts]="divContents['footer']"></helper>
-          <div class="uk-visible@m">
-            <div *ngIf="properties.footerGrantText" class="">
-              <span style="font-size: 12px; line-height: 0.7!important;"
-                    [innerHtml]="properties.footerGrantText"></span>
-            </div>
+  <div [ngClass]="background">
+    <div *ngIf="properties.footerGrantText || (divContents && divContents['footer']?.length > 0)"
+         class="uk-padding-small uk-flex uk-flex-middle uk-flex-between">
+      <div *ngIf="showCommision" class="uk-width-expand">
+        <div class="uk-flex uk-flex-middle@m uk-flex-top">
+          <div>
+            <img style="max-width: 42px;"
+                 [src]="assetsPath + 'common/commission.jpg'"
+                 alt="flag black white low" width="50px" loading="lazy">
           </div>
-          <div class="uk-text-center uk-hidden@m">
-            <div *ngIf="properties.footerGrantText" class="">
+          <div class="uk-margin-left">
+            <helper *ngIf="divContents && divContents['footer']?.length > 0"
+                    [texts]="divContents['footer']"></helper>
+            <div class="uk-visible@m">
+              <div *ngIf="properties.footerGrantText" class="">
               <span style="font-size: 12px; line-height: 0.7!important;"
                     [innerHtml]="properties.footerGrantText"></span>
+              </div>
+            </div>
+            <div class="uk-text-center uk-hidden@m">
+              <div *ngIf="properties.footerGrantText" class="">
+              <span style="font-size: 12px; line-height: 0.7!important;"
+                    [innerHtml]="properties.footerGrantText"></span>
+              </div>
             </div>
           </div>
         </div>
       </div>
-    </div>
-    <div *ngIf="showOpenaire" class="uk-text-right uk-width-1-2">
-      <!-- <img [src]="assetsPath + 'common/Logo_Horizontal_'+(darkBackground?'white':'dark')+'_small.png'" -->
-      <img [src]="assetsPath + 'common/Logo_Horizontal.png'"
-           width="140px"
-           height="50px" class="el-image" alt="OpenAIRE" loading="lazy">
+      <div *ngIf="showOpenaire" class="uk-width-1-2 uk-margin-left">
+        <!-- <img [src]="assetsPath + 'common/Logo_Horizontal_'+(darkBackground?'white':'dark')+'_small.png'" -->
+        <img [src]="assetsPath + 'common/Logo_Horizontal.png'"
+             width="140px"
+             height="50px" class="el-image" alt="OpenAIRE" loading="lazy">
+      </div>
     </div>
   </div>
 </ng-container>

From 70e0d02227b60032f34e7e839dc6aa70575a9b68 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Wed, 25 Jan 2023 14:41:53 +0200
Subject: [PATCH 07/13] Add a workaround for sticky update bug on sidebar
 toggle

---
 .../page-content/page-content.component.ts    | 115 ++++++++++++------
 .../sidebar/layout.service.ts                 |   6 +-
 .../sidebar/sidebar-content.component.ts      |   2 +-
 3 files changed, 85 insertions(+), 38 deletions(-)

diff --git a/dashboard/sharedComponents/page-content/page-content.component.ts b/dashboard/sharedComponents/page-content/page-content.component.ts
index 64ff4522..2642a1e4 100644
--- a/dashboard/sharedComponents/page-content/page-content.component.ts
+++ b/dashboard/sharedComponents/page-content/page-content.component.ts
@@ -2,14 +2,15 @@ import {
   AfterViewInit,
   ChangeDetectorRef,
   Component,
-  ElementRef, Inject,
+  ElementRef,
+  Inject,
   Input,
   OnDestroy,
-  OnInit, PLATFORM_ID,
+  OnInit,
+  PLATFORM_ID,
   ViewChild
 } from "@angular/core";
 import {LayoutService} from "../sidebar/layout.service";
-import {Subscription} from "rxjs";
 
 declare var UIkit;
 declare var ResizeObserver;
@@ -18,8 +19,8 @@ declare var ResizeObserver;
   selector: '[page-content]',
   template: `
     <div id="page_content">
-      <div [class.uk-hidden]="!isBrowser" id="page_content_sticky_footer" #sticky_footer class="uk-tile-default uk-blur-background"
-           [attr.uk-sticky]="'bottom: true'" [attr.offset]="footer_offset">
+      <div [class.uk-hidden]="!isBrowser" id="page_content_sticky_footer" #sticky_footer
+           class="uk-tile-default uk-blur-background">
         <div class="uk-container uk-container-large">
           <div class="uk-padding-small uk-padding-remove-vertical">
             <ng-content select="[sticky_footer]"></ng-content>
@@ -27,7 +28,6 @@ declare var ResizeObserver;
         </div>
       </div>
       <div id="page_content_header" #header class="uk-blur-background"
-           [attr.uk-sticky]="(headerSticky && shouldSticky)?'media: @m':null" [attr.offset]="offset"
            [attr.style]="'margin-top: '+(footer_height? '-'+footer_height+'px': '0')">
         <div class="uk-container uk-container-large">
           <div class="uk-padding-small uk-padding-remove-vertical uk-padding-remove-right">
@@ -37,8 +37,7 @@ declare var ResizeObserver;
           </div>
         </div>
       </div>
-      <div id="page_content_actions" #actions class="uk-blur-background"
-           [attr.uk-sticky]="(!headerSticky && shouldSticky)?'media: @m':null" [attr.offset]="offset">
+      <div id="page_content_actions" #actions class="uk-blur-background">
         <div class="uk-container uk-container-large">
           <div class="uk-padding-small uk-padding-remove-vertical uk-padding-remove-right">
             <div class="actions">
@@ -69,43 +68,49 @@ export class PageContentComponent implements OnInit, AfterViewInit, OnDestroy {
   public shouldSticky: boolean = true;
   @ViewChild('header') header: ElementRef;
   @ViewChild('actions') actions: ElementRef;
-  public footer_offset: number = 0;
   public footer_height: number = 0;
-  @ViewChild("sticky_footer") sticky_footer;
+  @ViewChild("sticky_footer") sticky_footer: ElementRef;
+  private sticky = {
+    header: null,
+    footer: null
+  }
   subscriptions = [];
-  
+
   constructor(private layoutService: LayoutService, private cdr: ChangeDetectorRef,
               @Inject(PLATFORM_ID) private platformId) {
   }
-  
+
   ngOnInit() {
     if (typeof document !== "undefined") {
       this.offset = Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--header-height'));
+      this.stickyBugWorkaround();
     }
   }
-  
+
   get isBrowser() {
     return this.platformId === 'browser';
   }
-  
+
   get isStickyActive() {
-    if (this.header && this.actions && this.shouldSticky) {
-      let sticky = this.headerSticky ? this.header.nativeElement : this.actions.nativeElement;
-      return UIkit.sticky(sticky).isActive;
-    } else {
-      return false;
-    }
+    return this.sticky.header?.isActive;
   }
-  
+
   ngAfterViewInit() {
     if (typeof document !== "undefined") {
-      // TODO make it smooth
-      // this.observeBottom();
-      this.observeHeader();
       this.observeStickyFooter();
+      if (this.shouldSticky && typeof document !== 'undefined') {
+        this.sticky.header = UIkit.sticky((this.headerSticky ? this.header.nativeElement : this.actions.nativeElement), {
+          media: '@m',
+          offset: this.offset
+        });
+      }
+      if (this.sticky_footer) {
+        let footer_offset = this.calcStickyFooterOffset(this.sticky_footer.nativeElement);
+        this.sticky.footer = UIkit.sticky(this.sticky_footer.nativeElement, {bottom: true, offset: footer_offset});
+      }
     }
   }
-  
+
   ngOnDestroy() {
     this.subscriptions.forEach(subscription => {
       if (subscription instanceof (ResizeObserver || IntersectionObserver)) {
@@ -113,13 +118,48 @@ export class PageContentComponent implements OnInit, AfterViewInit, OnDestroy {
       }
     });
   }
-  
-  ngAfterContentChecked() {
-    if (this.sticky_footer && typeof document !== 'undefined') {
-      this.footer_offset = this.calcStickyFooterOffset(this.sticky_footer.nativeElement);
-    }
+
+
+  /**
+   * Workaround for sticky not update bug when sidebar is toggled.
+   * TODO when UIKit will be updated => remove
+   *
+   * */
+  stickyBugWorkaround() {
+    let sidebarOffset = Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--dashboard-sidebar-width')) -
+      Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--dashboard-sidebar-mini-width'));
+    let transitionDelay = Number.parseFloat(getComputedStyle(document.documentElement).getPropertyValue('--dashboard-transition-delay')) * 1000;
+    this.subscriptions.push(this.layoutService.isOpen.subscribe(isOpen => {
+      if (this.sticky.header) {
+        if (isOpen) {
+          this.sticky.header.$el.style.width = Number.parseInt(this.sticky.header.$el.style.width) - sidebarOffset + 'px';
+        } else {
+          this.sticky.header.$el.style.width = Number.parseInt(this.sticky.header.$el.style.width) + sidebarOffset + 'px';
+        }
+        setTimeout(() => {
+          this.sticky.header.$emit();
+        }, transitionDelay);
+      }
+      if (this.sticky.footer) {
+        if (isOpen) {
+          this.sticky.footer.$el.style.width = Number.parseInt(this.sticky.footer.$el.style.width) - sidebarOffset + 'px';
+        } else {
+          this.sticky.footer.$el.style.width = Number.parseInt(this.sticky.footer.$el.style.width) + sidebarOffset + 'px';
+        }
+        setTimeout(() => {
+          this.sticky.footer.$emit();
+        }, transitionDelay);
+      }
+      this.cdr.detectChanges();
+    }));
   }
-  
+
+  /**
+   * @deprecated
+   *
+   * Should be smooth
+   *
+   * */
   private observeBottom() {
     let bottom = document.getElementById('bottom');
     if (bottom) {
@@ -132,12 +172,15 @@ export class PageContentComponent implements OnInit, AfterViewInit, OnDestroy {
       bottomObs.observe(bottom);
     }
   }
-  
+
+  /**
+   * @deprecated
+   * */
   private observeHeader() {
     if (this.header) {
       let headerObs = new IntersectionObserver(entries => {
         entries.forEach(entry => {
-          if(entry.boundingClientRect.height > 0) {
+          if (entry.boundingClientRect.height > 0) {
             this.layoutService.setReplaceHeader(!entry.isIntersecting);
           }
         })
@@ -146,13 +189,13 @@ export class PageContentComponent implements OnInit, AfterViewInit, OnDestroy {
       headerObs.observe(this.header.nativeElement);
     }
   }
-  
+
   private observeStickyFooter() {
     if (this.sticky_footer) {
       let resizeObs = new ResizeObserver(entries => {
         entries.forEach(entry => {
           setTimeout(() => {
-            this.footer_offset = this.calcStickyFooterOffset(entry.target);
+            this.sticky.footer.offset = this.calcStickyFooterOffset(entry.target);
             this.cdr.detectChanges();
           });
         })
@@ -161,7 +204,7 @@ export class PageContentComponent implements OnInit, AfterViewInit, OnDestroy {
       resizeObs.observe(this.sticky_footer.nativeElement);
     }
   }
-  
+
   calcStickyFooterOffset(element) {
     this.footer_height = element.offsetHeight;
     return window.innerHeight - this.footer_height;
diff --git a/dashboard/sharedComponents/sidebar/layout.service.ts b/dashboard/sharedComponents/sidebar/layout.service.ts
index ed6e67fc..ca0e6d63 100644
--- a/dashboard/sharedComponents/sidebar/layout.service.ts
+++ b/dashboard/sharedComponents/sidebar/layout.service.ts
@@ -160,7 +160,11 @@ export class LayoutService {
     }));
     this.setObserver();
   }
-  
+
+  get isOpen(): Observable<boolean> {
+    return this.openSubject.asObservable();
+  }
+
   get open(): boolean {
     return this.openSubject.getValue();
   }
diff --git a/dashboard/sharedComponents/sidebar/sidebar-content.component.ts b/dashboard/sharedComponents/sidebar/sidebar-content.component.ts
index 130a0899..4b102e24 100644
--- a/dashboard/sharedComponents/sidebar/sidebar-content.component.ts
+++ b/dashboard/sharedComponents/sidebar/sidebar-content.component.ts
@@ -1,4 +1,4 @@
-import {Component, HostListener} from "@angular/core";
+import {Component} from "@angular/core";
 import {LayoutService} from "./layout.service";
 
 @Component({

From 3acd9a6c29cd54699f27ea58fd9664e07526d589 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Thu, 26 Jan 2023 12:35:05 +0200
Subject: [PATCH 08/13] Portals: Add piwik as a column. Add pid in search

---
 dashboard/portal/portals.component.html | 8 ++++++--
 dashboard/portal/portals.component.ts   | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dashboard/portal/portals.component.html b/dashboard/portal/portals.component.html
index 9f57de8c..6910431c 100644
--- a/dashboard/portal/portals.component.html
+++ b/dashboard/portal/portals.component.html
@@ -55,11 +55,11 @@
                   Bulk Actions ({{getSelectedPortals().length}})
                 </button>
                 <div uk-dropdown="mode: click">
-                  <ul class="uk-nav uk-dropdown-nav"
+                  <ul class="uk-nav uk-dropdown-nav uk-text-capitalize"
                       [attr.uk-tooltip]="getSelectedPortals().length == 0 ? 'pos:left; cls: uk-active' : 'cls: uk-invisible'"
                       title="Select at least one entity">
                     <li>
-                      <a (click)="confirmDeleteSelectedPortals()"><i></i>Delete</a>
+                      <a (click)="confirmDeleteSelectedPortals()">Delete</a>
                     </li>
                   </ul>
                 </div>
@@ -67,6 +67,7 @@
             </th>
             <th>Name</th>
             <th>Type</th>
+            <th>Piwik</th>
             <th>Actions</th>
           </tr>
           </thead>
@@ -81,6 +82,9 @@
               <td>
                 <div class="type" href="#">{{check.portal.type}}</div>
               </td>
+              <td>
+                <div class="name" href="#">{{check.portal.piwik}}</div>
+              </td>
               <td>
                 <div class="uk-flex uk-flex-middle">
                   <icon class="clickable" [flex]="true" name="edit" [customClass]="'uk-text-primary'" (click)="editPortal(i)"></icon>
diff --git a/dashboard/portal/portals.component.ts b/dashboard/portal/portals.component.ts
index be2ed599..d9dec3ec 100644
--- a/dashboard/portal/portals.component.ts
+++ b/dashboard/portal/portals.component.ts
@@ -229,11 +229,11 @@ export class PortalsComponent implements OnInit {
   
   public filterByType(portal: Portal): boolean {
     let type = this.filterForm.get("type").value;
-    return type == "all" || (type == portal.type);
+    return type == "all" || (type === portal.type);
   }
   
   public filterPortals(portal: Portal): boolean {
-    return this.searchText.toString() === '' || (portal.name || portal.type).match(this.searchText) != null;
+    return this.searchText.toString() === '' || (portal.name + portal.type + portal.pid).match(this.searchText) != null;
   }
   
   handleUpdateError(message: string, error = null) {

From ccab3d0847962d80696e40d1dc21a28b5d5b4390 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Fri, 27 Jan 2023 13:54:40 +0200
Subject: [PATCH 09/13] Slider-tabs: Add align left and right and merge query
 params on navigate to other fragment

---
 sharedComponents/tabs/slider-tab.component.ts |  2 ++
 .../tabs/slider-tabs.component.ts             | 29 +++++++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/sharedComponents/tabs/slider-tab.component.ts b/sharedComponents/tabs/slider-tab.component.ts
index 2060ccf2..bea2540b 100644
--- a/sharedComponents/tabs/slider-tab.component.ts
+++ b/sharedComponents/tabs/slider-tab.component.ts
@@ -13,4 +13,6 @@ export class SliderTabComponent {
   public active: boolean = false;
   @Input()
   public disabled: boolean = false;
+  @Input()
+  public align: 'left' | 'right' = 'left';
 }
diff --git a/sharedComponents/tabs/slider-tabs.component.ts b/sharedComponents/tabs/slider-tabs.component.ts
index 63257c9b..318d5802 100644
--- a/sharedComponents/tabs/slider-tabs.component.ts
+++ b/sharedComponents/tabs/slider-tabs.component.ts
@@ -27,13 +27,23 @@ declare var UIkit;
             [attr.uk-tab]="type === 'static'?('connect:' + connect):null"
             [ngClass]="'uk-flex-' + flexPosition">
           <ng-container *ngIf="type === 'static'">
-            <li *ngFor="let tab of tabs.toArray()" class="uk-text-capitalize">
+            <li *ngFor="let tab of leftTabs" class="uk-text-capitalize">
+              <a>{{tab.title}}</a>
+            </li>
+            <li *ngFor="let tab of rightTabs; let i=index;"
+                [ngClass]="i === 0?'uk-flex-1 uk-flex uk-flex-right':''"
+                class="uk-text-capitalize">
               <a>{{tab.title}}</a>
             </li>
           </ng-container>
           <ng-container *ngIf="type === 'scrollable'">
-            <li *ngFor="let tab of tabs.toArray()" class="uk-text-capitalize" [class.uk-active]="tab.active">
-              <a routerLink="./" [fragment]="tab.id">{{tab.title}}</a>
+            <li *ngFor="let tab of leftTabs" class="uk-text-capitalize" [class.uk-active]="tab.active">
+              <a routerLink="./" [fragment]="tab.id" queryParamsHandling="merge">{{tab.title}}</a>
+            </li>
+            <li *ngFor="let tab of rightTabs; let i=index;" class="uk-text-capitalize"
+                [ngClass]="i === 0?'uk-flex-1 uk-flex uk-flex-right':''"
+                [class.uk-active]="tab.active">
+              <a routerLink="./" [fragment]="tab.id" queryParamsHandling="merge">{{tab.title}}</a>
             </li>
           </ng-container>
         </ul>
@@ -126,7 +136,7 @@ export class SliderTabsComponent implements AfterViewInit, OnDestroy {
       let index = event.detail[0].index();
       if (index !== this.activeIndex) {
         this.activeIndex = index;
-        this.router.navigate(['./'], {relativeTo: this.route, fragment: this.connect.replace('#', '')});
+        this.router.navigate(['./'], {relativeTo: this.route, fragment: this.connect.replace('#', ''), queryParamsHandling: "merge"});
       }
     }));
   }
@@ -153,7 +163,8 @@ export class SliderTabsComponent implements AfterViewInit, OnDestroy {
             this.router.navigate(['./'], {
               fragment: entry.target.id,
               relativeTo: this.route,
-              state: {disableScroll: true}
+              state: {disableScroll: true},
+              queryParamsHandling: 'merge'
             });
           }, 200);
         }
@@ -186,6 +197,14 @@ export class SliderTabsComponent implements AfterViewInit, OnDestroy {
     this.cdr.detectChanges();
   }
   
+  get leftTabs(): SliderTabComponent[] {
+    return this.tabs.toArray().filter(tab => tab.align === 'left');
+  }
+  
+  get rightTabs(): SliderTabComponent[] {
+    return this.tabs.toArray().filter(tab => tab.align === 'right');
+  }
+  
   ngOnDestroy() {
     this.subscriptions.forEach(subscription => {
       if (subscription instanceof Subscription) {

From 5454509b55e817b9320a128920d03cb75b5ac44d Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Fri, 27 Jan 2023 15:57:39 +0200
Subject: [PATCH 10/13] Fix sidebar flex items

---
 dashboard/sharedComponents/sidebar/sideBar.component.html | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dashboard/sharedComponents/sidebar/sideBar.component.html b/dashboard/sharedComponents/sidebar/sideBar.component.html
index 02e606ac..29682e8e 100644
--- a/dashboard/sharedComponents/sidebar/sideBar.component.html
+++ b/dashboard/sharedComponents/sidebar/sideBar.component.html
@@ -1,18 +1,16 @@
 <aside id="sidebar_main">
   <div sidebar-content>
-    <div *ngIf="items.length > 0" class="menu_section uk-margin-large-top" style="min-height: 30vh">
+    <div *ngIf="items.length > 0" class="menu_section mobile uk-margin-large-top" style="min-height: 30vh">
       <ul #nav class="uk-list uk-nav uk-nav-default uk-nav-parent-icon" uk-nav="duration: 400">
         <ng-template ngFor [ngForOf]="items" let-item>
           <li [class.uk-active]="isTheActiveMenuItem(item)"
               [class.uk-parent]="item.items.length > 0">
             <a [routerLink]="getItemRoute(item)" [title]="item.title"
-               [queryParams]="item.route?item.params:null" [queryParamsHandling]="item.route?queryParamsHandling:null">
-              <div class="uk-flex uk-flex-middle">
+               [queryParams]="item.route?item.params:null" [queryParamsHandling]="item.route?queryParamsHandling:null" class="uk-flex uk-flex-middle">
                 <div *ngIf="item.icon && (item.icon.svg || item.icon.name)" class="uk-width-auto">
                   <icon class="menu-icon" [customClass]="item.icon.class" [name]="item.icon.name" ratio="0.9" [svg]="item.icon.svg" [flex]="true"></icon>
                 </div>
-                <span [class.hide-on-close]="item.icon" class="uk-width-expand uk-text-truncate uk-margin-small-left">{{item.title}}</span>
-              </div>
+                <span [class.hide-on-close]="item.icon" class="uk-width-expand@l uk-text-truncate uk-margin-small-left">{{item.title}}</span>
             </a>
             <ul *ngIf="item.items?.length > 0 && (isBrowser || isTheActiveMenuItem(item))" class="uk-nav-sub">
               <li *ngFor="let subItem of item.items"

From 39a2549681c127112a67a327ef0d4cdebaedc03a Mon Sep 17 00:00:00 2001
From: Alex Martzios <alexandros.martzios@gmail.com>
Date: Wed, 8 Feb 2023 11:31:47 +0200
Subject: [PATCH 11/13] change path of vocabulary fos/sdgs

---
 utils/staticAutoComplete/ISVocabularies.service.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/staticAutoComplete/ISVocabularies.service.ts b/utils/staticAutoComplete/ISVocabularies.service.ts
index 8df594e5..295ba7d6 100644
--- a/utils/staticAutoComplete/ISVocabularies.service.ts
+++ b/utils/staticAutoComplete/ISVocabularies.service.ts
@@ -107,14 +107,14 @@ export class ISVocabulariesService {
 
   getLocalVocabularyFromService(vocabularyName: string, properties: EnvProperties): Observable<AutoCompleteValue[]> {
     if(vocabularyName == "sdg"){
-      let url = properties.domain+"/assets/vocabulary/sdg.json";
+      let url = properties.domain+"/assets/common-assets/vocabulary/sdg.json";
       return this.http.get((properties.useLongCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
           //.map(res => <any> res.json())
           .pipe(map(res => res['sdg']))
           .pipe(map(res => this.parseSDGs(res)))
           .pipe(catchError(this.handleError));
     }else if( vocabularyName == "fos"){
-      let url = properties.domain+"/assets/vocabulary/fos.json";
+      let url = properties.domain+"/assets/common-assets/vocabulary/fos.json";
       return this.http.get((properties.useLongCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
           //.map(res => <any> res.json())
           .pipe(map(res => res['fos']))

From 1e56ef66ec1e78a76b3cc49be004a21c17ff358a Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Thu, 9 Feb 2023 12:09:49 +0200
Subject: [PATCH 12/13] 1. Simplify logout process. 2. Deprecate isSmallScreen
 in Layout service. 3. Make some inmprovements in slider-tabs and add
 slider-arrow for previous and next. 4. Navigation Bar: Remove badge and
 header logo info from mobiles. 5. Page Content: Fix paddings for mobiles and
 add events for sticky status changes.

---
 .../page-content/page-content.component.ts    | 34 ++++++++----
 .../sidebar/layout.service.ts                 |  7 +++
 login/userMini.component.ts                   |  3 --
 monitor/methodology/terminology.component.ts  |  2 +-
 services/user-management.service.ts           |  1 -
 sharedComponents/navigationBar.component.html | 12 ++---
 .../slider-utils/slider-arrow.component.ts    | 25 +++++++++
 .../slider-utils/slider-utils.module.ts       | 11 ++++
 sharedComponents/tabs/slider-tab.component.ts |  6 +++
 .../tabs/slider-tabs.component.ts             | 53 +++++++++++++------
 sharedComponents/tabs/slider-tabs.module.ts   |  3 +-
 11 files changed, 115 insertions(+), 42 deletions(-)
 create mode 100644 sharedComponents/slider-utils/slider-arrow.component.ts
 create mode 100644 sharedComponents/slider-utils/slider-utils.module.ts

diff --git a/dashboard/sharedComponents/page-content/page-content.component.ts b/dashboard/sharedComponents/page-content/page-content.component.ts
index 2642a1e4..35f64427 100644
--- a/dashboard/sharedComponents/page-content/page-content.component.ts
+++ b/dashboard/sharedComponents/page-content/page-content.component.ts
@@ -22,24 +22,24 @@ declare var ResizeObserver;
       <div [class.uk-hidden]="!isBrowser" id="page_content_sticky_footer" #sticky_footer
            class="uk-tile-default uk-blur-background">
         <div class="uk-container uk-container-large">
-          <div class="uk-padding-small uk-padding-remove-vertical">
+          <div [ngClass]="!isMobile?'uk-padding-small uk-padding-remove-vertical':''">
             <ng-content select="[sticky_footer]"></ng-content>
           </div>
         </div>
       </div>
-      <div id="page_content_header" #header class="uk-blur-background"
+      <div id="page_content_header" #header class="uk-blur-background" [class.uk-border-bottom]="border && isStickyActive"
            [attr.style]="'margin-top: '+(footer_height? '-'+footer_height+'px': '0')">
         <div class="uk-container uk-container-large">
-          <div class="uk-padding-small uk-padding-remove-vertical uk-padding-remove-right">
+          <div [ngClass]="!isMobile?'uk-padding-small uk-padding-remove-vertical uk-padding-remove-right':''">
             <div class="header">
               <ng-content select="[header]"></ng-content>
             </div>
           </div>
         </div>
       </div>
-      <div id="page_content_actions" #actions class="uk-blur-background">
+      <div id="page_content_actions" #actions class="uk-blur-background" [class.uk-border-bottom]="border && isStickyActive">
         <div class="uk-container uk-container-large">
-          <div class="uk-padding-small uk-padding-remove-vertical uk-padding-remove-right">
+          <div [ngClass]="!isMobile?'uk-padding-small uk-padding-remove-vertical uk-padding-remove-right':''">
             <div class="actions">
               <ng-content select="[actions]"></ng-content>
             </div>
@@ -47,13 +47,13 @@ declare var ResizeObserver;
         </div>
       </div>
       <div id="page_content_inner" class="uk-container uk-container-large">
-        <div class="uk-padding-small uk-padding-remove-vertical">
+        <div [ngClass]="!isMobile?'uk-padding-small uk-padding-remove-vertical':''">
           <ng-content select="[inner]"></ng-content>
         </div>
       </div>
       <div id="page_content_footer" #footer>
         <div class="uk-container uk-container-large">
-          <div class="uk-padding-small uk-padding-remove-vertical">
+          <div [ngClass]="!isMobile?'uk-padding-small uk-padding-remove-vertical':''">
             <ng-content select="[footer]"></ng-content>
           </div>
         </div>
@@ -64,8 +64,11 @@ declare var ResizeObserver;
 export class PageContentComponent implements OnInit, AfterViewInit, OnDestroy {
   @Input()
   public headerSticky: boolean = false;
+  @Input()
+  public border: boolean = true;
   public offset: number;
   public shouldSticky: boolean = true;
+  public isMobile: boolean = false;
   @ViewChild('header') header: ElementRef;
   @ViewChild('actions') actions: ElementRef;
   public footer_height: number = 0;
@@ -74,6 +77,7 @@ export class PageContentComponent implements OnInit, AfterViewInit, OnDestroy {
     header: null,
     footer: null
   }
+  public isStickyActive: boolean = false;
   subscriptions = [];
 
   constructor(private layoutService: LayoutService, private cdr: ChangeDetectorRef,
@@ -85,16 +89,16 @@ export class PageContentComponent implements OnInit, AfterViewInit, OnDestroy {
       this.offset = Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--header-height'));
       this.stickyBugWorkaround();
     }
+    this.subscriptions.push(this.layoutService.isMobile.subscribe(isMobile => {
+      this.isMobile = isMobile;
+      this.cdr.detectChanges();
+    }));
   }
 
   get isBrowser() {
     return this.platformId === 'browser';
   }
 
-  get isStickyActive() {
-    return this.sticky.header?.isActive;
-  }
-
   ngAfterViewInit() {
     if (typeof document !== "undefined") {
       this.observeStickyFooter();
@@ -103,6 +107,14 @@ export class PageContentComponent implements OnInit, AfterViewInit, OnDestroy {
           media: '@m',
           offset: this.offset
         });
+        this.subscriptions.push(UIkit.util.on(document, 'active', '#' + this.sticky.header.$el.id, () => {
+          this.isStickyActive = true;
+          this.cdr.detectChanges();
+        }));
+        this.subscriptions.push(UIkit.util.on(document, 'inactive', '#' + this.sticky.header.$el.id, () => {
+          this.isStickyActive = false;
+          this.cdr.detectChanges();
+        }));
       }
       if (this.sticky_footer) {
         let footer_offset = this.calcStickyFooterOffset(this.sticky_footer.nativeElement);
diff --git a/dashboard/sharedComponents/sidebar/layout.service.ts b/dashboard/sharedComponents/sidebar/layout.service.ts
index ca0e6d63..d39fb765 100644
--- a/dashboard/sharedComponents/sidebar/layout.service.ts
+++ b/dashboard/sharedComponents/sidebar/layout.service.ts
@@ -46,6 +46,7 @@ export class LayoutService {
   private isFrontPageSubject: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
   /**
    *  Add isSmallScreen: true on data of route config, if screen is small.
+   *  @deprecated
    */
   private isSmallScreenSubject: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
   /**
@@ -233,10 +234,16 @@ export class LayoutService {
     this.replaceHeaderSubject.next(value);
   }
   
+  /**
+   * @deprecated
+   * */
   get isSmallScreen(): boolean {
     return this.isSmallScreenSubject.getValue();
   }
   
+  /**
+   * @deprecated
+   * */
   setSmallScreen(value: boolean) {
     this.isSmallScreenSubject.next(value);
   }
diff --git a/login/userMini.component.ts b/login/userMini.component.ts
index f5b8b021..b1795bf6 100644
--- a/login/userMini.component.ts
+++ b/login/userMini.component.ts
@@ -142,9 +142,6 @@ export class UserMiniComponent implements OnInit, OnChanges {
     if (this.user) {
       this.userManagementService.logout();
     }
-    this.loggedIn = false;
-    this.isAuthorized = false;
-    this.user = new User();
   }
   
   logIn() {
diff --git a/monitor/methodology/terminology.component.ts b/monitor/methodology/terminology.component.ts
index a68d770b..ded7fbcd 100644
--- a/monitor/methodology/terminology.component.ts
+++ b/monitor/methodology/terminology.component.ts
@@ -94,7 +94,7 @@ declare var ResizeObserver;
 					</div>
 				</div>
 				<div>
-					<div class="uk-sticky uk-background-default uk-padding uk-padding-remove-horizontal" uk-sticky>
+					<div class="uk-sticky uk-background-default uk-padding-small uk-padding-remove-right" uk-sticky>
 						<slider-tabs type="scrollable" position="horizontal">
 							<slider-tab tabId="entities_m" tabTitle="1. Entities"></slider-tab>
 							<slider-tab tabId="inherited-and-inferred-attributes_m"
diff --git a/services/user-management.service.ts b/services/user-management.service.ts
index 6282ddb6..9291cc6a 100644
--- a/services/user-management.service.ts
+++ b/services/user-management.service.ts
@@ -124,7 +124,6 @@ export class UserManagementService {
   public logout() {
     this.setRedirectUrl();
     Session.removeUser();
-    this.getUserInfoSubject.next(null);
     window.location.href = properties.logoutUrl + "?redirect=" + this.redirectUrl;
   }
 }
diff --git a/sharedComponents/navigationBar.component.html b/sharedComponents/navigationBar.component.html
index bb24504d..7298761d 100644
--- a/sharedComponents/navigationBar.component.html
+++ b/sharedComponents/navigationBar.component.html
@@ -1,12 +1,6 @@
 <div *ngIf="showMenu && activeHeader">
   <div id="main-menu-small" class="uk-hidden@m">
     <nav class="uk-navbar-container uk-navbar" uk-navbar="delay-hide: 400">
-        <div
-            *ngIf="(properties.environment =='beta' || properties.environment =='development') && showLogo  && activeHeader.badge">
-          <img class="uk-position-top-left"
-               [src]="'assets/common-assets/'+(properties.environment =='beta'?'beta_flag.svg':'prototype_flag.svg')"
-               alt="BETA" style="height: 60px; width: 60px;">
-        </div>
         <div *ngIf="!onlyTop || userMenu" class="uk-navbar-left" [class.uk-light]='activeHeader.darkBg'>
           <a class="uk-navbar-toggle" href="#tm-mobile" uk-toggle>
             <div uk-navbar-toggle-icon="" class="uk-navbar-toggle-icon uk-icon custom-navbar-toggle-icon"></div>
@@ -177,7 +171,7 @@
                 <user-mini *ngIf="userMenu" [user]="user"
                            [userMenuItems]=userMenuItems [logInUrl]=properties.loginUrl [logOutUrl]=properties.logoutUrl
                            [cookieDomain]=properties.cookieDomain></user-mini>
-                <div class="uk-visible@l">
+                <div class="uk-visible@m">
                   <ng-content select="[extra-m]"></ng-content>
                 </div>
               </div>
@@ -320,7 +314,7 @@
     <img *ngIf="(mobile && activeHeader.logoSmallUrl) || (!mobile && activeHeader.logoUrl)"
            [src]="!mobile?activeHeader.logoUrl:activeHeader.logoSmallUrl"
            [alt]="activeHeader.title">
-    <div *ngIf="activeHeader.logoInfo" [innerHTML]="activeHeader.logoInfo"></div>
+    <div *ngIf="activeHeader.logoInfo && !mobile" [innerHTML]="activeHeader.logoInfo"></div>
     <ng-container *ngIf="(mobile && !activeHeader.logoSmallUrl) || (!mobile && !activeHeader.logoUrl)">
       <div class="multi-line-ellipsis lines-2" [style.max-width]="(!mobile)?'25vw':null" [title]="activeHeader.title">
         <p class="uk-margin-remove">{{activeHeader.title}}</p>
@@ -332,7 +326,7 @@
     <img *ngIf="(mobile && activeHeader.logoSmallUrl) || (!mobile && activeHeader.logoUrl)"
          [src]="!mobile?activeHeader.logoUrl:activeHeader.logoSmallUrl"
          [alt]="activeHeader.title">
-    <div *ngIf="activeHeader.logoInfo" [innerHTML]="activeHeader.logoInfo"></div>
+    <div *ngIf="activeHeader.logoInfo && !mobile" [innerHTML]="activeHeader.logoInfo"></div>
     <ng-container *ngIf="(mobile && !activeHeader.logoSmallUrl) || (!mobile && !activeHeader.logoUrl)">
       <div class="multi-line-ellipsis lines-2" [style.max-width]="(!mobile)?'25vw':null" [title]="activeHeader.title">
         <p class="uk-margin-remove">{{activeHeader.title}}</p>
diff --git a/sharedComponents/slider-utils/slider-arrow.component.ts b/sharedComponents/slider-utils/slider-arrow.component.ts
new file mode 100644
index 00000000..37f28509
--- /dev/null
+++ b/sharedComponents/slider-utils/slider-arrow.component.ts
@@ -0,0 +1,25 @@
+import {Component, Input} from "@angular/core";
+
+@Component({
+  selector: 'slider-arrow',
+  template: `
+    <div *ngIf="type" class="uk-slider-arrow" [ngClass]="positionClasses" [attr.uk-slider-item]="type">
+      <button class="uk-icon-button uk-icon-button-small uk-box-no-shadow uk-box-no-shadow-hover uk-border">
+        <icon [name]="icon" [flex]="true" visuallyHidden="download"></icon>
+      </button>
+    </div>
+  `
+})
+export class SliderArrowComponent {
+  @Input()
+  public type: 'previous' | 'next';
+
+
+  get positionClasses() {
+    return (this.type == 'previous')?'uk-position-center-left uk-slider-left':'uk-position-center-right uk-slider-right'
+  }
+
+  get icon() {
+    return (this.type == 'previous')?'chevron_left':'chevron_right'
+  }
+}
\ No newline at end of file
diff --git a/sharedComponents/slider-utils/slider-utils.module.ts b/sharedComponents/slider-utils/slider-utils.module.ts
new file mode 100644
index 00000000..da0d1181
--- /dev/null
+++ b/sharedComponents/slider-utils/slider-utils.module.ts
@@ -0,0 +1,11 @@
+import {NgModule} from "@angular/core";
+import {CommonModule} from "@angular/common";
+import {SliderArrowComponent} from "./slider-arrow.component";
+import {IconsModule} from "../../utils/icons/icons.module";
+
+@NgModule({
+  imports: [CommonModule, IconsModule],
+  declarations: [SliderArrowComponent],
+  exports: [SliderArrowComponent]
+})
+export class SliderUtilsModule {}
\ No newline at end of file
diff --git a/sharedComponents/tabs/slider-tab.component.ts b/sharedComponents/tabs/slider-tab.component.ts
index bea2540b..97d5a70b 100644
--- a/sharedComponents/tabs/slider-tab.component.ts
+++ b/sharedComponents/tabs/slider-tab.component.ts
@@ -15,4 +15,10 @@ export class SliderTabComponent {
   public disabled: boolean = false;
   @Input()
   public align: 'left' | 'right' = 'left';
+  @Input()
+  public routerLink: any[] | string | null | undefined = null;
+  @Input()
+  public queryParams: any = null;
+  @Input()
+  public customClass: string = '';
 }
diff --git a/sharedComponents/tabs/slider-tabs.component.ts b/sharedComponents/tabs/slider-tabs.component.ts
index 318d5802..1fb31617 100644
--- a/sharedComponents/tabs/slider-tabs.component.ts
+++ b/sharedComponents/tabs/slider-tabs.component.ts
@@ -20,12 +20,12 @@ declare var UIkit;
   template: `
     <div #sliderElement class="uk-position-relative" [class.uk-slider]="position === 'horizontal'"
          [ngClass]="customClass">
-      <div [class.uk-slider-container-tabs]="position === 'horizontal'">
-        <ul #tabsElement class="uk-tab" [class.uk-flex-nowrap]="position === 'horizontal'"
+      <div [class.uk-slider-container-tabs]="position === 'horizontal'" [class.uk-border-bottom]="border && position === 'horizontal'">
+        <ul #tabsElement [class.uk-flex-nowrap]="position === 'horizontal'"
             [class.uk-slider-items]="position === 'horizontal'"
             [class.uk-tab-left]="position === 'left'" [class.uk-tab-right]="position === 'right'"
-            [attr.uk-tab]="type === 'static'?('connect:' + connect):null"
-            [ngClass]="'uk-flex-' + flexPosition">
+            [attr.uk-switcher]="type === 'static'?('connect:' + connect):null"
+            [ngClass]="'uk-flex-' + flexPosition + ' ' + tabsClass">
           <ng-container *ngIf="type === 'static'">
             <li *ngFor="let tab of leftTabs" class="uk-text-capitalize">
               <a>{{tab.title}}</a>
@@ -33,32 +33,41 @@ declare var UIkit;
             <li *ngFor="let tab of rightTabs; let i=index;"
                 [ngClass]="i === 0?'uk-flex-1 uk-flex uk-flex-right':''"
                 class="uk-text-capitalize">
-              <a>{{tab.title}}</a>
+              <a [ngClass]="tab.customClass">{{tab.title}}</a>
+            </li>
+          </ng-container>
+          <ng-container *ngIf="type === 'dynamic'">
+            <li *ngFor="let tab of leftTabs" [class.uk-active]="tab.active" class="uk-text-capitalize">
+              <a [routerLink]="tab.routerLink" [queryParams]="tab.queryParams" [ngClass]="tab.customClass">{{tab.title}}</a>
+            </li>
+            <li *ngFor="let tab of rightTabs; let i=index;" [class.uk-active]="tab.active"
+                [ngClass]="i === 0?'uk-flex-1 uk-flex uk-flex-right':''"
+                class="uk-text-capitalize">
+              <a [routerLink]="tab.routerLink" [queryParams]="tab.queryParams" [ngClass]="tab.customClass">{{tab.title}}</a>
             </li>
           </ng-container>
           <ng-container *ngIf="type === 'scrollable'">
             <li *ngFor="let tab of leftTabs" class="uk-text-capitalize" [class.uk-active]="tab.active">
-              <a routerLink="./" [fragment]="tab.id" queryParamsHandling="merge">{{tab.title}}</a>
+              <a routerLink="./" [fragment]="tab.id" queryParamsHandling="merge" [ngClass]="tab.customClass">{{tab.title}}</a>
             </li>
             <li *ngFor="let tab of rightTabs; let i=index;" class="uk-text-capitalize"
                 [ngClass]="i === 0?'uk-flex-1 uk-flex uk-flex-right':''"
                 [class.uk-active]="tab.active">
-              <a routerLink="./" [fragment]="tab.id" queryParamsHandling="merge">{{tab.title}}</a>
+              <a routerLink="./" [fragment]="tab.id" queryParamsHandling="merge" [ngClass]="tab.customClass">{{tab.title}}</a>
             </li>
           </ng-container>
         </ul>
       </div>
-      <a *ngIf="position === 'horizontal'" class="uk-position-center-left uk-blur-background" uk-slider-item="previous"><span
-          uk-icon="chevron-left"></span></a>
-      <a *ngIf="position === 'horizontal'" class="uk-position-center-right uk-blur-background" uk-slider-item="next"><span
-          uk-icon="chevron-right"></span></a>
+      <slider-arrow *ngIf="position === 'horizontal' && arrows" type="previous"></slider-arrow>
+      <slider-arrow *ngIf="position === 'horizontal' && arrows" type="next"></slider-arrow>
     </div>
   `,
 })
 export class SliderTabsComponent implements AfterViewInit, OnDestroy {
-  //TODO now it works only for scrollable and static, to be extended for dynamic
   /**
-   * Type of tabs: Static = Uikit tabs with @connect class or selector, Dynamic = Active is defined by tabComponent.active input,
+   * Type of tabs:
+   * Static = Uikit tabs with @connect class or selector
+   * Dynamic = Active is defined by tabComponent's active Input
    * Scrollable = Active is defined by the active fragment of URL and position of scroll
    * */
   @Input()
@@ -84,10 +93,19 @@ export class SliderTabsComponent implements AfterViewInit, OnDestroy {
   @Input()
   public flexPosition: 'center' | 'left' | 'right' = 'left';
   /**
-   * Tabs custom class
+   * Set a class above tabs
    * */
   @Input()
   public customClass: string;
+  /**
+   * Tabs class
+   * */
+  @Input()
+  public tabsClass: string = 'uk-tab';
+  @Input()
+  public border: boolean = true;
+  @Input()
+  public arrows: boolean = true;
   @ContentChildren(SliderTabComponent) tabs: QueryList<SliderTabComponent>;
   @ViewChild('sliderElement') sliderElement: ElementRef;
   @ViewChild('tabsElement') tabsElement: ElementRef;
@@ -112,9 +130,12 @@ export class SliderTabsComponent implements AfterViewInit, OnDestroy {
           let slider = UIkit.slider(this.sliderElement.nativeElement, {finite: true});
           slider.clsActive = 'uk-slider-active';
           slider.updateActiveClasses();
-          slider.slides.forEach(item => {
-            item.classList.remove('uk-active');
+          slider.slides.forEach((item, index) => {
+            if(!this.tabs.get(index).active) {
+              item.classList.remove('uk-active');
+            }
           });
+          console.log(slider);
           if (this.type === 'static') {
             let tabs = UIkit.tab(this.tabsElement.nativeElement, {connect: this.connect});
             tabs.show(this.activeIndex);
diff --git a/sharedComponents/tabs/slider-tabs.module.ts b/sharedComponents/tabs/slider-tabs.module.ts
index 4bdc8e9b..3cbedb67 100644
--- a/sharedComponents/tabs/slider-tabs.module.ts
+++ b/sharedComponents/tabs/slider-tabs.module.ts
@@ -3,9 +3,10 @@ import {CommonModule} from "@angular/common";
 import {SliderTabsComponent} from "./slider-tabs.component";
 import {SliderTabComponent} from "./slider-tab.component";
 import {RouterModule} from "@angular/router";
+import {SliderUtilsModule} from "../slider-utils/slider-utils.module";
 
 @NgModule({
-  imports: [CommonModule, RouterModule],
+  imports: [CommonModule, RouterModule, SliderUtilsModule],
   declarations: [SliderTabsComponent, SliderTabComponent],
   exports: [SliderTabsComponent, SliderTabComponent]
 })

From c53806f5b33c2fc218b35b2ac8af30e1daa663d2 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Thu, 9 Feb 2023 16:30:24 +0200
Subject: [PATCH 13/13] 1. Add cache in get managers and members methods. 2.
 Add delete Authorization level with values curator and manager in role users
 for managers. Authorization level for mebers are always manager. 3. Clear
 cache when managers and members list has been updated.

---
 .../role-users/role-users.component.html      |  8 +++---
 .../users/role-users/role-users.component.ts  | 18 +++++++++++++
 .../role-verification.component.ts            |  6 ++++-
 services/user-registry.service.ts             | 27 ++++++++++---------
 4 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/dashboard/users/role-users/role-users.component.html b/dashboard/users/role-users/role-users.component.html
index 83681f59..f9f2e444 100644
--- a/dashboard/users/role-users/role-users.component.html
+++ b/dashboard/users/role-users/role-users.component.html
@@ -67,9 +67,11 @@
 								<div class="uk-card-body">
 									<span class="uk-text-bold uk-text-large">{{(showCurrent) ? item.email : item}}</span>
 								</div>
-								<div *ngIf="isCurator || !showCurrent" class="uk-card-footer uk-flex uk-flex-right">
-									<button (click)="openDeleteModal(item)" class="uk-button uk-button-link uk-flex uk-flex-middle"  [disabled]="role === 'member' && item.isManager"
-													[attr.uk-tooltip]="(role === 'member' && item.isManager)?'This user is a manager and cannot be removed.':null">
+								<div *ngIf="!showCurrent || role === 'member' || canDelete" class="uk-card-footer uk-flex uk-flex-right">
+									<button (click)="openDeleteModal(item)" class="uk-button uk-button-link uk-flex uk-flex-middle"
+													[disabled]="(role === 'member' && item.isManager) || isMe(item.id)"
+													[attr.uk-tooltip]="(role === 'member' && item.isManager)?'This user is a manager and cannot be removed.':
+													(isMe(item.id)?'You cannot remove yourself':null)">
 										<icon name="delete" [flex]="true" type="filled"></icon>
 										<span class="uk-margin-small-left uk-text-bold uk-text-uppercase">{{showCurrent ? 'Delete' : 'Cancel invitation'}}</span>
 									</button>
diff --git a/dashboard/users/role-users/role-users.component.ts b/dashboard/users/role-users/role-users.component.ts
index 59ad68df..2acc7edc 100644
--- a/dashboard/users/role-users/role-users.component.ts
+++ b/dashboard/users/role-users/role-users.component.ts
@@ -11,6 +11,7 @@ import {StringUtils} from "../../../utils/string-utils.class";
 import {NotificationService} from "../../../notifications/notification.service";
 import {Subscription} from "rxjs";
 import {NotificationHandler} from "../../../utils/notification-handler";
+import {ClearCacheService} from "../../../services/clear-cache.service";
 
 @Component({
   selector: 'role-users',
@@ -29,6 +30,8 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
   @Input()
   public role: "member" | "manager" = "manager";
   @Input()
+  public deleteAuthorizationLevel: 'curator' | 'manager' = 'curator';
+  @Input()
   public message: string = null;
   @Input()
   public emailComposer: Function;
@@ -63,6 +66,7 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
   
   constructor(private userRegistryService: UserRegistryService,
               private userManagementService: UserManagementService,
+              private clearCacheService: ClearCacheService,
               private notificationService: NotificationService,
               private router: Router,
               private fb: UntypedFormBuilder) {
@@ -73,6 +77,7 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
     this.updateLists();
     this.userManagementService.getUserInfo().subscribe(user => {
       this.user = user;
+      console.log(this.canDelete)
     });
   }
   
@@ -196,6 +201,7 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
       }
       this.filterActiveBySearch(this.filterForm.value.active);
       this.userManagementService.updateUserInfo();
+      this.clearCacheService.clearCache(this.role + 's of ' + this.id + ' have been updated');
       NotificationHandler.rise(this.selectedUser + ' <b>is no longer</b> ' + this.role + ' of ' + this.name + ' Dashboard');
       this.loadActive = false;
     }, error => {
@@ -267,6 +273,18 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
     });
   }
   
+  public get canDelete() {
+    return (this.deleteAuthorizationLevel === 'curator'?this.isCurator:this.isManager);
+  }
+  
+  public isMe(userId: string) {
+    return userId.includes(this.user.id) && !this.isCurator;
+  }
+  
+  public get isManager(): boolean {
+    return this.isCurator || !!Session.isManager(this.type, this.id, this.user);
+  }
+  
   public get isCurator(): boolean {
     return this.isPortalAdmin || !!Session.isCurator(this.type, this.user);
   }
diff --git a/role-verification/role-verification.component.ts b/role-verification/role-verification.component.ts
index 1f2b3a72..253fa91c 100644
--- a/role-verification/role-verification.component.ts
+++ b/role-verification/role-verification.component.ts
@@ -10,6 +10,7 @@ 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";
 
 @Component({
   selector: 'role-verification',
@@ -106,7 +107,8 @@ export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewIn
               private fb: UntypedFormBuilder,
               private emailService: EmailService,
               private userManagementService: UserManagementService,
-              private userRegistryService: UserRegistryService) {
+              private userRegistryService: UserRegistryService,
+              private clearCacheService: ClearCacheService) {
   }
   
   ngOnInit() {
@@ -195,6 +197,7 @@ export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewIn
   public verifyManager() {
     this.loading = true;
     this.subscriptions.push(this.userRegistryService.verify(this.verification.id, this.code.value).subscribe(() => {
+      this.clearCacheService.clearCache('Managers updated');
       this.managerModal.cancel();
       this.error = null;
       this.userManagementService.updateUserInfo(() => {
@@ -232,6 +235,7 @@ export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewIn
     this.loading = true;
     if (!this.isMember) {
       this.subscriptions.push(this.userRegistryService.verify(this.verification.id, this.code.value, "member").subscribe(() => {
+        this.clearCacheService.clearCache('Members updated');
         this.loading = false;
         this.error = null;
         this.userManagementService.updateUserInfo(() => {
diff --git a/services/user-registry.service.ts b/services/user-registry.service.ts
index f3d2dcc8..0e8db8ea 100644
--- a/services/user-registry.service.ts
+++ b/services/user-registry.service.ts
@@ -14,50 +14,52 @@ export class UserRegistryService {
   }
   
   public createRole(type: string, id: string): Observable<any[]> {
-    return this.http.post<any>(properties.registryUrl + 'create/' + encodeURIComponent(type) + '/' + encodeURIComponent(id), null,
+    return this.http.post<any>(properties.registryUrl + 'create/' + type + '/' + id, null,
       CustomOptions.registryOptions()).pipe(map((response: any) => response.response));
   }
   
   public getMembersCount(type: string, id: string): Observable<any> {
-    return this.http.get(properties.registryUrl + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/members/count');
+    let url = properties.registryUrl + type + '/' + id + '/members/count';
+    return this.http.get((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url);
   }
 
   public subscribeTo(type: string, id: string): Observable<any> {
-    return this.http.post(properties.registryUrl + 'subscribe/' + encodeURIComponent(type) + '/' + encodeURIComponent(id),
+    return this.http.post(properties.registryUrl + 'subscribe/' + type + '/' + id,
       null, CustomOptions.registryOptions());
   }
 
   public unsubscribeFrom(type: string, id: string): Observable<any> {
-    return this.http.post(properties.registryUrl + 'unsubscribe/' + encodeURIComponent(type) + '/' + encodeURIComponent(id),
+    return this.http.post(properties.registryUrl + 'unsubscribe/' + type + '/' + id,
       null, CustomOptions.registryOptions());
   }
 
   public remove(type: string, id: string, email: string, role: "member" | "manager" = "manager"): Observable<any> {
     return this.http.delete<any>(properties.registryUrl +
-      encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + role + '/' + encodeURIComponent(email), CustomOptions.registryOptions());
+      type + '/' + id + '/' + role + '/' + encodeURIComponent(email), CustomOptions.registryOptions());
   }
   
   public invite(type: string, id: string, details: any, role: "member" | "manager" = "manager"): Observable<any[]> {
     return this.http.post<any>(properties.registryUrl + 'invite/' +
-      encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + role, details,
+      type + '/' + id + '/' + role, details,
       CustomOptions.registryOptions()).pipe(map((response: any) => response.response));
   }
   
   public verify(id: string, code: string, role: "member" | "manager" = "manager"): Observable<any> {
-    return this.http.post<any>(properties.registryUrl + 'verification/' + role + '/' + encodeURIComponent(id), code, CustomOptions.registryOptions());
+    return this.http.post<any>(properties.registryUrl + 'verification/' + role + '/' + id, code, CustomOptions.registryOptions());
   }
 
   public getInvitation(id: string): Observable<any> {
-    return this.http.get<any>(properties.registryUrl + 'verification/' + encodeURIComponent(id), CustomOptions.registryOptions())
+    return this.http.get<any>(properties.registryUrl + 'verification/' + id, CustomOptions.registryOptions())
       .pipe(map((response: any) => response.response));
   }
 
   public deleteVerification(id: string): Observable<any> {
-    return this.http.delete<any>(properties.registryUrl + 'verification/' + encodeURIComponent(id), CustomOptions.registryOptions());
+    return this.http.delete<any>(properties.registryUrl + 'verification/' + id, CustomOptions.registryOptions());
   }
 
   public getActive(type: string, id: string, role: "member" | "manager" = "manager"): Observable<any[]> {
-    return this.http.get<any>(properties.registryUrl + encodeURIComponent(type) + '/' + encodeURIComponent(id) + "/" + role + 's',
+    let url = properties.registryUrl + type + '/' + id + "/" + role + 's';
+    return this.http.get<any>((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url,
       CustomOptions.registryOptions()).pipe(map((response:any) => response.response), map(users => {
         if(users.length > 0 && !users[0].email) {
           return [];
@@ -68,13 +70,14 @@ export class UserRegistryService {
   }
   
   public getPending(type: string, id: string, role: "member" | "manager" = "manager"): Observable<any[]> {
-    return this.http.get<any>(properties.registryUrl + 'invite/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + "/" + role + 's/',
+    let url = properties.registryUrl + 'invite/' +type + '/' +id + "/" + role + 's/';
+    return this.http.get<any>((properties.useCache) ? (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<any> {
     return this.http.delete<any>(properties.registryUrl + 'invite/' +
-      encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/' + role + '/' + encodeURIComponent(email),
+      type + '/' + id + '/' + role + '/' + encodeURIComponent(email),
       CustomOptions.registryOptions());
   }
 }