From 3c20cb7ee12102776b0ca1df278be6afd1d9bfb1 Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Wed, 28 Oct 2020 15:27:44 +0100
Subject: [PATCH] fix positioning of group delete button and clearing of the
 cache on delete

---
 .../group-registry/group-form/group-form.component.html   | 8 +++++---
 .../group-registry/group-form/group-form.component.ts     | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.html b/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.html
index 583f992a1b..2e1c563f03 100644
--- a/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.html
+++ b/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.html
@@ -18,9 +18,11 @@
                [formLayout]="formLayout"
                (cancel)="onCancel()"
                (submitForm)="onSubmit()">
-        <button class="btn btn-light delete-button" [disabled]="!(canDelete$ | async)" (click)="delete()">
-          <i class="fa fa-trash"></i> {{ messagePrefix + '.actions.delete' | translate}}
-        </button>
+        <div *ngIf="groupBeingEdited != null" class="row">
+          <button class="btn btn-light delete-button" [disabled]="!(canDelete$ | async)" (click)="delete()">
+            <i class="fa fa-trash"></i> {{ messagePrefix + '.actions.delete' | translate}}
+          </button>
+        </div>
       </ds-form>
 
       <ds-members-list *ngIf="groupBeingEdited != null" [messagePrefix]="messagePrefix + '.members-list'"></ds-members-list>
diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.ts b/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.ts
index 9f2f3b7829..0861eb1745 100644
--- a/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.ts
+++ b/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.ts
@@ -144,7 +144,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
       });
       this.formModel = [
         this.groupName,
-        this.groupDescription
+        this.groupDescription,
       ];
       this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
       this.subs.push(this.groupDataService.getActiveGroup().subscribe((activeGroup: Group) => {
@@ -349,8 +349,8 @@ export class GroupFormComponent implements OnInit, OnDestroy {
    * This method will ensure that the page gets reset and that the cache is cleared
    */
   reset() {
-    this.groupDataService.getActiveGroup().pipe(take(1)).subscribe((group: Group) => {
-      this.requestService.removeByHrefSubstring(group.self);
+    this.groupDataService.getBrowseEndpoint().pipe(take(1)).subscribe((href: string) => {
+      this.requestService.removeByHrefSubstring(href);
     });
     this.onCancel();
   }