This is an automated email from the ASF dual-hosted git repository.
shamrick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new f87ccb4a13 Fix unable to delete newly created Capability (#7534)
f87ccb4a13 is described below
commit f87ccb4a13085c92685f0331a4c78faafb7e5d17
Author: ocket8888 <[email protected]>
AuthorDate: Thu May 25 08:28:03 2023 -0600
Fix unable to delete newly created Capability (#7534)
---
.../capability-details/capability-details.component.spec.ts | 8 ++++----
.../capability-details/capability-details.component.ts | 11 +++++------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git
a/experimental/traffic-portal/src/app/core/servers/capabilities/capability-details/capability-details.component.spec.ts
b/experimental/traffic-portal/src/app/core/servers/capabilities/capability-details/capability-details.component.spec.ts
index acb806aba1..f17f583c0c 100644
---
a/experimental/traffic-portal/src/app/core/servers/capabilities/capability-details/capability-details.component.spec.ts
+++
b/experimental/traffic-portal/src/app/core/servers/capabilities/capability-details/capability-details.component.spec.ts
@@ -82,19 +82,19 @@ describe("CapabilityDetailsComponent", () => {
it("opens a dialog for Capability deletion", async () => {
const api = TestBed.inject(ServerService);
const spy = spyOn(api, "deleteCapability").and.callThrough();
- expect(spy).not.toHaveBeenCalled();
+ await expect(spy).not.toHaveBeenCalled();
const dialogService = TestBed.inject(MatDialog);
const openSpy = spyOn(dialogService, "open").and.returnValue({
afterClosed: () => of(true)
} as MatDialogRef<unknown>);
- expect(openSpy).not.toHaveBeenCalled();
+ await expect(openSpy).not.toHaveBeenCalled();
const asyncExpectation =
expectAsync(component.deleteCapability()).toBeResolvedTo(undefined);
- expect(openSpy).toHaveBeenCalled();
- expect(spy).toHaveBeenCalled();
+ await expect(openSpy).toHaveBeenCalled();
+ await expect(spy).toHaveBeenCalled();
await asyncExpectation;
});
diff --git
a/experimental/traffic-portal/src/app/core/servers/capabilities/capability-details/capability-details.component.ts
b/experimental/traffic-portal/src/app/core/servers/capabilities/capability-details/capability-details.component.ts
index 54edbd65e0..0d8cd1a912 100644
---
a/experimental/traffic-portal/src/app/core/servers/capabilities/capability-details/capability-details.component.ts
+++
b/experimental/traffic-portal/src/app/core/servers/capabilities/capability-details/capability-details.component.ts
@@ -90,12 +90,11 @@ export class CapabilityDetailsComponent implements OnInit {
title: "Confirm Delete"
}
});
- ref.afterClosed().subscribe(result => {
- if(result) {
- this.api.deleteCapability(this.capability);
- this.location.back();
- }
- });
+ const result = await ref.afterClosed().toPromise();
+ if(result) {
+ await this.api.deleteCapability(this.capability);
+ this.location.back();
+ }
}
/**