From e8a0f419e0876821c2bd8d8446b745aec65b073d Mon Sep 17 00:00:00 2001
From: RIHTARSIC Joze <joze.rihtarsic@ext.ec.europa.eu>
Date: Mon, 19 Jun 2023 06:41:05 +0200
Subject: [PATCH] Fix selections when opening edit dialog and close it again.
---
.../panels/membership-panel/membership-panel.component.ts | 6 ++----
.../domain-group-panel/domain-group.component.ts | 1 +
.../group-resource-panel/group-resource-panel.component.ts | 3 ++-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/smp-angular/src/app/common/panels/membership-panel/membership-panel.component.ts b/smp-angular/src/app/common/panels/membership-panel/membership-panel.component.ts
index 9ab900648..4cfe3b4f7 100644
--- a/smp-angular/src/app/common/panels/membership-panel/membership-panel.component.ts
+++ b/smp-angular/src/app/common/panels/membership-panel/membership-panel.component.ts
@@ -46,10 +46,7 @@ export class MembershipPanelComponent implements BeforeLeaveGuard {
private membershipService: MembershipService,
private alertService: AlertMessageService,
private dialog: MatDialog) {
-
-
}
-
ngAfterViewInit() {
this.loadMembershipData();
}
@@ -111,7 +108,7 @@ export class MembershipPanelComponent implements BeforeLeaveGuard {
}
public loadMembershipData() {
-
+ this.memberSelected(null)
let membershipService: Observable<SearchTableResult> = this.getMembershipListService();
if (!membershipService) {
return;
@@ -176,6 +173,7 @@ export class MembershipPanelComponent implements BeforeLeaveGuard {
member: member,
}
}).afterClosed().subscribe(value => {
+
this.refresh();
});
}
diff --git a/smp-angular/src/app/edit/edit-domain/domain-group-panel/domain-group.component.ts b/smp-angular/src/app/edit/edit-domain/domain-group-panel/domain-group.component.ts
index 111893532..ccc27e5c5 100644
--- a/smp-angular/src/app/edit/edit-domain/domain-group-panel/domain-group.component.ts
+++ b/smp-angular/src/app/edit/edit-domain/domain-group-panel/domain-group.component.ts
@@ -88,6 +88,7 @@ export class DomainGroupComponent implements BeforeLeaveGuard {
}
loadTableData() {
+ this.selectedGroup = null;
if (!this._domain) {
this.dataSource.data = null;
return;
diff --git a/smp-angular/src/app/edit/edit-group/group-resource-panel/group-resource-panel.component.ts b/smp-angular/src/app/edit/edit-group/group-resource-panel/group-resource-panel.component.ts
index f2257d0a3..4232e71e6 100644
--- a/smp-angular/src/app/edit/edit-group/group-resource-panel/group-resource-panel.component.ts
+++ b/smp-angular/src/app/edit/edit-group/group-resource-panel/group-resource-panel.component.ts
@@ -66,6 +66,8 @@ export class GroupResourcePanelComponent implements BeforeLeaveGuard {
}
loadGroupResources() {
+
+ this.onResourceSelected(null);
if (!this._group) {
return;
}
@@ -105,7 +107,6 @@ export class GroupResourcePanelComponent implements BeforeLeaveGuard {
identifierValue: "",
smlRegistered: false,
visibility: VisibilityEnum.Public
-
}
}
--
GitLab