From 897d6e857d2d67cbdf377f2250f1510053d38cf3 Mon Sep 17 00:00:00 2001
From: Konstantinos Triantafyllou <k.triantafyllou@di.uoa.gr>
Date: Mon, 9 Dec 2019 13:52:48 +0000
Subject: [PATCH] [MonitorDashboard]: Fix a bug with alias Validator

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57841 d315682c-612b-4755-9ff5-7f18f6832af3
---
 src/app/home/home.component.html | 2 +-
 src/app/home/home.component.ts   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html
index f6654a8..38ea610 100644
--- a/src/app/home/home.component.html
+++ b/src/app/home/home.component.html
@@ -189,7 +189,7 @@
 </div>
 <modal-alert #editStakeholderModal
              (alertOutput)="saveStakeholder()"
-             [okDisabled]="stakeholderFb && (stakeholderFb.invalid || (!stakeholderFb.dirty && index !==-1))">
+             [okDisabled]="stakeholderFb && (stakeholderFb.invalid || (stakeholderFb.pristine && index !==-1))">
   <div *ngIf="stakeholderFb" class="uk-padding-small" [formGroup]="stakeholderFb">
     <div dashboard-input class="uk-form-row" [formInput]="stakeholderFb.get('index_name')" label="Name"></div>
     <div class="uk-form-row uk-flex uk-flex-middle uk-child-width-1-3" uk-grid>
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
index 282a518..c52a2b7 100644
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@@ -167,7 +167,9 @@ export class HomeComponent implements OnInit, OnDestroy {
                 [
                     Validators.required,
                     this.stakeholderUtils.aliasValidator(
-                        (this.stakeholder.isDefaultProfile) ? this.defaultStakeholders : this.stakeholders
+                        (this.stakeholder.isDefaultProfile) ?
+                            this.defaultStakeholders.filter(stakeholder => stakeholder.alias !== this.stakeholder.alias):
+                            this.stakeholders.filter(stakeholder => stakeholder.alias !== this.stakeholder.alias)
                     )]
             ),
             isPublic: this.fb.control(this.stakeholder.isPublic),