Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature/386 - Add Delete Report functionality #1831

Merged
merged 2 commits into from
Apr 5, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,6 @@ <h5 class="m-0">Recent reports</h5>
(dialogClose)="dialogVisible = false"
[dialogVisible]="dialogVisible"
></app-form-type-dialog>

<p-toast></p-toast>
<p-confirmDialog></p-confirmDialog>
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
import { HttpClientTestingModule } from '@angular/common/http/testing';
import { provideMockStore } from '@ngrx/store/testing';
import { testMockStore } from 'app/shared/utils/unit-test.utils';
import { testActiveReport, testMockStore } from 'app/shared/utils/unit-test.utils';
import { TableModule } from 'primeng/table';
import { ToolbarModule } from 'primeng/toolbar';
import { ConfirmationService, MessageService } from 'primeng/api';
import { ApiService } from 'app/shared/services/api.service';
import { ReportListComponent } from './report-list.component';
import { Form3X, F3xFormTypes } from '../../shared/models/form-3x.model';
import { F3xFormTypes, Form3X } from '../../shared/models/form-3x.model';
import { Report, ReportTypes } from '../../shared/models/report.model';
import { RouterTestingModule } from '@angular/router/testing';
import { Router } from '@angular/router';
Expand Down Expand Up @@ -101,4 +101,25 @@ describe('ReportListComponent', () => {
component.editItem(item);
expect(navigateSpy).toHaveBeenCalledWith('/reports/f1m/edit/99');
});

describe('deleteReport', () => {
it('should call confirm', () => {
const confirmSpy = spyOn(component.confirmationService, 'confirm');
component.confirmDelete(testActiveReport);
expect(confirmSpy).toHaveBeenCalledTimes(1);
});

it('should delete', fakeAsync(async () => {
const deleteSpy = spyOn(component.itemService, 'delete').and.returnValue(of(null));
const messageServiceSpy = spyOn(component.messageService, 'add');
await component.delete(testActiveReport);
expect(deleteSpy).toHaveBeenCalledOnceWith(testActiveReport);
expect(messageServiceSpy).toHaveBeenCalledOnceWith({
severity: 'success',
summary: 'Successful',
detail: 'Report Deleted',
life: 3000,
});
}));
});
});
33 changes: 29 additions & 4 deletions front-end/src/app/reports/report-list/report-list.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, ElementRef, OnDestroy, OnInit } from '@angular/core';
import { take, takeUntil } from 'rxjs';
import { lastValueFrom, take, takeUntil } from 'rxjs';
import { ConfirmationService, MessageService } from 'primeng/api';
import { TableAction, TableListBaseComponent } from '../../shared/components/table-list-base/table-list-base.component';
import { Report, ReportStatus, ReportTypes } from '../../shared/models/report.model';
Expand All @@ -25,14 +25,15 @@ export class ReportListComponent extends TableListBaseComponent<Report> implemen
this.editItem.bind(this),
(report: Report) => report.report_status !== ReportStatus.IN_PROGRESS,
),
new TableAction('Delete', this.confirmDelete.bind(this), (report: Report) => report.can_delete),
new TableAction('Download as .fec', this.goToTest.bind(this)),
];

constructor(
protected override messageService: MessageService,
protected override confirmationService: ConfirmationService,
override messageService: MessageService,
override confirmationService: ConfirmationService,
protected override elementRef: ElementRef,
protected override itemService: ReportService,
override itemService: ReportService,
public router: Router,
) {
super(messageService, confirmationService, elementRef);
Expand Down Expand Up @@ -84,6 +85,30 @@ export class ReportListComponent extends TableListBaseComponent<Report> implemen
});
}

public confirmDelete(report: Report): void {
this.confirmationService.confirm({
message: 'Are you sure you want to delete this report? This action cannot be undone',
header: 'Hang on...',
rejectLabel: 'Cancel',
rejectIcon: 'none',
rejectButtonStyleClass: 'p-button-secondary',
acceptLabel: 'Confirm',
acceptIcon: 'none',
accept: async () => this.delete(report),
});
}

async delete(report: Report) {
await lastValueFrom(this.itemService.delete(report));
this.refreshTable();
this.messageService.add({
severity: 'success',
summary: 'Successful',
detail: 'Report Deleted',
life: 3000,
});
}

public async goToTest(item: Report): Promise<void> {
await this.router.navigateByUrl(`/reports/f3x/test-dot-fec/${item.id}`);
}
Expand Down
2 changes: 1 addition & 1 deletion front-end/src/app/shared/models/report.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export abstract class Report extends BaseModel {
@Type(() => Date)
@Transform(BaseModel.dateTransform)
updated: Date | undefined;
deleted: string | undefined;
can_delete = false;

abstract get formLabel(): string;

Expand Down
15 changes: 14 additions & 1 deletion front-end/src/assets/styles/theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -4646,7 +4646,18 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
padding: 1rem;
border-top-right-radius: 4px;
border-top-left-radius: 4px;
position: relative;
}

.p-dialog .p-dialog-header::after {
border-bottom: 2px solid #5b616b;
width: 94%;
position: absolute;
left: 3%;
bottom: 0;
content: "";
}

.p-dialog .p-dialog-header .p-dialog-title {
font-weight: 600;
font-size: 1.25rem;
Expand Down Expand Up @@ -4677,7 +4688,7 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
.p-dialog .p-dialog-content {
background: #ffffff;
color: #212121;
padding: 1rem;
padding: 1rem 2rem;
}
.p-dialog .p-dialog-footer {
border-top: 1px solid #e8e8e8;
Expand All @@ -4687,6 +4698,8 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
text-align: right;
border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px;
display: flex;
justify-content: space-between;
}
.p-dialog .p-dialog-footer button {
margin: 0 0.5rem 0 0;
Expand Down