From 5c1a0028770283f219b6da05d6a0369c938d7931 Mon Sep 17 00:00:00 2001
From: Guillermo <guillermo@escire.lat>
Date: Wed, 12 Aug 2026 13:04:31 -0600
Subject: [PATCH 1/3] fix #5922: allow unsubscribe from Manage Subscription
 modal

---
 .../subscription-modal.component.html         |  3 --
 .../subscription-modal.component.spec.ts      | 25 ++++++++++++++++
 .../subscription-modal.component.ts           | 30 ++++++++++++++++---
 3 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
index 9ecf824bbaf..2ab35875b09 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
@@ -37,9 +37,6 @@ <h4 class="modal-title">{{'subscriptions.modal.title' | translate}}</h4>
         </fieldset>
       }
     </div>
-    @if ((showDeleteInfo$ | async)) {
-      <p class="text-muted">{{'subscriptions.modal.delete-info' | translate}}</p>
-    }
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-outline-secondary"
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts
index d31ed49a4ac..227e3dd0bb8 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts
@@ -188,6 +188,31 @@ describe('SubscriptionModalComponent', () => {
       expect(component.subscriptionForm.controls).toBeTruthy();
     });
 
+    it('should delete an existing subscription when all frequencies are unchecked', () => {
+      subscriptionServiceStub.deleteSubscription = jasmine.createSpy('deleteSubscription').and.returnValue(createSuccessfulRemoteDataObject$({}));
+
+      component.subscriptionForm = new UntypedFormGroup({});
+      for (let t of testTypes) {
+        const formGroup = new UntypedFormGroup({
+          subscriptionId: new UntypedFormControl(testSubscriptionId),
+          frequencies: new UntypedFormGroup({
+            f: new UntypedFormControl(false),
+            g: new UntypedFormControl(false),
+          }),
+        });
+        component.subscriptionForm.addControl(t, formGroup);
+        component.subscriptionForm.get('test1').markAsDirty();
+        component.subscriptionForm.get('test1').markAsTouched();
+      }
+
+      fixture.detectChanges();
+      component.submit();
+
+      expect(subscriptionServiceStub.deleteSubscription).toHaveBeenCalled();
+      expect(subscriptionServiceStub.createSubscription).not.toHaveBeenCalled();
+      expect(subscriptionServiceStub.updateSubscription).not.toHaveBeenCalled();
+    });
+
   });
 
   describe('when no subscription is given', () => {
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
index 8ec465706e8..a9333a45a3e 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
@@ -169,7 +169,10 @@ export class SubscriptionModalComponent implements OnInit {
       for (const f of this.frequencyDefaultValues) {
         anyFrequencySelected = anyFrequencySelected || newValue.content.frequencies[f];
       }
-      this.isValid = anyFrequencySelected;
+      const hasExistingSubscription = this.subscriptionDefaultTypes.some(
+        (t) => isNotEmpty(newValue[t]?.subscriptionId)
+      );
+      this.isValid = anyFrequencySelected || hasExistingSubscription;
     });
   }
 
@@ -217,7 +220,7 @@ export class SubscriptionModalComponent implements OnInit {
     ).subscribe({
       next: (res: PaginatedList<Subscription>) => {
         if (res.pageInfo.totalElements > 0) {
-          this.showDeleteInfo$.next(true);
+          //this.showDeleteInfo$.next(true);
           for (const subscription of res.page) {
             const type = subscription.subscriptionType;
             const subscriptionGroup: UntypedFormGroup = this.subscriptionForm.get(type) as UntypedFormGroup;
@@ -245,6 +248,7 @@ export class SubscriptionModalComponent implements OnInit {
     const subscriptionTypes: string[] = Object.keys(this.subscriptionForm.controls);
     const subscriptionsToBeCreated = [];
     const subscriptionsToBeUpdated = [];
+    const subscriptionsToBeDeleted = [];
 
     subscriptionTypes.forEach((subscriptionType: string) => {
       const subscriptionGroup: UntypedFormGroup = this.subscriptionForm.controls[subscriptionType] as UntypedFormGroup;
@@ -254,9 +258,10 @@ export class SubscriptionModalComponent implements OnInit {
           subscriptionType,
           subscriptionGroup.controls.frequencies as UntypedFormGroup,
         );
-
-        if (isNotEmpty(body.id)) {
+        if (isNotEmpty(body.id) && isNotEmpty(body.subscriptionParameterList)) {
           subscriptionsToBeUpdated.push(body);
+        } else if (isNotEmpty(body.id) && !isNotEmpty(body.subscriptionParameterList)) {
+          subscriptionsToBeDeleted.push(body);
         } else if (isNotEmpty(body.subscriptionParameterList)) {
           subscriptionsToBeCreated.push(body);
         }
@@ -304,6 +309,23 @@ export class SubscriptionModalComponent implements OnInit {
       ));
     }
 
+    if (isNotEmpty(subscriptionsToBeDeleted)) {
+      toBeProcessed.push(from(subscriptionsToBeDeleted).pipe(
+        mergeMap((subscriptionBody: any) => {
+          return this.subscriptionService.deleteSubscription(subscriptionBody.id).pipe(
+            getFirstCompletedRemoteData(),
+          );
+        }),
+        tap((res: any) => {
+          if (res.hasSucceeded) {
+            this.notificationsService.success(null, this.translate.instant('subscriptions.modal.delete.success'));
+          } else {
+            this.notificationsService.error(null, this.translate.instant('subscriptions.modal.delete.error'));
+          }
+        }),
+      ));
+    }
+
     combineLatest([...toBeProcessed]).subscribe((res) => {
       this.updated.emit();
       this.activeModal.close('updated');

From ae297a25b4bc2d85ccf631a8e50767d7a886200d Mon Sep 17 00:00:00 2001
From: Guillermo <guillermo@escire.lat>
Date: Wed, 12 Aug 2026 13:11:22 -0600
Subject: [PATCH 2/3] fix: remove unused showDeleteInfo line

---
 .../subscription-modal/subscription-modal.component.ts           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
index a9333a45a3e..5e143f6a346 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
@@ -220,7 +220,6 @@ export class SubscriptionModalComponent implements OnInit {
     ).subscribe({
       next: (res: PaginatedList<Subscription>) => {
         if (res.pageInfo.totalElements > 0) {
-          //this.showDeleteInfo$.next(true);
           for (const subscription of res.page) {
             const type = subscription.subscriptionType;
             const subscriptionGroup: UntypedFormGroup = this.subscriptionForm.get(type) as UntypedFormGroup;

From 22ff07065c6758631e90d8c251f36bc49ab6cb71 Mon Sep 17 00:00:00 2001
From: Guillermo <guillermo@escire.lat>
Date: Wed, 12 Aug 2026 13:17:46 -0600
Subject: [PATCH 3/3] fix: add missing trailing comma

---
 .../subscription-modal/subscription-modal.component.ts          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
index 5e143f6a346..bd0c043fb86 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
@@ -170,7 +170,7 @@ export class SubscriptionModalComponent implements OnInit {
         anyFrequencySelected = anyFrequencySelected || newValue.content.frequencies[f];
       }
       const hasExistingSubscription = this.subscriptionDefaultTypes.some(
-        (t) => isNotEmpty(newValue[t]?.subscriptionId)
+        (t) => isNotEmpty(newValue[t]?.subscriptionId),
       );
       this.isValid = anyFrequencySelected || hasExistingSubscription;
     });