From 27f541ef8420ffca01256c9de239767c4c74f749 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.it>
Date: Wed, 8 Feb 2023 19:56:54 +0100
Subject: [PATCH] [CST-7757] modal fixes

---
 .../subscription-modal/subscription-modal.component.html   | 1 +
 .../subscription-view/subscription-view.component.html     | 7 +++----
 .../subscription-view/subscription-view.component.spec.ts  | 2 +-
 src/assets/i18n/en.json5                                   | 5 +++--
 4 files changed, 8 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 fbab2513cb..5cbfb138d4 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
@@ -27,6 +27,7 @@
         </ds-alert>
       </fieldset>
     </div>
+    <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-view/subscription-view.component.html b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
index dfd2e2b1b1..db11eb547f 100644
--- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
@@ -1,8 +1,7 @@
 <td class="dso-info">
-	<span *ngIf="!!dso" class="badge badge-info">{{dso.type}}</span>
-	<p><a *ngIf="!!dso" [routerLink]="[getPageRoutePrefix(), dso.id]">{{dso.name}}</a></p>
-</td>
-<td>
+  <ds-type-badge *ngIf="!!dso" [object]="dso"></ds-type-badge>
+  <p><a *ngIf="!!dso" [routerLink]="[getPageRoutePrefix(), dso.id]">{{dso.name}}</a></p>
+</td><td>
 	<span *ngIf="!!subscription" class="subscription-type">{{subscription.subscriptionType}}</span>
 </td>
 <td class="subscription-parameters">
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts
index 00f0b8d22c..aa40f2bf43 100644
--- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts
@@ -94,7 +94,7 @@ describe('SubscriptionViewComponent', () => {
   });
 
   it('should have dso object info', () => {
-    expect(de.query(By.css('.dso-info > span'))).toBeTruthy();
+    expect(de.query(By.css('.dso-info > ds-type-badge'))).toBeTruthy();
     expect(de.query(By.css('.dso-info > p > a'))).toBeTruthy();
   });
 
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index be9ffc99ed..ba0200a892 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -4589,6 +4589,8 @@
 
   "subscriptions.modal.close": "Close",
 
+  "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
+
   "subscriptions.modal.new-subscription-form.type.content": "Content",
 
   "subscriptions.modal.new-subscription-form.frequency.D": "Daily",
@@ -4619,8 +4621,7 @@
 
   "subscriptions.table.action": "Action",
 
-  "subscriptions.table.empty.message": "You have not subscribed any notification yet. To subscribe notification about an object please use the contextual menu in the object detail view",
-
+  "subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.",
 
 
   "thumbnail.default.alt": "Thumbnail Image",