From 110c2ab4b392c79f7e31b199be261a81284c587e Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Mon, 26 Feb 2024 15:54:50 +0200
Subject: [PATCH] [develop | FIXED | DONE]: 1. Fixed prefix of roles. 2.
 Disable filtering in manage stakeholders while loading.

---
 dashboard/users/subscribers/subscribers.component.ts          | 4 ++--
 login/utils/helper.class.ts                                   | 2 +-
 .../manageStakeholders/manageStakeholders.component.html      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dashboard/users/subscribers/subscribers.component.ts b/dashboard/users/subscribers/subscribers.component.ts
index 5b7976e7..fcc49978 100644
--- a/dashboard/users/subscribers/subscribers.component.ts
+++ b/dashboard/users/subscribers/subscribers.component.ts
@@ -141,8 +141,8 @@ export class SubscribersComponent implements OnInit, OnDestroy, OnChanges {
     this.createRoleModal.okButtonLeft = false;
     this.createRoleModal.okButtonText = 'create';
     this.roleFb = this.fb.group({
-      name: this.fb.control(Role.mapType(this.type) + '.' + this.id, Validators.required),
-      description: this.fb.control(Role.mapType(this.type) + ' ' + this.id, Validators.required)
+      name: this.fb.control(Role.roleName(this.type, this.id), Validators.required),
+      description: this.fb.control(Role.roleName(this.type, this.id), Validators.required)
     });
     setTimeout(() => {
       this.roleFb.get('name').disable();
diff --git a/login/utils/helper.class.ts b/login/utils/helper.class.ts
index 92c2a62e..6f2a2951 100644
--- a/login/utils/helper.class.ts
+++ b/login/utils/helper.class.ts
@@ -239,7 +239,7 @@ export class Role {
     } else if (type == "organization") {
       type = "institution";
     }
-    return Role.GROUP + type;
+    return type;
   }
   
   /**
diff --git a/monitor-admin/manageStakeholders/manageStakeholders.component.html b/monitor-admin/manageStakeholders/manageStakeholders.component.html
index de1567cd..a876d32a 100644
--- a/monitor-admin/manageStakeholders/manageStakeholders.component.html
+++ b/monitor-admin/manageStakeholders/manageStakeholders.component.html
@@ -14,11 +14,11 @@
         <div class="uk-section-xsmall">
             <div class="uk-flex uk-flex-center uk-flex-wrap uk-flex-middle uk-flex-between@m">
                 <div class="uk-width-medium uk-margin-small-bottom">
-                    <div input type="select" placeholder="Type"
+                    <div input type="select" placeholder="Type" [disabled]="loading"
                          [options]="typeOptions" [formInput]="filters.get('type')">
                     </div>
                 </div>
-                <div search-input [searchControl]="filters.get('keyword')" [expandable]="true"
+                <div search-input [searchControl]="filters.get('keyword')" [expandable]="true" [disabled]="loading"
                      placeholder="Search Profiles" searchInputClass="outer"
                      class="uk-width-1-3@xl uk-width-2-5@l uk-width-1-2@m uk-width-1-1 uk-flex uk-flex-right"></div>
             </div>