wfprev-656 (#978)

Author: yzlucas

client/wfprev-war/src/main/angular/src/app/components/edit-project/fiscal-map/fiscal-map.component.ts

@@ -164,7 +164,7 @@ export class FiscalMapComponent implements AfterViewInit, OnDestroy, OnInit {
   private handleBoundariesResponse(results: any[]): void {
     // Filter out nulls or empty boundary arrays
     const validResults = results.filter(r => r?.boundary && r.boundary.length > 0);
-  
+    this.activityBoundaryGroup.clearLayers(); // clears old activity polygons at first place
     // For each activity, keep only the latest boundary
     const dedupedResults: any[] = [];
     const seenActivityGuids = new Set<string>();
@@ -203,7 +203,6 @@ export class FiscalMapComponent implements AfterViewInit, OnDestroy, OnInit {
   }
 
   plotActivityBoundariesOnMap(boundaries: any[]): void {
-    this.activityBoundaryGroup.clearLayers(); // clears old activity polygons
     const allFiscalPolygons: L.Layer[] = [];
 
     boundaries.forEach(boundaryEntry => {

client/wfprev-war/src/main/angular/src/app/components/edit-project/project-fiscals/project-fiscals.component.spec.ts

@@ -933,4 +933,59 @@ describe('ProjectFiscalsComponent', () => {
     expect(component.selectedTabIndex).toBe(0);
   }));
 
+  it('should block deletion and show snackbar if activities exist', () => {
+    mockSnackBar.open.calls.reset();
+    mockProjectService.deleteProjectFiscalByProjectPlanFiscalGuid.calls.reset();
+
+    // ✅ Mock dialog.open to auto-confirm
+    spyOn(component.dialog, 'open').and.returnValue({
+      afterClosed: () => of(true) // Simulates user clicking "Confirm"
+    } as any);
+
+    // ✅ Provide activities that match the fiscalGuid
+    (component as any).activitiesComponent = {
+      activities: [{ projectPlanFiscalGuid: 'test-guid' }]
+    };
+
+    component.projectFiscals = [{ projectPlanFiscalGuid: 'test-guid' }];
+    component.selectedTabIndex = 0;
+
+    fixture.detectChanges();
+
+    component.deleteFiscalYear({ value: component.projectFiscals[0] }, 0);
+
+    expect(mockSnackBar.open).toHaveBeenCalledOnceWith(
+      component.messages.fiscalActivityDeletedFailure,
+      'OK',
+      { duration: 5000, panelClass: 'snackbar-error' }
+    );
+
+    expect(mockProjectService.deleteProjectFiscalByProjectPlanFiscalGuid)
+      .not.toHaveBeenCalled();
+  });
+
+
+  it('should proceed with deletion if there are no activities', () => {
+    spyOn(component.dialog, 'open').and.returnValue({
+      afterClosed: () => of(true)
+    } as any);
+    spyOn(component, 'loadProjectFiscals');
+
+    component.activitiesComponent = {
+      activities: []
+    } as any;
+
+    mockProjectService.deleteProjectFiscalByProjectPlanFiscalGuid = jasmine.createSpy().and.returnValue(of({}));
+
+    component.projectFiscals = [{ projectPlanFiscalGuid: 'test-guid' }];
+    component.deleteFiscalYear({ value: component.projectFiscals[0] }, 0);
+
+    expect(mockProjectService.deleteProjectFiscalByProjectPlanFiscalGuid).toHaveBeenCalledWith('test-guid', 'test-guid');
+    expect(mockSnackBar.open).toHaveBeenCalledWith(
+      component.messages.projectFiscalDeletedSuccess,
+      'OK',
+      { duration: 5000, panelClass: 'snackbar-success' }
+    );
+  });
+
 });

client/wfprev-war/src/main/angular/src/app/components/edit-project/project-fiscals/project-fiscals.component.ts

@@ -491,6 +491,7 @@ export class ProjectFiscalsComponent implements OnInit, CanComponentDeactivate {
     const fiscalYear = this.projectFiscals[this.selectedTabIndex]?.fiscalYear;
     const formattedYear = fiscalYear ? `${fiscalYear}/${(fiscalYear + 1).toString().slice(-2)}` : null;
     const yearName = (fiscalName && fiscalYear) ? `${fiscalName}:${formattedYear}` : 'this fiscal activity'
+    const fiscalGuid = formData.projectPlanFiscalGuid ?? '';
 
     const dialogRef = this.dialog.open(ConfirmationDialogComponent, {
       data: {
@@ -503,6 +504,18 @@ export class ProjectFiscalsComponent implements OnInit, CanComponentDeactivate {
 
     dialogRef.afterClosed().subscribe((confirmed: boolean) => {
       if (confirmed) {
+
+        const hasActivities = this.activitiesComponent?.activities?.some(a => a.projectPlanFiscalGuid === fiscalGuid) ?? false;
+
+        if (hasActivities) {
+          this.snackbarService.open(
+            this.messages.fiscalActivityDeletedFailure,
+            'OK',
+            { duration: 5000, panelClass: 'snackbar-error' }
+          );
+          return;
+        }
+
         if (formData.projectPlanFiscalGuid) {
           // Delete from the service call if it's a saved fiscal activity
           this.projectService.deleteProjectFiscalByProjectPlanFiscalGuid(this.projectGuid, formData.projectPlanFiscalGuid)
@@ -545,6 +558,7 @@ export class ProjectFiscalsComponent implements OnInit, CanComponentDeactivate {
   }
 
   onBoundariesChanged(): void {
+    
     if (this.fiscalMapComponent) {
       this.fiscalMapComponent.getAllActivitiesBoundaries(); // refresh boundaries on map
     }
@@ -653,6 +667,7 @@ export class ProjectFiscalsComponent implements OnInit, CanComponentDeactivate {
       this.updateFiscalStatus(index, action);
     }
   }
+  
 
   onSaveEndorsement(updatedFiscal: ProjectFiscal): void {
     const index = this.selectedTabIndex;

client/wfprev-war/src/main/angular/src/app/utils/constants.ts

@@ -30,6 +30,7 @@ export const Messages = {
   fileDownloadFailure: 'Error: File download unsuccessful',
   fileDownloadSuccess: 'File downloaded successfully.',
   fileDownloadInProgress: 'File download in progress. Please wait',
+  fiscalActivityDeletedFailure: 'Delete Failed. Remove Activities to Delete Fiscal Activity'
 };
 
 export const CodeTableKeys = {