From 078bdd287fbeca3912cc894f2356241925172081 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.it>
Date: Mon, 13 Feb 2023 15:45:56 +0100
Subject: [PATCH] [CST-7757] Fix delete message

---
 .../subscription-modal.component.html              |  2 +-
 .../subscription-modal.component.ts                | 14 ++++++++------
 2 files changed, 9 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 0e723a8140..a71498f002 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
@@ -27,7 +27,7 @@
         </ds-alert>
       </fieldset>
     </div>
-    <p class="text-muted" *ngIf="showDeleteInfo">{{'subscriptions.modal.delete-info' | translate}}</p>
+    <p class="text-muted" *ngIf="(showDeleteInfo$ | async)">{{'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.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
index efb8f103e0..cd37a2bb02 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
@@ -49,6 +49,11 @@ export class SubscriptionModalComponent implements OnInit {
    */
   public processing$ = new BehaviorSubject<boolean>(false);
 
+  /**
+   * If true, show a message explaining how to delete a subscription
+   */
+  public showDeleteInfo$ = new BehaviorSubject<boolean>(false);
+
   /**
    * Reactive form group that will be used to add/edit subscriptions
    */
@@ -69,8 +74,6 @@ export class SubscriptionModalComponent implements OnInit {
    */
   frequencyDefaultValues = ['D', 'W', 'M'];
 
-  showDeleteInfo: boolean;
-
   /**
    * True if form status has changed and at least one frequency is checked
    */
@@ -103,10 +106,8 @@ export class SubscriptionModalComponent implements OnInit {
       this.ePersonId = ePersonId;
       if (isNotEmpty(this.subscription)) {
         this.initFormByGivenSubscription();
-        this.showDeleteInfo = true;
       } else {
         this.initFormByAllSubscriptions();
-        this.showDeleteInfo = false;
       }
     });
 
@@ -153,8 +154,8 @@ export class SubscriptionModalComponent implements OnInit {
   }
 
   /**
-   * Get subscription for the eperson & dso object relation
-   * If no subscription start with an empty form
+   * Get subscriptions for the current ePerson & dso object relation.
+   * If there are no subscriptions then start with an empty form.
    */
   initFormDataBySubscriptions(): void {
     this.processing$.next(true);
@@ -163,6 +164,7 @@ export class SubscriptionModalComponent implements OnInit {
     ).subscribe({
       next: (res: PaginatedList<Subscription>) => {
         if (res.pageInfo.totalElements > 0) {
+          this.showDeleteInfo$.next(true);
           for (let subscription of res.page) {
             const type = subscription.subscriptionType;
             const subscriptionGroup: FormGroup = this.subscriptionForm.get(type) as FormGroup;